Extra Units Additions (#3390)

Handful of submarines, conforming to new bos standards
beyond-all-reason · Jul 15, 2024 · 4c7de94 · 4c7de94
1 parent 006aaa1
commit 4c7de94
Show file tree

Hide file tree

Showing 46 changed files with 3,094 additions and 3 deletions.
diff --git a/gamedata/alldefs_post.lua b/gamedata/alldefs_post.lua
@@ -500,12 +500,18 @@ function UnitDef_Post(name, uDef)
 			uDef.buildoptions[numBuildoptions + 2] = "armdecadet3"
 			uDef.buildoptions[numBuildoptions + 3] = "armpshipt3"
 			uDef.buildoptions[numBuildoptions + 4] = "armserpt3"
-			uDef.buildoptions[numBuildoptions + 5] = "armtrident"
+			uDef.buildoptions[numBuildoptions + 5] = "armexcalibur"
+			uDef.buildoptions[numBuildoptions + 6] = "armseadragon"
+			uDef.buildoptions[numBuildoptions + 7] = "armtrident"
+			uDef.buildoptions[numBuildoptions + 8] = "armdronecarry"
 		elseif name == "corasy" then
 			local numBuildoptions = #uDef.buildoptions
 			uDef.buildoptions[numBuildoptions + 1] = "corslrpc"
 			uDef.buildoptions[numBuildoptions + 2] = "coresuppt3"
-			uDef.buildoptions[numBuildoptions + 3] = "corsentinel"
+			uDef.buildoptions[numBuildoptions + 3] = "coronager"
+			uDef.buildoptions[numBuildoptions + 4] = "cordesolator"
+			uDef.buildoptions[numBuildoptions + 5] = "corsentinel"
+			uDef.buildoptions[numBuildoptions + 6] = "cordronecarry"
 		end
 	end
 

diff --git a/gamedata/armordefs.lua b/gamedata/armordefs.lua
@@ -623,6 +623,10 @@ local armorDefs = {
         "coracsub",
 		"armrecl",
 		"correcl",
+		"coronager",
+		"cordesolator",
+		"armexcalibur",
+		"armseadragon",
 	},
 
 	raptor =

diff --git a/gamedata/icontypes.lua b/gamedata/icontypes.lua
@@ -299,6 +299,10 @@ local icontypes = {
 		bitmap = "icons/energystorage.png",
 		size = 1.10249984
 	},
+	armexcalibur = {
+		bitmap = "icons/sub_t2_coastal.png",
+		size = 2.2
+	},
 	armeyes = {
 		bitmap = "icons/eye.png",
 		size = 0.89249998
@@ -775,6 +779,10 @@ local icontypes = {
 		bitmap = "icons/seismic.png",
 		size = 1.46999991
 	},
+	armseadragon = {
+		bitmap = "icons/sub_t3_nuke.png",
+		size = 2.8
+	},
 	armseap = {
 		bitmap = "icons/air_torp_sea.png",
 		size = 1.57499993
@@ -1263,6 +1271,10 @@ local icontypes = {
 		bitmap = "icons/cordemon.png",
 		size = 2.625
 	},
+	cordesolator = {
+		bitmap = "icons/sub_t3_nuke.png",
+		size = 2.8
+	},
 	cordl = {
 		bitmap = "icons/defence_1_naval.png",
 		size = 1.10249984
@@ -1659,6 +1671,10 @@ local icontypes = {
 		bitmap = "icons/bot_t1_rez.png",
 		size = 0.74000001
 	},
+	coronager = {
+		bitmap = "icons/sub_t2_coastal.png",
+		size = 2.2
+	},
 	corparrow = {
 		bitmap = "icons/corparrow.png",
 		size = 1.62749982

diff --git a/gamedata/scavengers/unitdef_post.lua b/gamedata/scavengers/unitdef_post.lua
@@ -301,12 +301,16 @@ local function scavUnitDef_Post(name, uDef)
 		uDef.buildoptions[numBuildoptions + 4] = "armserpt3_scav"
 		uDef.buildoptions[numBuildoptions + 5] = "armtrident_scav"
 		uDef.buildoptions[numBuildoptions + 6] = "armdronecarry_scav"
+		uDef.buildoptions[numBuildoptions + 7] = "armexcalibur_scav"
+		uDef.buildoptions[numBuildoptions + 8] = "armseadragon_scav"
 	elseif name == "corasy_scav" then
 		local numBuildoptions = #uDef.buildoptions
 		uDef.buildoptions[numBuildoptions + 1] = "corslrpc_scav"
 		uDef.buildoptions[numBuildoptions + 2] = "coresuppt3_scav"
 		uDef.buildoptions[numBuildoptions + 3] = "corsentinel_scav"
 		uDef.buildoptions[numBuildoptions + 4] = "cordronecarry_scav"
+		uDef.buildoptions[numBuildoptions + 5] = "coronager_scav"
+		uDef.buildoptions[numBuildoptions + 6] = "cordesolator_scav"
 	end
 
 	return uDef

diff --git a/icons/inverted/sub_t2_coastal.png b/icons/inverted/sub_t2_coastal.png
diff --git a/icons/inverted/sub_t3_nuke.png b/icons/inverted/sub_t3_nuke.png
diff --git a/icons/sub_t2_coastal.png b/icons/sub_t2_coastal.png
diff --git a/icons/sub_t3_nuke.png b/icons/sub_t3_nuke.png
diff --git a/language/en/units.json b/language/en/units.json
@@ -99,6 +99,7 @@
 			"armepoch": "Epoch",
 			"armestor": "Energy Storage",
 			"armeyes": "Beholder",
+			"armexcalibur": "Excalibur",
 			"armfark": "Butler",
 			"armfast": "Sprinter",
 			"armfatf": "Naval Pinpointer",
@@ -202,6 +203,7 @@
 			"armsb": "Tsunami",
 			"armscab": "Umbrella",
 			"armsd": "Tracer",
+			"armseadragon": "Seadragon",
 			"armseap": "Puffin",
 			"armseer": "Prophet",
 			"armsehak": "Horizon",
@@ -432,6 +434,7 @@
 			"corcv": "Construction Vehicle",
 			"cordecom": "Commander",
 			"cordemon": "Demon",
+			"cordesolator": "Desolator",
 			"cordl": "Jellyfish",
 			"cordoom": "Bulwark",
 			"cordoomt3": "Epic Bulwark",
@@ -530,6 +533,7 @@
 			"cornanotct2": "T2 Construction Turret",
 			"cornanotc2plat": "T2 Naval Construction Turret",
 			"cornecro": "Graverobber",
+			"coronager": "Onager",
 			"corparrow": "Poison Arrow",
 			"corplat": "Seaplane Platform",
 			"corprinter": "Printer",
@@ -920,6 +924,7 @@
 			"armepoch": "Flagship",
 			"armestor": "Increases Energy Storage (6000)",
 			"armeyes": "Perimeter Camera",
+			"armexcalibur": "Coastal Assault Submarine",
 			"armfark": "Fast Assist / Repair Bot",
 			"armfast": "Fast Raider Bot",
 			"armfatf": "Enhanced Radar Targeting",
@@ -1024,6 +1029,7 @@
 			"armsb": "Seaplane Bomber",
 			"armscab": "Mobile Anti-Nuke",
 			"armsd": "Intrusion Countermeasure System - tracks down stealthy units",
+			"armseadragon": "Nuclear ICBM Launcher Submarine",
 			"armseap": "Torpedo Gunship",
 			"armseer": "Radar Vehicle",
 			"armsehak": "Advanced Radar / Sonar Plane",
@@ -1255,6 +1261,7 @@
 			"corcv": "Tech 1 Constructor",
 			"cordecom": "Decoy Commander",
 			"cordemon": "Flamethrower Mech",
+			"cordesolator": "Nuclear ICBM Launcher Submarine",
 			"cordl": "Coastal Torpedo Launcher",
 			"cordoom": "Energy Weapon",
 			"cordoomt3": "Super Heavy Heatray Defense",
@@ -1353,6 +1360,7 @@
 			"cornanotct2": "Assist & Repair in larger radius",
 			"cornanotc2plat": "Repairs and builds in larger radius",
 			"cornecro": "Stealthy Rez / Reclaim / Repair Bot",
+			"coronager": "Coastal Assault Submarine",
 			"corparrow": "Very Heavy Amphibious Tank",
 			"corplat": "Builds Seaplanes",
 			"corprinter": "Armored Field Engineer",

diff --git a/luarules/configs/gui_soundeffects.lua b/luarules/configs/gui_soundeffects.lua
@@ -1004,6 +1004,11 @@ GUIUnitSoundEffects = {
 		BaseSoundMovementType = "arm-sub-medium-ok",
 		BaseSoundWeaponType = "torpedo-medium",
 	},
+	armexcalibur = {
+		BaseSoundSelectType = "arm-sub-medium-sel",
+		BaseSoundMovementType = "arm-sub-medium-ok",
+		BaseSoundWeaponType = "laser-large",
+	},
 	armaas = {
 		BaseSoundSelectType = "arm-shp-medium-sel",
 		BaseSoundMovementType = "arm-shp-medium-ok",
@@ -1024,6 +1029,11 @@ GUIUnitSoundEffects = {
 		BaseSoundMovementType = "arm-sub-medium-ok",
 		BaseSoundWeaponType = "torpedo-medium",
 	},
+	armseadragon = {
+		BaseSoundSelectType = "arm-bld-defense-action-t3",
+		BaseSoundMovementType = "arm-sub-medium-ok",
+		BaseSoundWeaponType = "nuke",
+	},
 	armmship = {
 		BaseSoundSelectType = "arm-shp-large-sel",
 		BaseSoundMovementType = "arm-shp-large-ok",
@@ -2180,6 +2190,11 @@ GUIUnitSoundEffects = {
 		BaseSoundMovementType = "cor-sub-medium-ok",
 		BaseSoundWeaponType = "torpedo-medium",
 	},
+	cordesolator = {
+		BaseSoundSelectType = "cor-sub-medium-sel",
+		BaseSoundMovementType = "cor-sub-medium-ok",
+		BaseSoundWeaponType = "rocketalt-large",
+	},
 	corarch = {
 		BaseSoundSelectType = "cor-shp-medium-sel",
 		BaseSoundMovementType = "cor-shp-medium-ok",
@@ -2200,6 +2215,11 @@ GUIUnitSoundEffects = {
 		BaseSoundMovementType = "cor-sub-medium-ok",
 		BaseSoundWeaponType = "torpedo-medium",
 	},
+	cordesolator = {
+		BaseSoundSelectType = "cor-sub-medium-sel",
+		BaseSoundMovementType = "cor-sub-medium-ok",
+		BaseSoundWeaponType = "nuke",
+	},
 	cormship = {
 		BaseSoundSelectType = "cor-shp-large-sel",
 		BaseSoundMovementType = "cor-shp-large-ok",

diff --git a/luarules/configs/scav_spawn_defs.lua b/luarules/configs/scav_spawn_defs.lua
@@ -792,8 +792,12 @@ local SeaUnitsList = {
 		},
 		[6] = {
 			--Armada
+			["armexcalibur_scav"] = 1,
+			["armseadeagon_scav"] = 1,
 
 			--Cortex
+			["coronager_scav"] = 1,
+			["cordesolator_scav"] = 1,
 
 		},
 		[7] = {

diff --git a/luarules/gadgets/unit_stockpile_limit.lua b/luarules/gadgets/unit_stockpile_limit.lua
@@ -31,6 +31,9 @@ if gadgetHandler:IsSyncedCode() then
 		['armsilo'] = 10,
 		['corsilo'] = 10,
 		['legsilo'] = 10,
+		['cordesolator'] = 10,
+		['armseadragon'] = 10,
+
 
 		['armamd'] = 20,
 		['corfmd'] = 20,