Fix: Vanilla GLA Hijacker And Saboteur Can Ride Toxin Generals Combat…

… Bike (#168)
TheSuperHackers · Sep 3, 2021 · c42178e · c42178e
1 parent e6f45f7
commit c42178e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Patch104pZH/Design/Tasks/commy2_tasks.txt b/Patch104pZH/Design/Tasks/commy2_tasks.txt
@@ -160,7 +160,7 @@ https://github.com/commy2/zerohour/issues/58  [IMPROVEMENT]           Some Comba
 https://github.com/commy2/zerohour/issues/57  [IMPROVEMENT]           Broken Combat Bike Animations
 https://github.com/commy2/zerohour/issues/56  [DONE]                  Saboteur Body Disappears From Destroyed Combat Bike
 https://github.com/commy2/zerohour/issues/55  [DONE]                  Vanilla GLA Combat Bike Has Duplicated Death Scream
-https://github.com/commy2/zerohour/issues/54  [IMPROVEMENT]           Vanilla GLA Hijacker And Saboteur Can Ride Toxin Generals Combat Bike
+https://github.com/commy2/zerohour/issues/54  [DONE]                  Vanilla GLA Hijacker And Saboteur Can Ride Toxin Generals Combat Bike
 https://github.com/commy2/zerohour/issues/53  [MAYBE]                 Veteran Quad Cannons Deal Less Damage When Scrapped
 https://github.com/commy2/zerohour/issues/52  [NOTRELEVANT]           Boss Base Defense Inconsistencies
 https://github.com/commy2/zerohour/issues/51  [DONE]                  Demo General Worker On Bike Missing Demo Generals Bike Destruction Effect

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
@@ -16618,6 +16618,8 @@ Object Chem_GLAVehicleCombatBike
     ReallyDamagedFXList1 = Loc: X:0 Y:0 Z:0 FXList:FX_BattleMasterDamageTransition
   End
 
+  ; Patch104p @bugfix commy2 03/09/2021 Disallow vanilla GLA riders on sub-faction Combat Bike.
+
   Behavior = RiderChangeContain ModuleTag_16
     ;A list of each valid rider that is allowed to ride this object. Each rider is
     ;assigned a modelcondition state, a weaponset flag, an object status bit, and
@@ -16629,8 +16631,8 @@ Object Chem_GLAVehicleCombatBike
     Rider3 = Chem_GLAInfantryTunnelDefender RIDER3 WEAPON_RIDER3 STATUS_RIDER3 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
     Rider4 = Chem_GLAInfantryJarmenKell     RIDER4 WEAPON_RIDER4 STATUS_RIDER4 GLAVehicleCombatBikeJarmenKellCommandSet SET_NORMAL
     Rider5 = Chem_GLAInfantryTerrorist      RIDER5 WEAPON_RIDER5 STATUS_RIDER5 GLAVehicleCombatBikeDefaultCommandSet SET_SLUGGISH
-    Rider6 = GLAInfantryHijacker       RIDER6 WEAPON_RIDER6 STATUS_RIDER6 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
-    Rider7 = GLAInfantrySaboteur       RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
+   ;Rider6 = GLAInfantryHijacker       RIDER6 WEAPON_RIDER6 STATUS_RIDER6 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
+   ;Rider7 = GLAInfantrySaboteur       RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
     ScuttleDelay          = 1500
     ScuttleStatus         = TOPPLED
 

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLAUnits.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLAUnits.ini
@@ -4824,6 +4824,8 @@ Object GC_Slth_GLAVehicleCombatBike
     ReallyDamagedFXList1 = Loc: X:0 Y:0 Z:0 FXList:FX_BattleMasterDamageTransition
   End
 
+  ; Patch104p @bugfix commy2 03/09/2021 Disallow vanilla GLA riders on sub-faction Combat Bike.
+
   Behavior = RiderChangeContain ModuleTag_16
     ;A list of each valid rider that is allowed to ride this object. Each rider is
     ;assigned a modelcondition state, a weaponset flag, an object status bit, and
@@ -4836,7 +4838,7 @@ Object GC_Slth_GLAVehicleCombatBike
     Rider4 = GC_Slth_GLAInfantryJarmenKell     RIDER4 WEAPON_RIDER4 STATUS_RIDER4 GLAVehicleCombatBikeJarmenKellCommandSet SET_NORMAL
     Rider5 = GC_Slth_GLAInfantryTerrorist      RIDER5 WEAPON_RIDER5 STATUS_RIDER5 GLAVehicleCombatBikeDefaultCommandSet SET_SLUGGISH
     Rider6 = GC_Slth_GLAInfantryHijacker       RIDER6 WEAPON_RIDER6 STATUS_RIDER6 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
-    Rider7 = GLAInfantrySaboteur               RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
+   ;Rider7 = GLAInfantrySaboteur               RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
     ScuttleDelay          = 1500
     ScuttleStatus         = TOPPLED
 
@@ -5620,6 +5622,8 @@ Object GC_Slth_GLAVehicleCombatBikeRocket
     ReallyDamagedFXList1 = Loc: X:0 Y:0 Z:0 FXList:FX_BattleMasterDamageTransition
   End
 
+  ; Patch104p @bugfix commy2 03/09/2021 Disallow vanilla GLA riders on sub-faction Combat Bike.
+
   Behavior = RiderChangeContain ModuleTag_16
     ;A list of each valid rider that is allowed to ride this object. Each rider is
     ;assigned a modelcondition state, a weaponset flag, an object status bit, and
@@ -5632,7 +5636,7 @@ Object GC_Slth_GLAVehicleCombatBikeRocket
     Rider4 = GC_Slth_GLAInfantryJarmenKell     RIDER4 WEAPON_RIDER4 STATUS_RIDER4 GLAVehicleCombatBikeJarmenKellCommandSet SET_NORMAL
     Rider5 = GC_Slth_GLAInfantryTerrorist      RIDER5 WEAPON_RIDER5 STATUS_RIDER5 GLAVehicleCombatBikeDefaultCommandSet SET_SLUGGISH
     Rider6 = GC_Slth_GLAInfantryHijacker       RIDER6 WEAPON_RIDER6 STATUS_RIDER6 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
-    Rider7 = GLAInfantrySaboteur               RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
+   ;Rider7 = GLAInfantrySaboteur               RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
     ScuttleDelay          = 1500
     ScuttleStatus         = TOPPLED
 
@@ -6416,6 +6420,8 @@ Object GC_Slth_GLAVehicleCombatBikeTerrorist
     ReallyDamagedFXList1 = Loc: X:0 Y:0 Z:0 FXList:FX_BattleMasterDamageTransition
   End
 
+  ; Patch104p @bugfix commy2 03/09/2021 Disallow vanilla GLA riders on sub-faction Combat Bike.
+
   Behavior = RiderChangeContain ModuleTag_16
     ;A list of each valid rider that is allowed to ride this object. Each rider is
     ;assigned a modelcondition state, a weaponset flag, an object status bit, and
@@ -6428,7 +6434,7 @@ Object GC_Slth_GLAVehicleCombatBikeTerrorist
     Rider4 = GC_Slth_GLAInfantryJarmenKell     RIDER4 WEAPON_RIDER4 STATUS_RIDER4 GLAVehicleCombatBikeJarmenKellCommandSet SET_NORMAL
     Rider5 = GC_Slth_GLAInfantryTerrorist      RIDER5 WEAPON_RIDER5 STATUS_RIDER5 GLAVehicleCombatBikeDefaultCommandSet SET_SLUGGISH
     Rider6 = GC_Slth_GLAInfantryHijacker       RIDER6 WEAPON_RIDER6 STATUS_RIDER6 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
-    Rider7 = GLAInfantrySaboteur               RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
+   ;Rider7 = GLAInfantrySaboteur               RIDER7 WEAPON_RIDER7 STATUS_RIDER7 GLAVehicleCombatBikeDefaultCommandSet SET_NORMAL
     ScuttleDelay          = 1500
     ScuttleStatus         = TOPPLED