diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 85e1de3850..675266253a 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -4,8 +4,6 @@ WEEDGUY: Cost: 300 Tooltip: Name: Chem Spray Infantry - Selectable: - Bounds: 12,17,0,-6 Voiced: VoiceSet: Weed Mobile: @@ -20,13 +18,6 @@ WEEDGUY: AttackFrontal: WithInfantryBody: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne UMAGON: Inherits: ^Infantry @@ -34,8 +25,6 @@ UMAGON: Cost: 400 Tooltip: Name: Umagon - Selectable: - Bounds: 12,17,0,-6 Voiced: VoiceSet: Umagon Mobile: @@ -51,13 +40,6 @@ UMAGON: Weapon: Sniper AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 @@ -69,8 +51,6 @@ CHAMSPY: Name: Chameleon Spy Voiced: VoiceSet: Spy - Selectable: - Bounds: 12,17,0,-9 Health: HP: 120 Mobile: @@ -79,13 +59,6 @@ CHAMSPY: Range: 9c0 Passenger: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne Disguise: Infiltrates: Types: SpyInfiltrate @@ -100,8 +73,6 @@ MUTANT: Cost: 100 Tooltip: Name: Mutant - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Mutant Health: @@ -116,13 +87,6 @@ MUTANT: Weapon: Vulcan AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 @@ -132,8 +96,6 @@ MWMN: Cost: 100 Tooltip: Name: Mutant Soldier - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: CivilianFemale Health: @@ -148,13 +110,6 @@ MWMN: Weapon: Vulcan AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 @@ -164,8 +119,6 @@ MUTANT3: Cost: 100 Tooltip: Name: Mutant Sergeant - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Mutant Health: @@ -180,13 +133,6 @@ MUTANT3: Weapon: Vulcan AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 @@ -196,8 +142,6 @@ TRATOS: Cost: 100 Tooltip: Name: Tratos - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Tratos Health: @@ -209,13 +153,6 @@ TRATOS: RevealsShroud: Range: 4c0 TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne -AutoTarget: WithInfantryBody: IdleSequences: idle1,idle2 @@ -226,8 +163,6 @@ OXANNA: Cost: 100 Tooltip: Name: Oxanna - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Oxanna Health: @@ -237,13 +172,6 @@ OXANNA: RevealsShroud: Range: 4c0 TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne -AutoTarget: WithInfantryBody: IdleSequences: idle1,idle2 @@ -254,8 +182,6 @@ SLAV: Cost: 100 Tooltip: Name: Slavick - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Slavick Health: @@ -265,13 +191,6 @@ SLAV: RevealsShroud: Range: 4c0 TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne -AutoTarget: WithInfantryBody: IdleSequences: idle1,idle2 @@ -289,8 +208,7 @@ DOGGIE: Cost: 100 Armor: Type: Light - RevealsShroud: - Range: 4c0 + -RevealsShroud: Mobile: Speed: 113 Voiced: @@ -306,66 +224,32 @@ DOGGIE: MaxMoveDelayInTicks: 45 VISSML: - Inherits: ^Infantry + Inherits: ^Viceroid Tooltip: Name: Baby Visceroid Health: HP: 200 - PoisonedByTiberium: - Weapon: TiberiumHeal - Valued: - Cost: 1 - Armor: - Type: Light - RevealsShroud: - Range: 0c0 - Mobile: - Speed: 113 - ROT: 16 - -Crushable: - Voiced: - VoiceSet: Fiend - TargetableUnit: - TargetTypes: Ground - -AutoTarget: - -RenderSprites: - -WithInfantryBody: - -WithDeathAnimation: - RenderUnit: + AttackWander: + WanderMoveRadius: 2 + MinMoveDelayInTicks: 30 + MaxMoveDelayInTicks: 60 VISLRG: - Inherits: ^Infantry + Inherits: ^Viceroid Tooltip: Name: Adult Visceroid Health: HP: 500 - PoisonedByTiberium: - Weapon: TiberiumHeal - Valued: - Cost: 1 - Armor: - Type: Light - RevealsShroud: - Range: 0c0 - Mobile: - Speed: 113 - ROT: 16 - -Crushable: - Voiced: - VoiceSet: Fiend - TargetableUnit: - TargetTypes: Ground Armament: Weapon: SlimeAttack + AutoTarget: AttackFrontal: AttackWander: WanderMoveRadius: 2 MinMoveDelayInTicks: 25 MaxMoveDelayInTicks: 45 - -RenderSprites: - -WithInfantryBody: - -WithDeathAnimation: - RenderUnit: + Mobile: + Crushes: crate, infantry CIV1: Inherits: ^CivilianInfantry diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index ad6e0547e2..e3eaceea48 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -185,10 +185,19 @@ SelectionDecorations: Palette: pips Selectable: + Bounds: 14,23,-1,-9 Voiced: VoiceSet: Infantry TargetableUnit: TargetTypes: Ground, Infantry + TakeCover: + DamageModifiers: + Prone50Percent: 50 + Prone60Percent: 60 + Prone70Percent: 70 + Prone100Percent: 100 + Prone350Percent: 350 + DamageTriggers: TriggerProne RenderSprites: WithInfantryBody: WithDeathAnimation: @@ -274,6 +283,7 @@ Range: 2c0 ProximityCaptor: Types: CivilianInfantry + -TakeCover: WithInfantryBody: ScaredyCat: -MustBeDestroyed: @@ -506,6 +516,43 @@ CruiseAltitude: 2560 ReturnOnIdle: +^Viceroid: + RenderUnit: + AppearsOnRadar: + Health: + Radius: 256 + Armor: + Type: Light + Mobile: + Speed: 113 + ROT: 16 + Crushes: crate + SharesCell: no + TerrainSpeeds: + Clear: 90 + Road: 100 + Rail: 80 + DirtRoad: 90 + Rough: 70 + Tiberium: 100 + BlueTiberium: 100 + SelectionDecorations: + Palette: pips + Selectable: + Bounds: 26,26,0,-3 + TargetableUnit: + TargetTypes: Ground + AttackMove: + HiddenUnderFog: + DrawLineToTarget: + PoisonedByTiberium: + Weapon: TiberiumHeal + CombatDebugOverlay: + Guardable: + BodyOrientation: + Huntable: + ScriptTriggers: + ^BlossomTree: Tooltip: Name: Blossom Tree diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index fab744c9ee..4f98062957 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -9,8 +9,6 @@ E2: Tooltip: Name: Disc Thrower Description: Infantry armed with special explosive discs.\n Strong vs Buildings, Infantry\n Weak vs Vehicles, Aircraft - Selectable: - Bounds: 12,17,0,-9 Health: HP: 150 Mobile: @@ -21,13 +19,6 @@ E2: FireDelay: 5 AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 @@ -42,8 +33,6 @@ MEDIC: Queue: Infantry BuildPaletteOrder: 70 Prerequisites: ~gapile - Selectable: - Bounds: 12,17,0,-6 Voiced: VoiceSet: Medic Mobile: @@ -56,13 +45,6 @@ MEDIC: Weapon: Heal AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 AttackSequence: heal @@ -81,9 +63,8 @@ JUMPJET: Queue: Infantry BuildPaletteOrder: 40 Prerequisites: ~gapile, garadr - Selectable: - Bounds: 12,17,0,-6 - Voice: JumpJet + Voiced: + VoiceSet: JumpJet Mobile: Speed: 56 Health: @@ -99,13 +80,6 @@ JUMPJET: -Crushable: AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: GHOST: @@ -120,9 +94,8 @@ GHOST: BuildPaletteOrder: 50 Prerequisites: ~gapile, gatech BuildLimit: 1 - Selectable: - Bounds: 12,17,0,-6 - Voice: Ghost + Voiced: + VoiceSet: Ghost Mobile: Speed: 56 Health: @@ -141,13 +114,6 @@ GHOST: C4Demolition: C4Delay: 45 TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 34379056d7..a536817863 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -9,8 +9,6 @@ E3: Tooltip: Name: Rocket Infantry Description: Anti-tank infantry.\n Strong vs Vehicles, Aircraft, Buildings\n Weak vs Infantry - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Rocket Health: @@ -22,13 +20,6 @@ E3: LocalOffset: 128,0,640 AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 @@ -47,7 +38,7 @@ CYBORG: Prerequisites: ~nahand -Crushable: Selectable: - Bounds: 14,30,0,-7 + Bounds: 16,31,0,-10 Voiced: VoiceSet: Cyborg Mobile: @@ -82,7 +73,7 @@ CYC2: BuildLimit: 1 -Crushable: Selectable: - Bounds: 14,30,0,-7 + Bounds: 16,32,-1,-12 Voiced: VoiceSet: CyborgCommando Mobile: @@ -109,12 +100,10 @@ MHIJACK: BuildPaletteOrder: 60 Prerequisites: ~nahand, natech # natech must be natmpl Valued: - Cost: 100 + Cost: 1850 Tooltip: Name: Mutant Hijacker Description: Hijacks enemy vehicles.\n Unarmed - Selectable: - Bounds: 12,17,0,-9 Voiced: VoiceSet: Hijacker Health: @@ -129,13 +118,6 @@ MHIJACK: Range: 6c0 -AutoTarget: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index 0ea97851f4..203e930a7a 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -9,8 +9,6 @@ E1: Tooltip: Name: Light Infantry Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles, Aircraft - Selectable: - Bounds: 12,17,0,-9 Health: HP: 125 Mobile: @@ -26,13 +24,6 @@ E1: UpgradeMinEnabledLevel: 1 AttackFrontal: TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 @@ -47,8 +38,6 @@ ENGINEER: Queue: Infantry BuildPaletteOrder: 30 Prerequisites: ~barracks - Selectable: - Bounds: 12,17,0,-6 Voiced: VoiceSet: Engineer Mobile: @@ -62,15 +51,8 @@ ENGINEER: Captures: CaptureTypes: building -AutoTarget: + TakeCover: WithInfantryBody: IdleSequences: idle1,idle2 - TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne -GainsExperience: