merge

patrickwieth · Jul 13, 2024 · dad4f4b · dad4f4b
2 parents afbe984 + a01bc46
commit dad4f4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/mods/ca/rules/allies/infantry.yaml b/mods/ca/rules/allies/infantry.yaml
@@ -34,6 +34,8 @@ Rocket_Infantry:
 	Inherits: ^WhiteFlash
 	Inherits: ^PrioAntiHeavyAA
 	Inherits: ^RelayTargeting
+	RenderSprites:
+		Image: rocket_infantry
 	Buildable:
 		Queue: Infantry
 		BuildAtProductionType: Soldier
@@ -119,30 +121,6 @@ Rocket_Infantry.cryo:
 		Weapon: RedEyeE
 		LocalOffset: 0,0,555
 		PauseOnCondition: !ammo || being-warped
-	-WithInfantryBody:
-	WithInfantryBody:
-		IdleSequences: idle-cryo1, idle-cryo2
-		StandSequences: stand-cryo, stand-cryo2
-		AttackSequences: shoot-cryo
-		DefaultAttackSequence: shoot-cryo
-		MoveSequence: run-cryo
-	-WithDeathAnimation:
-	WithDeathAnimation:
-		DeathSequence: die-cryo
-		DeathSequencePalette: overlayplayertd
-		DeathTypes:
-			DefaultDeath: 1
-			BulletDeath: 2
-			SmallExplosionDeath: 3
-			ExplosionDeath: 4
-			FireDeath: 5
-			ElectricityDeath: 6
-			PoisonDeath: 7
-			ChronoDeath: 8
-			ToxinDeath: 9
-			RadiationDeath: 10
-			FrozenDeath: 11
-		CrushedSequence: die-crushed
 
 Cryotrooper:
 	Inherits: ^Soldier

diff --git a/mods/ca/rules/china/commander-tree.yaml b/mods/ca/rules/china/commander-tree.yaml
@@ -415,7 +415,7 @@ commander_tree.Nuke_Cannon.Range:
 commander_tree.Nuke_Cannon.Neutron:
 	Inherits: ^default.commander_tree_item
 	Tooltip:
-		Name: Nuke Cannon Neutron Upgrade
+		Name: Nuke Cannon Neutron Bomb Upgrade
 	RenderSprites:
 		Image: chnukecann
 	WithProductionIconOverlay@Neutron: