brute

patrickwieth · Nov 15, 2024 · a0ed4a2 · a0ed4a2
1 parent 0346e75
commit a0ed4a2
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 33 deletions.
diff --git a/mods/ca/bits/jjeticnh.shp b/mods/ca/bits/jjeticnh.shp
diff --git a/mods/ca/bits/yuri/brute.shp b/mods/ca/bits/yuri/brute.shp
diff --git a/mods/ca/bits/yuri/genmutanim.shp b/mods/ca/bits/yuri/genmutanim.shp
diff --git a/mods/ca/mod.yaml b/mods/ca/mod.yaml
@@ -47,6 +47,7 @@ Packages:
 	ca|bits/audio
 	ca|uibits
 	ca|bits/scrin
+	ca|bits/yuri
 	ca|bits/scrin/audio
 	ca|bits/newscrin
 	ca|bits/misc
@@ -162,6 +163,7 @@ Sequences:
 	ca|sequences/gdi.yaml
 	ca|sequences/nod.yaml
 	ca|sequences/scrin.yaml
+	ca|sequences/yuri.yaml
 	ca|sequences/china.yaml
 	ca|sequences/soviet.yaml
 	ca|sequences/gla.yaml

diff --git a/mods/ca/rules/allies/commander-tree.yaml b/mods/ca/rules/allies/commander-tree.yaml
@@ -201,7 +201,6 @@ commander_tree.Huey.Cryo:
 	Tooltip:
 		Name: Cryo Huey Upgrade
 	Buildable:
-		IconPalette: chrometd
 		BuildPaletteOrder: 37
 		Prerequisites: prerequisite.has_points, ~aircraft.allies, ~!commander_tree.huey.grenade, ~!commander_tree.huey.recon
 		Description: Upgrades the attack of the Huey with cryo missiles, slowing down enemies.

diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
@@ -1458,7 +1458,7 @@ PROC.Dummy:
 	ExternalCondition@GMUT:
 		Condition: geneticmutation
 	SpawnActorOnDeath@GMUT:
-		Actor: brut.mutating
+		Actor: brute.mutating
 		OwnerType: Killer
 		DeathType: MutatedDeath
 		SpawnAfterDefeat: false

diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml
@@ -1192,8 +1192,9 @@ LEADER:
 		PauseOnCondition: loaded
 
 
-BRUT:
+Brute:
 	Inherits: ^Soldier
+	Inherits: ^InfantryRA2Sprite
 	Inherits@Armor: ^LightArmor
 	Inherits: ^PrioAntiHeavy
 	AutoTarget:
@@ -1232,7 +1233,6 @@ BRUT:
 	AttackSounds:
 		Sounds: ibruatta.aud, ibruattb.aud
 	WithDeathAnimation:
-		DeathSequencePalette: overlayplayertd
 		DeathSequence: die
 		UseDeathTypeSuffix: true
 		DeathTypes:
@@ -1269,10 +1269,10 @@ BRUT:
 	-SpawnActorOnDeath@GMUT:
 	-Targetable@GMUT:
 
-BRUT.Mutating:
-	Inherits: BRUT
+Brute.Mutating:
+	Inherits: Brute
 	RenderSprites:
-		Image: brut
+		Image: brute
 	RejectsOrders:
 	WithFacingSpriteBody:
 		Sequence: stand
@@ -1282,7 +1282,7 @@ BRUT.Mutating:
 		RequiresCondition: !mutating
 		Delay: 10
 	SpawnActorOnDeath@GMUT:
-		Actor: brut
+		Actor: brute
 		OwnerType: Victim
 		SpawnAfterDefeat: false
 	-UpdatesPlayerStatistics:

diff --git a/mods/ca/rules/scrin.yaml b/mods/ca/rules/scrin.yaml
@@ -247,7 +247,7 @@ FEED:
 		PipCount: 7
 
 GSCR:
-	Inherits: BRUT
+	Inherits: Brute
 	Inherits: ^ScrinInfantrySprite
 	RenderSprites:
 		Image: gscr
@@ -265,7 +265,7 @@ GSCR:
 		Sounds: gscr-attack1.aud, gscr-attack2.aud
 
 GSCR.Mutating:
-	Inherits: BRUT.Mutating
+	Inherits: Brute.Mutating
 	Inherits: ^ScrinInfantrySprite
 	SpawnActorOnDeath@GMUT:
 		Actor: gscr

diff --git a/mods/ca/sequences/yuri.yaml b/mods/ca/sequences/yuri.yaml
@@ -1,5 +1,5 @@
 
-brut:
+brute:
 	Defaults: brute
 		Offset: 0, 0
 	stand: brute
@@ -21,39 +21,37 @@ brut:
 		Tick: 100
 	idle1: brute
 		Start: 395
-		Length: 16
+		Length: 15
 		Tick: 100
-	idle2: brut
-		Start: 97
-		Length: 9
+	idle2: brute
+		Start: 410
+		Length: 10
 		Tick: 100
-	make: brut
-		Start: 156
-		Length: 14
-		Tick: 80
+	make: genmutanim
+		Tick: 180
 	die1: brute
 		Start: 360
 		Length: 34
 		Tick: 100
-	die2: brut
-		Start: 114
-		Length: 9
+	die2: brute
+		Start: 360
+		Length: 34
+		Tick: 100
+	die5: brute
+		Start: 360
+		Length: 34
+		Tick: 100
+	die6: brute
+		Start: 360
+		Length: 34
 		Tick: 100
-	die5: brut
-		Start: 144
-		Length: 12
-		Tick: 80
-	die6: brut
-		Start: 131
-		Length: 13
-		Tick: 40
 	die8: chronozapTD
 		AddExtension: True
 		Length: *
 		BlendMode: Alpha
-	die10: brut
-		Start: 123
-		Length: 8
+	die10: brute
+		Start: 360
+		Length: 34
 		Tick: 100
 	chrono-overlay: chronofade_small
 		Length: *