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: Helix and Overlord addons are now colored red when affected by Frenzy #132

Merged
merged 1 commit into from
Sep 1, 2021
Merged

Fix: Helix and Overlord addons are now colored red when affected by Frenzy #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaAir.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,11 @@ Object ChinaHelixPropagandaTower
Armor = InvulnerableAllArmor ; We can't be hurt on the field. We share damage from the Overlord with his damage module
End
VisionRange = 200
; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Propaganda Tower.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
Expand Down Expand Up @@ -598,6 +603,12 @@ Object ChinaHelixBattleBunker
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Battle Bunker.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand All @@ -606,7 +617,9 @@ Object ChinaHelixBattleBunker
End

; *** ENGINEERING Parameters ***
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI

; Patch104p @bugfix hanfield 01/09/2021 Added CAN_ATTACK KINDOF to let Frenzy affect the Battle Bunker.
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI CAN_ATTACK
Body = StructureBody ModuleTag_02
MaxHealth = 100.0
InitialHealth = 100.0
Expand Down
16 changes: 15 additions & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaVehicle.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,12 @@ Object ChinaTankOverlordPropagandaTower
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Propaganda Tower.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand Down Expand Up @@ -740,6 +746,13 @@ Object ChinaTankOverlordBattleBunker
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Battle Bunker.

WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand All @@ -748,7 +761,8 @@ Object ChinaTankOverlordBattleBunker
End

; *** ENGINEERING Parameters ***
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI
; Patch104p @bugfix hanfield 01/09/2021 Added CAN_ATTACK KINDOF to let Frenzy affect the Battle Bunker
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI CAN_ATTACK
Body = StructureBody ModuleTag_02
MaxHealth = 100.0
InitialHealth = 100.0
Expand Down
9 changes: 8 additions & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16263,6 +16263,12 @@ Object Infa_ChinaHelixBattleBunker
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Battle Bunker.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand All @@ -16271,7 +16277,8 @@ Object Infa_ChinaHelixBattleBunker
End

; *** ENGINEERING Parameters ***
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI
; Patch104p @bugfix hanfield 01/09/2021 Added CAN_ATTACK KINDOF to let Frenzy affect the Battle Bunker.
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI CAN_ATTACK
Body = StructureBody ModuleTag_02
MaxHealth = 100.0
InitialHealth = 100.0
Expand Down
29 changes: 27 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,11 @@ Object Nuke_ChinaHelixPropagandaTower
Armor = InvulnerableAllArmor ; We can't be hurt on the field. We share damage from the Overlord with his damage module
End
VisionRange = 200
; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Propaganda Tower.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
Expand Down Expand Up @@ -888,6 +893,12 @@ Object Nuke_ChinaHelixBattleBunker
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Propaganda Tower.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand All @@ -896,7 +907,8 @@ Object Nuke_ChinaHelixBattleBunker
End

; *** ENGINEERING Parameters ***
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI
; Patch104p @bugfix hanfield 01/09/2021 Added CAN_ATTACK KINDOF to let Frenzy affect the Battle Bunker.
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI CAN_ATTACK
Body = StructureBody ModuleTag_02
MaxHealth = 100.0
InitialHealth = 100.0
Expand Down Expand Up @@ -17262,6 +17274,12 @@ Object Nuke_ChinaTankOverlordPropagandaTower
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Propaganda Tower.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand Down Expand Up @@ -17359,6 +17377,12 @@ Object Nuke_ChinaTankOverlordBattleBunker
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Battle Bunker.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand All @@ -17367,7 +17391,8 @@ Object Nuke_ChinaTankOverlordBattleBunker
End

; *** ENGINEERING Parameters ***
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI
; Patch104p @bugfix hanfield 01/09/2021 Added CAN_ATTACK KINDOF to let Frenzy affect the Battle Bunker.
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI CAN_ATTACK
Body = StructureBody ModuleTag_02
MaxHealth = 100.0
InitialHealth = 100.0
Expand Down
31 changes: 29 additions & 2 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 @@ -517,6 +517,12 @@ Object Tank_ChinaHelixPropagandaTower
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Propaganda Tower.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand Down Expand Up @@ -614,6 +620,12 @@ Object Tank_ChinaHelixBattleBunker
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Battle Bunker.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand All @@ -622,7 +634,9 @@ Object Tank_ChinaHelixBattleBunker
End

; *** ENGINEERING Parameters ***
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI

