From b619dd14c56767425aabf9f3101ba1f8d0c551e1 Mon Sep 17 00:00:00 2001 From: Gustas <37534529+PunkPun@users.noreply.github.com> Date: Mon, 5 Dec 2022 15:43:34 +0200 Subject: [PATCH] Remove sniper --- mods/ra/maps/ant-01/rules.yaml | 4 - mods/ra/maps/fort-lonestar/map.yaml | 2 + mods/ra/maps/fort-lonestar/rules.yaml | 48 ++++++++++ mods/ra/maps/fort-lonestar/sequences.yaml | 89 +++++++++++++++++ .../{bits => maps/fort-lonestar}/sniper.shp | Bin .../fort-lonestar}/snipericon.shp | Bin mods/ra/maps/fort-lonestar/weapons.yaml | 7 ++ mods/ra/rules/infantry.yaml | 56 ----------- mods/ra/sequences/infantry.yaml | 90 ------------------ mods/ra/weapons/smallcaliber.yaml | 6 -- 10 files changed, 146 insertions(+), 156 deletions(-) create mode 100644 mods/ra/maps/fort-lonestar/sequences.yaml rename mods/ra/{bits => maps/fort-lonestar}/sniper.shp (100%) rename mods/ra/{bits => maps/fort-lonestar}/snipericon.shp (100%) diff --git a/mods/ra/maps/ant-01/rules.yaml b/mods/ra/maps/ant-01/rules.yaml index 580d5c8f11..8f42fe6d1a 100644 --- a/mods/ra/maps/ant-01/rules.yaml +++ b/mods/ra/maps/ant-01/rules.yaml @@ -80,10 +80,6 @@ SPY: Buildable: Prerequisites: ~disabled -SNIPER: - Buildable: - Prerequisites: ~disabled - MGG: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index e992a14f10..51c30b9dd1 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -465,4 +465,6 @@ Rules: rules.yaml Weapons: weapons.yaml +Sequences: sequences.yaml + Music: music.yaml diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index 720cc2fe7c..fc4dea3bd0 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -273,12 +273,60 @@ SHOK: Cost: 150 SNIPER: + Inherits: ^Soldier Valued: Cost: 200 + Tooltip: + Name: Sniper + UpdatesPlayerStatistics: + AddToArmyValue: true Buildable: + Queue: Infantry + BuildAtProductionType: Soldier + BuildPaletteOrder: 80 Prerequisites: barracks + Description: Elite sniper infantry unit.\nCan detect cloaked units.\n Strong vs Infantry\n Weak vs Vehicles, Aircraft Health: HP: 20000 + Passenger: + CustomPipType: red + RevealsShroud: + Range: 6c0 + AutoTarget: + InitialStance: HoldFire + InitialStanceAI: ReturnFire + AutoTargetPriority@DEFAULT: + ValidTargets: Infantry + Armament@PRIMARY: + Weapon: Sniper + Armament@GARRISONED: + Name: garrisoned + Weapon: Sniper + MuzzleSequence: garrison-muzzle + WithInfantryBody: + DefaultAttackSequence: shoot + RequiresCondition: !parachute + WithInfantryBody@PARACHUTE: + RequiresCondition: parachute + Palette: player-noshadow + IsPlayerPalette: true + Cloak: + InitialDelay: 250 + CloakDelay: 120 + CloakSound: + UncloakSound: + UncloakOn: Attack, Unload, Infiltrate, Demolish, Move + IsPlayerPalette: true + PauseOnCondition: cloak-force-disabled + GrantConditionOnDamageState@UNCLOAK: + Condition: cloak-force-disabled + ValidDamageStates: Critical + -MustBeDestroyed: + ProducibleWithLevel: + Prerequisites: barracks.upgraded + WithProductionIconOverlay: + Types: Veterancy + Prerequisites: barracks.upgraded SNIPER.soviets: Inherits: SNIPER diff --git a/mods/ra/maps/fort-lonestar/sequences.yaml b/mods/ra/maps/fort-lonestar/sequences.yaml new file mode 100644 index 0000000000..794a68ac17 --- /dev/null +++ b/mods/ra/maps/fort-lonestar/sequences.yaml @@ -0,0 +1,89 @@ +sniper: + stand: + Facings: 8 + stand2: + Start: 8 + Facings: 8 + run: + Start: 16 + Length: 6 + Facings: 8 + Tick: 100 + shoot: + Start: 64 + Length: 16 + Facings: 8 + prone-stand: + Start: 208 + Stride: 4 + Facings: 8 + prone-stand2: + Start: 208 + Stride: 4 + Facings: 8 + prone-run: + Start: 208 + Length: 4 + Facings: 8 + Tick: 100 + liedown: + Start: 192 + Length: 2 + Facings: 8 + standup: + Start: 240 + Length: 2 + Facings: 8 + prone-shoot: + Start: 256 + Length: 16 + Facings: 8 + idle1: + Start: 384 + Length: 14 + Tick: 120 + idle2: + Start: 399 + Length: 16 + Tick: 120 + die1: + Start: 416 + Length: 8 + Tick: 80 + die2: + Start: 424 + Length: 8 + Tick: 80 + die3: + Start: 432 + Length: 8 + Tick: 80 + die4: + Start: 440 + Length: 12 + Tick: 80 + die5: + Start: 452 + Length: 18 + Tick: 80 + die6: electro + Frames: 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 + Length: * + Tick: 80 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + die-crushed: corpse1 + Length: 6 + Tick: 1600 + ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + garrison-muzzle: minigun + Length: 3 + Stride: 6 + Facings: 8 + icon: snipericon diff --git a/mods/ra/bits/sniper.shp b/mods/ra/maps/fort-lonestar/sniper.shp similarity index 100% rename from mods/ra/bits/sniper.shp rename to mods/ra/maps/fort-lonestar/sniper.shp diff --git a/mods/ra/bits/snipericon.shp b/mods/ra/maps/fort-lonestar/snipericon.shp similarity index 100% rename from mods/ra/bits/snipericon.shp rename to mods/ra/maps/fort-lonestar/snipericon.shp diff --git a/mods/ra/maps/fort-lonestar/weapons.yaml b/mods/ra/maps/fort-lonestar/weapons.yaml index 728419a7fd..dff83cac76 100644 --- a/mods/ra/maps/fort-lonestar/weapons.yaml +++ b/mods/ra/maps/fort-lonestar/weapons.yaml @@ -174,3 +174,10 @@ SilencedPPK: ValidTargets: Infantry, Vehicle, Husk Versus: Heavy: 50 + +Sniper: + Inherits: ^SnipeWeapon + ReloadDelay: 70 + Range: 10c0 + Warhead@1Dam: SpreadDamage + Damage: 14000 diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 88016ba7b5..3699ea4953 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -731,62 +731,6 @@ SHOK: Types: Veterancy Prerequisites: barracks.upgraded -SNIPER: - Inherits: ^Soldier - Valued: - Cost: 700 - Tooltip: - Name: Sniper - UpdatesPlayerStatistics: - AddToArmyValue: true - Buildable: - Queue: Infantry - BuildAtProductionType: Soldier - BuildPaletteOrder: 80 - Prerequisites: ~disabled - Description: Elite sniper infantry unit.\nCan detect cloaked units.\n Strong vs Infantry\n Weak vs Vehicles, Aircraft - Health: - HP: 8000 - Passenger: - CustomPipType: red - RevealsShroud: - Range: 6c0 - AutoTarget: - InitialStance: HoldFire - InitialStanceAI: ReturnFire - AutoTargetPriority@DEFAULT: - ValidTargets: Infantry - Armament@PRIMARY: - Weapon: Sniper - Armament@GARRISONED: - Name: garrisoned - Weapon: Sniper - MuzzleSequence: garrison-muzzle - WithInfantryBody: - DefaultAttackSequence: shoot - RequiresCondition: !parachute - WithInfantryBody@PARACHUTE: - RequiresCondition: parachute - Palette: player-noshadow - IsPlayerPalette: true - Cloak: - InitialDelay: 250 - CloakDelay: 120 - CloakSound: - UncloakSound: - UncloakOn: Attack, Unload, Infiltrate, Demolish, Move - IsPlayerPalette: true - PauseOnCondition: cloak-force-disabled - GrantConditionOnDamageState@UNCLOAK: - Condition: cloak-force-disabled - ValidDamageStates: Critical - -MustBeDestroyed: - ProducibleWithLevel: - Prerequisites: barracks.upgraded - WithProductionIconOverlay: - Types: Veterancy - Prerequisites: barracks.upgraded - Zombie: Inherits: ^Soldier Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index 27cc4dc739..737fab4bea 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -114,96 +114,6 @@ e1: Frames: 42,43,44,45,46,47,42,43,44,45,46,47 icon: e1icon -sniper: - stand: - Facings: 8 - stand2: - Start: 8 - Facings: 8 - run: - Start: 16 - Length: 6 - Facings: 8 - Tick: 100 - shoot: - Start: 64 - Length: 16 - Facings: 8 - prone-stand: - Start: 208 - Stride: 4 - Facings: 8 - prone-stand2: - Start: 208 - Stride: 4 - Facings: 8 - prone-run: - Start: 208 - Length: 4 - Facings: 8 - Tick: 100 - liedown: - Start: 192 - Length: 2 - Facings: 8 - standup: - Start: 240 - Length: 2 - Facings: 8 - prone-shoot: - Start: 256 - Length: 16 - Facings: 8 - idle1: - Start: 384 - Length: 14 - Tick: 120 - idle2: - Start: 399 - Length: 16 - Tick: 120 - die1: - Start: 416 - Length: 8 - Tick: 80 - die2: - Start: 424 - Length: 8 - Tick: 80 - die3: - Start: 432 - Length: 8 - Tick: 80 - die4: - Start: 440 - Length: 12 - Tick: 80 - die5: - Start: 452 - Length: 18 - Tick: 80 - die6: electro - Frames: 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 - Length: * - Tick: 80 - UseTilesetExtension: true - TilesetOverrides: - DESERT: TEMPERAT - INTERIOR: TEMPERAT - die-crushed: corpse1 - Length: 6 - Tick: 1600 - ZOffset: -511 - UseTilesetExtension: true - TilesetOverrides: - DESERT: TEMPERAT - INTERIOR: TEMPERAT - garrison-muzzle: minigun - Length: 3 - Stride: 6 - Facings: 8 - icon: snipericon - e3: stand: Facings: 8 diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml index 688dea6b30..dba644c6ff 100644 --- a/mods/ra/weapons/smallcaliber.yaml +++ b/mods/ra/weapons/smallcaliber.yaml @@ -334,9 +334,3 @@ Colt45: Warhead@1Dam: SpreadDamage Damage: 5000 -Sniper: - Inherits: ^SnipeWeapon - ReloadDelay: 70 - Range: 10c0 - Warhead@1Dam: SpreadDamage - Damage: 14000