replace soviet mammoth with apoc

patrickwieth · Jul 20, 2024 · 31e36a8 · 31e36a8
1 parent 602c76a
commit 31e36a8
Show file tree

Hide file tree

Showing 25 changed files with 360 additions and 615 deletions.
diff --git a/mods/ca/bits/misc/overlays/countericonoverlay.shp b/mods/ca/bits/misc/overlays/countericonoverlay.shp
diff --git a/mods/ca/bits/soviet/apoctank.bmp b/mods/ca/bits/soviet/apoctank.bmp
diff --git a/mods/ca/bits/soviet/apoctank.vxl b/mods/ca/bits/soviet/apoctank.vxl
diff --git a/mods/ca/bits/soviet/apoctanktur.bmp b/mods/ca/bits/soviet/apoctanktur.bmp
diff --git a/mods/ca/bits/soviet/apoctanktur.vxl b/mods/ca/bits/soviet/apoctanktur.vxl
diff --git a/mods/ca/maps/island-wars-ii-shell/map.yaml b/mods/ca/maps/island-wars-ii-shell/map.yaml
@@ -693,7 +693,7 @@ Actors:
 		TurretFacing: 201
 		Facing: 201
 		Stance: AttackAnything
-	Actor256: 4tnk
+	Actor256: apoc
 		Location: 66,59
 		Facing: 92
 		TurretFacing: 85

diff --git a/mods/ca/maps/island-wars-ii-shell/shellmap.lua b/mods/ca/maps/island-wars-ii-shell/shellmap.lua
@@ -20,7 +20,7 @@ ProducedUnitTypes =
 	{ factory = ANavalYard1, types = { "pt2" } },
 	{ factory = SSubPen1, types = { "ss" } },
 	{ factory = AlliedWarFactory1, types = { "mtnk", "Mammoth", "msam" } },
-	{ factory = SovietWarFactory1, types = { "3tnk", "4tnk", "ttnk" } }
+	{ factory = SovietWarFactory1, types = { "3tnk", "apoc", "ttnk" } }
 }
 
 BindActorTriggers = function(a)

diff --git a/mods/ca/rules/ai/brutal.yaml b/mods/ca/rules/ai/brutal.yaml
@@ -276,7 +276,7 @@ Player:
 			tnkd: 45
 			rtnk: 45
 			3tnk: 70
-			4tnk: 40
+			apoc: 40
 			tpod: 40
 			rptp: 40
 			ltnk: 40

diff --git a/mods/ca/rules/ai/easy.yaml b/mods/ca/rules/ai/easy.yaml
@@ -260,7 +260,7 @@ Player:
 			tnkd: 45
 			rtnk: 45
 			3tnk: 70
-			4tnk: 40
+			apoc: 40
 			tpod: 40
 			rptp: 40
 			ltnk: 40

diff --git a/mods/ca/rules/ai/hard.yaml b/mods/ca/rules/ai/hard.yaml
@@ -269,7 +269,7 @@ Player:
 			tnkd: 45
 			rtnk: 45
 			3tnk: 70
-			4tnk: 40
+			apoc: 40
 			tpod: 40
 			rptp: 40
 			ltnk: 40

diff --git a/mods/ca/rules/ai/normal.yaml b/mods/ca/rules/ai/normal.yaml
@@ -261,7 +261,7 @@ Player:
 			tnkd: 45
 			rtnk: 45
 			3tnk: 70
-			4tnk: 40
+			apoc: 40
 			tpod: 40
 			rptp: 40
 			ltnk: 40

diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml
@@ -962,124 +962,6 @@ hack.cameo_filler.109b:
 		BuildPaletteOrder: 118
 		Prerequisites: prerequisite.has_points, ~vehicles.soviet, disabled, ~filler.btr
 
