unitdef.category cleanup, bugfixes, removal of temp code (#3818)

* arm+core category clean up * Add SURFACE to all underwater structures For cases where they are visible above water * leg category clean up * remaining category clean up * Remove temporary category code + fixes * if then else -> if not thanks Sprung Co-authored-by: sprunk <[email protected]> * remove empty category strings from unitdef * Categorise critters as "OBJECT" to prevent them from being manually targeted As apparently they shouldn't be. Except laser penguins. * removed SPACE armordef use * removed more use of SPACE category --------- Co-authored-by: sprunk <[email protected]> Co-authored-by: Floris <[email protected]>
beyond-all-reason · Oct 10, 2024 · ce712ad · ce712ad
1 parent 329ded0
commit ce712ad
Show file tree

Hide file tree

Showing 824 changed files with 316 additions and 1,007 deletions.
diff --git a/gamedata/alldefs_post.lua b/gamedata/alldefs_post.lua
@@ -750,11 +750,8 @@ function UnitDef_Post(name, uDef)
 	----------------------------------------------------------------------
 	-- CATEGORY ASSIGNER
 	----------------------------------------------------------------------
-
-	local function manualCategory(unitDef, categoryString) return string.find(unitDef.category, categoryString) end
-	local function append(unitDef, appendString) do unitDef.category = unitDef.category..appendString end end
 
-	-- unitDef.movementclass lists
+	-- uDef.movementclass lists
 	local hoverList = {
 		HOVER2 = true,
 		HOVER3 = true,
@@ -798,52 +795,30 @@ function UnitDef_Post(name, uDef)
 	-- Deprecated caregories: BOT TANK PHIB NOTLAND SPACE
 
 	categories["ALL"] = function() return true end
-	categories["MOBILE"] = function(unitDef) return unitDef.speed and unitDef.speed > 0 end
-	categories["NOTMOBILE"] = function(unitDef) return not categories.MOBILE(unitDef) end
-	categories["WEAPON"] = function(unitDef) return unitDef.weapondefs ~= nil end
-	categories["NOWEAPON"] = function(unitDef) return not categories.WEAPON(unitDef) end
-	categories["VTOL"] = function(unitDef) return unitDef.canfly == true end
-	categories["NOTAIR"] = function(unitDef) return not categories.VTOL(unitDef) end
-	categories["HOVER"] = function(unitDef) return hoverList[unitDef.movementclass] and (unitDef.maxwaterdepth == nil or unitDef.maxwaterdepth < 1) end -- convertible tank/boats have maxwaterdepth
-	categories["NOTHOVER"] = function(unitDef) return not categories.HOVER(unitDef) end
-	categories["SHIP"] = function(unitDef) return shipList[unitDef.movementclass] or (hoverList[unitDef.movementclass] and unitDef.maxwaterdepth and unitDef.maxwaterdepth >=1) end
-	categories["NOTSHIP"] = function(unitDef) return not categories.SHIP(unitDef) end
-	categories["NOTSUB"] = function(unitDef) return not subList[unitDef.movementclass] end
-	categories["CANBEUW"] = function(unitDef) return amphibList[unitDef.movementclass] end
-	categories["UNDERWATER"] = function(unitDef) return (unitDef.minwaterdepth and unitDef.waterline == nil) or (unitDef.minwaterdepth and unitDef.waterline > unitDef.minwaterdepth and unitDef.speed and unitDef.speed > 0) end
-	categories["SURFACE"] = function(unitDef) return not categories.UNDERWATER(unitDef) and not categories.VTOL(unitDef) end
-	categories["MINE"] = function(unitDef) return unitDef.weapondefs and unitDef.weapondefs.minerange end
-	categories["COMMANDER"] = function(unitDef) return commanderList[unitDef.movementclass] end
-	categories["EMPABLE"] = function(unitDef) return categories.SURFACE(unitDef) and unitDef.customparams and unitDef.customparams.paralyzemultiplier ~= 0 end
-
+	categories["MOBILE"] = function(uDef) return uDef.speed and uDef.speed > 0 end
+	categories["NOTMOBILE"] = function(uDef) return not categories.MOBILE(uDef) end
+	categories["WEAPON"] = function(uDef) return uDef.weapondefs ~= nil end
+	categories["NOWEAPON"] = function(uDef) return not categories.WEAPON(uDef) end
+	categories["VTOL"] = function(uDef) return uDef.canfly == true end
+	categories["NOTAIR"] = function(uDef) return not categories.VTOL(uDef) end
+	categories["HOVER"] = function(uDef) return hoverList[uDef.movementclass] and (uDef.maxwaterdepth == nil or uDef.maxwaterdepth < 1) end -- convertible tank/boats have maxwaterdepth
+	categories["NOTHOVER"] = function(uDef) return not categories.HOVER(uDef) end
+	categories["SHIP"] = function(uDef) return shipList[uDef.movementclass] or (hoverList[uDef.movementclass] and uDef.maxwaterdepth and uDef.maxwaterdepth >=1) end
+	categories["NOTSHIP"] = function(uDef) return not categories.SHIP(uDef) end
+	categories["NOTSUB"] = function(uDef) return not subList[uDef.movementclass] end
+	categories["CANBEUW"] = function(uDef) return amphibList[uDef.movementclass] or uDef.cansubmerge == true end
+	categories["UNDERWATER"] = function(uDef) return (uDef.minwaterdepth and uDef.waterline == nil) or (uDef.minwaterdepth and uDef.waterline > uDef.minwaterdepth and uDef.speed and uDef.speed > 0) end
+	categories["SURFACE"] = function(uDef) return not (categories.UNDERWATER(uDef) and categories.MOBILE(uDef)) and not categories.VTOL(uDef) end
+	categories["MINE"] = function(uDef) return uDef.weapondefs and uDef.weapondefs.minerange end
+	categories["COMMANDER"] = function(uDef) return commanderList[uDef.movementclass] end
+	categories["EMPABLE"] = function(uDef) return uDef.customparams and uDef.customparams.paralyzemultiplier ~= 0 end
 
-	for name, unitDef in pairs(UnitDefs) do
-		if string.find(unitDef.category, "OBJECT") then -- objects should not be targetable and therefore are not assigned any other category
-		else
-
-			-- temrorary code, pending unitdef cleanup
-			local isT4AIR
-			local isLIGHTAIRSCOUT
-			local isGROUNDSCOUT
-			local isRAPTOR
-			if manualCategory(unitDef, "T4AIR") then isT4AIR = true end
-			if manualCategory(unitDef, "LIGHTAIRSCOUT") then isLIGHTAIRSCOUT = true end
-			if manualCategory(unitDef, "GROUNDSCOUT") then isGROUNDSCOUT = true end
-			if manualCategory(unitDef, "RAPTOR") then isRAPTOR = true end
-			unitDef.category = ""
-			if isT4AIR == true then append(unitDef, " T4AIR") end
-			if isLIGHTAIRSCOUT == true then append(unitDef, " LIGHTAIRSCOUT") end
-			if isGROUNDSCOUT == true then append(unitDef, " GROUNDSCOUT") end
-			if isRAPTOR == true then append(unitDef, " isRAPTOR") end
-			if name == "armmex" or name == "cormex" or name == "legmex" or name == "legmext15" then append(unitDef, " CANBEUW") end
-			if name == "corplat" or name == "armplat" then append(unitDef, " UNDERWATER SURFACE") end
-			-- end of temporary code
-
-			for categoryName, condition in pairs(categories) do
-				if unitDef.exemptcategory == nil or not string.find(unitDef.exemptcategory, categoryName) then
-					if condition(unitDef) then
-						append(unitDef, " " .. categoryName)
-					end
+	uDef.category = uDef.category or ""
+	if not string.find(uDef.category, "OBJECT") then -- objects should not be targetable and therefore are not assigned any other category
+		for categoryName, condition in pairs(categories) do
+			if uDef.exemptcategory == nil or not string.find(uDef.exemptcategory, categoryName) then
+				if condition(uDef) then
+						uDef.category = uDef.category.." " .. categoryName
 				end
 			end
 		end

diff --git a/gamedata/armordefs.lua b/gamedata/armordefs.lua
@@ -437,7 +437,7 @@ local armorDefs = {
 		"legotter",
 		"legacv",
 		"legack",
-		
+
 		"legah",
 		"legmh",
 		"legner",
@@ -447,10 +447,6 @@ local armorDefs = {
 		"legch",
 		"legeyes",
 	},
-
-	space = {
-		"armsat",
-	},
 	mines = {
 		"armfmine3",
 		"armmine1",

diff --git a/unitbasedefs/lootboxes/lootboxnano.lua b/unitbasedefs/lootboxes/lootboxnano.lua
@@ -165,7 +165,6 @@ local createNanoUnitDef = function(tier)
 		cantbetransported = false,
 		capturable = true,
 		canhover = true,
-		category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 0",
 		collisionvolumescales = parameters.collisionVolumeScales,
 		collisionvolumetype = "CylY",

diff --git a/units/ArmAircraft/T2/armaca.lua b/units/ArmAircraft/T2/armaca.lua
@@ -7,7 +7,6 @@ return {
 		buildtime = 17750,
 		canfly = true,
 		canmove = true,
-		category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER",
 		collide = true,
 		cruisealtitude = 80,
 		energycost = 12000,

diff --git a/units/ArmAircraft/T2/armawac.lua b/units/ArmAircraft/T2/armawac.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 12800,
 		canfly = true,
 		canmove = true,
-		category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER",
 		collide = false,
 		cruisealtitude = 160,
 		energycost = 8600,

diff --git a/units/ArmAircraft/T2/armblade.lua b/units/ArmAircraft/T2/armblade.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 24000,
 		canfly = true,
 		canmove = true,
-		category = "ALL WEAPON NOTSUB VTOL NOTHOVER",
 		collide = true,
 		cruisealtitude = 110,
 		energycost = 22000,

diff --git a/units/ArmAircraft/T2/armbrawl.lua b/units/ArmAircraft/T2/armbrawl.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 13500,
 		canfly = true,
 		canmove = true,
-		category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER",
 		collide = true,
 		cruisealtitude = 100,
 		energycost = 6200,

diff --git a/units/ArmAircraft/T2/armdfly.lua b/units/ArmAircraft/T2/armdfly.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 16000,
 		canfly = true,
 		canmove = true,
-		category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER",
 		collide = false,
 		collisionvolumeoffsets = "1 1 5",
 		collisionvolumescales = "52 21 52",

diff --git a/units/ArmAircraft/T2/armhawk.lua b/units/ArmAircraft/T2/armhawk.lua
@@ -6,7 +6,6 @@ return {
 		buildtime = 8900,
 		canfly = true,
 		canmove = true,
-		category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER",
 		collide = false,
 		cruisealtitude = 160,
 		energycost = 5700,

diff --git a/units/ArmAircraft/T2/armlance.lua b/units/ArmAircraft/T2/armlance.lua
@@ -4,7 +4,6 @@ return {
 		buildtime = 15100,
 		canfly = true,
 		canmove = true,
-		category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER",
 		collide = true,
 		cruisealtitude = 90,
 		energycost = 8000,

diff --git a/units/ArmAircraft/T2/armliche.lua b/units/ArmAircraft/T2/armliche.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 57400,
 		canfly = true,
 		canmove = true,
-		category = "ALL WEAPON NOTSUB VTOL NOTHOVER",
 		collide = false,
 		cruisealtitude = 150,
 		energycost = 46000,

diff --git a/units/ArmAircraft/T2/armpnix.lua b/units/ArmAircraft/T2/armpnix.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 21000,
 		canfly = true,
 		canmove = true,
-		category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER",
 		collide = false,
 		cruisealtitude = 220,
 		energycost = 12500,

diff --git a/units/ArmAircraft/T2/armstil.lua b/units/ArmAircraft/T2/armstil.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 32000,
 		canfly = true,
 		canmove = true,
-		category = "ALL MOBILE WEAPON VTOL NOTSUB NOTHOVER",
 		collide = false,
 		collisionvolumeoffsets = "0 -3 0",
 		collisionvolumescales = "24 9 24",

diff --git a/units/ArmAircraft/armatlas.lua b/units/ArmAircraft/armatlas.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 3850,
 		canfly = true,
 		canmove = true,
-		category = "ALL MOBILE WEAPON NOTLAND NOTSUB VTOL NOTSHIP NOTHOVER",
 		collide = false,
 		cruisealtitude = 100,
 		energycost = 1300,

diff --git a/units/ArmAircraft/armca.lua b/units/ArmAircraft/armca.lua
@@ -7,7 +7,6 @@ return {
 		buildtime = 7960,
 		canfly = true,
 		canmove = true,
-		category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER",
 		collide = true,
 		cruisealtitude = 70,
 		energycost = 3000,

diff --git a/units/ArmAircraft/armdrone.lua b/units/ArmAircraft/armdrone.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 1200,
 		canfly = true,
 		canmove = true,
-		category = "ALL WEAPON NOTSUB VTOL NOTHOVER",
 		collide = true,
 		cruisealtitude = 40,
 		energycost = 600,

diff --git a/units/ArmAircraft/armdroneold.lua b/units/ArmAircraft/armdroneold.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 2200,
 		canfly = true,
 		canmove = true,
-		category = "ALL WEAPON NOTSUB VTOL NOTHOVER",
 		collide = true,
 		cruisealtitude = 70,
 		energycost = 1100,

diff --git a/units/ArmAircraft/armfig.lua b/units/ArmAircraft/armfig.lua
@@ -6,7 +6,6 @@ return {
 		buildtime = 3500,
 		canfly = true,
 		canmove = true,
-		category = "ALL MOBILE WEAPON NOTSUB NOTLAND VTOL NOTSHIP NOTHOVER",
 		collide = false,
 		cruisealtitude = 125,
 		energycost = 2900,

diff --git a/units/ArmAircraft/armkam.lua b/units/ArmAircraft/armkam.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 5050,
 		canfly = true,
 		canmove = true,
-		category = "ALL WEAPON NOTSUB VTOL NOTHOVER",
 		collide = true,
 		cruisealtitude = 70,
 		energycost = 2300,

diff --git a/units/ArmAircraft/armpeep.lua b/units/ArmAircraft/armpeep.lua
@@ -5,7 +5,7 @@ return {
 		buildtime = 2800,
 		canfly = true,
 		canmove = true,
-		category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER LIGHTAIRSCOUT",
+		category = "LIGHTAIRSCOUT",
 		collide = false,
 		cruisealtitude = 180,
 		energycost = 1550,

diff --git a/units/ArmAircraft/armthund.lua b/units/ArmAircraft/armthund.lua
@@ -4,7 +4,6 @@ return {
 		buildtime = 4780,
 		canfly = true,
 		canmove = true,
-		category = "ALL MOBILE WEAPON NOTLAND NOTSUB VTOL NOTSHIP NOTHOVER",
 		collide = false,
 		cruisealtitude = 165,
 		energycost = 4200,

diff --git a/units/ArmBots/T2/armaak.lua b/units/ArmBots/T2/armaak.lua
@@ -4,7 +4,6 @@ return {
 		buildpic = "ARMAAK.DDS",
 		buildtime = 7000,
 		canmove = true,
-		category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE",
 		collisionvolumeoffsets = "0 -1 1",
 		collisionvolumescales = "25 32 16",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armack.lua b/units/ArmBots/T2/armack.lua
@@ -5,7 +5,6 @@ return {
 		buildpic = "ARMACK.DDS",
 		buildtime = 9500,
 		canmove = true,
-		category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 0",
 		collisionvolumescales = "27 35 23",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armamph.lua b/units/ArmBots/T2/armamph.lua
@@ -3,7 +3,6 @@ return {
 		buildpic = "ARMAMPH.DDS",
 		buildtime = 5200,
 		canmove = true,
-		category = "BOT MOBILE WEAPON ALL NOTSHIP NOTAIR NOTSUB SURFACE PHIB EMPABLE",
 		collisionvolumeoffsets = "0 0 -1",
 		collisionvolumescales = "27 35 21",
 		collisionvolumetype = "cylY",

diff --git a/units/ArmBots/T2/armaser.lua b/units/ArmBots/T2/armaser.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 4940,
 		canattack = false,
 		canmove = true,
-		category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 -7 2",
 		collisionvolumescales = "26 48 24",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armdecom.lua b/units/ArmBots/T2/armdecom.lua
@@ -11,7 +11,6 @@ return {
 		canmove = true,
 		capturable = false,
 		capturespeed = 900,
-		category = "ALL WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE",
 		cloakcost = 30,
 		cloakcostmoving = 180,
 		collisionvolumeoffsets = "0 3 0",

diff --git a/units/ArmBots/T2/armfark.lua b/units/ArmBots/T2/armfark.lua
@@ -6,7 +6,6 @@ return {
 		buildpic = "ARMFARK.DDS",
 		buildtime = 4300,
 		canmove = true,
-		category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 -1",
 		collisionvolumescales = "21 26 17",
 		collisionvolumetype = "CylY",

diff --git a/units/ArmBots/T2/armfast.lua b/units/ArmBots/T2/armfast.lua
@@ -3,7 +3,6 @@ return {
 		buildpic = "ARMFAST.DDS",
 		buildtime = 3960,
 		canmove = true,
-		category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 -2 1",
 		collisionvolumescales = "25 37 11",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armfboy.lua b/units/ArmBots/T2/armfboy.lua
@@ -3,7 +3,6 @@ return {
 		buildpic = "ARMFBOY.DDS",
 		buildtime = 21000,
 		canmove = true,
-		category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 0",
 		collisionvolumescales = "34 40 42",
 		collisionvolumetype = "Box",

diff --git a/units/ArmBots/T2/armfido.lua b/units/ArmBots/T2/armfido.lua
@@ -4,7 +4,6 @@ return {
 		buildpic = "ARMFIDO.DDS",
 		buildtime = 6230,
 		canmove = true,
-		category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 1",
 		collisionvolumescales = "26 32 28",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armmark.lua b/units/ArmBots/T2/armmark.lua
@@ -5,7 +5,6 @@ return {
 		buildtime = 3800,
 		canattack = false,
 		canmove = true,
-		category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 -1",
 		collisionvolumescales = "26 24 16",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armmav.lua b/units/ArmBots/T2/armmav.lua
@@ -4,7 +4,6 @@ return {
 		buildpic = "ARMMAV.DDS",
 		buildtime = 17000,
 		canmove = true,
-		category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 0",
 		collisionvolumescales = "28 45 28",
 		collisionvolumetype = "CylY",

diff --git a/units/ArmBots/T2/armscab.lua b/units/ArmBots/T2/armscab.lua
@@ -4,7 +4,6 @@ return {
 		buildtime = 40000,
 		canattack = false,
 		canmove = true,
-		category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 3 -1",
 		collisionvolumescales = "43 23 49",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armsnipe.lua b/units/ArmBots/T2/armsnipe.lua
@@ -3,7 +3,6 @@ return {
 		buildpic = "ARMSNIPE.DDS",
 		buildtime = 19000,
 		canmove = true,
-		category = "BOT MOBILE WEAPON ALL NOTSHIP NOTAIR NOTHOVER NOTSUB SURFACE EMPABLE",
 		cloakcost = 75,
 		cloakcostmoving = 200,
 		collisionvolumeoffsets = "0 0 0",

diff --git a/units/ArmBots/T2/armspid.lua b/units/ArmBots/T2/armspid.lua
@@ -9,7 +9,6 @@ return {
 		canmove = true,
 		canrepair = false,
 		canrestore = false,
-		category = "ALL BOT MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 0 0",
 		collisionvolumescales = "28 15 28",
 		collisionvolumetype = "box",

diff --git a/units/ArmBots/T2/armsptk.lua b/units/ArmBots/T2/armsptk.lua
@@ -3,7 +3,6 @@ return {
 		buildpic = "ARMSPTK.DDS",
 		buildtime = 8800,
 		canmove = true,
-		category = "ALL BOT MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		collisionvolumeoffsets = "0 -2 0",
 		collisionvolumescales = "42 28 42",
 		collisionvolumetype = "CylY",

diff --git a/units/ArmBots/T2/armspy.lua b/units/ArmBots/T2/armspy.lua
@@ -10,7 +10,6 @@ return {
 		canmove = true,
 		canrepair = false,
 		canrestore = false,
-		category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE",
 		cloakcost = 50,
 		cloakcostmoving = 100,
 		collisionvolumeoffsets = "0 0 0",

diff --git a/units/ArmBots/T2/armvader.lua b/units/ArmBots/T2/armvader.lua
@@ -4,7 +4,6 @@ return {
 		buildpic = "ARMVADER.DDS",
 		buildtime = 7900,
 		canmove = true,
-		category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE",
 		collisionvolumeoffsets = "0 2 0",
 		collisionvolumescales = "17 13 17",
 		collisionvolumetype = "box",