Replaced Yuri parabombs with chaos bombs.

Inq8 · Feb 3, 2024 · b574668 · b574668
1 parent bd137df
commit b574668
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 22 deletions.
diff --git a/mods/ca/bits/chaosbombicon.shp b/mods/ca/bits/chaosbombicon.shp
diff --git a/mods/ca/maps/ca-composition-tester/composition-tester.lua b/mods/ca/maps/ca-composition-tester/composition-tester.lua
@@ -312,6 +312,7 @@ IgnoredUnits = {
 	"badr.cbomber",
 	"badr.nbomber",
 	"badr.mbomber",
+	"badr.chaosbomber",
 	"b2b",
 	"p51",
 	"tran.paradrop",

diff --git a/mods/ca/maps/ca-composition-tester/rules.yaml b/mods/ca/maps/ca-composition-tester/rules.yaml
@@ -14,6 +14,7 @@ Player:
 	Inherits@CARPETBOMBPOWER: ^CarpetBombPower
 	Inherits@ATOMBOMBPOWER: ^AtomBombPower
 	Inherits@MUTABOMBPOWER: ^MutaBombPower
+	Inherits@CHAOSBOMBSPOWER: ^ChaosBombsPower
 	Inherits@NANITEREPAIRPOWER: ^NaniteRepairPower
 	Inherits@NANITESHIELDPOWER: ^NaniteShieldPower
 	Inherits@SHADOWTEAMPOWER: ^ShadowTeamPower
@@ -43,6 +44,9 @@ Player:
 	AirstrikePower@Iraqiparabombs:
 		-Prerequisites:
 		ChargeInterval: 1
+	AirstrikePower@ChaosBombs:
+		-Prerequisites:
+		ChargeInterval: 1
 	AirstrikePower@MutaBomb:
 		-Prerequisites:
 		ChargeInterval: 1

diff --git a/mods/ca/maps/ca-composition-tournament/rules.yaml b/mods/ca/maps/ca-composition-tournament/rules.yaml
@@ -245,6 +245,20 @@ MSHP:
 	SpawnActorAbility:
 		Range: 10c0
 
+AFLD:
+	-AirstrikePower@Russianparabombs:
+	-AirstrikePower@CarpetBomb:
+	-AirstrikePower@Iraqiparabombs:
+	-AirstrikePower@ChaosBombs:
+
+DOME:
+	-AirstrikePower@clustermines:
+	-SpawnActorPowerCA@VeilOfWar:
+	-ParatroopersPower@paratroopers:
+	-ParatroopersPower@Russianparatroopers:
+	-AirstrikePower@MutaBomb:
+	-AirstrikePower@spyplane:
+
 # ####
 
 hazmat.upgrade:

diff --git a/mods/ca/maps/ca20-subjugation/rules.yaml b/mods/ca/maps/ca20-subjugation/rules.yaml
@@ -206,10 +206,10 @@ TTRK:
 
 DOME:
 	-AirstrikePower@spyplane:
+	-AirstrikePower@MutaBomb:
 
 HPAD:
-	-AirstrikePower@Russianparabombs:
-	-AirstrikePower@MutaBomb:
+	-AirstrikePower@ChaosBombs:
 
 SILO:
 	Power:

diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml
@@ -128,6 +128,11 @@ BADR.MBomber:
 	Armament:
 		Weapon: GeneticMutationBomb
 
+BADR.ChaosBomber:
+	Inherits: BADR.Bomber
+	Armament:
+		Weapon: ChaosBomb
+
 B2B:
 	Inherits: ^NeutralPlane
 	Inherits@EMP: ^EmpDisable

diff --git a/mods/ca/rules/custom/composition-tester.yaml b/mods/ca/rules/custom/composition-tester.yaml
@@ -1327,10 +1327,6 @@ AFLD:
 	-SpawnActorsOnSell:
 	-SpawnActorOnDeath:
 	-SpawnRandomActorOnDeath:
-	-AirstrikePower@Russianparabombs:
-	-AirstrikePower@CarpetBomb:
-	-AirstrikePower@Iraqiparabombs:
-	-AirstrikePower@MutaBomb:
 	Capturable:
 		Types: None
 		RequiresCondition: being-captured
@@ -1346,11 +1342,6 @@ DOME:
 	-SpawnActorsOnSell:
 	-SpawnActorOnDeath:
 	-SpawnRandomActorOnDeath:
-	-AirstrikePower@clustermines:
-	-SpawnActorPowerCA@VeilOfWar:
-	-ParatroopersPower@paratroopers:
-	-ParatroopersPower@Russianparatroopers:
-	-AirstrikePower@spyplane:
 	Capturable:
 		Types: None
 		RequiresCondition: being-captured

diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml
@@ -373,6 +373,9 @@ ToxicCloud:
 	RenderSprites:
 		Image: cloud1
 		Palette: tseffect-ignore-lighting-alpha75
+	# required for death animation
+	Health:
+		HP: 1
 	WithSpriteBody:
 	BodyOrientation:
 		QuantizedFacings: 1

diff --git a/mods/ca/rules/powers.yaml b/mods/ca/rules/powers.yaml
@@ -445,7 +445,7 @@
 ^ParabombsPower:
 	AirstrikePower@Russianparabombs:
 		OrderName: parabombs
-		Prerequisites: ~support.parabombs
+		Prerequisites: ~aircraft.russia
 		PauseOnCondition: empdisable || being-warped
 		Icon: parabombs
 		ChargeInterval: 7500
@@ -473,7 +473,7 @@
 ^CarpetBombPower:
 	AirstrikePower@CarpetBomb:
 		OrderName: carpetbomb
-		Prerequisites: ~radar.ukraine
+		Prerequisites: ~aircraft.ukraine
 		PauseOnCondition: empdisable || being-warped
 		Icon: carpetbomb
 		ChargeInterval: 10500
@@ -501,7 +501,7 @@
 ^AtomBombPower:
 	AirstrikePower@Iraqiparabombs:
 		OrderName: atombomb
-		Prerequisites: ~radar.iraq
+		Prerequisites: ~aircraft.iraq
 		PauseOnCondition: empdisable || being-warped
 		Icon: abombair
 		ChargeInterval: 10500
@@ -554,27 +554,50 @@
 		CircleSequence: circles
 		UseDirectionalTarget: True
 		DirectionArrowAnimation: paradirection
+		SupportPowerPaletteOrder: 50
+
+^ChaosBombsPower:
+	AirstrikePower@ChaosBombs:
+		OrderName: chaosbombs
+		Prerequisites: ~aircraft.yuri
+		PauseOnCondition: empdisable || being-warped
+		Icon: chaosbombs
+		ChargeInterval: 8250
+		Name: Chaos Bombs
+		Description: \nCalls in a Badger bomber which drops parachuted\n    chaos bombs on your target.
+		SelectTargetSpeechNotification: SelectTarget
+		SelectTargetTextNotification: Select target.
+		EndChargeSpeechNotification: ParabombsReady
+		EndChargeTextNotification: Chaos bombs ready.
+		CameraActor: camera.paradrop
+		CameraRemoveDelay: 150
+		UnitType: badr.chaosbomber
+		QuantizedFacings: 8
+		DisplayBeacon: true
+		BeaconPoster: pbmbicon
+		SquadSize: 1
+		SquadOffset: 0,1792,0
+		ArrowSequence: arrow
+		ClockSequence: clock
+		CircleSequence: circles
+		UseDirectionalTarget: True
+		DirectionArrowAnimation: paradirection
 		SupportPowerPaletteOrder: 45
 
 ^SovietRadarPowers:
 	Inherits@SPYPLANEPOWER: ^SpyPlanePower
 	Inherits@PARATROOPERSPOWER: ^ParatroopersPower
 	Inherits@STORMTROOPERSPOWER: ^StormTroopersPower
+	Inherits@MUTABOMBPOWER: ^MutaBombPower
 	ProvidesPrerequisiteValidatedFaction@paratroopers:
 		Factions: ukraine, iraq
 		Prerequisite: support.paratroopers
-	ProvidesPrerequisiteValidatedFaction@stormtroopers:
-		Factions: russia
-		Prerequisite: support.stormtroopers
 
 ^SovietBombingPowers:
 	Inherits@PARABOMBSPOWER: ^ParabombsPower
 	Inherits@CARPETBOMBPOWER: ^CarpetBombPower
 	Inherits@ATOMBOMBPOWER: ^AtomBombPower
-	Inherits@MUTABOMBPOWER: ^MutaBombPower
-	ProvidesPrerequisiteValidatedFaction@parabombs:
-		Factions: russia, yuri
-		Prerequisite: support.parabombs
+	Inherits@CHAOSBOMBPOWER: ^ChaosBombsPower
 
 ^AtomicAmmoPower:
 	GrantExternalConditionPowerCA@ATOMICAMMO:

diff --git a/mods/ca/rules/world.yaml b/mods/ca/rules/world.yaml
@@ -293,7 +293,7 @@
 		Name: Psi-Corps
 		InternalName: yuri
 		Side: Soviet
-		Description: Psychic Corps: Mind Control & Genetics\n Units:\n  • Brute\n  • Floating Disc (replaces Kirov)\n  • Chaos Drone (replaces MAD Tank)\n  • Yuri (replaces Boris)\n\n Powers:\n  • Genetic Mutation Bomb\n  • Parabombs\n\n Upgrades:\n  • Lasher Tank
+		Description: Psychic Corps: Mind Control & Genetics\n Units:\n  • Brute\n  • Floating Disc (replaces Kirov)\n  • Chaos Drone (replaces MAD Tank)\n  • Yuri (replaces Boris)\n\n Powers:\n  • Genetic Mutation Bomb\n  • Chaos Bombs\n\n Upgrades:\n  • Lasher Tank
 	Faction@8:
 		Name: GDI
 		InternalName: gdi

diff --git a/mods/ca/sequences/misc.yaml b/mods/ca/sequences/misc.yaml
@@ -1737,6 +1737,8 @@ icon:
 		Filename: abombicon.shp
 	mutabomb:
 		Filename: gmutationicon.shp
+	chaosbombs:
+		Filename: chaosbombicon.shp
 	stormtroopers:
 		Filename: stroopicon.shp
 	atomicammo:

diff --git a/mods/ca/weapons/superweapons.yaml b/mods/ca/weapons/superweapons.yaml
@@ -38,6 +38,17 @@ ParaBomb:
 		ValidTargets: Water, Underwater
 		InvalidTargets: Ship, Structure
 
+ChaosBomb:
+	Inherits: ParaBomb
+	Warhead@3Eff: CreateEffect
+		Explosions: chaosexplosion
+		ExplosionPalette: caneon
+		ImpactSounds: firebl3.aud
+	Warhead@Cloud1: SpawnActor
+		Actors: chaoscloud, chaoscloud2
+		Range: 5
+		ValidTargets: Ground, Water, Trees
+
 CarpetBomb:
 	Inherits: ParaBomb
 	Report: bwhis.aud