Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Some Rebels Are Missing Upgrade Icons #225

Merged
merged 1 commit into from
Sep 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Patch104pZH/Design/Tasks/commy2_tasks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ https://github.com/commy2/zerohour/issues/121 [IMPROVEMENT] Countermea
https://github.com/commy2/zerohour/issues/120 [MAYBE] 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
https://github.com/commy2/zerohour/issues/118 [MAYBE] Some ECM Tanks Automatically Engage Enemy Vehicles
https://github.com/commy2/zerohour/issues/117 [IMPROVEMENT] Some Rebels Are Missing Upgrade Icons
https://github.com/commy2/zerohour/issues/117 [DONE] Some Rebels Are Missing Upgrade Icons
https://github.com/commy2/zerohour/issues/116 [MAYBE] Tactical Nuke Mig Upgrade Not Buildable While Low On Power
https://github.com/commy2/zerohour/issues/115 [IMPROVEMENT] Early And Nuke Carpet Bomber Unavailable While Controlling Mixed Sub Faction Command Centers
https://github.com/commy2/zerohour/issues/114 [DONE] Hitting Battle Bus In Hull Mode Causes Screen Shake
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20971,10 +20971,13 @@ Object Chem_GLAInfantryRebel
SelectPortrait = SUToxinRebel_L
ButtonImage = SUToxinRebel

UpgradeCameo1 = Chem_Upgrade_GLAAnthraxGamma
UpgradeCameo2 = Upgrade_InfantryCaptureBuilding
UpgradeCameo3 = Upgrade_GLACamouflage
; Patch104p @bugfix commy2 05/09/2021 Sorted Rebel upgrade icons across sub-factions.

UpgradeCameo1 = Chem_Upgrade_GLAAnthraxGamma
UpgradeCameo2 = Upgrade_GLACamouflage
UpgradeCameo3 = Upgrade_InfantryCaptureBuilding
;UpgradeCameo4 = Upgrade_GLAInfantryRebelBoobyTrapAttack
;UpgradeCameo5 = NONE

Draw = W3DModelDraw ModuleTag_01

Expand Down
10 changes: 6 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11879,11 +11879,13 @@ Object Demo_GLAInfantryRebel
SelectPortrait = SURebel_L
ButtonImage = SURebel

; Patch104p @bugfix commy2 05/09/2021 Added missing upgrade icons for Camouflage and Booby Traps. Sorted Rebel upgrade icons across sub-factions.

UpgradeCameo1 = Upgrade_GLAAPBullets
UpgradeCameo2 = Upgrade_InfantryCaptureBuilding
UpgradeCameo3 = Demo_Upgrade_SuicideBomb
;UpgradeCameo4 = NONE
;UpgradeCameo5 = NONE
UpgradeCameo2 = Upgrade_GLACamouflage
UpgradeCameo3 = Upgrade_InfantryCaptureBuilding
UpgradeCameo4 = Upgrade_GLAInfantryRebelBoobyTrapAttack
UpgradeCameo5 = Demo_Upgrade_SuicideBomb

Draw = W3DModelDraw ModuleTag_01

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,13 @@ Object GC_Chem_GLAInfantryRebel
SelectPortrait = SUToxinRebel_L
ButtonImage = SUToxinRebel

; Patch104p @bugfix commy2 05/09/2021 Sorted Rebel upgrade icons across sub-factions.

UpgradeCameo1 = Chem_Upgrade_GLAAnthraxGamma
UpgradeCameo2 = Upgrade_InfantryCaptureBuilding
UpgradeCameo3 = Upgrade_GLACamouflage
UpgradeCameo2 = Upgrade_GLACamouflage
UpgradeCameo3 = Upgrade_InfantryCaptureBuilding
;UpgradeCameo4 = Upgrade_GLAInfantryRebelBoobyTrapAttack
;UpgradeCameo5 = NONE


Draw = W3DModelDraw ModuleTag_01
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1627,9 +1627,12 @@ Object GC_Slth_GLAInfantryRebel
SelectPortrait = SURebel_L
ButtonImage = SURebel

; Patch104p @bugfix commy2 05/09/2021 Sorted Rebel upgrade icons across sub-factions.

UpgradeCameo1 = Upgrade_GLAAPBullets
UpgradeCameo2 = Upgrade_InfantryCaptureBuilding
;UpgradeCameo4 = NONE
;UpgradeCameo2 = Upgrade_GLACamouflage
UpgradeCameo3 = Upgrade_InfantryCaptureBuilding
;UpgradeCameo4 = Upgrade_GLAInfantryRebelBoobyTrapAttack
;UpgradeCameo5 = NONE

Draw = W3DModelDraw ModuleTag_01
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12589,10 +12589,12 @@ Object Slth_GLAInfantryRebel
SelectPortrait = SURebel_L
ButtonImage = SURebel

; Patch104p @bugfix commy2 05/09/2021 Added missing upgrade icon for Camouflage. Sorted Rebel upgrade icons across sub-factions.

UpgradeCameo1 = Upgrade_GLAAPBullets
;UpgradeCameo2 = Upgrade_GLACamouflage
UpgradeCameo2 = Upgrade_GLACamouflage
UpgradeCameo3 = Upgrade_InfantryCaptureBuilding
;UpgradeCameo4 = NONE
;UpgradeCameo4 = Upgrade_GLAInfantryRebelBoobyTrapAttack
;UpgradeCameo5 = NONE

Draw = W3DModelDraw ModuleTag_01
Expand Down