Merge branch 'tweaks'

Author: frakern

.run/Run Starsector.run.xml

@@ -1,11 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Starsector" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="1.17" />
+    <option name="ALTERNATIVE_JRE_PATH" value="azul-17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="com.fs.starfarer.StarfarerLauncher" />
-    <module name="starpocalypse" />
-    <option name="VM_PARAMETERS" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.library.path=native\windows -Xms1536m -Xmx1536m -Xss1024k -Dcom.fs.starfarer.settings.paths.logs=. -Dcom.fs.starfarer.settings.paths.saves=../saves -Dcom.fs.starfarer.settings.paths.screenshots=../screenshots -Dcom.fs.starfarer.settings.paths.mods=../mods -classpath janino.jar;commons-compiler.jar;commons-compiler-jdk.jar;starfarer.res.jar;starfarer.api.jar;starfarer_obf.jar;jogg-0.0.7.jar;jorbis-0.0.15.jar;json.jar;lwjgl.jar;lwjgl_util_applet.jar;jinput.jar;lwjgl_test.jar;log4j-1.2.9.jar;lwjgl_util.jar;fs.sound_obf.jar;fs.common_obf.jar;xstream-1.4.10.jar com.fs.starfarer.StarfarerLauncher" />
+    <module name="starpocalypse.main" />
+    <option name="VM_PARAMETERS" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -noverify -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShowCodeDetailsInExceptionMessages -XX:+ExtensiveErrorReports -XX:+ShowMessageBoxOnError -XX:+PrintCommandLineFlags -XX:+TieredCompilation -XX:-UseCondCardMark -Xlog:async -XX:+UseFastStosb -XX:+AlwaysCompileLoopMethods -XX:TieredStopAtLevel=4 -XX:TrimNativeHeapInterval=60000 -XX:+UseCriticalCompilerThreadPriority -XX:+UseCriticalJavaThreadPriority -XX:UseAVX=3 -XX:AVX3Threshold=0 -XX:UseSSE=4 -XX:+UseSSE42Intrinsics -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UseFMA -XX:+UseBMI1Instructions -XX:+UseBMI2Instructions -XX:+UseCLMUL -XX:+UseFastUnorderedTimeStamps -XX:+UseUnalignedLoadStores -XX:+UseXMMForArrayCopy -XX:+UseXMMForObjInit -XX:+UseXmmI2D -XX:+UseXmmI2F -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=compact -XX:ShenandoahAllocationThreshold=85 -XX:ShenandoahGuaranteedGCInterval=0 -XX:+ZeroTLAB -XX:+SegmentedCodeCache -XX:+AlwaysAtomicAccesses -XX:+UseStringDeduplication -XX:-DontCompileHugeMethods -XX:Tier0Delay=1 -XX:+UseFPUForSpilling -XX:+EnableVectorAggressiveReboxing -XX:+EnableVectorReboxing -XX:+EnableVectorSupport -XX:-AlignVector -XX:TieredOldPercentage=10000 -XX:Tier0ProfilingStartPercentage=2000 -XX:IncreaseFirstTierCompileThresholdAt=99 -XX:InterpreterProfilePercentage=99 -XX:+UseVectorCmov -XX:+UseVectorStubs -XX:ReferencesPerThread=0 -XX:MaxGCPauseMillis=10 -XX:-EnableThreadSMRStatistics -XX:+UseUnalignedAccesses -XX:PerMethodRecompilationCutoff=100000 -XX:ProfileMaturityPercentage=100 -XX:NmethodSweepActivity=1 -XX:ThreadPriorityPolicy=1 -XX:ReservedCodeCacheSize=256m -XX:+PrintCodeCache -XX:-UseDynamicNumberOfCompilerThreads -XX:CompilerDirectivesFile=./compiler_directives.txt -Djava.library.path=native\\windows -XX:-BytecodeVerificationLocal -XX:-BytecodeVerificationRemote -Djava.util.Arrays.useLegacyMergeSort=true --enable-preview --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.Buffer.UNSAFE=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.desktop/java.awt.Rectangle=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED -Xmx2048m -Xms2048m -Xss4m -Dcom.fs.starfarer.settings.paths.saves=..\\saves -Dcom.fs.starfarer.settings.paths.screenshots=..\\screenshots -Dcom.fs.starfarer.settings.paths.mods=..\\mods -Dcom.fs.starfarer.settings.paths.logs=. -classpath janino.jar;commons-compiler.jar;commons-compiler-jdk.jar;starfarer.api.jar;starfarer_obf.jar;jogg-0.0.7.jar;jorbis-0.0.15.jar;json.jar;lwjgl.jar;jinput.jar;log4j-1.2.9.jar;lwjgl_util.jar;fs.sound_obf.jar;fs.common_obf.jar;xstream-1.4.10.jar;txw2-3.0.2.jar;jaxb-api-2.4.0-b180830.0359.jar;webp-imageio-0.1.6.jar com.fs.starfarer.StarfarerLauncher" />
     <option name="WORKING_DIRECTORY" value="C:\Program Files (x86)\Fractal Softworks\Starsector\starsector-core" />
