refactor: Update

data/campaign/procgen/age_gen_data.csv

@@ -1,4 +1,4 @@
-id,minExtraOrbits,maxExtraOrbits,probNebula,nebulaDensity,freqNormal,freqBinary,freqTrinary
-YOUNG,10,10,1.0,0.8,100,30,10
-AVERAGE,8,8,1.0,0.55,100,20,5
+id,minExtraOrbits,maxExtraOrbits,probNebula,nebulaDensity,freqNormal,freqBinary,freqTrinary
+YOUNG,10,10,1.0,0.8,100,30,10
+AVERAGE,8,8,1.0,0.55,100,20,5
 OLD,6,6,1.0,0.3,100,10,0

data/campaign/procgen/location_gen_data.csv

@@ -1,8 +1,8 @@
-id,tags,freqYOUNG,freqAVERAGE,freqOLD
-SINGLE,,1000,1000,1000
-BINARY_CLOSE,,50,40,30
-BINARY_FAR,,100,70,50
-TRINARY_2CLOSE,,2,1,1
-TRINARY_1CLOSE_1FAR,,4,3,2
-TRINARY_2FAR,,5,3,2
+id,tags,freqYOUNG,freqAVERAGE,freqOLD
+SINGLE,,1000,1000,1000
+BINARY_CLOSE,,50,40,30
+BINARY_FAR,,100,70,50
+TRINARY_2CLOSE,,2,1,1
+TRINARY_1CLOSE_1FAR,,4,3,2
+TRINARY_2FAR,,5,3,2
 NEBULA,requires_nebula,50,20,5

data/campaign/procgen/star_gen_data.csv

@@ -1,16 +1,16 @@
-id,age,tags,freqYOUNG,freqAVERAGE,freqOLD,minRadius,maxRadius,habZoneStart,probOrbits,minOrbits,maxOrbits,coronaMin,coronaMult,coronaVar,solarWind,minFlare,maxFlare,crLossMult,lightColorMin,lightColorMax
-star_neutron,ANY,,0,0,0,150,250,-3,1,6,10,2000,100,10,50,0,0,15,175 185 195,225 235 245
-star_orange_giant,OLD,,1,4,6,1100,1300,4,1,6,10,500,1,0.5,7,0,1,2,255 190 140,255 240 200
-star_red_giant,OLD,,5,20,30,1100,1300,4,1,6,10,500,1,0.5,5,0,1,2,255 175 135,255 225 225
-star_red_supergiant,AVERAGE,,3,5,1,1500,1800,5,1,6,10,500,1,0.5,5,0,1,2,255 175 135,255 225 225
-star_red_dwarf,ANY,,75,65,55,500,600,2,1,6,10,300,1,0.25,5,0,1,2,255 175 135,255 225 225
-star_orange,ANY,,50,45,40,650,750,3,1,6,10,400,1,0.5,10,0,1,3,255 180 140,255 240 200
-star_yellow,ANY,,40,35,30,800,900,3,1,6,10,400,1,0.5,10,0,1,3,255 205 205,255 255 255
-star_blue_giant,YOUNG,,30,15,5,1100,1300,6,1,6,10,500,1,0.5,15,0,3,5,155 175 255,225 225 255
-star_browndwarf,ANY,,5,5,5,400,450,0,1,6,10,150,1,0.25,1,0,0,1,180 205 140,220 240 155
-star_white,OLD,,10,20,50,400,700,2,1,6,10,300,1,0.25,5,0,1,2,230 230 230,255 255 255
-star_blue_supergiant,YOUNG,,10,5,2,1200,1500,6,1,6,10,500,1,0.5,17,0,3,6,155 175 255,220 220 255
-black_hole,ANY,,5,10,20,150,200,-20,1,6,10,1000,1,0.5,-10,0,0,25,125 90 125,125 90 125
-nebula_center_old,ANY,NEBULA,0,0,3,0,0,-20,1,6,10,0,0,0,0,0,0,0,125 125 125,125 125 125
-nebula_center_average,ANY,NEBULA,0,5,0,0,0,-20,1,6,10,0,0,0,0,0,0,0,125 125 125,125 125 125
+id,age,tags,freqYOUNG,freqAVERAGE,freqOLD,minRadius,maxRadius,habZoneStart,probOrbits,minOrbits,maxOrbits,coronaMin,coronaMult,coronaVar,solarWind,minFlare,maxFlare,crLossMult,lightColorMin,lightColorMax
+star_neutron,ANY,,0,0,0,150,250,-3,1,6,10,2000,100,10,50,0,0,15,175 185 195,225 235 245
+star_orange_giant,OLD,,1,4,6,1100,1300,4,1,6,10,500,1,0.5,7,0,1,2,255 190 140,255 240 200
+star_red_giant,OLD,,5,20,30,1100,1300,4,1,6,10,500,1,0.5,5,0,1,2,255 175 135,255 225 225
+star_red_supergiant,AVERAGE,,3,5,1,1500,1800,5,1,6,10,500,1,0.5,5,0,1,2,255 175 135,255 225 225
+star_red_dwarf,ANY,,75,65,55,500,600,2,1,6,10,300,1,0.25,5,0,1,2,255 175 135,255 225 225
+star_orange,ANY,,50,45,40,650,750,3,1,6,10,400,1,0.5,10,0,1,3,255 180 140,255 240 200
+star_yellow,ANY,,40,35,30,800,900,3,1,6,10,400,1,0.5,10,0,1,3,255 205 205,255 255 255
+star_blue_giant,YOUNG,,30,15,5,1100,1300,6,1,6,10,500,1,0.5,15,0,3,5,155 175 255,225 225 255
+star_browndwarf,ANY,,5,5,5,400,450,0,1,6,10,150,1,0.25,1,0,0,1,180 205 140,220 240 155
+star_white,OLD,,10,20,50,400,700,2,1,6,10,300,1,0.25,5,0,1,2,230 230 230,255 255 255
+star_blue_supergiant,YOUNG,,10,5,2,1200,1500,6,1,6,10,500,1,0.5,17,0,3,6,155 175 255,220 220 255
+black_hole,ANY,,5,10,20,150,200,-20,1,6,10,1000,1,0.5,-10,0,0,25,125 90 125,125 90 125
+nebula_center_old,ANY,NEBULA,0,0,3,0,0,-20,1,6,10,0,0,0,0,0,0,0,125 125 125,125 125 125
+nebula_center_average,ANY,NEBULA,0,5,0,0,0,-20,1,6,10,0,0,0,0,0,0,0,125 125 125,125 125 125
 nebula_center_young,ANY,NEBULA,10,0,0,0,0,-20,1,6,10,0,0,0,0,0,0,0,125 125 125,125 125 125

