Merge branch 'master' of github.com:patrickwieth/YMCA

patrickwieth · Jun 30, 2024 · f5298a8 · f5298a8
2 parents 1e65ee2 + 279180c
commit f5298a8
Show file tree

Hide file tree

Showing 39 changed files with 609 additions and 715 deletions.
diff --git a/mods/ca/bits/allies/rocketinfantry.shp b/mods/ca/bits/allies/rocketinfantry.shp
diff --git a/mods/ca/bits/allies/rocketinfantryicon.shp b/mods/ca/bits/allies/rocketinfantryicon.shp
diff --git a/mods/ca/bits/soviet/heavytank.hva b/mods/ca/bits/soviet/heavytank.hva
diff --git a/mods/ca/bits/soviet/heavytank.vxl b/mods/ca/bits/soviet/heavytank.vxl
diff --git a/mods/ca/bits/soviet/heavytanktur.hva b/mods/ca/bits/soviet/heavytanktur.hva
diff --git a/mods/ca/bits/soviet/heavytanktur.vxl b/mods/ca/bits/soviet/heavytanktur.vxl
diff --git a/mods/ca/bits/soviet/rpgsoldiericon.shp b/mods/ca/bits/soviet/rpgsoldiericon.shp
diff --git a/mods/ca/maps/delirium-shell/map.bin b/mods/ca/maps/delirium-shell/map.bin
diff --git a/mods/ca/maps/delirium-shell/map.png b/mods/ca/maps/delirium-shell/map.png
diff --git a/mods/ca/maps/delirium-shell/map.yaml b/mods/ca/maps/delirium-shell/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 11
+MapFormat: 12
 
 RequiresMod: ca
 
@@ -1074,37 +1074,37 @@ Actors:
 		TurretFacing: 384
 		SubCell: 3
 		Location: 84,86
-	Actor385: e3
+	Actor385: rocket_infantry
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384
 		Location: 84,87
 		SubCell: 3
-	Actor386: e3
+	Actor386: rocket_infantry
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384
 		SubCell: 1
 		Location: 85,87
-	Actor387: e3
+	Actor387: rocket_infantry
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384
 		Location: 73,78
 		SubCell: 3
-	Actor388: e3
+	Actor388: rocket_infantry
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384
 		SubCell: 3
 		Location: 69,87
-	Actor389: e3
+	Actor389: rocket_infantry
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384
 		SubCell: 3
 		Location: 77,89
-	Actor390: e3
+	Actor390: rocket_infantry
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384
@@ -1207,7 +1207,6 @@ Actors:
 		Location: 96,77
 		Facing: 80
 		Stance: AttackAnything
-		Health: 100
 	Actor431: tpod
 		Owner: Multi2
 		Facing: 384

diff --git a/mods/ca/maps/delirium-shell/rules.yaml b/mods/ca/maps/delirium-shell/rules.yaml
@@ -42,7 +42,7 @@ World:
 powerproxy.paratroopers:
 	ParatroopersPower:
 		DisplayBeacon: false
-		DropItems: light_infantry,light_infantry,E2,E3,flamethrower
+		DropItems: light_infantry,light_infantry,E2,rocket_infantry,flamethrower
 
 PROC:
 	FreeActor:

diff --git a/mods/ca/maps/delirium-shell/shellmap.lua b/mods/ca/maps/delirium-shell/shellmap.lua
@@ -10,20 +10,20 @@
 NodLightUnitTypes = { "bike", "bike", "bggy", "rmbc", "rmbc", "stormtrooper", "stormtrooper", "stormtrooper", "stormtrooper", "rocket_cyborg", "rocket_cyborg" }
 NodHeavyUnitTypes = { "mtnk", "mtnk", "ftnk", "ftnk", "wtnk", "wtnk", "cdrn" }
 NodAirUnitTypes = {"scrn", "scrn", "scrn"}
-AlliedUnitTypes = { "jeep", "1tnk", "ifv.ai", "1tnk", "rtnk", "ifv.ai", "ptnk", "light_infantry", "light_infantry", "light_infantry", "light_infantry", "e3", "e3", "e3", "e3" }
+AlliedUnitTypes = { "jeep", "1tnk", "ifv.ai", "1tnk", "rtnk", "ifv.ai", "ptnk", "light_infantry", "light_infantry", "light_infantry", "light_infantry", "rocket_infantry", "rocket_infantry", "rocket_infantry", "rocket_infantry" }
 ScrinUnitTypes = { "seek", "seek", "gunw", "devo", "tpod", "s1", "s1", "s1", "s1", "s3", "s3" }
 ScrinAirUnitTypes = {"deva", "stmr", "stmr"}
 ProducedUnitTypes =
 {
-	{ factory = AlliedBarracks1, types = { "light_infantry", "e3" } },
+	{ factory = AlliedBarracks1, types = { "light_infantry", "rocket_infantry" } },
 	{ factory = ScrinBarracks1, types = { "s1", "s3" } },
 	{ factory = NodBarracks1, types = { "adept", "rocket_trooper", "n4" } },
 	{ factory = AlliedWarFactory1, types = { "1tnk", "2tnk", "ptnk", "jeep", "ifv.ai", "cryo", "rtnk" } },
 	{ factory = ScrinWarFactory1, types = { "seek", "tpod", "gunw", "devo", "corr" } },
 	{ factory = NodWarFactory1, types = { "ltnk", "ftnk", "stnk", "arty.nod", "mlrs" } }
 }
 
-HelicopterUnitTypes = { "light_infantry", "light_infantry", "light_infantry", "light_infantry", "e3", "e3" };
+HelicopterUnitTypes = { "light_infantry", "light_infantry", "light_infantry", "light_infantry", "rocket_infantry", "rocket_infantry" };
 
 BindActorTriggers = function(a)
 	if a.HasProperty("Hunt") then