-    <method v="2" />
+    <method v="2">
+      <option name="MakeProject" enabled="true" />
+    </method>
   </configuration>
 </component>

assets/data/campaign/submarkets.csv

@@ -36,4 +36,6 @@ Weapons and other military hardware can be bought and sold here even if they're
 
 Will buy locally illegal goods as part of a no-questions-asked buyback program. Will also sell normally illegal items while stability is low.
 
-Selling enough of a commodity will temporarily resolve a shortage.",starpocalypse.submarket.RegulatedMilitaryMarket,,100
+Selling enough of a commodity will temporarily resolve a shortage.",starpocalypse.submarket.RegulatedMilitaryMarket,,100
+exerelin_prismMarket,High-End Seller,independent,"Pulls rare, advanced warships and weapons from across the Sector for those who are willing to pay a premium and don't ask too many questions. Preferred clients get better prices.",starpocalypse.submarket.RegulatedPrismMarket,graphics/SCY/factions/SCY_prismStorage.png,200
+regulated_exerelin_prismMarket,High-End Seller,independent,"Pulls rare, advanced warships and weapons from across the Sector for those who are willing to pay a premium and don't ask too many questions. Preferred clients get better prices.",starpocalypse.submarket.RegulatedPrismMarket,graphics/SCY/factions/SCY_prismStorage.png,200

assets/data/starpocalypse/shipDamageSubmarket.csv

@@ -2,10 +2,12 @@ submarket
 # vanilla
 all
 !storage
+!generic_military
 # mods
 !IndEvo_tempStorage
 !IndEvo_DeconstStorage
 !IndEvo_EngStorage
 !IndEvo_RepairStorage
 !IndEvo_ReqCenterMarket
-!IndEvo_SharedStore
+!IndEvo_SharedStore
+!exerelin_prismMarket

assets/starpocalypse.json

@@ -17,7 +17,7 @@
     # If it is not they will not sell to you. They will buy though.
     "militaryRegulations": true, # Vanilla: false
 
-    # Whether free ports regulate their open markets. false removes all regulations on free port open markets.
+    # Whether free ports regulate their open markets. false removes all the following military regulations on free port open markets.
     "freePortOpenMarketRegulations": true, # Vanilla: false
 
     # Whether the military market can be fully accessed without commission. Only active if regulation is true.
@@ -112,6 +112,7 @@
     "blackMarketShipDestroyer": 4,
     "blackMarketShipCruiser": 5,
     "blackMarketShipCapital": 6,
+    "freePortBlackMarketRequiresContact": true, # Vanilla: false If false black markets in free ports will ignore the above rules.
 
     ## BETTER MARKET DEFENCES
     # Add a station to non-hidden markets based on size where one does not already exist.

build.gradle

@@ -48,7 +48,7 @@ build {
 
 // compile time dependencies
 dependencies {
-    implementation files('N:/Starsector/starsector-core/starfarer.api.jar')
+    implementation "jaghaimo:starsector-api:0.98a-RC7@starfarer.api.jar"
     implementation "Histidine91:Nexerelin:ExerelinCore.jar"
 
     // game dependencies

gradle/wrapper/gradle-wrapper.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e996d452d2645e70c01c11143ca2d3742734a28da2bf61f25c82bdc288c9e637
-size 59203
+oid sha256:33ad4583fd7ee156f533778736fa1b4940bd83b433934d1cc4e9f608e99a6a89
+size 59536