sniper new model, fixes of wrong anims of inf (grenadier, yo brother)

patrickwieth · Jan 19, 2025 · 3460498 · 3460498
1 parent 0f787f0
commit 3460498
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 180 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -83,14 +83,14 @@ Contributors & special thanks to:
 	* Augusto (Red Guard, Minigunner, Tank Hunter)
 	* DarkStar (snct.shp/SonicTurret)
 	* Conman (Bi Xi Dragon)
-	* Medalmonkey/DerekPlus (Obelisktrooper, Mirage Trooper/Saboteur, Mercenary, Stormtrooper, Shock Trooper, Railgunner/Parasite, Cryotrooper)
+	* Medalmonkey/DerekPlus (Obelisktrooper, Mirage Trooper/Saboteur, Mercenary, Stormtrooper, Shock Trooper, Railgunner/Parasite, Cryotrooper, Sniper)
 	* m7 (Microwave Tank)
 	* Merophage/RAPD (conscript, light infantry, engineer/mechanic)
 	* unknown_men (Crazy Ivan)
 	* Blade (Yuri/Psispy)
 	* BDragon1727 (Acid effects)
 	* Chrono Loony (Black Hand Trooper)
-	* Moder.U (T-34)
+	* Moder.U (T-34)	
 	* Stingerr (Seahawk)
 	* tom2050 (Zombie/Brute)
 	* god_l1ke1 (SpecOps, Thor, Yo Brother/Heavy, Engineer)

diff --git a/mods/ca/bits/allies/sniper.shp b/mods/ca/bits/allies/sniper.shp
diff --git a/mods/ca/bits/sniper.shp b/mods/ca/bits/sniper.shp
diff --git a/mods/ca/rules/allies/infantry.yaml b/mods/ca/rules/allies/infantry.yaml
@@ -159,6 +159,72 @@ Cryotrooper:
 		FacingTolerance: 0
 	Inherits: ^PointLaserDefenseSystemSmall
 
+Sniper:
+	Inherits: ^Soldier
+	Inherits: ^PrioAntiInfantry
+	Inherits: ^ScoutEquipment
+	Inherits: ^CloakedAttacker
+	Inherits: ^InfantryRA2Sprite
+	Buildable:
+		Queue: Infantry
+		BuildAtProductionType: Soldier
+		BuildPaletteOrder: 55
+		Prerequisites: ~infantry.england, dome, ~commander_tree.advanced_infantry_training
+		Description: Elite marksman infantry.\n Armed with a powerful sniper rifle.\n  Strong vs Infantry, Vehicles\n  Weak vs Aircraft, Structures\n  Special Ability: Camouflage\n  Special Ability: Kill Driver
+	Valued:
+		Cost: 1000
+	Tooltip:
+		Name: Sniper
+	UpdatesPlayerStatistics:
+		AddToArmyValue: true
+	Health:
+		HP: 4500
+	Armament@PRIMARY:
+		Weapon: sniper
+	Armament@Garrison:
+		Weapon: sniperE
+		Name: mounted
+	Armament@DRIVER_SNIPE:
+		Name: driver_snipe
+		Weapon: sniper.vehicle
+		PauseOnCondition: !ammo
+	AmmoPool:
+		Ammo: 1
+		Armaments: driver_snipe
+		Name: driver_snipe
+		AmmoCondition: ammo
+	WithAmmoPipsDecoration:
+		Position: BottomLeft
+		Margin: 4, 3
+		RequiresSelection: true
+	RenderRangeCircle:
+		Color: 0A880A
+	ReloadArmamentsBar:
+		Armaments: driver_snipe
+	ReloadAmmoPool:
+		AmmoPool: driver_snipe
+		Delay: 500
+	Mobile:
+		speed: 73
+		Voice: Move
+	AttackFrontal:
+		Voice: Attack
+		Armaments: primary, driver_snipe, laser
+		PauseOnCondition: being-warped
+		FacingTolerance: 0
+	WithInfantryBody:
+		StandSequences: stand, stand2
+	Passenger:
+		CustomPipType: red
+		Voice: Move
+	Guard:
+		Voice: Move
+	Voiced:
+		VoiceSet: SniperVoice
+	WithAmmoPipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+
 MECH:
 	Inherits: ^Soldier
 	Inherits: ^InfantryRA2Sprite
@@ -241,9 +307,9 @@ SPY:
 SpecOps:
 	Inherits: ^Soldier
 	Inherits: ^PrioAntiInfantry
-	Inherits: ^InfantryRA2Sprite
 	Inherits: ^SensorEquipment
 	Inherits: ^CloakedAttacker
+	Inherits: ^InfantryRA2Sprite
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -282,9 +348,6 @@ SpecOps:
 		Name: mounted
 		Weapon: relayMarker
 	IgnoresDisguise:
-	Cloak@NORMAL:
-		IsPlayerPalette: true
-		Palette: cloakts
 
 Thor:
 	Inherits: ^Soldier

diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
@@ -87,6 +87,9 @@
 		DeathSequencePalette: playerra2
 	GrantCondition@Model:
 		Condition: ra2sprite