; Patch104p @bugfix hanfield 01/09/2021 Added CAN_ATTACK KINDOF to let Frenzy affect the Battle Bunker.
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI CAN_ATTACK
Body = StructureBody ModuleTag_02
MaxHealth = 100.0
InitialHealth = 100.0
Expand Down Expand Up @@ -3345,6 +3359,12 @@ Object Tank_ChinaTankOverlordPropagandaTower
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Propaganda Tower.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand Down Expand Up @@ -3447,6 +3467,12 @@ Object Tank_ChinaTankOverlordBattleBunker
End
VisionRange = 200

; Patch104p @bugfix hanfield 01/09/2021 Added dummy weaponset to make Frenzy affect the Battle Bunker.
WeaponSet
Conditions = None
Weapon = PRIMARY DummyWeapon
End

; *** AUDIO Parameters ***
UnitSpecificSounds
TurretMoveStart = NoSound
Expand All @@ -3455,7 +3481,8 @@ Object Tank_ChinaTankOverlordBattleBunker
End

; *** ENGINEERING Parameters ***
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI
; Patch104p @bugfix hanfield 01/09/2021 Added CAN_ATTACK KINDOF to let Frenzy affect the Battle Bunker.
KindOf = PRELOAD PORTABLE_STRUCTURE CLICK_THROUGH IGNORED_IN_GUI CAN_ATTACK
Body = StructureBody ModuleTag_02
MaxHealth = 100.0
InitialHealth = 100.0
Expand Down
8 changes: 8 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Weapon.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,10 @@ Weapon GattlingBuildingGun
WeaponBonus = CONTINUOUS_FIRE_MEAN RATE_OF_FIRE 200% ; When the object achieves this state, this weapon gets double the rate of fire
WeaponBonus = CONTINUOUS_FIRE_FAST RATE_OF_FIRE 300% ; This is not cumulative, so with Delay of 40, and values of 2 and 4 for these bonuses, you shoot at (40, 20, 10)
WeaponBonus = PLAYER_UPGRADE DAMAGE 125% ; ChainGun upgrade
; Patch104p @bugfix hanfield 01/09/2021 Added WeaponBonus parameters for Frenzy that nullify the bonus but allow it to color the Gattling Cannon.
WeaponBonus = FRENZY_ONE DAMAGE 90%
WeaponBonus = FRENZY_TWO DAMAGE 80%
WeaponBonus = FRENZY_THREE DAMAGE 70%
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Are we sure this negates it correctly?

  WeaponBonus = FRENZY_ONE    DAMAGE 110% ; Granted by a China Generals power
  WeaponBonus = FRENZY_TWO    DAMAGE 120%
  WeaponBonus = FRENZY_THREE  DAMAGE 130%

VS

  WeaponBonus           = FRENZY_ONE DAMAGE 90%
  WeaponBonus           = FRENZY_TWO DAMAGE 80%
  WeaponBonus           = FRENZY_THREE DAMAGE 70%

It may be calculated like so:

1,1 * 0,9 = 0,99 = 99%
1,2 * 0,8 = 0,96 = 96%
1,3 * 0,7 = 0,91 = 91%

Right now we count on it being calculated like so:

(1,1 + 0,9) / 2 = 1,00 = 100%
(1,2 + 0,8) / 2 = 1,00 = 100%
(1,3 + 0,7) / 2 = 1,00 = 100%

But that is not clear (to me).

AntiAirborneVehicle = No
AntiAirborneInfantry = No
AntiSmallMissile = No
Expand Down Expand Up @@ -1285,6 +1289,10 @@ Weapon GattlingBuildingGunAir
WeaponBonus = CONTINUOUS_FIRE_MEAN RATE_OF_FIRE 200% ; When the object achieves this state, this weapon gets double the rate of fire
WeaponBonus = CONTINUOUS_FIRE_FAST RATE_OF_FIRE 300% ; This is not cumulative, so with Delay of 40, and values of 2 and 4 for these bonuses, you shoot at (40, 20, 10)
WeaponBonus = PLAYER_UPGRADE DAMAGE 125% ; ChainGun upgrade
; Patch104p @bugfix hanfield 01/09/2021 Added WeaponBonus parameters for Frenzy that nullify the bonus but allow it to color the Gattling Cannon.
WeaponBonus = FRENZY_ONE DAMAGE 90%
WeaponBonus = FRENZY_TWO DAMAGE 80%
WeaponBonus = FRENZY_THREE DAMAGE 70%
AntiAirborneVehicle = Yes
AntiAirborneInfantry = Yes
AntiSmallMissile = No
Expand Down