A bunch of scav related fixes (beyond-all-reason#3256)

- Fixed inverted icon for leghive - Fixed missing icons for all the "baby" and "squad" units - Made child units for "squad" units faster so they can keep up behind their parent - Made all the parent units always use Fight command so they don't stupidly rush in.
Tharsy · Jun 27, 2024 · 5c4f9ad · 5c4f9ad
1 parent 4b05cc2
commit 5c4f9ad
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 1 deletion.
diff --git a/gamedata/icontypes.lua b/gamedata/icontypes.lua
@@ -663,6 +663,14 @@ local icontypes = {
 		bitmap = "icons/armpwt4.png",
 		size = 2.30999994
 	},
+	squadarmpw = {
+		bitmap = "icons/bot_t1_raid_0.7.png",
+		size = 0.73499995
+	},
+	squadarmpwt4 = {
+		bitmap = "icons/armpwt4.png",
+		size = 2.30999994
+	},
 	armrad = {
 		bitmap = "icons/radar_t1.png",
 		size = 0.94499993
@@ -843,6 +851,14 @@ local icontypes = {
 		bitmap = "icons/armsptkt4.png",
 		size = 2.30999994
 	},
+	squadarmsptk = {
+		bitmap = "icons/armsptk_1.44.png",
+		size = 1.65199995
+	},
+	squadarmsptkt4 = {
+		bitmap = "icons/armsptkt4.png",
+		size = 2.30999994
+	},
 	armspy = {
 		bitmap = "icons/spy.png",
 		size = 1.17999995
@@ -955,6 +971,10 @@ local icontypes = {
 		bitmap = "icons/armvader_0.9.png",
 		size = 0.94499993
 	},
+	babyarmvader = {
+		bitmap = "icons/armvader_0.9.png",
+		size = 0.94499993
+	},
 	armvadert4 = {
 		bitmap = "icons/armvadert4.png",
 		size = 2.625
@@ -1063,6 +1083,14 @@ local icontypes = {
 		bitmap = "icons/corakt4.png",
 		size = 1.7
 	},
+	squadcorak = {
+		bitmap = "icons/bot_t1_raid_0.7.png",
+		size = 0.73499995
+	},
+	squadcorakt4 = {
+		bitmap = "icons/corakt4.png",
+		size = 1.7
+	},
 	coralab = {
 		bitmap = "icons/factory_bot_t2.png",
 		size = 1.9425
@@ -1491,6 +1519,14 @@ local icontypes = {
 		bitmap = "icons/corkarganetht4.png",
 		size = 3.14999986
 	},
+	squadcorkarg = {
+		bitmap = "icons/corkarg_2.05.png",
+		size = 2.424999
+	},
+	squadcorkarganetht4 = {
+		bitmap = "icons/corkarganetht4.png",
+		size = 3.14999986
+	},
 	corkorg = {
 		bitmap = "icons/mech.png",
 		size = 3.46499968
@@ -2246,6 +2282,10 @@ local icontypes = {
 		bitmap = "icons/bot_t1_raid_0.7.png",
 		size = 0.60000002
 	},
+	babyleggob = {
+		bitmap = "icons/bot_t1_raid_0.7.png",
+		size = 0.60000002
+	},
 	leghades = {
 		bitmap = "icons/vehicle_t1_raid.png",
 		size = 0.75
@@ -2318,6 +2358,10 @@ local icontypes = {
 		bitmap = "icons/bot_plasma_t1.png",
 		size = 0.80000001
 	},
+	babyleglob = {
+		bitmap = "icons/bot_plasma_t1.png",
+		size = 0.80000001
+	},
 	leglupara = {
 		bitmap = "icons/aa_flak_t15.png",
 		size = 1.3
@@ -2438,6 +2482,10 @@ local icontypes = {
 		bitmap = "icons/kbot_t2_shotgun.png",
 		size = 1.60000002
 	},
+	babylegshot = {
+		bitmap = "icons/kbot_t2_shotgun.png",
+		size = 1.60000002
+	},
 	legsnapper = {
 		bitmap = "icons/corroach_0.9.png",
 		size = 0.94499993

diff --git a/icons/inverted/legdefcarryt1.png → icons/inverted/leghive.png b/icons/inverted/legdefcarryt1.png → icons/inverted/leghive.png
diff --git a/luarules/configs/scav_spawn_defs.lua b/luarules/configs/scav_spawn_defs.lua
@@ -1336,6 +1336,10 @@ scavBehaviours = {
 	},
 	ARTILLERY = { -- Long lifetime and no regrouping, always uses Fight command to keep distance
 		--[UnitDefNames["raptor_allterrain_arty_basic_t2_v1"].id] = true,
+		[UnitDefNames["squadarmpwt4_scav"].id] = true,
+		[UnitDefNames["squadcorakt4_scav"].id] = true,
+		[UnitDefNames["squadarmsptkt4_scav"].id] = true,
+		[UnitDefNames["squadcorkarganetht4_scav"].id] = true,
 	},
 	KAMIKAZE = { -- Long lifetime and no regrouping, always uses Move command to rush into the enemy
 		--[UnitDefNames["raptor_land_kamikaze_basic_t2_v1"].id] = true,

diff --git a/units/Scavengers/Boss/babyscavbossunits.lua b/units/Scavengers/Boss/babyscavbossunits.lua
@@ -67,9 +67,9 @@ unitsTable['squadarmpw'].metalcost = 1
 unitsTable['squadarmpw'].movestate = 2
 unitsTable['squadarmpw'].power = 50
 unitsTable['squadarmpw'].mass = 50
+unitsTable['squadarmpw'].speed = unitsTable['squadarmpw'].speed*1.5
 unitsTable['squadarmpw'].customparams.i18nfromunit = 'armpw'
 
-
 --Epic Recluse Squad
 unitsTable['squadarmsptkt4'] = VFS.Include('units/Scavengers/Bots/armsptkt4.lua').armsptkt4 --if this filepath is changed, the unit will no longer work!
 unitsTable['squadarmsptkt4'].selfdestructas = ""
@@ -138,6 +138,7 @@ unitsTable['squadarmsptk'].metalcost = 1
 unitsTable['squadarmsptk'].movestate = 2
 unitsTable['squadarmsptk'].power = 500
 unitsTable['squadarmsptk'].mass = 500
+unitsTable['squadarmsptk'].speed = unitsTable['squadarmsptk'].speed*1.5
 unitsTable['squadarmsptk'].customparams.i18nfromunit = 'armsptk'
 
 --Epic Grunt Squad
@@ -208,6 +209,7 @@ unitsTable['squadcorak'].metalcost = 1
 unitsTable['squadcorak'].movestate = 2
 unitsTable['squadcorak'].power = 50
 unitsTable['squadcorak'].mass = 50
+unitsTable['squadcorak'].speed = unitsTable['squadcorak'].speed*1.5
 unitsTable['squadcorak'].customparams.i18nfromunit = 'corak'
 
 --Epic Karganeth Squad
@@ -278,6 +280,7 @@ unitsTable['squadcorkarg'].metalcost = 1
 unitsTable['squadcorkarg'].movestate = 2
 unitsTable['squadcorkarg'].power = 1800
 unitsTable['squadcorkarg'].mass = 500
+unitsTable['squadcorkarg'].speed = unitsTable['squadcorkarg'].speed*1.5
 unitsTable['squadcorkarg'].customparams.i18nfromunit = 'corkarg'