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.

Sign up for GitHub

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: Emperor Overlord Incompatible With Subliminal Messaging #236

Merged
merged 3 commits into from
Dec 10, 2021
Merged

Fix: Emperor Overlord Incompatible With Subliminal Messaging #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef5dcf6
Fix: Emperor Overlord Incompatible With Subliminal Messaging
commy2 Sep 7, 2021
0aeb248
Merge branch 'main' into fix-emperor-subliminal
commy2 Sep 7, 2021
0f19907
Merge branch 'main' into fix-emperor-subliminal
commy2 Sep 23, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ /~https://github.com/commy2/zerohour/issues/103 [DONE][NPROJEC!] Some Speci
/~https://github.com/commy2/zerohour/issues/102 [DONE][NPROJEC!] Tank Hunter Missing Patriotism Upgrade Icon
/~https://github.com/commy2/zerohour/issues/101 [DONE][NPROJEC!] Speaker Tower Lacks Mine Upgrade
/~https://github.com/commy2/zerohour/issues/100 [DONE][NPROJEC!] Overlord Turns Chassis When Gattling Cannon Is Aiming At Air Unit
/~https://github.com/commy2/zerohour/issues/99 [MAYBE][NPROJECT] Emperor Overlord Incompatible With Subliminal Messaging
/~https://github.com/commy2/zerohour/issues/99 [DONE][NPROJECT] Emperor Overlord Incompatible With Subliminal Messaging
/~https://github.com/commy2/zerohour/issues/98 [MAYBE][NPROJECT] Nuke Cannon Animation Inconsistency
/~https://github.com/commy2/zerohour/issues/97 [NOTRELEVANT][NPROJECT] Infantry General Gattling Tank Starts As Veteran
/~https://github.com/commy2/zerohour/issues/96 [DONE][NPROJEC!] Vanilla China Troop Crawlers Missing Detection Effect
Expand Down
18 changes: 12 additions & 6 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2893,11 +2893,13 @@ Object Tank_ChinaTankEmperor
SelectPortrait = SNEmpTank_L
ButtonImage = SNEmpTank

; Patch104p @bugfix commy2 07/09/2021 Added upgrade icon for Subliminal Messaging.

UpgradeCameo1 = Upgrade_ChinaUraniumShells
UpgradeCameo2 = Upgrade_ChinaNuclearTanks
UpgradeCameo3 = Upgrade_ChinaOverlordGattlingCannon
UpgradeCameo4 = Upgrade_ChinaOverlordPropagandaTower
; UpgradeCameo5 = Tank_Upgrade_ChinaTankAutoLoader
UpgradeCameo5 = Upgrade_ChinaSubliminalMessaging

Draw = W3DOverlordTankDraw ModuleTag_01
ConditionState = NONE
Expand Down Expand Up @@ -3041,11 +3043,13 @@ Object Tank_ChinaTankEmperor
ExperienceSinkForRider = Yes ; I get the Exp for things my turret friend kills
End

; Patch104p @bugfix commy2 07/09/2021 Enabled this to highlight the Propaganda Tower upgrade icon on the unit.

; Prop Tower is intrinsic. Plus, GrantUpgradeCreates on units crash savegames if the unit is Elite.
; Behavior = GrantUpgradeCreate ModuleTag_22
; UpgradeToGrant = Upgrade_ChinaOverlordPropagandaTower
; ExemptStatus = UNDER_CONSTRUCTION
; End
Behavior = GrantUpgradeCreate ModuleTag_22
UpgradeToGrant = Upgrade_ChinaOverlordPropagandaTower
ExemptStatus = UNDER_CONSTRUCTION
End

Behavior = ObjectCreationUpgrade ModuleTag_07
UpgradeObject = OCL_OverlordGattlingCannon
Expand Down Expand Up @@ -3095,12 +3099,14 @@ Object Tank_ChinaTankEmperor
Mass = 50.0
End

; Patch104p @bugfix commy2 07/09/2021 Fixed required upgrade to make Subliminal Messaging work on this unit.

Behavior = PropagandaTowerBehavior ModulePropaganda_04
Radius = 150.0
DelayBetweenUpdates = 2000 ; in milliseconds
HealPercentEachSecond = 1% ; get this % of max health every second
PulseFX = FX_OverlordPropagandaTowerPropagandaPulse ;plays as often as DelayBetweenUpdates
UpgradeRequired = Upgrade_ChinaOverlordPropagandaTower
UpgradeRequired = Upgrade_ChinaSubliminalMessaging
UpgradedHealPercentEachSecond = 2% ; get this % of max health every second
UpgradedPulseFX = FX_OverlordPropagandaTowerSubliminalPulse ;plays as often as DelayBetweenUpdates
AffectsSelf = Yes ; Needs this since Tower is not seperate object for Emperor
Expand Down