Fix: Paradrop Ability Spawns Wrong Ranger Type (#286)

TheSuperHackers · Sep 11, 2021 · 577229a · 577229a
1 parent 7c9418f
commit 577229a
Show file tree

Hide file tree

Showing 5 changed files with 354 additions and 10 deletions.
diff --git a/Patch104pZH/Design/Tasks/commy2_tasks.txt b/Patch104pZH/Design/Tasks/commy2_tasks.txt
@@ -96,7 +96,7 @@ https://github.com/commy2/zerohour/issues/126 [MAYBE]                 Microwave
 https://github.com/commy2/zerohour/issues/125 [IMPROVEMENT][NPROJECT] USA War Factory Displays Generic Tank On Button
 https://github.com/commy2/zerohour/issues/124 [IMPROVEMENT][NPROJECT] Super Weapon Particle Cannon Uses Normal Particle Cannon Portrait
 https://github.com/commy2/zerohour/issues/123 [IMPROVEMENT][NPROJECT] Super Weapon General Particle Cannon Uses Some Blue Effects
-https://github.com/commy2/zerohour/issues/122 [IMPROVEMENT][NPROJECT] Paradrop Spawns Wrong Ranger Type
+https://github.com/commy2/zerohour/issues/122 [DONE][NPROJECT]        Paradrop Spawns Wrong Ranger Type
 https://github.com/commy2/zerohour/issues/121 [IMPROVEMENT]           Countermeasures Tooltip Claims 50% Evasion Rate Instead Of True 30%
 https://github.com/commy2/zerohour/issues/120 [MAYBE][NPROJECT]       Vehicles Can Shoot Out Of Combat Chinook
 https://github.com/commy2/zerohour/issues/119 [IMPROVEMENT]           Car Bomb May Bug Out And Be Unable To Attack

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini
@@ -8603,11 +8603,14 @@ Object AirF_AmericaCommandCenter
     OCL                  = SUPERWEAPON_SpyDrone
     CreateLocation       = CREATE_ABOVE_LOCATION
   End
+
+  ; Patch104p @bugfix commy2 11/09/2021 Fix Paradrop spawning vanilla USA Rangers.
+
   Behavior           = OCLSpecialPower ModuleTag_22
     SpecialPowerTemplate = SuperweaponParadropAmerica
-    UpgradeOCL           = SCIENCE_Paradrop3 SUPERWEAPON_Paradrop3
-    UpgradeOCL           = SCIENCE_Paradrop2 SUPERWEAPON_Paradrop2
-    OCL                  = SUPERWEAPON_Paradrop1
+    UpgradeOCL           = SCIENCE_Paradrop3 AirF_SUPERWEAPON_Paradrop3
+    UpgradeOCL           = SCIENCE_Paradrop2 AirF_SUPERWEAPON_Paradrop2
+    OCL                  = AirF_SUPERWEAPON_Paradrop1
     CreateLocation       = CREATE_AT_EDGE_NEAR_SOURCE
     OCLAdjustPositionToPassable = Yes ;Like RA2, shift target to passable cell so we don't land in water and on cliffs.
   End

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini
@@ -8333,11 +8333,14 @@ Object Lazr_AmericaCommandCenter
     OCL                  = SUPERWEAPON_SpyDrone
     CreateLocation       = CREATE_ABOVE_LOCATION
   End
+
+  ; Patch104p @bugfix commy2 11/09/2021 Fix Paradrop spawning vanilla USA Rangers.
+
   Behavior           = OCLSpecialPower ModuleTag_22
     SpecialPowerTemplate = SuperweaponParadropAmerica
-    UpgradeOCL           = SCIENCE_Paradrop3 SUPERWEAPON_Paradrop3
-    UpgradeOCL           = SCIENCE_Paradrop2 SUPERWEAPON_Paradrop2
-    OCL                  = SUPERWEAPON_Paradrop1
+    UpgradeOCL           = SCIENCE_Paradrop3 Lazr_SUPERWEAPON_Paradrop3
+    UpgradeOCL           = SCIENCE_Paradrop2 Lazr_SUPERWEAPON_Paradrop2
+    OCL                  = Lazr_SUPERWEAPON_Paradrop1
     CreateLocation       = CREATE_AT_EDGE_NEAR_SOURCE
     OCLAdjustPositionToPassable = Yes ;Like RA2, shift target to passable cell so we don't land in water and on cliffs.
   End

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini
@@ -8801,11 +8801,14 @@ Object SupW_AmericaCommandCenter
     OCL                  = SUPERWEAPON_SpyDrone
     CreateLocation       = CREATE_ABOVE_LOCATION
   End
+
+  ; Patch104p @bugfix commy2 11/09/2021 Fix Paradrop spawning vanilla USA Rangers.
+
   Behavior           = OCLSpecialPower ModuleTag_22
     SpecialPowerTemplate = SuperweaponParadropAmerica
-    UpgradeOCL           = SCIENCE_Paradrop3 SUPERWEAPON_Paradrop3
-    UpgradeOCL           = SCIENCE_Paradrop2 SUPERWEAPON_Paradrop2
-    OCL                  = SUPERWEAPON_Paradrop1
+    UpgradeOCL           = SCIENCE_Paradrop3 SupW_SUPERWEAPON_Paradrop3
+    UpgradeOCL           = SCIENCE_Paradrop2 SupW_SUPERWEAPON_Paradrop2
+    OCL                  = SupW_SUPERWEAPON_Paradrop1
     CreateLocation       = CREATE_AT_EDGE_NEAR_SOURCE
     OCLAdjustPositionToPassable = Yes ;Like RA2, shift target to passable cell so we don't land in water and on cliffs.
   End