diff --git a/AUTHORS b/AUTHORS index e932e095..6887f28e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -92,6 +92,7 @@ Contributors & special thanks to: * Chrono Loony (Black Hand Trooper) * Moder.U (T-34) * Stingerr (Seahawk) + * god_l1ke1 (SpecOps) Of course YMCA wouldn't exist today without OpenRA & the hard work of the many OpenRA contributors. diff --git a/mods/ca/bits/allies/specops.shp b/mods/ca/bits/allies/specops.shp new file mode 100644 index 00000000..0012a2c9 Binary files /dev/null and b/mods/ca/bits/allies/specops.shp differ diff --git a/mods/ca/bits/spec.shp b/mods/ca/bits/spec.shp deleted file mode 100644 index b1b5ed9b..00000000 Binary files a/mods/ca/bits/spec.shp and /dev/null differ diff --git a/mods/ca/bits/specops.shp b/mods/ca/bits/specops.shp deleted file mode 100644 index 0cdd6e42..00000000 Binary files a/mods/ca/bits/specops.shp and /dev/null differ diff --git a/mods/ca/bits/yuri.shp b/mods/ca/bits/yuri.shp deleted file mode 100644 index 50ab3e57..00000000 Binary files a/mods/ca/bits/yuri.shp and /dev/null differ diff --git a/mods/ca/bits/yuria.shp b/mods/ca/bits/yuria.shp deleted file mode 100644 index 18380c46..00000000 Binary files a/mods/ca/bits/yuria.shp and /dev/null differ diff --git a/mods/ca/bits/yurib.shp b/mods/ca/bits/yurib.shp deleted file mode 100644 index 00e48929..00000000 Binary files a/mods/ca/bits/yurib.shp and /dev/null differ diff --git a/mods/ca/bits/yuric.shp b/mods/ca/bits/yuric.shp deleted file mode 100644 index 60ae5fdd..00000000 Binary files a/mods/ca/bits/yuric.shp and /dev/null differ diff --git a/mods/ca/rules/allies/infantry.yaml b/mods/ca/rules/allies/infantry.yaml index 8bd21b6f..70f2f876 100644 --- a/mods/ca/rules/allies/infantry.yaml +++ b/mods/ca/rules/allies/infantry.yaml @@ -158,3 +158,51 @@ Cryotrooper: PauseOnCondition: being-warped FacingTolerance: 0 Inherits: ^PointLaserDefenseSystemSmall + +SpecOps: + Inherits: ^Soldier + Inherits: ^PrioAntiInfantry + Inherits: ^InfantryRA2Sprite + Inherits: ^SensorEquipment + Inherits: ^CloakedAttacker + Buildable: + Queue: Infantry + BuildAtProductionType: Soldier + BuildPaletteOrder: 100 + Prerequisites: ~infantry.allies, atek, ~commander_tree.advanced_infantry_training, ~commander_tree.spec_ops + Description: Marks Vehicles and Buildings with a laser allowing rocket infantry to shoot at these from great distance.\n Can detect other stealthed units. + Valued: + Cost: 800 + Passenger: + Voice: Move + Guard: + Voice: Move + Voiced: + VoiceSet: InfilVoice + WithInfantryBody: + StandSequences: stand + IdleSequences: idle1, idle2, idle3 + Health: + HP: 4000 + Mobile: + speed: 73 + Voice: Move + Tooltip: + Name: Special Operations + AttackFrontal: + Voice: Attack + PauseOnCondition: being-warped + FacingTolerance: 0 + Armament: + Weapon: SilencedPPK + FireDelay: 5 + Armament@SECONADARY: + LocalOffset: 250,0,400 + Weapon: relayMarker + Armament@Garrison: + Name: mounted + Weapon: relayMarker + IgnoresDisguise: + Cloak@NORMAL: + IsPlayerPalette: true + Palette: cloakts diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml index 2e11ab13..e00516b5 100644 --- a/mods/ca/rules/commander-tree.yaml +++ b/mods/ca/rules/commander-tree.yaml @@ -148,9 +148,7 @@ commander_tree.Spec_Ops: Tooltip: Name: Spec Ops Buildable: - BuildPaletteOrder: 7 - Prerequisites: prerequisite.has_points, ~infantry.allies, commander_tree.advanced_infantry_training, techcenter Description: Marks Vehicles and Buildings with a laser allowing rocket infantry to shoot at these from great distance.\n Can detect other stealthed units. @@ -159,9 +157,7 @@ commander_tree.Prism_Tank: Tooltip: Name: Prism Tank Buildable: - BuildPaletteOrder: 9 - Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_blaster, ~!vehicles.england Description: Enables to build the Prism Tank, an energy based weapon with high range.\n Srong versus light vehicles and infantry. ProvidesPrerequisite@filler: diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml index 8a7d397a..381fbdab 100644 --- a/mods/ca/rules/defaults.yaml +++ b/mods/ca/rules/defaults.yaml @@ -4805,7 +4805,7 @@ PROC.Dummy: RequiresCondition: hidden ^CloakedInfiltrator: - Cloak: + Cloak@NORMAL: InitialDelay: 100 CloakDelay: 200 CloakedCondition: hidden diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml index add3e53a..1155a576 100644 --- a/mods/ca/rules/infantry.yaml +++ b/mods/ca/rules/infantry.yaml @@ -977,50 +977,6 @@ Mortar.Chemical: WithDeathAnimation: DeathSequencePalette: playertd -SpecOps: - Inherits: ^Soldier - Inherits: ^PrioAntiInfantry - Inherits: ^SensorEquipment - Inherits: ^CloakedAttacker - Buildable: - Queue: Infantry - BuildAtProductionType: Soldier - BuildPaletteOrder: 100 - Prerequisites: ~infantry.allies, atek, ~commander_tree.advanced_infantry_training, ~commander_tree.spec_ops - Description: Marks Vehicles and Buildings with a laser allowing rocket infantry to shoot at these from great distance.\n Can detect other stealthed units. - Valued: - Cost: 800 - Passenger: - Voice: Move - Guard: - Voice: Move - Voiced: - VoiceSet: InfilVoice - WithInfantryBody: - StandSequences: stand - IdleSequences: idle1 - Health: - HP: 4000 - Mobile: - speed: 73 - Voice: Move - Tooltip: - Name: Special Operations - AttackFrontal: - Voice: Attack - PauseOnCondition: being-warped - FacingTolerance: 0 - Armament@PRIMARY: - LocalOffset: 150,0,300 - Weapon: relayMarker - Armament@SECONADARY: - Name: Secondary - Weapon: SilencedPPK - Armament@Garrison: - Name: mounted - Weapon: relayMarker - IgnoresDisguise: - JJET: Inherits: ^Infantry Inherits: ^PrioAntiLight diff --git a/mods/ca/sequences/infantry.yaml b/mods/ca/sequences/infantry.yaml index d9707c2e..d6ce2118 100644 --- a/mods/ca/sequences/infantry.yaml +++ b/mods/ca/sequences/infantry.yaml @@ -1551,6 +1551,8 @@ n6: specops: Inherits: ^CommonDeaths + Defaults: + Scale: 0.8 stand: specops Facings: 8 run: specops @@ -1559,48 +1561,43 @@ specops: Facings: 8 Tick: 100 shoot: specops - Start: 56 - Length: 4 - Facings: 8 - prone-stand: specops - Start: 104 - Stride: 4 - Facings: 8 - prone-run: specops - Start: 104 - Length: 4 - Facings: 8 - Tick: 100 - standup: specops - Start: 136 - Length: 2 + Start: 177 + Length: 20 Facings: 8 - prone-shoot: specops - Start: 152 - Length: 4 + cheer: specops + Start: 112 + Length: 20 Facings: 8 idle1: specops - Start: 184 - Length: 26 + Start: 56 + Length: 18 + Tick: 120 + idle2: specops + Start: 56 + Length: 18 + Tick: 120 + idle3: specops + Start: 133 + Length: 36 Tick: 120 die1: specops - Start: 210 - Length: 8 + Start: 75 + Length: 20 die2: specops - Start: 218 - Length: 8 + Start: 95 + Length: 17 die3: specops - Start: 226 - Length: 8 + Start: 75 + Length: 20 die4: specops - Start: 234 - Length: 12 + Start: 95 + Length: 17 die5: specops - Start: 246 - Length: 18 + Start: 75 + Length: 20 die7: specops - Start: 210 - Length: 8 + Start: 95 + Length: 17 chrono-overlay: chronofade_small Length: * BlendMode: Additive