-commander_tree.Mammoth_Tank:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Mammoth Tank
-	Buildable:
-		Queue: Commander_Tree
-		BuildPaletteOrder: 119
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, techcenter, ~vehicles.soviet, ~disabled
-		Description: Enables to build the Mammoth Tank.\n  The Mammoth is a slow and very heavy tank, which can be further specialized.
-
-commander_tree.Mammoth_Tank.TT:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Mammoth Tesla Turret
-	Buildable:
-		Queue: Commander_Tree
-		IconPalette: chrometd
-		BuildPaletteOrder: 120
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!commander_tree.mammoth_tank.ns, ~!commander_tree.mammoth_tank.pt
-		Description: The Mammoth Tank is upgraded with a Tesla Weapon System. \n  Energy based weapons systems cannot be shot down by Point Defense Systems. \n  The Mammoth can no longer shoot on aircraft.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.sovietmammoth
-
-commander_tree.Mammoth_Tank.NS:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Mammoth Nuclear Shells
-	Buildable:
-		Queue: Commander_Tree
-		IconPalette: chrometd
-		BuildPaletteOrder: 120
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.iraq, techcenter, ~!commander_tree.mammoth_tank.tt, ~!commander_tree.mammoth_tank.pt
-		Description: The Mammoth is upgraded with Nuclear Shells. \n  Nuclear Shells deal a lot of damage to the target and its surroundings. \n  Nuclear Shells are weak vs. Point Laser Defense Systems.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.sovietmammoth
-
-commander_tree.Mammoth_Tank.PT:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Mammoth Propaganda Tower
-	Buildable:
-		Queue: Commander_Tree
-		IconPalette: chrometd
-		BuildPaletteOrder: 120
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~!vehicles.iraq, techcenter, ~!commander_tree.mammoth_tank.tt, ~!commander_tree.mammoth_tank.ns
-		Description: The Mammoth is upgraded with a Propaganda Speaker.\n  This gives infantry in its proximity a boost in combat.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.sovietmammoth
-
-commander_tree.Mammoth_Tank.PDL:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Mammoth Point Laser Defense
-	Buildable:
-		Queue: Commander_Tree
-		IconPalette: chrometd
-		BuildPaletteOrder: 121
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~filler.sovietmammoth, ~!commander_tree.mammoth_tank.reflector
-		Description: Upgrades the Mammoth with a Point Laser Defense System to shoot down incoming projectiles.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.sovietmammoth2
-
-commander_tree.Mammoth_Tank.Reflector:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Mammoth PDL Reflector Armor
-	Buildable:
-		Queue: Commander_Tree
-		IconPalette: chrometd
-		BuildPaletteOrder: 121
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~filler.sovietmammoth, ~!commander_tree.mammoth_tank.pdl
-		Description: Equips the Mammoth with Reflector Armor. \n Very resistent vs. Energy Weapons.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.sovietmammoth2
-
-hack.cameo_filler.110:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 122
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, disabled
-
-hack.cameo_filler.111:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 122
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, disabled, ~filler.sovietmammoth2
-
-commander_tree.Apocalypse:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Apocalypse Tank
-	Buildable:
-		Queue: Commander_Tree
-		BuildPaletteOrder: 123
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~!vehicles.iraq, techcenter
-		Description: Unlocks the Apocalypse Tank. It is very good at breaking through PDL defenses.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.apoc
-
-hack.cameo_filler.112:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 124
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, disabled
-
-hack.cameo_filler.112a:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 124
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, disabled
-
 commander_tree.Hind.Tesla:
 	Inherits: ^default.commander_tree_item
 	Tooltip:

diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
@@ -1811,11 +1811,13 @@ PROC.Dummy:
 	Inherits: ^Tank
 
 ^BigVehicle:
+	Mobile:
+		TurnSpeed: 16
 	Passenger:
 		Weight: 6
 	Selectable:
 		Bounds: 1536, 1536
-	#Shrapnel?
+	Inherits: ^ThrowsShrapnel
 
 ^VehicleVision:
 	RevealsShroud:

diff --git a/mods/ca/rules/husks.yaml b/mods/ca/rules/husks.yaml
@@ -24,19 +24,6 @@
 	RenderSprites:
 		Image: 2tnk.destroyed
 
-4TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Mammoth Tank)
-	ThrowsParticle@turret:
-		Anim: turret
-	TransformOnCapture:
-		IntoActor: 4tnk
-	InfiltrateForTransform:
-		IntoActor: 4tnk
-	RenderSprites:
-		Image: 4tnk.destroyed
-
 HARV.FullHusk:
 	Inherits: ^Husk
 	Tooltip:
@@ -1751,19 +1738,6 @@ TTNK.RA2.Husk:
 	RenderSprites:
 		Image: ttnk.ra2.destroyed
 
-APOC.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Apocalypse)
-	ThrowsParticle@turret:
-		Anim: turret
-	TransformOnCapture:
-		IntoActor: apoc
-	InfiltrateForTransform:
-		IntoActor: apoc
-	RenderSprites:
-		Image: apoc.destroyed
-
 NHAW.Husk:
 	Inherits: ^HelicopterHusk
 	Tooltip:

diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml
@@ -118,9 +118,9 @@ CRATE:
 		Units: 3tnk
 		ValidFactions: soviet, russia, nkorea, iraq
 		Prerequisites: ~!techlevel.infonly, ~!techlevel.aircraft
-	GiveUnitCrateAction@4tnk:
+	GiveUnitCrateAction@apoc:
 		SelectionShares: 3
-		Units: 4tnk
+		Units: apoc
 		ValidFactions: soviet, russia, nkorea, iraq
 		Prerequisites: ~!techlevel.infonly, ~!techlevel.aircraft, techcenter
 	GiveUnitCrateAction@Mammoth:

diff --git a/mods/ca/rules/misc/overlays.yaml b/mods/ca/rules/misc/overlays.yaml
@@ -23,6 +23,11 @@ Player:
 		Image: iconoverlays
 		Palette: chrometd
 		Sequence: chainer