data/config/settings.json

@@ -1,39 +1,56 @@
-{
-    "combatSpeedMult":"1.5f",
-
-    "speedPerBurnLevel": 100,
-    "maxStormStrikeBurn": 20,
-
-    "maxLogisticsHullmods": 100,
-    "maxPermanentHullmods": 99,
-
-    "baseMaxOutposts": 0,
-    "colonyOverMaxPenalty":0,
-
-    "maxIndustries":[1,2,3,4,5,6,7,8,9,9],
-    "maxColonySize": 9,
-    "accessibilityLossWhenAllHostile": 0,
-
-    "techMiningDecay":1.0,
-
-    "industryImproveBase":0,
-    "createStableLocation":0,
-
-    "maxShipsInFleet":100,
-    "maxShipsInAIFleet":100,
-
-    "minBattleSize":100,
-    "defaultBattleSize":300,
-    "maxBattleSize":1000,
-
-    "minPersonBounties":6,
-    "maxPersonBounties":10,
-
-    "raidCooldownDays":0,
-    "raidDefenderIncreasePerRaid":0,
-    "raidDefenderIncreaseMax":0,
-    "raidDefenderIncreaseFraction":0,
-    "raidDefenderIncreaseMin":0,
-
-    "contactMissionUpdateIntervalDays":1
-}
+{
+    "combatSpeedMult":"1.5f",
+
+    "speedPerBurnLevel": 100,
+    "maxStormStrikeBurn": 20,
+
+    "maxLogisticsHullmods": 100,
+    "maxPermanentHullmods": 99,
+
+    "baseMaxOutposts": 0,
+    "colonyOverMaxPenalty":0,
+
+    "upkeepReductionFromInFactionImports": 1.0,
+    "maxIndustries":[11,12,13,14,15,16,17,18,19,20],
+    # This is contolled by other mod (Astral Ascension)
+    "maxColonySize": 9,
+    "accessibilityLossWhenAllHostile": 0,
+
+    "techMiningDecay":1.0,
+
+    "salvageWeaponProb":1.0,
+    "salvageWingProb":1.0,
+
+    "historianSpecialItemBase":0,
+    "industryImproveBase":0,
+    "createStableLocation":0,
+
+    "showMaxShipsWidgetAtShips":0,
+    "maxShipsInFleet":100,
+    "maxShipsInAIFleet":100,
+    "maxOfficersInAIFleet":100,
+
+	"drop_prob_officer_alpha_core":1.0,
+	"drop_prob_officer_beta_core":1.0,
+	"drop_prob_officer_gamma_core":1.0,
+
+    "minBattleSize":200,
+    "defaultBattleSize":600,
+    "maxBattleSize":1000,
+
+    "minPersonBounties":6,
+    "maxPersonBounties":12,
+    "personBountyNoSpawnRangeAroundPlayerLY":1,
+
+    # Deciv
+    "decivSamplingMonths": 240,
+
+    # Raid
+    "raidCooldownDays":0,
+    "raidDefenderIncreasePerRaid":0,
+    "raidDefenderIncreaseMax":0,
+    "raidDefenderIncreaseFraction":0,
+    "raidDefenderIncreaseMin":0,
+
+    "contactMissionUpdateIntervalDays":1
+}