diff --git a/mods/ca/maps/island-wars-ii-shell/rules.yaml b/mods/ca/maps/island-wars-ii-shell/rules.yaml
@@ -72,4 +72,4 @@ World:
 powerproxy.paratroopers:
 	ParatroopersPower:
 		DisplayBeacon: false
-		DropItems: conscript,conscript,E2,E3,flamethrower
+		DropItems: conscript,conscript,E2,E3.soviet,flamethrower
diff --git a/mods/ca/maps/island-wars-ii-shell/shellmap.lua b/mods/ca/maps/island-wars-ii-shell/shellmap.lua
@@ -10,12 +10,12 @@
 UnitTypes = { "3tnk", "ttnk" }
 GDIUnitTypes = { "mtnk", "mtnk" }
 GDIMLRSTypes = { "msam", "msam" }
-BeachUnitTypes = { "conscript", "e2", "e3", "flamethrower", "conscript", "e2", "e3", "flamethrower", "conscript", "e2", "e3", "flamethrower", "conscript", "e2", "e3", "shok" }
+BeachUnitTypes = { "conscript", "e2", "e3.soviet", "flamethrower", "conscript", "e2", "e3.soviet", "flamethrower", "conscript", "e2", "e3.soviet", "flamethrower", "conscript", "e2", "e3.soviet", "shok" }
 GDIBeachUnitTypes = { "mercenary", "n2", "rocket_mercenary", "n2", "mercenary", "n2", "rocket_mercenary", "mercenary", "mercenary", "n2", "rocket_mercenary", "mercenary", "mercenary", "mercenary", "mercenary", "mercenary" }
 ProducedUnitTypes =
 {
-	{ factory = AlliedBarracks1, types = { "light_infantry", "e3" } },
-	{ factory = SovietBarracks1, types = { "conscript", "e2", "e3" } },
+	{ factory = AlliedBarracks1, types = { "light_infantry", "rocket_infantry" } },
+	{ factory = SovietBarracks1, types = { "conscript", "e2", "e3.soviet" } },
 	{ factory = SKennel1, types = { "dog" } },
 	{ factory = ANavalYard1, types = { "pt2" } },
 	{ factory = SSubPen1, types = { "ss" } },

diff --git a/mods/ca/rules/ai/brutal.yaml b/mods/ca/rules/ai/brutal.yaml
@@ -216,7 +216,8 @@ Player:
 			conscript: 65
 			light_infantry: 65
 			e2: 25
-			e3: 40
+			e3.soviet: 40
+			rocket_infantry: 40
 			flamethrower: 15
 			e6: 5
 			adept: 65

diff --git a/mods/ca/rules/ai/easy.yaml b/mods/ca/rules/ai/easy.yaml
@@ -200,7 +200,8 @@ Player:
 			conscript: 65
 			light_infantry: 65
 			e2: 25
-			e3: 40
+			e3.soviet: 40
+			rocket_infantry: 40
 			flamethrower: 15
 			e6: 5
 			adept: 65

diff --git a/mods/ca/rules/ai/hard.yaml b/mods/ca/rules/ai/hard.yaml
@@ -209,7 +209,8 @@ Player:
 			conscript: 65
 			light_infantry: 65
 			e2: 25
-			e3: 40
+			e3.soviet: 40
+			rocket_infantry: 40
 			flamethrower: 15
 			e6: 5
 			adept: 65

diff --git a/mods/ca/rules/ai/naval.yaml b/mods/ca/rules/ai/naval.yaml
@@ -159,7 +159,8 @@ Player:
 			conscript: 65
 			light_infantry: 65
 			e2: 25
-			e3: 40
+			e3.soviet: 40
+			rocket_infantry: 40
 			flamethrower: 15
 			adept: 65
 			mercenary: 65

diff --git a/mods/ca/rules/ai/normal.yaml b/mods/ca/rules/ai/normal.yaml
@@ -201,7 +201,8 @@ Player:
 			conscript: 65
 			light_infantry: 65
 			e2: 25
-			e3: 40
+			e3.soviet: 40
+			rocket_infantry: 40
 			flamethrower: 15
 			e6: 5
 			adept: 65

diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml
@@ -781,7 +781,7 @@ TRAN.Eagle:
 		TurnSpeed: 20
 		Speed: 155
 	Cargo:
-		InitialUnits: e3, e3, e3, e3
+		InitialUnits: rocket_infantry, rocket_infantry, rocket_infantry, rocket_infantry
 	AutoTarget:
 		InitialStance: Defend
 		InitialStanceAI: Defend

diff --git a/mods/ca/rules/allies/defaults.yaml b/mods/ca/rules/allies/defaults.yaml
@@ -40,14 +40,14 @@
 		ClassName: Light Support
 		Factions: allies, england, france, germany
 		BaseActor: mcv
-		SupportActors: light_infantry,light_infantry,light_infantry,e3,e3
+		SupportActors: light_infantry,light_infantry,light_infantry,rocket_infantry,rocket_infantry
 		InnerSupportRadius: 3
 		OuterSupportRadius: 5
 	StartingUnits@heavyallies:
 		Class: heavy
 		ClassName: Heavy Support
 		Factions: allies, england, france, germany
 		BaseActor: mcv
-		SupportActors: light_infantry,light_infantry,light_infantry,e3,e3,e3,2tnk,2tnk
+		SupportActors: light_infantry,light_infantry,light_infantry,rocket_infantry,rocket_infantry,rocket_infantry,2tnk,2tnk
 		InnerSupportRadius: 3
 		OuterSupportRadius: 5