From ce712ad792d48b2c6bd1ae0f1cbde8a0e39f3ad0 Mon Sep 17 00:00:00 2001 From: kroIya <95887841+kroIya@users.noreply.github.com> Date: Thu, 10 Oct 2024 20:07:50 +0300 Subject: [PATCH] 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 * 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 Co-authored-by: Floris --- gamedata/alldefs_post.lua | 73 ++++++------------- gamedata/armordefs.lua | 6 +- unitbasedefs/lootboxes/lootboxnano.lua | 1 - units/ArmAircraft/T2/armaca.lua | 1 - units/ArmAircraft/T2/armawac.lua | 1 - units/ArmAircraft/T2/armblade.lua | 1 - units/ArmAircraft/T2/armbrawl.lua | 1 - units/ArmAircraft/T2/armdfly.lua | 1 - units/ArmAircraft/T2/armhawk.lua | 1 - units/ArmAircraft/T2/armlance.lua | 1 - units/ArmAircraft/T2/armliche.lua | 1 - units/ArmAircraft/T2/armpnix.lua | 1 - units/ArmAircraft/T2/armstil.lua | 1 - units/ArmAircraft/armatlas.lua | 1 - units/ArmAircraft/armca.lua | 1 - units/ArmAircraft/armdrone.lua | 1 - units/ArmAircraft/armdroneold.lua | 1 - units/ArmAircraft/armfig.lua | 1 - units/ArmAircraft/armkam.lua | 1 - units/ArmAircraft/armpeep.lua | 2 +- units/ArmAircraft/armthund.lua | 1 - units/ArmBots/T2/armaak.lua | 1 - units/ArmBots/T2/armack.lua | 1 - units/ArmBots/T2/armamph.lua | 1 - units/ArmBots/T2/armaser.lua | 1 - units/ArmBots/T2/armdecom.lua | 1 - units/ArmBots/T2/armfark.lua | 1 - units/ArmBots/T2/armfast.lua | 1 - units/ArmBots/T2/armfboy.lua | 1 - units/ArmBots/T2/armfido.lua | 1 - units/ArmBots/T2/armmark.lua | 1 - units/ArmBots/T2/armmav.lua | 1 - units/ArmBots/T2/armscab.lua | 1 - units/ArmBots/T2/armsnipe.lua | 1 - units/ArmBots/T2/armspid.lua | 1 - units/ArmBots/T2/armsptk.lua | 1 - units/ArmBots/T2/armspy.lua | 1 - units/ArmBots/T2/armvader.lua | 1 - units/ArmBots/T2/armzeus.lua | 1 - units/ArmBots/armck.lua | 1 - units/ArmBots/armflea.lua | 2 +- units/ArmBots/armham.lua | 1 - units/ArmBots/armjeth.lua | 1 - units/ArmBots/armpw.lua | 1 - units/ArmBots/armrectr.lua | 1 - units/ArmBots/armrock.lua | 1 - units/ArmBots/armwar.lua | 1 - .../LandDefenceOffence/armamb.lua | 1 - .../LandDefenceOffence/armamd.lua | 1 - .../LandDefenceOffence/armanni.lua | 1 - .../LandDefenceOffence/armbeamer.lua | 1 - .../LandDefenceOffence/armbrtha.lua | 1 - .../LandDefenceOffence/armcir.lua | 1 - .../LandDefenceOffence/armclaw.lua | 1 - .../LandDefenceOffence/armemp.lua | 1 - .../LandDefenceOffence/armferret.lua | 1 - .../LandDefenceOffence/armflak.lua | 1 - .../LandDefenceOffence/armguard.lua | 1 - .../LandDefenceOffence/armhlt.lua | 1 - .../LandDefenceOffence/armjuno.lua | 1 - .../LandDefenceOffence/armllt.lua | 1 - .../LandDefenceOffence/armmercury.lua | 4 +- .../ArmBuildings/LandDefenceOffence/armpb.lua | 1 - .../ArmBuildings/LandDefenceOffence/armrl.lua | 1 - .../LandDefenceOffence/armshockwave.lua | 1 - .../LandDefenceOffence/armsilo.lua | 1 - .../LandDefenceOffence/armvulc.lua | 1 - units/ArmBuildings/LandEconomy/armadvsol.lua | 1 - units/ArmBuildings/LandEconomy/armafus.lua | 1 - units/ArmBuildings/LandEconomy/armageo.lua | 1 - units/ArmBuildings/LandEconomy/armamex.lua | 1 - units/ArmBuildings/LandEconomy/armckfus.lua | 1 - units/ArmBuildings/LandEconomy/armestor.lua | 1 - units/ArmBuildings/LandEconomy/armfus.lua | 1 - units/ArmBuildings/LandEconomy/armgeo.lua | 1 - units/ArmBuildings/LandEconomy/armgmm.lua | 1 - units/ArmBuildings/LandEconomy/armmakr.lua | 1 - units/ArmBuildings/LandEconomy/armmex.lua | 2 +- units/ArmBuildings/LandEconomy/armmmkr.lua | 1 - units/ArmBuildings/LandEconomy/armmoho.lua | 1 - units/ArmBuildings/LandEconomy/armmstor.lua | 1 - units/ArmBuildings/LandEconomy/armsolar.lua | 1 - units/ArmBuildings/LandEconomy/armwin.lua | 1 - units/ArmBuildings/LandFactories/armaap.lua | 1 - units/ArmBuildings/LandFactories/armalab.lua | 1 - units/ArmBuildings/LandFactories/armap.lua | 1 - units/ArmBuildings/LandFactories/armavp.lua | 1 - units/ArmBuildings/LandFactories/armhp.lua | 1 - units/ArmBuildings/LandFactories/armlab.lua | 1 - units/ArmBuildings/LandFactories/armshltx.lua | 1 - units/ArmBuildings/LandFactories/armvp.lua | 1 - units/ArmBuildings/LandUtil/armarad.lua | 1 - units/ArmBuildings/LandUtil/armasp.lua | 1 - units/ArmBuildings/LandUtil/armdf.lua | 1 - units/ArmBuildings/LandUtil/armdrag.lua | 1 - units/ArmBuildings/LandUtil/armeyes.lua | 1 - units/ArmBuildings/LandUtil/armfort.lua | 1 - units/ArmBuildings/LandUtil/armgate.lua | 3 +- units/ArmBuildings/LandUtil/armjamt.lua | 1 - units/ArmBuildings/LandUtil/armmine1.lua | 1 - units/ArmBuildings/LandUtil/armmine2.lua | 1 - units/ArmBuildings/LandUtil/armmine3.lua | 1 - units/ArmBuildings/LandUtil/armnanotc.lua | 1 - units/ArmBuildings/LandUtil/armnanotct2.lua | 1 - units/ArmBuildings/LandUtil/armrad.lua | 1 - units/ArmBuildings/LandUtil/armsd.lua | 1 - units/ArmBuildings/LandUtil/armtarg.lua | 1 - units/ArmBuildings/LandUtil/armveil.lua | 1 - units/ArmBuildings/SeaDefence/armatl.lua | 1 - units/ArmBuildings/SeaDefence/armdl.lua | 1 - units/ArmBuildings/SeaDefence/armfflak.lua | 1 - units/ArmBuildings/SeaDefence/armfhlt.lua | 1 - units/ArmBuildings/SeaDefence/armfrock.lua | 1 - units/ArmBuildings/SeaDefence/armfrt.lua | 1 - units/ArmBuildings/SeaDefence/armgplat.lua | 1 - units/ArmBuildings/SeaDefence/armkraken.lua | 1 - units/ArmBuildings/SeaDefence/armptl.lua | 2 +- units/ArmBuildings/SeaDefence/armtl.lua | 1 - units/ArmBuildings/SeaEconomy/armfmkr.lua | 1 - units/ArmBuildings/SeaEconomy/armtide.lua | 1 - units/ArmBuildings/SeaEconomy/armuwadves.lua | 2 +- units/ArmBuildings/SeaEconomy/armuwadvms.lua | 2 +- units/ArmBuildings/SeaEconomy/armuwageo.lua | 1 - units/ArmBuildings/SeaEconomy/armuwes.lua | 1 - units/ArmBuildings/SeaEconomy/armuwfus.lua | 1 - units/ArmBuildings/SeaEconomy/armuwgeo.lua | 1 - units/ArmBuildings/SeaEconomy/armuwmex.lua | 2 +- units/ArmBuildings/SeaEconomy/armuwmme.lua | 1 - units/ArmBuildings/SeaEconomy/armuwmmm.lua | 1 - units/ArmBuildings/SeaEconomy/armuwms.lua | 1 - units/ArmBuildings/SeaFactories/armamsub.lua | 1 - units/ArmBuildings/SeaFactories/armasy.lua | 1 - units/ArmBuildings/SeaFactories/armfhp.lua | 1 - units/ArmBuildings/SeaFactories/armplat.lua | 2 +- .../ArmBuildings/SeaFactories/armshltxuw.lua | 1 - units/ArmBuildings/SeaFactories/armsy.lua | 1 - units/ArmBuildings/SeaUtil/armason.lua | 1 - units/ArmBuildings/SeaUtil/armfasp.lua | 1 - units/ArmBuildings/SeaUtil/armfatf.lua | 1 - units/ArmBuildings/SeaUtil/armfdrag.lua | 1 - units/ArmBuildings/SeaUtil/armfgate.lua | 3 +- units/ArmBuildings/SeaUtil/armfmine3.lua | 1 - units/ArmBuildings/SeaUtil/armfrad.lua | 1 - units/ArmBuildings/SeaUtil/armnanotc2plat.lua | 1 - units/ArmBuildings/SeaUtil/armnanotcplat.lua | 3 +- units/ArmBuildings/SeaUtil/armsonar.lua | 1 - units/ArmGantry/armbanth.lua | 1 - units/ArmGantry/armlun.lua | 1 - units/ArmGantry/armmar.lua | 1 - units/ArmGantry/armprowl.lua | 1 - units/ArmGantry/armraz.lua | 1 - units/ArmGantry/armthor.lua | 1 - units/ArmGantry/armvang.lua | 1 - units/ArmHovercraft/armah.lua | 1 - units/ArmHovercraft/armanac.lua | 1 - units/ArmHovercraft/armch.lua | 1 - units/ArmHovercraft/armmh.lua | 1 - units/ArmHovercraft/armsh.lua | 1 - units/ArmHovercraft/armthovr.lua | 1 - units/ArmSeaplanes/armcsa.lua | 1 - units/ArmSeaplanes/armsaber.lua | 1 - units/ArmSeaplanes/armsb.lua | 1 - units/ArmSeaplanes/armseap.lua | 1 - units/ArmSeaplanes/armsehak.lua | 1 - units/ArmSeaplanes/armsfig.lua | 1 - units/ArmSeaplanes/armsfig2.lua | 1 - units/ArmShips/T2/armaas.lua | 1 - units/ArmShips/T2/armacsub.lua | 1 - units/ArmShips/T2/armantiship.lua | 1 - units/ArmShips/T2/armbats.lua | 1 - units/ArmShips/T2/armcarry.lua | 1 - units/ArmShips/T2/armcrus.lua | 1 - units/ArmShips/T2/armdronecarry.lua | 1 - units/ArmShips/T2/armepoch.lua | 1 - units/ArmShips/T2/armexcalibur.lua | 1 - units/ArmShips/T2/armlship.lua | 1 - units/ArmShips/T2/armmls.lua | 1 - units/ArmShips/T2/armmship.lua | 1 - units/ArmShips/T2/armseadragon.lua | 1 - units/ArmShips/T2/armserp.lua | 1 - units/ArmShips/T2/armsjam.lua | 1 - units/ArmShips/T2/armsubk.lua | 1 - units/ArmShips/T2/armtdrone.lua | 1 - units/ArmShips/T2/armtrident.lua | 1 - units/ArmShips/armcs.lua | 1 - units/ArmShips/armdecade.lua | 1 - units/ArmShips/armpship.lua | 1 - units/ArmShips/armpt.lua | 1 - units/ArmShips/armrecl.lua | 1 - units/ArmShips/armroy.lua | 1 - units/ArmShips/armsub.lua | 1 - units/ArmShips/armtorps.lua | 1 - units/ArmShips/armtship.lua | 1 - units/ArmVehicles/T2/armacv.lua | 1 - units/ArmVehicles/T2/armbull.lua | 1 - units/ArmVehicles/T2/armconsul.lua | 1 - units/ArmVehicles/T2/armcroc.lua | 1 - units/ArmVehicles/T2/armgremlin.lua | 1 - units/ArmVehicles/T2/armjam.lua | 1 - units/ArmVehicles/T2/armlatnk.lua | 1 - units/ArmVehicles/T2/armmanni.lua | 1 - units/ArmVehicles/T2/armmart.lua | 1 - units/ArmVehicles/T2/armmerl.lua | 1 - units/ArmVehicles/T2/armseer.lua | 1 - units/ArmVehicles/T2/armyork.lua | 1 - units/ArmVehicles/armart.lua | 1 - units/ArmVehicles/armbeaver.lua | 1 - units/ArmVehicles/armcv.lua | 1 - units/ArmVehicles/armfav.lua | 2 +- units/ArmVehicles/armflash.lua | 1 - units/ArmVehicles/armjanus.lua | 1 - units/ArmVehicles/armmlv.lua | 1 - units/ArmVehicles/armpincer.lua | 1 - units/ArmVehicles/armsam.lua | 1 - units/ArmVehicles/armstump.lua | 1 - units/CorAircraft/T2/coraca.lua | 1 - units/CorAircraft/T2/corape.lua | 1 - units/CorAircraft/T2/corawac.lua | 1 - units/CorAircraft/T2/corcrwh.lua | 1 - units/CorAircraft/T2/corhurc.lua | 1 - units/CorAircraft/T2/corseah.lua | 1 - units/CorAircraft/T2/cortitan.lua | 1 - units/CorAircraft/T2/corvamp.lua | 1 - units/CorAircraft/corbw.lua | 1 - units/CorAircraft/corca.lua | 1 - units/CorAircraft/cordrone.lua | 1 - units/CorAircraft/cordroneold.lua | 1 - units/CorAircraft/corfink.lua | 2 +- units/CorAircraft/corshad.lua | 1 - units/CorAircraft/corvalk.lua | 1 - units/CorAircraft/corveng.lua | 1 - units/CorBots/T2/coraak.lua | 1 - units/CorBots/T2/corack.lua | 1 - units/CorBots/T2/coramph.lua | 1 - units/CorBots/T2/corcan.lua | 1 - units/CorBots/T2/cordecom.lua | 1 - units/CorBots/T2/corfast.lua | 1 - units/CorBots/T2/corhrk.lua | 1 - units/CorBots/T2/cormando.lua | 1 - units/CorBots/T2/cormort.lua | 1 - units/CorBots/T2/corpyro.lua | 1 - units/CorBots/T2/corroach.lua | 1 - units/CorBots/T2/corsktl.lua | 1 - units/CorBots/T2/corspec.lua | 1 - units/CorBots/T2/corspy.lua | 1 - units/CorBots/T2/corsumo.lua | 1 - units/CorBots/T2/cortermite.lua | 1 - units/CorBots/T2/corvoyr.lua | 1 - units/CorBots/corak.lua | 1 - units/CorBots/corck.lua | 1 - units/CorBots/corcrash.lua | 1 - units/CorBots/cornecro.lua | 1 - units/CorBots/corstorm.lua | 1 - units/CorBots/corthud.lua | 1 - .../LandDefenceOffence/corbhmth.lua | 1 - .../LandDefenceOffence/corbuzz.lua | 1 - .../LandDefenceOffence/cordoom.lua | 1 - .../LandDefenceOffence/corerad.lua | 1 - .../LandDefenceOffence/corexp.lua | 1 - .../LandDefenceOffence/corflak.lua | 1 - .../LandDefenceOffence/corfmd.lua | 1 - .../LandDefenceOffence/corhllt.lua | 1 - .../LandDefenceOffence/corhlt.lua | 1 - .../LandDefenceOffence/corint.lua | 1 - .../LandDefenceOffence/corjuno.lua | 1 - .../LandDefenceOffence/corllt.lua | 1 - .../LandDefenceOffence/cormadsam.lua | 1 - .../LandDefenceOffence/cormaw.lua | 1 - .../LandDefenceOffence/cormexp.lua | 1 - .../LandDefenceOffence/corpun.lua | 1 - .../CorBuildings/LandDefenceOffence/corrl.lua | 1 - .../LandDefenceOffence/corscreamer.lua | 4 +- .../LandDefenceOffence/corsilo.lua | 1 - .../LandDefenceOffence/cortoast.lua | 1 - .../LandDefenceOffence/cortron.lua | 1 - .../LandDefenceOffence/corvipe.lua | 1 - units/CorBuildings/LandEconomy/coradvsol.lua | 1 - units/CorBuildings/LandEconomy/corafus.lua | 1 - units/CorBuildings/LandEconomy/corageo.lua | 1 - units/CorBuildings/LandEconomy/corestor.lua | 1 - units/CorBuildings/LandEconomy/corfus.lua | 1 - units/CorBuildings/LandEconomy/corgeo.lua | 1 - units/CorBuildings/LandEconomy/cormakr.lua | 1 - units/CorBuildings/LandEconomy/cormex.lua | 2 +- units/CorBuildings/LandEconomy/cormmkr.lua | 1 - units/CorBuildings/LandEconomy/cormoho.lua | 1 - units/CorBuildings/LandEconomy/cormstor.lua | 1 - units/CorBuildings/LandEconomy/corsolar.lua | 1 - units/CorBuildings/LandEconomy/corwin.lua | 1 - units/CorBuildings/LandFactories/coraap.lua | 1 - units/CorBuildings/LandFactories/coralab.lua | 1 - units/CorBuildings/LandFactories/corap.lua | 1 - units/CorBuildings/LandFactories/coravp.lua | 1 - units/CorBuildings/LandFactories/corgant.lua | 1 - units/CorBuildings/LandFactories/corhp.lua | 1 - units/CorBuildings/LandFactories/corlab.lua | 1 - units/CorBuildings/LandFactories/corvp.lua | 1 - units/CorBuildings/LandUtil/corarad.lua | 1 - units/CorBuildings/LandUtil/corasp.lua | 1 - units/CorBuildings/LandUtil/cordrag.lua | 1 - units/CorBuildings/LandUtil/coreyes.lua | 1 - units/CorBuildings/LandUtil/corfort.lua | 1 - units/CorBuildings/LandUtil/corgate.lua | 3 +- units/CorBuildings/LandUtil/corjamt.lua | 1 - units/CorBuildings/LandUtil/cormine1.lua | 1 - units/CorBuildings/LandUtil/cormine2.lua | 1 - units/CorBuildings/LandUtil/cormine3.lua | 1 - units/CorBuildings/LandUtil/cornanotc.lua | 1 - units/CorBuildings/LandUtil/cornanotct2.lua | 1 - units/CorBuildings/LandUtil/corrad.lua | 1 - units/CorBuildings/LandUtil/corsd.lua | 1 - units/CorBuildings/LandUtil/corshroud.lua | 1 - units/CorBuildings/LandUtil/cortarg.lua | 1 - units/CorBuildings/SeaDefence/coratl.lua | 1 - units/CorBuildings/SeaDefence/cordl.lua | 1 - units/CorBuildings/SeaDefence/corenaa.lua | 1 - units/CorBuildings/SeaDefence/corfdoom.lua | 1 - units/CorBuildings/SeaDefence/corfhlt.lua | 1 - units/CorBuildings/SeaDefence/corfrock.lua | 1 - units/CorBuildings/SeaDefence/corfrt.lua | 1 - units/CorBuildings/SeaDefence/corgplat.lua | 1 - units/CorBuildings/SeaDefence/corptl.lua | 1 - units/CorBuildings/SeaDefence/cortl.lua | 1 - units/CorBuildings/SeaEconomy/corfmkr.lua | 1 - units/CorBuildings/SeaEconomy/cortide.lua | 1 - units/CorBuildings/SeaEconomy/coruwadves.lua | 2 +- units/CorBuildings/SeaEconomy/coruwadvms.lua | 2 +- units/CorBuildings/SeaEconomy/coruwageo.lua | 1 - units/CorBuildings/SeaEconomy/coruwes.lua | 1 - units/CorBuildings/SeaEconomy/coruwfus.lua | 1 - units/CorBuildings/SeaEconomy/coruwgeo.lua | 1 - units/CorBuildings/SeaEconomy/coruwmex.lua | 2 +- units/CorBuildings/SeaEconomy/coruwmme.lua | 1 - units/CorBuildings/SeaEconomy/coruwmmm.lua | 1 - units/CorBuildings/SeaEconomy/coruwms.lua | 1 - units/CorBuildings/SeaFactories/coramsub.lua | 1 - units/CorBuildings/SeaFactories/corasy.lua | 1 - units/CorBuildings/SeaFactories/corfhp.lua | 1 - units/CorBuildings/SeaFactories/corgantuw.lua | 1 - units/CorBuildings/SeaFactories/corplat.lua | 2 +- units/CorBuildings/SeaFactories/corsy.lua | 1 - units/CorBuildings/SeaUtil/corason.lua | 1 - units/CorBuildings/SeaUtil/corfasp.lua | 1 - units/CorBuildings/SeaUtil/corfatf.lua | 1 - units/CorBuildings/SeaUtil/corfdrag.lua | 1 - units/CorBuildings/SeaUtil/corfgate.lua | 3 +- units/CorBuildings/SeaUtil/corfmine3.lua | 1 - units/CorBuildings/SeaUtil/corfrad.lua | 1 - units/CorBuildings/SeaUtil/cornanotc2plat.lua | 1 - units/CorBuildings/SeaUtil/cornanotcplat.lua | 3 +- units/CorBuildings/SeaUtil/corsonar.lua | 1 - units/CorGantry/corcat.lua | 1 - units/CorGantry/cordemon.lua | 1 - units/CorGantry/corjugg.lua | 1 - units/CorGantry/corkarg.lua | 1 - units/CorGantry/corkorg.lua | 1 - units/CorGantry/corshiva.lua | 1 - units/CorGantry/corsok.lua | 1 - units/CorHovercraft/corah.lua | 1 - units/CorHovercraft/corch.lua | 1 - units/CorHovercraft/corhal.lua | 1 - units/CorHovercraft/cormh.lua | 1 - units/CorHovercraft/corsh.lua | 1 - units/CorHovercraft/corsnap.lua | 1 - units/CorHovercraft/corthovr.lua | 1 - units/CorSeaplanes/corcsa.lua | 1 - units/CorSeaplanes/corcut.lua | 1 - units/CorSeaplanes/corhunt.lua | 1 - units/CorSeaplanes/corsb.lua | 1 - units/CorSeaplanes/corseap.lua | 1 - units/CorSeaplanes/corsfig.lua | 1 - units/CorSeaplanes/corsfig2.lua | 1 - units/CorShips/T2/coracsub.lua | 1 - units/CorShips/T2/corantiship.lua | 1 - units/CorShips/T2/corarch.lua | 1 - units/CorShips/T2/corbats.lua | 1 - units/CorShips/T2/corblackhy.lua | 1 - units/CorShips/T2/corcarry.lua | 1 - units/CorShips/T2/corcrus.lua | 1 - units/CorShips/T2/cordesolator.lua | 2 - units/CorShips/T2/cordronecarry.lua | 1 - units/CorShips/T2/corfship.lua | 1 - units/CorShips/T2/cormls.lua | 1 - units/CorShips/T2/cormship.lua | 1 - units/CorShips/T2/coronager.lua | 1 - units/CorShips/T2/corsentinel.lua | 1 - units/CorShips/T2/corshark.lua | 1 - units/CorShips/T2/corsjam.lua | 1 - units/CorShips/T2/corssub.lua | 1 - units/CorShips/T2/cortdrone.lua | 1 - units/CorShips/corcs.lua | 1 - units/CorShips/coresupp.lua | 1 - units/CorShips/corpship.lua | 1 - units/CorShips/corpt.lua | 1 - units/CorShips/correcl.lua | 1 - units/CorShips/corroy.lua | 1 - units/CorShips/corsub.lua | 1 - units/CorShips/cortship.lua | 1 - units/CorVehicles/T2/coracv.lua | 1 - units/CorVehicles/T2/corban.lua | 1 - units/CorVehicles/T2/coreter.lua | 1 - units/CorVehicles/T2/corgol.lua | 1 - units/CorVehicles/T2/corintr.lua | 1 - units/CorVehicles/T2/cormabm.lua | 1 - units/CorVehicles/T2/cormart.lua | 1 - units/CorVehicles/T2/corparrow.lua | 1 - units/CorVehicles/T2/corphantom.lua | 1 - units/CorVehicles/T2/corprinter.lua | 1 - units/CorVehicles/T2/correap.lua | 1 - units/CorVehicles/T2/corsala.lua | 1 - units/CorVehicles/T2/corseal.lua | 1 - units/CorVehicles/T2/corsent.lua | 1 - units/CorVehicles/T2/corsiegebreaker.lua | 1 - units/CorVehicles/T2/cortrem.lua | 1 - units/CorVehicles/T2/corvac.lua | 1 - units/CorVehicles/T2/corvacct.lua | 2 +- units/CorVehicles/T2/corvrad.lua | 1 - units/CorVehicles/T2/corvroc.lua | 1 - units/CorVehicles/corcv.lua | 1 - units/CorVehicles/corfav.lua | 2 +- units/CorVehicles/corgarp.lua | 1 - units/CorVehicles/corgator.lua | 1 - units/CorVehicles/corlevlr.lua | 1 - units/CorVehicles/cormist.lua | 1 - units/CorVehicles/cormlv.lua | 1 - units/CorVehicles/cormuskrat.lua | 1 - units/CorVehicles/corraid.lua | 1 - units/CorVehicles/corwolv.lua | 1 - units/Legion/Air/T2 Air/legfort.lua | 1 - units/Legion/Air/T2 Air/legheavydrone.lua | 1 - units/Legion/Air/T2 Air/legionnaire.lua | 1 - units/Legion/Air/T2 Air/legmineb.lua | 1 - units/Legion/Air/T2 Air/legnap.lua | 1 - units/Legion/Air/T2 Air/legphoenix.lua | 1 - units/Legion/Air/T2 Air/legstronghold.lua | 1 - units/Legion/Air/T2 Air/legvenator.lua | 1 - units/Legion/Air/T2 Air/legwhisper.lua | 1 - units/Legion/Air/legatrans.lua | 1 - units/Legion/Air/legcib.lua | 1 - units/Legion/Air/legdrone.lua | 1 - units/Legion/Air/legfig.lua | 1 - units/Legion/Air/legkam.lua | 1 - units/Legion/Air/legmos.lua | 1 - units/Legion/Bots/T2 Bots/legbart.lua | 1 - units/Legion/Bots/T2 Bots/legdecom.lua | 1 - units/Legion/Bots/T2 Bots/leginc.lua | 1 - units/Legion/Bots/T2 Bots/leginfestor.lua | 1 - units/Legion/Bots/T2 Bots/legshot.lua | 1 - units/Legion/Bots/T2 Bots/legsnapper.lua | 1 - units/Legion/Bots/T2 Bots/legsrail.lua | 1 - units/Legion/Bots/T2 Bots/legstr.lua | 1 - units/Legion/Bots/legbal.lua | 1 - units/Legion/Bots/legcen.lua | 1 - units/Legion/Bots/leggob.lua | 1 - units/Legion/Bots/legkark.lua | 1 - units/Legion/Bots/leglob.lua | 1 - units/Legion/Constructors/legaca.lua | 1 - units/Legion/Constructors/legaceb.lua | 1 - units/Legion/Constructors/legack.lua | 1 - units/Legion/Constructors/legacv.lua | 1 - units/Legion/Constructors/legca.lua | 1 - units/Legion/Constructors/legch.lua | 1 - units/Legion/Constructors/legck.lua | 1 - units/Legion/Constructors/legcs.lua | 1 - units/Legion/Constructors/legcv.lua | 1 - units/Legion/Constructors/legotter.lua | 1 - units/Legion/Defenses/legabm.lua | 1 - units/Legion/Defenses/legacluster.lua | 1 - units/Legion/Defenses/legbastion.lua | 1 - units/Legion/Defenses/legbombard.lua | 1 - units/Legion/Defenses/legcluster.lua | 1 - units/Legion/Defenses/legdrag.lua | 1 - units/Legion/Defenses/legdtr.lua | 1 - units/Legion/Defenses/legflak.lua | 1 - units/Legion/Defenses/legforti.lua | 1 - units/Legion/Defenses/leghive.lua | 1 - units/Legion/Defenses/leglht.lua | 1 - units/Legion/Defenses/leglraa.lua | 5 +- units/Legion/Defenses/leglrpc.lua | 1 - units/Legion/Defenses/leglupara.lua | 1 - units/Legion/Defenses/legmg.lua | 1 - units/Legion/Defenses/legperdition.lua | 1 - units/Legion/Defenses/legrhapsis.lua | 1 - units/Legion/Defenses/legrl.lua | 1 - units/Legion/Defenses/legsilo.lua | 1 - units/Legion/Defenses/legstarfall.lua | 1 - units/Legion/Economy/legadvsol.lua | 1 - units/Legion/Economy/legageo.lua | 1 - units/Legion/Economy/legamstor.lua | 2 +- units/Legion/Economy/legeconv.lua | 1 - units/Legion/Economy/legestor.lua | 1 - units/Legion/Economy/leggeo.lua | 1 - units/Legion/Economy/legmex.lua | 2 +- units/Legion/Economy/legmext15.lua | 2 +- units/Legion/Economy/legmoho.lua | 1 - units/Legion/Economy/legmohobp.lua | 1 - units/Legion/Economy/legmohobpct.lua | 2 +- units/Legion/Economy/legmstor.lua | 1 - units/Legion/Economy/legrampart.lua | 1 - units/Legion/Economy/legsolar.lua | 1 - units/Legion/Economy/legwin.lua | 1 - units/Legion/Hovercraft/legah.lua | 1 - units/Legion/Hovercraft/legcar.lua | 1 - units/Legion/Hovercraft/legmh.lua | 1 - units/Legion/Hovercraft/legner.lua | 1 - units/Legion/Hovercraft/legsh.lua | 1 - units/Legion/Labs/legaap.lua | 1 - units/Legion/Labs/legalab.lua | 1 - units/Legion/Labs/legamsub.lua | 1 - units/Legion/Labs/legap.lua | 1 - units/Legion/Labs/legavp.lua | 1 - units/Legion/Labs/legfhp.lua | 1 - units/Legion/Labs/leggant.lua | 1 - units/Legion/Labs/leghp.lua | 1 - units/Legion/Labs/legjim.lua | 1 - units/Legion/Labs/leglab.lua | 1 - units/Legion/Labs/legvp.lua | 1 - units/Legion/Legion EvoCom/legcomlvl10.lua | 1 - units/Legion/Legion EvoCom/legcomlvl2.lua | 1 - units/Legion/Legion EvoCom/legcomlvl3.lua | 1 - units/Legion/Legion EvoCom/legcomlvl4.lua | 1 - units/Legion/Legion EvoCom/legcomlvl5.lua | 1 - units/Legion/Legion EvoCom/legcomlvl6.lua | 1 - units/Legion/Legion EvoCom/legcomlvl7.lua | 1 - units/Legion/Legion EvoCom/legcomlvl8.lua | 1 - units/Legion/Legion EvoCom/legcomlvl9.lua | 1 - units/Legion/Other/Commanders/legcomecon.lua | 1 - units/Legion/Other/Commanders/legcomoff.lua | 1 - units/Legion/Other/Commanders/legcomt2com.lua | 1 - units/Legion/Other/Commanders/legcomt2def.lua | 1 - units/Legion/Other/Commanders/legcomt2off.lua | 1 - units/Legion/Other/legvision.lua | 1 - units/Legion/SeaDefenses/legfhive.lua | 1 - units/Legion/SeaDefenses/legptl.lua | 1 - units/Legion/SeaDefenses/legtl.lua | 1 - units/Legion/Seaconomy/legfmkr.lua | 1 - units/Legion/Seaconomy/legtide.lua | 1 - units/Legion/Ships/leghastatus.lua | 1 - units/Legion/Ships/leghastatusalt.lua | 1 - units/Legion/Ships/legoptio.lua | 1 - units/Legion/Ships/legpontus.lua | 1 - units/Legion/Ships/legportent.lua | 1 - units/Legion/Ships/legstingray.lua | 1 - units/Legion/Ships/legtriarius.lua | 1 - units/Legion/Ships/legtriariusdrone.lua | 1 - units/Legion/Ships/legtriariusheatray.lua | 1 - units/Legion/Ships/legvelite.lua | 1 - units/Legion/T3/leegmech.lua | 1 - units/Legion/T3/legkeres.lua | 1 - units/Legion/T3/legpede.lua | 1 - units/Legion/Utilities/cornanotc2plat.lua | 1 - units/Legion/Utilities/legeyes.lua | 2 +- units/Legion/Utilities/legjam.lua | 1 - units/Legion/Utilities/legnanotc.lua | 1 - units/Legion/Utilities/legnanotcplat.lua | 1 - units/Legion/Utilities/legnanotct2.lua | 1 - units/Legion/Utilities/legrad.lua | 1 - .../Vehicles/T2 Vehicles/legaheattank.lua | 1 - .../Vehicles/T2 Vehicles/legamcluster.lua | 1 - .../Vehicles/T2 Vehicles/legaskirmtank.lua | 1 - .../Legion/Vehicles/T2 Vehicles/legavroc.lua | 1 - .../Legion/Vehicles/T2 Vehicles/legfloat.lua | 1 - units/Legion/Vehicles/T2 Vehicles/leginf.lua | 1 - units/Legion/Vehicles/T2 Vehicles/legmed.lua | 1 - units/Legion/Vehicles/T2 Vehicles/legmrv.lua | 1 - .../Legion/Vehicles/T2 Vehicles/legvcarry.lua | 1 - units/Legion/Vehicles/legamphtank.lua | 1 - units/Legion/Vehicles/legbar.lua | 1 - units/Legion/Vehicles/leggat.lua | 1 - units/Legion/Vehicles/leghades.lua | 1 - units/Legion/Vehicles/leghelios.lua | 1 - units/Legion/Vehicles/legmlv.lua | 1 - units/Legion/Vehicles/legrail.lua | 1 - units/Legion/Vehicles/legscout.lua | 2 +- units/Legion/legcom.lua | 1 - units/Scavengers/Air/armfepocht4.lua | 2 +- units/Scavengers/Air/armlichet4.lua | 2 +- units/Scavengers/Air/armminebomber.lua | 1 - units/Scavengers/Air/armthundt4.lua | 2 +- units/Scavengers/Air/corcrw.lua | 1 - units/Scavengers/Air/corcrwt4.lua | 2 +- units/Scavengers/Air/cordronecarryair.lua | 1 - units/Scavengers/Air/cords.lua | 1 - units/Scavengers/Air/corfblackhyt4.lua | 2 +- units/Scavengers/Boss/armcomboss.lua | 1 - units/Scavengers/Boss/armscavengerbossv2.lua | 1 - units/Scavengers/Boss/corcomboss.lua | 1 - units/Scavengers/Boss/scavengerbossv4.lua | 1 - units/Scavengers/Bots/armassimilator.lua | 1 - units/Scavengers/Bots/armlunchbox.lua | 1 - units/Scavengers/Bots/armmeatball.lua | 1 - units/Scavengers/Bots/armpwt4.lua | 1 - units/Scavengers/Bots/armsptkt4.lua | 1 - units/Scavengers/Bots/corakt4.lua | 1 - units/Scavengers/Bots/cordeadeye.lua | 1 - units/Scavengers/Bots/corkarganetht4.lua | 1 - units/Scavengers/Bots/cormandot4.lua | 1 - units/Scavengers/Bots/corthermite.lua | 1 - .../Buildings/DefenseOffense/armannit3.lua | 1 - .../Buildings/DefenseOffense/armbotrail.lua | 1 - .../Buildings/DefenseOffense/armlwall.lua | 1 - .../Buildings/DefenseOffense/armminivulc.lua | 1 - .../Buildings/DefenseOffense/cordoomt3.lua | 1 - .../Buildings/DefenseOffense/corhllllt.lua | 1 - .../Buildings/DefenseOffense/corminibuzz.lua | 1 - .../Buildings/DefenseOffense/cormwall.lua | 1 - .../Buildings/DefenseOffense/corscavdrag.lua | 1 - .../Buildings/DefenseOffense/corscavdtf.lua | 1 - .../Buildings/DefenseOffense/corscavdtl.lua | 1 - .../Buildings/DefenseOffense/corscavdtm.lua | 1 - .../Buildings/DefenseOffense/corscavfort.lua | 1 - .../Buildings/DefenseOffense/legdtf.lua | 1 - .../Buildings/DefenseOffense/legdtl.lua | 1 - .../Buildings/DefenseOffense/legdtm.lua | 1 - .../DefenseOffense/legministarfall.lua | 1 - .../Scavengers/Buildings/Economy/armwint2.lua | 1 - .../Scavengers/Buildings/Economy/corwint2.lua | 1 - .../Scavengers/Buildings/Economy/legwint2.lua | 1 - .../Buildings/Factories/armapt3.lua | 1 - .../Buildings/Factories/corapt3.lua | 1 - .../Buildings/Utility/scavbeacon_t1.lua | 2 +- .../Buildings/Utility/scavbeacon_t2.lua | 2 +- .../Buildings/Utility/scavbeacon_t3.lua | 2 +- .../Buildings/Utility/scavbeacon_t4.lua | 2 +- .../Buildings/Utility/scavsafeareabeacon.lua | 1 - units/Scavengers/Other/scavempspawner.lua | 1 - units/Scavengers/Other/scavengerdroppod.lua | 1 - .../Other/scavengerdroppodfriendly.lua | 1 - units/Scavengers/Other/scavmists.lua | 1 - units/Scavengers/Other/scavtacnukespawner.lua | 1 - units/Scavengers/Ships/armdecadet3.lua | 1 - units/Scavengers/Ships/armpshipt3.lua | 1 - units/Scavengers/Ships/armptt2.lua | 1 - units/Scavengers/Ships/armserpt3.lua | 1 - units/Scavengers/Ships/coresuppt3.lua | 1 - units/Scavengers/Ships/corslrpc.lua | 1 - .../Scavengers/Vehicles/armdronecarryland.lua | 1 - units/Scavengers/Vehicles/armrattet4.lua | 1 - units/Scavengers/Vehicles/armvadert4.lua | 1 - units/Scavengers/Vehicles/armzapper.lua | 2 +- units/Scavengers/Vehicles/corforge.lua | 1 - units/Scavengers/Vehicles/corftiger.lua | 1 - units/Scavengers/Vehicles/corgatreap.lua | 1 - units/Scavengers/Vehicles/corgolt4.lua | 1 - units/Scavengers/Vehicles/cortorch.lua | 1 - units/armassistdrone.lua | 1 - units/armassistdrone_land.lua | 1 - units/armcom.lua | 1 - units/armcomcon.lua | 1 - units/corassistdrone.lua | 1 - units/corassistdrone_land.lua | 1 - units/corcom.lua | 1 - units/corcomcon.lua | 1 - units/legassistdrone.lua | 1 - units/legassistdrone_land.lua | 1 - units/other/armrespawn.lua | 1 - units/other/armsat.lua | 1 - units/other/correspawn.lua | 1 - units/other/corsat.lua | 1 - units/other/critters/critter_ant.lua | 2 +- units/other/critters/critter_crab.lua | 2 +- units/other/critters/critter_duck.lua | 2 +- units/other/critters/critter_goldfish.lua | 2 +- units/other/critters/critter_gull.lua | 2 +- units/other/critters/critter_penguin.lua | 2 +- units/other/critters/critter_penguinbro.lua | 1 - units/other/critters/critter_penguinking.lua | 1 - units/other/dbg_sphere.lua | 1 - units/other/dbg_sphere_fullmetal.lua | 1 - units/other/evocom/armcomlvl10.lua | 1 - units/other/evocom/armcomlvl2.lua | 1 - units/other/evocom/armcomlvl3.lua | 1 - units/other/evocom/armcomlvl4.lua | 1 - units/other/evocom/armcomlvl5.lua | 1 - units/other/evocom/armcomlvl6.lua | 1 - units/other/evocom/armcomlvl7.lua | 1 - units/other/evocom/armcomlvl8.lua | 1 - units/other/evocom/armcomlvl9.lua | 1 - units/other/evocom/babyunits/babyarmvader.lua | 1 - units/other/evocom/comeffigy.lua | 1 - units/other/evocom/corcomlvl10.lua | 1 - units/other/evocom/corcomlvl2.lua | 1 - units/other/evocom/corcomlvl3.lua | 1 - units/other/evocom/corcomlvl4.lua | 1 - units/other/evocom/corcomlvl5.lua | 1 - units/other/evocom/corcomlvl6.lua | 1 - units/other/evocom/corcomlvl7.lua | 1 - units/other/evocom/corcomlvl8.lua | 1 - units/other/evocom/corcomlvl9.lua | 1 - units/other/freefusion.lua | 1 - units/other/legnanotcbase.lua | 1 - units/other/lootboxes/lootboxbronze.lua | 1 - units/other/lootboxes/lootboxgold.lua | 1 - units/other/lootboxes/lootboxplatinum.lua | 1 - units/other/lootboxes/lootboxsilver.lua | 1 - units/other/lootboxes/lootdroppod_gold.lua | 1 - units/other/lootboxes/lootdroppod_printer.lua | 1 - units/other/meteor.lua | 1 - units/other/mission_command_tower.lua | 1 - units/other/nuketest.lua | 1 - units/other/nuketestcor.lua | 1 - units/other/nuketestorg.lua | 1 - units/other/pbr_cube.lua | 1 - .../Acid/raptor_air_bomber_acid_t2_v1.lua | 4 +- .../raptor_allterrain_arty_acid_t2_v1.lua | 4 +- .../raptor_allterrain_arty_acid_t4_v1.lua | 4 +- .../raptor_allterrain_assault_acid_t2_v1.lua | 6 +- .../raptor_allterrain_swarmer_acid_t2_v1.lua | 4 +- .../Acid/raptor_land_assault_acid_t2_v1.lua | 6 +- .../Acid/raptor_land_swarmer_acids_t2_v1.lua | 4 +- .../raptor_allterrain_arty_basic_t2_v1.lua | 4 +- .../raptor_allterrain_arty_basic_t4_v1.lua | 4 +- units/other/raptors/Arty/raptorartillery.lua | 2 +- .../raptor_allterrain_assault_basic_t4_v1.lua | 6 +- .../raptor_allterrain_assault_basic_t4_v2.lua | 6 +- .../raptor_land_assault_basic_t4_v1.lua | 6 +- .../raptor_land_assault_basic_t4_v2.lua | 6 +- .../raptor_allterrain_assault_basic_t2_v1.lua | 6 +- .../raptor_allterrain_assault_basic_t2_v2.lua | 6 +- .../raptor_allterrain_assault_basic_t2_v3.lua | 6 +- .../raptor_land_assault_basic_t2_v1.lua | 6 +- .../raptor_land_assault_basic_t2_v2.lua | 6 +- .../raptor_land_assault_basic_t2_v3.lua | 6 +- .../Bomber/raptor_air_bomber_basic_t1_v1.lua | 4 +- .../Bomber/raptor_air_bomber_basic_t2_v1.lua | 4 +- .../Bomber/raptor_air_bomber_basic_t2_v2.lua | 4 +- .../Bomber/raptor_air_bomber_basic_t4_v1.lua | 4 +- .../Bomber/raptor_air_bomber_basic_t4_v2.lua | 4 +- .../Brood/raptor_air_bomber_brood_t4_v2.lua | 4 +- .../Brood/raptor_air_bomber_brood_t4_v3.lua | 4 +- .../Brood/raptor_air_bomber_brood_t4_v4.lua | 4 +- .../raptor_allterrain_arty_brood_t2_v1.lua | 4 +- .../raptor_allterrain_arty_brood_t4_v1.lua | 4 +- .../Brood/raptor_land_swarmer_brood_t2_v1.lua | 4 +- .../Brood/raptor_land_swarmer_brood_t3_v1.lua | 4 +- .../Brood/raptor_land_swarmer_brood_t4_v1.lua | 4 +- .../Electric/raptor_air_bomber_emp_t2_v1.lua | 4 +- .../raptor_allterrain_arty_emp_t2_v1.lua | 4 +- .../raptor_allterrain_arty_emp_t4_v1.lua | 4 +- .../raptor_allterrain_assault_emp_t2_v1.lua | 6 +- .../raptor_allterrain_swarmer_emp_t2_v1.lua | 4 +- .../raptor_land_assault_emp_t2_v1.lua | 6 +- .../raptor_land_kamikaze_emp_t2_v1.lua | 4 +- .../raptor_land_kamikaze_emp_t4_v1.lua | 4 +- .../raptor_land_swarmer_emp_t2_v1.lua | 4 +- .../raptor_air_fighter_basic_t1_v1.lua | 4 +- .../raptor_air_fighter_basic_t2_v1.lua | 4 +- .../raptor_air_fighter_basic_t2_v2.lua | 4 +- .../raptor_air_fighter_basic_t2_v3.lua | 4 +- .../raptor_air_fighter_basic_t2_v4.lua | 4 +- .../raptor_air_fighter_basic_t4_v1.lua | 4 +- .../raptor_allterrain_swarmer_fire_t2_v1.lua | 4 +- .../Flamer/raptor_land_swarmer_fire_t2_v1.lua | 8 +- .../Flamer/raptor_land_swarmer_fire_t4_v1.lua | 4 +- .../Healer/raptor_land_swarmer_heal_t1_v1.lua | 2 +- .../Healer/raptor_land_swarmer_heal_t2_v1.lua | 2 +- .../Healer/raptor_land_swarmer_heal_t3_v1.lua | 2 +- .../Healer/raptor_land_swarmer_heal_t4_v1.lua | 2 +- units/other/raptors/Healer/raptorh1b.lua | 2 +- .../raptor_air_kamikaze_basic_t2_v1.lua | 4 +- .../raptor_land_kamikaze_basic_t2_v1.lua | 4 +- .../raptor_land_kamikaze_basic_t4_v1.lua | 4 +- .../Miniqueen/raptor_matriarch_acid.lua | 4 +- .../Miniqueen/raptor_matriarch_basic.lua | 4 +- .../Miniqueen/raptor_matriarch_electric.lua | 4 +- .../Miniqueen/raptor_matriarch_fire.lua | 6 +- .../Miniqueen/raptor_matriarch_healer.lua | 4 +- .../Miniqueen/raptor_matriarch_spectre.lua | 4 +- units/other/raptors/Overseer/raptorh5.lua | 4 +- .../raptors/Queens/raptor_queen_easy.lua | 4 +- .../raptors/Queens/raptor_queen_epic.lua | 4 +- .../raptors/Queens/raptor_queen_hard.lua | 4 +- .../raptors/Queens/raptor_queen_normal.lua | 4 +- .../raptors/Queens/raptor_queen_veryeasy.lua | 4 +- .../raptors/Queens/raptor_queen_veryhard.lua | 4 +- .../Scout/raptor_air_scout_basic_t2_v1.lua | 4 +- .../Scout/raptor_air_scout_basic_t3_v1.lua | 4 +- .../Scout/raptor_air_scout_basic_t4_v1.lua | 4 +- .../raptor_land_assault_spectre_t2_v1.lua | 6 +- .../raptor_land_assault_spectre_t4_v1.lua | 6 +- .../raptor_land_spiker_spectre_t4_v1.lua | 6 +- .../raptor_land_swarmer_spectre_t3_v1.lua | 4 +- .../raptor_land_swarmer_spectre_t4_v1.lua | 4 +- .../Spiker/raptor_land_spiker_basic_t2_v1.lua | 6 +- .../Spiker/raptor_land_spiker_basic_t4_v1.lua | 6 +- .../raptors/Structures/raptor_antinuke.lua | 2 +- .../other/raptors/Structures/raptor_hive.lua | 2 +- .../Structures/raptor_turret_acid_t2_v1.lua | 2 +- .../Structures/raptor_turret_acid_t3_v1.lua | 2 +- .../Structures/raptor_turret_acid_t4_v1.lua | 2 +- .../raptor_turret_antiair_t2_v1.lua | 2 +- .../raptor_turret_antiair_t3_v1.lua | 2 +- .../raptor_turret_antiair_t4_v1.lua | 2 +- .../raptor_turret_antinuke_t2_v1.lua | 2 +- .../raptor_turret_antinuke_t3_v1.lua | 2 +- .../Structures/raptor_turret_basic_t2_v1.lua | 2 +- .../Structures/raptor_turret_basic_t3_v1.lua | 2 +- .../Structures/raptor_turret_basic_t4_v1.lua | 2 +- .../Structures/raptor_turret_burrow_t2_v1.lua | 2 +- .../Structures/raptor_turret_emp_t2_v1.lua | 2 +- .../Structures/raptor_turret_emp_t3_v1.lua | 2 +- .../Structures/raptor_turret_emp_t4_v1.lua | 2 +- .../Structures/raptor_turret_meteor_t4_v1.lua | 2 +- .../raptors/Structures/raptor_worm_green.lua | 2 +- .../raptor_land_swarmer_basic_t4_v1.lua | 4 +- .../raptor_land_swarmer_basic_t4_v2.lua | 4 +- .../Swarmer/AllTerrain/raptor_6legged_l.lua | 4 +- .../raptor_allterrain_swarmer_basic_t2_v1.lua | 4 +- .../raptor_allterrain_swarmer_basic_t3_v1.lua | 4 +- .../raptor_allterrain_swarmer_basic_t4_v1.lua | 4 +- .../raptor_land_swarmer_basic_t1_v1.lua | 4 +- .../raptor_land_swarmer_basic_t2_v1.lua | 4 +- .../raptor_land_swarmer_basic_t2_v2.lua | 4 +- .../raptor_land_swarmer_basic_t2_v3.lua | 4 +- .../raptor_land_swarmer_basic_t2_v4.lua | 4 +- .../raptor_land_swarmer_basic_t3_v1.lua | 4 +- .../raptor_land_swarmer_basic_t3_v2.lua | 4 +- .../raptor_land_swarmer_basic_t3_v3.lua | 4 +- .../raptors/raptor_air_gunship_acid_t2_v1.lua | 6 +- .../raptor_air_gunship_antiair_t2_v1.lua | 4 +- .../raptor_air_gunship_basic_t2_v1.lua | 6 +- .../raptors/raptor_air_gunship_emp_t2_v1.lua | 4 +- .../raptors/raptor_air_gunship_fire_t2_v1.lua | 6 +- units/other/resourcecheat.lua | 1 - 824 files changed, 316 insertions(+), 1007 deletions(-) diff --git a/gamedata/alldefs_post.lua b/gamedata/alldefs_post.lua index 94dfa7e40c4..3c08b39f3ad 100644 --- 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 index f36383a9665..d96ce591ae1 100644 --- 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 index d9cf433b9f6..62c424293f0 100644 --- 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 index 3cb96e12df8..7aae406343b 100644 --- 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 index 8ab1089e2af..7c5d68cc2d8 100644 --- 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 index dd1aa11262a..ed353790b64 100644 --- 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 index c2788ef8ae9..52852f8d564 100644 --- 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 index 9bef513c4e1..e36212f6852 100644 --- 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 index d0d5f714baf..33e9d14252a 100644 --- 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 index 6b86a51d905..d42ff6ad046 100644 --- 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 index e137974242b..cc56fa1c718 100644 --- 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 index 6e7ec26088a..0bf0527ee25 100644 --- 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 index afbf9e9f6cd..9320e50a6b2 100644 --- 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 index 48fba762302..530b37bc052 100644 --- 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 index b213d91daa9..89e1517609d 100644 --- 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 index 3280ced4e95..6c682f7d268 100644 --- 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 index c4de4c53b92..1cf8b949187 100644 --- 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 index 3e21ff2ae04..e548ceefe47 100644 --- 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 index c0b64e0cd0a..23f4dec3731 100644 --- 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 index 1050ae44658..5677d768bd9 100644 --- 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 index 636092b1a85..0552d38786b 100644 --- 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 index 197e0166d89..e17d8c648c8 100644 --- 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 index 761cdae8425..bf564e5baab 100644 --- 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 index 03bf571c7eb..246ca3b7987 100644 --- 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 index cb5dfe7b3b5..a591ed008bf 100644 --- 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 index 44819a5d30a..18ec3015b9a 100644 --- 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 index d7abe0090c0..f3b022ac3fa 100644 --- 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 index 83cdb10d1d6..bcac54b2d9e 100644 --- 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 index abd39d72569..ff8680e37d9 100644 --- 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 index 3c54022658c..c217ad1786d 100644 --- 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 index 37a5c732586..aa090b2fcd6 100644 --- 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 index b9312365118..f1e8d593a5f 100644 --- 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 index aa71980b9c2..2f7ef9e459f 100644 --- 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 index 4ac503bbfe6..2141551593c 100644 --- 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 index fbece1570c4..6c304e7a2e8 100644 --- 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 index b621e40c348..84a8dfaeecc 100644 --- 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 index 8898459b439..27f1d1188b8 100644 --- 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 index b92601e3de6..f14eeb19313 100644 --- 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", diff --git a/units/ArmBots/T2/armzeus.lua b/units/ArmBots/T2/armzeus.lua index 81529226537..03aacccd15a 100644 --- a/units/ArmBots/T2/armzeus.lua +++ b/units/ArmBots/T2/armzeus.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMZEUS.DDS", buildtime = 7250, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "35 36 35", collisionvolumetype = "CylY", diff --git a/units/ArmBots/armck.lua b/units/ArmBots/armck.lua index 924d4132b78..9ca3231d070 100644 --- a/units/ArmBots/armck.lua +++ b/units/ArmBots/armck.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMCK.DDS", buildtime = 3450, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "27 30 27", collisionvolumetype = "CylY", diff --git a/units/ArmBots/armflea.lua b/units/ArmBots/armflea.lua index 1a22faaa383..062c7cd285b 100644 --- a/units/ArmBots/armflea.lua +++ b/units/ArmBots/armflea.lua @@ -3,7 +3,7 @@ return { buildpic = "ARMFLEA.DDS", buildtime = 800, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE GROUNDSCOUT EMPABLE", + category = "GROUNDSCOUT", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "20 12 20", collisionvolumetype = "cylY", diff --git a/units/ArmBots/armham.lua b/units/ArmBots/armham.lua index 10dcdb79966..79e9e0b0d5c 100644 --- a/units/ArmBots/armham.lua +++ b/units/ArmBots/armham.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMHAM.DDS", buildtime = 2200, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "29 30 29", collisionvolumetype = "CylY", diff --git a/units/ArmBots/armjeth.lua b/units/ArmBots/armjeth.lua index f5026a78bdb..8f9e1cd7f9a 100644 --- a/units/ArmBots/armjeth.lua +++ b/units/ArmBots/armjeth.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMJETH.DDS", buildtime = 1830, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "28 30 28", collisionvolumetype = "CylY", diff --git a/units/ArmBots/armpw.lua b/units/ArmBots/armpw.lua index 2d292442768..f71b4d6c0d2 100644 --- a/units/ArmBots/armpw.lua +++ b/units/ArmBots/armpw.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMPW.DDS", buildtime = 1420, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "22 30 22", collisionvolumetype = "CylY", diff --git a/units/ArmBots/armrectr.lua b/units/ArmBots/armrectr.lua index a1486955e2f..2dd1c6767df 100644 --- a/units/ArmBots/armrectr.lua +++ b/units/ArmBots/armrectr.lua @@ -7,7 +7,6 @@ return { canassist = false, canmove = true, canresurrect = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "24 32 24", collisionvolumetype = "CylY", diff --git a/units/ArmBots/armrock.lua b/units/ArmBots/armrock.lua index 16f81d36b3c..66a8d10556e 100644 --- a/units/ArmBots/armrock.lua +++ b/units/ArmBots/armrock.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMROCK.DDS", buildtime = 2010, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "24 28 24", collisionvolumetype = "CylY", diff --git a/units/ArmBots/armwar.lua b/units/ArmBots/armwar.lua index 4a15625bbf4..4bc0606bccf 100644 --- a/units/ArmBots/armwar.lua +++ b/units/ArmBots/armwar.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMWAR.DDS", buildtime = 4200, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 1", collisionvolumescales = "30 32 30", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armamb.lua b/units/ArmBuildings/LandDefenceOffence/armamb.lua index 668426480ca..c7245f09655 100644 --- a/units/ArmBuildings/LandDefenceOffence/armamb.lua +++ b/units/ArmBuildings/LandDefenceOffence/armamb.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMAMB.DDS", buildtime = 27000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 24, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "60 30 60", diff --git a/units/ArmBuildings/LandDefenceOffence/armamd.lua b/units/ArmBuildings/LandDefenceOffence/armamd.lua index 2b7ebb41dfb..fd7bf3a0d1e 100644 --- a/units/ArmBuildings/LandDefenceOffence/armamd.lua +++ b/units/ArmBuildings/LandDefenceOffence/armamd.lua @@ -5,7 +5,6 @@ return { buildtime = 60000, canattack = false, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -1", collisionvolumescales = "53 78 53", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandDefenceOffence/armanni.lua b/units/ArmBuildings/LandDefenceOffence/armanni.lua index 5509c6c554b..584d6e6d10a 100644 --- a/units/ArmBuildings/LandDefenceOffence/armanni.lua +++ b/units/ArmBuildings/LandDefenceOffence/armanni.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMANNI.DDS", buildtime = 52000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 10 0", collisionvolumescales = "54 81 54", collisionvolumetype = "BoxY", diff --git a/units/ArmBuildings/LandDefenceOffence/armbeamer.lua b/units/ArmBuildings/LandDefenceOffence/armbeamer.lua index 34ac816b09d..a6f8182cad0 100644 --- a/units/ArmBuildings/LandDefenceOffence/armbeamer.lua +++ b/units/ArmBuildings/LandDefenceOffence/armbeamer.lua @@ -5,7 +5,6 @@ return { buildtime = 5320, canrepeat = false, cantbetransported = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -1", collisionvolumescales = "33 85 33", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armbrtha.lua b/units/ArmBuildings/LandDefenceOffence/armbrtha.lua index 9e29dc454a0..b67d35b1d5d 100644 --- a/units/ArmBuildings/LandDefenceOffence/armbrtha.lua +++ b/units/ArmBuildings/LandDefenceOffence/armbrtha.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMBRTHA.DDS", buildtime = 85000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -20", collisionvolumescales = "48 90 48", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armcir.lua b/units/ArmBuildings/LandDefenceOffence/armcir.lua index 3fc15e76f1c..e684abf037e 100644 --- a/units/ArmBuildings/LandDefenceOffence/armcir.lua +++ b/units/ArmBuildings/LandDefenceOffence/armcir.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMCIR.DDS", buildtime = 12000, canrepeat = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "50 77 50", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armclaw.lua b/units/ArmBuildings/LandDefenceOffence/armclaw.lua index 4903ed02c11..8217e1f2ad0 100644 --- a/units/ArmBuildings/LandDefenceOffence/armclaw.lua +++ b/units/ArmBuildings/LandDefenceOffence/armclaw.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMCLAW.DDS", buildtime = 4650, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.33, decoyfor = "armdrag", diff --git a/units/ArmBuildings/LandDefenceOffence/armemp.lua b/units/ArmBuildings/LandDefenceOffence/armemp.lua index 70c494ac976..6e259c667e5 100644 --- a/units/ArmBuildings/LandDefenceOffence/armemp.lua +++ b/units/ArmBuildings/LandDefenceOffence/armemp.lua @@ -3,7 +3,6 @@ return { buildangle = 8192, buildpic = "ARMEMP.DDS", buildtime = 79300, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 5 0", collisionvolumescales = "80 30 60", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandDefenceOffence/armferret.lua b/units/ArmBuildings/LandDefenceOffence/armferret.lua index 0e41faf0f84..e66ca751d30 100644 --- a/units/ArmBuildings/LandDefenceOffence/armferret.lua +++ b/units/ArmBuildings/LandDefenceOffence/armferret.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMFERRET.DDS", buildtime = 5800, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 12, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 25 46", diff --git a/units/ArmBuildings/LandDefenceOffence/armflak.lua b/units/ArmBuildings/LandDefenceOffence/armflak.lua index 714027a9c4b..da36ac7de59 100644 --- a/units/ArmBuildings/LandDefenceOffence/armflak.lua +++ b/units/ArmBuildings/LandDefenceOffence/armflak.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMFLAK.DDS", buildtime = 19000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "36 55 36", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armguard.lua b/units/ArmBuildings/LandDefenceOffence/armguard.lua index db8acf2ab1f..f0e2c925be9 100644 --- a/units/ArmBuildings/LandDefenceOffence/armguard.lua +++ b/units/ArmBuildings/LandDefenceOffence/armguard.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMGUARD.DDS", buildtime = 21400, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "48 40 48", collisionvolumetype = "box", diff --git a/units/ArmBuildings/LandDefenceOffence/armhlt.lua b/units/ArmBuildings/LandDefenceOffence/armhlt.lua index 756a4fe5cd3..075076dc8d7 100644 --- a/units/ArmBuildings/LandDefenceOffence/armhlt.lua +++ b/units/ArmBuildings/LandDefenceOffence/armhlt.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMHLT.DDS", buildtime = 12500, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 11 0", collisionvolumescales = "36 88 36", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armjuno.lua b/units/ArmBuildings/LandDefenceOffence/armjuno.lua index cbc6ad225df..8d41115abe4 100644 --- a/units/ArmBuildings/LandDefenceOffence/armjuno.lua +++ b/units/ArmBuildings/LandDefenceOffence/armjuno.lua @@ -2,7 +2,6 @@ return { armjuno = { buildpic = "ARMJUNO.DDS", buildtime = 21800, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "44 128 44", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armllt.lua b/units/ArmBuildings/LandDefenceOffence/armllt.lua index ef4c9abdf7e..547ae37f5d9 100644 --- a/units/ArmBuildings/LandDefenceOffence/armllt.lua +++ b/units/ArmBuildings/LandDefenceOffence/armllt.lua @@ -5,7 +5,6 @@ return { buildtime = 2660, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 5 0", collisionvolumescales = "32 77 32", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armmercury.lua b/units/ArmBuildings/LandDefenceOffence/armmercury.lua index 03afc76398b..e111e1304b7 100644 --- a/units/ArmBuildings/LandDefenceOffence/armmercury.lua +++ b/units/ArmBuildings/LandDefenceOffence/armmercury.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMMERCURY.DDS", buildtime = 28000, canrepeat = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 -1 0", collisionvolumescales = "60 78 60", collisionvolumetype = "CylY", @@ -149,7 +148,6 @@ return { weapontype = "MissileLauncher", weaponvelocity = 1850, damage = { - space = 750, vtol = 750, }, }, @@ -158,7 +156,7 @@ return { [1] = { badtargetcategory = "NOTAIR LIGHTAIRSCOUT", def = "ARM_ADVSAM", - onlytargetcategory = "VTOL SPACE", + onlytargetcategory = "VTOL", }, }, }, diff --git a/units/ArmBuildings/LandDefenceOffence/armpb.lua b/units/ArmBuildings/LandDefenceOffence/armpb.lua index 01bdf44440e..d884036f6a8 100644 --- a/units/ArmBuildings/LandDefenceOffence/armpb.lua +++ b/units/ArmBuildings/LandDefenceOffence/armpb.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMPB.DDS", buildtime = 15000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 16, corpse = "DEAD", damagemodifier = 0.5, diff --git a/units/ArmBuildings/LandDefenceOffence/armrl.lua b/units/ArmBuildings/LandDefenceOffence/armrl.lua index 610e6fef648..724c5946a05 100644 --- a/units/ArmBuildings/LandDefenceOffence/armrl.lua +++ b/units/ArmBuildings/LandDefenceOffence/armrl.lua @@ -5,7 +5,6 @@ return { buildtime = 1800, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "48 60 48", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armshockwave.lua b/units/ArmBuildings/LandDefenceOffence/armshockwave.lua index 25b5496384c..f6e9a11882b 100644 --- a/units/ArmBuildings/LandDefenceOffence/armshockwave.lua +++ b/units/ArmBuildings/LandDefenceOffence/armshockwave.lua @@ -7,7 +7,6 @@ return { buildtime = 15000, canattack = true, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 20, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "40 45 40", diff --git a/units/ArmBuildings/LandDefenceOffence/armsilo.lua b/units/ArmBuildings/LandDefenceOffence/armsilo.lua index addde4d5581..1ec0715b810 100644 --- a/units/ArmBuildings/LandDefenceOffence/armsilo.lua +++ b/units/ArmBuildings/LandDefenceOffence/armsilo.lua @@ -3,7 +3,6 @@ return { buildangle = 8192, buildpic = "ARMSILO.DDS", buildtime = 178500, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 3 1", collisionvolumescales = "90 80 90", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandDefenceOffence/armvulc.lua b/units/ArmBuildings/LandDefenceOffence/armvulc.lua index 3a38bb184c5..20dd616fd03 100644 --- a/units/ArmBuildings/LandDefenceOffence/armvulc.lua +++ b/units/ArmBuildings/LandDefenceOffence/armvulc.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMVULC.DDS", buildtime = 1400000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -45", collisionvolumescales = "90 145 90", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armadvsol.lua b/units/ArmBuildings/LandEconomy/armadvsol.lua index d6e3b5019f2..9adeb28da55 100644 --- a/units/ArmBuildings/LandEconomy/armadvsol.lua +++ b/units/ArmBuildings/LandEconomy/armadvsol.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMADVSOL.DDS", buildtime = 7950, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 34 46", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armafus.lua b/units/ArmBuildings/LandEconomy/armafus.lua index efb51c3de01..6635410950e 100644 --- a/units/ArmBuildings/LandEconomy/armafus.lua +++ b/units/ArmBuildings/LandEconomy/armafus.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMAFUS.DDS", buildtime = 312500, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "96 96 96", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandEconomy/armageo.lua b/units/ArmBuildings/LandEconomy/armageo.lua index 0acf609cc6e..92b86fb0abf 100644 --- a/units/ArmBuildings/LandEconomy/armageo.lua +++ b/units/ArmBuildings/LandEconomy/armageo.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMAGEO.DDS", buildtime = 33300, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "107 77 107", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armamex.lua b/units/ArmBuildings/LandEconomy/armamex.lua index d2d5dda1dfd..d6e24328676 100644 --- a/units/ArmBuildings/LandEconomy/armamex.lua +++ b/units/ArmBuildings/LandEconomy/armamex.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMAMEX.DDS", buildtime = 1800, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 12, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "70 50 70", diff --git a/units/ArmBuildings/LandEconomy/armckfus.lua b/units/ArmBuildings/LandEconomy/armckfus.lua index b7ec4c997ce..1b94f6562b6 100644 --- a/units/ArmBuildings/LandEconomy/armckfus.lua +++ b/units/ArmBuildings/LandEconomy/armckfus.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMCKFUS.DDS", buildtime = 84400, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 100, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "97 42 51", diff --git a/units/ArmBuildings/LandEconomy/armestor.lua b/units/ArmBuildings/LandEconomy/armestor.lua index e9ad97f2465..42bf08c5cbd 100644 --- a/units/ArmBuildings/LandEconomy/armestor.lua +++ b/units/ArmBuildings/LandEconomy/armestor.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMESTOR.DDS", buildtime = 4110, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "42 34 42", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armfus.lua b/units/ArmBuildings/LandEconomy/armfus.lua index b9a8ae2027f..ac616a4d9c3 100644 --- a/units/ArmBuildings/LandEconomy/armfus.lua +++ b/units/ArmBuildings/LandEconomy/armfus.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMFUS.DDS", buildtime = 70000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "91 57 59", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandEconomy/armgeo.lua b/units/ArmBuildings/LandEconomy/armgeo.lua index 8e52442f388..a024c66b553 100644 --- a/units/ArmBuildings/LandEconomy/armgeo.lua +++ b/units/ArmBuildings/LandEconomy/armgeo.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMGEO.DDS", buildtime = 13100, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "60 70 60", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandEconomy/armgmm.lua b/units/ArmBuildings/LandEconomy/armgmm.lua index d87da962e82..136246e3317 100644 --- a/units/ArmBuildings/LandEconomy/armgmm.lua +++ b/units/ArmBuildings/LandEconomy/armgmm.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMGMM.DDS", buildtime = 41500, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 6 0", collisionvolumescales = "72 33 72", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armmakr.lua b/units/ArmBuildings/LandEconomy/armmakr.lua index 42dbd09bbcd..dade1918637 100644 --- a/units/ArmBuildings/LandEconomy/armmakr.lua +++ b/units/ArmBuildings/LandEconomy/armmakr.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMMAKR.DDS", buildtime = 2600, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "40 40 40", collisionvolumetype = "CYLY", diff --git a/units/ArmBuildings/LandEconomy/armmex.lua b/units/ArmBuildings/LandEconomy/armmex.lua index 86cd9549a96..e5f3b9c5b9a 100644 --- a/units/ArmBuildings/LandEconomy/armmex.lua +++ b/units/ArmBuildings/LandEconomy/armmex.lua @@ -6,7 +6,7 @@ return { buildpic = "ARMMEX.DDS", buildtime = 1800, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE CANBEUW UNDERWATER", + category = "CANBEUW", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "48 33 48", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armmmkr.lua b/units/ArmBuildings/LandEconomy/armmmkr.lua index 04e74c75ed1..ce40c369191 100644 --- a/units/ArmBuildings/LandEconomy/armmmkr.lua +++ b/units/ArmBuildings/LandEconomy/armmmkr.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMMMKR.DDS", buildtime = 35000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 21000, explodeas = "advmetalmaker", diff --git a/units/ArmBuildings/LandEconomy/armmoho.lua b/units/ArmBuildings/LandEconomy/armmoho.lua index 6ac5f487beb..94626580b02 100644 --- a/units/ArmBuildings/LandEconomy/armmoho.lua +++ b/units/ArmBuildings/LandEconomy/armmoho.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMMOHO.DDS", buildtime = 14900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armmstor.lua b/units/ArmBuildings/LandEconomy/armmstor.lua index 219efbefa35..eb595963216 100644 --- a/units/ArmBuildings/LandEconomy/armmstor.lua +++ b/units/ArmBuildings/LandEconomy/armmstor.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMMSTOR.DDS", buildtime = 2920, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "56 61 56", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandEconomy/armsolar.lua b/units/ArmBuildings/LandEconomy/armsolar.lua index d145c2099c1..285db71cba0 100644 --- a/units/ArmBuildings/LandEconomy/armsolar.lua +++ b/units/ArmBuildings/LandEconomy/armsolar.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMSOLAR.DDS", buildtime = 2800, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 -18.0 1.0", collisionvolumescales = "50.0 76.0 50.0", collisionvolumetype = "Ell", diff --git a/units/ArmBuildings/LandEconomy/armwin.lua b/units/ArmBuildings/LandEconomy/armwin.lua index 8ba24cc7b30..256f5857854 100644 --- a/units/ArmBuildings/LandEconomy/armwin.lua +++ b/units/ArmBuildings/LandEconomy/armwin.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMWIN.DDS", buildtime = 1600, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "34 87 34", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandFactories/armaap.lua b/units/ArmBuildings/LandFactories/armaap.lua index 99f356b3211..b21706e2990 100644 --- a/units/ArmBuildings/LandFactories/armaap.lua +++ b/units/ArmBuildings/LandFactories/armaap.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMAAP.DDS", buildtime = 20900, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-8 4 0", collisionvolumescales = "130 70 70", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandFactories/armalab.lua b/units/ArmBuildings/LandFactories/armalab.lua index 8528af85498..22d506fe29d 100644 --- a/units/ArmBuildings/LandFactories/armalab.lua +++ b/units/ArmBuildings/LandFactories/armalab.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMALAB.DDS", buildtime = 16200, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "85 75 100", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/ArmBuildings/LandFactories/armap.lua b/units/ArmBuildings/LandFactories/armap.lua index 4b0675c7f36..0c1a328b099 100644 --- a/units/ArmBuildings/LandFactories/armap.lua +++ b/units/ArmBuildings/LandFactories/armap.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMAP.DDS", buildtime = 7250, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 1", collisionvolumescales = "134 49 82", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandFactories/armavp.lua b/units/ArmBuildings/LandFactories/armavp.lua index 000cc2783a4..abbf4e52ea3 100644 --- a/units/ArmBuildings/LandFactories/armavp.lua +++ b/units/ArmBuildings/LandFactories/armavp.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMAVP.DDS", buildtime = 18000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -13 2", collisionvolumescales = "110 70 110", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandFactories/armhp.lua b/units/ArmBuildings/LandFactories/armhp.lua index f280ec3c71d..d486edcb8c0 100644 --- a/units/ArmBuildings/LandFactories/armhp.lua +++ b/units/ArmBuildings/LandFactories/armhp.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMHP.DDS", buildtime = 11000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "100 40 90", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/ArmBuildings/LandFactories/armlab.lua b/units/ArmBuildings/LandFactories/armlab.lua index b2fae43904c..3ea2fa6d520 100644 --- a/units/ArmBuildings/LandFactories/armlab.lua +++ b/units/ArmBuildings/LandFactories/armlab.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMLAB.DDS", buildtime = 6500, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "84 22 84", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandFactories/armshltx.lua b/units/ArmBuildings/LandFactories/armshltx.lua index 3aa974565bf..03fc8563dd3 100644 --- a/units/ArmBuildings/LandFactories/armshltx.lua +++ b/units/ArmBuildings/LandFactories/armshltx.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMSHLTX.DDS", buildtime = 61400, canmove = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "137 75 145", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandFactories/armvp.lua b/units/ArmBuildings/LandFactories/armvp.lua index 74dc72d5e29..db4cb16a31d 100644 --- a/units/ArmBuildings/LandFactories/armvp.lua +++ b/units/ArmBuildings/LandFactories/armvp.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMVP.DDS", buildtime = 7200, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "120 34 92", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/ArmBuildings/LandUtil/armarad.lua b/units/ArmBuildings/LandUtil/armarad.lua index 4c420da7692..6608c112621 100644 --- a/units/ArmBuildings/LandUtil/armarad.lua +++ b/units/ArmBuildings/LandUtil/armarad.lua @@ -6,7 +6,6 @@ return { buildtime = 11800, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 80 32", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armasp.lua b/units/ArmBuildings/LandUtil/armasp.lua index d1cb07edb92..8fad5fbffcd 100644 --- a/units/ArmBuildings/LandUtil/armasp.lua +++ b/units/ArmBuildings/LandUtil/armasp.lua @@ -7,7 +7,6 @@ return { buildtime = 9100, canrepeat = false, cantbetransported = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "135 27 135", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandUtil/armdf.lua b/units/ArmBuildings/LandUtil/armdf.lua index a2d5dc13481..6234c70d7bb 100644 --- a/units/ArmBuildings/LandUtil/armdf.lua +++ b/units/ArmBuildings/LandUtil/armdf.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMDF.DDS", buildtime = 7500, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "91 57 59", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/LandUtil/armdrag.lua b/units/ArmBuildings/LandUtil/armdrag.lua index ad16ba0b31b..5a2f54a12cc 100644 --- a/units/ArmBuildings/LandUtil/armdrag.lua +++ b/units/ArmBuildings/LandUtil/armdrag.lua @@ -6,7 +6,6 @@ return { buildtime = 255, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 22 32", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armeyes.lua b/units/ArmBuildings/LandUtil/armeyes.lua index e6f62305e44..0744009016a 100644 --- a/units/ArmBuildings/LandUtil/armeyes.lua +++ b/units/ArmBuildings/LandUtil/armeyes.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMEYES.DDS", buildtime = 750, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 10, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "20 32 20", diff --git a/units/ArmBuildings/LandUtil/armfort.lua b/units/ArmBuildings/LandUtil/armfort.lua index 14a17d8a36f..83cb0938093 100644 --- a/units/ArmBuildings/LandUtil/armfort.lua +++ b/units/ArmBuildings/LandUtil/armfort.lua @@ -7,7 +7,6 @@ return { buildtime = 900, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "32 50 32", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armgate.lua b/units/ArmBuildings/LandUtil/armgate.lua index fbf35dc3ae8..9c358bb084c 100644 --- a/units/ArmBuildings/LandUtil/armgate.lua +++ b/units/ArmBuildings/LandUtil/armgate.lua @@ -6,7 +6,8 @@ return { buildtime = 55000, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", + category = "NOWEAPON", + exemptcategory = "WEAPON", collisionvolumeoffsets = "0 0 1", collisionvolumescales = "57 37 57", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armjamt.lua b/units/ArmBuildings/LandUtil/armjamt.lua index 7dba91d0127..029b7aa851a 100644 --- a/units/ArmBuildings/LandUtil/armjamt.lua +++ b/units/ArmBuildings/LandUtil/armjamt.lua @@ -6,7 +6,6 @@ return { buildtime = 9950, canattack = false, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 25, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 82 32", diff --git a/units/ArmBuildings/LandUtil/armmine1.lua b/units/ArmBuildings/LandUtil/armmine1.lua index 24d0da57fc4..d859b413ff6 100644 --- a/units/ArmBuildings/LandUtil/armmine1.lua +++ b/units/ArmBuildings/LandUtil/armmine1.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL NOTLAND WEAPON MINE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 0.5, collide = false, collisionvolumeoffsets = "0 0 0", diff --git a/units/ArmBuildings/LandUtil/armmine2.lua b/units/ArmBuildings/LandUtil/armmine2.lua index 6b1b60399f2..257b5924263 100644 --- a/units/ArmBuildings/LandUtil/armmine2.lua +++ b/units/ArmBuildings/LandUtil/armmine2.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL NOTLAND WEAPON MINE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 1, collide = false, collisionvolumeoffsets = "0 0 0", diff --git a/units/ArmBuildings/LandUtil/armmine3.lua b/units/ArmBuildings/LandUtil/armmine3.lua index 340e59e1326..e7649aee40a 100644 --- a/units/ArmBuildings/LandUtil/armmine3.lua +++ b/units/ArmBuildings/LandUtil/armmine3.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL NOTLAND WEAPON MINE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 1.5, collide = false, collisionvolumeoffsets = "0 0 0", diff --git a/units/ArmBuildings/LandUtil/armnanotc.lua b/units/ArmBuildings/LandUtil/armnanotc.lua index 26ae471561b..f53200458fb 100644 --- a/units/ArmBuildings/LandUtil/armnanotc.lua +++ b/units/ArmBuildings/LandUtil/armnanotc.lua @@ -12,7 +12,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 32 31", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armnanotct2.lua b/units/ArmBuildings/LandUtil/armnanotct2.lua index 91d897efd2f..0bcb300e7b0 100644 --- a/units/ArmBuildings/LandUtil/armnanotct2.lua +++ b/units/ArmBuildings/LandUtil/armnanotct2.lua @@ -12,7 +12,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 80 46", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armrad.lua b/units/ArmBuildings/LandUtil/armrad.lua index 0e22a6f2051..08109a97e8c 100644 --- a/units/ArmBuildings/LandUtil/armrad.lua +++ b/units/ArmBuildings/LandUtil/armrad.lua @@ -7,7 +7,6 @@ return { canattack = false, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 115 32", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armsd.lua b/units/ArmBuildings/LandUtil/armsd.lua index 0d93d245024..d46d7b1757e 100644 --- a/units/ArmBuildings/LandUtil/armsd.lua +++ b/units/ArmBuildings/LandUtil/armsd.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMSD.DDS", buildtime = 11900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "75 23 75", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armtarg.lua b/units/ArmBuildings/LandUtil/armtarg.lua index 1e726be1080..61501ded036 100644 --- a/units/ArmBuildings/LandUtil/armtarg.lua +++ b/units/ArmBuildings/LandUtil/armtarg.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMTARG.DDS", buildtime = 8700, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "55 80 55", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/LandUtil/armveil.lua b/units/ArmBuildings/LandUtil/armveil.lua index 2a71eb3cba9..c13b84fb663 100644 --- a/units/ArmBuildings/LandUtil/armveil.lua +++ b/units/ArmBuildings/LandUtil/armveil.lua @@ -6,7 +6,6 @@ return { buildtime = 9100, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 19000, energyupkeep = 125, diff --git a/units/ArmBuildings/SeaDefence/armatl.lua b/units/ArmBuildings/SeaDefence/armatl.lua index 455ebe43a83..6cced5a87ad 100644 --- a/units/ArmBuildings/SeaDefence/armatl.lua +++ b/units/ArmBuildings/SeaDefence/armatl.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMATL.DDS", buildtime = 9260, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 8500, explodeas = "smallBuildingExplosionGeneric", diff --git a/units/ArmBuildings/SeaDefence/armdl.lua b/units/ArmBuildings/SeaDefence/armdl.lua index 3b4f2e43807..acbcc94160f 100644 --- a/units/ArmBuildings/SeaDefence/armdl.lua +++ b/units/ArmBuildings/SeaDefence/armdl.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMDL.DDS", buildtime = 6600, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "44 55 44", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaDefence/armfflak.lua b/units/ArmBuildings/SeaDefence/armfflak.lua index afce72031de..6def24ecf8e 100644 --- a/units/ArmBuildings/SeaDefence/armfflak.lua +++ b/units/ArmBuildings/SeaDefence/armfflak.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMFFLAK.DDS", buildtime = 21900, canrepeat = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "42 64 42", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaDefence/armfhlt.lua b/units/ArmBuildings/SeaDefence/armfhlt.lua index 8296ff61ae1..260e6ae8bce 100644 --- a/units/ArmBuildings/SeaDefence/armfhlt.lua +++ b/units/ArmBuildings/SeaDefence/armfhlt.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMFHLT.DDS", buildtime = 9670, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "46 74 46", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaDefence/armfrock.lua b/units/ArmBuildings/SeaDefence/armfrock.lua index a894f64a34b..5929693a695 100644 --- a/units/ArmBuildings/SeaDefence/armfrock.lua +++ b/units/ArmBuildings/SeaDefence/armfrock.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMFROCK.DDS", buildtime = 5810, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 15 0", collisionvolumescales = "36 59 36", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaDefence/armfrt.lua b/units/ArmBuildings/SeaDefence/armfrt.lua index 150d610e17b..cd48616d550 100644 --- a/units/ArmBuildings/SeaDefence/armfrt.lua +++ b/units/ArmBuildings/SeaDefence/armfrt.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMFRT.DDS", buildtime = 2200, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "36 74 36", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaDefence/armgplat.lua b/units/ArmBuildings/SeaDefence/armgplat.lua index cb4a578aa16..5c80ff06bd0 100644 --- a/units/ArmBuildings/SeaDefence/armgplat.lua +++ b/units/ArmBuildings/SeaDefence/armgplat.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMGPLAT.DDS", buildtime = 2860, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "45 36 45", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaDefence/armkraken.lua b/units/ArmBuildings/SeaDefence/armkraken.lua index fba7cc71c14..2054c5bb5bf 100644 --- a/units/ArmBuildings/SeaDefence/armkraken.lua +++ b/units/ArmBuildings/SeaDefence/armkraken.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMKRAKEN.DDS", buildtime = 20000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "84 60 84", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaDefence/armptl.lua b/units/ArmBuildings/SeaDefence/armptl.lua index 5afb0ab621b..53168a4eb98 100644 --- a/units/ArmBuildings/SeaDefence/armptl.lua +++ b/units/ArmBuildings/SeaDefence/armptl.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMTL.DDS", buildtime = 3700, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 1500, explodeas = "mediumBuildingExplosionGeneric", @@ -25,6 +24,7 @@ return { selfdestructas = "mediumBuildingExplosionGenericSelfd", sightdistance = 494, sonardistance = 230, + waterline = 0, yardmap = "ooooooooo", customparams = { model_author = "FireStorm", diff --git a/units/ArmBuildings/SeaDefence/armtl.lua b/units/ArmBuildings/SeaDefence/armtl.lua index fff72d7dd8a..e8ead58fa0e 100644 --- a/units/ArmBuildings/SeaDefence/armtl.lua +++ b/units/ArmBuildings/SeaDefence/armtl.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMTL.DDS", buildtime = 3700, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 1500, explodeas = "mediumExplosionGeneric", diff --git a/units/ArmBuildings/SeaEconomy/armfmkr.lua b/units/ArmBuildings/SeaEconomy/armfmkr.lua index 0618a4cb164..9f5ecbe3815 100644 --- a/units/ArmBuildings/SeaEconomy/armfmkr.lua +++ b/units/ArmBuildings/SeaEconomy/armfmkr.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMFMKR.DDS", buildtime = 2600, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", energycost = 1150, explodeas = "largeBuildingExplosionGeneric", footprintx = 3, diff --git a/units/ArmBuildings/SeaEconomy/armtide.lua b/units/ArmBuildings/SeaEconomy/armtide.lua index cc8f47b77db..f5bec7d6c57 100644 --- a/units/ArmBuildings/SeaEconomy/armtide.lua +++ b/units/ArmBuildings/SeaEconomy/armtide.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMTIDE.DDS", buildtime = 2190, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "37 26 39", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaEconomy/armuwadves.lua b/units/ArmBuildings/SeaEconomy/armuwadves.lua index 4dc8c452d67..5af473241d2 100644 --- a/units/ArmBuildings/SeaEconomy/armuwadves.lua +++ b/units/ArmBuildings/SeaEconomy/armuwadves.lua @@ -4,7 +4,7 @@ return { buildpic = "ARMUWADVES.DDS", buildtime = 20300, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", + category = "CANBEUW", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "42 62 62", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaEconomy/armuwadvms.lua b/units/ArmBuildings/SeaEconomy/armuwadvms.lua index 33d883d220c..0933d8bc886 100644 --- a/units/ArmBuildings/SeaEconomy/armuwadvms.lua +++ b/units/ArmBuildings/SeaEconomy/armuwadvms.lua @@ -4,7 +4,7 @@ return { buildpic = "ARMUWADVMS.DDS", buildtime = 20400, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", + category = "CANBEUW", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "88 38 72", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaEconomy/armuwageo.lua b/units/ArmBuildings/SeaEconomy/armuwageo.lua index f5f149fb3c3..a8668605679 100644 --- a/units/ArmBuildings/SeaEconomy/armuwageo.lua +++ b/units/ArmBuildings/SeaEconomy/armuwageo.lua @@ -9,7 +9,6 @@ return { buildpic = "ARMUWAGEO.DDS", buildtime = 33300, canrepeat = false, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "107 77 107", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaEconomy/armuwes.lua b/units/ArmBuildings/SeaEconomy/armuwes.lua index 5e7fbe21a0c..a9135b62e62 100644 --- a/units/ArmBuildings/SeaEconomy/armuwes.lua +++ b/units/ArmBuildings/SeaEconomy/armuwes.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMUWES.DDS", buildtime = 4110, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", energycost = 1700, energystorage = 6000, diff --git a/units/ArmBuildings/SeaEconomy/armuwfus.lua b/units/ArmBuildings/SeaEconomy/armuwfus.lua index 55f81b89bcb..b5d9310838c 100644 --- a/units/ArmBuildings/SeaEconomy/armuwfus.lua +++ b/units/ArmBuildings/SeaEconomy/armuwfus.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMUWFUS.DDS", buildtime = 99900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", energycost = 33500, energymake = 1200, diff --git a/units/ArmBuildings/SeaEconomy/armuwgeo.lua b/units/ArmBuildings/SeaEconomy/armuwgeo.lua index 44f0f9311fd..11a7e17868b 100644 --- a/units/ArmBuildings/SeaEconomy/armuwgeo.lua +++ b/units/ArmBuildings/SeaEconomy/armuwgeo.lua @@ -9,7 +9,6 @@ return { buildpic = "ARMUWGEO.DDS", buildtime = 13100, canrepeat = false, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "60 70 60", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaEconomy/armuwmex.lua b/units/ArmBuildings/SeaEconomy/armuwmex.lua index 21456af89af..f08ffffb3b3 100644 --- a/units/ArmBuildings/SeaEconomy/armuwmex.lua +++ b/units/ArmBuildings/SeaEconomy/armuwmex.lua @@ -6,7 +6,7 @@ return { buildpic = "ARMUWMEX.DDS", buildtime = 1870, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", + category = "CANBEUW", collisionvolumeoffsets = "0 -55 0", collisionvolumescales = "31 128 31", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaEconomy/armuwmme.lua b/units/ArmBuildings/SeaEconomy/armuwmme.lua index 9f48293b84b..5cc7ac6cd02 100644 --- a/units/ArmBuildings/SeaEconomy/armuwmme.lua +++ b/units/ArmBuildings/SeaEconomy/armuwmme.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMUWMME.DDS", buildtime = 14900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", energycost = 7700, energyupkeep = 20, diff --git a/units/ArmBuildings/SeaEconomy/armuwmmm.lua b/units/ArmBuildings/SeaEconomy/armuwmmm.lua index 468b6e4fd52..1c8b75449b1 100644 --- a/units/ArmBuildings/SeaEconomy/armuwmmm.lua +++ b/units/ArmBuildings/SeaEconomy/armuwmmm.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMUWMMM.DDS", buildtime = 35000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "72 72 72", collisionvolumetype = "Ell", diff --git a/units/ArmBuildings/SeaEconomy/armuwms.lua b/units/ArmBuildings/SeaEconomy/armuwms.lua index fea33f09f5f..1ac46b754ab 100644 --- a/units/ArmBuildings/SeaEconomy/armuwms.lua +++ b/units/ArmBuildings/SeaEconomy/armuwms.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMUWMS.DDS", buildtime = 2920, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", energycost = 570, explodeas = "largeBuildingexplosiongeneric-uw", diff --git a/units/ArmBuildings/SeaFactories/armamsub.lua b/units/ArmBuildings/SeaFactories/armamsub.lua index d0f3dc53018..65f1391a1a9 100644 --- a/units/ArmBuildings/SeaFactories/armamsub.lua +++ b/units/ArmBuildings/SeaFactories/armamsub.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMAMSUB.DDS", buildtime = 11100, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "118 40 119", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaFactories/armasy.lua b/units/ArmBuildings/SeaFactories/armasy.lua index eea3222818f..c58888b3a83 100644 --- a/units/ArmBuildings/SeaFactories/armasy.lua +++ b/units/ArmBuildings/SeaFactories/armasy.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMASY.DDS", buildtime = 16000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -9 -2", collisionvolumescales = "160 60 160", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaFactories/armfhp.lua b/units/ArmBuildings/SeaFactories/armfhp.lua index fcc046237ea..1ddc31068b2 100644 --- a/units/ArmBuildings/SeaFactories/armfhp.lua +++ b/units/ArmBuildings/SeaFactories/armfhp.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMFHP.DDS", buildtime = 11000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "120 32 106", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/ArmBuildings/SeaFactories/armplat.lua b/units/ArmBuildings/SeaFactories/armplat.lua index a6182972534..b340cf6ee76 100644 --- a/units/ArmBuildings/SeaFactories/armplat.lua +++ b/units/ArmBuildings/SeaFactories/armplat.lua @@ -5,7 +5,7 @@ return { buildpic = "ARMPLAT.DDS", buildtime = 12000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE UNDERWATER", + category = "SURFACE UNDERWATER", corpse = "DEAD", energycost = 5000, energystorage = 200, diff --git a/units/ArmBuildings/SeaFactories/armshltxuw.lua b/units/ArmBuildings/SeaFactories/armshltxuw.lua index f1f7c6933f9..1956140b368 100644 --- a/units/ArmBuildings/SeaFactories/armshltxuw.lua +++ b/units/ArmBuildings/SeaFactories/armshltxuw.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMSHLTXUW.DDS", buildtime = 61400, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 0 8", collisionvolumescales = "137 75 145", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaFactories/armsy.lua b/units/ArmBuildings/SeaFactories/armsy.lua index 5ca35f678e1..aac2579be70 100644 --- a/units/ArmBuildings/SeaFactories/armsy.lua +++ b/units/ArmBuildings/SeaFactories/armsy.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMSY.DDS", buildtime = 6660, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-2 -3 -3", collisionvolumescales = "116 63 116", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaUtil/armason.lua b/units/ArmBuildings/SeaUtil/armason.lua index bc100f9a627..ca5d7fdb6cb 100644 --- a/units/ArmBuildings/SeaUtil/armason.lua +++ b/units/ArmBuildings/SeaUtil/armason.lua @@ -6,7 +6,6 @@ return { buildtime = 6150, canattack = false, canrepeat = false, - category = "ALL UNDERWATER NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 2600, explodeas = "mediumBuildingexplosiongeneric-uw", diff --git a/units/ArmBuildings/SeaUtil/armfasp.lua b/units/ArmBuildings/SeaUtil/armfasp.lua index cf9351245b6..dc5fb433939 100644 --- a/units/ArmBuildings/SeaUtil/armfasp.lua +++ b/units/ArmBuildings/SeaUtil/armfasp.lua @@ -11,7 +11,6 @@ return { buildtime = 9100, canrepeat = false, cantbetransported = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "155 55 155", collisionvolumetype = "Box", diff --git a/units/ArmBuildings/SeaUtil/armfatf.lua b/units/ArmBuildings/SeaUtil/armfatf.lua index 3990efc2d41..48865d92478 100644 --- a/units/ArmBuildings/SeaUtil/armfatf.lua +++ b/units/ArmBuildings/SeaUtil/armfatf.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMFATF.DDS", buildtime = 9880, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "52 44 52", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaUtil/armfdrag.lua b/units/ArmBuildings/SeaUtil/armfdrag.lua index 0d213b48487..b56ba8ceddc 100644 --- a/units/ArmBuildings/SeaUtil/armfdrag.lua +++ b/units/ArmBuildings/SeaUtil/armfdrag.lua @@ -7,7 +7,6 @@ return { buildtime = 370, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "36 14 36", collisionvolumetype = "box", diff --git a/units/ArmBuildings/SeaUtil/armfgate.lua b/units/ArmBuildings/SeaUtil/armfgate.lua index 401316e268d..25a10fb04a0 100644 --- a/units/ArmBuildings/SeaUtil/armfgate.lua +++ b/units/ArmBuildings/SeaUtil/armfgate.lua @@ -7,7 +7,8 @@ return { buildtime = 59000, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR", + category = "NOWEAPON", + exemptcategory = "WEAPON", collisionvolumeoffsets = "0 -30 0", collisionvolumescales = "53 65 53", collisionvolumetype = "cyly", diff --git a/units/ArmBuildings/SeaUtil/armfmine3.lua b/units/ArmBuildings/SeaUtil/armfmine3.lua index 9b182b7d752..c790f594505 100644 --- a/units/ArmBuildings/SeaUtil/armfmine3.lua +++ b/units/ArmBuildings/SeaUtil/armfmine3.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL WEAPON MINE NOTSUB NOTAIR HOVER SURFACE EMPABLE", cloakcost = 2, collide = false, collisionvolumeoffsets = "0 -1.5 0", diff --git a/units/ArmBuildings/SeaUtil/armfrad.lua b/units/ArmBuildings/SeaUtil/armfrad.lua index b7378f75ac3..570af8e0d64 100644 --- a/units/ArmBuildings/SeaUtil/armfrad.lua +++ b/units/ArmBuildings/SeaUtil/armfrad.lua @@ -6,7 +6,6 @@ return { buildtime = 1800, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 5 0", collisionvolumescales = "36 59 36", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaUtil/armnanotc2plat.lua b/units/ArmBuildings/SeaUtil/armnanotc2plat.lua index 94454b1c64d..a091c1f441a 100644 --- a/units/ArmBuildings/SeaUtil/armnanotc2plat.lua +++ b/units/ArmBuildings/SeaUtil/armnanotc2plat.lua @@ -12,7 +12,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 80 46", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaUtil/armnanotcplat.lua b/units/ArmBuildings/SeaUtil/armnanotcplat.lua index 08c9217a64f..238da5bcf7a 100644 --- a/units/ArmBuildings/SeaUtil/armnanotcplat.lua +++ b/units/ArmBuildings/SeaUtil/armnanotcplat.lua @@ -11,8 +11,7 @@ return { canreclaim = true, canrepeat = false, canstop = true, - cantbetransported = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", + cantbetransported = true, -- transports cannot drop them back into water, reenable once that works collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 50 31", collisionvolumetype = "CylY", diff --git a/units/ArmBuildings/SeaUtil/armsonar.lua b/units/ArmBuildings/SeaUtil/armsonar.lua index e87a77140e7..5e6aa397b60 100644 --- a/units/ArmBuildings/SeaUtil/armsonar.lua +++ b/units/ArmBuildings/SeaUtil/armsonar.lua @@ -6,7 +6,6 @@ return { buildtime = 910, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "28 41 28", collisionvolumetype = "CylY", diff --git a/units/ArmGantry/armbanth.lua b/units/ArmGantry/armbanth.lua index bef84cbad94..97cecb96de7 100644 --- a/units/ArmGantry/armbanth.lua +++ b/units/ArmGantry/armbanth.lua @@ -5,7 +5,6 @@ return { buildtime = 276000, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "60 88 60", collisionvolumetype = "CylY", diff --git a/units/ArmGantry/armlun.lua b/units/ArmGantry/armlun.lua index e04cd8f20ce..a04447ffd0b 100644 --- a/units/ArmGantry/armlun.lua +++ b/units/ArmGantry/armlun.lua @@ -10,7 +10,6 @@ return { canpatrol = true, canstop = 1, cantbetransported = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", corpse = "dead", energycost = 23000, explodeas = "largeexplosiongeneric", diff --git a/units/ArmGantry/armmar.lua b/units/ArmGantry/armmar.lua index 25c78ef9fec..3bb0ba9a631 100644 --- a/units/ArmGantry/armmar.lua +++ b/units/ArmGantry/armmar.lua @@ -4,7 +4,6 @@ return { buildtime = 26100, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "50 70 50", collisionvolumetype = "CYLY", diff --git a/units/ArmGantry/armprowl.lua b/units/ArmGantry/armprowl.lua index 92f42282fec..38e4f555e0a 100644 --- a/units/ArmGantry/armprowl.lua +++ b/units/ArmGantry/armprowl.lua @@ -4,7 +4,6 @@ return { buildtime = 26100, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -2 -1", collisionvolumescales = "34 68 38", collisionvolumetype = "Box", diff --git a/units/ArmGantry/armraz.lua b/units/ArmGantry/armraz.lua index 1b0fac71a7e..c208614ff22 100644 --- a/units/ArmGantry/armraz.lua +++ b/units/ArmGantry/armraz.lua @@ -4,7 +4,6 @@ return { buildtime = 88600, canmove = true, cantbetransported = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "55 80 55", collisionvolumetype = "CYLY", diff --git a/units/ArmGantry/armthor.lua b/units/ArmGantry/armthor.lua index d7a89d84e29..6d2126b6f67 100644 --- a/units/ArmGantry/armthor.lua +++ b/units/ArmGantry/armthor.lua @@ -5,7 +5,6 @@ return { canmanualfire = true, canmove = true, cantbetransported = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "58 34 58", collisionvolumetype = "Box", diff --git a/units/ArmGantry/armvang.lua b/units/ArmGantry/armvang.lua index 99a0f1a886f..708378bb912 100644 --- a/units/ArmGantry/armvang.lua +++ b/units/ArmGantry/armvang.lua @@ -5,7 +5,6 @@ return { buildtime = 91000, canmove = true, cantbetransported = true, - category = "ALL NOTSUB WEAPON NOTAIR NOTHOVER SURFACE BOT EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "65 60 65", collisionvolumetype = "CylY", diff --git a/units/ArmHovercraft/armah.lua b/units/ArmHovercraft/armah.lua index 18d1e7cce91..80476009a80 100644 --- a/units/ArmHovercraft/armah.lua +++ b/units/ArmHovercraft/armah.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMAH.DDS", buildtime = 3560, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "34 20 34", collisionvolumetype = "CylY", diff --git a/units/ArmHovercraft/armanac.lua b/units/ArmHovercraft/armanac.lua index 588c4d54072..62dce6bb233 100644 --- a/units/ArmHovercraft/armanac.lua +++ b/units/ArmHovercraft/armanac.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMANAC.DDS", buildtime = 3000, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "40 19 40", collisionvolumetype = "Cyly", diff --git a/units/ArmHovercraft/armch.lua b/units/ArmHovercraft/armch.lua index a7701ace8f2..79855eb68c7 100644 --- a/units/ArmHovercraft/armch.lua +++ b/units/ArmHovercraft/armch.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMCH.DDS", buildtime = 4470, canmove = true, - category = "ALL HOVER MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 12 31", collisionvolumetype = "CylY", diff --git a/units/ArmHovercraft/armmh.lua b/units/ArmHovercraft/armmh.lua index 1dcea118745..c14afc701e6 100644 --- a/units/ArmHovercraft/armmh.lua +++ b/units/ArmHovercraft/armmh.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMMH.DDS", buildtime = 3300, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "33 26 43", collisionvolumetype = "CylY", diff --git a/units/ArmHovercraft/armsh.lua b/units/ArmHovercraft/armsh.lua index 15464245291..1f34237b657 100644 --- a/units/ArmHovercraft/armsh.lua +++ b/units/ArmHovercraft/armsh.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMSH.DDS", buildtime = 1700, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "24 20 24", collisionvolumetype = "CylY", diff --git a/units/ArmHovercraft/armthovr.lua b/units/ArmHovercraft/armthovr.lua index 554d2e3cad9..6ac5a01d064 100644 --- a/units/ArmHovercraft/armthovr.lua +++ b/units/ArmHovercraft/armthovr.lua @@ -5,7 +5,6 @@ return { buildtime = 20350, canmove = true, cantbetransported = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "-1 -1 -3", collisionvolumescales = "56 56 75", collisionvolumetype = "CylZ", diff --git a/units/ArmSeaplanes/armcsa.lua b/units/ArmSeaplanes/armcsa.lua index 1602e647a7d..ffea8c3e358 100644 --- a/units/ArmSeaplanes/armcsa.lua +++ b/units/ArmSeaplanes/armcsa.lua @@ -8,7 +8,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER CANBEUW", collide = true, cruisealtitude = 50, energycost = 7800, diff --git a/units/ArmSeaplanes/armsaber.lua b/units/ArmSeaplanes/armsaber.lua index e7cebc2d66a..9fd57b678e2 100644 --- a/units/ArmSeaplanes/armsaber.lua +++ b/units/ArmSeaplanes/armsaber.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER CANBEUW", collide = true, cruisealtitude = 85, energycost = 6400, diff --git a/units/ArmSeaplanes/armsb.lua b/units/ArmSeaplanes/armsb.lua index 41ed68f738f..b84789c8207 100644 --- a/units/ArmSeaplanes/armsb.lua +++ b/units/ArmSeaplanes/armsb.lua @@ -5,7 +5,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER CANBEUW", collide = false, cruisealtitude = 210, energycost = 7500, diff --git a/units/ArmSeaplanes/armseap.lua b/units/ArmSeaplanes/armseap.lua index 37b9d1c7876..a6a5dc63613 100644 --- a/units/ArmSeaplanes/armseap.lua +++ b/units/ArmSeaplanes/armseap.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER CANBEUW", collide = true, cruisealtitude = 100, energycost = 6500, diff --git a/units/ArmSeaplanes/armsehak.lua b/units/ArmSeaplanes/armsehak.lua index 88238bde797..066a7ecf385 100644 --- a/units/ArmSeaplanes/armsehak.lua +++ b/units/ArmSeaplanes/armsehak.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER CANBEUW", collide = false, cruisealtitude = 220, energycost = 7000, diff --git a/units/ArmSeaplanes/armsfig.lua b/units/ArmSeaplanes/armsfig.lua index 9a32b93b1a0..6c8401c17be 100644 --- a/units/ArmSeaplanes/armsfig.lua +++ b/units/ArmSeaplanes/armsfig.lua @@ -7,7 +7,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER CANBEUW", collide = false, cruisealtitude = 140, energycost = 4500, diff --git a/units/ArmSeaplanes/armsfig2.lua b/units/ArmSeaplanes/armsfig2.lua index 9c1d464fa6e..234422210f1 100644 --- a/units/ArmSeaplanes/armsfig2.lua +++ b/units/ArmSeaplanes/armsfig2.lua @@ -7,7 +7,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB VTOL NOTSHIP NOTHOVER CANBEUW", collide = false, cruisealtitude = 140, energycost = 4500, diff --git a/units/ArmShips/T2/armaas.lua b/units/ArmShips/T2/armaas.lua index 117da144646..46f4762a3df 100644 --- a/units/ArmShips/T2/armaas.lua +++ b/units/ArmShips/T2/armaas.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMAAS.DDS", buildtime = 15000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 -1", collisionvolumescales = "31 31 74", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armacsub.lua b/units/ArmShips/T2/armacsub.lua index db941b3ed8c..fc365e02ebe 100644 --- a/units/ArmShips/T2/armacsub.lua +++ b/units/ArmShips/T2/armacsub.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMACSUB.DDS", buildtime = 18000, canmove = true, - category = "UNDERWATER ALL NOTLAND MOBILE NOWEAPON NOTAIR NOTHOVER", collisionvolumeoffsets = "0 0 -1", collisionvolumescales = "31 30 63", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armantiship.lua b/units/ArmShips/T2/armantiship.lua index 374dc1dba00..2a0f800a8cc 100644 --- a/units/ArmShips/T2/armantiship.lua +++ b/units/ArmShips/T2/armantiship.lua @@ -10,7 +10,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "48 48 140", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armbats.lua b/units/ArmShips/T2/armbats.lua index d31a8c55c74..4a20c218c8b 100644 --- a/units/ArmShips/T2/armbats.lua +++ b/units/ArmShips/T2/armbats.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMBATS.DDS", buildtime = 35000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 -10 4", collisionvolumescales = "63 63 144", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armcarry.lua b/units/ArmShips/T2/armcarry.lua index dffb9363113..703c57310ff 100644 --- a/units/ArmShips/T2/armcarry.lua +++ b/units/ArmShips/T2/armcarry.lua @@ -10,7 +10,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 -7 2", collisionvolumescales = "64 64 159", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armcrus.lua b/units/ArmShips/T2/armcrus.lua index 500255011f4..412e7af6596 100644 --- a/units/ArmShips/T2/armcrus.lua +++ b/units/ArmShips/T2/armcrus.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMCRUS.DDS", buildtime = 17000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -8 0", collisionvolumescales = "32 32 112", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armdronecarry.lua b/units/ArmShips/T2/armdronecarry.lua index d73103471ff..1b6742b65a9 100644 --- a/units/ArmShips/T2/armdronecarry.lua +++ b/units/ArmShips/T2/armdronecarry.lua @@ -11,7 +11,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "3 -7 -3", collisionvolumescales = "48 48 140", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armepoch.lua b/units/ArmShips/T2/armepoch.lua index 007e19ee840..fc06caba2d8 100644 --- a/units/ArmShips/T2/armepoch.lua +++ b/units/ArmShips/T2/armepoch.lua @@ -6,7 +6,6 @@ return { buildtime = 169800, canattackground = true, canmove = true, - category = "ALL WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 -6 3", collisionvolumescales = "71 71 180", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armexcalibur.lua b/units/ArmShips/T2/armexcalibur.lua index 57e9af90be4..0ec7f537127 100644 --- a/units/ArmShips/T2/armexcalibur.lua +++ b/units/ArmShips/T2/armexcalibur.lua @@ -6,7 +6,6 @@ return { buildpic = "armexcalibur.DDS", buildtime = 18000, canmove = true, - category = "ALL MOBILE NOTLAND WEAPON SUB NOTSHIP NOTAIR NOTHOVER EMPABLE UNDERWATER", collide = true, collisionvolumeoffsets = "0 1 -4", collisionvolumescales = "20 15 52", diff --git a/units/ArmShips/T2/armlship.lua b/units/ArmShips/T2/armlship.lua index 16f02e33b78..9f933d06722 100644 --- a/units/ArmShips/T2/armlship.lua +++ b/units/ArmShips/T2/armlship.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMLSHIP.DDS", buildtime = 11400, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 4", collisionvolumescales = "28 30 82", collisionvolumetype = "box", diff --git a/units/ArmShips/T2/armmls.lua b/units/ArmShips/T2/armmls.lua index ec62fb90da0..67f911f1dfa 100644 --- a/units/ArmShips/T2/armmls.lua +++ b/units/ArmShips/T2/armmls.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMMLS.DDS", buildtime = 4720, canmove = true, - category = "ALL NOTSUB SHIP NOWEAPON MOBILE NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 2", collisionvolumescales = "25 25 66", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armmship.lua b/units/ArmShips/T2/armmship.lua index 00370a634dc..0caf37f15fd 100644 --- a/units/ArmShips/T2/armmship.lua +++ b/units/ArmShips/T2/armmship.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMMSHIP.DDS", buildtime = 15000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "44 44 80", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armseadragon.lua b/units/ArmShips/T2/armseadragon.lua index d6c0b1da73f..c25e8aa8d4b 100644 --- a/units/ArmShips/T2/armseadragon.lua +++ b/units/ArmShips/T2/armseadragon.lua @@ -6,7 +6,6 @@ return { buildtime = 140000, canmanualfire = true, canmove = true, - category = "ALL MOBILE NOTLAND WEAPON SUB NOTSHIP NOTAIR NOTHOVER EMPABLE UNDERWATER", collisionvolumeoffsets = "0 -3 -5", collisionvolumescales = "32 29 110", collisionvolumetype = "box", diff --git a/units/ArmShips/T2/armserp.lua b/units/ArmShips/T2/armserp.lua index a42e86b3b0b..f23d6a3f0fd 100644 --- a/units/ArmShips/T2/armserp.lua +++ b/units/ArmShips/T2/armserp.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMSERP.DDS", buildtime = 22770, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTAIR NOTHOVER CANBEUW EMPABLE UNDERWATER", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "45 19 57", collisionvolumetype = "box", diff --git a/units/ArmShips/T2/armsjam.lua b/units/ArmShips/T2/armsjam.lua index 1b1dea36355..b42246c087d 100644 --- a/units/ArmShips/T2/armsjam.lua +++ b/units/ArmShips/T2/armsjam.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMSJAM.DDS", buildtime = 6040, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "22 22 64", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/T2/armsubk.lua b/units/ArmShips/T2/armsubk.lua index 299f87f7694..b93b247adeb 100644 --- a/units/ArmShips/T2/armsubk.lua +++ b/units/ArmShips/T2/armsubk.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMSUBK.DDS", buildtime = 22000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTAIR NOTHOVER CANBEUW EMPABLE UNDERWATER", collisionvolumeoffsets = "0.5 0 0", collisionvolumescales = "20 15 64", collisionvolumetype = "box", diff --git a/units/ArmShips/T2/armtdrone.lua b/units/ArmShips/T2/armtdrone.lua index bf61dbaa28b..ece3a9e3e4a 100644 --- a/units/ArmShips/T2/armtdrone.lua +++ b/units/ArmShips/T2/armtdrone.lua @@ -9,7 +9,6 @@ return { buildtime = 1500, canfly = true, canmove = true, - category = "ALL WEAPON NOTSUB VTOL NOTHOVER", collide = true, cruisealt = 40, explodeas = "smallExplosionGeneric", diff --git a/units/ArmShips/T2/armtrident.lua b/units/ArmShips/T2/armtrident.lua index cc79ff6fdd4..831491f9181 100644 --- a/units/ArmShips/T2/armtrident.lua +++ b/units/ArmShips/T2/armtrident.lua @@ -11,7 +11,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "42 42 84", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/armcs.lua b/units/ArmShips/armcs.lua index c0ba29d3109..bfbece14cfd 100644 --- a/units/ArmShips/armcs.lua +++ b/units/ArmShips/armcs.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMCS.DDS", buildtime = 3460, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "30 30 50", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/armdecade.lua b/units/ArmShips/armdecade.lua index b9dd2e7c38f..2cbb8bdb9df 100644 --- a/units/ArmShips/armdecade.lua +++ b/units/ArmShips/armdecade.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMDECADE.DDS", buildtime = 2450, canmove = true, - category = "ALL WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 -1", collisionvolumescales = "21 25 62", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/armpship.lua b/units/ArmShips/armpship.lua index f511cf1911d..49286dc25ba 100644 --- a/units/ArmShips/armpship.lua +++ b/units/ArmShips/armpship.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMPSHIP.DDS", buildtime = 4250, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 1", collisionvolumescales = "26 26 76", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/armpt.lua b/units/ArmShips/armpt.lua index d8e3a52e266..fe5f362f3a5 100644 --- a/units/ArmShips/armpt.lua +++ b/units/ArmShips/armpt.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMPT.DDS", buildtime = 2700, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "24 24 48", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/armrecl.lua b/units/ArmShips/armrecl.lua index 571f9ac5e8b..56a1726f8b6 100644 --- a/units/ArmShips/armrecl.lua +++ b/units/ArmShips/armrecl.lua @@ -9,7 +9,6 @@ return { canassist = false, canmove = true, canresurrect = true, - category = "ALL UNDERWATER NOWEAPON NOTAIR NOTHOVER", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "38 17 50", collisionvolumetype = "box", diff --git a/units/ArmShips/armroy.lua b/units/ArmShips/armroy.lua index c2c62c6d69e..32fbf09908d 100644 --- a/units/ArmShips/armroy.lua +++ b/units/ArmShips/armroy.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMROY.DDS", buildtime = 10200, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 1", collisionvolumescales = "35 35 83", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/armsub.lua b/units/ArmShips/armsub.lua index 8208efd06ed..6ea908accf5 100644 --- a/units/ArmShips/armsub.lua +++ b/units/ArmShips/armsub.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMSUB.DDS", buildtime = 5800, canmove = true, - category = "UNDERWATER ALL MOBILE WEAPON NOTLAND NOTAIR NOTHOVER", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "30 15 43", collisionvolumetype = "box", diff --git a/units/ArmShips/armtorps.lua b/units/ArmShips/armtorps.lua index f96f216aa86..e9c9d523574 100644 --- a/units/ArmShips/armtorps.lua +++ b/units/ArmShips/armtorps.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMMLS.DDS", buildtime = 2350, canmove = true, - category = "ALL WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-2 -3 -5", collisionvolumescales = "24 24 62", collisionvolumetype = "CylZ", diff --git a/units/ArmShips/armtship.lua b/units/ArmShips/armtship.lua index 9de44ca5ed4..1ce07d34feb 100644 --- a/units/ArmShips/armtship.lua +++ b/units/ArmShips/armtship.lua @@ -6,7 +6,6 @@ return { buildtime = 6500, canattack = false, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 -5", collisionvolumescales = "50 50 80", collisionvolumetype = "CylZ", diff --git a/units/ArmVehicles/T2/armacv.lua b/units/ArmVehicles/T2/armacv.lua index 7851b23e15b..a88377fb337 100644 --- a/units/ArmVehicles/T2/armacv.lua +++ b/units/ArmVehicles/T2/armacv.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMACV.DDS", buildtime = 12400, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "36 43 42", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armbull.lua b/units/ArmVehicles/T2/armbull.lua index 0671d62d276..a200babd5b5 100644 --- a/units/ArmVehicles/T2/armbull.lua +++ b/units/ArmVehicles/T2/armbull.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMBULL.DDS", buildtime = 17200, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "44 23 52", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armconsul.lua b/units/ArmVehicles/T2/armconsul.lua index 2046658f98c..ccd12b95ff4 100644 --- a/units/ArmVehicles/T2/armconsul.lua +++ b/units/ArmVehicles/T2/armconsul.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMCONSUL.DDS", buildtime = 6800, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -3", collisionvolumescales = "32 30 30", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armcroc.lua b/units/ArmVehicles/T2/armcroc.lua index b8afc10d8ce..f25e4b05075 100644 --- a/units/ArmVehicles/T2/armcroc.lua +++ b/units/ArmVehicles/T2/armcroc.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMCROC.DDS", buildtime = 16000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 -3", collisionvolumescales = "40 30 56", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armgremlin.lua b/units/ArmVehicles/T2/armgremlin.lua index b419364219c..8cb5ffcbf52 100644 --- a/units/ArmVehicles/T2/armgremlin.lua +++ b/units/ArmVehicles/T2/armgremlin.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMGREMLIN.DDS", buildtime = 6700, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 5, cloakcostmoving = 20, collisionvolumeoffsets = "0 1 0", diff --git a/units/ArmVehicles/T2/armjam.lua b/units/ArmVehicles/T2/armjam.lua index 0926a5845e4..2195b93e227 100644 --- a/units/ArmVehicles/T2/armjam.lua +++ b/units/ArmVehicles/T2/armjam.lua @@ -5,7 +5,6 @@ return { buildtime = 5930, canattack = false, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "23 28 33", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armlatnk.lua b/units/ArmVehicles/T2/armlatnk.lua index db75fd41888..1630705b4fc 100644 --- a/units/ArmVehicles/T2/armlatnk.lua +++ b/units/ArmVehicles/T2/armlatnk.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMLATNK.DDS", buildtime = 6030, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "30 26 34", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armmanni.lua b/units/ArmVehicles/T2/armmanni.lua index 433c23a1b3b..77976637b62 100644 --- a/units/ArmVehicles/T2/armmanni.lua +++ b/units/ArmVehicles/T2/armmanni.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMMANNI.DDS", buildtime = 25700, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "39 49 39", collisionvolumetype = "box", diff --git a/units/ArmVehicles/T2/armmart.lua b/units/ArmVehicles/T2/armmart.lua index f15100cbedd..4567a07162a 100644 --- a/units/ArmVehicles/T2/armmart.lua +++ b/units/ArmVehicles/T2/armmart.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMMART.DDS", buildtime = 6500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "36 20 38", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armmerl.lua b/units/ArmVehicles/T2/armmerl.lua index 125da086da3..5475f4499ca 100644 --- a/units/ArmVehicles/T2/armmerl.lua +++ b/units/ArmVehicles/T2/armmerl.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMMERL.DDS", buildtime = 15500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 30 54", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armseer.lua b/units/ArmVehicles/T2/armseer.lua index 7ce654cd205..1c36753ad09 100644 --- a/units/ArmVehicles/T2/armseer.lua +++ b/units/ArmVehicles/T2/armseer.lua @@ -5,7 +5,6 @@ return { buildtime = 6200, canattack = false, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "28 30 34", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/T2/armyork.lua b/units/ArmVehicles/T2/armyork.lua index 07dc09a5f3d..4f4477ccc7f 100644 --- a/units/ArmVehicles/T2/armyork.lua +++ b/units/ArmVehicles/T2/armyork.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMYORK.DDS", buildtime = 9950, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 -2", collisionvolumescales = "31 31 38", collisionvolumetype = "box", diff --git a/units/ArmVehicles/armart.lua b/units/ArmVehicles/armart.lua index f8a11f931a9..405772c590c 100644 --- a/units/ArmVehicles/armart.lua +++ b/units/ArmVehicles/armart.lua @@ -3,7 +3,6 @@ return { buildpic = "armart.DDS", buildtime = 3000, canmove = true, - category = "ALL TANK WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -5", collisionvolumescales = "30 24 35", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armbeaver.lua b/units/ArmVehicles/armbeaver.lua index d47e59df37e..e2ce18580b9 100644 --- a/units/ArmVehicles/armbeaver.lua +++ b/units/ArmVehicles/armbeaver.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMBEAVER.DDS", buildtime = 6700, canmove = true, - category = "ALL TANK PHIB NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "34 26 41", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armcv.lua b/units/ArmVehicles/armcv.lua index 46ddec9e6fa..2970a409332 100644 --- a/units/ArmVehicles/armcv.lua +++ b/units/ArmVehicles/armcv.lua @@ -5,7 +5,6 @@ return { buildpic = "ARMCV.DDS", buildtime = 4050, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -1", collisionvolumescales = "35 30 50", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armfav.lua b/units/ArmVehicles/armfav.lua index 47ff0a75b5b..2e3fe09d58e 100644 --- a/units/ArmVehicles/armfav.lua +++ b/units/ArmVehicles/armfav.lua @@ -3,7 +3,7 @@ return { buildpic = "ARMFAV.DDS", buildtime = 950, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE GROUNDSCOUT EMPABLE", + category = "GROUNDSCOUT", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "21 15 26", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armflash.lua b/units/ArmVehicles/armflash.lua index d3dd7df304d..122aa11159e 100644 --- a/units/ArmVehicles/armflash.lua +++ b/units/ArmVehicles/armflash.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMFLASH.DDS", buildtime = 1960, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 -1", collisionvolumescales = "24 13 31", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armjanus.lua b/units/ArmVehicles/armjanus.lua index d389a95fc1d..7af66401e74 100644 --- a/units/ArmVehicles/armjanus.lua +++ b/units/ArmVehicles/armjanus.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMJANUS.DDS", buildtime = 3550, canmove = true, - category = "ALL TANK WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "25 12 33", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armmlv.lua b/units/ArmVehicles/armmlv.lua index 84fe0917ebe..ca4a3a04cd1 100644 --- a/units/ArmVehicles/armmlv.lua +++ b/units/ArmVehicles/armmlv.lua @@ -10,7 +10,6 @@ return { canreclaim = false, canrepair = true, canrestore = false, - category = "ALL TANK WEAPON MOBILE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "22 28 35", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armpincer.lua b/units/ArmVehicles/armpincer.lua index 8fcda4b184b..746c97378bf 100644 --- a/units/ArmVehicles/armpincer.lua +++ b/units/ArmVehicles/armpincer.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMPINCER.DDS", buildtime = 2610, canmove = true, - category = "ALL TANK PHIB WEAPON NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 1", collisionvolumescales = "31 13 31", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armsam.lua b/units/ArmVehicles/armsam.lua index 3ca48d045ba..e65b79f82ca 100644 --- a/units/ArmVehicles/armsam.lua +++ b/units/ArmVehicles/armsam.lua @@ -4,7 +4,6 @@ return { buildpic = "ARMSAM.DDS", buildtime = 3420, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "26 15 41", collisionvolumetype = "Box", diff --git a/units/ArmVehicles/armstump.lua b/units/ArmVehicles/armstump.lua index 300b805fe08..600a8c4a2f9 100644 --- a/units/ArmVehicles/armstump.lua +++ b/units/ArmVehicles/armstump.lua @@ -3,7 +3,6 @@ return { buildpic = "ARMSTUMP.DDS", buildtime = 2900, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "34 18 40", collisionvolumetype = "Box", diff --git a/units/CorAircraft/T2/coraca.lua b/units/CorAircraft/T2/coraca.lua index 78d36b09873..61828790fc4 100644 --- a/units/CorAircraft/T2/coraca.lua +++ b/units/CorAircraft/T2/coraca.lua @@ -7,7 +7,6 @@ return { buildtime = 18000, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = true, cruisealtitude = 70, energycost = 11000, diff --git a/units/CorAircraft/T2/corape.lua b/units/CorAircraft/T2/corape.lua index 959b0c52519..3a28e7d0392 100644 --- a/units/CorAircraft/T2/corape.lua +++ b/units/CorAircraft/T2/corape.lua @@ -5,7 +5,6 @@ return { buildtime = 14500, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER", collide = true, collisionvolumeoffsets = "0 5 3", collisionvolumescales = "48 18 48", diff --git a/units/CorAircraft/T2/corawac.lua b/units/CorAircraft/T2/corawac.lua index 8220c352752..b413bb87997 100644 --- a/units/CorAircraft/T2/corawac.lua +++ b/units/CorAircraft/T2/corawac.lua @@ -5,7 +5,6 @@ return { buildtime = 13300, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = false, cruisealtitude = 110, energycost = 8300, diff --git a/units/CorAircraft/T2/corcrwh.lua b/units/CorAircraft/T2/corcrwh.lua index e3082d6ddf8..f2aa74adb85 100644 --- a/units/CorAircraft/T2/corcrwh.lua +++ b/units/CorAircraft/T2/corcrwh.lua @@ -8,7 +8,6 @@ return { buildtime = 84200, canfly = true, canmove = true, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, collisionvolumeoffsets = "0 1 17", collisionvolumescales = "55 28 80", diff --git a/units/CorAircraft/T2/corhurc.lua b/units/CorAircraft/T2/corhurc.lua index 0ab9f74cbe6..eb050c155fe 100644 --- a/units/CorAircraft/T2/corhurc.lua +++ b/units/CorAircraft/T2/corhurc.lua @@ -5,7 +5,6 @@ return { buildtime = 31000, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 220, energycost = 18500, diff --git a/units/CorAircraft/T2/corseah.lua b/units/CorAircraft/T2/corseah.lua index 460d2876ac2..a824a4e430a 100644 --- a/units/CorAircraft/T2/corseah.lua +++ b/units/CorAircraft/T2/corseah.lua @@ -5,7 +5,6 @@ return { buildtime = 10000, canfly = true, canmove = true, - category = "ALL NOTSUB VTOL NOWEAPON NOTHOVER", collide = false, collisionvolumeoffsets = "1 -3 0", collisionvolumescales = "52 21 52", diff --git a/units/CorAircraft/T2/cortitan.lua b/units/CorAircraft/T2/cortitan.lua index fa686e20ae8..dc05e49e2a9 100644 --- a/units/CorAircraft/T2/cortitan.lua +++ b/units/CorAircraft/T2/cortitan.lua @@ -5,7 +5,6 @@ return { buildtime = 14700, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = true, cruisealtitude = 90, energycost = 8200, diff --git a/units/CorAircraft/T2/corvamp.lua b/units/CorAircraft/T2/corvamp.lua index f5b201b567c..eac6c836138 100644 --- a/units/CorAircraft/T2/corvamp.lua +++ b/units/CorAircraft/T2/corvamp.lua @@ -6,7 +6,6 @@ return { buildtime = 8400, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 160, energycost = 4750, diff --git a/units/CorAircraft/corbw.lua b/units/CorAircraft/corbw.lua index 6f4fcf37537..f566bfcdf77 100644 --- a/units/CorAircraft/corbw.lua +++ b/units/CorAircraft/corbw.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cantbetransported = false, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, cruisealtitude = 78, energycost = 1300, diff --git a/units/CorAircraft/corca.lua b/units/CorAircraft/corca.lua index f5244ae1217..216625d3ad8 100644 --- a/units/CorAircraft/corca.lua +++ b/units/CorAircraft/corca.lua @@ -7,7 +7,6 @@ return { buildtime = 8360, canfly = true, canmove = true, - category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = true, cruisealtitude = 75, energycost = 3200, diff --git a/units/CorAircraft/cordrone.lua b/units/CorAircraft/cordrone.lua index d574d13b4a8..e17494b28bf 100644 --- a/units/CorAircraft/cordrone.lua +++ b/units/CorAircraft/cordrone.lua @@ -5,7 +5,6 @@ return { buildtime = 1500, canfly = true, canmove = true, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, cruisealtitude = 40, energycost = 750, diff --git a/units/CorAircraft/cordroneold.lua b/units/CorAircraft/cordroneold.lua index f534bc54e36..651273e0670 100644 --- a/units/CorAircraft/cordroneold.lua +++ b/units/CorAircraft/cordroneold.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cantbetransported = false, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, cruisealtitude = 78, energycost = 650, diff --git a/units/CorAircraft/corfink.lua b/units/CorAircraft/corfink.lua index cbee32f5d98..09989bb3154 100644 --- a/units/CorAircraft/corfink.lua +++ b/units/CorAircraft/corfink.lua @@ -5,7 +5,7 @@ return { buildtime = 2400, canfly = true, canmove = true, - category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER LIGHTAIRSCOUT", + category = "LIGHTAIRSCOUT", collide = false, cruisealtitude = 110, energycost = 1450, diff --git a/units/CorAircraft/corshad.lua b/units/CorAircraft/corshad.lua index 95e05940b2a..70dd9e3a06c 100644 --- a/units/CorAircraft/corshad.lua +++ b/units/CorAircraft/corshad.lua @@ -5,7 +5,6 @@ return { buildtime = 5050, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER", collide = true, cruisealtitude = 165, energycost = 4600, diff --git a/units/CorAircraft/corvalk.lua b/units/CorAircraft/corvalk.lua index 5ee790d4ce3..8465062afb4 100644 --- a/units/CorAircraft/corvalk.lua +++ b/units/CorAircraft/corvalk.lua @@ -5,7 +5,6 @@ return { buildtime = 4120, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 100, energycost = 1450, diff --git a/units/CorAircraft/corveng.lua b/units/CorAircraft/corveng.lua index deb498f0526..ea10d4e84c7 100644 --- a/units/CorAircraft/corveng.lua +++ b/units/CorAircraft/corveng.lua @@ -6,7 +6,6 @@ return { buildtime = 3330, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON VTOL NOTLAND NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 125, energycost = 2800, diff --git a/units/CorBots/T2/coraak.lua b/units/CorBots/T2/coraak.lua index 8a0206e6857..e57a0768877 100644 --- a/units/CorBots/T2/coraak.lua +++ b/units/CorBots/T2/coraak.lua @@ -4,7 +4,6 @@ return { buildpic = "CORAAK.DDS", buildtime = 7600, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "27 29 22", collisionvolumetype = "Box", diff --git a/units/CorBots/T2/corack.lua b/units/CorBots/T2/corack.lua index 03acce5cb06..bf6724107b3 100644 --- a/units/CorBots/T2/corack.lua +++ b/units/CorBots/T2/corack.lua @@ -5,7 +5,6 @@ return { buildpic = "CORACK.DDS", buildtime = 9700, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "28 42 30", collisionvolumetype = "Box", diff --git a/units/CorBots/T2/coramph.lua b/units/CorBots/T2/coramph.lua index 5e1a8135609..2d625d2120b 100644 --- a/units/CorBots/T2/coramph.lua +++ b/units/CorBots/T2/coramph.lua @@ -4,7 +4,6 @@ return { buildpic = "CORAMPH.DDS", buildtime = 9650, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSHIP NOTAIR NOTHOVER NOTSUB SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 29 32", collisionvolumetype = "CylY", diff --git a/units/CorBots/T2/corcan.lua b/units/CorBots/T2/corcan.lua index 3b762474d9b..eaa49ae1f5a 100644 --- a/units/CorBots/T2/corcan.lua +++ b/units/CorBots/T2/corcan.lua @@ -3,7 +3,6 @@ return { buildpic = "CORCAN.DDS", buildtime = 11700, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "32 34 30", collisionvolumetype = "CylY", diff --git a/units/CorBots/T2/cordecom.lua b/units/CorBots/T2/cordecom.lua index f519decd9cf..5ba9e221856 100644 --- a/units/CorBots/T2/cordecom.lua +++ b/units/CorBots/T2/cordecom.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/CorBots/T2/corfast.lua b/units/CorBots/T2/corfast.lua index b7221aaaf7b..91d69b552b1 100644 --- a/units/CorBots/T2/corfast.lua +++ b/units/CorBots/T2/corfast.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFAST.DDS", buildtime = 6500, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "22 47 19", collisionvolumetype = "Box", diff --git a/units/CorBots/T2/corhrk.lua b/units/CorBots/T2/corhrk.lua index 618b142b4c7..1d76ef58e49 100644 --- a/units/CorBots/T2/corhrk.lua +++ b/units/CorBots/T2/corhrk.lua @@ -3,7 +3,6 @@ return { buildpic = "CORHRK.DDS", buildtime = 6600, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 1 -1", collisionvolumescales = "26 31 33", collisionvolumetype = "Box", diff --git a/units/CorBots/T2/cormando.lua b/units/CorBots/T2/cormando.lua index c403e51e320..724ff4bb34a 100644 --- a/units/CorBots/T2/cormando.lua +++ b/units/CorBots/T2/cormando.lua @@ -11,7 +11,6 @@ return { canreclaim = true, canrepair = true, canrestore = false, - category = "ALL MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE BOT CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "38 50 22", collisionvolumetype = "box", diff --git a/units/CorBots/T2/cormort.lua b/units/CorBots/T2/cormort.lua index eef0f8b796c..531cf93ff33 100644 --- a/units/CorBots/T2/cormort.lua +++ b/units/CorBots/T2/cormort.lua @@ -3,7 +3,6 @@ return { buildpic = "CORMORT.DDS", buildtime = 5140, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "2 0 0", collisionvolumescales = "28 35 28", collisionvolumetype = "CylY", diff --git a/units/CorBots/T2/corpyro.lua b/units/CorBots/T2/corpyro.lua index fd45f84f1c1..1d72b145177 100644 --- a/units/CorBots/T2/corpyro.lua +++ b/units/CorBots/T2/corpyro.lua @@ -3,7 +3,6 @@ return { buildpic = "CORPYRO.DDS", buildtime = 5030, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "28 35 28", collisionvolumetype = "CylY", diff --git a/units/CorBots/T2/corroach.lua b/units/CorBots/T2/corroach.lua index c6c6b296a7d..053e72daf65 100644 --- a/units/CorBots/T2/corroach.lua +++ b/units/CorBots/T2/corroach.lua @@ -4,7 +4,6 @@ return { buildpic = "CORROACH.DDS", buildtime = 7900, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "20 9 20", collisionvolumetype = "CylY", diff --git a/units/CorBots/T2/corsktl.lua b/units/CorBots/T2/corsktl.lua index 7c46b3b260a..501896ff026 100644 --- a/units/CorBots/T2/corsktl.lua +++ b/units/CorBots/T2/corsktl.lua @@ -4,7 +4,6 @@ return { buildtime = 17000, canmove = true, cantbetransported = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 150, cloakcostmoving = 400, collisionvolumeoffsets = "0.5 -1 0", diff --git a/units/CorBots/T2/corspec.lua b/units/CorBots/T2/corspec.lua index 773e9bcadf2..fc00aed0a48 100644 --- a/units/CorBots/T2/corspec.lua +++ b/units/CorBots/T2/corspec.lua @@ -5,7 +5,6 @@ return { buildtime = 5440, canattack = false, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 4", collisionvolumescales = "29 45 29", collisionvolumetype = "Box", diff --git a/units/CorBots/T2/corspy.lua b/units/CorBots/T2/corspy.lua index 9824e62824f..c98a6e8bc36 100644 --- a/units/CorBots/T2/corspy.lua +++ b/units/CorBots/T2/corspy.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 -2 0", diff --git a/units/CorBots/T2/corsumo.lua b/units/CorBots/T2/corsumo.lua index a3acd482946..e8c36be0ccb 100644 --- a/units/CorBots/T2/corsumo.lua +++ b/units/CorBots/T2/corsumo.lua @@ -3,7 +3,6 @@ return { buildpic = "CORSUMO.DDS", buildtime = 51000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "38 34 36", collisionvolumetype = "Box", diff --git a/units/CorBots/T2/cortermite.lua b/units/CorBots/T2/cortermite.lua index 0304bca7588..a6232d8c30e 100644 --- a/units/CorBots/T2/cortermite.lua +++ b/units/CorBots/T2/cortermite.lua @@ -3,7 +3,6 @@ return { buildpic = "CORTERMITE.DDS", buildtime = 15000, canmove = true, - category = "ALL BOT WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "40 26 48", collisionvolumetype = "CylY", diff --git a/units/CorBots/T2/corvoyr.lua b/units/CorBots/T2/corvoyr.lua index c9773c7d261..027d04d2271 100644 --- a/units/CorBots/T2/corvoyr.lua +++ b/units/CorBots/T2/corvoyr.lua @@ -5,7 +5,6 @@ return { buildtime = 3950, canattack = false, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "26 34 26", collisionvolumetype = "CylY", diff --git a/units/CorBots/corak.lua b/units/CorBots/corak.lua index 08fff4cab9c..9658dc9b711 100644 --- a/units/CorBots/corak.lua +++ b/units/CorBots/corak.lua @@ -3,7 +3,6 @@ return { buildpic = "CORAK.DDS", buildtime = 1280, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "24 32 24", collisionvolumetype = "CylY", diff --git a/units/CorBots/corck.lua b/units/CorBots/corck.lua index 78121998e48..56818184422 100644 --- a/units/CorBots/corck.lua +++ b/units/CorBots/corck.lua @@ -5,7 +5,6 @@ return { buildpic = "CORCK.DDS", buildtime = 3550, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -1", collisionvolumescales = "25 31 25", collisionvolumetype = "CylY", diff --git a/units/CorBots/corcrash.lua b/units/CorBots/corcrash.lua index 1f910ee9a13..b53eef1e239 100644 --- a/units/CorBots/corcrash.lua +++ b/units/CorBots/corcrash.lua @@ -4,7 +4,6 @@ return { buildpic = "CORCRASH.DDS", buildtime = 1900, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "30 32 30", collisionvolumetype = "CYLY", diff --git a/units/CorBots/cornecro.lua b/units/CorBots/cornecro.lua index 3dc2bf3936e..689eb700f1e 100644 --- a/units/CorBots/cornecro.lua +++ b/units/CorBots/cornecro.lua @@ -7,7 +7,6 @@ return { canassist = false, canmove = true, canresurrect = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 1", collisionvolumescales = "28 34 28", collisionvolumetype = "CylY", diff --git a/units/CorBots/corstorm.lua b/units/CorBots/corstorm.lua index 90d4816790d..8f664c2c9e0 100644 --- a/units/CorBots/corstorm.lua +++ b/units/CorBots/corstorm.lua @@ -3,7 +3,6 @@ return { buildpic = "CORSTORM.DDS", buildtime = 1950, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "22 28 22", collisionvolumetype = "cylY", diff --git a/units/CorBots/corthud.lua b/units/CorBots/corthud.lua index 287b3c222b0..24afd1a4486 100644 --- a/units/CorBots/corthud.lua +++ b/units/CorBots/corthud.lua @@ -3,7 +3,6 @@ return { buildpic = "CORTHUD.DDS", buildtime = 2100, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "29 32 29", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corbhmth.lua b/units/CorBuildings/LandDefenceOffence/corbhmth.lua index 8ef5a418163..44bc8226859 100644 --- a/units/CorBuildings/LandDefenceOffence/corbhmth.lua +++ b/units/CorBuildings/LandDefenceOffence/corbhmth.lua @@ -5,7 +5,6 @@ return { buildpic = "CORBHMTH.DDS", buildtime = 59600, canrepeat = false, - category = "ALL NOTLAND NOTSUB WEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "80 80 80", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corbuzz.lua b/units/CorBuildings/LandDefenceOffence/corbuzz.lua index 7b62d715ff2..86b3d8c4c26 100644 --- a/units/CorBuildings/LandDefenceOffence/corbuzz.lua +++ b/units/CorBuildings/LandDefenceOffence/corbuzz.lua @@ -4,7 +4,6 @@ return { buildpic = "CORBUZZ.DDS", buildtime = 1400000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "80 160 80", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/cordoom.lua b/units/CorBuildings/LandDefenceOffence/cordoom.lua index cd8d9876383..d4275d7d72f 100644 --- a/units/CorBuildings/LandDefenceOffence/cordoom.lua +++ b/units/CorBuildings/LandDefenceOffence/cordoom.lua @@ -5,7 +5,6 @@ return { buildpic = "CORDOOM.DDS", buildtime = 55200, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 -17.0 0.0", collisionvolumescales = "48.0 110.0 48.0", collisionvolumetype = "box", diff --git a/units/CorBuildings/LandDefenceOffence/corerad.lua b/units/CorBuildings/LandDefenceOffence/corerad.lua index d80052f15da..f8ce928cac0 100644 --- a/units/CorBuildings/LandDefenceOffence/corerad.lua +++ b/units/CorBuildings/LandDefenceOffence/corerad.lua @@ -5,7 +5,6 @@ return { buildpic = "CORERAD.DDS", buildtime = 12000, canrepeat = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 7900, explodeas = "mediumBuildingExplosionGeneric", diff --git a/units/CorBuildings/LandDefenceOffence/corexp.lua b/units/CorBuildings/LandDefenceOffence/corexp.lua index be85b4f7b02..949b899d413 100644 --- a/units/CorBuildings/LandDefenceOffence/corexp.lua +++ b/units/CorBuildings/LandDefenceOffence/corexp.lua @@ -7,7 +7,6 @@ return { buildtime = 2720, canattack = true, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "40 45 40", collisionvolumetype = "BOX", diff --git a/units/CorBuildings/LandDefenceOffence/corflak.lua b/units/CorBuildings/LandDefenceOffence/corflak.lua index 02d578e9556..4d202067437 100644 --- a/units/CorBuildings/LandDefenceOffence/corflak.lua +++ b/units/CorBuildings/LandDefenceOffence/corflak.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFLAK.DDS", buildtime = 20100, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "28 34 28", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corfmd.lua b/units/CorBuildings/LandDefenceOffence/corfmd.lua index adf0a6a23f6..ea72b89eb48 100644 --- a/units/CorBuildings/LandDefenceOffence/corfmd.lua +++ b/units/CorBuildings/LandDefenceOffence/corfmd.lua @@ -5,7 +5,6 @@ return { buildtime = 60000, canattack = false, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -19 0", collisionvolumescales = "48 78 48", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandDefenceOffence/corhllt.lua b/units/CorBuildings/LandDefenceOffence/corhllt.lua index 8fedb445e19..ef9c074b70a 100644 --- a/units/CorBuildings/LandDefenceOffence/corhllt.lua +++ b/units/CorBuildings/LandDefenceOffence/corhllt.lua @@ -5,7 +5,6 @@ return { buildtime = 5440, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 6 0", collisionvolumescales = "32 90 32", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corhlt.lua b/units/CorBuildings/LandDefenceOffence/corhlt.lua index ef418178a7a..7f9000d531b 100644 --- a/units/CorBuildings/LandDefenceOffence/corhlt.lua +++ b/units/CorBuildings/LandDefenceOffence/corhlt.lua @@ -4,7 +4,6 @@ return { buildpic = "CORHLT.DDS", buildtime = 12650, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -8 0", collisionvolumescales = "38 90 38", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corint.lua b/units/CorBuildings/LandDefenceOffence/corint.lua index c3c2fc628aa..c6c83e88009 100644 --- a/units/CorBuildings/LandDefenceOffence/corint.lua +++ b/units/CorBuildings/LandDefenceOffence/corint.lua @@ -4,7 +4,6 @@ return { buildpic = "CORINT.DDS", buildtime = 93300, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -20", collisionvolumescales = "72 105 72", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corjuno.lua b/units/CorBuildings/LandDefenceOffence/corjuno.lua index d1446550b06..623e5544583 100644 --- a/units/CorBuildings/LandDefenceOffence/corjuno.lua +++ b/units/CorBuildings/LandDefenceOffence/corjuno.lua @@ -2,7 +2,6 @@ return { corjuno = { buildpic = "CORJUNO.DDS", buildtime = 27700, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "50 88 50", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corllt.lua b/units/CorBuildings/LandDefenceOffence/corllt.lua index abdc214989a..a6766bd3325 100644 --- a/units/CorBuildings/LandDefenceOffence/corllt.lua +++ b/units/CorBuildings/LandDefenceOffence/corllt.lua @@ -5,7 +5,6 @@ return { buildtime = 2720, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "32 72 32", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/cormadsam.lua b/units/CorBuildings/LandDefenceOffence/cormadsam.lua index 165dca2f242..d4ea8fce747 100644 --- a/units/CorBuildings/LandDefenceOffence/cormadsam.lua +++ b/units/CorBuildings/LandDefenceOffence/cormadsam.lua @@ -5,7 +5,6 @@ return { buildpic = "CORMADSAM.DDS", buildtime = 5240, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 5 -2", collisionvolumescales = "45 54 45", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/cormaw.lua b/units/CorBuildings/LandDefenceOffence/cormaw.lua index 275a253b489..130bc96ba46 100644 --- a/units/CorBuildings/LandDefenceOffence/cormaw.lua +++ b/units/CorBuildings/LandDefenceOffence/cormaw.lua @@ -4,7 +4,6 @@ return { buildpic = "CORMAW.DDS", buildtime = 4420, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.33, decoyfor = "cordrag", diff --git a/units/CorBuildings/LandDefenceOffence/cormexp.lua b/units/CorBuildings/LandDefenceOffence/cormexp.lua index fd89b7979bd..25c1e1da546 100644 --- a/units/CorBuildings/LandDefenceOffence/cormexp.lua +++ b/units/CorBuildings/LandDefenceOffence/cormexp.lua @@ -7,7 +7,6 @@ return { buildtime = 32500, canattack = true, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "75 44 75", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corpun.lua b/units/CorBuildings/LandDefenceOffence/corpun.lua index 5f0be567c17..61638234925 100644 --- a/units/CorBuildings/LandDefenceOffence/corpun.lua +++ b/units/CorBuildings/LandDefenceOffence/corpun.lua @@ -5,7 +5,6 @@ return { buildpic = "CORPUN.DDS", buildtime = 19300, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -13 0", collisionvolumescales = "52 60 52", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corrl.lua b/units/CorBuildings/LandDefenceOffence/corrl.lua index 4c09d474247..bac1d611184 100644 --- a/units/CorBuildings/LandDefenceOffence/corrl.lua +++ b/units/CorBuildings/LandDefenceOffence/corrl.lua @@ -5,7 +5,6 @@ return { buildtime = 1750, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 5 0", collisionvolumescales = "32 70 32", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corscreamer.lua b/units/CorBuildings/LandDefenceOffence/corscreamer.lua index d18d956118e..6c9b62c8b7a 100644 --- a/units/CorBuildings/LandDefenceOffence/corscreamer.lua +++ b/units/CorBuildings/LandDefenceOffence/corscreamer.lua @@ -5,7 +5,6 @@ return { buildpic = "CORSCREAMER.DDS", buildtime = 28000, canrepeat = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "63 57 63", collisionvolumetype = "CylY", @@ -149,7 +148,6 @@ return { weapontype = "MissileLauncher", weaponvelocity = 1850, damage = { - space = 750, vtol = 750, }, }, @@ -158,7 +156,7 @@ return { [1] = { badtargetcategory = "NOTAIR LIGHTAIRSCOUT", def = "COR_ADVSAM", - onlytargetcategory = "VTOL SPACE", + onlytargetcategory = "VTOL", }, }, }, diff --git a/units/CorBuildings/LandDefenceOffence/corsilo.lua b/units/CorBuildings/LandDefenceOffence/corsilo.lua index 5f87cf8896a..888d0d607e0 100644 --- a/units/CorBuildings/LandDefenceOffence/corsilo.lua +++ b/units/CorBuildings/LandDefenceOffence/corsilo.lua @@ -3,7 +3,6 @@ return { buildangle = 8192, buildpic = "CORSILO.DDS", buildtime = 181000, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 18 -2", collisionvolumescales = "90 38 84", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandDefenceOffence/cortoast.lua b/units/CorBuildings/LandDefenceOffence/cortoast.lua index 138ebbfc678..0fb28d7d38b 100644 --- a/units/CorBuildings/LandDefenceOffence/cortoast.lua +++ b/units/CorBuildings/LandDefenceOffence/cortoast.lua @@ -5,7 +5,6 @@ return { buildpic = "CORTOAST.DDS", buildtime = 25700, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "60 30 15", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/cortron.lua b/units/CorBuildings/LandDefenceOffence/cortron.lua index 79a97cc5f74..e756e9f46ad 100644 --- a/units/CorBuildings/LandDefenceOffence/cortron.lua +++ b/units/CorBuildings/LandDefenceOffence/cortron.lua @@ -3,7 +3,6 @@ return { buildangle = 8192, buildpic = "CORTRON.DDS", buildtime = 59000, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "59 47 59", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandDefenceOffence/corvipe.lua b/units/CorBuildings/LandDefenceOffence/corvipe.lua index d06bdff601c..cfcd3cb9e37 100644 --- a/units/CorBuildings/LandDefenceOffence/corvipe.lua +++ b/units/CorBuildings/LandDefenceOffence/corvipe.lua @@ -4,7 +4,6 @@ return { buildpic = "CORVIPE.DDS", buildtime = 15000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.5, energycost = 14000, diff --git a/units/CorBuildings/LandEconomy/coradvsol.lua b/units/CorBuildings/LandEconomy/coradvsol.lua index 79a92933723..7c87a752185 100644 --- a/units/CorBuildings/LandEconomy/coradvsol.lua +++ b/units/CorBuildings/LandEconomy/coradvsol.lua @@ -5,7 +5,6 @@ return { buildpic = "CORADVSOL.DDS", buildtime = 8150, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "57 35 57", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandEconomy/corafus.lua b/units/CorBuildings/LandEconomy/corafus.lua index e7a3aed9ece..15e36fc2913 100644 --- a/units/CorBuildings/LandEconomy/corafus.lua +++ b/units/CorBuildings/LandEconomy/corafus.lua @@ -4,7 +4,6 @@ return { buildpic = "CORAFUS.DDS", buildtime = 329200, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "84 95 84", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandEconomy/corageo.lua b/units/CorBuildings/LandEconomy/corageo.lua index 16892546f94..9810deee599 100644 --- a/units/CorBuildings/LandEconomy/corageo.lua +++ b/units/CorBuildings/LandEconomy/corageo.lua @@ -5,7 +5,6 @@ return { buildpic = "CORAGEO.DDS", buildtime = 32000, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "96 86 96", collisionvolumetype = "cylY", diff --git a/units/CorBuildings/LandEconomy/corestor.lua b/units/CorBuildings/LandEconomy/corestor.lua index c91a27cae5d..14907404d3a 100644 --- a/units/CorBuildings/LandEconomy/corestor.lua +++ b/units/CorBuildings/LandEconomy/corestor.lua @@ -5,7 +5,6 @@ return { buildpic = "CORESTOR.DDS", buildtime = 4260, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "60 35 60", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandEconomy/corfus.lua b/units/CorBuildings/LandEconomy/corfus.lua index 3f95c2a2301..734e18b5622 100644 --- a/units/CorBuildings/LandEconomy/corfus.lua +++ b/units/CorBuildings/LandEconomy/corfus.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFUS.DDS", buildtime = 75400, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 26000, energymake = 1100, diff --git a/units/CorBuildings/LandEconomy/corgeo.lua b/units/CorBuildings/LandEconomy/corgeo.lua index 80b0e8b8870..92f38a6b8ea 100644 --- a/units/CorBuildings/LandEconomy/corgeo.lua +++ b/units/CorBuildings/LandEconomy/corgeo.lua @@ -5,7 +5,6 @@ return { buildpic = "CORGEO.DDS", buildtime = 12900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "63 45 63", collisionvolumetype = "cylY", diff --git a/units/CorBuildings/LandEconomy/cormakr.lua b/units/CorBuildings/LandEconomy/cormakr.lua index 150da22127b..f7f591f870a 100644 --- a/units/CorBuildings/LandEconomy/cormakr.lua +++ b/units/CorBuildings/LandEconomy/cormakr.lua @@ -5,7 +5,6 @@ return { buildpic = "CORMAKR.DDS", buildtime = 2680, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "32 25 32", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandEconomy/cormex.lua b/units/CorBuildings/LandEconomy/cormex.lua index f12306e8baa..d23d196d289 100644 --- a/units/CorBuildings/LandEconomy/cormex.lua +++ b/units/CorBuildings/LandEconomy/cormex.lua @@ -6,7 +6,7 @@ return { buildpic = "CORMEX.DDS", buildtime = 1870, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE CANBEUW UNDERWATER", + category = "CANBEUW", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "48 30 48", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandEconomy/cormmkr.lua b/units/CorBuildings/LandEconomy/cormmkr.lua index e7070468713..f0ce0312daf 100644 --- a/units/CorBuildings/LandEconomy/cormmkr.lua +++ b/units/CorBuildings/LandEconomy/cormmkr.lua @@ -5,7 +5,6 @@ return { buildpic = "CORMMKR.DDS", buildtime = 31300, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 21000, explodeas = "advmetalmaker", diff --git a/units/CorBuildings/LandEconomy/cormoho.lua b/units/CorBuildings/LandEconomy/cormoho.lua index bbd76b24a10..9f7724f973e 100644 --- a/units/CorBuildings/LandEconomy/cormoho.lua +++ b/units/CorBuildings/LandEconomy/cormoho.lua @@ -6,7 +6,6 @@ return { buildpic = "CORMOHO.DDS", buildtime = 14100, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "79 37 79", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandEconomy/cormstor.lua b/units/CorBuildings/LandEconomy/cormstor.lua index d6eea27357d..68c14c3776b 100644 --- a/units/CorBuildings/LandEconomy/cormstor.lua +++ b/units/CorBuildings/LandEconomy/cormstor.lua @@ -4,7 +4,6 @@ return { buildpic = "CORMSTOR.DDS", buildtime = 2920, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "64 60 64", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandEconomy/corsolar.lua b/units/CorBuildings/LandEconomy/corsolar.lua index 690a92336ec..74216f436ad 100644 --- a/units/CorBuildings/LandEconomy/corsolar.lua +++ b/units/CorBuildings/LandEconomy/corsolar.lua @@ -5,7 +5,6 @@ return { buildpic = "CORSOLAR.DDS", buildtime = 2800, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "77 78 77", collisionvolumetype = "Ell", diff --git a/units/CorBuildings/LandEconomy/corwin.lua b/units/CorBuildings/LandEconomy/corwin.lua index 895f9622883..cd92271975a 100644 --- a/units/CorBuildings/LandEconomy/corwin.lua +++ b/units/CorBuildings/LandEconomy/corwin.lua @@ -4,7 +4,6 @@ return { buildpic = "CORWIN.DDS", buildtime = 1680, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "34 89 34", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandFactories/coraap.lua b/units/CorBuildings/LandFactories/coraap.lua index 7260a639d51..eccfb81a697 100644 --- a/units/CorBuildings/LandFactories/coraap.lua +++ b/units/CorBuildings/LandFactories/coraap.lua @@ -5,7 +5,6 @@ return { buildpic = "CORAAP.DDS", buildtime = 20700, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 10 -2", collisionvolumescales = "113 43 89", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandFactories/coralab.lua b/units/CorBuildings/LandFactories/coralab.lua index 14f62c7011a..c41cfeb37b7 100644 --- a/units/CorBuildings/LandFactories/coralab.lua +++ b/units/CorBuildings/LandFactories/coralab.lua @@ -5,7 +5,6 @@ return { buildpic = "CORALAB.DDS", buildtime = 16800, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 13 8", collisionvolumescales = "101 51 90", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandFactories/corap.lua b/units/CorBuildings/LandFactories/corap.lua index a3ace3c8f8a..6dbc5a7634f 100644 --- a/units/CorBuildings/LandFactories/corap.lua +++ b/units/CorBuildings/LandFactories/corap.lua @@ -5,7 +5,6 @@ return { buildpic = "CORAP.DDS", buildtime = 7180, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "110 33 90", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandFactories/coravp.lua b/units/CorBuildings/LandFactories/coravp.lua index 2ba042c2542..4f108b1059d 100644 --- a/units/CorBuildings/LandFactories/coravp.lua +++ b/units/CorBuildings/LandFactories/coravp.lua @@ -5,7 +5,6 @@ return { buildpic = "CORAVP.DDS", buildtime = 18500, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "1 0 0", collisionvolumescales = "124 70 109", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandFactories/corgant.lua b/units/CorBuildings/LandFactories/corgant.lua index de7656c65d5..6f9531cf484 100644 --- a/units/CorBuildings/LandFactories/corgant.lua +++ b/units/CorBuildings/LandFactories/corgant.lua @@ -4,7 +4,6 @@ return { buildpic = "CORGANT.DDS", buildtime = 67300, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 8", collisionvolumescales = "150 43 150", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandFactories/corhp.lua b/units/CorBuildings/LandFactories/corhp.lua index 5e299ae2b52..1e3894869b4 100644 --- a/units/CorBuildings/LandFactories/corhp.lua +++ b/units/CorBuildings/LandFactories/corhp.lua @@ -4,7 +4,6 @@ return { buildpic = "CORHP.DDS", buildtime = 11000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "120 32 108", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/CorBuildings/LandFactories/corlab.lua b/units/CorBuildings/LandFactories/corlab.lua index 01ebdc31218..dec81e81d27 100644 --- a/units/CorBuildings/LandFactories/corlab.lua +++ b/units/CorBuildings/LandFactories/corlab.lua @@ -5,7 +5,6 @@ return { buildpic = "CORLAB.DDS", buildtime = 6500, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "93 92 87", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandFactories/corvp.lua b/units/CorBuildings/LandFactories/corvp.lua index db8529fe58a..03560492f86 100644 --- a/units/CorBuildings/LandFactories/corvp.lua +++ b/units/CorBuildings/LandFactories/corvp.lua @@ -5,7 +5,6 @@ return { buildpic = "CORVP.DDS", buildtime = 7150, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "3 15 2", collisionvolumescales = "101 40 106", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandUtil/corarad.lua b/units/CorBuildings/LandUtil/corarad.lua index 2bb7b058735..8d4d4e6fabb 100644 --- a/units/CorBuildings/LandUtil/corarad.lua +++ b/units/CorBuildings/LandUtil/corarad.lua @@ -6,7 +6,6 @@ return { buildtime = 12000, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "35 98 35", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/corasp.lua b/units/CorBuildings/LandUtil/corasp.lua index 4a7052a2458..b10c3c6da59 100644 --- a/units/CorBuildings/LandUtil/corasp.lua +++ b/units/CorBuildings/LandUtil/corasp.lua @@ -7,7 +7,6 @@ return { buildtime = 9300, canrepeat = false, cantbetransported = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -9 0", collisionvolumescales = "135 27 135", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandUtil/cordrag.lua b/units/CorBuildings/LandUtil/cordrag.lua index dfd7b0957cc..90593925079 100644 --- a/units/CorBuildings/LandUtil/cordrag.lua +++ b/units/CorBuildings/LandUtil/cordrag.lua @@ -6,7 +6,6 @@ return { buildtime = 255, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 22 32", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/coreyes.lua b/units/CorBuildings/LandUtil/coreyes.lua index 1ea9b9601cc..e1939044c47 100644 --- a/units/CorBuildings/LandUtil/coreyes.lua +++ b/units/CorBuildings/LandUtil/coreyes.lua @@ -5,7 +5,6 @@ return { buildpic = "COREYES.DDS", buildtime = 750, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 10, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "20 24 20", diff --git a/units/CorBuildings/LandUtil/corfort.lua b/units/CorBuildings/LandUtil/corfort.lua index 147f3e1c53e..535a8de4a4f 100644 --- a/units/CorBuildings/LandUtil/corfort.lua +++ b/units/CorBuildings/LandUtil/corfort.lua @@ -7,7 +7,6 @@ return { buildtime = 900, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "32 52 32", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/corgate.lua b/units/CorBuildings/LandUtil/corgate.lua index d1b54e133fc..e24aa828a5b 100644 --- a/units/CorBuildings/LandUtil/corgate.lua +++ b/units/CorBuildings/LandUtil/corgate.lua @@ -6,7 +6,8 @@ return { buildtime = 55000, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", + category = "NOWEAPON", + exemptcategory = "WEAPON", collisionvolumeoffsets = "0 -4 1", collisionvolumescales = "57 38 57", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/corjamt.lua b/units/CorBuildings/LandUtil/corjamt.lua index 86bba40f00c..4376b89b5f3 100644 --- a/units/CorBuildings/LandUtil/corjamt.lua +++ b/units/CorBuildings/LandUtil/corjamt.lua @@ -6,7 +6,6 @@ return { buildtime = 4570, canattack = false, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "30 37 30", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/cormine1.lua b/units/CorBuildings/LandUtil/cormine1.lua index b431fb3fa85..0fae01bddc3 100644 --- a/units/CorBuildings/LandUtil/cormine1.lua +++ b/units/CorBuildings/LandUtil/cormine1.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL NOTLAND WEAPON MINE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 0.5, collide = false, collisionvolumeoffsets = "0 0 0", diff --git a/units/CorBuildings/LandUtil/cormine2.lua b/units/CorBuildings/LandUtil/cormine2.lua index 6239b022c7a..221f668f8da 100644 --- a/units/CorBuildings/LandUtil/cormine2.lua +++ b/units/CorBuildings/LandUtil/cormine2.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL NOTLAND WEAPON MINE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 1, collide = false, collisionvolumeoffsets = "0 0 0", diff --git a/units/CorBuildings/LandUtil/cormine3.lua b/units/CorBuildings/LandUtil/cormine3.lua index c5c47d94dc7..98eb9a4e61b 100644 --- a/units/CorBuildings/LandUtil/cormine3.lua +++ b/units/CorBuildings/LandUtil/cormine3.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL NOTLAND WEAPON MINE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 1.5, collide = false, collisionvolumeoffsets = "0 0 0", diff --git a/units/CorBuildings/LandUtil/cornanotc.lua b/units/CorBuildings/LandUtil/cornanotc.lua index 4350a8521f4..9b5f7c6d751 100644 --- a/units/CorBuildings/LandUtil/cornanotc.lua +++ b/units/CorBuildings/LandUtil/cornanotc.lua @@ -12,7 +12,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 32 31", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/cornanotct2.lua b/units/CorBuildings/LandUtil/cornanotct2.lua index 8453d113547..0ddaedd019b 100644 --- a/units/CorBuildings/LandUtil/cornanotct2.lua +++ b/units/CorBuildings/LandUtil/cornanotct2.lua @@ -12,7 +12,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 80 46", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/corrad.lua b/units/CorBuildings/LandUtil/corrad.lua index 8a9b89000ea..0512e191453 100644 --- a/units/CorBuildings/LandUtil/corrad.lua +++ b/units/CorBuildings/LandUtil/corrad.lua @@ -7,7 +7,6 @@ return { canattack = false, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -12 0", collisionvolumescales = "32 99 32", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/corsd.lua b/units/CorBuildings/LandUtil/corsd.lua index 389f233b054..af8551318b3 100644 --- a/units/CorBuildings/LandUtil/corsd.lua +++ b/units/CorBuildings/LandUtil/corsd.lua @@ -5,7 +5,6 @@ return { buildpic = "CORSD.DDS", buildtime = 12000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "65 10 60", collisionvolumetype = "Box", diff --git a/units/CorBuildings/LandUtil/corshroud.lua b/units/CorBuildings/LandUtil/corshroud.lua index 0eea00f3f32..cf463f9fbc7 100644 --- a/units/CorBuildings/LandUtil/corshroud.lua +++ b/units/CorBuildings/LandUtil/corshroud.lua @@ -6,7 +6,6 @@ return { buildtime = 9400, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 16 -2", collisionvolumescales = "34 93 34", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/LandUtil/cortarg.lua b/units/CorBuildings/LandUtil/cortarg.lua index 3ed3384619b..e0241e07adf 100644 --- a/units/CorBuildings/LandUtil/cortarg.lua +++ b/units/CorBuildings/LandUtil/cortarg.lua @@ -5,7 +5,6 @@ return { buildpic = "CORTARG.DDS", buildtime = 10900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 7500, energyupkeep = 100, diff --git a/units/CorBuildings/SeaDefence/coratl.lua b/units/CorBuildings/SeaDefence/coratl.lua index 5b6d45f06b8..055c8b5077d 100644 --- a/units/CorBuildings/SeaDefence/coratl.lua +++ b/units/CorBuildings/SeaDefence/coratl.lua @@ -5,7 +5,6 @@ return { buildpic = "CORATL.DDS", buildtime = 10900, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSHIP NOTAIR NOTHOVER NOTSUB SURFACE EMPABLE", corpse = "DEAD", energycost = 8500, explodeas = "smallBuildingExplosionGeneric", diff --git a/units/CorBuildings/SeaDefence/cordl.lua b/units/CorBuildings/SeaDefence/cordl.lua index 190f6a6637f..44d814524d2 100644 --- a/units/CorBuildings/SeaDefence/cordl.lua +++ b/units/CorBuildings/SeaDefence/cordl.lua @@ -5,7 +5,6 @@ return { buildpic = "CORDL.DDS", buildtime = 6800, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "38 52 38", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaDefence/corenaa.lua b/units/CorBuildings/SeaDefence/corenaa.lua index dd8988cffef..451fbad232d 100644 --- a/units/CorBuildings/SeaDefence/corenaa.lua +++ b/units/CorBuildings/SeaDefence/corenaa.lua @@ -6,7 +6,6 @@ return { buildpic = "CORENAA.DDS", buildtime = 23100, canrepeat = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "42 44 42", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaDefence/corfdoom.lua b/units/CorBuildings/SeaDefence/corfdoom.lua index 42b6d61c830..e83218e2f50 100644 --- a/units/CorBuildings/SeaDefence/corfdoom.lua +++ b/units/CorBuildings/SeaDefence/corfdoom.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFDOOM.DDS", buildtime = 24000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 15 0.0", collisionvolumescales = "55.0 90 55.0", collisionvolumetype = "box", diff --git a/units/CorBuildings/SeaDefence/corfhlt.lua b/units/CorBuildings/SeaDefence/corfhlt.lua index 5e1d2c6fbb9..855ead05675 100644 --- a/units/CorBuildings/SeaDefence/corfhlt.lua +++ b/units/CorBuildings/SeaDefence/corfhlt.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFHLT.DDS", buildtime = 11400, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "73 67 73", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaDefence/corfrock.lua b/units/CorBuildings/SeaDefence/corfrock.lua index 17eb72f2d18..8ba46bb478c 100644 --- a/units/CorBuildings/SeaDefence/corfrock.lua +++ b/units/CorBuildings/SeaDefence/corfrock.lua @@ -6,7 +6,6 @@ return { buildpic = "CORFROCK.DDS", buildtime = 5240, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 15 0", collisionvolumescales = "36 59 36", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaDefence/corfrt.lua b/units/CorBuildings/SeaDefence/corfrt.lua index d496ffc4e00..75ceb38e4d0 100644 --- a/units/CorBuildings/SeaDefence/corfrt.lua +++ b/units/CorBuildings/SeaDefence/corfrt.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFRT.DDS", buildtime = 2200, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "40 64 40", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaDefence/corgplat.lua b/units/CorBuildings/SeaDefence/corgplat.lua index ea41ff83051..192d2df1407 100644 --- a/units/CorBuildings/SeaDefence/corgplat.lua +++ b/units/CorBuildings/SeaDefence/corgplat.lua @@ -5,7 +5,6 @@ return { buildpic = "CORGPLAT.DDS", buildtime = 3000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "45 36 45", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaDefence/corptl.lua b/units/CorBuildings/SeaDefence/corptl.lua index bafa3be880d..5ab0e000135 100644 --- a/units/CorBuildings/SeaDefence/corptl.lua +++ b/units/CorBuildings/SeaDefence/corptl.lua @@ -5,7 +5,6 @@ return { buildpic = "CORTL.DDS", buildtime = 3750, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 1800, explodeas = "mediumBuildingExplosionGeneric", diff --git a/units/CorBuildings/SeaDefence/cortl.lua b/units/CorBuildings/SeaDefence/cortl.lua index 7ad3ce2b4d2..2a4292546af 100644 --- a/units/CorBuildings/SeaDefence/cortl.lua +++ b/units/CorBuildings/SeaDefence/cortl.lua @@ -5,7 +5,6 @@ return { buildpic = "CORTL.DDS", buildtime = 3750, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", energycost = 1800, explodeas = "mediumBuildingexplosiongeneric", diff --git a/units/CorBuildings/SeaEconomy/corfmkr.lua b/units/CorBuildings/SeaEconomy/corfmkr.lua index 68909f61636..a885149e8b6 100644 --- a/units/CorBuildings/SeaEconomy/corfmkr.lua +++ b/units/CorBuildings/SeaEconomy/corfmkr.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFMKR.DDS", buildtime = 2680, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", energycost = 1250, explodeas = "largeBuildingExplosionGeneric", footprintx = 3, diff --git a/units/CorBuildings/SeaEconomy/cortide.lua b/units/CorBuildings/SeaEconomy/cortide.lua index acac1b80910..8f3f5878fd5 100644 --- a/units/CorBuildings/SeaEconomy/cortide.lua +++ b/units/CorBuildings/SeaEconomy/cortide.lua @@ -5,7 +5,6 @@ return { buildpic = "CORTIDE.DDS", buildtime = 2100, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-3 2 -1", collisionvolumescales = "28 30 33", collisionvolumetype = "Box", diff --git a/units/CorBuildings/SeaEconomy/coruwadves.lua b/units/CorBuildings/SeaEconomy/coruwadves.lua index ae9841db7cb..2cc744a7142 100644 --- a/units/CorBuildings/SeaEconomy/coruwadves.lua +++ b/units/CorBuildings/SeaEconomy/coruwadves.lua @@ -4,7 +4,7 @@ return { buildpic = "CORUWADVES.DDS", buildtime = 20400, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", + category = "CANBEUW", collisionvolumeoffsets = "0 -16 0", collisionvolumescales = "90 65 90", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaEconomy/coruwadvms.lua b/units/CorBuildings/SeaEconomy/coruwadvms.lua index 3e1a1c4b30e..2d9665bcd46 100644 --- a/units/CorBuildings/SeaEconomy/coruwadvms.lua +++ b/units/CorBuildings/SeaEconomy/coruwadvms.lua @@ -4,7 +4,7 @@ return { buildpic = "CORUWADVMS.DDS", buildtime = 20500, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", + category = "CANBEUW", collisionvolumeoffsets = "-6 0 0", collisionvolumescales = "46 40 58", collisionvolumetype = "Box", diff --git a/units/CorBuildings/SeaEconomy/coruwageo.lua b/units/CorBuildings/SeaEconomy/coruwageo.lua index f2a7954816d..dace6d68e86 100644 --- a/units/CorBuildings/SeaEconomy/coruwageo.lua +++ b/units/CorBuildings/SeaEconomy/coruwageo.lua @@ -9,7 +9,6 @@ return { buildpic = "CORUWAGEO.DDS", buildtime = 32000, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 5 0", collisionvolumescales = "96 86 96", collisionvolumetype = "cylY", diff --git a/units/CorBuildings/SeaEconomy/coruwes.lua b/units/CorBuildings/SeaEconomy/coruwes.lua index 76de5776816..f107dd15482 100644 --- a/units/CorBuildings/SeaEconomy/coruwes.lua +++ b/units/CorBuildings/SeaEconomy/coruwes.lua @@ -4,7 +4,6 @@ return { buildpic = "CORUWES.DDS", buildtime = 4260, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", energycost = 1800, energystorage = 6000, diff --git a/units/CorBuildings/SeaEconomy/coruwfus.lua b/units/CorBuildings/SeaEconomy/coruwfus.lua index cf563d51c10..1bfc1f8f71b 100644 --- a/units/CorBuildings/SeaEconomy/coruwfus.lua +++ b/units/CorBuildings/SeaEconomy/coruwfus.lua @@ -5,7 +5,6 @@ return { buildpic = "CORUWFUS.DDS", buildtime = 105000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", energycost = 34000, energymake = 1220, diff --git a/units/CorBuildings/SeaEconomy/coruwgeo.lua b/units/CorBuildings/SeaEconomy/coruwgeo.lua index 086a2d56bc8..ee391128e62 100644 --- a/units/CorBuildings/SeaEconomy/coruwgeo.lua +++ b/units/CorBuildings/SeaEconomy/coruwgeo.lua @@ -9,7 +9,6 @@ return { buildpic = "CORUWGEO.DDS", buildtime = 12900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "63 45 63", collisionvolumetype = "cylY", diff --git a/units/CorBuildings/SeaEconomy/coruwmex.lua b/units/CorBuildings/SeaEconomy/coruwmex.lua index 1e207e0ef90..e52cc75a080 100644 --- a/units/CorBuildings/SeaEconomy/coruwmex.lua +++ b/units/CorBuildings/SeaEconomy/coruwmex.lua @@ -6,7 +6,7 @@ return { buildpic = "CORUWMEX.DDS", buildtime = 1880, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", + category = "CANBEUW", collisionvolumeoffsets = "0 -55 0", collisionvolumescales = "31 128 31", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaEconomy/coruwmme.lua b/units/CorBuildings/SeaEconomy/coruwmme.lua index 6f9eeec8d49..d26d14ec7fe 100644 --- a/units/CorBuildings/SeaEconomy/coruwmme.lua +++ b/units/CorBuildings/SeaEconomy/coruwmme.lua @@ -6,7 +6,6 @@ return { buildpic = "CORUWMME.DDS", buildtime = 14100, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", damagemodifier = 0.5, energycost = 8100, diff --git a/units/CorBuildings/SeaEconomy/coruwmmm.lua b/units/CorBuildings/SeaEconomy/coruwmmm.lua index 68d5f40ec85..be0efc3de3f 100644 --- a/units/CorBuildings/SeaEconomy/coruwmmm.lua +++ b/units/CorBuildings/SeaEconomy/coruwmmm.lua @@ -5,7 +5,6 @@ return { buildpic = "CORUWMMM.DDS", buildtime = 31300, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "120 120 120", collisionvolumetype = "Ell", diff --git a/units/CorBuildings/SeaEconomy/coruwms.lua b/units/CorBuildings/SeaEconomy/coruwms.lua index 069ae83e440..d988d73b1a8 100644 --- a/units/CorBuildings/SeaEconomy/coruwms.lua +++ b/units/CorBuildings/SeaEconomy/coruwms.lua @@ -4,7 +4,6 @@ return { buildpic = "CORUWMS.DDS", buildtime = 2920, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", corpse = "DEAD", energycost = 590, explodeas = "largeBuildingexplosiongeneric-uw", diff --git a/units/CorBuildings/SeaFactories/coramsub.lua b/units/CorBuildings/SeaFactories/coramsub.lua index 34e5a8f545d..1b7e2d73146 100644 --- a/units/CorBuildings/SeaFactories/coramsub.lua +++ b/units/CorBuildings/SeaFactories/coramsub.lua @@ -4,7 +4,6 @@ return { buildpic = "CORAMSUB.DDS", buildtime = 11400, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 85 -2", collisionvolumescales = "115 55 112", collisionvolumetype = "Box", diff --git a/units/CorBuildings/SeaFactories/corasy.lua b/units/CorBuildings/SeaFactories/corasy.lua index 09acc854317..f571cb874a8 100644 --- a/units/CorBuildings/SeaFactories/corasy.lua +++ b/units/CorBuildings/SeaFactories/corasy.lua @@ -4,7 +4,6 @@ return { buildpic = "CORASY.DDS", buildtime = 15700, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 10 -2", collisionvolumescales = "186 78 183", collisionvolumetype = "Box", diff --git a/units/CorBuildings/SeaFactories/corfhp.lua b/units/CorBuildings/SeaFactories/corfhp.lua index 736e4676096..b4e73f14abb 100644 --- a/units/CorBuildings/SeaFactories/corfhp.lua +++ b/units/CorBuildings/SeaFactories/corfhp.lua @@ -4,7 +4,6 @@ return { buildpic = "CORFHP.DDS", buildtime = 11000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "120 32 106", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/CorBuildings/SeaFactories/corgantuw.lua b/units/CorBuildings/SeaFactories/corgantuw.lua index 838a101a971..8f7011caf23 100644 --- a/units/CorBuildings/SeaFactories/corgantuw.lua +++ b/units/CorBuildings/SeaFactories/corgantuw.lua @@ -4,7 +4,6 @@ return { buildpic = "CORGANTUW.DDS", buildtime = 67300, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 -5 8", collisionvolumescales = "150 43 150", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaFactories/corplat.lua b/units/CorBuildings/SeaFactories/corplat.lua index c9494324b63..537c128fe3f 100644 --- a/units/CorBuildings/SeaFactories/corplat.lua +++ b/units/CorBuildings/SeaFactories/corplat.lua @@ -5,7 +5,7 @@ return { buildpic = "CORPLAT.DDS", buildtime = 11800, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE UNDERWATER", + category = "SURFACE UNDERWATER", corpse = "DEAD", energycost = 5500, energystorage = 200, diff --git a/units/CorBuildings/SeaFactories/corsy.lua b/units/CorBuildings/SeaFactories/corsy.lua index 746be5562ef..46afcc0ca5f 100644 --- a/units/CorBuildings/SeaFactories/corsy.lua +++ b/units/CorBuildings/SeaFactories/corsy.lua @@ -4,7 +4,6 @@ return { buildpic = "CORSY.DDS", buildtime = 6600, canmove = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "124 59 122", collisionvolumetype = "Box", diff --git a/units/CorBuildings/SeaUtil/corason.lua b/units/CorBuildings/SeaUtil/corason.lua index cf2e486e6c3..95af037be65 100644 --- a/units/CorBuildings/SeaUtil/corason.lua +++ b/units/CorBuildings/SeaUtil/corason.lua @@ -6,7 +6,6 @@ return { buildtime = 6100, canattack = false, canrepeat = false, - category = "ALL UNDERWATER NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "45 28 45", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaUtil/corfasp.lua b/units/CorBuildings/SeaUtil/corfasp.lua index ea37bf9de32..5ae8bf8d1b8 100644 --- a/units/CorBuildings/SeaUtil/corfasp.lua +++ b/units/CorBuildings/SeaUtil/corfasp.lua @@ -11,7 +11,6 @@ return { buildtime = 9300, canrepeat = false, cantbetransported = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -9 0", collisionvolumescales = "155 55 155", collisionvolumetype = "Box", diff --git a/units/CorBuildings/SeaUtil/corfatf.lua b/units/CorBuildings/SeaUtil/corfatf.lua index bea36662a84..d3b96ff0ec3 100644 --- a/units/CorBuildings/SeaUtil/corfatf.lua +++ b/units/CorBuildings/SeaUtil/corfatf.lua @@ -5,7 +5,6 @@ return { buildpic = "CORFATF.DDS", buildtime = 10300, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 -3.5", collisionvolumescales = "60 30 60", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaUtil/corfdrag.lua b/units/CorBuildings/SeaUtil/corfdrag.lua index dc6cf6cb484..2d94d3dfaea 100644 --- a/units/CorBuildings/SeaUtil/corfdrag.lua +++ b/units/CorBuildings/SeaUtil/corfdrag.lua @@ -7,7 +7,6 @@ return { buildtime = 400, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "36 14 36", collisionvolumetype = "box", diff --git a/units/CorBuildings/SeaUtil/corfgate.lua b/units/CorBuildings/SeaUtil/corfgate.lua index 0683bcc6d03..5d49f87584a 100644 --- a/units/CorBuildings/SeaUtil/corfgate.lua +++ b/units/CorBuildings/SeaUtil/corfgate.lua @@ -7,7 +7,8 @@ return { buildtime = 59000, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR", + category = "NOWEAPON", + exemptcategory = "WEAPON", collisionvolumeoffsets = "0 -25 0", collisionvolumescales = "60 70 60", collisionvolumetype = "cyly", diff --git a/units/CorBuildings/SeaUtil/corfmine3.lua b/units/CorBuildings/SeaUtil/corfmine3.lua index 8429b66ae8d..9762d6f72ef 100644 --- a/units/CorBuildings/SeaUtil/corfmine3.lua +++ b/units/CorBuildings/SeaUtil/corfmine3.lua @@ -7,7 +7,6 @@ return { canguard = false, canpatrol = false, canrepeat = false, - category = "ALL WEAPON MINE NOTSUB NOTAIR HOVER SURFACE EMPABLE", cloakcost = 2, collide = false, collisionvolumeoffsets = "0 -0.5 0", diff --git a/units/CorBuildings/SeaUtil/corfrad.lua b/units/CorBuildings/SeaUtil/corfrad.lua index 93898558b3e..4611d13f9af 100644 --- a/units/CorBuildings/SeaUtil/corfrad.lua +++ b/units/CorBuildings/SeaUtil/corfrad.lua @@ -6,7 +6,6 @@ return { buildtime = 1800, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "32 95 32", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaUtil/cornanotc2plat.lua b/units/CorBuildings/SeaUtil/cornanotc2plat.lua index 39195d472df..9bb816d6470 100644 --- a/units/CorBuildings/SeaUtil/cornanotc2plat.lua +++ b/units/CorBuildings/SeaUtil/cornanotc2plat.lua @@ -12,7 +12,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 80 46", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaUtil/cornanotcplat.lua b/units/CorBuildings/SeaUtil/cornanotcplat.lua index cff3c0cdd98..73687a86ade 100644 --- a/units/CorBuildings/SeaUtil/cornanotcplat.lua +++ b/units/CorBuildings/SeaUtil/cornanotcplat.lua @@ -11,8 +11,7 @@ return { canreclaim = true, canrepeat = false, canstop = true, - cantbetransported = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", + cantbetransported = true, -- transports cannot drop them back into water, reenable once that works collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 50 31", collisionvolumetype = "CylY", diff --git a/units/CorBuildings/SeaUtil/corsonar.lua b/units/CorBuildings/SeaUtil/corsonar.lua index e58582fd8f2..15ba639bf27 100644 --- a/units/CorBuildings/SeaUtil/corsonar.lua +++ b/units/CorBuildings/SeaUtil/corsonar.lua @@ -6,7 +6,6 @@ return { buildtime = 900, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "30 33 30", collisionvolumetype = "CylY", diff --git a/units/CorGantry/corcat.lua b/units/CorGantry/corcat.lua index 27eadf96589..ef791b2715f 100644 --- a/units/CorGantry/corcat.lua +++ b/units/CorGantry/corcat.lua @@ -4,7 +4,6 @@ return { buildtime = 127000, canmove = true, cantbetransported = true, - category = "WEAPON NOTSUB NOTAIR NOTHOVER SURFACE BOT EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "60 53 48", collisionvolumetype = "CylY", diff --git a/units/CorGantry/cordemon.lua b/units/CorGantry/cordemon.lua index 84b8bf61650..5be304cc664 100644 --- a/units/CorGantry/cordemon.lua +++ b/units/CorGantry/cordemon.lua @@ -4,7 +4,6 @@ return { buildtime = 120000, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "60 88 60", collisionvolumetype = "CylY", diff --git a/units/CorGantry/corjugg.lua b/units/CorGantry/corjugg.lua index 2f21c3aa2f1..6361771c47e 100644 --- a/units/CorGantry/corjugg.lua +++ b/units/CorGantry/corjugg.lua @@ -4,7 +4,6 @@ return { buildtime = 630000, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "90 80 90", collisionvolumetype = "CylY", diff --git a/units/CorGantry/corkarg.lua b/units/CorGantry/corkarg.lua index 7052f547b74..e8733ca22f0 100644 --- a/units/CorGantry/corkarg.lua +++ b/units/CorGantry/corkarg.lua @@ -4,7 +4,6 @@ return { buildtime = 76000, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 -2.0 1", collisionvolumescales = "59.0 63.0 42.0", collisionvolumetype = "box", diff --git a/units/CorGantry/corkorg.lua b/units/CorGantry/corkorg.lua index 9a49ce79471..70ca90a9f68 100644 --- a/units/CorGantry/corkorg.lua +++ b/units/CorGantry/corkorg.lua @@ -4,7 +4,6 @@ return { buildtime = 555000, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW", collisionvolumeoffsets = "0 -6 -5", collisionvolumescales = "97 160 85", collisionvolumetype = "CylY", diff --git a/units/CorGantry/corshiva.lua b/units/CorGantry/corshiva.lua index 908728151d1..eb4bf5cc751 100644 --- a/units/CorGantry/corshiva.lua +++ b/units/CorGantry/corshiva.lua @@ -4,7 +4,6 @@ return { buildtime = 30600, canmove = true, cantbetransported = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "61 60 61", collisionvolumetype = "cylY", diff --git a/units/CorGantry/corsok.lua b/units/CorGantry/corsok.lua index e8d245c1663..5995b4a2bbd 100644 --- a/units/CorGantry/corsok.lua +++ b/units/CorGantry/corsok.lua @@ -10,7 +10,6 @@ return { canpatrol = true, canstop = 1, cantbetransported = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "52 40 58", collisionvolumetype = "CylY", diff --git a/units/CorHovercraft/corah.lua b/units/CorHovercraft/corah.lua index 23e31d64a72..809236746df 100644 --- a/units/CorHovercraft/corah.lua +++ b/units/CorHovercraft/corah.lua @@ -5,7 +5,6 @@ return { buildpic = "CORAH.DDS", buildtime = 3650, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "28 16 35", collisionvolumetype = "Box", diff --git a/units/CorHovercraft/corch.lua b/units/CorHovercraft/corch.lua index 7b9b39fb8ad..84353f2145c 100644 --- a/units/CorHovercraft/corch.lua +++ b/units/CorHovercraft/corch.lua @@ -5,7 +5,6 @@ return { buildpic = "CORCH.DDS", buildtime = 4580, canmove = true, - category = "ALL HOVER MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "27 26 40", collisionvolumetype = "Box", diff --git a/units/CorHovercraft/corhal.lua b/units/CorHovercraft/corhal.lua index 8d4ecc1dd04..75ca496d6a8 100644 --- a/units/CorHovercraft/corhal.lua +++ b/units/CorHovercraft/corhal.lua @@ -3,7 +3,6 @@ return { buildpic = "CORHAL.DDS", buildtime = 12900, canmove = true, - category = "ALL HOVER WEAPON NOTSUB NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "42 12 42", collisionvolumetype = "Box", diff --git a/units/CorHovercraft/cormh.lua b/units/CorHovercraft/cormh.lua index 93f6ed59553..a6151ede229 100644 --- a/units/CorHovercraft/cormh.lua +++ b/units/CorHovercraft/cormh.lua @@ -3,7 +3,6 @@ return { buildpic = "CORMH.DDS", buildtime = 3500, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "38 20 38", collisionvolumetype = "CylY", diff --git a/units/CorHovercraft/corsh.lua b/units/CorHovercraft/corsh.lua index 1b086d623a3..bd6eeb4547c 100644 --- a/units/CorHovercraft/corsh.lua +++ b/units/CorHovercraft/corsh.lua @@ -3,7 +3,6 @@ return { buildpic = "CORSH.DDS", buildtime = 1500, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "18 15 30", collisionvolumetype = "Box", diff --git a/units/CorHovercraft/corsnap.lua b/units/CorHovercraft/corsnap.lua index 96233e41ffa..eb0a1bdb2be 100644 --- a/units/CorHovercraft/corsnap.lua +++ b/units/CorHovercraft/corsnap.lua @@ -3,7 +3,6 @@ return { buildpic = "CORSNAP.DDS", buildtime = 3500, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "32 16 38", collisionvolumetype = "Box", diff --git a/units/CorHovercraft/corthovr.lua b/units/CorHovercraft/corthovr.lua index 2490d680f30..be0190967c3 100644 --- a/units/CorHovercraft/corthovr.lua +++ b/units/CorHovercraft/corthovr.lua @@ -5,7 +5,6 @@ return { buildtime = 19600, canmove = true, cantbetransported = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -17 -2", collisionvolumescales = "60 60 80", collisionvolumetype = "CylZ", diff --git a/units/CorSeaplanes/corcsa.lua b/units/CorSeaplanes/corcsa.lua index a9d99668bb8..734af2d18da 100644 --- a/units/CorSeaplanes/corcsa.lua +++ b/units/CorSeaplanes/corcsa.lua @@ -8,7 +8,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER CANBEUW", collide = true, cruisealtitude = 55, energycost = 8200, diff --git a/units/CorSeaplanes/corcut.lua b/units/CorSeaplanes/corcut.lua index ebe74e07d8a..2fc53519f9f 100644 --- a/units/CorSeaplanes/corcut.lua +++ b/units/CorSeaplanes/corcut.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL MOBILE WEAPON VTOL NOTLAND NOTSUB NOTSHIP NOTHOVER CANBEUW", collide = true, cruisealtitude = 85, energycost = 5400, diff --git a/units/CorSeaplanes/corhunt.lua b/units/CorSeaplanes/corhunt.lua index 8c2328099f9..a05301f8022 100644 --- a/units/CorSeaplanes/corhunt.lua +++ b/units/CorSeaplanes/corhunt.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER CANBEUW", collide = false, cruisealtitude = 190, energycost = 6900, diff --git a/units/CorSeaplanes/corsb.lua b/units/CorSeaplanes/corsb.lua index 29ada4ffef7..2fc695138bb 100644 --- a/units/CorSeaplanes/corsb.lua +++ b/units/CorSeaplanes/corsb.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER CANBEUW", collide = false, cruisealtitude = 150, energycost = 8200, diff --git a/units/CorSeaplanes/corseap.lua b/units/CorSeaplanes/corseap.lua index 41fae8d6b50..71454084c79 100644 --- a/units/CorSeaplanes/corseap.lua +++ b/units/CorSeaplanes/corseap.lua @@ -6,7 +6,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER CANBEUW", collide = true, cruisealtitude = 100, energycost = 5500, diff --git a/units/CorSeaplanes/corsfig.lua b/units/CorSeaplanes/corsfig.lua index 71598559765..c10fba71b14 100644 --- a/units/CorSeaplanes/corsfig.lua +++ b/units/CorSeaplanes/corsfig.lua @@ -7,7 +7,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 140, energycost = 4600, diff --git a/units/CorSeaplanes/corsfig2.lua b/units/CorSeaplanes/corsfig2.lua index 1019d36deec..62f967700d8 100644 --- a/units/CorSeaplanes/corsfig2.lua +++ b/units/CorSeaplanes/corsfig2.lua @@ -7,7 +7,6 @@ return { canfly = true, canmove = true, cansubmerge = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER CANBEUW", collide = false, cruisealtitude = 140, energycost = 4600, diff --git a/units/CorShips/T2/coracsub.lua b/units/CorShips/T2/coracsub.lua index dc5c404bd5e..3562904fa44 100644 --- a/units/CorShips/T2/coracsub.lua +++ b/units/CorShips/T2/coracsub.lua @@ -5,7 +5,6 @@ return { buildpic = "CORACSUB.DDS", buildtime = 18000, canmove = true, - category = "ALL UNDERWATER MOBILE NOTLAND NOWEAPON NOTAIR NOTHOVER", collisionvolumeoffsets = "0 0 4", collisionvolumescales = "38 9 72", collisionvolumetype = "box", diff --git a/units/CorShips/T2/corantiship.lua b/units/CorShips/T2/corantiship.lua index 3c95ce09595..b52e464e2e6 100644 --- a/units/CorShips/T2/corantiship.lua +++ b/units/CorShips/T2/corantiship.lua @@ -10,7 +10,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "48 48 140", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corarch.lua b/units/CorShips/T2/corarch.lua index 0a1826209b8..8683bf577e0 100644 --- a/units/CorShips/T2/corarch.lua +++ b/units/CorShips/T2/corarch.lua @@ -5,7 +5,6 @@ return { buildpic = "CORARCH.DDS", buildtime = 15000, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 3", collisionvolumescales = "37 37 74", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corbats.lua b/units/CorShips/T2/corbats.lua index 7e6bbc6c441..2da55d95a3f 100644 --- a/units/CorShips/T2/corbats.lua +++ b/units/CorShips/T2/corbats.lua @@ -4,7 +4,6 @@ return { buildpic = "CORBATS.DDS", buildtime = 36000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -15 2", collisionvolumescales = "62 62 148", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corblackhy.lua b/units/CorShips/T2/corblackhy.lua index 65486922d65..b164692bdfe 100644 --- a/units/CorShips/T2/corblackhy.lua +++ b/units/CorShips/T2/corblackhy.lua @@ -5,7 +5,6 @@ return { buildpic = "CORBLACKHY.DDS", buildtime = 175300, canmove = true, - category = "ALL WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 -24 5", collisionvolumescales = "80 80 186", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corcarry.lua b/units/CorShips/T2/corcarry.lua index 8bc6bb2cb64..78f86c4f73c 100644 --- a/units/CorShips/T2/corcarry.lua +++ b/units/CorShips/T2/corcarry.lua @@ -10,7 +10,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB SHIP NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 -7 0", collisionvolumescales = "61 61 153", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corcrus.lua b/units/CorShips/T2/corcrus.lua index dcc3fdd17aa..aad640314b3 100644 --- a/units/CorShips/T2/corcrus.lua +++ b/units/CorShips/T2/corcrus.lua @@ -5,7 +5,6 @@ return { buildpic = "CORCRUS.DDS", buildtime = 17000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -14 0", collisionvolumescales = "34 34 115", collisionvolumetype = "box", diff --git a/units/CorShips/T2/cordesolator.lua b/units/CorShips/T2/cordesolator.lua index b9a34ea6197..99585e9d91d 100644 --- a/units/CorShips/T2/cordesolator.lua +++ b/units/CorShips/T2/cordesolator.lua @@ -6,7 +6,6 @@ return { buildtime = 140000, canmanualfire = true, canmove = true, - category = "ALL MOBILE NOTLAND WEAPON SUB NOTSHIP NOTAIR NOTHOVER EMPABLE UNDERWATER", collisionvolumeoffsets = "0 1 4", collisionvolumescales = "20 45 100", collisionvolumetype = "box", @@ -129,7 +128,6 @@ return { collideenemy = false, collidefeature = false, collidefriendly = false, - commandfire = true, craterareaofeffect = 1920, craterboost = 2.4, cratermult = 1.2, diff --git a/units/CorShips/T2/cordronecarry.lua b/units/CorShips/T2/cordronecarry.lua index 6b32d96c29d..c2f30f7b5bb 100644 --- a/units/CorShips/T2/cordronecarry.lua +++ b/units/CorShips/T2/cordronecarry.lua @@ -11,7 +11,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 5 2", collisionvolumescales = "48 48 136", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corfship.lua b/units/CorShips/T2/corfship.lua index 2ec30a677ae..6a3715f6ff3 100644 --- a/units/CorShips/T2/corfship.lua +++ b/units/CorShips/T2/corfship.lua @@ -7,7 +7,6 @@ return { buildpic = "CORFSHIP.DDS", buildtime = 9400, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 -2", collisionvolumescales = "27 20 81", collisionvolumetype = "box", diff --git a/units/CorShips/T2/cormls.lua b/units/CorShips/T2/cormls.lua index e0a1ac7a6eb..415f8ba9be1 100644 --- a/units/CorShips/T2/cormls.lua +++ b/units/CorShips/T2/cormls.lua @@ -5,7 +5,6 @@ return { buildpic = "CORMLS.DDS", buildtime = 4800, canmove = true, - category = "ALL NOWEAPON SHIP NOTSUB MOBILE NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-2 -3 0", collisionvolumescales = "24 24 42", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/cormship.lua b/units/CorShips/T2/cormship.lua index 7cdcd6409e9..b149df84434 100644 --- a/units/CorShips/T2/cormship.lua +++ b/units/CorShips/T2/cormship.lua @@ -4,7 +4,6 @@ return { buildpic = "CORMSHIP.DDS", buildtime = 15000, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -8 0", collisionvolumescales = "43 43 101", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/coronager.lua b/units/CorShips/T2/coronager.lua index fcc177dbfaa..6165eb131c2 100644 --- a/units/CorShips/T2/coronager.lua +++ b/units/CorShips/T2/coronager.lua @@ -4,7 +4,6 @@ return { buildpic = "coronager.DDS", buildtime = 20000, canmove = true, - category = "ALL MOBILE NOTLAND WEAPON SUB NOTSHIP NOTAIR NOTHOVER EMPABLE UNDERWATER", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "18 18 60", collisionvolumetype = "box", diff --git a/units/CorShips/T2/corsentinel.lua b/units/CorShips/T2/corsentinel.lua index 487508b1656..5029147491f 100644 --- a/units/CorShips/T2/corsentinel.lua +++ b/units/CorShips/T2/corsentinel.lua @@ -11,7 +11,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-1 5 0", collisionvolumescales = "48 48 102", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corshark.lua b/units/CorShips/T2/corshark.lua index d55aaa7d580..10c0ac030f6 100644 --- a/units/CorShips/T2/corshark.lua +++ b/units/CorShips/T2/corshark.lua @@ -4,7 +4,6 @@ return { buildpic = "CORSHARK.DDS", buildtime = 18000, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND NOTAIR NOTHOVER CANBEUW EMPABLE UNDERWATER", collisionvolumeoffsets = "0.5 0 0", collisionvolumescales = "20 15 64", collisionvolumetype = "box", diff --git a/units/CorShips/T2/corsjam.lua b/units/CorShips/T2/corsjam.lua index 8ecbda50a81..33d414f5fb8 100644 --- a/units/CorShips/T2/corsjam.lua +++ b/units/CorShips/T2/corsjam.lua @@ -4,7 +4,6 @@ return { buildpic = "CORSJAM.DDS", buildtime = 6320, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB SHIP NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -8 4", collisionvolumescales = "28 28 65", collisionvolumetype = "CylZ", diff --git a/units/CorShips/T2/corssub.lua b/units/CorShips/T2/corssub.lua index ffbaf7148e8..eab3b09c7e7 100644 --- a/units/CorShips/T2/corssub.lua +++ b/units/CorShips/T2/corssub.lua @@ -4,7 +4,6 @@ return { buildpic = "CORSSUB.DDS", buildtime = 24750, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND NOTAIR NOTHOVER CANBEUW EMPABLE UNDERWATER", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "52 14 67", collisionvolumetype = "box", diff --git a/units/CorShips/T2/cortdrone.lua b/units/CorShips/T2/cortdrone.lua index e2869bcd2b6..0df54e7000c 100644 --- a/units/CorShips/T2/cortdrone.lua +++ b/units/CorShips/T2/cortdrone.lua @@ -9,7 +9,6 @@ return { buildtime = 1000, canfly = true, canmove = true, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, cruisealt = 40, explodeas = "tinyExplosionGeneric", diff --git a/units/CorShips/corcs.lua b/units/CorShips/corcs.lua index 998361999f2..f7721cb8bf0 100644 --- a/units/CorShips/corcs.lua +++ b/units/CorShips/corcs.lua @@ -5,7 +5,6 @@ return { buildpic = "CORCS.DDS", buildtime = 3700, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB SHIP NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 1", collisionvolumescales = "26 26 47", collisionvolumetype = "CylZ", diff --git a/units/CorShips/coresupp.lua b/units/CorShips/coresupp.lua index 2676839f55a..23a0f1fb611 100644 --- a/units/CorShips/coresupp.lua +++ b/units/CorShips/coresupp.lua @@ -4,7 +4,6 @@ return { buildpic = "CORESUPP.DDS", buildtime = 1400, canmove = true, - category = "ALL WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "20 16 40", collisionvolumetype = "CylZ", diff --git a/units/CorShips/corpship.lua b/units/CorShips/corpship.lua index 70fe7cb4f1f..2cb493934f6 100644 --- a/units/CorShips/corpship.lua +++ b/units/CorShips/corpship.lua @@ -6,7 +6,6 @@ return { buildpic = "CORPSHIP.DDS", buildtime = 4550, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 -2", collisionvolumescales = "25 24 71", collisionvolumetype = "box", diff --git a/units/CorShips/corpt.lua b/units/CorShips/corpt.lua index b5ec20471a9..1cd774b14bc 100644 --- a/units/CorShips/corpt.lua +++ b/units/CorShips/corpt.lua @@ -6,7 +6,6 @@ return { buildpic = "CORPT.DDS", buildtime = 2500, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 -1", collisionvolumescales = "20 20 60", collisionvolumetype = "box", diff --git a/units/CorShips/correcl.lua b/units/CorShips/correcl.lua index 185f5658b96..4201fb031b1 100644 --- a/units/CorShips/correcl.lua +++ b/units/CorShips/correcl.lua @@ -9,7 +9,6 @@ return { canassist = false, canmove = true, canresurrect = true, - category = "UNDERWATER ALL NOWEAPON NOTAIR NOTHOVER", collisionvolumeoffsets = "0 -3 2", collisionvolumescales = "37 25 48", collisionvolumetype = "box", diff --git a/units/CorShips/corroy.lua b/units/CorShips/corroy.lua index 24a2ab91329..2e4ff701fba 100644 --- a/units/CorShips/corroy.lua +++ b/units/CorShips/corroy.lua @@ -5,7 +5,6 @@ return { buildpic = "CORROY.DDS", buildtime = 10600, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 1", collisionvolumescales = "34 34 82", collisionvolumetype = "CylZ", diff --git a/units/CorShips/corsub.lua b/units/CorShips/corsub.lua index 1e38a374eb0..aff25999b2f 100644 --- a/units/CorShips/corsub.lua +++ b/units/CorShips/corsub.lua @@ -5,7 +5,6 @@ return { buildpic = "CORSUB.DDS", buildtime = 7200, canmove = true, - category = "ALL UNDERWATER MOBILE WEAPON NOTLAND NOTAIR NOTHOVER", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "35 17 50", collisionvolumetype = "box", diff --git a/units/CorShips/cortship.lua b/units/CorShips/cortship.lua index f0f7ca685e7..64639350c18 100644 --- a/units/CorShips/cortship.lua +++ b/units/CorShips/cortship.lua @@ -6,7 +6,6 @@ return { buildtime = 6400, canattack = false, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 5", collisionvolumescales = "40 40 90", collisionvolumetype = "CylZ", diff --git a/units/CorVehicles/T2/coracv.lua b/units/CorVehicles/T2/coracv.lua index cc452604aed..770a5af6ce0 100644 --- a/units/CorVehicles/T2/coracv.lua +++ b/units/CorVehicles/T2/coracv.lua @@ -5,7 +5,6 @@ return { buildpic = "CORACV.DDS", buildtime = 12900, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "36 36 47", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/corban.lua b/units/CorVehicles/T2/corban.lua index 83cbbeab7ad..c755a7f0a41 100644 --- a/units/CorVehicles/T2/corban.lua +++ b/units/CorVehicles/T2/corban.lua @@ -3,7 +3,6 @@ return { buildpic = "CORBAN.DDS", buildtime = 23100, canmove = true, - category = "ALL TANK WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -9 1", collisionvolumescales = "42 42 42", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/coreter.lua b/units/CorVehicles/T2/coreter.lua index 5976c30b613..7dffaeb7b36 100644 --- a/units/CorVehicles/T2/coreter.lua +++ b/units/CorVehicles/T2/coreter.lua @@ -5,7 +5,6 @@ return { buildtime = 6400, canattack = false, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "26.5 26.5 47.5", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/corgol.lua b/units/CorVehicles/T2/corgol.lua index 7c9cb3eea23..cc0fb69577c 100644 --- a/units/CorVehicles/T2/corgol.lua +++ b/units/CorVehicles/T2/corgol.lua @@ -3,7 +3,6 @@ return { buildpic = "CORGOL.DDS", buildtime = 26100, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 -1", collisionvolumescales = "50 50 50", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/corintr.lua b/units/CorVehicles/T2/corintr.lua index 9bf725f9596..d55b21a7fa9 100644 --- a/units/CorVehicles/T2/corintr.lua +++ b/units/CorVehicles/T2/corintr.lua @@ -5,7 +5,6 @@ return { buildtime = 14200, canmove = true, cantbetransported = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "48.2 48.2 87.2", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/cormabm.lua b/units/CorVehicles/T2/cormabm.lua index 7ffef6262bf..74d7dd2d08c 100644 --- a/units/CorVehicles/T2/cormabm.lua +++ b/units/CorVehicles/T2/cormabm.lua @@ -4,7 +4,6 @@ return { buildtime = 42000, canattack = false, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "40 40 40", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/cormart.lua b/units/CorVehicles/T2/cormart.lua index 1f8dbcfa95e..885e8648ff6 100644 --- a/units/CorVehicles/T2/cormart.lua +++ b/units/CorVehicles/T2/cormart.lua @@ -3,7 +3,6 @@ return { buildpic = "CORMART.DDS", buildtime = 6500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "38 24 41", collisionvolumetype = "Box", diff --git a/units/CorVehicles/T2/corparrow.lua b/units/CorVehicles/T2/corparrow.lua index f3256aadbd8..2d27063d31f 100644 --- a/units/CorVehicles/T2/corparrow.lua +++ b/units/CorVehicles/T2/corparrow.lua @@ -4,7 +4,6 @@ return { buildpic = "CORPARROW.DDS", buildtime = 22200, canmove = true, - category = "ALL TANK PHIB WEAPON NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -10 1", collisionvolumescales = "44 35 53", collisionvolumetype = "Box", diff --git a/units/CorVehicles/T2/corphantom.lua b/units/CorVehicles/T2/corphantom.lua index d87bd1dc6e3..2bca8f2cee0 100644 --- a/units/CorVehicles/T2/corphantom.lua +++ b/units/CorVehicles/T2/corphantom.lua @@ -4,7 +4,6 @@ return { buildpic = "CORPHANTOM.DDS", buildtime = 9000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE CANBEUW", cloakcost = 10, cloakcostmoving = 30, collisionvolumeoffsets = "0 -4 0", diff --git a/units/CorVehicles/T2/corprinter.lua b/units/CorVehicles/T2/corprinter.lua index 1c037481002..f4aa4d5334b 100644 --- a/units/CorVehicles/T2/corprinter.lua +++ b/units/CorVehicles/T2/corprinter.lua @@ -6,7 +6,6 @@ return { buildpic = "CORPRINTER.DDS", buildtime = 10200, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "36 36 54", collisionvolumetype = "Box", diff --git a/units/CorVehicles/T2/correap.lua b/units/CorVehicles/T2/correap.lua index 4187b290e02..d4ddbf5938d 100644 --- a/units/CorVehicles/T2/correap.lua +++ b/units/CorVehicles/T2/correap.lua @@ -3,7 +3,6 @@ return { buildpic = "CORREAP.DDS", buildtime = 11500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "34 34 38", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/corsala.lua b/units/CorVehicles/T2/corsala.lua index b20aa9394f7..d6b6f9319cc 100644 --- a/units/CorVehicles/T2/corsala.lua +++ b/units/CorVehicles/T2/corsala.lua @@ -4,7 +4,6 @@ return { buildpic = "CORSALA.DDS", buildtime = 7900, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -5.5 0", collisionvolumescales = "31 34 31", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/corseal.lua b/units/CorVehicles/T2/corseal.lua index e46e6d1f2ed..c57808822b3 100644 --- a/units/CorVehicles/T2/corseal.lua +++ b/units/CorVehicles/T2/corseal.lua @@ -4,7 +4,6 @@ return { buildpic = "CORSEAL.DDS", buildtime = 12050, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -7 0", collisionvolumescales = "31 31 31", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/corsent.lua b/units/CorVehicles/T2/corsent.lua index 7ce248b100c..db3dfba92ea 100644 --- a/units/CorVehicles/T2/corsent.lua +++ b/units/CorVehicles/T2/corsent.lua @@ -4,7 +4,6 @@ return { buildpic = "CORSENT.DDS", buildtime = 12000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 -4", collisionvolumescales = "40.5 40.5 43.5", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/corsiegebreaker.lua b/units/CorVehicles/T2/corsiegebreaker.lua index 095212f0802..6448db03d6a 100644 --- a/units/CorVehicles/T2/corsiegebreaker.lua +++ b/units/CorVehicles/T2/corsiegebreaker.lua @@ -8,7 +8,6 @@ return { buildpic = "CORSIEGEBREAKER.DDS", buildtime = 20000, canmove = true, - category = "ALL TANK WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "3.5 3 2", collisionvolumescales = "32 18 55", collisionvolumetype = "BOX", diff --git a/units/CorVehicles/T2/cortrem.lua b/units/CorVehicles/T2/cortrem.lua index dd3832dc593..c1006d130f5 100644 --- a/units/CorVehicles/T2/cortrem.lua +++ b/units/CorVehicles/T2/cortrem.lua @@ -3,7 +3,6 @@ return { buildpic = "CORTREM.DDS", buildtime = 31100, canmove = true, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE TANK EMPABLE", collisionvolumeoffsets = "0 -5 3", collisionvolumescales = "37 61 51", collisionvolumetype = "Box", diff --git a/units/CorVehicles/T2/corvac.lua b/units/CorVehicles/T2/corvac.lua index d87a92a0a60..60b97090676 100644 --- a/units/CorVehicles/T2/corvac.lua +++ b/units/CorVehicles/T2/corvac.lua @@ -6,7 +6,6 @@ return { buildpic = "CORPRINTER.DDS", buildtime = 10000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "36 36 54", collisionvolumetype = "Box", diff --git a/units/CorVehicles/T2/corvacct.lua b/units/CorVehicles/T2/corvacct.lua index 6c2335438f6..265b1ead5b2 100644 --- a/units/CorVehicles/T2/corvacct.lua +++ b/units/CorVehicles/T2/corvacct.lua @@ -7,7 +7,7 @@ return { buildtime = 10, canmove = true, capturable = false, - category = "", + category = "OBJECT", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "Box", diff --git a/units/CorVehicles/T2/corvrad.lua b/units/CorVehicles/T2/corvrad.lua index 25d51b40f3e..f4af7acf76c 100644 --- a/units/CorVehicles/T2/corvrad.lua +++ b/units/CorVehicles/T2/corvrad.lua @@ -5,7 +5,6 @@ return { buildtime = 4220, canattack = false, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "24 18 29", collisionvolumetype = "box", diff --git a/units/CorVehicles/T2/corvroc.lua b/units/CorVehicles/T2/corvroc.lua index ab8aa9efb31..12763b53c42 100644 --- a/units/CorVehicles/T2/corvroc.lua +++ b/units/CorVehicles/T2/corvroc.lua @@ -3,7 +3,6 @@ return { buildpic = "CORVROC.DDS", buildtime = 15000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -9 -2", collisionvolumescales = "40 40 44", collisionvolumetype = "Box", diff --git a/units/CorVehicles/corcv.lua b/units/CorVehicles/corcv.lua index 52584c7d4f5..ab122130cbf 100644 --- a/units/CorVehicles/corcv.lua +++ b/units/CorVehicles/corcv.lua @@ -5,7 +5,6 @@ return { buildpic = "CORCV.DDS", buildtime = 4160, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "35 32 49", collisionvolumetype = "Box", diff --git a/units/CorVehicles/corfav.lua b/units/CorVehicles/corfav.lua index c6865ccdbae..bd9c9ddf6dc 100644 --- a/units/CorVehicles/corfav.lua +++ b/units/CorVehicles/corfav.lua @@ -3,7 +3,7 @@ return { buildpic = "CORFAV.DDS", buildtime = 1150, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE GROUNDSCOUT EMPABLE", + category = "GROUNDSCOUT", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "16 16 26", collisionvolumetype = "Box", diff --git a/units/CorVehicles/corgarp.lua b/units/CorVehicles/corgarp.lua index 90c86949c33..5f7ad89b598 100644 --- a/units/CorVehicles/corgarp.lua +++ b/units/CorVehicles/corgarp.lua @@ -4,7 +4,6 @@ return { buildpic = "CORGARP.DDS", buildtime = 3100, canmove = true, - category = "ALL TANK PHIB WEAPON NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "30 21 36", collisionvolumetype = "Box", diff --git a/units/CorVehicles/corgator.lua b/units/CorVehicles/corgator.lua index 7dbb09df394..a643a409ac4 100644 --- a/units/CorVehicles/corgator.lua +++ b/units/CorVehicles/corgator.lua @@ -3,7 +3,6 @@ return { buildpic = "CORGATOR.DDS", buildtime = 1761, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 1", collisionvolumescales = "30 15 38", collisionvolumetype = "Box", diff --git a/units/CorVehicles/corlevlr.lua b/units/CorVehicles/corlevlr.lua index a81d97eda54..534d0df282a 100644 --- a/units/CorVehicles/corlevlr.lua +++ b/units/CorVehicles/corlevlr.lua @@ -3,7 +3,6 @@ return { buildpic = "CORLEVLR.DDS", buildtime = 3000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "29 20 32", collisionvolumetype = "Box", diff --git a/units/CorVehicles/cormist.lua b/units/CorVehicles/cormist.lua index d0dd8c68449..fe9da9ed67e 100644 --- a/units/CorVehicles/cormist.lua +++ b/units/CorVehicles/cormist.lua @@ -4,7 +4,6 @@ return { buildpic = "CORMIST.DDS", buildtime = 3440, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 1", collisionvolumescales = "34 18 43", collisionvolumetype = "Box", diff --git a/units/CorVehicles/cormlv.lua b/units/CorVehicles/cormlv.lua index 539dac253a9..6303de90e28 100644 --- a/units/CorVehicles/cormlv.lua +++ b/units/CorVehicles/cormlv.lua @@ -10,7 +10,6 @@ return { canreclaim = false, canrepair = true, canrestore = false, - category = "ALL TANK WEAPON MOBILE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "30 17 45", collisionvolumetype = "Box", diff --git a/units/CorVehicles/cormuskrat.lua b/units/CorVehicles/cormuskrat.lua index 8a16ae0bb01..1580ad6e7e9 100644 --- a/units/CorVehicles/cormuskrat.lua +++ b/units/CorVehicles/cormuskrat.lua @@ -5,7 +5,6 @@ return { buildpic = "CORMUSKRAT.DDS", buildtime = 6860, canmove = true, - category = "ALL TANK PHIB NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 1", collisionvolumescales = "26 28 46", collisionvolumetype = "Box", diff --git a/units/CorVehicles/corraid.lua b/units/CorVehicles/corraid.lua index cc5088322a9..c1542895c50 100644 --- a/units/CorVehicles/corraid.lua +++ b/units/CorVehicles/corraid.lua @@ -3,7 +3,6 @@ return { buildpic = "CORRAID.DDS", buildtime = 3310, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "32 16 32", collisionvolumetype = "Box", diff --git a/units/CorVehicles/corwolv.lua b/units/CorVehicles/corwolv.lua index 18ec214b8b0..d7d0b489f32 100644 --- a/units/CorVehicles/corwolv.lua +++ b/units/CorVehicles/corwolv.lua @@ -3,7 +3,6 @@ return { buildpic = "CORWOLV.DDS", buildtime = 3550, canmove = true, - category = "ALL TANK WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "28 22 38", collisionvolumetype = "Box", diff --git a/units/Legion/Air/T2 Air/legfort.lua b/units/Legion/Air/T2 Air/legfort.lua index 33b5a06fdb1..b5098f75a4f 100644 --- a/units/Legion/Air/T2 Air/legfort.lua +++ b/units/Legion/Air/T2 Air/legfort.lua @@ -11,7 +11,6 @@ return { buildtime = 90000, canfly = true, canmove = true, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, collisionvolumeoffsets = "0 1 0", collisionvolumescales = "70 40 110", diff --git a/units/Legion/Air/T2 Air/legheavydrone.lua b/units/Legion/Air/T2 Air/legheavydrone.lua index 1ae572097a2..008b9474640 100644 --- a/units/Legion/Air/T2 Air/legheavydrone.lua +++ b/units/Legion/Air/T2 Air/legheavydrone.lua @@ -10,7 +10,6 @@ return { canfly = true, canmove = true, cantbetransported = false, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, cruisealtitude = 68, explodeas = "tinyExplosionGeneric", diff --git a/units/Legion/Air/T2 Air/legionnaire.lua b/units/Legion/Air/T2 Air/legionnaire.lua index 5a3ff9a075f..cbd9793aabd 100644 --- a/units/Legion/Air/T2 Air/legionnaire.lua +++ b/units/Legion/Air/T2 Air/legionnaire.lua @@ -10,7 +10,6 @@ return { buildtime = 10000, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 160, explodeas = "smallExplosionGenericAir", diff --git a/units/Legion/Air/T2 Air/legmineb.lua b/units/Legion/Air/T2 Air/legmineb.lua index bb20ab6bf96..0aa933d8e73 100644 --- a/units/Legion/Air/T2 Air/legmineb.lua +++ b/units/Legion/Air/T2 Air/legmineb.lua @@ -9,7 +9,6 @@ return { buildtime = 26000, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 150, explodeas = "mediumExplosionGeneric", diff --git a/units/Legion/Air/T2 Air/legnap.lua b/units/Legion/Air/T2 Air/legnap.lua index 898dcce2087..af3e1468692 100644 --- a/units/Legion/Air/T2 Air/legnap.lua +++ b/units/Legion/Air/T2 Air/legnap.lua @@ -10,7 +10,6 @@ return { buildtime = 36000, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 180, explodeas = "largeexplosiongeneric", diff --git a/units/Legion/Air/T2 Air/legphoenix.lua b/units/Legion/Air/T2 Air/legphoenix.lua index a731a01a761..d76438eb5bd 100644 --- a/units/Legion/Air/T2 Air/legphoenix.lua +++ b/units/Legion/Air/T2 Air/legphoenix.lua @@ -10,7 +10,6 @@ return { canfly = true, canattack = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collisionvolumeoffsets = "0 0 5", collisionvolumescales = "110 20 60",--yes this is unconventional but needs to be this way (passes the Drivver Test) collisionvolumetype = "Box", diff --git a/units/Legion/Air/T2 Air/legstronghold.lua b/units/Legion/Air/T2 Air/legstronghold.lua index 184049fa9c5..3da5bf7233a 100644 --- a/units/Legion/Air/T2 Air/legstronghold.lua +++ b/units/Legion/Air/T2 Air/legstronghold.lua @@ -9,7 +9,6 @@ return { buildtime = 20000, canfly = true, canmove = true, - category = "ALL NOTSUB VTOL NOWEAPON NOTHOVER", collide = false, collisionvolumeoffsets = "1 -3 0", collisionvolumescales = "52 21 52", diff --git a/units/Legion/Air/T2 Air/legvenator.lua b/units/Legion/Air/T2 Air/legvenator.lua index cbc07a587bf..a54230e7078 100644 --- a/units/Legion/Air/T2 Air/legvenator.lua +++ b/units/Legion/Air/T2 Air/legvenator.lua @@ -10,7 +10,6 @@ return { buildtime = 8400, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 160, explodeas = "smallExplosionGenericAir", diff --git a/units/Legion/Air/T2 Air/legwhisper.lua b/units/Legion/Air/T2 Air/legwhisper.lua index 0693903b4dc..abf805a3861 100644 --- a/units/Legion/Air/T2 Air/legwhisper.lua +++ b/units/Legion/Air/T2 Air/legwhisper.lua @@ -8,7 +8,6 @@ return { buildtime = 14000, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = false, cruisealtitude = 130, explodeas = "mediumexplosiongeneric", diff --git a/units/Legion/Air/legatrans.lua b/units/Legion/Air/legatrans.lua index 109c8a7c664..2804174818d 100644 --- a/units/Legion/Air/legatrans.lua +++ b/units/Legion/Air/legatrans.lua @@ -9,7 +9,6 @@ return { buildtime = 4300, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, cruisealtitude = 100, explodeas = "mediumexplosiongeneric", diff --git a/units/Legion/Air/legcib.lua b/units/Legion/Air/legcib.lua index 183f3bda13f..482dc975354 100644 --- a/units/Legion/Air/legcib.lua +++ b/units/Legion/Air/legcib.lua @@ -9,7 +9,6 @@ return { buildtime = 4200, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER", collide = true, cruisealtitude = 130, explodeas = "mediumexplosiongeneric", diff --git a/units/Legion/Air/legdrone.lua b/units/Legion/Air/legdrone.lua index 90c61cbc7e9..9f1ea1aee12 100644 --- a/units/Legion/Air/legdrone.lua +++ b/units/Legion/Air/legdrone.lua @@ -10,7 +10,6 @@ return { canfly = true, canmove = true, cantbetransported = false, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, cruisealtitude = 78, explodeas = "tinyExplosionGeneric", diff --git a/units/Legion/Air/legfig.lua b/units/Legion/Air/legfig.lua index d9f94b0835d..f0583687bac 100644 --- a/units/Legion/Air/legfig.lua +++ b/units/Legion/Air/legfig.lua @@ -10,7 +10,6 @@ return { buildtime = 2000, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTSUB NOTLAND VTOL NOTSHIP NOTHOVER", collide = false, cruisealtitude = 125, explodeas = "smallExplosionGenericAir", diff --git a/units/Legion/Air/legkam.lua b/units/Legion/Air/legkam.lua index da6265e9845..b6b8f0fdd6f 100644 --- a/units/Legion/Air/legkam.lua +++ b/units/Legion/Air/legkam.lua @@ -9,7 +9,6 @@ return { buildtime = 2200, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER", collide = false, collisionvolumeoffsets = "0 5 12", collisionvolumescales = "15 15 40", diff --git a/units/Legion/Air/legmos.lua b/units/Legion/Air/legmos.lua index 2de8a778998..fc7d8e1e329 100644 --- a/units/Legion/Air/legmos.lua +++ b/units/Legion/Air/legmos.lua @@ -9,7 +9,6 @@ return { buildtime = 4000, canfly = true, canmove = true, - category = "ALL WEAPON NOTSUB VTOL NOTHOVER", collide = true, cruisealtitude = 70, explodeas = "smallExplosionGeneric", diff --git a/units/Legion/Bots/T2 Bots/legbart.lua b/units/Legion/Bots/T2 Bots/legbart.lua index 98cac5b9e1e..ff1f4804b84 100644 --- a/units/Legion/Bots/T2 Bots/legbart.lua +++ b/units/Legion/Bots/T2 Bots/legbart.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGBART.DDS", buildtime = 10000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 -5", collisionvolumescales = "28 45 35", collisionvolumetype = "CylY", diff --git a/units/Legion/Bots/T2 Bots/legdecom.lua b/units/Legion/Bots/T2 Bots/legdecom.lua index 5f8de030efa..a3cddfb218d 100644 --- a/units/Legion/Bots/T2 Bots/legdecom.lua +++ b/units/Legion/Bots/T2 Bots/legdecom.lua @@ -15,7 +15,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/Legion/Bots/T2 Bots/leginc.lua b/units/Legion/Bots/T2 Bots/leginc.lua index 28b79483ee3..5d1733ef68b 100644 --- a/units/Legion/Bots/T2 Bots/leginc.lua +++ b/units/Legion/Bots/T2 Bots/leginc.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGINC.DDS", buildtime = 55000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "60 40 60", collisionvolumetype = "Box", diff --git a/units/Legion/Bots/T2 Bots/leginfestor.lua b/units/Legion/Bots/T2 Bots/leginfestor.lua index bdac36bc0bf..6fb78844fbc 100644 --- a/units/Legion/Bots/T2 Bots/leginfestor.lua +++ b/units/Legion/Bots/T2 Bots/leginfestor.lua @@ -11,7 +11,6 @@ return { canassist = true, canreclaim = true, canmove = true, - category = "ALL BOT WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "36 26 44", collisionvolumetype = "CylY", diff --git a/units/Legion/Bots/T2 Bots/legshot.lua b/units/Legion/Bots/T2 Bots/legshot.lua index c20205dc948..c1b98bcad7b 100644 --- a/units/Legion/Bots/T2 Bots/legshot.lua +++ b/units/Legion/Bots/T2 Bots/legshot.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGSHOT.DDS", buildtime = 11000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "33 40 33", collisionvolumetype = "CylY", diff --git a/units/Legion/Bots/T2 Bots/legsnapper.lua b/units/Legion/Bots/T2 Bots/legsnapper.lua index 36187ed17f4..8dfe2282a2f 100644 --- a/units/Legion/Bots/T2 Bots/legsnapper.lua +++ b/units/Legion/Bots/T2 Bots/legsnapper.lua @@ -8,7 +8,6 @@ return { buildpic = "legsnapper.DDS", buildtime = 8000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "25 9 20", collisionvolumetype = "CylY", diff --git a/units/Legion/Bots/T2 Bots/legsrail.lua b/units/Legion/Bots/T2 Bots/legsrail.lua index 9a4e02775d2..9f5d536ec42 100644 --- a/units/Legion/Bots/T2 Bots/legsrail.lua +++ b/units/Legion/Bots/T2 Bots/legsrail.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGSRAIL.DDS", buildtime = 18000, canmove = true, - category = "ALL NOTSUB WEAPON NOTAIR NOTHOVER SURFACE BOT EMPABLE", collisionvolumeoffsets = "0 10 0", collisionvolumescales = "45 40 45", collisionvolumetype = "CylY", diff --git a/units/Legion/Bots/T2 Bots/legstr.lua b/units/Legion/Bots/T2 Bots/legstr.lua index 69069961f03..8ef2f365cc0 100644 --- a/units/Legion/Bots/T2 Bots/legstr.lua +++ b/units/Legion/Bots/T2 Bots/legstr.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGSTR.DDS", buildtime = 7200, canmove = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 -4", collisionvolumescales = "25 53 25", collisionvolumetype = "CYLY", diff --git a/units/Legion/Bots/legbal.lua b/units/Legion/Bots/legbal.lua index 76d77bebdf4..adf293bffdd 100644 --- a/units/Legion/Bots/legbal.lua +++ b/units/Legion/Bots/legbal.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGBAL.DDS", buildtime = 2400, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 -1", collisionvolumescales = "26 36 20", collisionvolumetype = "box", diff --git a/units/Legion/Bots/legcen.lua b/units/Legion/Bots/legcen.lua index 4fa97115875..9ddd5f23826 100644 --- a/units/Legion/Bots/legcen.lua +++ b/units/Legion/Bots/legcen.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGCEN.DDS", buildtime = 3000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 1", collisionvolumescales = "18 20 30", collisionvolumetype = "box", diff --git a/units/Legion/Bots/leggob.lua b/units/Legion/Bots/leggob.lua index 255c835953a..d915844fe00 100644 --- a/units/Legion/Bots/leggob.lua +++ b/units/Legion/Bots/leggob.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGGOB.DDS", buildtime = 750, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "18 22 18", collisionvolumetype = "CylY", diff --git a/units/Legion/Bots/legkark.lua b/units/Legion/Bots/legkark.lua index a1bec70ea53..ec0289fb23e 100644 --- a/units/Legion/Bots/legkark.lua +++ b/units/Legion/Bots/legkark.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGKARK.DDS", buildtime = 4000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 1", collisionvolumescales = "29 35 29", collisionvolumetype = "CylY", diff --git a/units/Legion/Bots/leglob.lua b/units/Legion/Bots/leglob.lua index e85ae7f58c5..142ab63516f 100644 --- a/units/Legion/Bots/leglob.lua +++ b/units/Legion/Bots/leglob.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGLOB.DDS", buildtime = 1100, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "20 18 20", collisionvolumetype = "CylY", diff --git a/units/Legion/Constructors/legaca.lua b/units/Legion/Constructors/legaca.lua index 6918ba94bce..f460f03e30f 100644 --- a/units/Legion/Constructors/legaca.lua +++ b/units/Legion/Constructors/legaca.lua @@ -11,7 +11,6 @@ return { buildtime = 18000, canfly = true, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = true, cruisealtitude = 70, energymake = 10, diff --git a/units/Legion/Constructors/legaceb.lua b/units/Legion/Constructors/legaceb.lua index ef614a5937a..a9ad8b2ff19 100644 --- a/units/Legion/Constructors/legaceb.lua +++ b/units/Legion/Constructors/legaceb.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGACEB.DDS", buildtime = 9500, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "30 26 30", collisionvolumetype = "CylY", diff --git a/units/Legion/Constructors/legack.lua b/units/Legion/Constructors/legack.lua index ff2fa1e2694..5a9fb73dd1e 100644 --- a/units/Legion/Constructors/legack.lua +++ b/units/Legion/Constructors/legack.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGACK.DDS", buildtime = 9700, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "25 38 28", collisionvolumetype = "Box", diff --git a/units/Legion/Constructors/legacv.lua b/units/Legion/Constructors/legacv.lua index 6189a5b8eb2..80e93072fb7 100644 --- a/units/Legion/Constructors/legacv.lua +++ b/units/Legion/Constructors/legacv.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGACV.DDS", buildtime = 12900, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "36 36 47", collisionvolumetype = "CylZ", diff --git a/units/Legion/Constructors/legca.lua b/units/Legion/Constructors/legca.lua index 082f9c33c61..a2ba2f6e369 100644 --- a/units/Legion/Constructors/legca.lua +++ b/units/Legion/Constructors/legca.lua @@ -11,7 +11,6 @@ return { buildtime = 8400, canfly = true, canmove = true, - category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = true, cruisealtitude = 75, energymake = 5, diff --git a/units/Legion/Constructors/legch.lua b/units/Legion/Constructors/legch.lua index 7cbfc96b40c..bf2d14ef5a9 100644 --- a/units/Legion/Constructors/legch.lua +++ b/units/Legion/Constructors/legch.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGCH.DDS", buildtime = 4580, canmove = true, - category = "ALL HOVER MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "27 18 38", collisionvolumetype = "Box", diff --git a/units/Legion/Constructors/legck.lua b/units/Legion/Constructors/legck.lua index f2d7c049edb..bac99808c0c 100644 --- a/units/Legion/Constructors/legck.lua +++ b/units/Legion/Constructors/legck.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGCK.DDS", buildtime = 3250, canmove = true, - category = "BOT MOBILE ALL NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -1", collisionvolumescales = "22 27 22", collisionvolumetype = "CylY", diff --git a/units/Legion/Constructors/legcs.lua b/units/Legion/Constructors/legcs.lua index a5fb7a99406..dbe566ed503 100644 --- a/units/Legion/Constructors/legcs.lua +++ b/units/Legion/Constructors/legcs.lua @@ -9,7 +9,6 @@ return { buildpic = "CORCS.DDS", buildtime = 3700, canmove = true, - category = "ALL NOTLAND MOBILE NOTSUB SHIP NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 1", collisionvolumescales = "26 26 47", collisionvolumetype = "CylZ", diff --git a/units/Legion/Constructors/legcv.lua b/units/Legion/Constructors/legcv.lua index 7dffb1a405a..2917654566e 100644 --- a/units/Legion/Constructors/legcv.lua +++ b/units/Legion/Constructors/legcv.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGCV.DDS", buildtime = 3900, canmove = true, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 21 45", collisionvolumetype = "Box", diff --git a/units/Legion/Constructors/legotter.lua b/units/Legion/Constructors/legotter.lua index 5ba84ba2d9a..cd28ce018e4 100644 --- a/units/Legion/Constructors/legotter.lua +++ b/units/Legion/Constructors/legotter.lua @@ -10,7 +10,6 @@ return { buildpic = "LEGOTTER.DDS", buildtime = 6860, canmove = true, - category = "ALL TANK PHIB NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -1 1", collisionvolumescales = "22 16 41", collisionvolumetype = "Box", diff --git a/units/Legion/Defenses/legabm.lua b/units/Legion/Defenses/legabm.lua index 10f08aa89da..96d9f14c84a 100644 --- a/units/Legion/Defenses/legabm.lua +++ b/units/Legion/Defenses/legabm.lua @@ -9,7 +9,6 @@ return { buildtime = 60000, canattack = false, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -19 0", collisionvolumescales = "48 78 48", collisionvolumetype = "Box", diff --git a/units/Legion/Defenses/legacluster.lua b/units/Legion/Defenses/legacluster.lua index 0f85ee25ea6..a081fb4f960 100644 --- a/units/Legion/Defenses/legacluster.lua +++ b/units/Legion/Defenses/legacluster.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGACLUSTER.DDS", buildtime = 25700, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "47 47 47", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legbastion.lua b/units/Legion/Defenses/legbastion.lua index 3886d6ad34d..1ea900756ba 100644 --- a/units/Legion/Defenses/legbastion.lua +++ b/units/Legion/Defenses/legbastion.lua @@ -9,7 +9,6 @@ return { buildpic = "legbastion.DDS", buildtime = 79000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 0.0 0.0", collisionvolumescales = "60 150 60", collisionvolumetype = "box", diff --git a/units/Legion/Defenses/legbombard.lua b/units/Legion/Defenses/legbombard.lua index 1e19751ae6a..9d629ce810e 100644 --- a/units/Legion/Defenses/legbombard.lua +++ b/units/Legion/Defenses/legbombard.lua @@ -7,7 +7,6 @@ return { buildpic = "legbombard.dds", buildtime = 17500, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 18 32", collisionvolumetype = "Box", diff --git a/units/Legion/Defenses/legcluster.lua b/units/Legion/Defenses/legcluster.lua index 794ef5f5354..34ba400664f 100644 --- a/units/Legion/Defenses/legcluster.lua +++ b/units/Legion/Defenses/legcluster.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGCLUSTER.DDS", buildtime = 19300, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "47 47 47", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legdrag.lua b/units/Legion/Defenses/legdrag.lua index 35dd0239429..3c2f3e58894 100644 --- a/units/Legion/Defenses/legdrag.lua +++ b/units/Legion/Defenses/legdrag.lua @@ -10,7 +10,6 @@ return { buildtime = 255, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 22 32", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legdtr.lua b/units/Legion/Defenses/legdtr.lua index db66c5e635a..9aae93f7dd0 100644 --- a/units/Legion/Defenses/legdtr.lua +++ b/units/Legion/Defenses/legdtr.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGDTR.DDS", buildtime = 4420, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.33, decoyfor = "legdrag", diff --git a/units/Legion/Defenses/legflak.lua b/units/Legion/Defenses/legflak.lua index 93434856cca..a0601695df9 100644 --- a/units/Legion/Defenses/legflak.lua +++ b/units/Legion/Defenses/legflak.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGFLAK.DDS", buildtime = 19000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "55 85 55", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legforti.lua b/units/Legion/Defenses/legforti.lua index a2a76012b76..53dd7db82b9 100644 --- a/units/Legion/Defenses/legforti.lua +++ b/units/Legion/Defenses/legforti.lua @@ -11,7 +11,6 @@ return { buildtime = 1000, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "32 50 32", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/leghive.lua b/units/Legion/Defenses/leghive.lua index f6f068ae74b..490fb3cdde8 100644 --- a/units/Legion/Defenses/leghive.lua +++ b/units/Legion/Defenses/leghive.lua @@ -9,7 +9,6 @@ return { buildtime = 7500, canrepeat = false, canmove = true, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 0", collisionvolumescales = "44 23 44", collisionvolumetype = "Box", diff --git a/units/Legion/Defenses/leglht.lua b/units/Legion/Defenses/leglht.lua index 5bce8ddfdef..18570192547 100644 --- a/units/Legion/Defenses/leglht.lua +++ b/units/Legion/Defenses/leglht.lua @@ -9,7 +9,6 @@ return { buildtime = 2450,--2720 canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 0", collisionvolumescales = "32 61 32", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/leglraa.lua b/units/Legion/Defenses/leglraa.lua index 230b5349c5c..d1003191655 100644 --- a/units/Legion/Defenses/leglraa.lua +++ b/units/Legion/Defenses/leglraa.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGLRAA.DDS", buildtime = 28000, canrepeat = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "63 57 63", collisionvolumetype = "CylY", @@ -154,7 +153,6 @@ return { damage = { default = 1, vtol = 750, - space = 750, }, }, railgunt2 = { @@ -201,7 +199,6 @@ return { --commanders = 750, default = 1, vtol = 700, - space = 700, }, }, }, @@ -209,7 +206,7 @@ return { [1] = { badtargetcategory = "NOTAIR LIGHTAIRSCOUT", def = "railgunt2", - onlytargetcategory = "VTOL SPACE", + onlytargetcategory = "VTOL/SeaUtil", }, }, }, diff --git a/units/Legion/Defenses/leglrpc.lua b/units/Legion/Defenses/leglrpc.lua index 308e5c14e6c..cd3909b5f18 100644 --- a/units/Legion/Defenses/leglrpc.lua +++ b/units/Legion/Defenses/leglrpc.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGLRPC.DDS", buildtime = 85000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", --collisionvolumeoffsets = "0 0 -20", --collisionvolumescales = "48 90 48", --collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/leglupara.lua b/units/Legion/Defenses/leglupara.lua index c24ae620613..dc458e62b64 100644 --- a/units/Legion/Defenses/leglupara.lua +++ b/units/Legion/Defenses/leglupara.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGLUPARA.DDS", buildtime = 12500, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "45 65 45", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legmg.lua b/units/Legion/Defenses/legmg.lua index 6e1283bd5d5..bf9fffb04af 100644 --- a/units/Legion/Defenses/legmg.lua +++ b/units/Legion/Defenses/legmg.lua @@ -10,7 +10,6 @@ return { buildtime = 8400, canrepeat = false, cantbetransported = false, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "36 80 36", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legperdition.lua b/units/Legion/Defenses/legperdition.lua index 2a62a1bed21..6c85a3347a0 100644 --- a/units/Legion/Defenses/legperdition.lua +++ b/units/Legion/Defenses/legperdition.lua @@ -7,7 +7,6 @@ return { metalcost = 1250, buildpic = "legperdition.DDS", buildtime = 62000, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "80 70 80", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legrhapsis.lua b/units/Legion/Defenses/legrhapsis.lua index 7491f18d9ab..a185a7b5226 100644 --- a/units/Legion/Defenses/legrhapsis.lua +++ b/units/Legion/Defenses/legrhapsis.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGRHAPSIS.DDS", buildtime = 4700, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "28 40 28", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legrl.lua b/units/Legion/Defenses/legrl.lua index f639e980ae9..ad893e7be7f 100644 --- a/units/Legion/Defenses/legrl.lua +++ b/units/Legion/Defenses/legrl.lua @@ -9,7 +9,6 @@ return { buildtime = 1750, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "26 52 26", collisionvolumetype = "CylY", diff --git a/units/Legion/Defenses/legsilo.lua b/units/Legion/Defenses/legsilo.lua index 054b07e0423..22f78dec225 100644 --- a/units/Legion/Defenses/legsilo.lua +++ b/units/Legion/Defenses/legsilo.lua @@ -7,7 +7,6 @@ return { metalcost = 7700, buildpic = "LEGSILO.DDS", buildtime = 181000, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 18 -2", collisionvolumescales = "90 38 84", collisionvolumetype = "Box", diff --git a/units/Legion/Defenses/legstarfall.lua b/units/Legion/Defenses/legstarfall.lua index 58e23f2d16b..fc2070cc803 100644 --- a/units/Legion/Defenses/legstarfall.lua +++ b/units/Legion/Defenses/legstarfall.lua @@ -8,7 +8,6 @@ return { buildpic = "legstarfall.DDS", buildtime = 1400000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "120 165 120", collisionvolumetype = "CylY", diff --git a/units/Legion/Economy/legadvsol.lua b/units/Legion/Economy/legadvsol.lua index 60085496556..ed1993225eb 100644 --- a/units/Legion/Economy/legadvsol.lua +++ b/units/Legion/Economy/legadvsol.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGADVSOL.DDS", buildtime = 14000, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "60 44 60", collisionvolumetype = "CylY", diff --git a/units/Legion/Economy/legageo.lua b/units/Legion/Economy/legageo.lua index 320cc7201d2..8702a463e88 100644 --- a/units/Legion/Economy/legageo.lua +++ b/units/Legion/Economy/legageo.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGAGEO.DDS", buildtime = 32000, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "96 86 96", collisionvolumetype = "cylY", diff --git a/units/Legion/Economy/legamstor.lua b/units/Legion/Economy/legamstor.lua index 156f388a8ea..9ac9e3609a1 100644 --- a/units/Legion/Economy/legamstor.lua +++ b/units/Legion/Economy/legamstor.lua @@ -6,7 +6,7 @@ return { buildpic = "legamstor.DDS", buildtime = 20500, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE UNDERWATER EMPABLE", + category = "CANBEUW", collisionvolumeoffsets = "-6 0 0", collisionvolumescales = "46 40 58", collisionvolumetype = "Box", diff --git a/units/Legion/Economy/legeconv.lua b/units/Legion/Economy/legeconv.lua index 41d028f807b..76400729a86 100644 --- a/units/Legion/Economy/legeconv.lua +++ b/units/Legion/Economy/legeconv.lua @@ -9,7 +9,6 @@ return { buildpic = "legeconv.DDS", buildtime = 2600, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "40 40 40", collisionvolumetype = "CYLY", diff --git a/units/Legion/Economy/legestor.lua b/units/Legion/Economy/legestor.lua index 3de7e3b6a62..3bd0253261e 100644 --- a/units/Legion/Economy/legestor.lua +++ b/units/Legion/Economy/legestor.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGESTOR.DDS", buildtime = 4260, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "60 35 60", collisionvolumetype = "CylY", diff --git a/units/Legion/Economy/leggeo.lua b/units/Legion/Economy/leggeo.lua index b48c5a27511..7348e5940a9 100644 --- a/units/Legion/Economy/leggeo.lua +++ b/units/Legion/Economy/leggeo.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGGEO.DDS", buildtime = 12900, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "63 45 63", collisionvolumetype = "cylY", diff --git a/units/Legion/Economy/legmex.lua b/units/Legion/Economy/legmex.lua index a82448f2bc6..5af69636a5c 100644 --- a/units/Legion/Economy/legmex.lua +++ b/units/Legion/Economy/legmex.lua @@ -10,7 +10,7 @@ return { buildpic = "LEGMEX.DDS", buildtime = 1880, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE CANBEUW UNDERWATER", + category = "CANBEUW", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "48 30 48", collisionvolumetype = "CylY", diff --git a/units/Legion/Economy/legmext15.lua b/units/Legion/Economy/legmext15.lua index a661206a7e1..33900401b4c 100644 --- a/units/Legion/Economy/legmext15.lua +++ b/units/Legion/Economy/legmext15.lua @@ -10,7 +10,7 @@ return { buildpic = "LEGMEXT15.DDS", buildtime = 5000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE CANBEUW UNDERWATER", + category = "CANBEUW", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "48 30 48", collisionvolumetype = "CylY", diff --git a/units/Legion/Economy/legmoho.lua b/units/Legion/Economy/legmoho.lua index 2c7d88b1e1e..51fee7c2a90 100644 --- a/units/Legion/Economy/legmoho.lua +++ b/units/Legion/Economy/legmoho.lua @@ -10,7 +10,6 @@ return { buildpic = "legmoho.DDS", buildtime = 14100, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "70 40 70", collisionvolumetype = "CylY", diff --git a/units/Legion/Economy/legmohobp.lua b/units/Legion/Economy/legmohobp.lua index 1b365efecbf..3d7f5ffd69a 100644 --- a/units/Legion/Economy/legmohobp.lua +++ b/units/Legion/Economy/legmohobp.lua @@ -11,7 +11,6 @@ return { buildtime = 14100, builder = true, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "70 40 70", collisionvolumetype = "CylY", diff --git a/units/Legion/Economy/legmohobpct.lua b/units/Legion/Economy/legmohobpct.lua index 50ac206d471..bbc4c74a95f 100644 --- a/units/Legion/Economy/legmohobpct.lua +++ b/units/Legion/Economy/legmohobpct.lua @@ -9,7 +9,7 @@ return { builddistance = 800, builder = true, canmove = false, - category = "", + category = "OBJECT", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "Box", diff --git a/units/Legion/Economy/legmstor.lua b/units/Legion/Economy/legmstor.lua index 8cbc89d8499..ac064eef0ab 100644 --- a/units/Legion/Economy/legmstor.lua +++ b/units/Legion/Economy/legmstor.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGMSTOR.DDS", buildtime = 2920, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "64 60 64", collisionvolumetype = "Box", diff --git a/units/Legion/Economy/legrampart.lua b/units/Legion/Economy/legrampart.lua index f53a037132d..774fc057229 100644 --- a/units/Legion/Economy/legrampart.lua +++ b/units/Legion/Economy/legrampart.lua @@ -10,7 +10,6 @@ return { buildtime = 36000, canrepeat = false, canmove = true, - category = "ALL NOTLAND NOTSUB WEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "96 86 96", collisionvolumetype = "cylY", diff --git a/units/Legion/Economy/legsolar.lua b/units/Legion/Economy/legsolar.lua index 48adaac14d4..c662f7f6ff6 100644 --- a/units/Legion/Economy/legsolar.lua +++ b/units/Legion/Economy/legsolar.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGSOLAR.DDS", buildtime = 2800, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 -18.0 1.0", collisionvolumescales = "50.0 76.0 50.0", collisionvolumetype = "Ell", diff --git a/units/Legion/Economy/legwin.lua b/units/Legion/Economy/legwin.lua index e39aa793df8..09f4a547f7a 100644 --- a/units/Legion/Economy/legwin.lua +++ b/units/Legion/Economy/legwin.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGWIN.DDS", buildtime = 1680, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "34 89 34", collisionvolumetype = "CylY", diff --git a/units/Legion/Hovercraft/legah.lua b/units/Legion/Hovercraft/legah.lua index 496a6d188ac..b321657f33e 100644 --- a/units/Legion/Hovercraft/legah.lua +++ b/units/Legion/Hovercraft/legah.lua @@ -9,7 +9,6 @@ return { buildpic = "legah.DDS", buildtime = 3300, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "28 12 38", collisionvolumetype = "Box", diff --git a/units/Legion/Hovercraft/legcar.lua b/units/Legion/Hovercraft/legcar.lua index ddd792b3532..ba927539b9e 100644 --- a/units/Legion/Hovercraft/legcar.lua +++ b/units/Legion/Hovercraft/legcar.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGCAR.DDS", buildtime = 11000, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "42 12 42", collisionvolumetype = "Box", diff --git a/units/Legion/Hovercraft/legmh.lua b/units/Legion/Hovercraft/legmh.lua index 3d579b8034e..0c2518ff182 100644 --- a/units/Legion/Hovercraft/legmh.lua +++ b/units/Legion/Hovercraft/legmh.lua @@ -7,7 +7,6 @@ return { buildpic = "legmh.DDS", buildtime = 3300, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "33 18 44", collisionvolumetype = "Box", diff --git a/units/Legion/Hovercraft/legner.lua b/units/Legion/Hovercraft/legner.lua index e50ef9e1e84..5a2543cadd9 100644 --- a/units/Legion/Hovercraft/legner.lua +++ b/units/Legion/Hovercraft/legner.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGNER.DDS", buildtime = 2400, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "34 12 34", collisionvolumetype = "Cyly", diff --git a/units/Legion/Hovercraft/legsh.lua b/units/Legion/Hovercraft/legsh.lua index 712a2e29e61..98657cbabea 100644 --- a/units/Legion/Hovercraft/legsh.lua +++ b/units/Legion/Hovercraft/legsh.lua @@ -7,7 +7,6 @@ return { buildpic = "legsh.DDS", buildtime = 1200, canmove = true, - category = "ALL HOVER MOBILE WEAPON NOTSUB NOTSHIP NOTAIR SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "19 8 25", collisionvolumetype = "Box", diff --git a/units/Legion/Labs/legaap.lua b/units/Legion/Labs/legaap.lua index aaba6bdd60a..a23fe253a18 100644 --- a/units/Legion/Labs/legaap.lua +++ b/units/Legion/Labs/legaap.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGAAP.DDS", buildtime = 20700, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 10 -2", collisionvolumescales = "113 43 89", collisionvolumetype = "Box", diff --git a/units/Legion/Labs/legalab.lua b/units/Legion/Labs/legalab.lua index b31eaa5cd7b..8f322c821be 100644 --- a/units/Legion/Labs/legalab.lua +++ b/units/Legion/Labs/legalab.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGALAB.DDS", buildtime = 16800, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 13 8", collisionvolumescales = "101 51 90", collisionvolumetype = "Box", diff --git a/units/Legion/Labs/legamsub.lua b/units/Legion/Labs/legamsub.lua index 26622bbc995..e64a4f994d5 100644 --- a/units/Legion/Labs/legamsub.lua +++ b/units/Legion/Labs/legamsub.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGAMSUB.DDS", buildtime = 11400, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER UNDERWATER EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "115 36 112", collisionvolumetype = "Box", diff --git a/units/Legion/Labs/legap.lua b/units/Legion/Labs/legap.lua index eee72737265..f49dda35fc6 100644 --- a/units/Legion/Labs/legap.lua +++ b/units/Legion/Labs/legap.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGAP.DDS", buildtime = 7180, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "110 33 90", collisionvolumetype = "Box", diff --git a/units/Legion/Labs/legavp.lua b/units/Legion/Labs/legavp.lua index 86552889a80..5c7dd83626e 100644 --- a/units/Legion/Labs/legavp.lua +++ b/units/Legion/Labs/legavp.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGAVP.DDS", buildtime = 18500, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "1 0 0", collisionvolumescales = "124 70 109", collisionvolumetype = "Box", diff --git a/units/Legion/Labs/legfhp.lua b/units/Legion/Labs/legfhp.lua index 0b8a066834d..ef81235e639 100644 --- a/units/Legion/Labs/legfhp.lua +++ b/units/Legion/Labs/legfhp.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGFHP.DDS", buildtime = 11000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "120 32 106", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/Legion/Labs/leggant.lua b/units/Legion/Labs/leggant.lua index 7a2d61b6eb2..6a6f270fbb6 100644 --- a/units/Legion/Labs/leggant.lua +++ b/units/Legion/Labs/leggant.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGGANT.DDS", buildtime = 67300, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 8", collisionvolumescales = "150 43 150", collisionvolumetype = "CylY", diff --git a/units/Legion/Labs/leghp.lua b/units/Legion/Labs/leghp.lua index 29cf175952d..70bd0e5eade 100644 --- a/units/Legion/Labs/leghp.lua +++ b/units/Legion/Labs/leghp.lua @@ -8,7 +8,6 @@ return { buildpic = "leghp.DDS", buildtime = 11000, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumescales = "120 32 108", collisionvolumetype = "Box", corpse = "DEAD", diff --git a/units/Legion/Labs/legjim.lua b/units/Legion/Labs/legjim.lua index 8fcce5e0ffa..8c31f320d2b 100644 --- a/units/Legion/Labs/legjim.lua +++ b/units/Legion/Labs/legjim.lua @@ -8,7 +8,6 @@ return { buildpic = "legsy.dds", buildtime = 6600, canmove = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "124 59 122", collisionvolumetype = "Box", diff --git a/units/Legion/Labs/leglab.lua b/units/Legion/Labs/leglab.lua index 23206144807..42ba25927e6 100644 --- a/units/Legion/Labs/leglab.lua +++ b/units/Legion/Labs/leglab.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGLAB.DDS", buildtime = 6500, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 5 0", collisionvolumescales = "100 45 100", collisionvolumetype = "CylY", diff --git a/units/Legion/Labs/legvp.lua b/units/Legion/Labs/legvp.lua index a87bcf34b2b..32b58d100e6 100644 --- a/units/Legion/Labs/legvp.lua +++ b/units/Legion/Labs/legvp.lua @@ -9,7 +9,6 @@ return { buildpic = "LEGVP.DDS", buildtime = 7200, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "3 15 2", collisionvolumescales = "101 40 106", collisionvolumetype = "Box", diff --git a/units/Legion/Legion EvoCom/legcomlvl10.lua b/units/Legion/Legion EvoCom/legcomlvl10.lua index 1f4a134cd18..48f0f4b4a14 100644 --- a/units/Legion/Legion EvoCom/legcomlvl10.lua +++ b/units/Legion/Legion EvoCom/legcomlvl10.lua @@ -18,7 +18,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "37 69 37", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl2.lua b/units/Legion/Legion EvoCom/legcomlvl2.lua index 0cefca28c05..6fb737fa9c4 100644 --- a/units/Legion/Legion EvoCom/legcomlvl2.lua +++ b/units/Legion/Legion EvoCom/legcomlvl2.lua @@ -18,7 +18,6 @@ return { canmove = true, capturable = false, capturespeed = 2100, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "31 57 31", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl3.lua b/units/Legion/Legion EvoCom/legcomlvl3.lua index eeec101a2a2..1614e62064a 100644 --- a/units/Legion/Legion EvoCom/legcomlvl3.lua +++ b/units/Legion/Legion EvoCom/legcomlvl3.lua @@ -19,7 +19,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "34 63 34", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl4.lua b/units/Legion/Legion EvoCom/legcomlvl4.lua index b00ce5ea95d..ac1c7bebeb1 100644 --- a/units/Legion/Legion EvoCom/legcomlvl4.lua +++ b/units/Legion/Legion EvoCom/legcomlvl4.lua @@ -19,7 +19,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "37 69 37", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl5.lua b/units/Legion/Legion EvoCom/legcomlvl5.lua index 9bda881919b..dff87ace728 100644 --- a/units/Legion/Legion EvoCom/legcomlvl5.lua +++ b/units/Legion/Legion EvoCom/legcomlvl5.lua @@ -18,7 +18,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "37 69 37", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl6.lua b/units/Legion/Legion EvoCom/legcomlvl6.lua index 02d9735ac49..77cd2445ed0 100644 --- a/units/Legion/Legion EvoCom/legcomlvl6.lua +++ b/units/Legion/Legion EvoCom/legcomlvl6.lua @@ -18,7 +18,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "37 69 37", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl7.lua b/units/Legion/Legion EvoCom/legcomlvl7.lua index 569d39e4114..2e14ef4d2d2 100644 --- a/units/Legion/Legion EvoCom/legcomlvl7.lua +++ b/units/Legion/Legion EvoCom/legcomlvl7.lua @@ -18,7 +18,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "37 69 37", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl8.lua b/units/Legion/Legion EvoCom/legcomlvl8.lua index 071644c807d..54c9798ff2c 100644 --- a/units/Legion/Legion EvoCom/legcomlvl8.lua +++ b/units/Legion/Legion EvoCom/legcomlvl8.lua @@ -18,7 +18,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "37 69 37", collisionvolumetype = "CylY", diff --git a/units/Legion/Legion EvoCom/legcomlvl9.lua b/units/Legion/Legion EvoCom/legcomlvl9.lua index 8f0ad836d6e..9f471df69fa 100644 --- a/units/Legion/Legion EvoCom/legcomlvl9.lua +++ b/units/Legion/Legion EvoCom/legcomlvl9.lua @@ -18,7 +18,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "37 69 37", collisionvolumetype = "CylY", diff --git a/units/Legion/Other/Commanders/legcomecon.lua b/units/Legion/Other/Commanders/legcomecon.lua index 4d17b77d1ea..69230b09621 100644 --- a/units/Legion/Other/Commanders/legcomecon.lua +++ b/units/Legion/Other/Commanders/legcomecon.lua @@ -15,7 +15,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "28 52 28", collisionvolumetype = "CylY", diff --git a/units/Legion/Other/Commanders/legcomoff.lua b/units/Legion/Other/Commanders/legcomoff.lua index f884bf73205..8d8f1dcba29 100644 --- a/units/Legion/Other/Commanders/legcomoff.lua +++ b/units/Legion/Other/Commanders/legcomoff.lua @@ -15,7 +15,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "28 52 28", collisionvolumetype = "CylY", diff --git a/units/Legion/Other/Commanders/legcomt2com.lua b/units/Legion/Other/Commanders/legcomt2com.lua index 8b5e8f839d2..d272a744135 100644 --- a/units/Legion/Other/Commanders/legcomt2com.lua +++ b/units/Legion/Other/Commanders/legcomt2com.lua @@ -15,7 +15,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 4 0", collisionvolumescales = "36 67 36", collisionvolumetype = "CylY", diff --git a/units/Legion/Other/Commanders/legcomt2def.lua b/units/Legion/Other/Commanders/legcomt2def.lua index 7f6e886680f..e09ab038634 100644 --- a/units/Legion/Other/Commanders/legcomt2def.lua +++ b/units/Legion/Other/Commanders/legcomt2def.lua @@ -15,7 +15,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "28 52 28", collisionvolumetype = "CylY", diff --git a/units/Legion/Other/Commanders/legcomt2off.lua b/units/Legion/Other/Commanders/legcomt2off.lua index fa1bc887e8e..d6833f1e1ff 100644 --- a/units/Legion/Other/Commanders/legcomt2off.lua +++ b/units/Legion/Other/Commanders/legcomt2off.lua @@ -15,7 +15,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 3 0", collisionvolumescales = "28 52 28", collisionvolumetype = "CylY", diff --git a/units/Legion/Other/legvision.lua b/units/Legion/Other/legvision.lua index 99f848a7c23..3741e0e69d8 100644 --- a/units/Legion/Other/legvision.lua +++ b/units/Legion/Other/legvision.lua @@ -9,7 +9,6 @@ return { buildpic = "COREYES.DDS", buildtime = 750, canrepeat = false, - category = "ALL", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "20 24 20", collisionvolumetype = "CylY", diff --git a/units/Legion/SeaDefenses/legfhive.lua b/units/Legion/SeaDefenses/legfhive.lua index 9c1ff696683..adef736854f 100644 --- a/units/Legion/SeaDefenses/legfhive.lua +++ b/units/Legion/SeaDefenses/legfhive.lua @@ -9,7 +9,6 @@ return { buildtime = 7500, canrepeat = false, canmove = true, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 0", collisionvolumescales = "44 23 44", collisionvolumetype = "Box", diff --git a/units/Legion/SeaDefenses/legptl.lua b/units/Legion/SeaDefenses/legptl.lua index fe03ccd0ad0..9904291a9a4 100644 --- a/units/Legion/SeaDefenses/legptl.lua +++ b/units/Legion/SeaDefenses/legptl.lua @@ -9,7 +9,6 @@ return { buildpic = "CORTL.DDS", buildtime = 3750, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", explodeas = "mediumBuildingExplosionGeneric", footprintx = 3, diff --git a/units/Legion/SeaDefenses/legtl.lua b/units/Legion/SeaDefenses/legtl.lua index 5a08275a331..0d41b1f32dc 100644 --- a/units/Legion/SeaDefenses/legtl.lua +++ b/units/Legion/SeaDefenses/legtl.lua @@ -9,7 +9,6 @@ return { buildpic = "CORTL.DDS", buildtime = 3750, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", explodeas = "mediumBuildingexplosiongeneric", footprintx = 3, diff --git a/units/Legion/Seaconomy/legfmkr.lua b/units/Legion/Seaconomy/legfmkr.lua index 3c8daeaaa48..9f977e68ba4 100644 --- a/units/Legion/Seaconomy/legfmkr.lua +++ b/units/Legion/Seaconomy/legfmkr.lua @@ -9,7 +9,6 @@ return { buildpic = "CORFMKR.DDS", buildtime = 2680, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", explodeas = "largeBuildingExplosionGeneric", footprintx = 3, footprintz = 3, diff --git a/units/Legion/Seaconomy/legtide.lua b/units/Legion/Seaconomy/legtide.lua index 5cfb711e936..674923355dc 100644 --- a/units/Legion/Seaconomy/legtide.lua +++ b/units/Legion/Seaconomy/legtide.lua @@ -9,7 +9,6 @@ return { buildpic = "CORTIDE.DDS", buildtime = 2100, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "-3 2 -1", collisionvolumescales = "28 30 33", collisionvolumetype = "Box", diff --git a/units/Legion/Ships/leghastatus.lua b/units/Legion/Ships/leghastatus.lua index 95578036db7..43c5586eb6d 100644 --- a/units/Legion/Ships/leghastatus.lua +++ b/units/Legion/Ships/leghastatus.lua @@ -10,7 +10,6 @@ return { buildpic = "leghastatus.DDS", buildtime = 4400, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 1", collisionvolumescales = "26 26 76", collisionvolumetype = "CylZ", diff --git a/units/Legion/Ships/leghastatusalt.lua b/units/Legion/Ships/leghastatusalt.lua index 0cc0baeb38f..7bccc4cf746 100644 --- a/units/Legion/Ships/leghastatusalt.lua +++ b/units/Legion/Ships/leghastatusalt.lua @@ -10,7 +10,6 @@ return { buildpic = "leghastatusalt.DDS", buildtime = 4400, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 1", collisionvolumescales = "26 26 76", collisionvolumetype = "CylZ", diff --git a/units/Legion/Ships/legoptio.lua b/units/Legion/Ships/legoptio.lua index 4cee5416e7c..59c1b6fd235 100644 --- a/units/Legion/Ships/legoptio.lua +++ b/units/Legion/Ships/legoptio.lua @@ -10,7 +10,6 @@ return { buildpic = "legoptio.DDS", buildtime = 10000, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 3", collisionvolumescales = "37 37 74", collisionvolumetype = "CylZ", diff --git a/units/Legion/Ships/legpontus.lua b/units/Legion/Ships/legpontus.lua index a718f00a65f..5d36d89f962 100644 --- a/units/Legion/Ships/legpontus.lua +++ b/units/Legion/Ships/legpontus.lua @@ -10,7 +10,6 @@ return { buildpic = "CORPT.DDS", buildtime = 2900, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 -1", collisionvolumescales = "20 20 60", collisionvolumetype = "box", diff --git a/units/Legion/Ships/legportent.lua b/units/Legion/Ships/legportent.lua index 71ac3854ce3..a72147b129f 100644 --- a/units/Legion/Ships/legportent.lua +++ b/units/Legion/Ships/legportent.lua @@ -9,7 +9,6 @@ return { buildpic = "legportent.DDS", buildtime = 20000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 1", collisionvolumescales = "34 34 82", collisionvolumetype = "CylZ", diff --git a/units/Legion/Ships/legstingray.lua b/units/Legion/Ships/legstingray.lua index 7bcb0e042d3..652a3f5a148 100644 --- a/units/Legion/Ships/legstingray.lua +++ b/units/Legion/Ships/legstingray.lua @@ -9,7 +9,6 @@ return { buildpic = "CORSUB.DDS", buildtime = 6000, canmove = true, - category = "ALL UNDERWATER MOBILE WEAPON NOTLAND NOTAIR NOTHOVER", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "35 17 50", collisionvolumetype = "box", diff --git a/units/Legion/Ships/legtriarius.lua b/units/Legion/Ships/legtriarius.lua index 12fd09ae2be..e37ad0321c0 100644 --- a/units/Legion/Ships/legtriarius.lua +++ b/units/Legion/Ships/legtriarius.lua @@ -9,7 +9,6 @@ return { buildpic = "legtriarius.DDS", buildtime = 11500, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 1", collisionvolumescales = "34 34 82", collisionvolumetype = "CylZ", diff --git a/units/Legion/Ships/legtriariusdrone.lua b/units/Legion/Ships/legtriariusdrone.lua index 7a8c40eace8..8167d23e294 100644 --- a/units/Legion/Ships/legtriariusdrone.lua +++ b/units/Legion/Ships/legtriariusdrone.lua @@ -9,7 +9,6 @@ return { buildpic = "legtriariusdrone.DDS", buildtime = 11500, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 1", collisionvolumescales = "34 34 82", collisionvolumetype = "CylZ", diff --git a/units/Legion/Ships/legtriariusheatray.lua b/units/Legion/Ships/legtriariusheatray.lua index 69290bcdd73..fa7a1c3c291 100644 --- a/units/Legion/Ships/legtriariusheatray.lua +++ b/units/Legion/Ships/legtriariusheatray.lua @@ -9,7 +9,6 @@ return { buildpic = "legtriariusheatray.DDS", buildtime = 11000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -5 1", collisionvolumescales = "34 34 82", collisionvolumetype = "CylZ", diff --git a/units/Legion/Ships/legvelite.lua b/units/Legion/Ships/legvelite.lua index 5f4aaf70c79..54bf62f37f9 100644 --- a/units/Legion/Ships/legvelite.lua +++ b/units/Legion/Ships/legvelite.lua @@ -8,7 +8,6 @@ return { buildpic = "ARMDECADE.DDS", buildtime = 2300, canmove = true, - category = "ALL WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7 -1", collisionvolumescales = "21 25 62", collisionvolumetype = "CylZ", diff --git a/units/Legion/T3/leegmech.lua b/units/Legion/T3/leegmech.lua index 7def3404c61..5744dd744c2 100644 --- a/units/Legion/T3/leegmech.lua +++ b/units/Legion/T3/leegmech.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGMECH.DDS", buildtime = 200000, canmove = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -11 0", collisionvolumescales = "66 86 66", collisionvolumetype = "CylY", diff --git a/units/Legion/T3/legkeres.lua b/units/Legion/T3/legkeres.lua index bc5b1204365..42b27f05c84 100644 --- a/units/Legion/T3/legkeres.lua +++ b/units/Legion/T3/legkeres.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGKERES.DDS", buildtime = 60000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "52 34 64", collisionvolumetype = "Box", diff --git a/units/Legion/T3/legpede.lua b/units/Legion/T3/legpede.lua index 026570d2ed6..ee32189d680 100644 --- a/units/Legion/T3/legpede.lua +++ b/units/Legion/T3/legpede.lua @@ -8,7 +8,6 @@ return { buildtime = 110000, canattack = false, canmove = true, - category = "ALL BOT MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 5 -6", collisionvolumescales = "26 28 144", collisionvolumetype = "Box", diff --git a/units/Legion/Utilities/cornanotc2plat.lua b/units/Legion/Utilities/cornanotc2plat.lua index 8de21b5b9d9..9a9d17e37ae 100644 --- a/units/Legion/Utilities/cornanotc2plat.lua +++ b/units/Legion/Utilities/cornanotc2plat.lua @@ -16,7 +16,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 80 46", collisionvolumetype = "CylY", diff --git a/units/Legion/Utilities/legeyes.lua b/units/Legion/Utilities/legeyes.lua index b13efc97f35..acf324b1721 100644 --- a/units/Legion/Utilities/legeyes.lua +++ b/units/Legion/Utilities/legeyes.lua @@ -9,7 +9,7 @@ return { buildpic = "COREYES.DDS", buildtime = 750, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", + collisionvolumeoffsets = "0 0 0", collisionvolumescales = "20 24 20", collisionvolumetype = "CylY", cloakcost = 10, diff --git a/units/Legion/Utilities/legjam.lua b/units/Legion/Utilities/legjam.lua index be0c4b9c48a..211b3394122 100644 --- a/units/Legion/Utilities/legjam.lua +++ b/units/Legion/Utilities/legjam.lua @@ -10,7 +10,6 @@ return { buildtime = 4570, canattack = false, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "30 84 30", collisionvolumetype = "CylY", diff --git a/units/Legion/Utilities/legnanotc.lua b/units/Legion/Utilities/legnanotc.lua index 5894b6c01af..c927d488b5d 100644 --- a/units/Legion/Utilities/legnanotc.lua +++ b/units/Legion/Utilities/legnanotc.lua @@ -16,7 +16,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 32 31", collisionvolumetype = "CylY", diff --git a/units/Legion/Utilities/legnanotcplat.lua b/units/Legion/Utilities/legnanotcplat.lua index 338f055a955..055da40edae 100644 --- a/units/Legion/Utilities/legnanotcplat.lua +++ b/units/Legion/Utilities/legnanotcplat.lua @@ -16,7 +16,6 @@ return { canrepeat = false, canstop = true, cantbetransported = true, -- transports cannot drop them back into water, reenable once that works - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 50 31", collisionvolumetype = "CylY", diff --git a/units/Legion/Utilities/legnanotct2.lua b/units/Legion/Utilities/legnanotct2.lua index 64a3b31dd71..9d997161ca2 100644 --- a/units/Legion/Utilities/legnanotct2.lua +++ b/units/Legion/Utilities/legnanotct2.lua @@ -16,7 +16,6 @@ return { canrepeat = false, canstop = true, cantbetransported = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 80 46", collisionvolumetype = "CylY", diff --git a/units/Legion/Utilities/legrad.lua b/units/Legion/Utilities/legrad.lua index 2b85f8be474..ab8157d52f1 100644 --- a/units/Legion/Utilities/legrad.lua +++ b/units/Legion/Utilities/legrad.lua @@ -11,7 +11,6 @@ return { canattack = false, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -12 0", collisionvolumescales = "32 99 32", collisionvolumetype = "CylY", diff --git a/units/Legion/Vehicles/T2 Vehicles/legaheattank.lua b/units/Legion/Vehicles/T2 Vehicles/legaheattank.lua index 4a342cfff48..80fd2de673a 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legaheattank.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legaheattank.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGAHEATTANK.DDS", buildtime = 19000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "46 25 46", collisionvolumetype = "CylY", diff --git a/units/Legion/Vehicles/T2 Vehicles/legamcluster.lua b/units/Legion/Vehicles/T2 Vehicles/legamcluster.lua index a8c362992a1..44e02640e5c 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legamcluster.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legamcluster.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGAMCLUSTER.DDS", buildtime = 8000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "36 20 38", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/T2 Vehicles/legaskirmtank.lua b/units/Legion/Vehicles/T2 Vehicles/legaskirmtank.lua index b1de3c9b636..fdc79e65e42 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legaskirmtank.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legaskirmtank.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGASKIRMTANK.DDS", buildtime = 8750, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "30 30 34", ---not respected used collisionvolumes.lua collisionvolumetype = "BOX", diff --git a/units/Legion/Vehicles/T2 Vehicles/legavroc.lua b/units/Legion/Vehicles/T2 Vehicles/legavroc.lua index 2cfab1aa9b0..a6f9bd06bbd 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legavroc.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legavroc.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGAVROC.DDS", buildtime = 15500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "46 30 54", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/T2 Vehicles/legfloat.lua b/units/Legion/Vehicles/T2 Vehicles/legfloat.lua index 73e3e71fbeb..2cf0fbcf3cc 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legfloat.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legfloat.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGFLOAT.DDS", buildtime = 16000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSHIP NOTHOVER NOTAIR NOTSUB SURFACE PHIB EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "40 20 50", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/T2 Vehicles/leginf.lua b/units/Legion/Vehicles/T2 Vehicles/leginf.lua index a1dd5f57fbb..4f2cf223d61 100644 --- a/units/Legion/Vehicles/T2 Vehicles/leginf.lua +++ b/units/Legion/Vehicles/T2 Vehicles/leginf.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGINF.DDS", buildtime = 33000, canmove = true, - category = "ALL WEAPON NOTSUB NOTAIR NOTHOVER SURFACE TANK EMPABLE", collisionvolumeoffsets = "0 -10 0", collisionvolumescales = "47 31 57", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/T2 Vehicles/legmed.lua b/units/Legion/Vehicles/T2 Vehicles/legmed.lua index 7dbce230e7a..ee6c4d89fe5 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legmed.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legmed.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGMED.DDS", buildtime = 22500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -11 -2", collisionvolumescales = "48 48 53", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/T2 Vehicles/legmrv.lua b/units/Legion/Vehicles/T2 Vehicles/legmrv.lua index e1eb556117b..7d37a276aca 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legmrv.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legmrv.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGMRV.DDS", buildtime = 4900, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "34 26 38", collisionvolumetype = "CylZ", diff --git a/units/Legion/Vehicles/T2 Vehicles/legvcarry.lua b/units/Legion/Vehicles/T2 Vehicles/legvcarry.lua index 3b922693d06..25fa9b77796 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legvcarry.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legvcarry.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGVCARRY.DDS", buildtime = 6000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 10 0", collisionvolumescales = "44 38 44", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/legamphtank.lua b/units/Legion/Vehicles/legamphtank.lua index a6603f2a45a..f9c5eb2d6da 100644 --- a/units/Legion/Vehicles/legamphtank.lua +++ b/units/Legion/Vehicles/legamphtank.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGAMPHTANK.DDS", buildtime = 2610, canmove = true, - category = "ALL TANK PHIB WEAPON NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 1", collisionvolumescales = "31 13 31", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/legbar.lua b/units/Legion/Vehicles/legbar.lua index fd393f3e78f..60d90110737 100644 --- a/units/Legion/Vehicles/legbar.lua +++ b/units/Legion/Vehicles/legbar.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGBAR.DDS", buildtime = 4000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "37 15 44", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/leggat.lua b/units/Legion/Vehicles/leggat.lua index 9590ee70409..07647f02571 100644 --- a/units/Legion/Vehicles/leggat.lua +++ b/units/Legion/Vehicles/leggat.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGGAT.DDS", buildtime = 4000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "34 16 40", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/leghades.lua b/units/Legion/Vehicles/leghades.lua index da06dc23739..8e1ae67c72d 100644 --- a/units/Legion/Vehicles/leghades.lua +++ b/units/Legion/Vehicles/leghades.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGHADES.DDS", buildtime = 1600, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "16 10 23", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/leghelios.lua b/units/Legion/Vehicles/leghelios.lua index 0fa28f92bde..e7815c2c06d 100644 --- a/units/Legion/Vehicles/leghelios.lua +++ b/units/Legion/Vehicles/leghelios.lua @@ -7,7 +7,6 @@ return { buildpic = "LEGHELIOS.DDS", buildtime = 2600, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 1", collisionvolumescales = "30 12 28", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/legmlv.lua b/units/Legion/Vehicles/legmlv.lua index 03c7b8d85f4..ee834d72981 100644 --- a/units/Legion/Vehicles/legmlv.lua +++ b/units/Legion/Vehicles/legmlv.lua @@ -16,7 +16,6 @@ return { canreclaim = false, canrepair = false, canrestore = false, - category = "ALL TANK MOBILE NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "19 15 29", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/legrail.lua b/units/Legion/Vehicles/legrail.lua index 3a11fc265ee..bccac9151ef 100644 --- a/units/Legion/Vehicles/legrail.lua +++ b/units/Legion/Vehicles/legrail.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGRAIL.DDS", buildtime = 4000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 7 4", collisionvolumescales = "37 39 40", collisionvolumetype = "Box", diff --git a/units/Legion/Vehicles/legscout.lua b/units/Legion/Vehicles/legscout.lua index e893b2cfcb3..5bb4a995669 100644 --- a/units/Legion/Vehicles/legscout.lua +++ b/units/Legion/Vehicles/legscout.lua @@ -7,7 +7,7 @@ return { buildpic = "LEGSCOUT.DDS", buildtime = 900, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE GROUNDSCOUT EMPABLE", + category = "GROUNDSCOUT", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "14 16 14", collisionvolumetype = "Box", diff --git a/units/Legion/legcom.lua b/units/Legion/legcom.lua index fb666bf4428..5afb3c76267 100644 --- a/units/Legion/legcom.lua +++ b/units/Legion/legcom.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/Scavengers/Air/armfepocht4.lua b/units/Scavengers/Air/armfepocht4.lua index d150a2356b6..be880d77ef5 100644 --- a/units/Scavengers/Air/armfepocht4.lua +++ b/units/Scavengers/Air/armfepocht4.lua @@ -11,7 +11,7 @@ return { buildtime = 250000, canfly = true, canmove = true, - category = "ALL WEAPON NOTSUB VTOL NOTHOVER T4AIR", + category = "T4AIR", collide = true, collisionvolumeoffsets = "0 -14 10", collisionvolumescales = "70 70 170", diff --git a/units/Scavengers/Air/armlichet4.lua b/units/Scavengers/Air/armlichet4.lua index 70c6ad2e884..061c177e942 100644 --- a/units/Scavengers/Air/armlichet4.lua +++ b/units/Scavengers/Air/armlichet4.lua @@ -9,7 +9,7 @@ return { buildtime = 240000, canfly = true, canmove = true, - category = "ALL WEAPON NOTSUB VTOL NOTHOVER", + category = "T4AIR", collide = false, cruisealtitude = 150, explodeas = "hugeexplosiongeneric", diff --git a/units/Scavengers/Air/armminebomber.lua b/units/Scavengers/Air/armminebomber.lua index c9063570c2a..b04000651e5 100644 --- a/units/Scavengers/Air/armminebomber.lua +++ b/units/Scavengers/Air/armminebomber.lua @@ -8,7 +8,6 @@ return { buildtime = 4800, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND NOTSUB VTOL NOTSHIP NOTHOVER", collide = false, cruisealtitude = 165, explodeas = "mediumexplosiongeneric", diff --git a/units/Scavengers/Air/armthundt4.lua b/units/Scavengers/Air/armthundt4.lua index a92a3ffb6ac..a2a6fdfde63 100644 --- a/units/Scavengers/Air/armthundt4.lua +++ b/units/Scavengers/Air/armthundt4.lua @@ -8,7 +8,7 @@ return { buildtime = 150000, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND NOTSUB VTOL NOTSHIP NOTHOVER T4AIR", + category = "T4AIR", collide = false, cruisealtitude = 190, explodeas = "explosiont3xl", diff --git a/units/Scavengers/Air/corcrw.lua b/units/Scavengers/Air/corcrw.lua index 76c7f800382..a9f95b813f8 100644 --- a/units/Scavengers/Air/corcrw.lua +++ b/units/Scavengers/Air/corcrw.lua @@ -11,7 +11,6 @@ return { buildtime = 84200, canfly = true, canmove = true, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER", collide = true, collisionvolumeoffsets = "0 1 0", collisionvolumescales = "64 24 64", diff --git a/units/Scavengers/Air/corcrwt4.lua b/units/Scavengers/Air/corcrwt4.lua index 0b85e735d98..433febe5189 100644 --- a/units/Scavengers/Air/corcrwt4.lua +++ b/units/Scavengers/Air/corcrwt4.lua @@ -11,7 +11,7 @@ return { buildtime = 150000, canfly = true, canmove = true, - category = "ALL WEAPON VTOL NOTSUB NOTHOVER T4AIR", + category = "T4AIR", collide = true, collisionvolumeoffsets = "0 10 0", collisionvolumescales = "80 51 120", diff --git a/units/Scavengers/Air/cordronecarryair.lua b/units/Scavengers/Air/cordronecarryair.lua index 23f0b0c0553..5595c975c41 100644 --- a/units/Scavengers/Air/cordronecarryair.lua +++ b/units/Scavengers/Air/cordronecarryair.lua @@ -12,7 +12,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL NOTLAND MOBILE NOTSUB NOTSHIP VTOL NOTHOVER EMPABLE", collide = true, collisionvolumeoffsets = "-1 5 2", collisionvolumescales = "48 48 136", diff --git a/units/Scavengers/Air/cords.lua b/units/Scavengers/Air/cords.lua index dbac94d2227..0872e848a5f 100644 --- a/units/Scavengers/Air/cords.lua +++ b/units/Scavengers/Air/cords.lua @@ -9,7 +9,6 @@ return { buildtime = 5000, canfly = true, canmove = true, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER", collide = true, cruisealtitude = 165, explodeas = "mediumexplosiongeneric", diff --git a/units/Scavengers/Air/corfblackhyt4.lua b/units/Scavengers/Air/corfblackhyt4.lua index 72a0acff2b5..0778659d496 100644 --- a/units/Scavengers/Air/corfblackhyt4.lua +++ b/units/Scavengers/Air/corfblackhyt4.lua @@ -11,7 +11,7 @@ return { buildtime = 250000, canfly = true, canmove = true, - category = "ALL WEAPON NOTSUB VTOL NOTHOVER T4AIR", + category = "T4AIR", collide = true, collisionvolumeoffsets = "0 -14 10", collisionvolumescales = "70 70 170", diff --git a/units/Scavengers/Boss/armcomboss.lua b/units/Scavengers/Boss/armcomboss.lua index f43069e92ed..07faa027e01 100644 --- a/units/Scavengers/Boss/armcomboss.lua +++ b/units/Scavengers/Boss/armcomboss.lua @@ -17,7 +17,6 @@ return { canmove = true, capturable = false, capturespeed = 6000, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", --cloakcost = 200, --cloakcostmoving = 2000, collisionvolumeoffsets = "0 7 0", diff --git a/units/Scavengers/Boss/armscavengerbossv2.lua b/units/Scavengers/Boss/armscavengerbossv2.lua index 0ddf061c194..d6c6f751da0 100644 --- a/units/Scavengers/Boss/armscavengerbossv2.lua +++ b/units/Scavengers/Boss/armscavengerbossv2.lua @@ -66,7 +66,6 @@ for difficulty, stats in pairs(difficultyParams) do canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 12 0", collisionvolumescales = "111 207 111", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Boss/corcomboss.lua b/units/Scavengers/Boss/corcomboss.lua index a7251ed09ee..ab7d87b9b01 100644 --- a/units/Scavengers/Boss/corcomboss.lua +++ b/units/Scavengers/Boss/corcomboss.lua @@ -17,7 +17,6 @@ return { canmove = true, capturable = false, capturespeed = 6000, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", --cloakcost = 200, --cloakcostmoving = 2000, collisionvolumeoffsets = "0 7 0", diff --git a/units/Scavengers/Boss/scavengerbossv4.lua b/units/Scavengers/Boss/scavengerbossv4.lua index 90df9d282fc..b9404d677fc 100644 --- a/units/Scavengers/Boss/scavengerbossv4.lua +++ b/units/Scavengers/Boss/scavengerbossv4.lua @@ -67,7 +67,6 @@ for difficulty, stats in pairs(difficultyParams) do canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 12 0", collisionvolumescales = "111 207 111", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Bots/armassimilator.lua b/units/Scavengers/Bots/armassimilator.lua index efad0b178b4..88117e7b0af 100644 --- a/units/Scavengers/Bots/armassimilator.lua +++ b/units/Scavengers/Bots/armassimilator.lua @@ -7,7 +7,6 @@ return { buildpic = "ARMASSIMILATOR.DDS", buildtime = 25000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 -2.0 -5", collisionvolumescales = "50.0 60.0 50.0", collisionvolumetype = "box", diff --git a/units/Scavengers/Bots/armlunchbox.lua b/units/Scavengers/Bots/armlunchbox.lua index cda001fa61e..a4b2d2dc74f 100644 --- a/units/Scavengers/Bots/armlunchbox.lua +++ b/units/Scavengers/Bots/armlunchbox.lua @@ -7,7 +7,6 @@ return { buildpic = "ARMLUNCHBOX.DDS", buildtime = 71000, canmove = true, - category = "ALL NOTSUB WEAPON NOTAIR NOTHOVER SURFACE BOT EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "65 60 65", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Bots/armmeatball.lua b/units/Scavengers/Bots/armmeatball.lua index cf19576e2e3..8b6d628cb02 100644 --- a/units/Scavengers/Bots/armmeatball.lua +++ b/units/Scavengers/Bots/armmeatball.lua @@ -7,7 +7,6 @@ return { buildpic = "ARMMEATBALL.DDS", buildtime = 30000, canmove = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -2 -1", collisionvolumescales = "34 68 38", collisionvolumetype = "Box", diff --git a/units/Scavengers/Bots/armpwt4.lua b/units/Scavengers/Bots/armpwt4.lua index 78611bc0b8f..4a8cb58327c 100644 --- a/units/Scavengers/Bots/armpwt4.lua +++ b/units/Scavengers/Bots/armpwt4.lua @@ -7,7 +7,6 @@ return { buildpic = "scavengers/armpwt4.DDS", buildtime = 150000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 -5", collisionvolumescales = "55 80 55", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Bots/armsptkt4.lua b/units/Scavengers/Bots/armsptkt4.lua index c4d598e6480..d98b2b0f300 100644 --- a/units/Scavengers/Bots/armsptkt4.lua +++ b/units/Scavengers/Bots/armsptkt4.lua @@ -7,7 +7,6 @@ return { buildpic = "scavengers/armsptkt4.DDS", buildtime = 75000, canmove = true, - category = "ALL BOT MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "75 50 75", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Bots/corakt4.lua b/units/Scavengers/Bots/corakt4.lua index 6ef6c245dd9..e139cb75872 100644 --- a/units/Scavengers/Bots/corakt4.lua +++ b/units/Scavengers/Bots/corakt4.lua @@ -7,7 +7,6 @@ return { buildpic = "CORAKT4.DDS", buildtime = 120000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -2 -3", collisionvolumescales = "49 56 49", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Bots/cordeadeye.lua b/units/Scavengers/Bots/cordeadeye.lua index 9e5e6107b4e..2cf2c29817f 100644 --- a/units/Scavengers/Bots/cordeadeye.lua +++ b/units/Scavengers/Bots/cordeadeye.lua @@ -7,7 +7,6 @@ return { buildpic = "cordeadeye.DDS", buildtime = 32000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "32 34 30", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Bots/corkarganetht4.lua b/units/Scavengers/Bots/corkarganetht4.lua index cd7bd6be278..169cd78b7fa 100644 --- a/units/Scavengers/Bots/corkarganetht4.lua +++ b/units/Scavengers/Bots/corkarganetht4.lua @@ -7,7 +7,6 @@ return { buildpic = "CORKARGANETHT4.DDS", buildtime = 120000, canmove = true, - category = "BOT WEAPON ALL NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 -2.0 1", collisionvolumescales = "56.0 60.0 40.0", collisionvolumetype = "box", diff --git a/units/Scavengers/Bots/cormandot4.lua b/units/Scavengers/Bots/cormandot4.lua index c31d978a3ed..98503b10319 100644 --- a/units/Scavengers/Bots/cormandot4.lua +++ b/units/Scavengers/Bots/cormandot4.lua @@ -18,7 +18,6 @@ return { canreclaim = true, canrepair = true, canrestore = false, - category = "ALL MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE BOT CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "38 50 22", collisionvolumetype = "box", diff --git a/units/Scavengers/Bots/corthermite.lua b/units/Scavengers/Bots/corthermite.lua index 8fe6350e017..a348a6664b3 100644 --- a/units/Scavengers/Bots/corthermite.lua +++ b/units/Scavengers/Bots/corthermite.lua @@ -7,7 +7,6 @@ return { buildpic = "CORTHERMITE.DDS", buildtime = 18800, canmove = true, - category = "ALL BOT WEAPON NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "80 50 98",--40 26 48 collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/armannit3.lua b/units/Scavengers/Buildings/DefenseOffense/armannit3.lua index c1ea2f6eb37..73481aec80a 100644 --- a/units/Scavengers/Buildings/DefenseOffense/armannit3.lua +++ b/units/Scavengers/Buildings/DefenseOffense/armannit3.lua @@ -9,7 +9,6 @@ return { buildpic = "ARMANNIT3.DDS", buildtime = 190000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 15 0", collisionvolumescales = "81 122 81", collisionvolumetype = "Box", diff --git a/units/Scavengers/Buildings/DefenseOffense/armbotrail.lua b/units/Scavengers/Buildings/DefenseOffense/armbotrail.lua index f0321a15717..caaf0ff3e33 100644 --- a/units/Scavengers/Buildings/DefenseOffense/armbotrail.lua +++ b/units/Scavengers/Buildings/DefenseOffense/armbotrail.lua @@ -8,7 +8,6 @@ return { buildpic = "ARMBOTRAIL.DDS", buildtime = 255000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -20", collisionvolumescales = "48 90 48", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/armlwall.lua b/units/Scavengers/Buildings/DefenseOffense/armlwall.lua index c1135be9c2c..b3bb81c527c 100644 --- a/units/Scavengers/Buildings/DefenseOffense/armlwall.lua +++ b/units/Scavengers/Buildings/DefenseOffense/armlwall.lua @@ -6,7 +6,6 @@ return { buildpic = "ARMLWALL.DDS", buildtime = 14000, --3x armclaw canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "32 50 32", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/armminivulc.lua b/units/Scavengers/Buildings/DefenseOffense/armminivulc.lua index 550cf49724f..85e634f9a6a 100644 --- a/units/Scavengers/Buildings/DefenseOffense/armminivulc.lua +++ b/units/Scavengers/Buildings/DefenseOffense/armminivulc.lua @@ -8,7 +8,6 @@ return { buildpic = "ARMMINIVULC.DDS", buildtime = 65000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "32 64 32", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/cordoomt3.lua b/units/Scavengers/Buildings/DefenseOffense/cordoomt3.lua index 5b29d8215b9..ff7eb13f4f3 100644 --- a/units/Scavengers/Buildings/DefenseOffense/cordoomt3.lua +++ b/units/Scavengers/Buildings/DefenseOffense/cordoomt3.lua @@ -9,7 +9,6 @@ return { buildpic = "CORDOOMT3.DDS", buildtime = 170000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0.0 -7.5 0.0", collisionvolumescales = "72.0 165.0 72.0", collisionvolumetype = "box", diff --git a/units/Scavengers/Buildings/DefenseOffense/corhllllt.lua b/units/Scavengers/Buildings/DefenseOffense/corhllllt.lua index 24cb60aac1c..93976cbecb9 100644 --- a/units/Scavengers/Buildings/DefenseOffense/corhllllt.lua +++ b/units/Scavengers/Buildings/DefenseOffense/corhllllt.lua @@ -9,7 +9,6 @@ return { buildtime = 8800, canrepeat = false, cantbetransported = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0-20 0", collisionvolumescales = "32 160 32", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/corminibuzz.lua b/units/Scavengers/Buildings/DefenseOffense/corminibuzz.lua index bd81345f854..3e9806bde05 100644 --- a/units/Scavengers/Buildings/DefenseOffense/corminibuzz.lua +++ b/units/Scavengers/Buildings/DefenseOffense/corminibuzz.lua @@ -8,7 +8,6 @@ return { buildpic = "CORMINIBUZZ.DDS", buildtime = 65000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "32 64 32", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/cormwall.lua b/units/Scavengers/Buildings/DefenseOffense/cormwall.lua index ad34402e421..eeef2506099 100644 --- a/units/Scavengers/Buildings/DefenseOffense/cormwall.lua +++ b/units/Scavengers/Buildings/DefenseOffense/cormwall.lua @@ -6,7 +6,6 @@ return { buildpic = "CORMWALL.DDS", buildtime = 14000, -- was 12214 canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "32 50 32", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/corscavdrag.lua b/units/Scavengers/Buildings/DefenseOffense/corscavdrag.lua index fbc1cc04fdd..a5b52b48e4c 100644 --- a/units/Scavengers/Buildings/DefenseOffense/corscavdrag.lua +++ b/units/Scavengers/Buildings/DefenseOffense/corscavdrag.lua @@ -10,7 +10,6 @@ return { buildtime = 255, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 22 32", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/corscavdtf.lua b/units/Scavengers/Buildings/DefenseOffense/corscavdtf.lua index b8be626ce57..4d2856df8a6 100644 --- a/units/Scavengers/Buildings/DefenseOffense/corscavdtf.lua +++ b/units/Scavengers/Buildings/DefenseOffense/corscavdtf.lua @@ -7,7 +7,6 @@ return { buildpic = "CORSCAVDTF.DDS", buildtime = 4400, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.25, decoyfor = "scavdrag", diff --git a/units/Scavengers/Buildings/DefenseOffense/corscavdtl.lua b/units/Scavengers/Buildings/DefenseOffense/corscavdtl.lua index 91230fa3880..60a384671ab 100644 --- a/units/Scavengers/Buildings/DefenseOffense/corscavdtl.lua +++ b/units/Scavengers/Buildings/DefenseOffense/corscavdtl.lua @@ -7,7 +7,6 @@ return { buildpic = "CORSCAVDTL.DDS", buildtime = 4600, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -24 0", collisionvolumescales = "30 51 30", collisionvolumetype = "Ell", diff --git a/units/Scavengers/Buildings/DefenseOffense/corscavdtm.lua b/units/Scavengers/Buildings/DefenseOffense/corscavdtm.lua index a3eacd0514b..9f8f9c850c7 100644 --- a/units/Scavengers/Buildings/DefenseOffense/corscavdtm.lua +++ b/units/Scavengers/Buildings/DefenseOffense/corscavdtm.lua @@ -7,7 +7,6 @@ return { buildpic = "CORSCAVDTM.DDS", buildtime = 4400, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.25, decoyfor = "scavdrag", diff --git a/units/Scavengers/Buildings/DefenseOffense/corscavfort.lua b/units/Scavengers/Buildings/DefenseOffense/corscavfort.lua index 292dadef000..0571944ad22 100644 --- a/units/Scavengers/Buildings/DefenseOffense/corscavfort.lua +++ b/units/Scavengers/Buildings/DefenseOffense/corscavfort.lua @@ -11,7 +11,6 @@ return { buildtime = 1000, canattack = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "32 50 32", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/DefenseOffense/legdtf.lua b/units/Scavengers/Buildings/DefenseOffense/legdtf.lua index 0a23f08ba82..a036c50f9b3 100644 --- a/units/Scavengers/Buildings/DefenseOffense/legdtf.lua +++ b/units/Scavengers/Buildings/DefenseOffense/legdtf.lua @@ -7,7 +7,6 @@ return { buildpic = "CORSCAVDTF.DDS", buildtime = 4400, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.33, decoyfor = "scavdrag", diff --git a/units/Scavengers/Buildings/DefenseOffense/legdtl.lua b/units/Scavengers/Buildings/DefenseOffense/legdtl.lua index 67ad9802b74..b6b2921d51c 100644 --- a/units/Scavengers/Buildings/DefenseOffense/legdtl.lua +++ b/units/Scavengers/Buildings/DefenseOffense/legdtl.lua @@ -7,7 +7,6 @@ return { buildpic = "CORSCAVDTL.DDS", buildtime = 4600, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -24 0", collisionvolumescales = "30 51 30", collisionvolumetype = "Ell", diff --git a/units/Scavengers/Buildings/DefenseOffense/legdtm.lua b/units/Scavengers/Buildings/DefenseOffense/legdtm.lua index fe298b5663b..ad6eb089652 100644 --- a/units/Scavengers/Buildings/DefenseOffense/legdtm.lua +++ b/units/Scavengers/Buildings/DefenseOffense/legdtm.lua @@ -7,7 +7,6 @@ return { buildpic = "CORSCAVDTM.DDS", buildtime = 4400, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", corpse = "DEAD", damagemodifier = 0.33, decoyfor = "scavdrag", diff --git a/units/Scavengers/Buildings/DefenseOffense/legministarfall.lua b/units/Scavengers/Buildings/DefenseOffense/legministarfall.lua index 17de60798e2..03d26dd21bb 100644 --- a/units/Scavengers/Buildings/DefenseOffense/legministarfall.lua +++ b/units/Scavengers/Buildings/DefenseOffense/legministarfall.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGSTARFALL.DDS", buildtime = 65000, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "52 65 52", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/Economy/armwint2.lua b/units/Scavengers/Buildings/Economy/armwint2.lua index f6218171907..c4bc01c638a 100644 --- a/units/Scavengers/Buildings/Economy/armwint2.lua +++ b/units/Scavengers/Buildings/Economy/armwint2.lua @@ -8,7 +8,6 @@ return { buildpic = "ARMWINT2.DDS", buildtime = 16000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "68 174 68", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/Economy/corwint2.lua b/units/Scavengers/Buildings/Economy/corwint2.lua index 79c64d9db5f..1924f1abdd7 100644 --- a/units/Scavengers/Buildings/Economy/corwint2.lua +++ b/units/Scavengers/Buildings/Economy/corwint2.lua @@ -8,7 +8,6 @@ return { buildpic = "CORWINT2.DDS", buildtime = 17000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "68 178 68", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/Economy/legwint2.lua b/units/Scavengers/Buildings/Economy/legwint2.lua index 9f890e6b838..7a95ce86f55 100644 --- a/units/Scavengers/Buildings/Economy/legwint2.lua +++ b/units/Scavengers/Buildings/Economy/legwint2.lua @@ -8,7 +8,6 @@ return { buildpic = "LEGWIN.DDS", buildtime = 17000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "68 178 68", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Buildings/Factories/armapt3.lua b/units/Scavengers/Buildings/Factories/armapt3.lua index ae1ae4ab62a..d397b177068 100644 --- a/units/Scavengers/Buildings/Factories/armapt3.lua +++ b/units/Scavengers/Buildings/Factories/armapt3.lua @@ -9,7 +9,6 @@ return { buildpic = "ARMAP.DDS", buildtime = 72400, canmove = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 8 1", collisionvolumescales = "268 98 164", collisionvolumetype = "Box", diff --git a/units/Scavengers/Buildings/Factories/corapt3.lua b/units/Scavengers/Buildings/Factories/corapt3.lua index 32a07da30e8..c30cfe387e8 100644 --- a/units/Scavengers/Buildings/Factories/corapt3.lua +++ b/units/Scavengers/Buildings/Factories/corapt3.lua @@ -8,7 +8,6 @@ return { buildpic = "CORAP.DDS", buildtime = 72400, canmove = true, - category = "ALL NOTLAND NOWEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -14 -23", collisionvolumescales = "220 66 100", collisionvolumetype = "Box", diff --git a/units/Scavengers/Buildings/Utility/scavbeacon_t1.lua b/units/Scavengers/Buildings/Utility/scavbeacon_t1.lua index 0ea6572203d..7d0448fdd86 100644 --- a/units/Scavengers/Buildings/Utility/scavbeacon_t1.lua +++ b/units/Scavengers/Buildings/Utility/scavbeacon_t1.lua @@ -9,7 +9,7 @@ return { metalcost = 500, buildpic = "scavengers/SCAVBEACON.DDS", buildtime = 5000, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", + category = "CANBEUW", canmove = false, canSelfDestruct = false, capturable = true, diff --git a/units/Scavengers/Buildings/Utility/scavbeacon_t2.lua b/units/Scavengers/Buildings/Utility/scavbeacon_t2.lua index f6019d1b8a7..3fa5d62fa0e 100644 --- a/units/Scavengers/Buildings/Utility/scavbeacon_t2.lua +++ b/units/Scavengers/Buildings/Utility/scavbeacon_t2.lua @@ -9,7 +9,7 @@ return { metalcost = 2500, buildpic = "scavengers/SCAVBEACON.DDS", buildtime = 25000, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", + category = "CANBEUW", canmove = false, canSelfDestruct = false, capturable = true, diff --git a/units/Scavengers/Buildings/Utility/scavbeacon_t3.lua b/units/Scavengers/Buildings/Utility/scavbeacon_t3.lua index 446c21ecc4d..657c8a625e1 100644 --- a/units/Scavengers/Buildings/Utility/scavbeacon_t3.lua +++ b/units/Scavengers/Buildings/Utility/scavbeacon_t3.lua @@ -9,7 +9,7 @@ return { metalcost = 5000, buildpic = "scavengers/SCAVBEACON.DDS", buildtime = 50000, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", + category = "CANBEUW", canmove = false, canSelfDestruct = false, capturable = true, diff --git a/units/Scavengers/Buildings/Utility/scavbeacon_t4.lua b/units/Scavengers/Buildings/Utility/scavbeacon_t4.lua index 96e61c3226d..0ce6f40ad3d 100644 --- a/units/Scavengers/Buildings/Utility/scavbeacon_t4.lua +++ b/units/Scavengers/Buildings/Utility/scavbeacon_t4.lua @@ -9,7 +9,7 @@ return { metalcost = 10000, buildpic = "scavengers/SCAVBEACON.DDS", buildtime = 100000, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", + category = "CANBEUW", canmove = false, canSelfDestruct = false, capturable = true, diff --git a/units/Scavengers/Buildings/Utility/scavsafeareabeacon.lua b/units/Scavengers/Buildings/Utility/scavsafeareabeacon.lua index 0bd011ad43b..1d39c614c40 100644 --- a/units/Scavengers/Buildings/Utility/scavsafeareabeacon.lua +++ b/units/Scavengers/Buildings/Utility/scavsafeareabeacon.lua @@ -10,7 +10,6 @@ return { buildtime = 100000, blocking = false, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", cloakcost = 10, explodeas = "scavcomexplosion", footprintx = 5, diff --git a/units/Scavengers/Other/scavempspawner.lua b/units/Scavengers/Other/scavempspawner.lua index 9a14fbfe258..a0680a904b5 100644 --- a/units/Scavengers/Other/scavempspawner.lua +++ b/units/Scavengers/Other/scavempspawner.lua @@ -12,7 +12,6 @@ return { craterboost = 0, cratermult = 0, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/Scavengers/Other/scavengerdroppod.lua b/units/Scavengers/Other/scavengerdroppod.lua index 446d633df6b..54c540cd10b 100644 --- a/units/Scavengers/Other/scavengerdroppod.lua +++ b/units/Scavengers/Other/scavengerdroppod.lua @@ -10,7 +10,6 @@ return { --builder = true, buildpic = "scavengers/scavengerdroppod.DDS", buildtime = 10, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", canmove = false, capturable = false, collisionvolumeoffsets = "0 0 0", diff --git a/units/Scavengers/Other/scavengerdroppodfriendly.lua b/units/Scavengers/Other/scavengerdroppodfriendly.lua index 6f48051b984..fc15a7a3af5 100644 --- a/units/Scavengers/Other/scavengerdroppodfriendly.lua +++ b/units/Scavengers/Other/scavengerdroppodfriendly.lua @@ -11,7 +11,6 @@ return { buildtime = 10, canmove = false, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/Scavengers/Other/scavmists.lua b/units/Scavengers/Other/scavmists.lua index bca8d3a7aee..c58dd2891f7 100644 --- a/units/Scavengers/Other/scavmists.lua +++ b/units/Scavengers/Other/scavmists.lua @@ -84,7 +84,6 @@ for lvl, stats in pairs(lvlParams) do cancloak = true, initcloaked = true, decloakonfire = false, - category = "ALL BOT MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "64 24 64", collisionvolumetype = "CylY", diff --git a/units/Scavengers/Other/scavtacnukespawner.lua b/units/Scavengers/Other/scavtacnukespawner.lua index 0c36f13222b..98ea472d966 100644 --- a/units/Scavengers/Other/scavtacnukespawner.lua +++ b/units/Scavengers/Other/scavtacnukespawner.lua @@ -11,7 +11,6 @@ return { buildpic = "other/nuketest.dds", buildtime = 10, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/Scavengers/Ships/armdecadet3.lua b/units/Scavengers/Ships/armdecadet3.lua index c0c516f1f67..d1dda07fc46 100644 --- a/units/Scavengers/Ships/armdecadet3.lua +++ b/units/Scavengers/Ships/armdecadet3.lua @@ -9,7 +9,6 @@ return { buildpic = "armdecadet3.DDS", buildtime = 90000, canmove = true, - category = "ALL WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -3", collisionvolumescales = "52 52 153", collisionvolumetype = "CylZ", diff --git a/units/Scavengers/Ships/armpshipt3.lua b/units/Scavengers/Ships/armpshipt3.lua index 9b754dad56d..2b86786c1b4 100644 --- a/units/Scavengers/Ships/armpshipt3.lua +++ b/units/Scavengers/Ships/armpshipt3.lua @@ -11,7 +11,6 @@ return { buildpic = "armpshipt3.DDS", buildtime = 70000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "52 52 152", collisionvolumetype = "CylZ", diff --git a/units/Scavengers/Ships/armptt2.lua b/units/Scavengers/Ships/armptt2.lua index b1e04f8e76a..de713805a4b 100644 --- a/units/Scavengers/Ships/armptt2.lua +++ b/units/Scavengers/Ships/armptt2.lua @@ -11,7 +11,6 @@ return { buildpic = "armptt2.DDS", buildtime = 25000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -7.5 0", collisionvolumescales = "60 60 120", collisionvolumetype = "CylZ", diff --git a/units/Scavengers/Ships/armserpt3.lua b/units/Scavengers/Ships/armserpt3.lua index c62d5d3660b..850372eb75d 100644 --- a/units/Scavengers/Ships/armserpt3.lua +++ b/units/Scavengers/Ships/armserpt3.lua @@ -9,7 +9,6 @@ return { buildpic = "armserpt3.DDS", buildtime = 250000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON NOTAIR NOTHOVER CANBEUW SURFACE EMPABLE UNDERWATER", collisionvolumeoffsets = "0 -4 0", collisionvolumescales = "90 38 114", collisionvolumetype = "box", diff --git a/units/Scavengers/Ships/coresuppt3.lua b/units/Scavengers/Ships/coresuppt3.lua index 8a90120d17c..b3fefe23a2f 100644 --- a/units/Scavengers/Ships/coresuppt3.lua +++ b/units/Scavengers/Ships/coresuppt3.lua @@ -9,7 +9,6 @@ return { buildpic = "coresuppt3.DDS", buildtime = 400000, canmove = true, - category = "ALL WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -14 -6", collisionvolumescales = "84 84 246",--"19 19 58", collisionvolumetype = "CylZ", diff --git a/units/Scavengers/Ships/corslrpc.lua b/units/Scavengers/Ships/corslrpc.lua index 8685ee991c8..02ef6d72d35 100644 --- a/units/Scavengers/Ships/corslrpc.lua +++ b/units/Scavengers/Ships/corslrpc.lua @@ -10,7 +10,6 @@ return { buildpic = "corslrpc.DDS", buildtime = 100000, canmove = true, - category = "ALL NOTLAND MOBILE WEAPON SHIP NOTSUB NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -10", collisionvolumescales = "75 75 182", collisionvolumetype = "CylZ", diff --git a/units/Scavengers/Vehicles/armdronecarryland.lua b/units/Scavengers/Vehicles/armdronecarryland.lua index 2ac93c039f9..26e5f51ef4c 100644 --- a/units/Scavengers/Vehicles/armdronecarryland.lua +++ b/units/Scavengers/Vehicles/armdronecarryland.lua @@ -11,7 +11,6 @@ return { canmove = true, canreclaim = false, canrepair = false, - category = "ALL TANK MOBILE NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE T4AIR", collisionvolumeoffsets = "0 25 -3", collisionvolumescales = "48 57 142", collisionvolumetype = "Box", diff --git a/units/Scavengers/Vehicles/armrattet4.lua b/units/Scavengers/Vehicles/armrattet4.lua index 760e6870c16..1714b171b2c 100644 --- a/units/Scavengers/Vehicles/armrattet4.lua +++ b/units/Scavengers/Vehicles/armrattet4.lua @@ -7,7 +7,6 @@ return { buildpic = "scavengers/armrattet4.DDS", buildtime = 250000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 -2", collisionvolumescales = "80 51 98", collisionvolumetype = "Box", diff --git a/units/Scavengers/Vehicles/armvadert4.lua b/units/Scavengers/Vehicles/armvadert4.lua index b5d23dd842e..d5f9ba1d4c7 100644 --- a/units/Scavengers/Vehicles/armvadert4.lua +++ b/units/Scavengers/Vehicles/armvadert4.lua @@ -8,7 +8,6 @@ return { buildpic = "scavengers/armvadert4.DDS", buildtime = 150000, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "91 91 91", collisionvolumetype = "sphere", diff --git a/units/Scavengers/Vehicles/armzapper.lua b/units/Scavengers/Vehicles/armzapper.lua index 7e4a5270e8a..b9b390090d6 100644 --- a/units/Scavengers/Vehicles/armzapper.lua +++ b/units/Scavengers/Vehicles/armzapper.lua @@ -7,7 +7,7 @@ return { buildpic = "armzapper.DDS", buildtime = 1200, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE GROUNDSCOUT EMPABLE", + category = "GROUNDSCOUT", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "21 15 26", collisionvolumetype = "Box", diff --git a/units/Scavengers/Vehicles/corforge.lua b/units/Scavengers/Vehicles/corforge.lua index c97feccfaff..d60ab216323 100644 --- a/units/Scavengers/Vehicles/corforge.lua +++ b/units/Scavengers/Vehicles/corforge.lua @@ -9,7 +9,6 @@ return { builddistance = 136, builder = true, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "36 22 38", collisionvolumetype = "Box", diff --git a/units/Scavengers/Vehicles/corftiger.lua b/units/Scavengers/Vehicles/corftiger.lua index 8ca5d05e670..f7a344c07e1 100644 --- a/units/Scavengers/Vehicles/corftiger.lua +++ b/units/Scavengers/Vehicles/corftiger.lua @@ -7,7 +7,6 @@ return { buildpic = "CORFTIGER.DDS", buildtime = 11500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "34 34 38", collisionvolumetype = "BOX", diff --git a/units/Scavengers/Vehicles/corgatreap.lua b/units/Scavengers/Vehicles/corgatreap.lua index d7ce6aa881c..2f279f3132e 100644 --- a/units/Scavengers/Vehicles/corgatreap.lua +++ b/units/Scavengers/Vehicles/corgatreap.lua @@ -7,7 +7,6 @@ return { buildpic = "CORGATREAP.DDS", buildtime = 14500, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -6 0", collisionvolumescales = "34 34 38", collisionvolumetype = "CylZ", diff --git a/units/Scavengers/Vehicles/corgolt4.lua b/units/Scavengers/Vehicles/corgolt4.lua index 119ce0c3f8e..31959b26006 100644 --- a/units/Scavengers/Vehicles/corgolt4.lua +++ b/units/Scavengers/Vehicles/corgolt4.lua @@ -7,7 +7,6 @@ return { buildpic = "CORGOLT4.DDS", buildtime = 250000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "61 48 67", collisionvolumetype = "Box", diff --git a/units/Scavengers/Vehicles/cortorch.lua b/units/Scavengers/Vehicles/cortorch.lua index 5bd0bec56c6..0d6b84b1296 100644 --- a/units/Scavengers/Vehicles/cortorch.lua +++ b/units/Scavengers/Vehicles/cortorch.lua @@ -8,7 +8,6 @@ return { buildpic = "CORTORCH.DDS", buildtime = 4150, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "30 21 36", collisionvolumetype = "Box", diff --git a/units/armassistdrone.lua b/units/armassistdrone.lua index 69424f57294..b29db4f13d8 100644 --- a/units/armassistdrone.lua +++ b/units/armassistdrone.lua @@ -12,7 +12,6 @@ return { cancapture = true, canfly = true, canmove = true, - category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = true, cruisealtitude = 100, explodeas = "smallexplosiongeneric-builder", diff --git a/units/armassistdrone_land.lua b/units/armassistdrone_land.lua index 846af7d274f..c4cabc2dc68 100644 --- a/units/armassistdrone_land.lua +++ b/units/armassistdrone_land.lua @@ -10,7 +10,6 @@ return { buildtime = 500, cancapture = true, canmove = true, - category = "ALL TANK PHIB NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "17 11 21", collisionvolumetype = "Box", diff --git a/units/armcom.lua b/units/armcom.lua index 9a94b619fe1..c68e4d96b62 100644 --- a/units/armcom.lua +++ b/units/armcom.lua @@ -12,7 +12,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/armcomcon.lua b/units/armcomcon.lua index 50ed36c769a..324fab0b388 100644 --- a/units/armcomcon.lua +++ b/units/armcomcon.lua @@ -12,7 +12,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/corassistdrone.lua b/units/corassistdrone.lua index 7cb7acffd99..960d9c6257e 100644 --- a/units/corassistdrone.lua +++ b/units/corassistdrone.lua @@ -12,7 +12,6 @@ return { cancapture = true, canfly = true, canmove = true, - category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = true, cruisealtitude = 100, explodeas = "smallexplosiongeneric-builder", diff --git a/units/corassistdrone_land.lua b/units/corassistdrone_land.lua index 7f6fdcd03a8..a631755878c 100644 --- a/units/corassistdrone_land.lua +++ b/units/corassistdrone_land.lua @@ -10,7 +10,6 @@ return { buildtime = 500, cancapture = true, canmove = true, - category = "ALL TANK PHIB NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -1 1", collisionvolumescales = "11 8 21", collisionvolumetype = "Box", diff --git a/units/corcom.lua b/units/corcom.lua index 87e5176cac2..a220fe5d400 100644 --- a/units/corcom.lua +++ b/units/corcom.lua @@ -12,7 +12,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/corcomcon.lua b/units/corcomcon.lua index b12d33b87eb..72afac99b26 100644 --- a/units/corcomcon.lua +++ b/units/corcomcon.lua @@ -12,7 +12,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/legassistdrone.lua b/units/legassistdrone.lua index efc35c8cc16..d606b7c382e 100644 --- a/units/legassistdrone.lua +++ b/units/legassistdrone.lua @@ -12,7 +12,6 @@ return { cancapture = true, canfly = true, canmove = true, - category = "ALL MOBILE NOTLAND NOTSUB VTOL NOWEAPON NOTSHIP NOTHOVER", collide = true, cruisealtitude = 100, explodeas = "smallexplosiongeneric-builder", diff --git a/units/legassistdrone_land.lua b/units/legassistdrone_land.lua index ca6ae871f17..2516f1a7728 100644 --- a/units/legassistdrone_land.lua +++ b/units/legassistdrone_land.lua @@ -10,7 +10,6 @@ return { buildtime = 500, cancapture = true, canmove = true, - category = "ALL TANK PHIB NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", collisionvolumeoffsets = "0 -1 1", collisionvolumescales = "11 8 21", collisionvolumetype = "Box", diff --git a/units/other/armrespawn.lua b/units/other/armrespawn.lua index 11f79f42f3e..c896684eaaa 100644 --- a/units/other/armrespawn.lua +++ b/units/other/armrespawn.lua @@ -17,7 +17,6 @@ return { canrepeat = false, canstop = true, cantbetransported = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 50 31", collisionvolumetype = "CylY", diff --git a/units/other/armsat.lua b/units/other/armsat.lua index 36f24361d6f..9fd0b1547ec 100644 --- a/units/other/armsat.lua +++ b/units/other/armsat.lua @@ -11,7 +11,6 @@ return { canfly = true, canmove = true, capturable = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON NOTSHIP NOTHOVER SPACE", collide = false, cruisealtitude = 2700, explodeas = "largeexplosiongeneric", diff --git a/units/other/correspawn.lua b/units/other/correspawn.lua index 2b095c55482..a3635687e48 100644 --- a/units/other/correspawn.lua +++ b/units/other/correspawn.lua @@ -17,7 +17,6 @@ return { canrepeat = false, canstop = true, cantbetransported = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 50 31", collisionvolumetype = "CylY", diff --git a/units/other/corsat.lua b/units/other/corsat.lua index 777974765b0..72b0af7d8f6 100644 --- a/units/other/corsat.lua +++ b/units/other/corsat.lua @@ -11,7 +11,6 @@ return { canfly = true, canmove = true, capturable = false, - category = "ALL NOTLAND MOBILE NOTSUB NOWEAPON NOTSHIP NOTHOVER SPACE", collide = false, cruisealtitude = 2700, explodeas = "largeexplosiongeneric", diff --git a/units/other/critters/critter_ant.lua b/units/other/critters/critter_ant.lua index 0b5870cc483..3e260c779f1 100644 --- a/units/other/critters/critter_ant.lua +++ b/units/other/critters/critter_ant.lua @@ -15,7 +15,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE NOWEAPON NOTAIR NOTSUB", + category = "OBJECT", defaultmissiontype = "Standby", explodeas = "TINYBUG_DEATH", floater = true, diff --git a/units/other/critters/critter_crab.lua b/units/other/critters/critter_crab.lua index dad7bb7f577..2897766b7aa 100644 --- a/units/other/critters/critter_crab.lua +++ b/units/other/critters/critter_crab.lua @@ -15,7 +15,7 @@ return { canstop = "1", cantbetransported = false, capturable = false, - category = "MOBILE NOWEAPON NOTAIR NOTSUB", + category = "OBJECT", defaultmissiontype = "Standby", explodeas = "SMALLBUG_DEATH", footprintx = 1, diff --git a/units/other/critters/critter_duck.lua b/units/other/critters/critter_duck.lua index df2e26b0738..90cf8de2ffd 100644 --- a/units/other/critters/critter_duck.lua +++ b/units/other/critters/critter_duck.lua @@ -15,7 +15,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "MOBILE NOWEAPON NOTAIR NOTSUB", + category = "OBJECT", defaultmissiontype = "Standby", explodeas = "SMALLBUG_DEATH", floater = true, diff --git a/units/other/critters/critter_goldfish.lua b/units/other/critters/critter_goldfish.lua index 48a4729aec7..27d628b4718 100644 --- a/units/other/critters/critter_goldfish.lua +++ b/units/other/critters/critter_goldfish.lua @@ -16,7 +16,7 @@ return { canstop = true, cantbetransported = true, capturable = false, - category = "NOWEAPON MOBILE NOTLAND NOTAIR UNDERWATER", + category = "OBJECT", explodeas = "TINYBUG_DEATH", footprintx = 1, footprintz = 1, diff --git a/units/other/critters/critter_gull.lua b/units/other/critters/critter_gull.lua index 4e01ab701fe..407935dc81f 100644 --- a/units/other/critters/critter_gull.lua +++ b/units/other/critters/critter_gull.lua @@ -17,7 +17,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "MOBILE NOTLAND NOTSUB VTOL NOTSHIP NOTHOVER", + category = "OBJECT", collide = false, collision = false, cruisealtitude = 200, diff --git a/units/other/critters/critter_penguin.lua b/units/other/critters/critter_penguin.lua index d83eddf230b..1cfe00c1c3b 100644 --- a/units/other/critters/critter_penguin.lua +++ b/units/other/critters/critter_penguin.lua @@ -15,7 +15,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "MOBILE WEAPON NOTAIR NOTSUB", + category = "OBJECT", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "8 15 8", collisionvolumetype = "CylY", diff --git a/units/other/critters/critter_penguinbro.lua b/units/other/critters/critter_penguinbro.lua index 183f4ee0782..6570744b320 100644 --- a/units/other/critters/critter_penguinbro.lua +++ b/units/other/critters/critter_penguinbro.lua @@ -15,7 +15,6 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "MOBILE WEAPON NOTAIR NOTSUB", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "15 32 15", collisionvolumetype = "CylY", diff --git a/units/other/critters/critter_penguinking.lua b/units/other/critters/critter_penguinking.lua index 98484b1eb3a..07a02653c87 100644 --- a/units/other/critters/critter_penguinking.lua +++ b/units/other/critters/critter_penguinking.lua @@ -15,7 +15,6 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "MOBILE WEAPON NOTAIR NOTSUB", collisionvolumeoffsets = "0 6 0", collisionvolumescales = "50 107 50", collisionvolumetype = "CylY", diff --git a/units/other/dbg_sphere.lua b/units/other/dbg_sphere.lua index 425003e1d72..cb885507bf8 100644 --- a/units/other/dbg_sphere.lua +++ b/units/other/dbg_sphere.lua @@ -9,7 +9,6 @@ return { buildtime = 5090, canmove = true, capturable = 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/other/dbg_sphere_fullmetal.lua b/units/other/dbg_sphere_fullmetal.lua index b50ad4b0e03..601ce3b8457 100644 --- a/units/other/dbg_sphere_fullmetal.lua +++ b/units/other/dbg_sphere_fullmetal.lua @@ -9,7 +9,6 @@ return { buildtime = 5090, canmove = true, capturable = 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/other/evocom/armcomlvl10.lua b/units/other/evocom/armcomlvl10.lua index 1f23d0d8dfd..dc818f6b18a 100644 --- a/units/other/evocom/armcomlvl10.lua +++ b/units/other/evocom/armcomlvl10.lua @@ -17,7 +17,6 @@ return { canselfrepair = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl2.lua b/units/other/evocom/armcomlvl2.lua index 83b994ad709..39bde971293 100644 --- a/units/other/evocom/armcomlvl2.lua +++ b/units/other/evocom/armcomlvl2.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl3.lua b/units/other/evocom/armcomlvl3.lua index 5f3878c1b90..0c7ba2426e0 100644 --- a/units/other/evocom/armcomlvl3.lua +++ b/units/other/evocom/armcomlvl3.lua @@ -17,7 +17,6 @@ return { canselfrepair = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl4.lua b/units/other/evocom/armcomlvl4.lua index fb06bd4b6e6..03dcff1a3b1 100644 --- a/units/other/evocom/armcomlvl4.lua +++ b/units/other/evocom/armcomlvl4.lua @@ -17,7 +17,6 @@ return { canselfrepair = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl5.lua b/units/other/evocom/armcomlvl5.lua index 7c4f3a62100..e83402009fa 100644 --- a/units/other/evocom/armcomlvl5.lua +++ b/units/other/evocom/armcomlvl5.lua @@ -17,7 +17,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl6.lua b/units/other/evocom/armcomlvl6.lua index f17db5a77ea..e641e073ca9 100644 --- a/units/other/evocom/armcomlvl6.lua +++ b/units/other/evocom/armcomlvl6.lua @@ -17,7 +17,6 @@ return { canselfrepair = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl7.lua b/units/other/evocom/armcomlvl7.lua index 9807e2a8c18..3d93d42b0e2 100644 --- a/units/other/evocom/armcomlvl7.lua +++ b/units/other/evocom/armcomlvl7.lua @@ -17,7 +17,6 @@ return { canselfrepair = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl8.lua b/units/other/evocom/armcomlvl8.lua index f6f3e21544b..03cada9c876 100644 --- a/units/other/evocom/armcomlvl8.lua +++ b/units/other/evocom/armcomlvl8.lua @@ -17,7 +17,6 @@ return { canselfrepair = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/armcomlvl9.lua b/units/other/evocom/armcomlvl9.lua index 104909adbd6..25a26fba47c 100644 --- a/units/other/evocom/armcomlvl9.lua +++ b/units/other/evocom/armcomlvl9.lua @@ -17,7 +17,6 @@ return { canselfrepair = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON NOTSUB COMMANDER NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/babyunits/babyarmvader.lua b/units/other/evocom/babyunits/babyarmvader.lua index 92f6659b78d..cf01bd271a0 100644 --- a/units/other/evocom/babyunits/babyarmvader.lua +++ b/units/other/evocom/babyunits/babyarmvader.lua @@ -11,7 +11,6 @@ return { cancloak = true, repairable = false, canmove = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 0, cloakcostmoving = 0, cloaktimeout = 0, diff --git a/units/other/evocom/comeffigy.lua b/units/other/evocom/comeffigy.lua index e285d7c3c73..e63b24b7f61 100644 --- a/units/other/evocom/comeffigy.lua +++ b/units/other/evocom/comeffigy.lua @@ -46,7 +46,6 @@ for lvl, stats in pairs(lvlParams) do canmove = false, canselfdestruct = false, capturable = false, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 0, cloakcostmoving = 0, cloaktimeout = 0, diff --git a/units/other/evocom/corcomlvl10.lua b/units/other/evocom/corcomlvl10.lua index ab4e41cc11e..d8040e4b4c1 100644 --- a/units/other/evocom/corcomlvl10.lua +++ b/units/other/evocom/corcomlvl10.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl2.lua b/units/other/evocom/corcomlvl2.lua index d9869ef63cb..6983872873c 100644 --- a/units/other/evocom/corcomlvl2.lua +++ b/units/other/evocom/corcomlvl2.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl3.lua b/units/other/evocom/corcomlvl3.lua index 534a68314b4..4959f21e376 100644 --- a/units/other/evocom/corcomlvl3.lua +++ b/units/other/evocom/corcomlvl3.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl4.lua b/units/other/evocom/corcomlvl4.lua index fe718474774..33c7f58fbf2 100644 --- a/units/other/evocom/corcomlvl4.lua +++ b/units/other/evocom/corcomlvl4.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl5.lua b/units/other/evocom/corcomlvl5.lua index c855642bcd1..0ec8b57601f 100644 --- a/units/other/evocom/corcomlvl5.lua +++ b/units/other/evocom/corcomlvl5.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl6.lua b/units/other/evocom/corcomlvl6.lua index 6deb04a6968..c628ae22136 100644 --- a/units/other/evocom/corcomlvl6.lua +++ b/units/other/evocom/corcomlvl6.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl7.lua b/units/other/evocom/corcomlvl7.lua index 68e5ea976e8..2c81bfc49d2 100644 --- a/units/other/evocom/corcomlvl7.lua +++ b/units/other/evocom/corcomlvl7.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl8.lua b/units/other/evocom/corcomlvl8.lua index c98cf676712..125200366ab 100644 --- a/units/other/evocom/corcomlvl8.lua +++ b/units/other/evocom/corcomlvl8.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/evocom/corcomlvl9.lua b/units/other/evocom/corcomlvl9.lua index de99ee17220..178d06879be 100644 --- a/units/other/evocom/corcomlvl9.lua +++ b/units/other/evocom/corcomlvl9.lua @@ -16,7 +16,6 @@ return { canmove = true, capturable = false, capturespeed = 1800, - category = "ALL WEAPON COMMANDER NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE CANBEUW EMPABLE", cloakcost = 100, cloakcostmoving = 1000, collisionvolumeoffsets = "0 3 0", diff --git a/units/other/freefusion.lua b/units/other/freefusion.lua index 623fc1df579..75c89bb5555 100644 --- a/units/other/freefusion.lua +++ b/units/other/freefusion.lua @@ -9,7 +9,6 @@ return { buildpic = "FREEFUSION.DDS", buildtime = 800, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", corpse = "DEAD", energymake = 850, energystorage = 150, diff --git a/units/other/legnanotcbase.lua b/units/other/legnanotcbase.lua index 4e4a743177b..181365598c0 100644 --- a/units/other/legnanotcbase.lua +++ b/units/other/legnanotcbase.lua @@ -17,7 +17,6 @@ return { canrepeat = false, canstop = true, cantbetransported = true, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "31 50 31", collisionvolumetype = "CylY", diff --git a/units/other/lootboxes/lootboxbronze.lua b/units/other/lootboxes/lootboxbronze.lua index 8b407ffe8b9..0d98832d52b 100644 --- a/units/other/lootboxes/lootboxbronze.lua +++ b/units/other/lootboxes/lootboxbronze.lua @@ -18,7 +18,6 @@ return { canstop = false, cantbetransported = false, capturable = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "32 32 32", collisionvolumetype = "box", diff --git a/units/other/lootboxes/lootboxgold.lua b/units/other/lootboxes/lootboxgold.lua index 6444d6666c8..39fb18f8d63 100644 --- a/units/other/lootboxes/lootboxgold.lua +++ b/units/other/lootboxes/lootboxgold.lua @@ -17,7 +17,6 @@ return { canstop = false, cantbetransported = false, capturable = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "64 64 64", collisionvolumetype = "box", diff --git a/units/other/lootboxes/lootboxplatinum.lua b/units/other/lootboxes/lootboxplatinum.lua index f89c5403285..0f3cb2d6259 100644 --- a/units/other/lootboxes/lootboxplatinum.lua +++ b/units/other/lootboxes/lootboxplatinum.lua @@ -17,7 +17,6 @@ return { canstop = false, cantbetransported = false, capturable = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "80 80 80", collisionvolumetype = "box", diff --git a/units/other/lootboxes/lootboxsilver.lua b/units/other/lootboxes/lootboxsilver.lua index 34240aaecad..ca558fbec8e 100644 --- a/units/other/lootboxes/lootboxsilver.lua +++ b/units/other/lootboxes/lootboxsilver.lua @@ -17,7 +17,6 @@ return { canstop = false, cantbetransported = false, capturable = true, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "48 48 48", collisionvolumetype = "box", diff --git a/units/other/lootboxes/lootdroppod_gold.lua b/units/other/lootboxes/lootdroppod_gold.lua index d5cfbd2e8d2..0993e83808f 100644 --- a/units/other/lootboxes/lootdroppod_gold.lua +++ b/units/other/lootboxes/lootdroppod_gold.lua @@ -11,7 +11,6 @@ return { buildtime = 10500, canmove = false, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/other/lootboxes/lootdroppod_printer.lua b/units/other/lootboxes/lootdroppod_printer.lua index 89c4c904633..695b346e074 100644 --- a/units/other/lootboxes/lootdroppod_printer.lua +++ b/units/other/lootboxes/lootdroppod_printer.lua @@ -11,7 +11,6 @@ return { buildtime = 10500, canmove = false, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/other/meteor.lua b/units/other/meteor.lua index 03c76bf87d0..f28a8bb2f2d 100644 --- a/units/other/meteor.lua +++ b/units/other/meteor.lua @@ -10,7 +10,6 @@ return { buildpic = "other/meteor.dds", buildtime = 1, canrepeat = false, - category = "NOTAIR NOTSUB NOTSHIP NOTHOVER ALL SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "56 11 56", collisionvolumetype = "box", diff --git a/units/other/mission_command_tower.lua b/units/other/mission_command_tower.lua index bcf5531154b..2afabd321ec 100644 --- a/units/other/mission_command_tower.lua +++ b/units/other/mission_command_tower.lua @@ -9,7 +9,6 @@ return { buildpic = "MISSION_COMMAND_TOWER.DDS", buildtime = 100000, canrepeat = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE", energymake = 250, energyupkeep = 0, explodeas = "fusionExplosion", diff --git a/units/other/nuketest.lua b/units/other/nuketest.lua index 2303fbc9ff1..0a366007ee2 100644 --- a/units/other/nuketest.lua +++ b/units/other/nuketest.lua @@ -10,7 +10,6 @@ return { buildpic = "other/nuketest.dds", buildtime = 10500, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/other/nuketestcor.lua b/units/other/nuketestcor.lua index a400c29f617..6a2db81c465 100644 --- a/units/other/nuketestcor.lua +++ b/units/other/nuketestcor.lua @@ -10,7 +10,6 @@ return { buildpic = "other/nuketest.dds", buildtime = 10500, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/other/nuketestorg.lua b/units/other/nuketestorg.lua index dac422425d1..48447828444 100644 --- a/units/other/nuketestorg.lua +++ b/units/other/nuketestorg.lua @@ -10,7 +10,6 @@ return { buildpic = "other/nuketest.dds", buildtime = 10500, capturable = false, - category = "ALL NOTLAND NOTSUB NOWEAPON NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "0 0 0", collisionvolumetype = "box", diff --git a/units/other/pbr_cube.lua b/units/other/pbr_cube.lua index 9ba1eceb099..63bc5aa9537 100644 --- a/units/other/pbr_cube.lua +++ b/units/other/pbr_cube.lua @@ -9,7 +9,6 @@ return { buildtime = 5090, canmove = true, capturable = 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/other/raptors/Acid/raptor_air_bomber_acid_t2_v1.lua b/units/other/raptors/Acid/raptor_air_bomber_acid_t2_v1.lua index 34c467d4f96..16cd627b480 100644 --- a/units/other/raptors/Acid/raptor_air_bomber_acid_t2_v1.lua +++ b/units/other/raptors/Acid/raptor_air_bomber_acid_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 14 48", @@ -44,7 +44,7 @@ return { speed = 210.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptoracidbomber.s3o", radardistance = 500, script = "Raptors/raptorf2.cob", diff --git a/units/other/raptors/Acid/raptor_allterrain_arty_acid_t2_v1.lua b/units/other/raptors/Acid/raptor_allterrain_arty_acid_t2_v1.lua index 04a6860e929..c0ccd6c346c 100644 --- a/units/other/raptors/Acid/raptor_allterrain_arty_acid_t2_v1.lua +++ b/units/other/raptors/Acid/raptor_allterrain_arty_acid_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "25 34 44", collisionvolumetype = "box", @@ -33,7 +33,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_acid_v2.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Acid/raptor_allterrain_arty_acid_t4_v1.lua b/units/other/raptors/Acid/raptor_allterrain_arty_acid_t4_v1.lua index a0cdca489fc..6909955293e 100644 --- a/units/other/raptors/Acid/raptor_allterrain_arty_acid_t4_v1.lua +++ b/units/other/raptors/Acid/raptor_allterrain_arty_acid_t4_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "60 34 80", collisionvolumetype = "box", @@ -33,7 +33,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_meteor_v2_acid.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Acid/raptor_allterrain_assault_acid_t2_v1.lua b/units/other/raptors/Acid/raptor_allterrain_assault_acid_t2_v1.lua index b9a03aa4877..5f9d67abac0 100644 --- a/units/other/raptors/Acid/raptor_allterrain_assault_acid_t2_v1.lua +++ b/units/other/raptors/Acid/raptor_allterrain_assault_acid_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "27 38 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptoracidallterrainassault.s3o", script = "Raptors/raptorallterraina1.cob", seismicsignature = 0, @@ -119,7 +119,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "acidspit", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Acid/raptor_allterrain_swarmer_acid_t2_v1.lua b/units/other/raptors/Acid/raptor_allterrain_swarmer_acid_t2_v1.lua index ba27a61c39a..cc7ba40f97d 100644 --- a/units/other/raptors/Acid/raptor_allterrain_swarmer_acid_t2_v1.lua +++ b/units/other/raptors/Acid/raptor_allterrain_swarmer_acid_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 28 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 15, movementclass = "RAPTORALLTERRAINHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptoracidallterrain.s3o", script = "Raptors/raptorc3.cob", seismicsignature = 0, diff --git a/units/other/raptors/Acid/raptor_land_assault_acid_t2_v1.lua b/units/other/raptors/Acid/raptor_land_assault_acid_t2_v1.lua index 6a82e36e43f..051dac2034b 100644 --- a/units/other/raptors/Acid/raptor_land_assault_acid_t2_v1.lua +++ b/units/other/raptors/Acid/raptor_land_assault_acid_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "27 48 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptoracidassault.s3o", script = "Raptors/raptora1.cob", seismicsignature = 0, @@ -119,7 +119,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "acidspit", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Acid/raptor_land_swarmer_acids_t2_v1.lua b/units/other/raptors/Acid/raptor_land_swarmer_acids_t2_v1.lua index bc2265349f1..272fa8eeac8 100644 --- a/units/other/raptors/Acid/raptor_land_swarmer_acids_t2_v1.lua +++ b/units/other/raptors/Acid/raptor_land_swarmer_acids_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptoracidswarmer.s3o", script = "Raptors/raptor1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Arty/raptor_allterrain_arty_basic_t2_v1.lua b/units/other/raptors/Arty/raptor_allterrain_arty_basic_t2_v1.lua index 378c6cb5961..912933b90a3 100644 --- a/units/other/raptors/Arty/raptor_allterrain_arty_basic_t2_v1.lua +++ b/units/other/raptors/Arty/raptor_allterrain_arty_basic_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "25 34 44", collisionvolumetype = "box", @@ -33,7 +33,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_v2.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Arty/raptor_allterrain_arty_basic_t4_v1.lua b/units/other/raptors/Arty/raptor_allterrain_arty_basic_t4_v1.lua index 179805f3532..72fd275072e 100644 --- a/units/other/raptors/Arty/raptor_allterrain_arty_basic_t4_v1.lua +++ b/units/other/raptors/Arty/raptor_allterrain_arty_basic_t4_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "120 80 120", collisionvolumetest = 1, @@ -34,7 +34,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIG2HOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_meteor_v2.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Arty/raptorartillery.lua b/units/other/raptors/Arty/raptorartillery.lua index ba031cd73e8..da8bc413e6b 100644 --- a/units/other/raptors/Arty/raptorartillery.lua +++ b/units/other/raptors/Arty/raptorartillery.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "25 34 44", collisionvolumetype = "box", diff --git a/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v1.lua b/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v1.lua index 03d05bb9436..f6e899e9182 100644 --- a/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v1.lua +++ b/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v1.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 10 2", collisionvolumescales = "37 55 90", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIG2HOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorapexallterrainassault.s3o", script = "Raptors/raptorapexallterraina.cob", seismicsignature = 0, @@ -156,7 +156,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v2.lua b/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v2.lua index ee5002fda6a..4468dcfc01d 100644 --- a/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v2.lua +++ b/units/other/raptors/Assault/Advanced/AllTerrain/raptor_allterrain_assault_basic_t4_v2.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 10 2", collisionvolumescales = "37 55 90", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIG2HOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorapexallterrainassaultb.s3o", script = "Raptors/raptorapexallterraina.cob", seismicsignature = 0, @@ -156,7 +156,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v1.lua b/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v1.lua index 741c6772857..35226806e1d 100644 --- a/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v1.lua +++ b/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v1.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -10 2", collisionvolumescales = "37 75 90", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORBIG2HOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptora2.s3o", script = "Raptors/raptora2.cob", seismicsignature = 0, @@ -156,7 +156,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v2.lua b/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v2.lua index 3480a6f6a67..8d7685a1492 100644 --- a/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v2.lua +++ b/units/other/raptors/Assault/Advanced/raptor_land_assault_basic_t4_v2.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 10 2", collisionvolumescales = "37 65 90", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORBIG2HOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptora2b.s3o", onlytargetcategory2 = "VTOL", script = "Raptors/raptora2b.cob", @@ -157,7 +157,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v1.lua b/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v1.lua index 5260432bd2a..2adec462c95 100644 --- a/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v1.lua +++ b/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "27 38 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorallterraina1.s3o", script = "Raptors/raptorallterraina1.cob", seismicsignature = 0, @@ -158,7 +158,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v2.lua b/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v2.lua index 67538bb4072..6e4b09ac85b 100644 --- a/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v2.lua +++ b/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v2.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "27 38 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorallterraina1b.s3o", script = "Raptors/raptorallterraina1.cob", seismicsignature = 0, @@ -155,7 +155,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v3.lua b/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v3.lua index 05932281baf..2347a080a93 100644 --- a/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v3.lua +++ b/units/other/raptors/Assault/AllTerrain/raptor_allterrain_assault_basic_t2_v3.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "27 38 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorallterraina1c.s3o", script = "Raptors/raptorallterraina1.cob", seismicsignature = 0, @@ -155,7 +155,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/raptor_land_assault_basic_t2_v1.lua b/units/other/raptors/Assault/raptor_land_assault_basic_t2_v1.lua index 734e9ac9b75..cb4a8aa8f01 100644 --- a/units/other/raptors/Assault/raptor_land_assault_basic_t2_v1.lua +++ b/units/other/raptors/Assault/raptor_land_assault_basic_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "27 48 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptora.s3o", script = "Raptors/raptora1.cob", seismicsignature = 0, @@ -157,7 +157,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/raptor_land_assault_basic_t2_v2.lua b/units/other/raptors/Assault/raptor_land_assault_basic_t2_v2.lua index 2535378322a..a13de77a0c4 100644 --- a/units/other/raptors/Assault/raptor_land_assault_basic_t2_v2.lua +++ b/units/other/raptors/Assault/raptor_land_assault_basic_t2_v2.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "27 48 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorab.s3o", script = "Raptors/raptora1b.cob", seismicsignature = 0, @@ -154,7 +154,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Assault/raptor_land_assault_basic_t2_v3.lua b/units/other/raptors/Assault/raptor_land_assault_basic_t2_v3.lua index f9cd45ec36e..e11701aebd6 100644 --- a/units/other/raptors/Assault/raptor_land_assault_basic_t2_v3.lua +++ b/units/other/raptors/Assault/raptor_land_assault_basic_t2_v3.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -5 0", collisionvolumescales = "27 48 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorac.s3o", script = "Raptors/raptora1c.cob", seismicsignature = 0, @@ -154,7 +154,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Bomber/raptor_air_bomber_basic_t1_v1.lua b/units/other/raptors/Bomber/raptor_air_bomber_basic_t1_v1.lua index f4b4b14af59..4bec5dcf95a 100644 --- a/units/other/raptors/Bomber/raptor_air_bomber_basic_t1_v1.lua +++ b/units/other/raptors/Bomber/raptor_air_bomber_basic_t1_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "35 35 35", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1_mini.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v1.lua b/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v1.lua index 872913e8172..e1b17b290bd 100644 --- a/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v1.lua +++ b/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v2.lua b/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v2.lua index 0a07f819e8a..a75fe474f3a 100644 --- a/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v2.lua +++ b/units/other/raptors/Bomber/raptor_air_bomber_basic_t2_v2.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "65 65 65", @@ -44,7 +44,7 @@ return { speed = 180.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1b.s3o", script = "Raptors/raptorf1b.cob", seismicsignature = 0, diff --git a/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v1.lua b/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v1.lua index 826bfd85104..2838a892d9a 100644 --- a/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v1.lua +++ b/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1apex.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v2.lua b/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v2.lua index ea944f2b765..7d842dd3979 100644 --- a/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v2.lua +++ b/units/other/raptors/Bomber/raptor_air_bomber_basic_t4_v2.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 180.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1apexb.s3o", script = "Raptors/raptorf1b.cob", seismicsignature = 0, diff --git a/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v2.lua b/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v2.lua index fecd1eaa588..e421d1e5010 100644 --- a/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v2.lua +++ b/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v2.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorbroodbomber.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v3.lua b/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v3.lua index 57627683d86..bd86698e41e 100644 --- a/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v3.lua +++ b/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v3.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorbroodbomber.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v4.lua b/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v4.lua index 1e3d5a61208..628e48ac7c4 100644 --- a/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v4.lua +++ b/units/other/raptors/Brood/raptor_air_bomber_brood_t4_v4.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorbroodbomber.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Brood/raptor_allterrain_arty_brood_t2_v1.lua b/units/other/raptors/Brood/raptor_allterrain_arty_brood_t2_v1.lua index 01905dafb9e..005db91a8e4 100644 --- a/units/other/raptors/Brood/raptor_allterrain_arty_brood_t2_v1.lua +++ b/units/other/raptors/Brood/raptor_allterrain_arty_brood_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "25 34 44", collisionvolumetype = "box", @@ -33,7 +33,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_brood_small.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Brood/raptor_allterrain_arty_brood_t4_v1.lua b/units/other/raptors/Brood/raptor_allterrain_arty_brood_t4_v1.lua index 5a48bddcc61..97175550c4f 100644 --- a/units/other/raptors/Brood/raptor_allterrain_arty_brood_t4_v1.lua +++ b/units/other/raptors/Brood/raptor_allterrain_arty_brood_t4_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "120 80 120", collisionvolumetest = 1, @@ -34,7 +34,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIG2HOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_brood_big.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Brood/raptor_land_swarmer_brood_t2_v1.lua b/units/other/raptors/Brood/raptor_land_swarmer_brood_t2_v1.lua index 39115e17151..4c5529f1981 100644 --- a/units/other/raptors/Brood/raptor_land_swarmer_brood_t2_v1.lua +++ b/units/other/raptors/Brood/raptor_land_swarmer_brood_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "13 20 22", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/s_raptor_white.s3o", script = "Raptors/raptorh4.cob", selfdestructas = "BUG_DEATH", diff --git a/units/other/raptors/Brood/raptor_land_swarmer_brood_t3_v1.lua b/units/other/raptors/Brood/raptor_land_swarmer_brood_t3_v1.lua index 2244721b041..b7d9096ec08 100644 --- a/units/other/raptors/Brood/raptor_land_swarmer_brood_t3_v1.lua +++ b/units/other/raptors/Brood/raptor_land_swarmer_brood_t3_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "30 38 60", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/s_raptorboss2_white.s3o", script = "Raptors/raptorh3.cob", selfdestructas = "BUG_DEATH", diff --git a/units/other/raptors/Brood/raptor_land_swarmer_brood_t4_v1.lua b/units/other/raptors/Brood/raptor_land_swarmer_brood_t4_v1.lua index 40abe331734..9b2670c0764 100644 --- a/units/other/raptors/Brood/raptor_land_swarmer_brood_t4_v1.lua +++ b/units/other/raptors/Brood/raptor_land_swarmer_brood_t4_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 0 2", collisionvolumescales = "37 70 90", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/s_raptorboss_white.s3o", script = "Raptors/raptorh2.cob", selfdestructas = "BUG_DEATH", diff --git a/units/other/raptors/Electric/raptor_air_bomber_emp_t2_v1.lua b/units/other/raptors/Electric/raptor_air_bomber_emp_t2_v1.lua index 8294b356b89..a9b16ab1322 100644 --- a/units/other/raptors/Electric/raptor_air_bomber_emp_t2_v1.lua +++ b/units/other/raptors/Electric/raptor_air_bomber_emp_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "75 75 75", @@ -44,7 +44,7 @@ return { speed = 210.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorebomber1.s3o", radardistance = 500, script = "Raptors/raptorf2.cob", diff --git a/units/other/raptors/Electric/raptor_allterrain_arty_emp_t2_v1.lua b/units/other/raptors/Electric/raptor_allterrain_arty_emp_t2_v1.lua index 4b6b9e6e488..63923876a5d 100644 --- a/units/other/raptors/Electric/raptor_allterrain_arty_emp_t2_v1.lua +++ b/units/other/raptors/Electric/raptor_allterrain_arty_emp_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "50 35 50", collisionvolumetype = "box", @@ -33,7 +33,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_electric_v2.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Electric/raptor_allterrain_arty_emp_t4_v1.lua b/units/other/raptors/Electric/raptor_allterrain_arty_emp_t4_v1.lua index c3dc669e30c..102fe54e36a 100644 --- a/units/other/raptors/Electric/raptor_allterrain_arty_emp_t4_v1.lua +++ b/units/other/raptors/Electric/raptor_allterrain_arty_emp_t4_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 1 0", collisionvolumescales = "25 34 44", collisionvolumetype = "box", @@ -33,7 +33,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_artillery_meteor_v2_electric.s3o", script = "Raptors/raptor_artillery_v2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Electric/raptor_allterrain_assault_emp_t2_v1.lua b/units/other/raptors/Electric/raptor_allterrain_assault_emp_t2_v1.lua index 04f5b54850e..354b3da4fb6 100644 --- a/units/other/raptors/Electric/raptor_allterrain_assault_emp_t2_v1.lua +++ b/units/other/raptors/Electric/raptor_allterrain_assault_emp_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "27 38 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORALLTERRAINBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorelectricallterrainassault.s3o", script = "Raptors/raptorallterraina1.cob", seismicsignature = 0, @@ -122,7 +122,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "raptorparalyzerbig", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Electric/raptor_allterrain_swarmer_emp_t2_v1.lua b/units/other/raptors/Electric/raptor_allterrain_swarmer_emp_t2_v1.lua index b93a2603fac..3f2ff65b67b 100644 --- a/units/other/raptors/Electric/raptor_allterrain_swarmer_emp_t2_v1.lua +++ b/units/other/raptors/Electric/raptor_allterrain_swarmer_emp_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 28 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 15, movementclass = "RAPTORALLTERRAINHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorelectricallterrain.s3o", script = "Raptors/raptorc3.cob", seismicsignature = 0, diff --git a/units/other/raptors/Electric/raptor_land_assault_emp_t2_v1.lua b/units/other/raptors/Electric/raptor_land_assault_emp_t2_v1.lua index c7f659af1c3..9b1ac706342 100644 --- a/units/other/raptors/Electric/raptor_land_assault_emp_t2_v1.lua +++ b/units/other/raptors/Electric/raptor_land_assault_emp_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "27 38 60", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptore2.s3o", script = "Raptors/raptora1.cob", seismicsignature = 0, @@ -122,7 +122,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "raptorparalyzerbig", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Electric/raptor_land_kamikaze_emp_t2_v1.lua b/units/other/raptors/Electric/raptor_land_kamikaze_emp_t2_v1.lua index 79db9c71122..67c79be12a7 100644 --- a/units/other/raptors/Electric/raptor_land_kamikaze_emp_t2_v1.lua +++ b/units/other/raptors/Electric/raptor_land_kamikaze_emp_t2_v1.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "10 14 22", @@ -37,7 +37,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE HOVER", + nochasecategory = "VTOL HOVER", objectname = "Raptors/raptor_dodo_electric.s3o", script = "Raptors/raptor_dodo1.cob", seismicsignature = 2, diff --git a/units/other/raptors/Electric/raptor_land_kamikaze_emp_t4_v1.lua b/units/other/raptors/Electric/raptor_land_kamikaze_emp_t4_v1.lua index 6617abf256f..9adcf443b40 100644 --- a/units/other/raptors/Electric/raptor_land_kamikaze_emp_t4_v1.lua +++ b/units/other/raptors/Electric/raptor_land_kamikaze_emp_t4_v1.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "18 35 41", @@ -37,7 +37,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE HOVER", + nochasecategory = "VTOL HOVER", objectname = "Raptors/raptor_dodo2_electric.s3o", script = "Raptors/raptor_dodo2.cob", seismicsignature = 4, diff --git a/units/other/raptors/Electric/raptor_land_swarmer_emp_t2_v1.lua b/units/other/raptors/Electric/raptor_land_swarmer_emp_t2_v1.lua index 2ef15f906b3..000461e43bc 100644 --- a/units/other/raptors/Electric/raptor_land_swarmer_emp_t2_v1.lua +++ b/units/other/raptors/Electric/raptor_land_swarmer_emp_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptore1.s3o", script = "Raptors/raptor1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Fighter/raptor_air_fighter_basic_t1_v1.lua b/units/other/raptors/Fighter/raptor_air_fighter_basic_t1_v1.lua index 07d2a5e08b6..99349df5896 100644 --- a/units/other/raptors/Fighter/raptor_air_fighter_basic_t1_v1.lua +++ b/units/other/raptors/Fighter/raptor_air_fighter_basic_t1_v1.lua @@ -20,7 +20,7 @@ return { canstop = true, cansubmerge = false, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "58 58 58", @@ -46,7 +46,7 @@ return { speed = 360.0, moverate1 = "32", noautofire = false, - nochasecategory = "NOTAIR SPACE", + nochasecategory = "NOTAIR", objectname = "Raptors/raptorw1_mini.s3o", script = "Raptors/raptorw1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v1.lua b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v1.lua index 8cd1b43fa3b..610b3758513 100644 --- a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v1.lua +++ b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v1.lua @@ -20,7 +20,7 @@ return { canstop = true, cansubmerge = false, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "58 58 58", @@ -46,7 +46,7 @@ return { speed = 360.0, moverate1 = "32", noautofire = false, - nochasecategory = "NOTAIR SPACE", + nochasecategory = "NOTAIR", objectname = "Raptors/raptor_pidgeon.s3o", script = "Raptors/raptorw1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v2.lua b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v2.lua index 5167d2b908a..770bca07ee0 100644 --- a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v2.lua +++ b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v2.lua @@ -20,7 +20,7 @@ return { canstop = true, cansubmerge = false, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "58 58 58", @@ -46,7 +46,7 @@ return { speed = 360.0, moverate1 = "32", noautofire = false, - nochasecategory = "NOTAIR SPACE", + nochasecategory = "NOTAIR", objectname = "Raptors/raptor_pidgeonb.s3o", script = "Raptors/raptorw1b.cob", seismicsignature = 0, diff --git a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v3.lua b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v3.lua index 47db2c20078..31bca205718 100644 --- a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v3.lua +++ b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v3.lua @@ -20,7 +20,7 @@ return { canstop = true, cansubmerge = false, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "58 58 58", @@ -46,7 +46,7 @@ return { speed = 360.0, moverate1 = "32", noautofire = false, - nochasecategory = "NOTAIR SPACE", + nochasecategory = "NOTAIR", objectname = "Raptors/raptor_pidgeonc.s3o", script = "Raptors/raptorw1c.cob", seismicsignature = 0, diff --git a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v4.lua b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v4.lua index a815863600f..800952d7f63 100644 --- a/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v4.lua +++ b/units/other/raptors/Fighter/raptor_air_fighter_basic_t2_v4.lua @@ -20,7 +20,7 @@ return { canstop = true, cansubmerge = false, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "22 22 22", @@ -46,7 +46,7 @@ return { speed = 360.0, moverate1 = "32", noautofire = false, - nochasecategory = "NOTAIR SPACE", + nochasecategory = "NOTAIR", objectname = "Raptors/raptor_pidgeond.s3o", script = "Raptors/raptorw1d.cob", seismicsignature = 0, diff --git a/units/other/raptors/Fighter/raptor_air_fighter_basic_t4_v1.lua b/units/other/raptors/Fighter/raptor_air_fighter_basic_t4_v1.lua index b2352c13ae6..8c81d416027 100644 --- a/units/other/raptors/Fighter/raptor_air_fighter_basic_t4_v1.lua +++ b/units/other/raptors/Fighter/raptor_air_fighter_basic_t4_v1.lua @@ -21,7 +21,7 @@ return { canstop = true, cansubmerge = false, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "58 58 58", @@ -45,7 +45,7 @@ return { speed = 450.0, moverate1 = "32", noautofire = false, - nochasecategory = "NOTAIR SPACE", + nochasecategory = "NOTAIR", objectname = "Raptors/raptor_crow.s3o", script = "Raptors/raptorw2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Flamer/raptor_allterrain_swarmer_fire_t2_v1.lua b/units/other/raptors/Flamer/raptor_allterrain_swarmer_fire_t2_v1.lua index 85c8456da25..b328e5292e2 100644 --- a/units/other/raptors/Flamer/raptor_allterrain_swarmer_fire_t2_v1.lua +++ b/units/other/raptors/Flamer/raptor_allterrain_swarmer_fire_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 28 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 15, movementclass = "RAPTORALLTERRAINHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorpyroallterrain.s3o", script = "Raptors/raptorpyroallterrain.cob", seismicsignature = 0, diff --git a/units/other/raptors/Flamer/raptor_land_swarmer_fire_t2_v1.lua b/units/other/raptors/Flamer/raptor_land_swarmer_fire_t2_v1.lua index ad9fb738564..5a20c44c5b7 100644 --- a/units/other/raptors/Flamer/raptor_land_swarmer_fire_t2_v1.lua +++ b/units/other/raptors/Flamer/raptor_land_swarmer_fire_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -2 0", collisionvolumescales = "25 31 44", collisionvolumetype = "box", @@ -30,7 +30,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorp2.s3o", script = "Raptors/raptorr2.cob", seismicsignature = 0, @@ -140,13 +140,13 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "CHASEWEAPON", maindir = "0 0 1", onlytargetcategory = "NOTAIR", }, [2] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "FLAMER", maindir = "0 0 1", maxangledif = 270, diff --git a/units/other/raptors/Flamer/raptor_land_swarmer_fire_t4_v1.lua b/units/other/raptors/Flamer/raptor_land_swarmer_fire_t4_v1.lua index a4cf766be3e..1c5800d7901 100644 --- a/units/other/raptors/Flamer/raptor_land_swarmer_fire_t4_v1.lua +++ b/units/other/raptors/Flamer/raptor_land_swarmer_fire_t4_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 2 0", collisionvolumescales = "40 48 70", collisionvolumetype = "box", @@ -30,7 +30,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_listener.s3o", script = "Raptors/raptorp1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Healer/raptor_land_swarmer_heal_t1_v1.lua b/units/other/raptors/Healer/raptor_land_swarmer_heal_t1_v1.lua index 12f6f8cb93c..a24d8406b5b 100644 --- a/units/other/raptors/Healer/raptor_land_swarmer_heal_t1_v1.lua +++ b/units/other/raptors/Healer/raptor_land_swarmer_heal_t1_v1.lua @@ -19,7 +19,7 @@ return { canreclaim = 0, canstop = 1, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "10 14 22", diff --git a/units/other/raptors/Healer/raptor_land_swarmer_heal_t2_v1.lua b/units/other/raptors/Healer/raptor_land_swarmer_heal_t2_v1.lua index 21c3fd1276f..ebdde408744 100644 --- a/units/other/raptors/Healer/raptor_land_swarmer_heal_t2_v1.lua +++ b/units/other/raptors/Healer/raptor_land_swarmer_heal_t2_v1.lua @@ -19,7 +19,7 @@ return { canreclaim = 0, canstop = 1, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "10 14 22", diff --git a/units/other/raptors/Healer/raptor_land_swarmer_heal_t3_v1.lua b/units/other/raptors/Healer/raptor_land_swarmer_heal_t3_v1.lua index f284f1921f0..76317f892f5 100644 --- a/units/other/raptors/Healer/raptor_land_swarmer_heal_t3_v1.lua +++ b/units/other/raptors/Healer/raptor_land_swarmer_heal_t3_v1.lua @@ -19,7 +19,7 @@ return { canreclaim = 0, canstop = 1, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "10 14 22", diff --git a/units/other/raptors/Healer/raptor_land_swarmer_heal_t4_v1.lua b/units/other/raptors/Healer/raptor_land_swarmer_heal_t4_v1.lua index 029b58434ea..86c0691d844 100644 --- a/units/other/raptors/Healer/raptor_land_swarmer_heal_t4_v1.lua +++ b/units/other/raptors/Healer/raptor_land_swarmer_heal_t4_v1.lua @@ -19,7 +19,7 @@ return { canreclaim = 0, canstop = 1, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "10 14 22", diff --git a/units/other/raptors/Healer/raptorh1b.lua b/units/other/raptors/Healer/raptorh1b.lua index 2e4cae2ad1a..14b1d16b390 100644 --- a/units/other/raptors/Healer/raptorh1b.lua +++ b/units/other/raptors/Healer/raptorh1b.lua @@ -19,7 +19,7 @@ return { canreclaim = 1, canstop = 1, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "15 18 22", diff --git a/units/other/raptors/Kamikaze/raptor_air_kamikaze_basic_t2_v1.lua b/units/other/raptors/Kamikaze/raptor_air_kamikaze_basic_t2_v1.lua index c23892b492f..f6cc3459e3d 100644 --- a/units/other/raptors/Kamikaze/raptor_air_kamikaze_basic_t2_v1.lua +++ b/units/other/raptors/Kamikaze/raptor_air_kamikaze_basic_t2_v1.lua @@ -18,7 +18,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 8 -2", collisionvolumescales = "35 7 24", @@ -43,7 +43,7 @@ return { speed = 450.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_dodo_air.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t2_v1.lua b/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t2_v1.lua index faca6096868..ad0020b6aec 100644 --- a/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t2_v1.lua +++ b/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t2_v1.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "10 14 22", @@ -37,7 +37,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE HOVER", + nochasecategory = "VTOL HOVER", objectname = "Raptors/raptor_dodo.s3o", script = "Raptors/raptor_dodo1.cob", seismicsignature = 2, diff --git a/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t4_v1.lua b/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t4_v1.lua index 6c1826100b4..77644fb909e 100644 --- a/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t4_v1.lua +++ b/units/other/raptors/Kamikaze/raptor_land_kamikaze_basic_t4_v1.lua @@ -15,7 +15,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collide = 0, collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "18 35 41", @@ -37,7 +37,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE HOVER", + nochasecategory = "VTOL HOVER", objectname = "Raptors/big_raptor_dodo.s3o", script = "Raptors/raptor_dodo2.cob", seismicsignature = 4, diff --git a/units/other/raptors/Miniqueen/raptor_matriarch_acid.lua b/units/other/raptors/Miniqueen/raptor_matriarch_acid.lua index 0d126d9000e..9086fc48157 100644 --- a/units/other/raptors/Miniqueen/raptor_matriarch_acid.lua +++ b/units/other/raptors/Miniqueen/raptor_matriarch_acid.lua @@ -16,7 +16,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 -30 23", collisionvolumescales = "60 113 105", @@ -35,7 +35,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_miniqueen_acid.s3o", script = "Raptors/raptor_miniqueen.cob", seismicsignature = 0, diff --git a/units/other/raptors/Miniqueen/raptor_matriarch_basic.lua b/units/other/raptors/Miniqueen/raptor_matriarch_basic.lua index 6fc79414cbf..94f51eb232f 100644 --- a/units/other/raptors/Miniqueen/raptor_matriarch_basic.lua +++ b/units/other/raptors/Miniqueen/raptor_matriarch_basic.lua @@ -19,7 +19,7 @@ return { canreclaim = 0, cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 -30 23", collisionvolumescales = "60 113 105", @@ -38,7 +38,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_miniqueen_basic.s3o", script = "Raptors/raptor_miniqueen.cob", seismicsignature = 0, diff --git a/units/other/raptors/Miniqueen/raptor_matriarch_electric.lua b/units/other/raptors/Miniqueen/raptor_matriarch_electric.lua index 6a97ff8c661..636ea0cf6ca 100644 --- a/units/other/raptors/Miniqueen/raptor_matriarch_electric.lua +++ b/units/other/raptors/Miniqueen/raptor_matriarch_electric.lua @@ -16,7 +16,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 -30 23", collisionvolumescales = "60 113 105", @@ -35,7 +35,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_miniqueen_electric.s3o", script = "Raptors/raptor_miniqueen.cob", seismicsignature = 0, diff --git a/units/other/raptors/Miniqueen/raptor_matriarch_fire.lua b/units/other/raptors/Miniqueen/raptor_matriarch_fire.lua index 8cd230f8464..9ba50a5c883 100644 --- a/units/other/raptors/Miniqueen/raptor_matriarch_fire.lua +++ b/units/other/raptors/Miniqueen/raptor_matriarch_fire.lua @@ -19,7 +19,7 @@ return { canreclaim = 0, cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 -30 23", collisionvolumescales = "60 113 105", @@ -38,7 +38,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_miniqueen_fire.s3o", script = "Raptors/raptor_miniqueen.cob", seismicsignature = 0, @@ -169,7 +169,6 @@ return { def = "flamethrowerspike", maindir = "0 0 1", maxangledif = 155, - badtargetcategory = "SPACE", }, [2] = { badtargetcategory = "NOTAIR", @@ -186,7 +185,6 @@ return { [5] = { def = "flamethrowermain", maxangledif = 180, - badtargetcategory = "SPACE", }, }, }, diff --git a/units/other/raptors/Miniqueen/raptor_matriarch_healer.lua b/units/other/raptors/Miniqueen/raptor_matriarch_healer.lua index 8a37941f87d..0f7609a6ab1 100644 --- a/units/other/raptors/Miniqueen/raptor_matriarch_healer.lua +++ b/units/other/raptors/Miniqueen/raptor_matriarch_healer.lua @@ -19,7 +19,7 @@ return { canreclaim = 0, cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 -30 23", collisionvolumescales = "60 113 105", @@ -38,7 +38,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_miniqueen_healer.s3o", repairable = false, script = "Raptors/raptor_miniqueen.cob", diff --git a/units/other/raptors/Miniqueen/raptor_matriarch_spectre.lua b/units/other/raptors/Miniqueen/raptor_matriarch_spectre.lua index 3a1ea4ac171..70d8644f010 100644 --- a/units/other/raptors/Miniqueen/raptor_matriarch_spectre.lua +++ b/units/other/raptors/Miniqueen/raptor_matriarch_spectre.lua @@ -20,7 +20,7 @@ return { cantbetransported = true, capturable = false, cancloak = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", cloakcost = 0, cloakcostmoving = 0, collisionspherescale = 1.75, @@ -43,7 +43,7 @@ return { mincloakdistance = 200, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_miniqueen_spectre.s3o", script = "Raptors/raptor_miniqueen.cob", seismicsignature = 0, diff --git a/units/other/raptors/Overseer/raptorh5.lua b/units/other/raptors/Overseer/raptorh5.lua index 7add33a99b8..16a6a82138c 100644 --- a/units/other/raptors/Overseer/raptorh5.lua +++ b/units/other/raptors/Overseer/raptorh5.lua @@ -18,7 +18,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -10 2", collisionvolumescales = "37 75 90", collisionvolumetype = "box", @@ -38,7 +38,7 @@ return { movementclass = "RAPTORSMALLHOVER", nanocolor = "0.7 0.15 0.15", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/brain_bug.s3o", script = "Raptors/raptorh5.cob", selfdestructas = "ROOST_DEATH", diff --git a/units/other/raptors/Queens/raptor_queen_easy.lua b/units/other/raptors/Queens/raptor_queen_easy.lua index 7aa0f29fdd3..d4edd307056 100644 --- a/units/other/raptors/Queens/raptor_queen_easy.lua +++ b/units/other/raptors/Queens/raptor_queen_easy.lua @@ -22,7 +22,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 30 15", collisionvolumescales = "110 180 190", @@ -41,7 +41,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/epic_raptorq.s3o", script = "Raptors/epic_raptorq.cob", seismicsignature = 0, diff --git a/units/other/raptors/Queens/raptor_queen_epic.lua b/units/other/raptors/Queens/raptor_queen_epic.lua index 9dc3216018f..b8174bc41bb 100644 --- a/units/other/raptors/Queens/raptor_queen_epic.lua +++ b/units/other/raptors/Queens/raptor_queen_epic.lua @@ -22,7 +22,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 30 15", collisionvolumescales = "110 180 190", @@ -41,7 +41,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/epic_raptorq.s3o", script = "Raptors/epic_raptorq.cob", seismicsignature = 0, diff --git a/units/other/raptors/Queens/raptor_queen_hard.lua b/units/other/raptors/Queens/raptor_queen_hard.lua index ff4dec5e406..346b1fd0c09 100644 --- a/units/other/raptors/Queens/raptor_queen_hard.lua +++ b/units/other/raptors/Queens/raptor_queen_hard.lua @@ -22,7 +22,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 30 15", collisionvolumescales = "110 180 190", @@ -41,7 +41,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/epic_raptorq.s3o", script = "Raptors/epic_raptorq.cob", seismicsignature = 0, diff --git a/units/other/raptors/Queens/raptor_queen_normal.lua b/units/other/raptors/Queens/raptor_queen_normal.lua index 787273d1c79..95af33e6847 100644 --- a/units/other/raptors/Queens/raptor_queen_normal.lua +++ b/units/other/raptors/Queens/raptor_queen_normal.lua @@ -22,7 +22,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 30 15", collisionvolumescales = "110 180 190", @@ -41,7 +41,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/epic_raptorq.s3o", script = "Raptors/epic_raptorq.cob", seismicsignature = 0, diff --git a/units/other/raptors/Queens/raptor_queen_veryeasy.lua b/units/other/raptors/Queens/raptor_queen_veryeasy.lua index 0c2ede3cdcf..0ded6b64999 100644 --- a/units/other/raptors/Queens/raptor_queen_veryeasy.lua +++ b/units/other/raptors/Queens/raptor_queen_veryeasy.lua @@ -21,7 +21,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 30 15", collisionvolumescales = "110 180 190", @@ -40,7 +40,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/epic_raptorq.s3o", script = "Raptors/epic_raptorq.cob", seismicsignature = 0, diff --git a/units/other/raptors/Queens/raptor_queen_veryhard.lua b/units/other/raptors/Queens/raptor_queen_veryhard.lua index acfe272cff6..abbb4f53e1b 100644 --- a/units/other/raptors/Queens/raptor_queen_veryhard.lua +++ b/units/other/raptors/Queens/raptor_queen_veryhard.lua @@ -22,7 +22,7 @@ return { canstop = "1", cantbetransported = true, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionspherescale = 1.75, collisionvolumeoffsets = "0 30 15", collisionvolumescales = "110 180 190", @@ -41,7 +41,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORQUEENHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/epic_raptorq.s3o", script = "Raptors/epic_raptorq.cob", seismicsignature = 0, diff --git a/units/other/raptors/Scout/raptor_air_scout_basic_t2_v1.lua b/units/other/raptors/Scout/raptor_air_scout_basic_t2_v1.lua index 65636d88a43..74ece4d7934 100644 --- a/units/other/raptors/Scout/raptor_air_scout_basic_t2_v1.lua +++ b/units/other/raptors/Scout/raptor_air_scout_basic_t2_v1.lua @@ -18,7 +18,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 8 -2", collisionvolumescales = "70 70 70", @@ -43,7 +43,7 @@ return { speed = 450.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorairscout1.s3o", radardistance = 1000, script = "Raptors/raptorairscout.cob", diff --git a/units/other/raptors/Scout/raptor_air_scout_basic_t3_v1.lua b/units/other/raptors/Scout/raptor_air_scout_basic_t3_v1.lua index 2b719faf5ab..5ee37522b55 100644 --- a/units/other/raptors/Scout/raptor_air_scout_basic_t3_v1.lua +++ b/units/other/raptors/Scout/raptor_air_scout_basic_t3_v1.lua @@ -18,7 +18,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 8 -2", collisionvolumescales = "70 70 70", @@ -43,7 +43,7 @@ return { speed = 525.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorairscout2.s3o", radardistance = 2000, script = "Raptors/raptorairscout.cob", diff --git a/units/other/raptors/Scout/raptor_air_scout_basic_t4_v1.lua b/units/other/raptors/Scout/raptor_air_scout_basic_t4_v1.lua index b86a04cfdf4..5473ec64ee4 100644 --- a/units/other/raptors/Scout/raptor_air_scout_basic_t4_v1.lua +++ b/units/other/raptors/Scout/raptor_air_scout_basic_t4_v1.lua @@ -18,7 +18,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = false, collisionvolumeoffsets = "0 8 -2", collisionvolumescales = "70 70 70", @@ -43,7 +43,7 @@ return { speed = 600.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorairscout3.s3o", radardistance = 3000, script = "Raptors/raptorairscout.cob", diff --git a/units/other/raptors/Spectre/raptor_land_assault_spectre_t2_v1.lua b/units/other/raptors/Spectre/raptor_land_assault_spectre_t2_v1.lua index 243094c2cef..b0f93420ff6 100644 --- a/units/other/raptors/Spectre/raptor_land_assault_spectre_t2_v1.lua +++ b/units/other/raptors/Spectre/raptor_land_assault_spectre_t2_v1.lua @@ -15,7 +15,7 @@ return { canstop = "1", capturable = false, cancloak = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", cloakcost = 0, cloakcostmoving = 0, collisionvolumeoffsets = "0 -10 0", @@ -36,7 +36,7 @@ return { mincloakdistance = 50, movementclass = "RAPTORBIGHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptora_spectre.s3o", script = "Raptors/raptora1.cob", seismicsignature = 3, @@ -163,7 +163,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Spectre/raptor_land_assault_spectre_t4_v1.lua b/units/other/raptors/Spectre/raptor_land_assault_spectre_t4_v1.lua index 54c1aef0f69..5e706213148 100644 --- a/units/other/raptors/Spectre/raptor_land_assault_spectre_t4_v1.lua +++ b/units/other/raptors/Spectre/raptor_land_assault_spectre_t4_v1.lua @@ -16,7 +16,7 @@ return { canstop = "1", capturable = false, cancloak = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", cloakcost = 0, cloakcostmoving = 0, collisionvolumeoffsets = "0 0 2", @@ -37,7 +37,7 @@ return { mincloakdistance = 50, movementclass = "RAPTORBIG2HOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptora2_spectre.s3o", script = "Raptors/raptora2.cob", seismicsignature = 4, @@ -161,7 +161,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/Spectre/raptor_land_spiker_spectre_t4_v1.lua b/units/other/raptors/Spectre/raptor_land_spiker_spectre_t4_v1.lua index a8ef32aa714..fd6848a74aa 100644 --- a/units/other/raptors/Spectre/raptor_land_spiker_spectre_t4_v1.lua +++ b/units/other/raptors/Spectre/raptor_land_spiker_spectre_t4_v1.lua @@ -15,7 +15,7 @@ return { canstop = "1", capturable = false, cancloak = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", cloakcost = 0, cloakcostmoving = 0, collisionvolumeoffsets = "0 -1 0", @@ -39,7 +39,7 @@ return { mincloakdistance = 50, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptors2_spectre.s3o", script = "Raptors/raptors2.cob", seismicsignature = 2, @@ -118,7 +118,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 180, diff --git a/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t3_v1.lua b/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t3_v1.lua index 8b637a4c71b..0c93e1f2da8 100644 --- a/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t3_v1.lua +++ b/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t3_v1.lua @@ -15,7 +15,7 @@ return { canstop = "1", capturable = false, cancloak = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", cloakcost = 0, cloakcostmoving = 0, collisionvolumeoffsets = "0 -3 -3", @@ -37,7 +37,7 @@ return { mincloakdistance = 50, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor1x_spectre.s3o", script = "Raptors/raptor1x.cob", seismicsignature = 2, diff --git a/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t4_v1.lua b/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t4_v1.lua index 16fee08d75f..05858c12d1a 100644 --- a/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t4_v1.lua +++ b/units/other/raptors/Spectre/raptor_land_swarmer_spectre_t4_v1.lua @@ -14,7 +14,7 @@ return { canstop = "1", capturable = false, cancloak = true, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", cloakcost = 0, cloakcostmoving = 0, collisionvolumeoffsets = "0 -1 0", @@ -36,7 +36,7 @@ return { mincloakdistance = 50, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor2_spectre.s3o", script = "Raptors/raptor2.cob", seismicsignature = 2, diff --git a/units/other/raptors/Spiker/raptor_land_spiker_basic_t2_v1.lua b/units/other/raptors/Spiker/raptor_land_spiker_basic_t2_v1.lua index 099cfe00349..7b4cbf823f2 100644 --- a/units/other/raptors/Spiker/raptor_land_spiker_basic_t2_v1.lua +++ b/units/other/raptors/Spiker/raptor_land_spiker_basic_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 0", collisionvolumescales = "21 30 46", collisionvolumetype = "box", @@ -34,7 +34,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptors.s3o", script = "Raptors/raptors1.cob", seismicsignature = 0, @@ -112,7 +112,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 180, diff --git a/units/other/raptors/Spiker/raptor_land_spiker_basic_t4_v1.lua b/units/other/raptors/Spiker/raptor_land_spiker_basic_t4_v1.lua index eaa87dc3d70..d4f11f0a559 100644 --- a/units/other/raptors/Spiker/raptor_land_spiker_basic_t4_v1.lua +++ b/units/other/raptors/Spiker/raptor_land_spiker_basic_t4_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", cloakable = 1, cloakcost = 0, cloakcostmoving = 0, @@ -39,7 +39,7 @@ return { mincloakdistance = 200, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptors2.s3o", script = "Raptors/raptors2.cob", seismicsignature = 0, @@ -117,7 +117,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 180, diff --git a/units/other/raptors/Structures/raptor_antinuke.lua b/units/other/raptors/Structures/raptor_antinuke.lua index 2dbfa601ca2..f855fce3ac1 100644 --- a/units/other/raptors/Structures/raptor_antinuke.lua +++ b/units/other/raptors/Structures/raptor_antinuke.lua @@ -9,7 +9,7 @@ return { buildtime = 60000, canattack = false, canrepeat = false, - category = "ALL NOTLAND WEAPON NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE EMPABLE", + category = "SURFACE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "1 1 1", collisionvolumetype = "Box", diff --git a/units/other/raptors/Structures/raptor_hive.lua b/units/other/raptors/Structures/raptor_hive.lua index 022d26d132d..478b471285d 100644 --- a/units/other/raptors/Structures/raptor_hive.lua +++ b/units/other/raptors/Structures/raptor_hive.lua @@ -11,7 +11,7 @@ return { buildpic = "raptors/raptor_hive.DDS", buildtime = 10500, capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "84 150 84", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_acid_t2_v1.lua b/units/other/raptors/Structures/raptor_turret_acid_t2_v1.lua index 412a87d9381..37844ecd011 100644 --- a/units/other/raptors/Structures/raptor_turret_acid_t2_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_acid_t2_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "20 50 20", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_acid_t3_v1.lua b/units/other/raptors/Structures/raptor_turret_acid_t3_v1.lua index b2f01a926bf..82a1e67b21a 100644 --- a/units/other/raptors/Structures/raptor_turret_acid_t3_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_acid_t3_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_acid_t4_v1.lua b/units/other/raptors/Structures/raptor_turret_acid_t4_v1.lua index 257605fdb20..6456b4ea49c 100644 --- a/units/other/raptors/Structures/raptor_turret_acid_t4_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_acid_t4_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_antiair_t2_v1.lua b/units/other/raptors/Structures/raptor_turret_antiair_t2_v1.lua index f620ba08a03..15ea8fad6fe 100644 --- a/units/other/raptors/Structures/raptor_turret_antiair_t2_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_antiair_t2_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "20 50 20", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_antiair_t3_v1.lua b/units/other/raptors/Structures/raptor_turret_antiair_t3_v1.lua index 88ea0e821e5..fcbf0ad61f0 100644 --- a/units/other/raptors/Structures/raptor_turret_antiair_t3_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_antiair_t3_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_antiair_t4_v1.lua b/units/other/raptors/Structures/raptor_turret_antiair_t4_v1.lua index 7985c8b47bb..ca48d02af8d 100644 --- a/units/other/raptors/Structures/raptor_turret_antiair_t4_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_antiair_t4_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "80 50 80", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_antinuke_t2_v1.lua b/units/other/raptors/Structures/raptor_turret_antinuke_t2_v1.lua index 55b7cb6eec1..16b90ad8e07 100644 --- a/units/other/raptors/Structures/raptor_turret_antinuke_t2_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_antinuke_t2_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "20 50 20", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_antinuke_t3_v1.lua b/units/other/raptors/Structures/raptor_turret_antinuke_t3_v1.lua index 681f0db7605..9c5f00be101 100644 --- a/units/other/raptors/Structures/raptor_turret_antinuke_t3_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_antinuke_t3_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_basic_t2_v1.lua b/units/other/raptors/Structures/raptor_turret_basic_t2_v1.lua index 145c18dbc07..b5059807c7d 100644 --- a/units/other/raptors/Structures/raptor_turret_basic_t2_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_basic_t2_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "20 50 20", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_basic_t3_v1.lua b/units/other/raptors/Structures/raptor_turret_basic_t3_v1.lua index 982604b5db7..01b3a9a07be 100644 --- a/units/other/raptors/Structures/raptor_turret_basic_t3_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_basic_t3_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_basic_t4_v1.lua b/units/other/raptors/Structures/raptor_turret_basic_t4_v1.lua index 2b50c1e9b74..6942ae82333 100644 --- a/units/other/raptors/Structures/raptor_turret_basic_t4_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_basic_t4_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_burrow_t2_v1.lua b/units/other/raptors/Structures/raptor_turret_burrow_t2_v1.lua index 563a878ded0..8086d30b6e2 100644 --- a/units/other/raptors/Structures/raptor_turret_burrow_t2_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_burrow_t2_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "20 50 20", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_emp_t2_v1.lua b/units/other/raptors/Structures/raptor_turret_emp_t2_v1.lua index eb00ed0f228..bc5b2a617ef 100644 --- a/units/other/raptors/Structures/raptor_turret_emp_t2_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_emp_t2_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "20 50 20", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_emp_t3_v1.lua b/units/other/raptors/Structures/raptor_turret_emp_t3_v1.lua index cefe8da012b..999b501b918 100644 --- a/units/other/raptors/Structures/raptor_turret_emp_t3_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_emp_t3_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_emp_t4_v1.lua b/units/other/raptors/Structures/raptor_turret_emp_t4_v1.lua index d98d834df09..d8dc370bd6b 100644 --- a/units/other/raptors/Structures/raptor_turret_emp_t4_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_emp_t4_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "40 50 40", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_turret_meteor_t4_v1.lua b/units/other/raptors/Structures/raptor_turret_meteor_t4_v1.lua index 8fe136f4670..09515dac0fa 100644 --- a/units/other/raptors/Structures/raptor_turret_meteor_t4_v1.lua +++ b/units/other/raptors/Structures/raptor_turret_meteor_t4_v1.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -15 0", collisionvolumescales = "80 50 80", collisionvolumetype = "box", diff --git a/units/other/raptors/Structures/raptor_worm_green.lua b/units/other/raptors/Structures/raptor_worm_green.lua index 8256e664b12..c9e50f8fb23 100644 --- a/units/other/raptors/Structures/raptor_worm_green.lua +++ b/units/other/raptors/Structures/raptor_worm_green.lua @@ -15,7 +15,7 @@ return { canrestore = false, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 15 0", collisionvolumescales = "35 50 35", collisionvolumetype = "box", diff --git a/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v1.lua b/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v1.lua index 6356bc8a76c..08935d4127e 100644 --- a/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v1.lua +++ b/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "20 40 44", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor2.s3o", script = "Raptors/raptor2.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v2.lua b/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v2.lua index f386d5f1f14..5412b2b1723 100644 --- a/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v2.lua +++ b/units/other/raptors/Swarmer/Advanced/raptor_land_swarmer_basic_t4_v2.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -1 0", collisionvolumescales = "25 40 70", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor2b.s3o", script = "Raptors/raptor2b.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/AllTerrain/raptor_6legged_l.lua b/units/other/raptors/Swarmer/AllTerrain/raptor_6legged_l.lua index 9d40b59093b..937370d3e08 100644 --- a/units/other/raptors/Swarmer/AllTerrain/raptor_6legged_l.lua +++ b/units/other/raptors/Swarmer/AllTerrain/raptor_6legged_l.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 28 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 15, movementclass = "RAPTORALLTERRAINHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_6legged_l.s3o", script = "Raptors/raptor_6legged_l.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t2_v1.lua b/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t2_v1.lua index d9b16008533..2726f0a2e72 100644 --- a/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t2_v1.lua +++ b/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t2_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 28 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 15, movementclass = "RAPTORALLTERRAINHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorc3.s3o", script = "Raptors/raptorc3.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t3_v1.lua b/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t3_v1.lua index 975e198a2d0..a90f95d0952 100644 --- a/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t3_v1.lua +++ b/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t3_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 28 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 15, movementclass = "RAPTORALLTERRAINHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorc3b.s3o", script = "Raptors/raptorc3b.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t4_v1.lua b/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t4_v1.lua index 3e25dd8d2d3..da33b358e0e 100644 --- a/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t4_v1.lua +++ b/units/other/raptors/Swarmer/AllTerrain/raptor_allterrain_swarmer_basic_t4_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 28 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 15, movementclass = "RAPTORALLTERRAINHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorc3c.s3o", script = "Raptors/raptorc3c.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t1_v1.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t1_v1.lua index 6f42e5c0078..0c1fc9e5645 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t1_v1.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t1_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 20 20", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor_mini.s3o", script = "Raptors/raptor1_mini.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v1.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v1.lua index 33b51eacd69..7831a4f4b2b 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v1.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v1.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor.s3o", script = "Raptors/raptor1.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v2.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v2.lua index d0659087dd6..7f706547007 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v2.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v2.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor1b.s3o", script = "Raptors/raptor1b.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v3.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v3.lua index 08981eafb2d..1f459cdc196 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v3.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v3.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor1c.s3o", script = "Raptors/raptor1c.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v4.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v4.lua index 4acae7167f0..25b454796d5 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v4.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t2_v4.lua @@ -13,7 +13,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -31,7 +31,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor1d.s3o", script = "Raptors/raptor1d.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v1.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v1.lua index 2b1af6245a4..c3d9783917e 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v1.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v1.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor1x.s3o", script = "Raptors/raptor1x.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v2.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v2.lua index 76e4a0ad193..f4aee1f6301 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v2.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v2.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor1y.s3o", script = "Raptors/raptor1y.cob", seismicsignature = 0, diff --git a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v3.lua b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v3.lua index b358d26ed78..8618da2f020 100644 --- a/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v3.lua +++ b/units/other/raptors/Swarmer/raptor_land_swarmer_basic_t3_v3.lua @@ -14,7 +14,7 @@ return { canpatrol = true, canstop = "1", capturable = false, - category = "BOT MOBILE WEAPON ALL NOTSUB NOTSHIP NOTAIR NOTHOVER SURFACE RAPTOR EMPABLE", + category = "RAPTOR", collisionvolumeoffsets = "0 -3 -3", collisionvolumescales = "18 40 40", collisionvolumetype = "box", @@ -32,7 +32,7 @@ return { maxwaterdepth = 0, movementclass = "RAPTORSMALLHOVER", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptor1z.s3o", script = "Raptors/raptor1z.cob", seismicsignature = 0, diff --git a/units/other/raptors/raptor_air_gunship_acid_t2_v1.lua b/units/other/raptors/raptor_air_gunship_acid_t2_v1.lua index e6f4528961a..98bcc05d35e 100644 --- a/units/other/raptors/raptor_air_gunship_acid_t2_v1.lua +++ b/units/other/raptors/raptor_air_gunship_acid_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, @@ -131,7 +131,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "acidspit", maindir = "0 0 1", maxangledif = 125, diff --git a/units/other/raptors/raptor_air_gunship_antiair_t2_v1.lua b/units/other/raptors/raptor_air_gunship_antiair_t2_v1.lua index fba1e38997a..90da65002ae 100644 --- a/units/other/raptors/raptor_air_gunship_antiair_t2_v1.lua +++ b/units/other/raptors/raptor_air_gunship_antiair_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "NOTAIR SPACE", + nochasecategory = "NOTAIR", objectname = "Raptors/raptorf1.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/raptor_air_gunship_basic_t2_v1.lua b/units/other/raptors/raptor_air_gunship_basic_t2_v1.lua index 0938be74aa1..83856a8677d 100644 --- a/units/other/raptors/raptor_air_gunship_basic_t2_v1.lua +++ b/units/other/raptors/raptor_air_gunship_basic_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, @@ -124,7 +124,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "WEAPON", maindir = "0 0 1", maxangledif = 180, diff --git a/units/other/raptors/raptor_air_gunship_emp_t2_v1.lua b/units/other/raptors/raptor_air_gunship_emp_t2_v1.lua index 7ecb95c01cc..3065dd9593a 100644 --- a/units/other/raptors/raptor_air_gunship_emp_t2_v1.lua +++ b/units/other/raptors/raptor_air_gunship_emp_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, diff --git a/units/other/raptors/raptor_air_gunship_fire_t2_v1.lua b/units/other/raptors/raptor_air_gunship_fire_t2_v1.lua index 1cea5b1fb2d..1a56d758b4a 100644 --- a/units/other/raptors/raptor_air_gunship_fire_t2_v1.lua +++ b/units/other/raptors/raptor_air_gunship_fire_t2_v1.lua @@ -19,7 +19,7 @@ return { canstop = "1", cansubmerge = true, capturable = false, - category = "ALL MOBILE WEAPON NOTLAND VTOL NOTSUB NOTSHIP NOTHOVER RAPTOR", + category = "RAPTOR", collide = true, collisionvolumeoffsets = "0 0 0", collisionvolumescales = "70 70 70", @@ -44,7 +44,7 @@ return { speed = 240.0, moverate1 = "32", noautofire = false, - nochasecategory = "VTOL SPACE", + nochasecategory = "VTOL", objectname = "Raptors/raptorf1.s3o", script = "Raptors/raptorf1.cob", seismicsignature = 0, @@ -133,7 +133,7 @@ return { }, weapons = { [1] = { - badtargetcategory = "VTOL SPACE", + badtargetcategory = "VTOL", def = "FLAMER", maindir = "0 0 1", maxangledif = 270, diff --git a/units/other/resourcecheat.lua b/units/other/resourcecheat.lua index 98975825322..85a723383ba 100644 --- a/units/other/resourcecheat.lua +++ b/units/other/resourcecheat.lua @@ -8,7 +8,6 @@ return { buildpic = "other/resourcecheat.dds", buildtime = 312500, canrepeat = false, - category = "ALL NOTSUB NOWEAPON NOTAIR NOTHOVER SURFACE EMPABLE", collisionvolumeoffsets = "0 0 0", collisionvolumescales = "110 110 110", collisionvolumetype = "Box",