2.3.0 - The Fix Update

data/campaign/sim_opponents.csv

@@ -3,4 +3,5 @@ halfbeack_original
 halfbeack_cannon
 halfbeack_dainsleif
 isaribi_standard
-isaribi_strike
+isaribi_strike
+biscoe

data/campaign/sim_opponents_dev.csv

@@ -3,4 +3,5 @@ halfbeack_original
 halfbeack_cannon
 halfbeack_dainsleif
 isaribi_standard
-isaribi_strike
+isaribi_strike
+biscoe

data/campaign/special_items.csv

@@ -0,0 +1,10 @@
+name,id,tags,tech/manufacturer,rarity,base price,stack size,cargo space,baseRaidDanger,icon,sound id,sound id drop,plugin,plugin params,desc,order
+Gjallarhorn Blueprint Package,gja_package,"package_bp, no_drop",,,50000,1000,1,,graphics/icons/cargo/blueprint_hightech.png,ui_chip_pickup,ui_bp_package_drop,com.fs.starfarer.api.campaign.impl.items.MultiBlueprintItemPlugin,gja_bp,"A set of blueprints that enable heavy industry to produce the omnipresent hulls and mobile suits employed by Gjallarhorn.",200
+Teiwaz Blueprint Package,teiwaz_package,"package_bp, no_drop",,,2000,1000,1,,graphics/icons/cargo/blueprint_midline.png,ui_chip_pickup,ui_bp_package_drop,com.fs.starfarer.api.campaign.impl.items.MultiBlueprintItemPlugin,teiwaz_bp,"A set of blueprints that enable heavy industry to produce any hulls and mobile suits produced by Teiwaz.",201
+Tekkadan Blueprint Package,tek_package,"package_bp",,,6000,1000,1,,graphics/icons/cargo/blueprint_lowtech.png,ui_chip_pickup,ui_bp_package_drop,com.fs.starfarer.api.campaign.impl.items.MultiBlueprintItemPlugin,tek_bp,"A collection of hacks and after-market modification specs that enables heavy industry to construct the hulls and mobile suits more commonly used by members Tekkadan.",201
+,,,,,,,,,,,,,,,
+Graze Blueprint Package,graze_package,"package_bp, no_drop",,,6000,1000,1,,graphics/icons/cargo/blueprint_graze.png,ui_chip_pickup,ui_bp_package_drop,com.fs.starfarer.api.campaign.impl.items.MultiBlueprintItemPlugin,graze_bp,Enables heavy industry to construct any Graze units.,250
+Shiden Blueprint Package,shiden_package,"package_bp, no_drop",,,6000,1000,1,,graphics/icons/cargo/blueprint_graze.png,ui_chip_pickup,ui_bp_package_drop,com.fs.starfarer.api.campaign.impl.items.MultiBlueprintItemPlugin,shiden_bp,Enables heavy industry to construct any Shiden units.,251
+Rodi Blueprint Package,rodi_package,"package_bp",,,2000,1000,1,,graphics/icons/cargo/blueprint_graze.png,ui_chip_pickup,ui_bp_package_drop,com.fs.starfarer.api.campaign.impl.items.MultiBlueprintItemPlugin,rodi_bp,Enables heavy industry to construct any Rodi units.,252
+Gundam Blueprint Package,gundam_package,"package_bp, no_drop",,,0,1000,1,,graphics/icons/cargo/blueprint_graze.png,ui_chip_pickup,ui_bp_package_drop,com.fs.starfarer.api.campaign.impl.items.MultiBlueprintItemPlugin,gundam_bp,Enables heavy industry to construct any Gundam units.,250
+,,,,,,,,,,,,,,,

data/config/exerelin/corvus_spawnpoints.csv

@@ -1,3 +1,4 @@
 faction,system,entityID
 #machine name,#human name,#machine name
-,,
+,,
+gjallarhorn,Dôn,arianrhod

data/config/exerelinFactionConfig/gjallarhorn.json