+	ProductionIconOverlayManager@Counter:
+		Type: Counter
+		Image: iconoverlays
+		Palette: chrometd
+		Sequence: counter
 	ProductionIconOverlayManager@Crosshair:
 		Type: Crosshair
 		Image: iconoverlays

diff --git a/mods/ca/rules/soviet/commander-tree.yaml b/mods/ca/rules/soviet/commander-tree.yaml
@@ -1,3 +1,15 @@
+commander_tree.War_Miners:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: War Miners
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 5
+		IconPalette: chrome
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~structures.soviet, ~anypower
+		Description: Equips Miners with a gatling turret. \nWar Miners can attack ground and air.
+
 commander_tree.Heavy_Tank.AP:
 	Inherits: ^default.commander_tree_item
 	Tooltip:
@@ -67,17 +79,117 @@ hack.cameo_filler.107a:
 		BuildPaletteOrder: 113
 		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~filler.3tnk, disabled
 
-commander_tree.War_Miners:
+
+commander_tree.Apocalypse_Tank:
 	Inherits: ^default.commander_tree_item
 	Tooltip:
-		Name: War Miners
+		Name: Apocalypse Tank
+	RenderSprites:
+		Image: apoc
 	Buildable:
 		Queue: Commander_Tree
-		BuildPaletteOrder: 5
-		IconPalette: chrome
+		BuildPaletteOrder: 119
 		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~structures.soviet, ~anypower
-		Description: Equips Miners with a gatling turret. \nWar Miners can attack ground and air.
+		Prerequisites: prerequisite.has_points, techcenter, ~vehicles.soviet, ~disabled
+		Description: Enables to build the Mammoth Tank.\n  The Mammoth is a slow and very heavy tank, which can be further specialized.
+
+commander_tree.Apocalypse_Tank.Drozd:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Apocalypse Tank Drozd Upgrade
+	RenderSprites:
+		Image: apoc
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 120
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!commander_tree.apocalypse_tank.nuke_shells, ~!commander_tree.apocalypse_tank.propaganda
+		Description: The Apocalypse Tank is upgraded with a Drozd Weapon System. \n  The Drozd system fires chaff, which is good at depleting PDL systems. \n  The Apocalypse Tank can no longer shoot on aircraft.
+	WithProductionIconOverlay@Counter:
+		Types: Counter
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.apocalypse_tank
+
+commander_tree.Apocalypse_Tank.Nuke_Shells:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Apocalypse Tank Nuclear Shells
+	RenderSprites:
+		Image: apoc
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 120
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, techcenter, ~!commander_tree.apocalypse_tank.drozd, ~!commander_tree.apocalypse_tank.propaganda
+		Description: The Apocalypse Tank is upgraded with Nuclear Shells. \n  Nuclear Shells deal a lot of damage to the target and its surroundings. \n  Nuclear Shells are weak vs. Point Laser Defense Systems.
+	WithProductionIconOverlay@Nuke:
+		Types: Nuke
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.apocalypse_tank
+
+commander_tree.Apocalypse_Tank.Propaganda:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Apocalypse Tank Propaganda Tower
+	RenderSprites:
+		Image: apoc
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 120
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~!vehicles.iraq, techcenter, ~!commander_tree.apocalypse_tank.drozd, ~!commander_tree.apocalypse_tank.nuke_shells
+		Description: The Apocalypse Tank is upgraded with a Propaganda Speaker.\n  This gives infantry in its proximity a boost in combat.
+	WithProductionIconOverlay@Speaker:
+		Types: Speaker
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.apocalypse_tank
+
+commander_tree.Apocalypse_Tank.PDL:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Apocalypse Tank Point Laser Defense
+	RenderSprites:
+		Image: apoc
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 121
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~filler.apocalypse_tank, ~!commander_tree.apocalypse_tank.reflector
+		Description: Upgrades the Apocalypse Tank with a Point Laser Defense System to shoot down incoming projectiles.
+	WithProductionIconOverlay@PDL:
+		Types: PDL
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.apocalypse_tank2
+
+commander_tree.Apocalypse_Tank.Reflector:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Apocalypse Tank Reflector Armor
+	RenderSprites:
+		Image: apoc
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 121
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~filler.apocalypse_tank, ~!commander_tree.apocalypse_tank.pdl
+		Description: Equips the Apocalypse Tank with Reflector Armor. \n Very resistent vs. Energy Weapons.
+	WithProductionIconOverlay@Reflector:
+		Types: Reflector
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.apocalypse_tank2
+
+hack.cameo_filler.110:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 122
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, disabled
+
+hack.cameo_filler.111:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 122
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, disabled, ~filler.apocalypse_tank2
+
 
 commander_tree.Rice_Cooker:
 	Inherits: ^default.commander_tree_item