From 90b3305b28b94fa230dbb8732e9758b1c72eecd4 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 6 Aug 2022 00:03:18 +0200 Subject: [PATCH 1/4] Make Dummy Upgrade Global --- Patch104pZH/GameFilesEdited/Data/INI/Upgrade.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Upgrade.ini b/Patch104pZH/GameFilesEdited/Data/INI/Upgrade.ini index c07ae335c..89630d7ea 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Upgrade.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Upgrade.ini @@ -811,9 +811,9 @@ End ; Added a new dummy object-class upgrade for use in places where a local upgrade is required. ; 23/08/2021 +; @bugfix commy2 06/08/2022 Upgrade is now global. ;---------------------------- Upgrade Upgrade_DummyUpgrade - Type = OBJECT BuildTime = 0.0 BuildCost = 0 End From 5b9381a9c56c48fbb236362a892dd2e825880788 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 6 Aug 2022 00:12:17 +0200 Subject: [PATCH 2/4] Clean Up Dummy Upgrade Code --- .../GameFilesEdited/Data/INI/Object/AirforceGeneral.ini | 2 -- .../GameFilesEdited/Data/INI/Object/FactionBuilding.ini | 6 ++---- .../GameFilesEdited/Data/INI/Object/InfantryGeneral.ini | 1 - .../GameFilesEdited/Data/INI/Object/LaserGeneral.ini | 2 -- Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini | 1 - .../GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini | 2 -- Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini | 1 - 7 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini index 113998d36..f2de4a89c 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini @@ -9833,7 +9833,6 @@ Object AirF_AmericaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 @@ -14663,7 +14662,6 @@ Object AirF_AmericaSupplyDropZone Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini index 93ce92f9d..89d2ce74b 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionBuilding.ini @@ -5115,7 +5115,6 @@ Object AmericaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 @@ -19017,7 +19016,6 @@ Object ChinaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 @@ -20415,12 +20413,12 @@ Object AmericaSupplyDropZone ; 22/08/2021 Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 - UpgradeToGrant = Upgrade_ChinaOverlordGattlingCannon + UpgradeToGrant = Upgrade_DummyUpgrade ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 - TriggeredBy = Upgrade_ChinaOverlordGattlingCannon + TriggeredBy = Upgrade_DummyUpgrade End Geometry = BOX diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini index 24d81bfce..7ba443da8 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini @@ -8461,7 +8461,6 @@ Object Infa_ChinaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini index edbc0b5f4..7ddea8065 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini @@ -9533,7 +9533,6 @@ Object Lazr_AmericaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 @@ -14348,7 +14347,6 @@ Object Lazr_AmericaSupplyDropZone Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini index 3462bb3b6..ac299a664 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini @@ -10231,7 +10231,6 @@ Object Nuke_ChinaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini index 3022772fb..b6e4c2ed3 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini @@ -13776,7 +13776,6 @@ Object SupW_AmericaSupplyDropZone Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 @@ -17505,7 +17504,6 @@ Object SupW_AmericaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini index a1259d100..bd31fe6b5 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini @@ -8136,7 +8136,6 @@ Object Tank_ChinaPowerPlant Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 UpgradeToGrant = Upgrade_DummyUpgrade - ExemptStatus = UNDER_CONSTRUCTION End Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 From 6d452144f277ff00c8e7415370fd0ed3fe69db10 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 6 Aug 2022 00:20:18 +0200 Subject: [PATCH 3/4] Add Microwave Fix To Boss Fusion Reactor --- .../Data/INI/Object/BossGeneral.ini | 43 ++++++++++++++++--- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini index 7b9ac38ba..cc52fd45e 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini @@ -2393,11 +2393,24 @@ Object Boss_PowerPlant EnergyBonus = 5 VisionRange = 200.0 ; Shroud clearing distance ShroudClearingRange = 200 + + ; @bugfix - hanfield commy2 + ; Added new default armorset that cannot be targeted or suffer SUBDUAL damage. + ; This resolves the Microwave Tank exploit but does not prevent being properly disabled later. + ; 06/08/2022 + ArmorSet - Conditions = None - Armor = StructureArmor - DamageFX = StructureDamageFXNoShake + Conditions = None ; Default state while being constructed. + Armor = StructureArmor_NoSubdualDamage ; Cannot be targeted by Microwave Tanks. + DamageFX = StructureDamageFXNoShake + End + + ArmorSet + Conditions = PLAYER_UPGRADE ; Upgrade is granted immediately once construction is complete. + Armor = StructureArmor ; Can be disabled by Microwave Tanks normally. + DamageFX = StructureDamageFXNoShake End + CommandSet = Boss_AmericaPowerPlantCommandSet ExperienceValue = 100 100 100 100 ; Experience point value at each level @@ -2486,10 +2499,30 @@ Object Boss_PowerPlant UpgradedMineName = ChinaEMPMine End - Behavior = ArmorUpgrade ModuleTag_26 - TriggeredBy = Upgrade_ChinaEMPMines + ; @bugfix - hanfield commy2 + ; Added two extra modules for Microwave Tank bug fix. + ; + ; MicrowaveTankFix01 grants a dummy object-class upgrade once the building is complete. + ; MicrowaveTankFix02 upgrades the armor with said upgrade and allows subdual once again. + ; + ; 06/08/2022 + + Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01 + UpgradeToGrant = Upgrade_DummyUpgrade End + Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02 + TriggeredBy = Upgrade_DummyUpgrade + End + + ; @bugfix - hanfield commy2 + ; Replaced the ArmorUpgrade that was used to trigger EMP mine availability with WeaponSetUpgrade. + ; This allows the player to research EMP mines while permitting the armorset-related bugfix. + ; 06/08/2022 + + Behavior = WeaponSetUpgrade ModuleTag_NeutronMineDummy + TriggeredBy = Upgrade_ChinaEMPMines + End Geometry = BOX GeometryMajorRadius = 22.0 From 81e63c0091b5bda78cbdbc9acbc951dc5a0fd542 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 6 Aug 2022 07:29:44 +0200 Subject: [PATCH 4/4] add patch name to change comment 2 --- Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini index cc52fd45e..6dc637aa3 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini @@ -2394,7 +2394,7 @@ Object Boss_PowerPlant VisionRange = 200.0 ; Shroud clearing distance ShroudClearingRange = 200 - ; @bugfix - hanfield commy2 + ; Patch104p @bugfix - hanfield commy2 ; Added new default armorset that cannot be targeted or suffer SUBDUAL damage. ; This resolves the Microwave Tank exploit but does not prevent being properly disabled later. ; 06/08/2022 @@ -2499,7 +2499,7 @@ Object Boss_PowerPlant UpgradedMineName = ChinaEMPMine End - ; @bugfix - hanfield commy2 + ; Patch104p @bugfix - hanfield commy2 ; Added two extra modules for Microwave Tank bug fix. ; ; MicrowaveTankFix01 grants a dummy object-class upgrade once the building is complete. @@ -2515,7 +2515,7 @@ Object Boss_PowerPlant TriggeredBy = Upgrade_DummyUpgrade End - ; @bugfix - hanfield commy2 + ; Patch104p @bugfix - hanfield commy2 ; Replaced the ArmorUpgrade that was used to trigger EMP mine availability with WeaponSetUpgrade. ; This allows the player to research EMP mines while permitting the armorset-related bugfix. ; 06/08/2022