@@ -1,6 +1,6 @@
 {
     # General tags
-    "corvusCompatible": false,
+    "corvusCompatible": true,
     "playableFaction": true,
     "rebelFleetSuffix": "Exile",
 
@@ -90,17 +90,7 @@
     "startSpecialItems": [
         [
             [
-                "low_tech_package",
-                ""
-            ],
-            [
-                "midline_package",
-                ""
-            ]
-        ],
-        [
-            [
-                "pirate_package",
+                "gja_package",
                 ""
             ]
         ],
@@ -109,71 +99,23 @@
     # Start Ships
     "startShipsSolo": [
         [
-            "lasher_Starting"
-        ]
-    ],
-    "startShipsCombatSmall": [
-        [
-            "enforcer_Balanced",
-            "swp_brawler_hegemony_ass",
-            "lasher_CS"
-        ],
-        [
-            "enforcer_Balanced",
-            "lasher_CS",
-            "wolf_hegemony_CS"
-        ]
-    ],
-    "startShipsTradeSmall": [
-        [
-            "mule_Starting",
-            "hound_hegemony_Standard",
-            "kite_hegemony_Interceptor"
+            "biscoe_space"
         ]
     ],
     "startShipsCombatLarge": [
         [
-            "swp_punisher_cs",
-            "swp_vanguard_sta",
-            "wolf_hegemony_CS"
-        ],
-        [
-            "dominator_Assault",
-            "enforcer_Escort",
-            "kite_hegemony_Interceptor"
-        ]
-    ],
-    "startShipsTradeLarge": [
-        [
-            "colossus_Standard",
-            "mule_Standard",
-            "kite_Starting"
-        ]
-    ],
-    "startShipsExplorerLarge": [
-        [
-            "venture_Balanced",
-            "buffalo_hegemony_Standard",
-            "shepherd_Frontier"
-        ]
-    ],
-    "startShipsCarrierSmall": [
-        [
-            "condor_Attack",
-            "lasher_Standard",
-            "hound_hegemony_Standard"
+            "halfbeack_distance",
+            "halfbeack_distance",
         ]
     ],
     "startShipsCarrierLarge": [
         [
-            "mora_Assault",
-            "enforcer_Escort",
-            "lasher_Strike"
-        ]
-    ],
-    "startShipsGrandFleet": [
+            "halfbeack_dainsleif",
+            "heron_Strike",
+        ],
         [
-            "onslaught_xiv_Elite"
+            "halfbeack_dainsleif",
+            "mora_Support",
         ]
     ],
 }

data/config/settings.json

@@ -0,0 +1,33 @@
+{
+	"designTypeColors": {
+		"Gjallarhorn": [
+			255,
+			255,
+			255,
+			255
+		],
+		"Teiwaz": [
+			83,
+			104,
+			114,
+			255
+		],
+		"Tekkadan": [
+			183,
+			83,
+			95,
+			255
+		],
+	},
+	"graphics": {
+		"blueprint_packages": {
+			"gja_package": "graphics/icons/cargo/gja_package.png",
+			"teiwaz_package": "graphics/icons/cargo/teiwaz_package.png",
+			"tek_package": "graphics/icons/cargo/tek_package.png",
+			"graze_package": "graphics/icons/cargo/graze_package.png",
+			"shiden_package": "graphics/icons/cargo/shiden_package.png",
+			"rodi_package": "graphics/icons/cargo/rodi_package.png",
+			"gundam_package": "graphics/icons/cargo/gundam_package.png",
+		},
+	}
+}

data/config/sounds.json

@@ -1,11 +1,36 @@
 {
 	"music": {
+		"music_title": [
+			{
+				"source": "sounds/music/",
+				"volume": 0.15,
+				"file": "006-An_Orphan_s_Sorrow.ogg",
+			},
+			{
+				"source": "sounds/music/",
+				"volume": 0.15,
+				"file": "018-Soul_of_Iron_Blooded_Orphans.ogg",
+			}
+		],
+		"music_combat": [
+			{
+				"source": "sounds/music/",
+				"volume": 0.2,
+				"file": "009-LONGER-Strengths_Focus.ogg"
+			},
+			{
+				"source": "sounds/music/",
+				"volume": 0.18,
+				"file": "SDGGGCR-LONGER-Strengths_Focus.ogg"
+			},
+		],
+		####################################
 		"ibo_teiwaz_theme": [
 			{
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"024-Teiwaz-Gundam_IBO.ogg"
+					"024-Teiwaz.ogg"
 				]
 			}
 		],
@@ -14,7 +39,7 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"035-Human_or_Not-Gundam_IBO.ogg"
+					"035-Human_or_Not.ogg"
 				]
 			}
 		],