+	Cloak@NORMAL:
+		IsPlayerPalette: true
+		Palette: cloakts
 
 ^InfantryRASprite:
 	RenderSprites:
@@ -4614,7 +4617,7 @@ PROC.Dummy:
 			bori: loaded
 			obelisk_trooper: loaded
 			mort: loaded
-			snip: loaded
+			sniper: loaded
 			shok: loaded
 			shok.nod: loaded
 			sab: loaded

diff --git a/mods/ca/rules/gdi/infantry.yaml b/mods/ca/rules/gdi/infantry.yaml
@@ -47,8 +47,6 @@ Grenadier:
 	WithInfantryBody:
 		StandSequences: stand
 		DefaultAttackSequence: throw
-	WithDeathAnimation:
-		DeathSequencePalette: playertd
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall

diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml
@@ -317,76 +317,6 @@ VICE:
 	Targetable:
 		TargetTypes: Ground, Infantry, Creep, ChaosImmune, MindControlImmune
 
-SNIP:
-	Inherits: ^Soldier
-	Inherits: ^PrioAntiInfantry
-	Inherits: ^ScoutEquipment
-	Inherits: ^CloakedAttacker
-	RenderSprites:
-		Image: sniper
-	Buildable:
-		Queue: Infantry
-		BuildAtProductionType: Soldier
-		BuildPaletteOrder: 55
-		Prerequisites: ~infantry.england, dome, ~commander_tree.advanced_infantry_training
-		Description: Elite marksman infantry.\n Armed with a powerful sniper rifle.\n  Strong vs Infantry, Vehicles\n  Weak vs Aircraft, Structures\n  Special Ability: Camouflage\n  Special Ability: Kill Driver
-	Valued:
-		Cost: 1000
-	Tooltip:
-		Name: Sniper
-	UpdatesPlayerStatistics:
-		AddToArmyValue: true
-	Health:
-		HP: 4500
-	Armament@PRIMARY:
-		Weapon: sniper
-	Armament@Garrison:
-		Weapon: sniperE
-		Name: mounted
-	Armament@DRIVER_SNIPE:
-		Name: driver_snipe
-		Weapon: sniper.vehicle
-		PauseOnCondition: !ammo
-	AmmoPool:
-		Ammo: 1
-		Armaments: driver_snipe
-		Name: driver_snipe
-		AmmoCondition: ammo
-	WithAmmoPipsDecoration:
-		Position: BottomLeft
-		Margin: 4, 3
-		RequiresSelection: true
-	RenderRangeCircle:
-		Color: 0A880A
-	ReloadArmamentsBar:
-		Armaments: driver_snipe
-	ReloadAmmoPool:
-		AmmoPool: driver_snipe
-		Delay: 500
-	Mobile:
-		speed: 73
-		Voice: Move
-	AttackFrontal:
-		Voice: Attack
-		Armaments: primary, driver_snipe, laser
-		PauseOnCondition: being-warped
-		FacingTolerance: 0
-	WithInfantryBody:
-		StandSequences: stand, stand2
-	Passenger:
-		CustomPipType: red
-		Voice: Move
-	Guard:
-		Voice: Move
-	Voiced:
-		VoiceSet: SniperVoice
-	WithAmmoPipsDecoration:
-		Position: BottomLeft
-		RequiresSelection: true
-	WithAmmoPipsDecoration:
-		Position: BottomLeft
-		RequiresSelection: true
-
 Mortar:
 	Inherits: ^Soldier
 	Inherits: ^PrioArtillery

diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml
@@ -593,7 +593,7 @@ powerproxy.paratroopers2:
 		Description: A Chinook drops a squad of infantry\nanywhere on the map.
 		OneShot: true
 		AllowMultiple: true
-		DropItems: light_infantry,light_infantry,SNIP,rocket_infantry,rocket_infantry
+		DropItems: light_infantry,light_infantry,sniper,rocket_infantry,rocket_infantry
 		SelectTargetSpeechNotification: SelectTarget
 		EndChargeSpeechNotification: Reinforce
 		LaunchSpeechNotification: ReinforcementsArrived

diff --git a/mods/ca/sequences/gdi.yaml b/mods/ca/sequences/gdi.yaml
@@ -346,36 +346,36 @@ rmbo:
 		Length: 22
 		Tick: 120
 	idle2: yobrother
-		Start: 22
-		Length: 15
+		Start: 137
+		Length: 24
 		Tick: 120
 	idle3: yobrother
 		Start: 37
 		Length: 26
 		Tick: 120
 	cheer: yobrother
-		Start: 137
-		Length: 24
+		Start: 22
+		Length: 15
 		Tick: 120
 	die1: yobrother
-		Start: 63
-		Length: 18
+		Start: 209
+		Length: 23
 		Tick: 80
 	die2: yobrother
 		Start: 209
 		Length: 23
 		Tick: 80
 	die3: yobrother
-		Start: 63
-		Length: 18
+		Start: 209
+		Length: 23
 		Tick: 80
 	die4: yobrother
 		Start: 209
 		Length: 23
 		Tick: 80
 	die5: yobrother
-		Start: 63
-		Length: 18
+		Start: 209
+		Length: 23
 		Tick: 80
 	die7: yobrother
 		Start: 209