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: Boss General Avenger Issues #454

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Fix: Boss General Avenger Issues #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f407b4
Fix: Boss General Avenger Issues
commy2 Oct 3, 2021
de7d155
Merge branch 'main' into fix-boss-avenger
commy2 Oct 7, 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 @@ -181,7 +181,7 @@ https://github.com/commy2/zerohour/issues/38 [DONE][NPROJEC!] Detached F
https://github.com/commy2/zerohour/issues/37 [DONE][NPROJEC!] Tomahawk Launchers Have Reversed Order For Battle And Scout Drone Upgrade
https://github.com/commy2/zerohour/issues/36 [MAYBE][NPROJECT] Boss Helix Inconsistencies
https://github.com/commy2/zerohour/issues/35 [DONE][NPROJECT] Boss Infantry Inconsistencies
https://github.com/commy2/zerohour/issues/34 [MAYBE][NPROJECT] Boss Avenger Inconsistencies
https://github.com/commy2/zerohour/issues/34 [DONE][NPROJECT] Boss Avenger Inconsistencies
https://github.com/commy2/zerohour/issues/33 [MAYBE][NPROJECT] Air Force General Avenger Receives 30% More Damage From Jet Missiles
https://github.com/commy2/zerohour/issues/32 [MAYBE][NPROJECT] Non-vanilla USA Avengers Benefit From Composite Armor
https://github.com/commy2/zerohour/issues/31 [DONE] Some Avengers Can Retaliate
Expand Down
47 changes: 36 additions & 11 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20000,6 +20000,16 @@ End




; Patch104p @bugfix commy2 3/10/2021 Fix the following issues with the Boss General Avenger:
; - unit would display team color wrong (always red team)
; - unit would show up wrong when disguised with Bomb Truck
; - unit was missing upgrade icon for Hellfire Drones
; - unit was using TankArmor type, had more health than regular Avengers against ground units, but be more vilnerable to air units
; - unit cannot promote at all
; - unit cannot be ordered to target air units
; - unit second PDL uses different scan rate, thus attempts to zap the same missiles as the first PDL
; - unit was useing the move sounds of Paladin instead of Humvee

;------------------------------------------------------------------------------
Object Boss_TankAvenger
Expand All @@ -20010,24 +20020,37 @@ Object Boss_TankAvenger

UpgradeCameo1 = Upgrade_AmericaBattleDrone
UpgradeCameo2 = Upgrade_AmericaScoutDrone
UpgradeCameo3 = Upgrade_AmericaAdvancedTraining
UpgradeCameo4 = Upgrade_AmericaCompositeArmor
UpgradeCameo5 = Upgrade_AmericaHallfireDrone
UpgradeCameo3 = Upgrade_AmericaHellfireDrone
UpgradeCameo4 = Upgrade_AmericaAdvancedTraining
;UpgradeCameo5 = Upgrade_AmericaCompositeArmor

Draw = W3DOverlordTruckDraw ModuleTag_01
OkToChangeModelColor = Yes
ExtraPublicBone = TurretFX03
ExtraPublicBone = LazerSpot01
ExtraPublicBone = LazerSpot02
DefaultConditionState
Model = AVAVNGER
HideSubObject = TURRET01 ;Hide controlled turret
End

ConditionState = REALLYDAMAGED
Model = AVAVNGER_D
HideSubObject = TURRET01 ;Hide controlled turret
End

ConditionState = RUBBLE
Model = AVAVNGER_D1
End

;When a bombtruck disguises as an avenger, show the turret!
ConditionState = DISGUISED
Model = AVAVNGER
ShowSubObject = TURRET01
End
ConditionState = REALLYDAMAGED DISGUISED
Model = AVAVNGER_D
ShowSubObject = TURRET01 ;Hide controlled turret
End

TrackMarks = EXTireTrack.tga
Expand All @@ -20053,10 +20076,11 @@ Object Boss_TankAvenger
WeaponSet
Conditions = None
Weapon = PRIMARY AvengerTargetDesignator
Weapon = SECONDARY AvengerAirLaserDummy
End
ArmorSet
Conditions = None
Armor = TankArmor
Armor = AvengerArmor
DamageFX = TankDamageFX
End
BuildCost = 2000
Expand All @@ -20070,7 +20094,7 @@ Object Boss_TankAvenger
ExperienceValue = 100 100 200 400 ;Experience point value at each level
ExperienceRequired = 0 200 300 600 ;Experience points needed to gain each level

IsTrainable = No
IsTrainable = Yes
CrusherLevel = 2 ;What can I crush?: 1 = infantry, 2 = trees, 3 = vehicles
CrushableLevel = 2 ;What am I?: 0 = for infantry, 1 = for trees, 2 = general vehicles
CommandSet = AmericaTankAvengerCommandSet
Expand All @@ -20079,9 +20103,10 @@ Object Boss_TankAvenger
VoiceSelect = AvengerVoiceSelect
VoiceMove = AvengerVoiceMove
VoiceGuard = AvengerVoiceMove
VoiceAttack = AvengerVoiceAttack
SoundMoveStart = PaladinTankMoveStart
SoundMoveStartDamaged = PaladinTankMoveStart
VoiceAttack = AvengerVoicePaint
VoiceAttackAir = AvengerVoiceAttack
SoundMoveStart = HumveeMoveStart
SoundMoveStartDamaged = HumveeMoveStart

UnitSpecificSounds
; These have the syntax of SomeNameSomewhereInCode = SomeNameSomewhereInLookupINIs
Expand All @@ -20098,8 +20123,8 @@ Object Boss_TankAvenger
KindOf = PRELOAD SELECTABLE CAN_ATTACK ATTACK_NEEDS_LINE_OF_SIGHT CAN_CAST_REFLECTIONS VEHICLE SCORE CANNOT_RETALIATE ; Patch104p @bugfix commy2 03/09/2021 This Avenger would retaliate unlike the normal USA Avenger.

Body = ActiveBody ModuleTag_02
MaxHealth = 500.0
InitialHealth = 500.0
MaxHealth = 300.0
InitialHealth = 300.0

; Subdual damage "Subdues" you (reaction defined by BodyModule) when it passes your max health.
; The cap limits how extra-subdued you can be, and the other numbers detemine how fast it drains away on its own.
Expand Down Expand Up @@ -20150,7 +20175,7 @@ Object Boss_TankAvenger
Behavior = PointDefenseLaserUpdate ModuleTag_Laser_Two
WeaponTemplate = AvengerPointDefenseLaserTwo
PrimaryTargetTypes = BALLISTIC_MISSILE SMALL_MISSILE
ScanRate = 0
ScanRate = 100
ScanRange = 200.0
PredictTargetVelocityFactor = 1.0
End
Expand Down