@@ -23,7 +48,7 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"007-Habitat-Gundam_IBO.ogg"
+					"007-Habitat.ogg"
 				]
 			}
 		],
@@ -32,7 +57,7 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"022-Military_Scheme-Gundam_IBO.ogg"
+					"022-Military_Scheme.ogg"
 				]
 			}
 		],
@@ -41,7 +66,7 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"065-Tenderfeet-Gundam_IBO.ogg"
+					"065-Tenderfeet.ogg"
 				]
 			}
 		],
@@ -50,14 +75,14 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"069-Suite_of_the_seven_stars-Gundam_IBO.ogg"
+					"069-Suite_of_the_seven_stars.ogg"
 				]
 			},
 			{
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"073-The_lord-Gundam_IBO.ogg"
+					"073-The_lord.ogg"
 				]
 			}
 		],
@@ -66,14 +91,14 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"097-Confliction-Gundam_IBO.ogg"
+					"097-Confliction.ogg"
 				]
 			},
 			{
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"098-Betrayal-Gundam_IBO.ogg"
+					"098-Betrayal.ogg"
 				]
 			}
 		],
@@ -82,21 +107,21 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"107-All_out-Gundam_IBO.ogg"
+					"107-All_out.ogg"
 				]
 			},
 			{
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"101-The_dignity_of_Lords-Gundam_IBO.ogg"
+					"101-The_dignity_of_Lords.ogg"
 				]
 			},
 			{
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"070-Battle_of_the_seven_stars-Gundam_IBO.ogg"
+					"070-Battle_of_the_seven_stars.ogg"
 				]
 			}
 		],
@@ -105,7 +130,7 @@
 				"source": "sounds/music/",
 				"volume": 0.2,
 				"files": [
-					"104-The_path_to_the_end-Gundam_IBO.ogg"
+					"104-The_path_to_the_end.ogg"
 				]
 			}
 		],

data/config/title_screen_variants.csv

@@ -1,7 +1,7 @@
 variant id
-halfbeack_original
 halfbeack_distance
 halfbeack_cannon
 isaribi_strike
 isaribi_strike_p
 isaribi_strike_h
+biscoe

data/hullmods/NanolaminateArmor.java

@@ -6,19 +6,31 @@
 
 public class NanolaminateArmor extends BaseHullMod {
 
-  public static final float BEAM_REDUCTION = 70f;
+  public static final float BEAM_RED = -50f;
+  public static final float ENERGY_RED = -70f;
+  // public static final float EMP_INC = 15f;
+  public static final float FLUX_INC = 12f;
 
   public void applyEffectsBeforeShipCreation(
     HullSize hullSize,
     MutableShipStatsAPI stats,
     String id
   ) {
-    stats.getEnergyDamageTakenMult().modifyPercent(id, 100 - BEAM_REDUCTION);
-    stats.getBeamDamageTakenMult().modifyPercent(id, 100 - BEAM_REDUCTION);
+    stats.getEnergyDamageTakenMult().modifyPercent(id, 100 + BEAM_RED);
+    stats.getBeamDamageTakenMult().modifyPercent(id, 100 + BEAM_RED);
+    // stats.getEmpDamageTakenMult().modifyPercent(id, 100 + EMP_INC);
+    // FLUX INCREASE
+    stats.getBeamWeaponFluxCostMult().modifyPercent(id, 100 + FLUX_INC);
+    stats.getEnergyWeaponFluxCostMod().modifyPercent(id, 100 + FLUX_INC);
+    stats.getMissileWeaponFluxCostMod().modifyPercent(id, 100 + FLUX_INC);
+    stats.getBallisticWeaponFluxCostMod().modifyPercent(id, 100 + FLUX_INC);
   }
 
   public String getDescriptionParam(int index, HullSize hullSize) {
-    if (index == 0) return "" + (int) BEAM_REDUCTION + "%";
+    if (index == 0) return "" + (int) -BEAM_RED + "%";
+    if (index == 1) return "" + (int) -ENERGY_RED + "%";
+    // if (index == 2) return "" + (int) EMP_INCREASE + "%";
+    if (index == 2) return "" + (int) FLUX_INC + "%";
     return null;
   }
 }

data/hullmods/hull_mods.csv

@@ -1,5 +1,5 @@
 name,id,tier,rarity,tech/manufacturer,tags,uiTags,base value,unlocked,hidden,hiddenEverywhere,cost_frigate,cost_dest,cost_cruiser,cost_capital,script,desc,short,sprite
-Nanolaminate Armor,nano_armor,1,,,"defensive, ibo",Defenses,2800,,,,4,8,12,16,data.hullmods.NanolaminateArmor,A special metal paint that reacts to Ahab Particles is vapor-deposited onto the surface of the armor of Mobile Suits and ships. Reduce Energy and Beam dammage by %s.,Reduce Energy and Beam dammage by %s.,graphics/hullmods/nano_armor.png
-Alaya-Vijnana System,av_system,0,,,special,,100,,TRUE,,0,0,0,0,data.hullmods.AlayaVijnanaSystem,"The Alaya-Vijnana System creates a pseudo-brain lobe in the pilot's body using nano-machines, and this allows the pilot's brain to directly process mobile suit data fed through the physical connection. As the pseudo-brain lobe also governs spatial awareness so the pilot's spatial awareness is enhanced. Increasing maneuverability by %s.",Increases fighter manevuerability by %s.,graphics/hullmods/av_system.png
-Catapult MS,catapult_ms,1,,,,,4000,,,,4,8,12,16,data.hullmods.CatapultMS,The Catapult MS is a tool to send fighters longer into battle. It mutliplies by %s the fighter longevity.,"It mutliplies by %s the fighter longevity",graphics/hullmods/catapult_ms.png
-Ahab Reactor,ah_reactor,2,,,"special, ibo",,8000,,,,8,12,16,20,data.hullmods.AhabReactor,"High output reactors invented by a scientist named Ahab Balaena and named after him, they are commonly used as power-plants in mobile suits and ships. Increases flux capacity by %s/%s/%s/%s and flux dissipation by %s/%s/%s/%s but increases sensor profile %s.","Increases flux capacity by %s/%s/%s/%s and flux dissipation by %s/%s/%s/%s but increases sensor profile %s.",graphics/hullmods/ah_reactor.png
+Nanolaminate Armor,nano_armor,1,,High Tech,defensive,Defenses,2800,,,,8,16,20,40,data.hullmods.NanolaminateArmor,A special metal paint that reacts to Ahab Particles is vapor-deposited onto the surface of the armor of Mobile Suits and ships. Reduce Beam dammage by %s and Energy dammage by %s. Increases Flux cost by %s.,Reduce Beam dammage by %s and Energy dammage by %s. Increases Flux cost by %s.,graphics/hullmods/nano_armor.png
+Alaya-Vijnana System,av_system,0,,Gjallarhorn,special,,100,,TRUE,,0,0,0,0,data.hullmods.AlayaVijnanaSystem,"The Alaya-Vijnana System creates a pseudo-brain lobe in the pilot's body using nano-machines, and this allows the pilot's brain to directly process mobile suit data fed through the physical connection. As the pseudo-brain lobe also governs spatial awareness so the pilot's spatial awareness is enhanced. Increasing maneuverability by %s.",Increases fighter manevuerability by %s.,graphics/hullmods/av_system.png
+Catapult MS,catapult_ms,1,,High Tech,special,,4000,,,,4,8,12,16,data.hullmods.CatapultMS,The Catapult MS is a tool to send fighters longer into battle. It mutliplies by %s the fighter longevity.,It mutliplies by %s the fighter longevity,graphics/hullmods/catapult_ms.png
+Ahab Reactor,ah_reactor,2,,High Tech,special,,8000,,,,8,12,16,20,data.hullmods.AhabReactor,"High output reactors invented by a scientist named Ahab Balaena and named after him, they are commonly used as power-plants in mobile suits and ships. Increases flux capacity by %s/%s/%s/%s and flux dissipation by %s/%s/%s/%s but increases sensor profile %s.",Increases flux capacity by %s/%s/%s/%s and flux dissipation by %s/%s/%s/%s but increases sensor profile %s.,graphics/hullmods/ah_reactor.png