data/hulls/ship_data.csv

@@ -1,2 +1,2 @@
-name,id,designation,tech/manufacturer,system id,fleet pts,hitpoints,armor rating,max flux,8/6/5/4%,flux dissipation,ordnance points,fighter bays,max speed,acceleration,deceleration,max turn rate,turn acceleration,mass,shield type,defense id,shield arc,shield upkeep,shield efficiency,phase cost,phase upkeep,min crew,max crew,cargo,fuel,fuel/ly,range,max burn,base value,cr %/day,CR to deploy,peak CR sec,CR loss/sec,supplies/rec,supplies/mo,c/s,c/f,f/s,f/f,crew/s,crew/f,hints,tags,rarity,breakProb,minPieces,maxPieces,travel drive,number
-Ravelin,ravelin,Station Drone,Midline,,3,4000,500,2400,,500,100,,250,400,300,60,90,200,FRONT,,300,0,0.7,,,0,0,,,,,10,,20,10,,,3,3,,,,,,,,,,0.4,2,2,,7
+name,id,designation,tech/manufacturer,system id,fleet pts,hitpoints,armor rating,max flux,8/6/5/4%,flux dissipation,ordnance points,fighter bays,max speed,acceleration,deceleration,max turn rate,turn acceleration,mass,shield type,defense id,shield arc,shield upkeep,shield efficiency,phase cost,phase upkeep,min crew,max crew,cargo,fuel,fuel/ly,range,max burn,base value,cr %/day,CR to deploy,peak CR sec,CR loss/sec,supplies/rec,supplies/mo,c/s,c/f,f/s,f/f,crew/s,crew/f,hints,tags,rarity,breakProb,minPieces,maxPieces,travel drive,number
+Ravelin,ravelin,Station Drone,Midline,,3,4000,500,2400,,500,100,,250,400,300,60,90,200,FRONT,,300,0,0.7,,,1,1,,,,,10,,20,5,,,3,3,,,,,,,,,,0.4,2,2,,7

mod_info.json

@@ -1,9 +1,9 @@
-{
-    "id": "darkborderman.gameconfig",
-    "name": "Game config",
-    "author": "Darkborderman",
-    "utility": "false",
-    "version": "0.0.0",
-    "description": "Personal adjusted gameplay config for playing Starsector",
-    "gameVersion": "0.96a-RC10"
-}
+{
+    "id": "darkborderman.gameconfig",
+    "name": "Game config",
+    "author": "Darkborderman",
+    "utility": "false",
+    "version": "0.0.0",
+    "description": "Personal adjusted gameplay config for playing Starsector",
+    "gameVersion": "0.97a-RC11"
+}