diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 26be6553d6..fe946ee5a3 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -47,8 +47,12 @@ E1: HP: 50 Mobile: Speed: 56 - Armament: + Armament@PRIMARY: Weapon: M1Carbine + Armament@GARRISONED: + Name: garrisoned + Weapon: Vulcan + MuzzleSequence: garrison-muzzle AttackFrontal: TakeCover: -RenderInfantry: @@ -75,10 +79,14 @@ E2: HP: 50 Mobile: Speed: 71 - Armament: + Armament@PRIMARY: Weapon: Grenade LocalOffset: 0,0,555 FireDelay: 15 + Armament@GARRISONED: + Name: garrisoned + Weapon: Grenade + FireDelay: 15 AttackFrontal: TakeCover: -RenderInfantry: @@ -113,6 +121,9 @@ E3: Armament@SECONDARY: Weapon: Dragon LocalOffset: 0,0,555 + Armament@GARRISONED: + Name: garrisoned + Weapon: Dragon AttackFrontal: TakeCover: -RenderInfantry: @@ -139,10 +150,13 @@ E4: HP: 40 Mobile: Speed: 56 - Armament: + Armament@PRIMARY: Weapon: Flamer LocalOffset: 427,0,341 FireDelay: 8 + Armament@GARRISONED: + Name: garrisoned + Weapon: Flamer AttackFrontal: TakeCover: -RenderInfantry: @@ -252,6 +266,10 @@ E7: Weapon: Colt45 Armament@SECONDARY: Weapon: Colt45 + Armament@GARRISONED: + Name: garrisoned + Weapon: Colt45 + MuzzleSequence: garrison-muzzle AttackFrontal: TakeCover: -RenderInfantry: @@ -429,9 +447,12 @@ SHOK: Speed: 56 RevealsShroud: Range: 4c0 - Armament: + Armament@PRIMARY: Weapon: PortaTesla LocalOffset: 427,0,341 + Armament@GARRISONED: + Name: garrisoned + Weapon: PortaTesla AttackFrontal: TakeCover: -RenderInfantry: @@ -465,8 +486,12 @@ SNIPER: Range: 6c0 AutoTarget: InitialStance: ReturnFire - Armament: + Armament@PRIMARY: Weapon: Sniper + Armament@GARRISONED: + Name: garrisoned + Weapon: Sniper + MuzzleSequence: garrison-muzzle AttackFrontal: TakeCover: -RenderInfantry: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 191199c48b..c8a7bb88db 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -401,9 +401,15 @@ DOME: PBOX: Inherits: ^Building Tooltip: - Name: Pillbox (Unarmed) + Name: Pillbox Building: Power: -15 + Buildable: + Queue: Defense + BuildPaletteOrder: 20 + Prerequisites: tent + Owner: allies + Hotkey: p -GivesBuildableArea: Valued: Cost: 400 @@ -423,133 +429,67 @@ PBOX: Types: Infantry MaxWeight: 1 PipCount: 1 + InitialUnits: e1 -EmitInfantryOnSell: DrawLineToTarget: - TransformOnPassenger@e1: - PassengerTypes: e1 - OnEnter: pbox.e1 - OnExit: pbox - SkipMakeAnims: true - TransformOnPassenger@e3: - PassengerTypes: e3 - OnEnter: pbox.e3 - OnExit: pbox - SkipMakeAnims: true - TransformOnPassenger@e4: - PassengerTypes: e4 - OnEnter: pbox.e4 - OnExit: pbox - SkipMakeAnims: true - TransformOnPassenger@e7: - PassengerTypes: e7 - OnEnter: pbox.e7 - OnExit: pbox - SkipMakeAnims: true - TransformOnPassenger@SHOK: - PassengerTypes: shok - OnEnter: pbox.shok - OnExit: pbox - SkipMakeAnims: true - TransformOnPassenger@Sniper: - PassengerTypes: sniper - OnEnter: pbox.sniper - OnExit: pbox - SkipMakeAnims: true + AttackGarrisoned: + Armaments: garrisoned + PortOffsets: 384,0,128, 224,-341,128, -224,-341,128, -384,0,128, -224,341,128, 224,341,128 + PortYaws: 0, 176, 341, 512, 682, 853 + PortCones: 86, 86, 86, 86, 86, 86 + RenderRangeCircle: + FallbackRange: 6c0 + AutoTarget: +# Legacy definitions to keep compatibility with outdated maps PBOX.E1: Inherits: PBOX + -Buildable: + RenderBuilding: + Image: PBOX + +PBOX.E3: + Inherits: PBOX + -Buildable: + RenderBuilding: + Image: PBOX + +PBOX.E4: + Inherits: PBOX + -Buildable: + RenderBuilding: + Image: PBOX + +PBOX.E7: + Inherits: PBOX + -Buildable: + RenderBuilding: + Image: PBOX + +PBOX.SHOK: + Inherits: PBOX + -Buildable: + RenderBuilding: + Image: PBOX + +PBOX.SNIPER: + Inherits: PBOX + -Buildable: + RenderBuilding: + Image: PBOX + +HBOX: + Inherits: ^Building + Tooltip: + Name: Camo Pillbox + Building: + Power: -15 Buildable: Queue: Defense BuildPaletteOrder: 20 Prerequisites: tent Owner: allies - Hotkey: p - Tooltip: - Name: Pillbox (Guns) - Description: Basic defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft - RenderBuilding: - Image: PBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Vulcan - LocalOffset: 384,0,88 - AttackTurreted: - WithMuzzleFlash: - Cargo: - InitialUnits: e1 - -PBOX.E3: - Inherits: PBOX - Tooltip: - Name: Pillbox (Rockets) - RenderBuilding: - Image: PBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Dragon - LocalOffset: 384,0,88 - AttackTurreted: - -PBOX.E4: - Inherits: PBOX - Tooltip: - Name: Pillbox (Flamethrower) - RenderBuilding: - Image: PBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Flamer - LocalOffset: 384,0,88 - AttackTurreted: - -PBOX.E7: - Inherits: PBOX - Tooltip: - Name: Pillbox (Tanya) - RenderBuilding: - Image: PBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Colt45 - LocalOffset: 384,0,88 - AttackTurreted: - -PBOX.SHOK: - Inherits: PBOX - Tooltip: - Name: Pillbox (Tesla) - RenderBuilding: - Image: PBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: PortaTesla - LocalOffset: 384,0,88 - AttackTurreted: - -PBOX.SNIPER: - Inherits: PBOX - Tooltip: - Name: Pillbox (Sniper) - RenderBuilding: - Image: PBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Sniper - LocalOffset: 384,0,88 - AttackTurreted: - -HBOX: - Inherits: ^Building - Tooltip: - Name: Camo Pillbox (Unarmed) - Building: - Power: -15 + Hotkey: l -GivesBuildableArea: Valued: Cost: 600 @@ -572,129 +512,56 @@ HBOX: Types: Infantry MaxWeight: 1 PipCount: 1 + InitialUnits: e1 -EmitInfantryOnSell: DrawLineToTarget: - TransformOnPassenger@e1: - PassengerTypes: e1 - OnEnter: HBOX.e1 - OnExit: HBOX - SkipMakeAnims: true - TransformOnPassenger@e3: - PassengerTypes: e3 - OnEnter: HBOX.e3 - OnExit: HBOX - SkipMakeAnims: true - TransformOnPassenger@e4: - PassengerTypes: e4 - OnEnter: HBOX.e4 - OnExit: HBOX - SkipMakeAnims: true - TransformOnPassenger@e7: - PassengerTypes: e7 - OnEnter: HBOX.e7 - OnExit: HBOX - SkipMakeAnims: true - TransformOnPassenger@SHOK: - PassengerTypes: shok - OnEnter: HBOX.shok - OnExit: HBOX - SkipMakeAnims: true - TransformOnPassenger@Sniper: - PassengerTypes: sniper - OnEnter: HBOX.sniper - OnExit: HBOX - SkipMakeAnims: true DetectCloaked: Range: 6 + RenderRangeCircle: + FallbackRange: 6c0 + AutoTarget: + AttackGarrisoned: + Armaments: garrisoned + PortOffsets: 384,0,128, 224,-341,128, -224,-341,128, -384,0,128, -224,341,128, 224,341,128 + PortYaws: 0, 176, 341, 512, 682, 853 + PortCones: 86, 86, 86, 86, 86, 86 +# Legacy definitions to keep compatibility with outdated maps HBOX.E1: Inherits: HBOX - Buildable: - Queue: Defense - BuildPaletteOrder: 20 - Prerequisites: tent - Owner: allies - Hotkey: l - Tooltip: - Name: Camo Pillbox (Guns) - Description: Hidden defensive structure.\nCan detect cloaked units.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft + -Buildable: RenderBuilding: Image: HBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Vulcan - LocalOffset: 400,0,48 - MuzzleSequence: muzzle - AttackTurreted: - WithMuzzleFlash: - Cargo: - InitialUnits: e1 HBOX.E3: Inherits: HBOX - Tooltip: - Name: Camo Pillbox (Rockets) + -Buildable: RenderBuilding: Image: HBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Dragon - LocalOffset: 400,0,48 - AttackTurreted: HBOX.E4: Inherits: HBOX - Tooltip: - Name: Camo Pillbox (Flamethrower) + -Buildable: RenderBuilding: Image: HBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Flamer - LocalOffset: 400,0,48 - AttackTurreted: HBOX.E7: Inherits: HBOX - Tooltip: - Name: Camo Pillbox (Tanya) + -Buildable: RenderBuilding: Image: HBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Colt45 - LocalOffset: 400,0,48 - AttackTurreted: HBOX.SHOK: Inherits: HBOX - Tooltip: - Name: Camo Pillbox (Tesla) + -Buildable: RenderBuilding: Image: HBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: PortaTesla - LocalOffset: 400,0,48 - AttackTurreted: HBOX.SNIPER: Inherits: HBOX - Tooltip: - Name: Camo Pillbox (Sniper) + -Buildable: RenderBuilding: Image: HBOX - RenderRangeCircle: - AutoTarget: - Armament: - Weapon: Sniper - LocalOffset: 400,0,48 - AttackTurreted: GUN: Inherits: ^Building diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index f5775bd9f0..37fe1b68b0 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -64,6 +64,10 @@ e1: Start: 0 Length: 6 Tick: 1600 + garrison-muzzle: minigun + Start: 0 + Length: 6 + Facings: 8 icon: e1icon Start: 0 @@ -132,6 +136,11 @@ sniper: Start: 0 Length: 6 Tick: 1600 + garrison-muzzle: minigun + Start: 0 + Length: 3 + Stride: 6 + Facings: 8 icon: snipericon Start: 0 @@ -644,6 +653,11 @@ e7: Start: 176 Length: 7 Facings: 8 + garrison-muzzle: minigun + Start: 0 + Length: 3 + Stride: 6 + Facings: 8 icon: e7icon Start: 0