From 2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 4 Apr 2015 00:39:09 +0200 Subject: [PATCH] - moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them. --- src/d_main.cpp | 1 + src/g_level.h | 1 + src/g_mapinfo.cpp | 12 ++ src/info.cpp | 2 - src/p_local.h | 1 + src/p_things.cpp | 87 +++++++++++++++ src/thingdef/thingdef_properties.cpp | 2 +- wadsrc/static/actors/chex/chexammo.txt | 9 -- wadsrc/static/actors/chex/chexdecorations.txt | 20 ---- wadsrc/static/actors/chex/chexitems.txt | 10 -- wadsrc/static/actors/chex/chexkeys.txt | 3 - wadsrc/static/actors/chex/chexmonsters.txt | 6 - wadsrc/static/actors/chex/chexweapons.txt | 9 -- wadsrc/static/actors/doom/arachnotron.txt | 4 - wadsrc/static/actors/doom/archvile.txt | 4 - wadsrc/static/actors/doom/bossbrain.txt | 3 - wadsrc/static/actors/doom/bruiser.txt | 6 - wadsrc/static/actors/doom/cacodemon.txt | 4 - wadsrc/static/actors/doom/cyberdemon.txt | 2 - wadsrc/static/actors/doom/deadthings.txt | 10 -- wadsrc/static/actors/doom/demon.txt | 4 - wadsrc/static/actors/doom/doomammo.txt | 18 --- wadsrc/static/actors/doom/doomarmor.txt | 6 - wadsrc/static/actors/doom/doomartifacts.txt | 16 --- wadsrc/static/actors/doom/doomdecorations.txt | 53 --------- wadsrc/static/actors/doom/doomhealth.txt | 6 - wadsrc/static/actors/doom/doomimp.txt | 4 - wadsrc/static/actors/doom/doomkeys.txt | 12 -- wadsrc/static/actors/doom/doommisc.txt | 6 - wadsrc/static/actors/doom/doomweapons.txt | 24 ---- wadsrc/static/actors/doom/fatso.txt | 4 - wadsrc/static/actors/doom/keen.txt | 1 - wadsrc/static/actors/doom/lostsoul.txt | 2 - wadsrc/static/actors/doom/painelemental.txt | 2 - wadsrc/static/actors/doom/possessed.txt | 8 -- wadsrc/static/actors/doom/revenant.txt | 4 - wadsrc/static/actors/doom/scriptedmarine.txt | 13 --- wadsrc/static/actors/doom/spidermaster.txt | 2 - wadsrc/static/actors/doom/stealthmonsters.txt | 24 ---- wadsrc/static/actors/heretic/beast.txt | 4 - wadsrc/static/actors/heretic/chicken.txt | 4 - wadsrc/static/actors/heretic/clink.txt | 2 - wadsrc/static/actors/heretic/dsparil.txt | 12 -- wadsrc/static/actors/heretic/hereticammo.txt | 26 ----- wadsrc/static/actors/heretic/hereticarmor.txt | 4 - .../actors/heretic/hereticartifacts.txt | 8 -- .../actors/heretic/hereticdecorations.txt | 18 --- wadsrc/static/actors/heretic/hereticimp.txt | 6 - wadsrc/static/actors/heretic/heretickeys.txt | 9 -- wadsrc/static/actors/heretic/hereticmisc.txt | 14 --- wadsrc/static/actors/heretic/hereticweaps.txt | 47 -------- wadsrc/static/actors/heretic/ironlich.txt | 6 - wadsrc/static/actors/heretic/knight.txt | 8 -- wadsrc/static/actors/heretic/mummy.txt | 10 -- wadsrc/static/actors/heretic/snake.txt | 6 - wadsrc/static/actors/heretic/wizard.txt | 4 - wadsrc/static/actors/hexen/bats.txt | 1 - wadsrc/static/actors/hexen/bishop.txt | 5 - wadsrc/static/actors/hexen/blastradius.txt | 2 - wadsrc/static/actors/hexen/boostarmor.txt | 2 - wadsrc/static/actors/hexen/centaur.txt | 6 - wadsrc/static/actors/hexen/clericboss.txt | 1 - wadsrc/static/actors/hexen/clericflame.txt | 1 - wadsrc/static/actors/hexen/clericholy.txt | 7 -- wadsrc/static/actors/hexen/clericmace.txt | 1 - wadsrc/static/actors/hexen/clericstaff.txt | 2 - wadsrc/static/actors/hexen/demons.txt | 7 -- wadsrc/static/actors/hexen/dragon.txt | 1 - wadsrc/static/actors/hexen/ettin.txt | 4 - wadsrc/static/actors/hexen/fighteraxe.txt | 2 - wadsrc/static/actors/hexen/fighterboss.txt | 1 - wadsrc/static/actors/hexen/fighterfist.txt | 1 - wadsrc/static/actors/hexen/fighterhammer.txt | 2 - wadsrc/static/actors/hexen/fighterplayer.txt | 1 - wadsrc/static/actors/hexen/fighterquietus.txt | 7 -- wadsrc/static/actors/hexen/firedemon.txt | 8 -- wadsrc/static/actors/hexen/flame.txt | 12 -- wadsrc/static/actors/hexen/flechette.txt | 5 - wadsrc/static/actors/hexen/flies.txt | 1 - wadsrc/static/actors/hexen/fog.txt | 4 - wadsrc/static/actors/hexen/healingradius.txt | 1 - wadsrc/static/actors/hexen/heresiarch.txt | 1 - wadsrc/static/actors/hexen/hexenarmor.txt | 8 -- .../static/actors/hexen/hexendecorations.txt | 103 ------------------ wadsrc/static/actors/hexen/hexenkeys.txt | 21 ---- .../static/actors/hexen/hexenspecialdecs.txt | 25 ----- wadsrc/static/actors/hexen/iceguy.txt | 2 - wadsrc/static/actors/hexen/korax.txt | 1 - wadsrc/static/actors/hexen/mageboss.txt | 1 - wadsrc/static/actors/hexen/magecone.txt | 4 - wadsrc/static/actors/hexen/magelightning.txt | 1 - wadsrc/static/actors/hexen/magestaff.txt | 7 -- wadsrc/static/actors/hexen/magewand.txt | 1 - wadsrc/static/actors/hexen/mana.txt | 8 -- wadsrc/static/actors/hexen/puzzleitems.txt | 26 ----- .../static/actors/hexen/scriptprojectiles.txt | 12 -- wadsrc/static/actors/hexen/serpent.txt | 4 - wadsrc/static/actors/hexen/speedboots.txt | 2 - wadsrc/static/actors/hexen/spike.txt | 4 - wadsrc/static/actors/hexen/summon.txt | 4 - wadsrc/static/actors/hexen/teleportother.txt | 2 - wadsrc/static/actors/hexen/wraith.txt | 10 -- wadsrc/static/actors/raven/artiegg.txt | 8 -- wadsrc/static/actors/raven/artitele.txt | 2 - wadsrc/static/actors/raven/minotaur.txt | 1 - wadsrc/static/actors/raven/ravenambient.txt | 6 - wadsrc/static/actors/raven/ravenartifacts.txt | 12 -- wadsrc/static/actors/raven/ravenhealth.txt | 2 - wadsrc/static/actors/shared/blood.txt | 1 - wadsrc/static/actors/shared/bridge.txt | 4 - wadsrc/static/actors/shared/debris.txt | 19 ---- wadsrc/static/actors/shared/sharedmisc.txt | 2 - wadsrc/static/actors/shared/soundsequence.txt | 10 -- wadsrc/static/actors/strife/acolyte.txt | 10 -- wadsrc/static/actors/strife/alienspectres.txt | 5 - wadsrc/static/actors/strife/beggars.txt | 5 - wadsrc/static/actors/strife/coin.txt | 4 - wadsrc/static/actors/strife/crusader.txt | 2 - wadsrc/static/actors/strife/entityboss.txt | 3 - wadsrc/static/actors/strife/inquisitor.txt | 1 - wadsrc/static/actors/strife/loremaster.txt | 1 - wadsrc/static/actors/strife/macil.txt | 2 - wadsrc/static/actors/strife/merchants.txt | 4 - wadsrc/static/actors/strife/oracle.txt | 1 - wadsrc/static/actors/strife/peasants.txt | 22 ---- wadsrc/static/actors/strife/programmer.txt | 1 - wadsrc/static/actors/strife/ratbuddy.txt | 1 - wadsrc/static/actors/strife/reaver.txt | 1 - wadsrc/static/actors/strife/rebels.txt | 7 -- wadsrc/static/actors/strife/sentinel.txt | 1 - wadsrc/static/actors/strife/sigil.txt | 6 - wadsrc/static/actors/strife/stalker.txt | 1 - wadsrc/static/actors/strife/strifeammo.txt | 18 --- wadsrc/static/actors/strife/strifearmor.txt | 4 - wadsrc/static/actors/strife/strifebishop.txt | 1 - wadsrc/static/actors/strife/strifeitems.txt | 25 ----- wadsrc/static/actors/strife/strifekeys.txt | 28 ----- wadsrc/static/actors/strife/strifestuff.txt | 102 ----------------- wadsrc/static/actors/strife/strifeweapons.txt | 14 --- wadsrc/static/actors/strife/templar.txt | 1 - .../static/actors/strife/thingstoblowup.txt | 3 - wadsrc/static/actors/strife/zombie.txt | 2 - wadsrc/static/mapinfo/common.txt | 24 ++++ wadsrc/static/mapinfo/doomcommon.txt | 91 ++++++++++++++++ wadsrc/static/mapinfo/heretic.txt | 94 ++++++++++++++++ wadsrc/static/mapinfo/hexen.txt | 95 ++++++++++++++++ wadsrc/static/mapinfo/strife.txt | 16 +++ 147 files changed, 423 insertions(+), 1165 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 6b5399c00..737622de3 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -2441,6 +2441,7 @@ void D_DoomMain (void) FinishDehPatch(); InitActorNumsFromMapinfo(); + InitSpawnablesFromMapinfo(); FActorInfo::StaticSetActorNums (); //Added by MC: diff --git a/src/g_level.h b/src/g_level.h index 50a661db9..27fc41fdb 100644 --- a/src/g_level.h +++ b/src/g_level.h @@ -105,6 +105,7 @@ struct FMapInfoParser void ParseIntermissionAction(FIntermissionDescriptor *Desc); void ParseIntermission(); void ParseDoomEdNums(); + void ParseSpawnNums(); void ParseAMColors(bool); FName CheckEndSequence(); FName ParseEndGame(); diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index a99056eeb..93e365941 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -1888,6 +1888,18 @@ void FMapInfoParser::ParseMapInfo (int lump, level_info_t &gamedefaults, level_i sc.ScriptError("doomednums definitions not supported with old MAPINFO syntax"); } } + else if (sc.Compare("spawnnums")) + { + if (format_type != FMT_Old) + { + format_type = FMT_New; + ParseSpawnNums(); + } + else + { + sc.ScriptError("spawnnums definitions not supported with old MAPINFO syntax"); + } + } else if (sc.Compare("automap") || sc.Compare("automap_overlay")) { if (format_type != FMT_Old) diff --git a/src/info.cpp b/src/info.cpp index 7677ac4a7..bba646ee5 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -141,8 +141,6 @@ void FActorInfo::StaticInit () void FActorInfo::StaticSetActorNums () { - SpawnableThings.Clear(); - for (unsigned int i = 0; i < PClass::m_RuntimeActors.Size(); ++i) { PClass::m_RuntimeActors[i]->ActorInfo->RegisterIDs (); diff --git a/src/p_local.h b/src/p_local.h index 7e9d810d8..07309a827 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -174,6 +174,7 @@ void P_RemoveThing(AActor * actor); bool P_Thing_Raise(AActor *thing, AActor *raiser); bool P_Thing_CanRaise(AActor *thing); const PClass *P_GetSpawnableType(int spawnnum); +void InitSpawnablesFromMapinfo(); // // P_MAPUTL diff --git a/src/p_things.cpp b/src/p_things.cpp index a8a34c384..423ecd042 100644 --- a/src/p_things.cpp +++ b/src/p_things.cpp @@ -45,10 +45,23 @@ #include "gi.h" #include "templates.h" #include "g_level.h" +#include "v_text.h" +#include "i_system.h" // Set of spawnable things for the Thing_Spawn and Thing_Projectile specials. TMap SpawnableThings; +struct MapinfoSpawnItem +{ + FName classname; // DECORATE is read after MAPINFO so we do not have the actual classes available here yet. + // These are for error reporting. We must store the file information because it's no longer available when these items get resolved. + FString filename; + int linenum; +}; + +typedef TMap SpawnMap; +static SpawnMap SpawnablesFromMapinfo; + static FRandom pr_leadtarget ("LeadTarget"); bool P_Thing_Spawn (int tid, AActor *source, int type, angle_t angle, bool fog, int newtid) @@ -559,3 +572,77 @@ CCMD (dumpspawnables) delete[] allpairs; } +void FMapInfoParser::ParseSpawnNums() +{ + TMap defined; + int error = 0; + + MapinfoSpawnItem editem; + + editem.filename = sc.ScriptName; + + ParseOpenBrace(); + while (true) + { + if (sc.CheckString("}")) return; + else if (sc.CheckNumber()) + { + int ednum = sc.Number; + sc.MustGetStringName("="); + sc.MustGetString(); + + bool *def = defined.CheckKey(ednum); + if (def != NULL) + { + sc.ScriptMessage("Spawn Number %d defined more than once", ednum); + error++; + } + else if (ednum < 0) + { + sc.ScriptMessage("Spawn Number must be positive, got %d", ednum); + error++; + } + defined[ednum] = true; + editem.classname = sc.String; + + SpawnablesFromMapinfo.Insert(ednum, editem); + } + else + { + sc.ScriptError("Number expected"); + } + } + if (error > 0) + { + sc.ScriptError("%d errors encountered in SpawnNum definition"); + } +} + +void InitSpawnablesFromMapinfo() +{ + SpawnableThings.Clear(); + SpawnMap::Iterator it(SpawnablesFromMapinfo); + SpawnMap::Pair *pair; + int error = 0; + + while (it.NextPair(pair)) + { + const PClass *cls = NULL; + if (pair->Value.classname != NAME_None) + { + cls = PClass::FindClass(pair->Value.classname); + if (cls == NULL) + { + Printf(TEXTCOLOR_RED "Script error, \"%s\" line %d:\nUnknown actor class %s\n", + pair->Value.filename.GetChars(), pair->Value.linenum, pair->Value.classname.GetChars()); + error++; + } + } + SpawnableThings.Insert(pair->Key, cls); + } + if (error > 0) + { + I_Error("%d unknown actor classes found", error); + } + SpawnablesFromMapinfo.Clear(); // we do not need this any longer +} diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp index 33066828c..4ddf951ac 100644 --- a/src/thingdef/thingdef_properties.cpp +++ b/src/thingdef/thingdef_properties.cpp @@ -976,7 +976,7 @@ DEFINE_PROPERTY(translation, L, Actor) if (type == 0) { PROP_INT_PARM(trans, 1); - int max = (gameinfo.gametype==GAME_Strife || (info->GameFilter&GAME_Strife)) ? 6:2; + int max = 6;// (gameinfo.gametype == GAME_Strife || (info->GameFilter&GAME_Strife)) ? 6 : 2; if (trans < 0 || trans > max) { I_Error ("Translation must be in the range [0,%d]", max); diff --git a/wadsrc/static/actors/chex/chexammo.txt b/wadsrc/static/actors/chex/chexammo.txt index 57a4ca285..27c5d419b 100644 --- a/wadsrc/static/actors/chex/chexammo.txt +++ b/wadsrc/static/actors/chex/chexammo.txt @@ -4,13 +4,11 @@ actor MiniZorchRecharge : Clip { - Game Chex inventory.pickupmessage "$GOTZORCHRECHARGE" } actor MiniZorchPack : Clip { - Game Chex Inventory.PickupMessage "$GOTMINIZORCHPACK" Inventory.Amount 50 States @@ -25,13 +23,11 @@ actor MiniZorchPack : Clip actor LargeZorchRecharge : Shell { - Game Chex inventory.pickupmessage "$GOTLARGEZORCHERRECHARGE" } actor LargeZorchPack : Shell { - Game Chex Inventory.PickupMessage "$GOTLARGEZORCHERPACK" Inventory.Amount 20 States @@ -46,13 +42,11 @@ actor LargeZorchPack : Shell actor PropulsorZorch : RocketAmmo { - Game Chex inventory.pickupmessage "$GOTPROPULSORRECHARGE" } actor PropulsorZorchPack : RocketAmmo { - Game Chex Inventory.PickupMessage "$GOTPROPULSORPACK" Inventory.Amount 5 States @@ -67,14 +61,11 @@ actor PropulsorZorchPack : RocketAmmo actor PhasingZorch : Cell { - Game Chex inventory.pickupmessage "$GOTPHASINGZORCHERRECHARGE" } actor PhasingZorchPack : Cell { - Game Chex - SpawnID 142 Inventory.PickupMessage "$GOTPHASINGZORCHERPACK" Inventory.Amount 100 States diff --git a/wadsrc/static/actors/chex/chexdecorations.txt b/wadsrc/static/actors/chex/chexdecorations.txt index 398e08836..6515061c5 100644 --- a/wadsrc/static/actors/chex/chexdecorations.txt +++ b/wadsrc/static/actors/chex/chexdecorations.txt @@ -4,19 +4,16 @@ actor ChexCivilian1 : GreenTorch { - game Chex height 54 } actor ChexCivilian2 : ShortGreenTorch { - game Chex height 54 } actor ChexCivilian3 : ShortRedTorch { - game Chex height 48 } @@ -24,13 +21,11 @@ actor ChexCivilian3 : ShortRedTorch actor ChexLandingLight : Column { - game Chex height 35 } actor ChexSpaceship : TechPillar { - game Chex height 52 } @@ -38,37 +33,31 @@ actor ChexSpaceship : TechPillar actor ChexAppleTree : Stalagtite { - game Chex height 92 } actor ChexBananaTree : BigTree { - game Chex height 108 } actor ChexOrangeTree : TorchTree { - game Chex height 92 } actor ChexSubmergedPlant : ShortGreenColumn { - game Chex height 42 } actor ChexTallFlower : HeadsOnAStick { - game Chex height 25 } actor ChexTallFlower2 : DeadStick { - game Chex height 25 } @@ -76,7 +65,6 @@ actor ChexTallFlower2 : DeadStick actor ChexSlimeFountain : BlueTorch { - game Chex height 48 States { @@ -90,13 +78,11 @@ actor ChexSlimeFountain : BlueTorch actor ChexCavernColumn : TallRedColumn { - game Chex height 128 } actor ChexCavernStalagmite : TallGreenColumn { - game Chex height 60 } @@ -104,37 +90,31 @@ actor ChexCavernStalagmite : TallGreenColumn actor ChexChemicalBurner : EvilEye { - game Chex height 25 } actor ChexChemicalFlask : Candlestick { - game Chex renderstyle translucent alpha 0.75 } actor ChexFlagOnPole : SkullColumn { - game Chex height 128 } actor ChexGasTank : Candelabra { - game Chex height 36 } actor ChexLightColumn : ShortBlueTorch { - game Chex height 86 } actor ChexMineCart : ShortRedColumn { - game Chex height 30 } diff --git a/wadsrc/static/actors/chex/chexitems.txt b/wadsrc/static/actors/chex/chexitems.txt index b26065395..431728e07 100644 --- a/wadsrc/static/actors/chex/chexitems.txt +++ b/wadsrc/static/actors/chex/chexitems.txt @@ -5,26 +5,22 @@ actor GlassOfWater : HealthBonus { - game Chex inventory.pickupmessage "$GOTWATER" } actor BowlOfFruit : Stimpack { - game Chex inventory.pickupmessage "$GOTFRUIT" } actor BowlOfVegetables : Medikit { - game Chex inventory.pickupmessage "$GOTVEGETABLES" health.lowmessage 25, "$GOTVEGETABLESNEED" } actor SuperchargeBreakfast : Soulsphere { - game Chex inventory.pickupmessage "$GOTBREAKFAST" } @@ -32,19 +28,16 @@ actor SuperchargeBreakfast : Soulsphere actor SlimeRepellent : ArmorBonus { - game Chex inventory.pickupmessage "$GOTREPELLENT" } actor ChexArmor : GreenArmor { - game Chex inventory.pickupmessage "$GOTCHEXARMOR" } actor SuperChexArmor : BlueArmor { - game Chex inventory.pickupmessage "$GOTSUPERCHEXARMOR" } @@ -52,18 +45,15 @@ actor SuperChexArmor : BlueArmor actor ComputerAreaMap : Allmap { - game Chex inventory.pickupmessage "$GOTCHEXMAP" } actor SlimeProofSuit : RadSuit { - game Chex inventory.pickupmessage "$GOTSLIMESUIT" } actor Zorchpack : Backpack { - game Chex inventory.pickupmessage "$GOTZORCHPACK" } diff --git a/wadsrc/static/actors/chex/chexkeys.txt b/wadsrc/static/actors/chex/chexkeys.txt index 6142f833c..0d5156392 100644 --- a/wadsrc/static/actors/chex/chexkeys.txt +++ b/wadsrc/static/actors/chex/chexkeys.txt @@ -2,18 +2,15 @@ actor ChexBlueCard : BlueCard { - Game Chex inventory.pickupmessage "$GOTCBLUEKEY" } actor ChexYellowCard : YellowCard { - Game Chex inventory.pickupmessage "$GOTCYELLOWKEY" } actor ChexRedCard : RedCard { - Game Chex inventory.pickupmessage "$GOTCREDKEY" } diff --git a/wadsrc/static/actors/chex/chexmonsters.txt b/wadsrc/static/actors/chex/chexmonsters.txt index eae27f6a1..0ee3c34c5 100644 --- a/wadsrc/static/actors/chex/chexmonsters.txt +++ b/wadsrc/static/actors/chex/chexmonsters.txt @@ -7,7 +7,6 @@ actor FlemoidusCommonus : ZombieMan { - Game Chex DropItem "" Obituary "$OB_COMMONUS" States @@ -27,7 +26,6 @@ actor FlemoidusCommonus : ZombieMan actor FlemoidusBipedicus : ShotgunGuy { - Game Chex DropItem "" Obituary "$OB_BIPEDICUS" States @@ -47,7 +45,6 @@ actor FlemoidusBipedicus : ShotgunGuy actor ArmoredFlemoidusBipedicus : DoomImp { - Game Chex Obituary "$OB_BIPEDICUS2" HitObituary "$OB_BIPEDICUS2" } @@ -60,7 +57,6 @@ actor ArmoredFlemoidusBipedicus : DoomImp actor FlemoidusCycloptisCommonus : Demon { - Game Chex Obituary "$OB_CYCLOPTIS" } @@ -72,7 +68,6 @@ actor FlemoidusCycloptisCommonus : Demon actor Flembrane : BaronOfHell { - Game Chex radius 44 height 100 speed 0 @@ -90,6 +85,5 @@ actor Flembrane : BaronOfHell actor ChexSoul : LostSoul { - Game Chex height 0 } diff --git a/wadsrc/static/actors/chex/chexweapons.txt b/wadsrc/static/actors/chex/chexweapons.txt index bb00e255c..755e7ad45 100644 --- a/wadsrc/static/actors/chex/chexweapons.txt +++ b/wadsrc/static/actors/chex/chexweapons.txt @@ -2,14 +2,12 @@ actor Bootspoon : Fist { - game Chex obituary "$OB_MPSPOON" Tag "$TAG_SPOON" } actor SuperBootspork : Chainsaw { - game Chex obituary "$OB_MPBOOTSPORK" Inventory.PickupMessage "$GOTSUPERBOOTSPORK" Tag "$TAG_SPORK" @@ -17,7 +15,6 @@ actor SuperBootspork : Chainsaw actor MiniZorcher : Pistol { - game Chex obituary "$OB_MPZORCH" inventory.pickupmessage "$GOTMINIZORCHER" Tag "$TAG_MINIZORCHER" @@ -30,7 +27,6 @@ actor MiniZorcher : Pistol actor LargeZorcher : Shotgun { - game Chex obituary "$OB_MPZORCH" inventory.pickupmessage "$GOTLARGEZORCHER" Tag "$TAG_LARGEZORCHER" @@ -38,7 +34,6 @@ actor LargeZorcher : Shotgun actor SuperLargeZorcher : SuperShotgun { - game Chex obituary "$OB_MPMEGAZORCH" inventory.pickupmessage "$GOTSUPERLARGEZORCHER" Tag "$TAG_SUPERLARGEZORCHER" @@ -46,7 +41,6 @@ actor SuperLargeZorcher : SuperShotgun actor RapidZorcher : Chaingun { - game Chex obituary "$OB_MPRAPIDZORCH" inventory.pickupmessage "$GOTRAPIDZORCHER" Tag "$TAG_RAPIDZORCHER" @@ -54,7 +48,6 @@ actor RapidZorcher : Chaingun actor ZorchPropulsor : RocketLauncher { - game Chex obituary "" inventory.pickupmessage "$GOTZORCHPROPULSOR" Tag "$TAG_ZORCHPROPULSOR" @@ -79,7 +72,6 @@ actor PropulsorMissile : Rocket actor PhasingZorcher : PlasmaRifle { - game Chex obituary "" inventory.pickupmessage "$GOTPHASINGZORCHER" Tag "$TAG_PHASINGZORCHER" @@ -109,7 +101,6 @@ actor PhaseZorchMissile : PlasmaBall actor LAZDevice : BFG9000 { - game Chex obituary "" inventory.pickupmessage "$GOTLAZDEVICE" Tag "$TAG_LAZDEVICE" diff --git a/wadsrc/static/actors/doom/arachnotron.txt b/wadsrc/static/actors/doom/arachnotron.txt index 9831e7ea9..16e4ebe55 100644 --- a/wadsrc/static/actors/doom/arachnotron.txt +++ b/wadsrc/static/actors/doom/arachnotron.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR Arachnotron { - Game Doom - SpawnID 6 Health 500 Radius 64 Height 64 @@ -63,8 +61,6 @@ ACTOR Arachnotron //=========================================================================== ACTOR ArachnotronPlasma { - Game Doom - SpawnID 129 Radius 13 Height 8 Speed 25 diff --git a/wadsrc/static/actors/doom/archvile.txt b/wadsrc/static/actors/doom/archvile.txt index ba3a9ca16..29108cda2 100644 --- a/wadsrc/static/actors/doom/archvile.txt +++ b/wadsrc/static/actors/doom/archvile.txt @@ -6,8 +6,6 @@ ACTOR Archvile { - Game Doom - SpawnID 111 Health 700 Radius 20 Height 56 @@ -67,8 +65,6 @@ ACTOR Archvile ACTOR ArchvileFire { - Game Doom - SpawnID 98 +NOBLOCKMAP +NOGRAVITY RenderStyle Add Alpha 1 diff --git a/wadsrc/static/actors/doom/bossbrain.txt b/wadsrc/static/actors/doom/bossbrain.txt index 92b8611f9..999f2da62 100644 --- a/wadsrc/static/actors/doom/bossbrain.txt +++ b/wadsrc/static/actors/doom/bossbrain.txt @@ -7,7 +7,6 @@ ACTOR BossBrain { - Game Doom Health 250 Mass 10000000 PainChance 255 @@ -45,7 +44,6 @@ ACTOR BossBrain ACTOR BossEye { - Game Doom Height 32 +NOBLOCKMAP +NOSECTOR @@ -69,7 +67,6 @@ ACTOR BossEye ACTOR BossTarget : SpecialSpot { - Game Doom Height 32 +NOBLOCKMAP +NOSECTOR diff --git a/wadsrc/static/actors/doom/bruiser.txt b/wadsrc/static/actors/doom/bruiser.txt index 57af9e9a0..0bc4a7f96 100644 --- a/wadsrc/static/actors/doom/bruiser.txt +++ b/wadsrc/static/actors/doom/bruiser.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR BaronOfHell { - Game Doom - SpawnID 3 Health 1000 Radius 24 Height 64 @@ -61,8 +59,6 @@ ACTOR BaronOfHell //=========================================================================== ACTOR HellKnight : BaronOfHell { - Game Doom - SpawnID 113 Health 500 -BOSSDEATH SeeSound "knight/sight" @@ -110,8 +106,6 @@ ACTOR HellKnight : BaronOfHell //=========================================================================== ACTOR BaronBall { - Game Doom - SpawnID 154 Radius 6 Height 16 Speed 15 diff --git a/wadsrc/static/actors/doom/cacodemon.txt b/wadsrc/static/actors/doom/cacodemon.txt index c2feabee0..bf7b8ddf2 100644 --- a/wadsrc/static/actors/doom/cacodemon.txt +++ b/wadsrc/static/actors/doom/cacodemon.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR Cacodemon { - Game Doom - SpawnID 19 Health 400 Radius 31 Height 56 @@ -61,8 +59,6 @@ ACTOR Cacodemon //=========================================================================== ACTOR CacodemonBall { - Game Doom - SpawnID 126 Radius 6 Height 8 Speed 10 diff --git a/wadsrc/static/actors/doom/cyberdemon.txt b/wadsrc/static/actors/doom/cyberdemon.txt index f4fa16ac2..80c1ba2da 100644 --- a/wadsrc/static/actors/doom/cyberdemon.txt +++ b/wadsrc/static/actors/doom/cyberdemon.txt @@ -6,8 +6,6 @@ //=========================================================================== ACTOR Cyberdemon { - Game Doom - SpawnID 114 Health 4000 Radius 40 Height 110 diff --git a/wadsrc/static/actors/doom/deadthings.txt b/wadsrc/static/actors/doom/deadthings.txt index 74d4184cc..5b9835e79 100644 --- a/wadsrc/static/actors/doom/deadthings.txt +++ b/wadsrc/static/actors/doom/deadthings.txt @@ -2,8 +2,6 @@ actor GibbedMarine { - Game Doom - SpawnID 145 States { Spawn: @@ -16,14 +14,12 @@ actor GibbedMarine actor GibbedMarineExtra : GibbedMarine { - Game Doom } // Dead marine ------------------------------------------------------------- actor DeadMarine { - Game Doom States { Spawn: @@ -42,7 +38,6 @@ actor DeadMarine actor DeadZombieMan : ZombieMan { Skip_Super - Game Doom DropItem None States { @@ -56,7 +51,6 @@ actor DeadZombieMan : ZombieMan actor DeadShotgunGuy : ShotgunGuy { Skip_Super - Game Doom DropItem None States { @@ -70,7 +64,6 @@ actor DeadShotgunGuy : ShotgunGuy actor DeadDoomImp : DoomImp { Skip_Super - Game Doom States { Spawn: @@ -83,7 +76,6 @@ actor DeadDoomImp : DoomImp actor DeadDemon : Demon { Skip_Super - Game Doom States { Spawn: @@ -96,7 +88,6 @@ actor DeadDemon : Demon actor DeadCacodemon : Cacodemon { Skip_Super - Game Doom States { Spawn: @@ -115,7 +106,6 @@ actor DeadCacodemon : Cacodemon actor DeadLostSoul : LostSoul { Skip_Super - Game Doom States { Spawn: diff --git a/wadsrc/static/actors/doom/demon.txt b/wadsrc/static/actors/doom/demon.txt index d88d67a72..a1ff8ccfb 100644 --- a/wadsrc/static/actors/doom/demon.txt +++ b/wadsrc/static/actors/doom/demon.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR Demon { - Game Doom - SpawnID 8 Health 150 PainChance 180 Speed 10 @@ -59,8 +57,6 @@ ACTOR Demon //=========================================================================== ACTOR Spectre : Demon { - Game Doom - SpawnID 9 +SHADOW RenderStyle OptFuzzy Alpha 0.5 diff --git a/wadsrc/static/actors/doom/doomammo.txt b/wadsrc/static/actors/doom/doomammo.txt index 9d25c3b46..8e137b3a8 100644 --- a/wadsrc/static/actors/doom/doomammo.txt +++ b/wadsrc/static/actors/doom/doomammo.txt @@ -2,8 +2,6 @@ ACTOR Clip : Ammo { - Game Doom - SpawnID 11 Inventory.PickupMessage "$GOTCLIP" Inventory.Amount 10 Inventory.MaxAmount 200 @@ -22,8 +20,6 @@ ACTOR Clip : Ammo ACTOR ClipBox : Clip { - Game Doom - SpawnID 139 Inventory.PickupMessage "$GOTCLIPBOX" Inventory.Amount 50 States @@ -38,8 +34,6 @@ ACTOR ClipBox : Clip ACTOR RocketAmmo : Ammo { - Game Doom - SpawnID 140 Inventory.PickupMessage "$GOTROCKET" Inventory.Amount 1 Inventory.MaxAmount 50 @@ -58,8 +52,6 @@ ACTOR RocketAmmo : Ammo ACTOR RocketBox : RocketAmmo { - Game Doom - SpawnID 141 Inventory.PickupMessage "$GOTROCKBOX" Inventory.Amount 5 States @@ -74,8 +66,6 @@ ACTOR RocketBox : RocketAmmo ACTOR Cell : Ammo { - Game Doom - SpawnID 75 Inventory.PickupMessage "$GOTCELL" Inventory.Amount 20 Inventory.MaxAmount 300 @@ -94,8 +84,6 @@ ACTOR Cell : Ammo ACTOR CellPack : Cell { - Game Doom - SpawnID 142 Inventory.PickupMessage "$GOTCELLBOX" Inventory.Amount 100 States @@ -110,8 +98,6 @@ ACTOR CellPack : Cell ACTOR Shell : Ammo { - Game Doom - SpawnID 12 Inventory.PickupMessage "$GOTSHELLS" Inventory.Amount 4 Inventory.MaxAmount 50 @@ -130,8 +116,6 @@ ACTOR Shell : Ammo ACTOR ShellBox : Shell { - Game Doom - SpawnID 143 Inventory.PickupMessage "$GOTSHELLBOX" Inventory.Amount 20 States @@ -146,8 +130,6 @@ ACTOR ShellBox : Shell ACTOR Backpack : BackpackItem { - Game Doom - SpawnID 144 Height 26 Inventory.PickupMessage "$GOTBACKPACK" States diff --git a/wadsrc/static/actors/doom/doomarmor.txt b/wadsrc/static/actors/doom/doomarmor.txt index 1cc6847ed..3b518bab8 100644 --- a/wadsrc/static/actors/doom/doomarmor.txt +++ b/wadsrc/static/actors/doom/doomarmor.txt @@ -3,8 +3,6 @@ Actor ArmorBonus : BasicArmorBonus { - Game Doom - SpawnID 22 Radius 20 Height 16 Inventory.Pickupmessage "$GOTARMBONUS" @@ -26,8 +24,6 @@ Actor ArmorBonus : BasicArmorBonus Actor GreenArmor : BasicArmorPickup { - Game Doom - SpawnID 68 Radius 20 Height 16 Inventory.Pickupmessage "$GOTARMOR" @@ -47,8 +43,6 @@ Actor GreenArmor : BasicArmorPickup Actor BlueArmor : BasicArmorPickup { - Game Doom - SpawnID 69 Radius 20 Height 16 Inventory.Pickupmessage "$GOTMEGA" diff --git a/wadsrc/static/actors/doom/doomartifacts.txt b/wadsrc/static/actors/doom/doomartifacts.txt index 6335d1b16..8702155e8 100644 --- a/wadsrc/static/actors/doom/doomartifacts.txt +++ b/wadsrc/static/actors/doom/doomartifacts.txt @@ -2,8 +2,6 @@ ACTOR InvulnerabilitySphere : PowerupGiver { - Game Doom - SpawnID 133 +COUNTITEM +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -24,8 +22,6 @@ ACTOR InvulnerabilitySphere : PowerupGiver ACTOR Soulsphere : Health { - Game Doom - SpawnID 25 +COUNTITEM +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -60,8 +56,6 @@ actor BlueArmorForMegasphere : BlueArmor ACTOR Megasphere : CustomInventory { - Game Doom - SpawnID 132 +COUNTITEM +INVENTORY.ALWAYSPICKUP Inventory.PickupMessage "$GOTMSPHERE" @@ -82,8 +76,6 @@ ACTOR Megasphere : CustomInventory ACTOR BlurSphere : PowerupGiver { - Game Doom - SpawnID 135 +COUNTITEM +VISIBILITYPULSE +INVENTORY.AUTOACTIVATE @@ -105,8 +97,6 @@ ACTOR BlurSphere : PowerupGiver ACTOR RadSuit : PowerupGiver { - Game Doom - SpawnID 136 Height 46 +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -125,8 +115,6 @@ ACTOR RadSuit : PowerupGiver ACTOR Infrared : PowerupGiver { - Game Doom - SpawnID 138 +COUNTITEM +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -146,8 +134,6 @@ ACTOR Infrared : PowerupGiver ACTOR Allmap : MapRevealer { - Game Doom - SpawnID 137 +COUNTITEM +INVENTORY.FANCYPICKUPSOUND +INVENTORY.ALWAYSPICKUP @@ -166,8 +152,6 @@ ACTOR Allmap : MapRevealer ACTOR Berserk : CustomInventory { - Game Doom - SpawnID 134 +COUNTITEM +INVENTORY.ALWAYSPICKUP Inventory.PickupMessage "$GOTBERSERK" diff --git a/wadsrc/static/actors/doom/doomdecorations.txt b/wadsrc/static/actors/doom/doomdecorations.txt index 7233657d8..1a5688b58 100644 --- a/wadsrc/static/actors/doom/doomdecorations.txt +++ b/wadsrc/static/actors/doom/doomdecorations.txt @@ -3,7 +3,6 @@ ACTOR TechLamp { - Game Doom Radius 16 Height 80 ProjectilePassHeight -16 @@ -20,7 +19,6 @@ ACTOR TechLamp ACTOR TechLamp2 { - Game Doom Radius 16 Height 60 ProjectilePassHeight -16 @@ -37,7 +35,6 @@ ACTOR TechLamp2 ACTOR Column { - Game Doom Radius 16 Height 48 ProjectilePassHeight -16 @@ -54,7 +51,6 @@ ACTOR Column ACTOR TallGreenColumn { - Game Doom Radius 16 Height 52 ProjectilePassHeight -16 @@ -71,7 +67,6 @@ ACTOR TallGreenColumn ACTOR ShortGreenColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -88,7 +83,6 @@ ACTOR ShortGreenColumn ACTOR TallRedColumn { - Game Doom Radius 16 Height 52 ProjectilePassHeight -16 @@ -105,7 +99,6 @@ ACTOR TallRedColumn ACTOR ShortRedColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -122,7 +115,6 @@ ACTOR ShortRedColumn ACTOR SkullColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -139,7 +131,6 @@ ACTOR SkullColumn ACTOR HeartColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -156,7 +147,6 @@ ACTOR HeartColumn ACTOR EvilEye { - Game Doom Radius 16 Height 54 ProjectilePassHeight -16 @@ -173,7 +163,6 @@ ACTOR EvilEye ACTOR FloatingSkull { - Game Doom Radius 16 Height 26 ProjectilePassHeight -16 @@ -190,7 +179,6 @@ ACTOR FloatingSkull ACTOR TorchTree { - Game Doom Radius 16 Height 56 ProjectilePassHeight -16 @@ -207,7 +195,6 @@ ACTOR TorchTree ACTOR BlueTorch { - Game Doom Radius 16 Height 68 ProjectilePassHeight -16 @@ -224,7 +211,6 @@ ACTOR BlueTorch ACTOR GreenTorch { - Game Doom Radius 16 Height 68 ProjectilePassHeight -16 @@ -241,7 +227,6 @@ ACTOR GreenTorch ACTOR RedTorch { - Game Doom Radius 16 Height 68 ProjectilePassHeight -16 @@ -258,7 +243,6 @@ ACTOR RedTorch ACTOR ShortBlueTorch { - Game Doom Radius 16 Height 37 ProjectilePassHeight -16 @@ -275,7 +259,6 @@ ACTOR ShortBlueTorch ACTOR ShortGreenTorch { - Game Doom Radius 16 Height 37 ProjectilePassHeight -16 @@ -292,7 +275,6 @@ ACTOR ShortGreenTorch ACTOR ShortRedTorch { - Game Doom Radius 16 Height 37 ProjectilePassHeight -16 @@ -309,7 +291,6 @@ ACTOR ShortRedTorch ACTOR Stalagtite { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -326,7 +307,6 @@ ACTOR Stalagtite ACTOR TechPillar { - Game Doom Radius 16 Height 128 ProjectilePassHeight -16 @@ -343,7 +323,6 @@ ACTOR TechPillar ACTOR Candlestick { - Game Doom Radius 20 Height 14 ProjectilePassHeight -16 @@ -359,7 +338,6 @@ ACTOR Candlestick ACTOR Candelabra { - Game Doom Radius 16 Height 60 ProjectilePassHeight -16 @@ -376,7 +354,6 @@ ACTOR Candelabra ACTOR BloodyTwitch { - Game Doom Radius 16 Height 68 +SOLID @@ -397,7 +374,6 @@ ACTOR BloodyTwitch ACTOR Meat2 { - Game Doom Radius 16 Height 84 +SOLID @@ -415,7 +391,6 @@ ACTOR Meat2 ACTOR Meat3 { - Game Doom Radius 16 Height 84 +SOLID @@ -433,7 +408,6 @@ ACTOR Meat3 ACTOR Meat4 { - Game Doom Radius 16 Height 68 +SOLID @@ -451,7 +425,6 @@ ACTOR Meat4 ACTOR Meat5 { - Game Doom Radius 16 Height 52 +SOLID @@ -469,28 +442,24 @@ ACTOR Meat5 ACTOR NonsolidMeat2 : Meat2 { - Game Doom -SOLID Radius 20 } ACTOR NonsolidMeat3 : Meat3 { - Game Doom -SOLID Radius 20 } ACTOR NonsolidMeat4 : Meat4 { - Game Doom -SOLID Radius 20 } ACTOR NonsolidMeat5 : Meat5 { - Game Doom -SOLID Radius 20 } @@ -499,7 +468,6 @@ ACTOR NonsolidMeat5 : Meat5 ACTOR NonsolidTwitch : BloodyTwitch { - Game Doom -SOLID Radius 20 } @@ -508,7 +476,6 @@ ACTOR NonsolidTwitch : BloodyTwitch ACTOR HeadOnAStick { - Game Doom Radius 16 Height 56 ProjectilePassHeight -16 @@ -525,7 +492,6 @@ ACTOR HeadOnAStick ACTOR HeadsOnAStick { - Game Doom Radius 16 Height 64 ProjectilePassHeight -16 @@ -542,7 +508,6 @@ ACTOR HeadsOnAStick ACTOR HeadCandles { - Game Doom Radius 16 Height 42 ProjectilePassHeight -16 @@ -559,7 +524,6 @@ ACTOR HeadCandles ACTOR DeadStick { - Game Doom Radius 16 Height 64 ProjectilePassHeight -16 @@ -576,7 +540,6 @@ ACTOR DeadStick ACTOR LiveStick { - Game Doom Radius 16 Height 64 ProjectilePassHeight -16 @@ -594,7 +557,6 @@ ACTOR LiveStick ACTOR BigTree { - Game Doom Radius 32 Height 108 ProjectilePassHeight -16 @@ -611,8 +573,6 @@ ACTOR BigTree ACTOR BurningBarrel { - Game Doom - SpawnID 149 Radius 16 Height 32 ProjectilePassHeight -16 @@ -629,7 +589,6 @@ ACTOR BurningBarrel ACTOR HangNoGuts { - Game Doom Radius 16 Height 88 +SOLID @@ -647,7 +606,6 @@ ACTOR HangNoGuts ACTOR HangBNoBrain { - Game Doom Radius 16 Height 88 +SOLID @@ -665,7 +623,6 @@ ACTOR HangBNoBrain ACTOR HangTLookingDown { - Game Doom Radius 16 Height 64 +SOLID @@ -683,7 +640,6 @@ ACTOR HangTLookingDown ACTOR HangTLookingUp { - Game Doom Radius 16 Height 64 +SOLID @@ -701,7 +657,6 @@ ACTOR HangTLookingUp ACTOR HangTSkull { - Game Doom Radius 16 Height 64 +SOLID @@ -719,7 +674,6 @@ ACTOR HangTSkull ACTOR HangTNoBrain { - Game Doom Radius 16 Height 64 +SOLID @@ -737,8 +691,6 @@ ACTOR HangTNoBrain ACTOR ColonGibs { - Game Doom - SpawnID 147 Radius 20 Height 4 +NOBLOCKMAP @@ -755,8 +707,6 @@ ACTOR ColonGibs ACTOR SmallBloodPool { - Game Doom - SpawnID 148 Radius 20 Height 1 +NOBLOCKMAP @@ -773,8 +723,6 @@ ACTOR SmallBloodPool ACTOR BrainStem { - Game Doom - SpawnID 150 Radius 20 Height 4 +NOBLOCKMAP @@ -792,7 +740,6 @@ ACTOR BrainStem ACTOR Stalagmite { - Game Doom Radius 16 Height 48 +SOLID diff --git a/wadsrc/static/actors/doom/doomhealth.txt b/wadsrc/static/actors/doom/doomhealth.txt index bc68c1017..77fc6eaeb 100644 --- a/wadsrc/static/actors/doom/doomhealth.txt +++ b/wadsrc/static/actors/doom/doomhealth.txt @@ -2,8 +2,6 @@ ACTOR HealthBonus : Health { - Game Doom - SpawnID 152 +COUNTITEM +INVENTORY.ALWAYSPICKUP Inventory.Amount 1 @@ -21,8 +19,6 @@ ACTOR HealthBonus : Health ACTOR Stimpack : Health { - Game Doom - SpawnID 23 Inventory.Amount 10 Inventory.PickupMessage "$GOTSTIM" States @@ -37,8 +33,6 @@ ACTOR Stimpack : Health ACTOR Medikit : Health { - Game Doom - SpawnID 24 Inventory.Amount 25 Inventory.PickupMessage "$GOTMEDIKIT" Health.LowMessage 25, "$GOTMEDINEED" diff --git a/wadsrc/static/actors/doom/doomimp.txt b/wadsrc/static/actors/doom/doomimp.txt index 0cf3665c8..938663e35 100644 --- a/wadsrc/static/actors/doom/doomimp.txt +++ b/wadsrc/static/actors/doom/doomimp.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR DoomImp { - Game Doom - SpawnID 5 Health 60 Radius 20 Height 56 @@ -66,8 +64,6 @@ ACTOR DoomImp //=========================================================================== ACTOR DoomImpBall { - Game Doom - SpawnID 10 Radius 6 Height 8 Speed 10 diff --git a/wadsrc/static/actors/doom/doomkeys.txt b/wadsrc/static/actors/doom/doomkeys.txt index 0b61af192..5472193af 100644 --- a/wadsrc/static/actors/doom/doomkeys.txt +++ b/wadsrc/static/actors/doom/doomkeys.txt @@ -10,8 +10,6 @@ Actor DoomKey : Key Actor BlueCard : DoomKey { - Game Doom - SpawnID 85 Inventory.Pickupmessage "$GOTBLUECARD" Inventory.Icon "STKEYS0" States @@ -27,8 +25,6 @@ Actor BlueCard : DoomKey Actor YellowCard : DoomKey { - Game Doom - SpawnID 87 Inventory.Pickupmessage "$GOTYELWCARD" Inventory.Icon "STKEYS1" States @@ -44,8 +40,6 @@ Actor YellowCard : DoomKey Actor RedCard : DoomKey { - Game Doom - SpawnID 86 Inventory.Pickupmessage "$GOTREDCARD" Inventory.Icon "STKEYS2" States @@ -61,8 +55,6 @@ Actor RedCard : DoomKey Actor BlueSkull : DoomKey { - Game Doom - SpawnID 90 Inventory.Pickupmessage "$GOTBLUESKUL" Inventory.Icon "STKEYS3" States @@ -78,8 +70,6 @@ Actor BlueSkull : DoomKey Actor YellowSkull : DoomKey { - Game Doom - SpawnID 88 Inventory.Pickupmessage "$GOTYELWSKUL" Inventory.Icon "STKEYS4" States @@ -95,8 +85,6 @@ Actor YellowSkull : DoomKey Actor RedSkull : DoomKey { - Game Doom - SpawnID 89 Inventory.Pickupmessage "$GOTREDSKUL" Inventory.Icon "STKEYS5" States diff --git a/wadsrc/static/actors/doom/doommisc.txt b/wadsrc/static/actors/doom/doommisc.txt index 0727726f8..d860f855a 100644 --- a/wadsrc/static/actors/doom/doommisc.txt +++ b/wadsrc/static/actors/doom/doommisc.txt @@ -2,8 +2,6 @@ ACTOR ExplosiveBarrel { - Game Doom - SpawnID 125 Health 20 Radius 10 Height 42 @@ -37,8 +35,6 @@ ACTOR ExplosiveBarrel ACTOR BulletPuff { - Game Doom - SpawnID 131 +NOBLOCKMAP +NOGRAVITY +ALLOWPARTICLES @@ -87,7 +83,6 @@ ACTOR DoomUnusedStates Actor EvilSceptre : ScoreItem { - Game Doom Inventory.PickupMessage "$BETA_BONUS3" States { @@ -99,7 +94,6 @@ Actor EvilSceptre : ScoreItem Actor UnholyBible : ScoreItem { - Game Doom Inventory.PickupMessage "$BETA_BONUS4" States { diff --git a/wadsrc/static/actors/doom/doomweapons.txt b/wadsrc/static/actors/doom/doomweapons.txt index ece9da40a..59ce07361 100644 --- a/wadsrc/static/actors/doom/doomweapons.txt +++ b/wadsrc/static/actors/doom/doomweapons.txt @@ -17,7 +17,6 @@ ACTOR DoomWeapon : Weapon ACTOR Fist : Weapon { - Game Doom Weapon.SelectionOrder 3700 Weapon.Kickback 100 Obituary "$OB_MPFIST" @@ -54,7 +53,6 @@ ACTOR Fist : Weapon ACTOR Pistol : DoomWeapon { - Game Doom Weapon.SelectionOrder 1900 Weapon.AmmoUse 1 Weapon.AmmoGive 20 @@ -99,8 +97,6 @@ ACTOR Pistol : DoomWeapon ACTOR Chainsaw : Weapon { - Game Doom - SpawnID 32 Weapon.Kickback 0 Weapon.SelectionOrder 2200 Weapon.UpSound "weapons/sawup" @@ -139,8 +135,6 @@ ACTOR Chainsaw : Weapon ACTOR Shotgun : DoomWeapon { - Game Doom - SpawnID 27 Weapon.SelectionOrder 1300 Weapon.AmmoUse 1 Weapon.AmmoGive 8 @@ -186,8 +180,6 @@ ACTOR Shotgun : DoomWeapon ACTOR SuperShotgun : DoomWeapon { - Game Doom - SpawnID 33 Weapon.SelectionOrder 400 Weapon.AmmoUse 2 Weapon.AmmoGive 8 @@ -240,8 +232,6 @@ ACTOR SuperShotgun : DoomWeapon ACTOR Chaingun : DoomWeapon { - Game Doom - SpawnID 28 Weapon.SelectionOrder 700 Weapon.AmmoUse 1 Weapon.AmmoGive 20 @@ -283,8 +273,6 @@ ACTOR Chaingun : DoomWeapon ACTOR RocketLauncher : DoomWeapon { - Game Doom - SpawnID 29 Weapon.SelectionOrder 2500 Weapon.AmmoUse 1 Weapon.AmmoGive 2 @@ -321,8 +309,6 @@ ACTOR RocketLauncher : DoomWeapon ACTOR Rocket { - Game Doom - SpawnID 127 Radius 11 Height 8 Speed 20 @@ -355,8 +341,6 @@ ACTOR Rocket ACTOR Grenade { - Game Doom - SpawnID 216 Radius 8 Height 8 Speed 25 @@ -406,8 +390,6 @@ ACTOR Grenade ACTOR PlasmaRifle : DoomWeapon { - Game Doom - SpawnID 30 Weapon.SelectionOrder 100 Weapon.AmmoUse 1 Weapon.AmmoGive 40 @@ -442,8 +424,6 @@ ACTOR PlasmaRifle : DoomWeapon ACTOR PlasmaBall { - Game Doom - SpawnID 51 Radius 13 Height 8 Speed 25 @@ -510,9 +490,7 @@ ACTOR PlasmaBall2 : PlasmaBall1 ACTOR BFG9000 : DoomWeapon { - Game Doom Height 20 - SpawnID 31 Weapon.SelectionOrder 2800 Weapon.AmmoUse 40 Weapon.AmmoGive 40 @@ -556,8 +534,6 @@ ACTOR BFG9000 : DoomWeapon ACTOR BFGBall { - Game Doom - SpawnID 128 Radius 13 Height 8 Speed 25 diff --git a/wadsrc/static/actors/doom/fatso.txt b/wadsrc/static/actors/doom/fatso.txt index b77f05b13..1ad40fd93 100644 --- a/wadsrc/static/actors/doom/fatso.txt +++ b/wadsrc/static/actors/doom/fatso.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR Fatso { - Game Doom - SpawnID 112 Health 600 Radius 48 Height 64 @@ -65,8 +63,6 @@ ACTOR Fatso //=========================================================================== ACTOR FatShot { - Game Doom - SpawnID 153 Radius 6 Height 8 Speed 20 diff --git a/wadsrc/static/actors/doom/keen.txt b/wadsrc/static/actors/doom/keen.txt index 2bdd2b343..2c07e5b32 100644 --- a/wadsrc/static/actors/doom/keen.txt +++ b/wadsrc/static/actors/doom/keen.txt @@ -5,7 +5,6 @@ //=========================================================================== ACTOR CommanderKeen { - Game Doom Health 100 Radius 16 Height 72 diff --git a/wadsrc/static/actors/doom/lostsoul.txt b/wadsrc/static/actors/doom/lostsoul.txt index f84d85488..80599d62a 100644 --- a/wadsrc/static/actors/doom/lostsoul.txt +++ b/wadsrc/static/actors/doom/lostsoul.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR LostSoul { - Game Doom - SpawnID 110 Health 100 Radius 16 Height 56 diff --git a/wadsrc/static/actors/doom/painelemental.txt b/wadsrc/static/actors/doom/painelemental.txt index 45d8afccd..5951afd6b 100644 --- a/wadsrc/static/actors/doom/painelemental.txt +++ b/wadsrc/static/actors/doom/painelemental.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR PainElemental { - Game Doom - SpawnID 115 Health 400 Radius 31 Height 56 diff --git a/wadsrc/static/actors/doom/possessed.txt b/wadsrc/static/actors/doom/possessed.txt index 42279317d..7dfee1f9e 100644 --- a/wadsrc/static/actors/doom/possessed.txt +++ b/wadsrc/static/actors/doom/possessed.txt @@ -6,8 +6,6 @@ //=========================================================================== ACTOR ZombieMan { - Game Doom - SpawnID 4 Health 20 Radius 20 Height 56 @@ -67,8 +65,6 @@ ACTOR ZombieMan //=========================================================================== ACTOR ShotgunGuy { - Game Doom - SpawnID 1 Health 30 Radius 20 Height 56 @@ -129,8 +125,6 @@ ACTOR ShotgunGuy //=========================================================================== ACTOR ChaingunGuy { - Game Doom - SpawnID 2 Health 70 Radius 20 Height 56 @@ -191,8 +185,6 @@ ACTOR ChaingunGuy //=========================================================================== ACTOR WolfensteinSS { - Game Doom - SpawnID 116 Health 50 Radius 20 Height 56 diff --git a/wadsrc/static/actors/doom/revenant.txt b/wadsrc/static/actors/doom/revenant.txt index 1d6b318c7..ce072bec4 100644 --- a/wadsrc/static/actors/doom/revenant.txt +++ b/wadsrc/static/actors/doom/revenant.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR Revenant { - Game Doom - SpawnID 20 Health 300 Radius 20 Height 56 @@ -70,8 +68,6 @@ ACTOR Revenant //=========================================================================== ACTOR RevenantTracer { - Game Doom - SpawnID 53 Radius 11 Height 8 Speed 10 diff --git a/wadsrc/static/actors/doom/scriptedmarine.txt b/wadsrc/static/actors/doom/scriptedmarine.txt index 6c5854ac7..7341498be 100644 --- a/wadsrc/static/actors/doom/scriptedmarine.txt +++ b/wadsrc/static/actors/doom/scriptedmarine.txt @@ -3,8 +3,6 @@ ACTOR ScriptedMarine native { - Game Doom - SpawnID 151 Health 100 Radius 16 Height 56 @@ -174,7 +172,6 @@ ACTOR ScriptedMarine native ACTOR MarineFist : ScriptedMarine { - Game Doom States { Melee: @@ -189,7 +186,6 @@ ACTOR MarineFist : ScriptedMarine ACTOR MarineBerserk : MarineFist { - Game Doom States { Melee: @@ -202,7 +198,6 @@ ACTOR MarineBerserk : MarineFist ACTOR MarineChainsaw : ScriptedMarine { - Game Doom States { Melee: @@ -218,7 +213,6 @@ ACTOR MarineChainsaw : ScriptedMarine ACTOR MarinePistol : ScriptedMarine { - Game Doom States { Missile: @@ -231,7 +225,6 @@ ACTOR MarinePistol : ScriptedMarine ACTOR MarineShotgun : ScriptedMarine { - Game Doom States { Missile: @@ -246,7 +239,6 @@ ACTOR MarineShotgun : ScriptedMarine ACTOR MarineSSG : ScriptedMarine { - Game Doom States { Missile: @@ -258,7 +250,6 @@ ACTOR MarineSSG : ScriptedMarine ACTOR MarineChaingun : ScriptedMarine { - Game Doom States { Missile: @@ -271,7 +262,6 @@ ACTOR MarineChaingun : ScriptedMarine ACTOR MarineRocket : MarineFist { - Game Doom States { Missile: @@ -284,7 +274,6 @@ ACTOR MarineRocket : MarineFist ACTOR MarinePlasma : ScriptedMarine { - Game Doom States { Missile: @@ -297,7 +286,6 @@ ACTOR MarinePlasma : ScriptedMarine ACTOR MarineRailgun : ScriptedMarine { - Game Doom States { Missile: @@ -310,7 +298,6 @@ ACTOR MarineRailgun : ScriptedMarine ACTOR MarineBFG : ScriptedMarine { - Game Doom States { Missile: diff --git a/wadsrc/static/actors/doom/spidermaster.txt b/wadsrc/static/actors/doom/spidermaster.txt index 8da894245..97ebbf143 100644 --- a/wadsrc/static/actors/doom/spidermaster.txt +++ b/wadsrc/static/actors/doom/spidermaster.txt @@ -5,8 +5,6 @@ //=========================================================================== ACTOR SpiderMastermind { - Game Doom - SpawnID 7 Health 3000 Radius 100 Height 100 diff --git a/wadsrc/static/actors/doom/stealthmonsters.txt b/wadsrc/static/actors/doom/stealthmonsters.txt index 5cc859ee0..5a35533ea 100644 --- a/wadsrc/static/actors/doom/stealthmonsters.txt +++ b/wadsrc/static/actors/doom/stealthmonsters.txt @@ -1,8 +1,6 @@ ACTOR StealthArachnotron : Arachnotron { - Game Doom - SpawnID 117 +STEALTH RenderStyle Translucent Alpha 0 @@ -11,8 +9,6 @@ ACTOR StealthArachnotron : Arachnotron ACTOR StealthArchvile : Archvile { - Game Doom - SpawnID 118 +STEALTH RenderStyle Translucent Alpha 0 @@ -21,8 +17,6 @@ ACTOR StealthArchvile : Archvile ACTOR StealthBaron : BaronOfHell { - Game Doom - SpawnID 100 +STEALTH RenderStyle Translucent Alpha 0 @@ -32,8 +26,6 @@ ACTOR StealthBaron : BaronOfHell ACTOR StealthCacodemon : Cacodemon { - Game Doom - SpawnID 119 +STEALTH RenderStyle Translucent Alpha 0 @@ -43,8 +35,6 @@ ACTOR StealthCacodemon : Cacodemon ACTOR StealthChaingunGuy : ChaingunGuy { - Game Doom - SpawnID 120 +STEALTH RenderStyle Translucent Alpha 0 @@ -53,8 +43,6 @@ ACTOR StealthChaingunGuy : ChaingunGuy ACTOR StealthDemon : Demon { - Game Doom - SpawnID 121 +STEALTH RenderStyle Translucent Alpha 0 @@ -64,8 +52,6 @@ ACTOR StealthDemon : Demon ACTOR StealthHellKnight : HellKnight { - Game Doom - SpawnID 101 +STEALTH RenderStyle Translucent Alpha 0 @@ -75,8 +61,6 @@ ACTOR StealthHellKnight : HellKnight ACTOR StealthDoomImp : DoomImp { - Game Doom - SpawnID 122 +STEALTH RenderStyle Translucent Alpha 0 @@ -86,8 +70,6 @@ ACTOR StealthDoomImp : DoomImp ACTOR StealthFatso : Fatso { - Game Doom - SpawnID 123 +STEALTH RenderStyle Translucent Alpha 0 @@ -96,8 +78,6 @@ ACTOR StealthFatso : Fatso ACTOR StealthRevenant : Revenant { - Game Doom - SpawnID 124 +STEALTH RenderStyle Translucent Alpha 0 @@ -107,8 +87,6 @@ ACTOR StealthRevenant : Revenant ACTOR StealthShotgunGuy : ShotgunGuy { - Game Doom - SpawnID 103 +STEALTH RenderStyle Translucent Alpha 0 @@ -117,8 +95,6 @@ ACTOR StealthShotgunGuy : ShotgunGuy ACTOR StealthZombieMan : ZombieMan { - Game Doom - SpawnID 102 +STEALTH RenderStyle Translucent Alpha 0 diff --git a/wadsrc/static/actors/heretic/beast.txt b/wadsrc/static/actors/heretic/beast.txt index 956f16dca..757414883 100644 --- a/wadsrc/static/actors/heretic/beast.txt +++ b/wadsrc/static/actors/heretic/beast.txt @@ -3,8 +3,6 @@ ACTOR Beast { - Game Heretic - SpawnID 3 Health 220 Radius 32 Height 74 @@ -61,8 +59,6 @@ ACTOR Beast ACTOR BeastBall { - Game Heretic - SpawnID 120 Radius 9 Height 8 Speed 12 diff --git a/wadsrc/static/actors/heretic/chicken.txt b/wadsrc/static/actors/heretic/chicken.txt index 029dca014..62982f944 100644 --- a/wadsrc/static/actors/heretic/chicken.txt +++ b/wadsrc/static/actors/heretic/chicken.txt @@ -113,8 +113,6 @@ ACTOR ChickenPlayer : PlayerPawn native ACTOR Chicken : MorphedMonster { - Game Heretic - SpawnID 122 Health 10 Radius 9 Height 22 @@ -164,8 +162,6 @@ ACTOR Chicken : MorphedMonster ACTOR Feather { - Game Heretic - SpawnID 121 Radius 2 Height 4 +MISSILE +DROPOFF diff --git a/wadsrc/static/actors/heretic/clink.txt b/wadsrc/static/actors/heretic/clink.txt index dd3bb4c85..f7a483331 100644 --- a/wadsrc/static/actors/heretic/clink.txt +++ b/wadsrc/static/actors/heretic/clink.txt @@ -1,8 +1,6 @@ ACTOR Clink { - Game Heretic - SpawnID 1 Health 150 Radius 20 Height 64 diff --git a/wadsrc/static/actors/heretic/dsparil.txt b/wadsrc/static/actors/heretic/dsparil.txt index 2b2efe3c6..47fada3e6 100644 --- a/wadsrc/static/actors/heretic/dsparil.txt +++ b/wadsrc/static/actors/heretic/dsparil.txt @@ -3,8 +3,6 @@ ACTOR BossSpot : SpecialSpot { - Game Heretic - SpawnID 141 +INVISIBLE } @@ -12,8 +10,6 @@ ACTOR BossSpot : SpecialSpot ACTOR Sorcerer1 { - Game Heretic - SpawnID 142 Health 2000 Radius 28 Height 100 @@ -84,8 +80,6 @@ ACTOR Sorcerer1 ACTOR SorcererFX1 { - Game Heretic - SpawnID 144 Radius 10 Height 10 Speed 20 @@ -112,8 +106,6 @@ ACTOR SorcererFX1 ACTOR Sorcerer2 { - Game Heretic - SpawnID 143 Health 3500 Radius 16 Height 70 @@ -192,8 +184,6 @@ ACTOR Sorcerer2 ACTOR Sorcerer2FX1 { - Game Heretic - SpawnID 145 Radius 10 Height 6 Speed 20 @@ -241,8 +231,6 @@ ACTOR Sorcerer2FXSpark ACTOR Sorcerer2FX2 { - Game Heretic - SpawnID 146 Radius 10 Height 6 Speed 6 diff --git a/wadsrc/static/actors/heretic/hereticammo.txt b/wadsrc/static/actors/heretic/hereticammo.txt index ee17bbdc8..cfbc29702 100644 --- a/wadsrc/static/actors/heretic/hereticammo.txt +++ b/wadsrc/static/actors/heretic/hereticammo.txt @@ -3,8 +3,6 @@ ACTOR GoldWandAmmo : Ammo { - Game Heretic - SpawnID 11 Inventory.PickupMessage "$TXT_AMMOGOLDWAND1" Inventory.Amount 10 Inventory.MaxAmount 100 @@ -23,8 +21,6 @@ ACTOR GoldWandAmmo : Ammo ACTOR GoldWandHefty : GoldWandAmmo { - Game Heretic - SpawnID 12 Inventory.PickupMessage "$TXT_AMMOGOLDWAND2" Inventory.Amount 50 States @@ -38,8 +34,6 @@ ACTOR GoldWandHefty : GoldWandAmmo ACTOR CrossbowAmmo : Ammo { - Game Heretic - SpawnID 33 Inventory.PickupMessage "$TXT_AMMOCROSSBOW1" Inventory.Amount 5 Inventory.MaxAmount 50 @@ -58,8 +52,6 @@ ACTOR CrossbowAmmo : Ammo ACTOR CrossbowHefty : CrossbowAmmo { - Game Heretic - SpawnID 34 Inventory.PickupMessage "$TXT_AMMOCROSSBOW2" Inventory.Amount 20 States @@ -73,8 +65,6 @@ ACTOR CrossbowHefty : CrossbowAmmo ACTOR MaceAmmo : Ammo { - Game Heretic - SpawnID 35 Inventory.PickupMessage "$TXT_AMMOMACE1" Inventory.Amount 20 Inventory.MaxAmount 150 @@ -93,8 +83,6 @@ ACTOR MaceAmmo : Ammo ACTOR MaceHefty : MaceAmmo { - Game Heretic - SpawnID 36 Inventory.PickupMessage "$TXT_AMMOMACE2" Inventory.Amount 100 States @@ -109,8 +97,6 @@ ACTOR MaceHefty : MaceAmmo ACTOR BlasterAmmo : Ammo { - Game Heretic - SpawnID 37 Inventory.PickupMessage "$TXT_AMMOBLASTER1" Inventory.Amount 10 Inventory.MaxAmount 200 @@ -129,8 +115,6 @@ ACTOR BlasterAmmo : Ammo ACTOR BlasterHefty : BlasterAmmo { - Game Heretic - SpawnID 38 Inventory.PickupMessage "$TXT_AMMOBLASTER2" Inventory.Amount 25 States @@ -145,8 +129,6 @@ ACTOR BlasterHefty : BlasterAmmo ACTOR SkullRodAmmo : Ammo { - Game Heretic - SpawnID 158 Inventory.PickupMessage "$TXT_AMMOSKULLROD1" Inventory.Amount 20 Inventory.MaxAmount 200 @@ -165,8 +147,6 @@ ACTOR SkullRodAmmo : Ammo ACTOR SkullRodHefty : SkullRodAmmo { - Game Heretic - SpawnID 159 Inventory.PickupMessage "$TXT_AMMOSKULLROD2" Inventory.Amount 100 States @@ -181,8 +161,6 @@ ACTOR SkullRodHefty : SkullRodAmmo ACTOR PhoenixRodAmmo : Ammo { - Game Heretic - SpawnID 161 Inventory.PickupMessage "$TXT_AMMOPHOENIXROD1" Inventory.Amount 1 Inventory.MaxAmount 20 @@ -200,8 +178,6 @@ ACTOR PhoenixRodAmmo : Ammo ACTOR PhoenixRodHefty : PhoenixRodAmmo { - Game Heretic - SpawnID 162 Inventory.PickupMessage "$TXT_AMMOPHOENIXROD2" Inventory.Amount 10 States @@ -216,8 +192,6 @@ ACTOR PhoenixRodHefty : PhoenixRodAmmo ACTOR BagOfHolding : BackpackItem { - Game Heretic - SpawnID 136 Inventory.PickupMessage "$TXT_ITEMBAGOFHOLDING" +COUNTITEM +FLOATBOB diff --git a/wadsrc/static/actors/heretic/hereticarmor.txt b/wadsrc/static/actors/heretic/hereticarmor.txt index 5f2658d9d..c6e28b030 100644 --- a/wadsrc/static/actors/heretic/hereticarmor.txt +++ b/wadsrc/static/actors/heretic/hereticarmor.txt @@ -3,8 +3,6 @@ Actor SilverShield : BasicArmorPickup { - Game Heretic - SpawnID 68 +FLOATBOB Inventory.Pickupmessage "$TXT_ITEMSHIELD1" Inventory.Icon "SHLDA0" @@ -22,8 +20,6 @@ Actor SilverShield : BasicArmorPickup Actor EnchantedShield : BasicArmorPickup { - Game Heretic - SpawnID 69 +FLOATBOB Inventory.Pickupmessage "$TXT_ITEMSHIELD2" Inventory.Icon "SHD2A0" diff --git a/wadsrc/static/actors/heretic/hereticartifacts.txt b/wadsrc/static/actors/heretic/hereticartifacts.txt index 50f7c45e1..91e954b1b 100644 --- a/wadsrc/static/actors/heretic/hereticartifacts.txt +++ b/wadsrc/static/actors/heretic/hereticartifacts.txt @@ -2,8 +2,6 @@ ACTOR SuperMap : MapRevealer { - Game Heretic - SpawnID 137 +COUNTITEM +INVENTORY.ALWAYSPICKUP +FLOATBOB @@ -22,8 +20,6 @@ ACTOR SuperMap : MapRevealer ACTOR ArtiInvisibility : PowerupGiver { - Game Heretic - SpawnID 135 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -47,8 +43,6 @@ ACTOR ArtiInvisibility : PowerupGiver ACTOR ArtiTomeOfPower : PowerupGiver native { - Game Heretic - SpawnID 134 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -90,8 +84,6 @@ ACTOR ActivatedTimeBomb ACTOR ArtiTimeBomb : Inventory native { - Game Heretic - SpawnID 72 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH diff --git a/wadsrc/static/actors/heretic/hereticdecorations.txt b/wadsrc/static/actors/heretic/hereticdecorations.txt index 2713d3378..27bd98540 100644 --- a/wadsrc/static/actors/heretic/hereticdecorations.txt +++ b/wadsrc/static/actors/heretic/hereticdecorations.txt @@ -1,6 +1,5 @@ ACTOR SkullHang70 { - Game Heretic Radius 20 Height 70 +SPAWNCEILING @@ -15,7 +14,6 @@ ACTOR SkullHang70 ACTOR SkullHang60 { - Game Heretic Radius 20 Height 60 +SPAWNCEILING @@ -30,7 +28,6 @@ ACTOR SkullHang60 ACTOR SkullHang45 { - Game Heretic Radius 20 Height 45 +SPAWNCEILING @@ -45,7 +42,6 @@ ACTOR SkullHang45 ACTOR SkullHang35 { - Game Heretic Radius 20 Height 35 +SPAWNCEILING @@ -60,7 +56,6 @@ ACTOR SkullHang35 ACTOR Chandelier { - Game Heretic Radius 20 Height 60 +SPAWNCEILING @@ -75,7 +70,6 @@ ACTOR Chandelier ACTOR SerpentTorch { - Game Heretic Radius 12 Height 54 +SOLID @@ -89,7 +83,6 @@ ACTOR SerpentTorch ACTOR SmallPillar { - Game Heretic Radius 16 Height 34 +SOLID @@ -103,7 +96,6 @@ ACTOR SmallPillar ACTOR StalagmiteSmall { - Game Heretic Radius 8 Height 32 +SOLID @@ -117,7 +109,6 @@ ACTOR StalagmiteSmall ACTOR StalagmiteLarge { - Game Heretic Radius 12 Height 64 +SOLID @@ -131,7 +122,6 @@ ACTOR StalagmiteLarge ACTOR StalactiteSmall { - Game Heretic Radius 8 Height 36 +SOLID @@ -147,7 +137,6 @@ ACTOR StalactiteSmall ACTOR StalactiteLarge { - Game Heretic Radius 12 Height 68 +SOLID @@ -163,7 +152,6 @@ ACTOR StalactiteLarge ACTOR FireBrazier { - Game Heretic Radius 16 Height 44 +SOLID @@ -177,7 +165,6 @@ ACTOR FireBrazier ACTOR Barrel { - Game Heretic Radius 12 Height 32 +SOLID @@ -191,7 +178,6 @@ ACTOR Barrel ACTOR BrownPillar { - Game Heretic Radius 14 Height 128 +SOLID @@ -205,7 +191,6 @@ ACTOR BrownPillar ACTOR Moss1 { - Game Heretic Radius 20 Height 23 +SPAWNCEILING @@ -220,7 +205,6 @@ ACTOR Moss1 ACTOR Moss2 { - Game Heretic Radius 20 Height 27 +SPAWNCEILING @@ -235,7 +219,6 @@ ACTOR Moss2 ACTOR WallTorch { - Game Heretic Radius 6 Height 16 +NOGRAVITY @@ -250,7 +233,6 @@ ACTOR WallTorch ACTOR HangingCorpse { - Game Heretic Radius 8 Height 104 +SOLID diff --git a/wadsrc/static/actors/heretic/hereticimp.txt b/wadsrc/static/actors/heretic/hereticimp.txt index 9a5c30c63..b91cf1160 100644 --- a/wadsrc/static/actors/heretic/hereticimp.txt +++ b/wadsrc/static/actors/heretic/hereticimp.txt @@ -3,8 +3,6 @@ ACTOR HereticImp { - Game Heretic - SpawnID 5 Health 40 Radius 16 Height 36 @@ -80,8 +78,6 @@ ACTOR HereticImp ACTOR HereticImpLeader : HereticImp { - Game Heretic - SpawnID 7 Species "HereticImpLeader" Health 80 -MISSILEMORE @@ -135,8 +131,6 @@ ACTOR HereticImpChunk2 ACTOR HereticImpBall { - Game Heretic - SpawnID 10 Radius 8 Height 8 Speed 10 diff --git a/wadsrc/static/actors/heretic/heretickeys.txt b/wadsrc/static/actors/heretic/heretickeys.txt index 3a34fe144..69d906e55 100644 --- a/wadsrc/static/actors/heretic/heretickeys.txt +++ b/wadsrc/static/actors/heretic/heretickeys.txt @@ -10,8 +10,6 @@ ACTOR HereticKey : Key ACTOR KeyGreen : HereticKey { - Game Heretic - SpawnID 86 Inventory.PickupMessage "$TXT_GOTGREENKEY" Inventory.Icon "GKEYICON" States @@ -26,8 +24,6 @@ ACTOR KeyGreen : HereticKey ACTOR KeyBlue : HereticKey { - Game Heretic - SpawnID 85 Inventory.PickupMessage "$TXT_GOTBLUEKEY" Inventory.Icon "BKEYICON" States @@ -42,8 +38,6 @@ ACTOR KeyBlue : HereticKey ACTOR KeyYellow : HereticKey { - Game Heretic - SpawnID 87 Inventory.PickupMessage "$TXT_GOTYELLOWKEY" Inventory.Icon "YKEYICON" States @@ -59,7 +53,6 @@ ACTOR KeyYellow : HereticKey ACTOR KeyGizmoBlue { - Game Heretic Radius 16 Height 50 +SOLID @@ -91,7 +84,6 @@ ACTOR KeyGizmoFloatBlue ACTOR KeyGizmoGreen { - Game Heretic Radius 16 Height 50 +SOLID @@ -123,7 +115,6 @@ ACTOR KeyGizmoFloatGreen ACTOR KeyGizmoYellow { - Game Heretic Radius 16 Height 50 +SOLID diff --git a/wadsrc/static/actors/heretic/hereticmisc.txt b/wadsrc/static/actors/heretic/hereticmisc.txt index 5231f819d..a8ef81b5d 100644 --- a/wadsrc/static/actors/heretic/hereticmisc.txt +++ b/wadsrc/static/actors/heretic/hereticmisc.txt @@ -3,8 +3,6 @@ ACTOR Pod { - Game Heretic - SpawnID 125 Health 45 Radius 16 Height 54 @@ -64,8 +62,6 @@ ACTOR PodGoo ACTOR PodGenerator { - Game Heretic - SpawnID 126 +NOBLOCKMAP +NOSECTOR +DONTSPLASH @@ -86,8 +82,6 @@ ACTOR PodGenerator ACTOR TeleGlitterGenerator1 { - Game Heretic - SpawnID 166 +NOBLOCKMAP +NOGRAVITY +DONTSPLASH @@ -104,8 +98,6 @@ ACTOR TeleGlitterGenerator1 ACTOR TeleGlitterGenerator2 { - Game Heretic - SpawnID 167 +NOBLOCKMAP +NOGRAVITY +DONTSPLASH @@ -162,8 +154,6 @@ ACTOR TeleGlitter2 : TeleGlitter1 ACTOR Volcano { - Game Heretic - SpawnID 150 Radius 12 Height 20 +SOLID @@ -187,8 +177,6 @@ ACTOR Volcano ACTOR VolcanoBlast { - Game Heretic - SpawnID 123 Radius 8 Height 8 Speed 2 @@ -219,8 +207,6 @@ ACTOR VolcanoBlast ACTOR VolcanoTBlast { - Game Heretic - SpawnID 124 Radius 8 Height 6 Speed 2 diff --git a/wadsrc/static/actors/heretic/hereticweaps.txt b/wadsrc/static/actors/heretic/hereticweaps.txt index f41a84f87..711c3fd29 100644 --- a/wadsrc/static/actors/heretic/hereticweaps.txt +++ b/wadsrc/static/actors/heretic/hereticweaps.txt @@ -9,7 +9,6 @@ ACTOR HereticWeapon : Weapon ACTOR Staff : HereticWeapon { - Game Heretic Weapon.SelectionOrder 3800 +THRUGHOST +WIMPY_WEAPON @@ -41,7 +40,6 @@ ACTOR Staff : HereticWeapon ACTOR StaffPowered : Staff { - Game Heretic Weapon.sisterweapon "Staff" Weapon.ReadySound "weapons/staffcrackle" +WEAPON.POWERED_UP @@ -112,7 +110,6 @@ ACTOR StaffPuff2 ACTOR GoldWand : HereticWeapon { - Game Heretic +BLOODSPLATTER Weapon.SelectionOrder 2000 Weapon.AmmoGive 25 @@ -151,7 +148,6 @@ ACTOR GoldWand : HereticWeapon ACTOR GoldWandPowered : GoldWand { - Game Heretic +WEAPON.POWERED_UP Weapon.AmmoGive 0 Weapon.SisterWeapon "GoldWand" @@ -176,8 +172,6 @@ ACTOR GoldWandPowered : GoldWand ACTOR GoldWandFX1 { - Game Heretic - SpawnID 151 Radius 10 Height 6 Speed 22 @@ -201,8 +195,6 @@ ACTOR GoldWandFX1 ACTOR GoldWandFX2 : GoldWandFX1 { - Game Heretic - SpawnID 152 Speed 18 Damage 1 DeathSound "" @@ -250,8 +242,6 @@ ACTOR GoldWandPuff2 : GoldWandFX1 ACTOR Crossbow : HereticWeapon { - Game Heretic - SpawnID 27 Weapon.SelectionOrder 800 Weapon.AmmoUse 1 Weapon.AmmoGive 10 @@ -289,7 +279,6 @@ ACTOR Crossbow : HereticWeapon ACTOR CrossbowPowered : Crossbow { - Game Heretic +WEAPON.POWERED_UP Weapon.AmmoGive 0 Weapon.SisterWeapon "Crossbow" @@ -317,8 +306,6 @@ ACTOR CrossbowPowered : Crossbow ACTOR CrossbowFX1 { - Game Heretic - SpawnID 147 Radius 11 Height 8 Speed 30 @@ -344,8 +331,6 @@ ACTOR CrossbowFX1 ACTOR CrossbowFX2 : CrossbowFX1 { - Game Heretic - SpawnID 148 Speed 32 Damage 6 Obituary "$OB_MPPCROSSBOW" @@ -361,8 +346,6 @@ ACTOR CrossbowFX2 : CrossbowFX1 ACTOR CrossbowFX3 : CrossbowFX1 { - Game Heretic - SpawnID 149 Speed 20 Damage 2 SeeSound "" @@ -402,8 +385,6 @@ ACTOR CrossbowFX4 ACTOR Gauntlets : Weapon { - Game Heretic - SpawnID 32 +BLOODSPLATTER Weapon.SelectionOrder 2300 +WEAPON.WIMPY_WEAPON @@ -446,7 +427,6 @@ ACTOR Gauntlets : Weapon ACTOR GauntletsPowered : Gauntlets { - Game Heretic +POWERED_UP Tag "$TAG_GAUNTLETSP" Obituary "$OB_MPPGAUNTLETS" @@ -509,8 +489,6 @@ ACTOR GauntletPuff2 : GauntletPuff1 ACTOR Mace : HereticWeapon { - Game Heretic - SpawnID 31 Weapon.SelectionOrder 1400 Weapon.AmmoUse 1 Weapon.AmmoGive1 50 @@ -548,7 +526,6 @@ ACTOR Mace : HereticWeapon ACTOR MacePowered : Mace { - Game Heretic +WEAPON.POWERED_UP Weapon.AmmoUse 5 Weapon.AmmoGive 0 @@ -573,8 +550,6 @@ ACTOR MacePowered : Mace ACTOR MaceFX1 { - Game Heretic - SpawnID 154 Radius 8 Height 6 Speed 20 @@ -604,8 +579,6 @@ ACTOR MaceFX1 ACTOR MaceFX2 : MaceFX1 { - Game Heretic - SpawnID 156 Speed 10 Damage 6 Gravity 0.125 @@ -629,8 +602,6 @@ ACTOR MaceFX2 : MaceFX1 ACTOR MaceFX3 : MaceFX1 { - Game Heretic - SpawnID 155 Speed 7 Damage 4 -NOGRAVITY @@ -648,8 +619,6 @@ ACTOR MaceFX3 : MaceFX1 ACTOR MaceFX4 native { - Game Heretic - SpawnID 153 Radius 8 Height 6 Speed 7 @@ -683,7 +652,6 @@ ACTOR MaceFX4 native ACTOR MaceSpawner : SpecialSpot { - Game Heretic +NOSECTOR +NOBLOCKMAP States @@ -700,8 +668,6 @@ ACTOR MaceSpawner : SpecialSpot ACTOR Blaster : HereticWeapon { - Game Heretic - SpawnID 28 +BLOODSPLATTER Weapon.SelectionOrder 500 Weapon.AmmoUse 1 @@ -741,7 +707,6 @@ ACTOR Blaster : HereticWeapon ACTOR BlasterPowered : Blaster { - Game Heretic +WEAPON.POWERED_UP Weapon.AmmoUse 5 Weapon.AmmoGive 0 @@ -809,8 +774,6 @@ ACTOR BlasterSmoke ACTOR Ripper native { - Game Heretic - SpawnID 157 Radius 8 Height 6 Speed 14 @@ -856,8 +819,6 @@ ACTOR BlasterPuff ACTOR SkullRod : HereticWeapon { - Game Heretic - SpawnID 30 Weapon.SelectionOrder 200 Weapon.AmmoUse1 1 Weapon.AmmoGive1 50 @@ -892,7 +853,6 @@ ACTOR SkullRod : HereticWeapon ACTOR SkullRodPowered : SkullRod { - Game Heretic +WEAPON.POWERED_UP Weapon.AmmoUse1 5 Weapon.AmmoGive1 0 @@ -921,8 +881,6 @@ ACTOR SkullRodPowered : SkullRod ACTOR HornRodFX1 { - Game Heretic - SpawnID 160 Radius 12 Height 8 Speed 22 @@ -1030,8 +988,6 @@ ACTOR RainTracker : Inventory native ACTOR PhoenixRod : Weapon native { - Game Heretic - SpawnID 29 +WEAPON.NOAUTOFIRE Weapon.SelectionOrder 2600 Weapon.Kickback 150 @@ -1070,7 +1026,6 @@ ACTOR PhoenixRod : Weapon native ACTOR PhoenixRodPowered : PhoenixRod native { - Game Heretic +WEAPON.POWERED_UP +WEAPON.MELEEWEAPON Weapon.SisterWeapon "PhoenixRod" @@ -1098,8 +1053,6 @@ ACTOR PhoenixRodPowered : PhoenixRod native ACTOR PhoenixFX1 native { - Game Heretic - SpawnID 163 Radius 11 Height 8 Speed 20 diff --git a/wadsrc/static/actors/heretic/ironlich.txt b/wadsrc/static/actors/heretic/ironlich.txt index 5d9cfa7c0..4b3527a4f 100644 --- a/wadsrc/static/actors/heretic/ironlich.txt +++ b/wadsrc/static/actors/heretic/ironlich.txt @@ -3,8 +3,6 @@ ACTOR Ironlich { - Game Heretic - SpawnID 20 Health 700 Radius 40 Height 72 @@ -59,8 +57,6 @@ ACTOR Ironlich ACTOR HeadFX1 { - Game Heretic - SpawnID 164 Radius 12 Height 6 Speed 13 @@ -147,8 +143,6 @@ ACTOR HeadFX3 ACTOR Whirlwind native { - Game Heretic - SpawnID 165 Radius 16 Height 74 Speed 10 diff --git a/wadsrc/static/actors/heretic/knight.txt b/wadsrc/static/actors/heretic/knight.txt index 55ce2728c..4249f9549 100644 --- a/wadsrc/static/actors/heretic/knight.txt +++ b/wadsrc/static/actors/heretic/knight.txt @@ -3,8 +3,6 @@ ACTOR Knight { - Game Heretic - SpawnID 6 Health 200 Radius 24 Height 78 @@ -62,8 +60,6 @@ ACTOR Knight ACTOR KnightGhost : Knight { - Game Heretic - SpawnID 129 +SHADOW +GHOST RenderStyle Translucent @@ -74,8 +70,6 @@ ACTOR KnightGhost : Knight ACTOR KnightAxe { - Game Heretic - SpawnID 127 Radius 10 Height 8 Speed 9 @@ -105,8 +99,6 @@ ACTOR KnightAxe ACTOR RedAxe : KnightAxe { - Game Heretic - SpawnID 128 +NOBLOCKMAP -WINDTHRUST Damage 7 diff --git a/wadsrc/static/actors/heretic/mummy.txt b/wadsrc/static/actors/heretic/mummy.txt index 57b54c622..46e9deaba 100644 --- a/wadsrc/static/actors/heretic/mummy.txt +++ b/wadsrc/static/actors/heretic/mummy.txt @@ -3,8 +3,6 @@ ACTOR Mummy { - Game Heretic - SpawnID 4 Health 80 Radius 22 Height 62 @@ -53,8 +51,6 @@ ACTOR Mummy ACTOR MummyLeader : Mummy { - Game Heretic - SpawnID 2 Species "MummyLeader" Health 100 Painchance 64 @@ -76,8 +72,6 @@ ACTOR MummyLeader : Mummy ACTOR MummyGhost : Mummy { - Game Heretic - SpawnID 8 +SHADOW +GHOST RenderStyle Translucent @@ -88,8 +82,6 @@ ACTOR MummyGhost : Mummy ACTOR MummyLeaderGhost : MummyLeader { - Game Heretic - SpawnID 9 Species "MummyLeaderGhost" +SHADOW +GHOST @@ -116,8 +108,6 @@ ACTOR MummySoul ACTOR MummyFX1 { - Game Heretic - SpawnID 131 Radius 8 Height 14 Speed 9 diff --git a/wadsrc/static/actors/heretic/snake.txt b/wadsrc/static/actors/heretic/snake.txt index 1f7af5e51..93ed830db 100644 --- a/wadsrc/static/actors/heretic/snake.txt +++ b/wadsrc/static/actors/heretic/snake.txt @@ -1,8 +1,6 @@ ACTOR Snake { - Game Heretic - SpawnID 132 Health 280 Radius 22 Height 70 @@ -50,8 +48,6 @@ ACTOR Snake ACTOR SnakeProjA { - Game Heretic - SpawnID 138 Radius 12 Height 8 Speed 14 @@ -82,8 +78,6 @@ ACTOR SnakeProjA ACTOR SnakeProjB : SnakeProjA { - Game Heretic - SpawnID 139 Damage 3 +NOBLOCKMAP -WINDTHRUST diff --git a/wadsrc/static/actors/heretic/wizard.txt b/wadsrc/static/actors/heretic/wizard.txt index 5ea30d77d..f8f59a0ac 100644 --- a/wadsrc/static/actors/heretic/wizard.txt +++ b/wadsrc/static/actors/heretic/wizard.txt @@ -3,8 +3,6 @@ ACTOR Wizard { - Game Heretic - SpawnID 19 Health 180 Radius 16 Height 68 @@ -75,8 +73,6 @@ ACTOR Wizard ACTOR WizardFX1 { - Game Heretic - SpawnID 140 Radius 10 Height 6 Speed 18 diff --git a/wadsrc/static/actors/hexen/bats.txt b/wadsrc/static/actors/hexen/bats.txt index 79518a4e5..e7c5b9de7 100644 --- a/wadsrc/static/actors/hexen/bats.txt +++ b/wadsrc/static/actors/hexen/bats.txt @@ -3,7 +3,6 @@ ACTOR BatSpawner : SwitchableDecoration { - Game Hexen +NOBLOCKMAP +NOSECTOR +NOGRAVITY RenderStyle None diff --git a/wadsrc/static/actors/hexen/bishop.txt b/wadsrc/static/actors/hexen/bishop.txt index 67d3a753c..6d08d8d7b 100644 --- a/wadsrc/static/actors/hexen/bishop.txt +++ b/wadsrc/static/actors/hexen/bishop.txt @@ -3,8 +3,6 @@ ACTOR Bishop { - Game Hexen - SpawnID 19 Health 130 Radius 22 Height 65 @@ -81,7 +79,6 @@ ACTOR Bishop ACTOR BishopPuff { - Game Hexen +NOBLOCKMAP +NOGRAVITY RenderStyle Translucent Alpha 0.6 @@ -99,7 +96,6 @@ ACTOR BishopPuff ACTOR BishopPainBlur { - Game Hexen +NOBLOCKMAP +NOGRAVITY RenderStyle Translucent Alpha 0.6 @@ -115,7 +111,6 @@ ACTOR BishopPainBlur ACTOR BishopFX { - Game Hexen Radius 10 Height 6 Speed 10 diff --git a/wadsrc/static/actors/hexen/blastradius.txt b/wadsrc/static/actors/hexen/blastradius.txt index 6f3fe76ea..47802de5d 100644 --- a/wadsrc/static/actors/hexen/blastradius.txt +++ b/wadsrc/static/actors/hexen/blastradius.txt @@ -1,8 +1,6 @@ ACTOR ArtiBlastRadius : CustomInventory { - Game Hexen - SpawnID 74 +FLOATBOB Inventory.DefMaxAmount Inventory.PickupFlash "PickupFlash" diff --git a/wadsrc/static/actors/hexen/boostarmor.txt b/wadsrc/static/actors/hexen/boostarmor.txt index aface7971..f06ffa7ca 100644 --- a/wadsrc/static/actors/hexen/boostarmor.txt +++ b/wadsrc/static/actors/hexen/boostarmor.txt @@ -3,8 +3,6 @@ ACTOR ArtiBoostArmor : Inventory native { - Game Hexen - SpawnID 22 +COUNTITEM +FLOATBOB Inventory.DefMaxAmount diff --git a/wadsrc/static/actors/hexen/centaur.txt b/wadsrc/static/actors/hexen/centaur.txt index b59f79104..7ea7f5f32 100644 --- a/wadsrc/static/actors/hexen/centaur.txt +++ b/wadsrc/static/actors/hexen/centaur.txt @@ -2,8 +2,6 @@ ACTOR Centaur { - Game Hexen - SpawnID 1 Health 200 Painchance 135 Speed 13 @@ -80,8 +78,6 @@ ACTOR Centaur ACTOR CentaurLeader : Centaur { - Game Hexen - SpawnID 2 Health 250 PainChance 96 Speed 10 @@ -105,8 +101,6 @@ ACTOR CentaurLeader : Centaur ACTOR CentaurMash : Centaur { - Game Hexen - SpawnID 103 +NOBLOOD +BLASTED -TELESTOMP diff --git a/wadsrc/static/actors/hexen/clericboss.txt b/wadsrc/static/actors/hexen/clericboss.txt index ee8d4b1e5..e3b028b32 100644 --- a/wadsrc/static/actors/hexen/clericboss.txt +++ b/wadsrc/static/actors/hexen/clericboss.txt @@ -3,7 +3,6 @@ ACTOR ClericBoss { - Game Hexen Health 800 PainChance 50 Speed 25 diff --git a/wadsrc/static/actors/hexen/clericflame.txt b/wadsrc/static/actors/hexen/clericflame.txt index 9bb698362..c467c8469 100644 --- a/wadsrc/static/actors/hexen/clericflame.txt +++ b/wadsrc/static/actors/hexen/clericflame.txt @@ -3,7 +3,6 @@ ACTOR CWeapFlame : ClericWeapon { - Game Hexen +NOGRAVITY Weapon.SelectionOrder 1000 Weapon.AmmoUse 4 diff --git a/wadsrc/static/actors/hexen/clericholy.txt b/wadsrc/static/actors/hexen/clericholy.txt index e4f1d808b..745d58fd8 100644 --- a/wadsrc/static/actors/hexen/clericholy.txt +++ b/wadsrc/static/actors/hexen/clericholy.txt @@ -14,8 +14,6 @@ ACTOR ClericWeaponPiece : WeaponPiece ACTOR CWeaponPiece1 : ClericWeaponPiece { - Game Hexen - SpawnID 33 WeaponPiece.Number 1 States { @@ -29,8 +27,6 @@ ACTOR CWeaponPiece1 : ClericWeaponPiece ACTOR CWeaponPiece2 : ClericWeaponPiece { - Game Hexen - SpawnID 34 WeaponPiece.Number 2 States { @@ -44,8 +40,6 @@ ACTOR CWeaponPiece2 : ClericWeaponPiece ACTOR CWeaponPiece3 : ClericWeaponPiece { - Game Hexen - SpawnID 35 WeaponPiece.Number 3 States { @@ -72,7 +66,6 @@ ACTOR WraithvergeDrop ACTOR CWeapWraithverge : ClericWeapon native { - Game Hexen Health 3 Weapon.SelectionOrder 3000 +WEAPON.PRIMARY_USES_BOTH diff --git a/wadsrc/static/actors/hexen/clericmace.txt b/wadsrc/static/actors/hexen/clericmace.txt index 14ef4b00f..bbeda50aa 100644 --- a/wadsrc/static/actors/hexen/clericmace.txt +++ b/wadsrc/static/actors/hexen/clericmace.txt @@ -3,7 +3,6 @@ ACTOR CWeapMace : ClericWeapon { - Game Hexen Weapon.SelectionOrder 3500 Weapon.KickBack 150 Weapon.YAdjust -8 diff --git a/wadsrc/static/actors/hexen/clericstaff.txt b/wadsrc/static/actors/hexen/clericstaff.txt index 9b5b050d7..7a2926023 100644 --- a/wadsrc/static/actors/hexen/clericstaff.txt +++ b/wadsrc/static/actors/hexen/clericstaff.txt @@ -3,8 +3,6 @@ ACTOR CWeapStaff : ClericWeapon { - Game Hexen - SpawnID 32 Weapon.SelectionOrder 1600 Weapon.AmmoUse1 1 Weapon.AmmoGive1 25 diff --git a/wadsrc/static/actors/hexen/demons.txt b/wadsrc/static/actors/hexen/demons.txt index f6bb7a1bf..561608f64 100644 --- a/wadsrc/static/actors/hexen/demons.txt +++ b/wadsrc/static/actors/hexen/demons.txt @@ -3,8 +3,6 @@ ACTOR Demon1 { - Game Hexen - SpawnID 3 Health 250 Painchance 50 Speed 13 @@ -70,8 +68,6 @@ ACTOR Demon1 ACTOR Demon1Mash : Demon1 { - Game Hexen - SpawnID 100 +NOBLOOD +BLASTED -TELESTOMP @@ -214,7 +210,6 @@ ACTOR Demon1FX1 ACTOR Demon2 : Demon1 { - Game Hexen Obituary "$OB_DEMON2" Species "Demon2" States @@ -262,8 +257,6 @@ ACTOR Demon2 : Demon1 ACTOR Demon2Mash : Demon2 { - Game Hexen - SpawnID 101 +NOBLOOD +BLASTED -TELESTOMP diff --git a/wadsrc/static/actors/hexen/dragon.txt b/wadsrc/static/actors/hexen/dragon.txt index 811f1a4b1..ea3b01293 100644 --- a/wadsrc/static/actors/hexen/dragon.txt +++ b/wadsrc/static/actors/hexen/dragon.txt @@ -3,7 +3,6 @@ ACTOR Dragon { - Game Hexen Health 640 PainChance 128 Speed 10 diff --git a/wadsrc/static/actors/hexen/ettin.txt b/wadsrc/static/actors/hexen/ettin.txt index 98d70c995..04f920aa1 100644 --- a/wadsrc/static/actors/hexen/ettin.txt +++ b/wadsrc/static/actors/hexen/ettin.txt @@ -3,8 +3,6 @@ ACTOR Ettin { - Game Hexen - SpawnID 4 Health 175 Radius 25 Height 68 @@ -91,8 +89,6 @@ ACTOR EttinMace ACTOR EttinMash : Ettin { - Game Hexen - SpawnID 102 +NOBLOOD +NOICEDEATH RenderStyle Translucent diff --git a/wadsrc/static/actors/hexen/fighteraxe.txt b/wadsrc/static/actors/hexen/fighteraxe.txt index f7b7ae4bf..b3bea4007 100644 --- a/wadsrc/static/actors/hexen/fighteraxe.txt +++ b/wadsrc/static/actors/hexen/fighteraxe.txt @@ -3,8 +3,6 @@ ACTOR FWeapAxe : FighterWeapon native { - Game Hexen - SpawnID 27 Weapon.SelectionOrder 1500 +WEAPON.AXEBLOOD +WEAPON.AMMO_OPTIONAL +WEAPON.MELEEWEAPON Weapon.AmmoUse1 2 diff --git a/wadsrc/static/actors/hexen/fighterboss.txt b/wadsrc/static/actors/hexen/fighterboss.txt index 5f5e20f1e..a41dd422c 100644 --- a/wadsrc/static/actors/hexen/fighterboss.txt +++ b/wadsrc/static/actors/hexen/fighterboss.txt @@ -3,7 +3,6 @@ ACTOR FighterBoss { - Game Hexen health 800 PainChance 50 Speed 25 diff --git a/wadsrc/static/actors/hexen/fighterfist.txt b/wadsrc/static/actors/hexen/fighterfist.txt index 0122d7f74..43a8b9862 100644 --- a/wadsrc/static/actors/hexen/fighterfist.txt +++ b/wadsrc/static/actors/hexen/fighterfist.txt @@ -3,7 +3,6 @@ ACTOR FWeapFist : FighterWeapon { - Game Hexen +BLOODSPLATTER Weapon.SelectionOrder 3400 +WEAPON.MELEEWEAPON diff --git a/wadsrc/static/actors/hexen/fighterhammer.txt b/wadsrc/static/actors/hexen/fighterhammer.txt index 9cfa4f066..f2b53ea93 100644 --- a/wadsrc/static/actors/hexen/fighterhammer.txt +++ b/wadsrc/static/actors/hexen/fighterhammer.txt @@ -3,8 +3,6 @@ ACTOR FWeapHammer : FighterWeapon { - Game Hexen - SpawnID 28 +BLOODSPLATTER Weapon.SelectionOrder 900 +WEAPON.AMMO_OPTIONAL +WEAPON.MELEEWEAPON diff --git a/wadsrc/static/actors/hexen/fighterplayer.txt b/wadsrc/static/actors/hexen/fighterplayer.txt index 809b1f9e9..14f28b3a8 100644 --- a/wadsrc/static/actors/hexen/fighterplayer.txt +++ b/wadsrc/static/actors/hexen/fighterplayer.txt @@ -104,7 +104,6 @@ ACTOR FighterPlayer : PlayerPawn Actor BloodyFighterSkull : PlayerChunk { - Game Hexen Radius 4 Height 4 +NOBLOCKMAP diff --git a/wadsrc/static/actors/hexen/fighterquietus.txt b/wadsrc/static/actors/hexen/fighterquietus.txt index 5208d8558..fa249a932 100644 --- a/wadsrc/static/actors/hexen/fighterquietus.txt +++ b/wadsrc/static/actors/hexen/fighterquietus.txt @@ -14,8 +14,6 @@ ACTOR FighterWeaponPiece : WeaponPiece ACTOR FWeaponPiece1 : FighterWeaponPiece { - Game Hexen - SpawnID 29 WeaponPiece.Number 1 States { @@ -29,8 +27,6 @@ ACTOR FWeaponPiece1 : FighterWeaponPiece ACTOR FWeaponPiece2 : FighterWeaponPiece { - Game Hexen - SpawnID 30 WeaponPiece.Number 2 States { @@ -44,8 +40,6 @@ ACTOR FWeaponPiece2 : FighterWeaponPiece ACTOR FWeaponPiece3 : FighterWeaponPiece { - Game Hexen - SpawnID 31 WeaponPiece.Number 3 States { @@ -72,7 +66,6 @@ ACTOR QuietusDrop ACTOR FWeapQuietus : FighterWeapon { - Game Hexen Health 3 Weapon.SelectionOrder 2900 +WEAPON.PRIMARY_USES_BOTH diff --git a/wadsrc/static/actors/hexen/firedemon.txt b/wadsrc/static/actors/hexen/firedemon.txt index 2c3eb6653..5a735f106 100644 --- a/wadsrc/static/actors/hexen/firedemon.txt +++ b/wadsrc/static/actors/hexen/firedemon.txt @@ -3,8 +3,6 @@ ACTOR FireDemon { - Game Hexen - SpawnID 5 Health 80 ReactionTime 8 PainChance 1 @@ -76,7 +74,6 @@ ACTOR FireDemon ACTOR FireDemonSplotch1 { - Game Hexen Health 1000 ReactionTime 8 Radius 3 @@ -112,7 +109,6 @@ ACTOR FireDemonSplotch2 : FireDemonSplotch1 ACTOR FireDemonRock1 { - Game Hexen Health 1000 ReactionTime 8 Radius 3 @@ -140,7 +136,6 @@ ACTOR FireDemonRock1 ACTOR FireDemonRock2 : FireDemonRock1 { - Game Hexen States { Spawn: @@ -158,7 +153,6 @@ ACTOR FireDemonRock2 : FireDemonRock1 ACTOR FireDemonRock3 : FireDemonRock1 { - Game Hexen States { Spawn: @@ -176,7 +170,6 @@ ACTOR FireDemonRock3 : FireDemonRock1 ACTOR FireDemonRock4 : FireDemonRock1 { - Game Hexen States { Spawn: @@ -194,7 +187,6 @@ ACTOR FireDemonRock4 : FireDemonRock1 ACTOR FireDemonRock5 : FireDemonRock1 { - Game Hexen States { Spawn: diff --git a/wadsrc/static/actors/hexen/flame.txt b/wadsrc/static/actors/hexen/flame.txt index 492e04fde..3fc9fa595 100644 --- a/wadsrc/static/actors/hexen/flame.txt +++ b/wadsrc/static/actors/hexen/flame.txt @@ -2,8 +2,6 @@ ACTOR FlameSmallTemp { - Game Hexen - SpawnID 96 +NOTELEPORT RenderStyle Add States @@ -23,8 +21,6 @@ ACTOR FlameSmallTemp ACTOR FlameLargeTemp { - Game Hexen - SpawnID 98 +NOTELEPORT RenderStyle Add States @@ -54,8 +50,6 @@ ACTOR FlameLargeTemp ACTOR FlameSmall : SwitchableDecoration { - Game Hexen - SpawnID 97 +NOTELEPORT +INVISIBLE Radius 15 @@ -79,16 +73,12 @@ ACTOR FlameSmall : SwitchableDecoration ACTOR FlameSmall2 : FlameSmall { - Game Hexen - SpawnID 66 } // Large Flame -------------------------------------------------------------- ACTOR FlameLarge : SwitchableDecoration { - Game Hexen - SpawnID 99 +NOTELEPORT +INVISIBLE Radius 15 @@ -112,7 +102,5 @@ ACTOR FlameLarge : SwitchableDecoration ACTOR FlameLarge2 : FlameLarge { - Game Hexen - SpawnID 67 } diff --git a/wadsrc/static/actors/hexen/flechette.txt b/wadsrc/static/actors/hexen/flechette.txt index e2e157ee5..137e72cab 100644 --- a/wadsrc/static/actors/hexen/flechette.txt +++ b/wadsrc/static/actors/hexen/flechette.txt @@ -3,7 +3,6 @@ ACTOR PoisonBag { - Game Hexen Radius 5 Height 5 +NOBLOCKMAP +NOGRAVITY @@ -51,7 +50,6 @@ ACTOR FireBomb ACTOR ThrowingBomb { - Game Hexen Health 48 Speed 12 Radius 8 @@ -96,8 +94,6 @@ ACTOR ThrowingBomb ACTOR ArtiPoisonBag : Inventory native { - Game Hexen - SpawnID 72 +FLOATBOB Inventory.DefMaxAmount Inventory.PickupFlash "PickupFlash" @@ -191,7 +187,6 @@ ACTOR PoisonCloud native ACTOR ZPoisonShroom : PoisonBag { - Game Hexen Radius 6 Height 20 PainChance 255 diff --git a/wadsrc/static/actors/hexen/flies.txt b/wadsrc/static/actors/hexen/flies.txt index 138749a44..e297cc289 100644 --- a/wadsrc/static/actors/hexen/flies.txt +++ b/wadsrc/static/actors/hexen/flies.txt @@ -3,7 +3,6 @@ ACTOR LittleFly { - Game Hexen +NOBLOCKMAP +NOGRAVITY +CANPASS diff --git a/wadsrc/static/actors/hexen/fog.txt b/wadsrc/static/actors/hexen/fog.txt index 9b76bdc7a..1689b5061 100644 --- a/wadsrc/static/actors/hexen/fog.txt +++ b/wadsrc/static/actors/hexen/fog.txt @@ -3,7 +3,6 @@ ACTOR FogSpawner { - Game Hexen +NOSECTOR +NOBLOCKMAP +FLOATBOB +NOGRAVITY @@ -23,7 +22,6 @@ ACTOR FogSpawner ACTOR FogPatchSmall { - Game Hexen Speed 1 +NOBLOCKMAP +NOGRAVITY +NOCLIP +FLOAT +NOTELEPORT @@ -47,7 +45,6 @@ ACTOR FogPatchSmall ACTOR FogPatchMedium : FogPatchSmall { - Game Hexen States { Spawn: @@ -63,7 +60,6 @@ ACTOR FogPatchMedium : FogPatchSmall ACTOR FogPatchLarge : FogPatchMedium { - Game Hexen States { Spawn: diff --git a/wadsrc/static/actors/hexen/healingradius.txt b/wadsrc/static/actors/hexen/healingradius.txt index eefff43ae..04187c898 100644 --- a/wadsrc/static/actors/hexen/healingradius.txt +++ b/wadsrc/static/actors/hexen/healingradius.txt @@ -3,7 +3,6 @@ ACTOR ArtiHealingRadius : Inventory native { - Game Hexen +COUNTITEM +FLOATBOB Inventory.DefMaxAmount diff --git a/wadsrc/static/actors/hexen/heresiarch.txt b/wadsrc/static/actors/hexen/heresiarch.txt index f883fae41..90f11bfb0 100644 --- a/wadsrc/static/actors/hexen/heresiarch.txt +++ b/wadsrc/static/actors/hexen/heresiarch.txt @@ -3,7 +3,6 @@ ACTOR Heresiarch native { - Game Hexen Health 5000 Painchance 10 Speed 16 diff --git a/wadsrc/static/actors/hexen/hexenarmor.txt b/wadsrc/static/actors/hexen/hexenarmor.txt index 9daffbbbe..97b9e0266 100644 --- a/wadsrc/static/actors/hexen/hexenarmor.txt +++ b/wadsrc/static/actors/hexen/hexenarmor.txt @@ -3,8 +3,6 @@ ACTOR MeshArmor : HexenArmor { - Game Hexen - SpawnID 68 +NOGRAVITY Health 0 // Armor class Inventory.Amount 0 @@ -21,8 +19,6 @@ ACTOR MeshArmor : HexenArmor ACTOR FalconShield : HexenArmor { - Game Hexen - SpawnID 69 +NOGRAVITY Health 1 // Armor class Inventory.Amount 0 @@ -39,8 +35,6 @@ ACTOR FalconShield : HexenArmor ACTOR PlatinumHelm : HexenArmor { - Game Hexen - SpawnID 70 +NOGRAVITY Health 2 // Armor class Inventory.Amount 0 @@ -57,8 +51,6 @@ ACTOR PlatinumHelm : HexenArmor ACTOR AmuletOfWarding : HexenArmor { - Game Hexen - SpawnID 71 +NOGRAVITY Health 3 // Armor class Inventory.Amount 0 diff --git a/wadsrc/static/actors/hexen/hexendecorations.txt b/wadsrc/static/actors/hexen/hexendecorations.txt index 3a172b51b..4fd673a44 100644 --- a/wadsrc/static/actors/hexen/hexendecorations.txt +++ b/wadsrc/static/actors/hexen/hexendecorations.txt @@ -1,6 +1,5 @@ ACTOR ZWingedStatue { - Game Hexen Radius 10 Height 62 +SOLID @@ -14,7 +13,6 @@ ACTOR ZWingedStatue ACTOR ZRock1 { - Game Hexen Radius 20 Height 16 States @@ -27,7 +25,6 @@ ACTOR ZRock1 ACTOR ZRock2 { - Game Hexen Radius 20 Height 16 States @@ -40,7 +37,6 @@ ACTOR ZRock2 ACTOR ZRock3 { - Game Hexen Radius 20 Height 16 States @@ -53,7 +49,6 @@ ACTOR ZRock3 ACTOR ZRock4 { - Game Hexen Radius 20 Height 16 States @@ -66,7 +61,6 @@ ACTOR ZRock4 ACTOR ZChandelier { - Game Hexen Radius 20 Height 60 +SPAWNCEILING @@ -81,7 +75,6 @@ ACTOR ZChandelier ACTOR ZChandelierUnlit { - Game Hexen Radius 20 Height 60 +SPAWNCEILING @@ -96,7 +89,6 @@ ACTOR ZChandelierUnlit ACTOR ZTreeDead { - Game Hexen Radius 10 Height 96 +SOLID @@ -110,7 +102,6 @@ ACTOR ZTreeDead ACTOR ZTree { - Game Hexen Radius 15 Height 128 +SOLID @@ -124,7 +115,6 @@ ACTOR ZTree ACTOR ZTreeSwamp150 { - Game Hexen Radius 10 Height 150 +SOLID @@ -138,7 +128,6 @@ ACTOR ZTreeSwamp150 ACTOR ZTreeSwamp120 { - Game Hexen Radius 10 Height 120 +SOLID @@ -152,7 +141,6 @@ ACTOR ZTreeSwamp120 ACTOR ZStumpBurned { - Game Hexen Radius 12 Height 20 +SOLID @@ -166,7 +154,6 @@ ACTOR ZStumpBurned ACTOR ZStumpBare { - Game Hexen Radius 12 Height 20 +SOLID @@ -180,7 +167,6 @@ ACTOR ZStumpBare ACTOR ZStumpSwamp1 { - Game Hexen Radius 20 Height 16 States @@ -193,7 +179,6 @@ ACTOR ZStumpSwamp1 ACTOR ZStumpSwamp2 { - Game Hexen Radius 20 Height 16 States @@ -206,7 +191,6 @@ ACTOR ZStumpSwamp2 ACTOR ZShroomLarge1 { - Game Hexen Radius 20 Height 16 States @@ -219,7 +203,6 @@ ACTOR ZShroomLarge1 ACTOR ZShroomLarge2 { - Game Hexen Radius 20 Height 16 States @@ -232,7 +215,6 @@ ACTOR ZShroomLarge2 ACTOR ZShroomLarge3 { - Game Hexen Radius 20 Height 16 States @@ -245,7 +227,6 @@ ACTOR ZShroomLarge3 ACTOR ZShroomSmall1 { - Game Hexen Radius 20 Height 16 States @@ -258,7 +239,6 @@ ACTOR ZShroomSmall1 ACTOR ZShroomSmall2 { - Game Hexen Radius 20 Height 16 States @@ -271,7 +251,6 @@ ACTOR ZShroomSmall2 ACTOR ZShroomSmall3 { - Game Hexen Radius 20 Height 16 States @@ -284,7 +263,6 @@ ACTOR ZShroomSmall3 ACTOR ZShroomSmall4 { - Game Hexen Radius 20 Height 16 States @@ -297,7 +275,6 @@ ACTOR ZShroomSmall4 ACTOR ZShroomSmall5 { - Game Hexen Radius 20 Height 16 States @@ -310,7 +287,6 @@ ACTOR ZShroomSmall5 ACTOR ZStalagmitePillar { - Game Hexen Radius 8 Height 138 +SOLID @@ -324,7 +300,6 @@ ACTOR ZStalagmitePillar ACTOR ZStalagmiteLarge { - Game Hexen Radius 8 Height 48 +SOLID @@ -338,7 +313,6 @@ ACTOR ZStalagmiteLarge ACTOR ZStalagmiteMedium { - Game Hexen Radius 6 Height 40 +SOLID @@ -352,7 +326,6 @@ ACTOR ZStalagmiteMedium ACTOR ZStalagmiteSmall { - Game Hexen Radius 8 Height 36 +SOLID @@ -366,7 +339,6 @@ ACTOR ZStalagmiteSmall ACTOR ZStalactiteLarge { - Game Hexen Radius 8 Height 66 +SOLID @@ -382,7 +354,6 @@ ACTOR ZStalactiteLarge ACTOR ZStalactiteMedium { - Game Hexen Radius 6 Height 50 +SOLID @@ -398,7 +369,6 @@ ACTOR ZStalactiteMedium ACTOR ZStalactiteSmall { - Game Hexen Radius 8 Height 40 +SOLID @@ -414,7 +384,6 @@ ACTOR ZStalactiteSmall ACTOR ZMossCeiling1 { - Game Hexen Radius 20 Height 20 +SPAWNCEILING @@ -429,7 +398,6 @@ ACTOR ZMossCeiling1 ACTOR ZMossCeiling2 { - Game Hexen Radius 20 Height 24 +SPAWNCEILING @@ -444,7 +412,6 @@ ACTOR ZMossCeiling2 ACTOR ZSwampVine { - Game Hexen Radius 8 Height 52 +SOLID @@ -458,7 +425,6 @@ ACTOR ZSwampVine ACTOR ZCorpseKabob { - Game Hexen Radius 10 Height 92 +SOLID @@ -472,7 +438,6 @@ ACTOR ZCorpseKabob ACTOR ZCorpseSleeping { - Game Hexen Radius 20 Height 16 States @@ -485,7 +450,6 @@ ACTOR ZCorpseSleeping ACTOR ZTombstoneRIP { - Game Hexen Radius 10 Height 46 +SOLID @@ -499,7 +463,6 @@ ACTOR ZTombstoneRIP ACTOR ZTombstoneShane { - Game Hexen Radius 10 Height 46 +SOLID @@ -513,7 +476,6 @@ ACTOR ZTombstoneShane ACTOR ZTombstoneBigCross { - Game Hexen Radius 10 Height 46 +SOLID @@ -527,7 +489,6 @@ ACTOR ZTombstoneBigCross ACTOR ZTombstoneBrianR { - Game Hexen Radius 10 Height 52 +SOLID @@ -541,7 +502,6 @@ ACTOR ZTombstoneBrianR ACTOR ZTombstoneCrossCircle { - Game Hexen Radius 10 Height 52 +SOLID @@ -555,7 +515,6 @@ ACTOR ZTombstoneCrossCircle ACTOR ZTombstoneSmallCross { - Game Hexen Radius 8 Height 46 +SOLID @@ -569,7 +528,6 @@ ACTOR ZTombstoneSmallCross ACTOR ZTombstoneBrianP { - Game Hexen Radius 8 Height 46 +SOLID @@ -583,7 +541,6 @@ ACTOR ZTombstoneBrianP ACTOR ZCorpseHanging { - Game Hexen Radius 6 Height 75 +SOLID @@ -599,7 +556,6 @@ ACTOR ZCorpseHanging ACTOR ZStatueGargoyleGreenTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -613,7 +569,6 @@ ACTOR ZStatueGargoyleGreenTall ACTOR ZStatueGargoyleBlueTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -627,7 +582,6 @@ ACTOR ZStatueGargoyleBlueTall ACTOR ZStatueGargoyleGreenShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -641,7 +595,6 @@ ACTOR ZStatueGargoyleGreenShort ACTOR ZStatueGargoyleBlueShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -655,7 +608,6 @@ ACTOR ZStatueGargoyleBlueShort ACTOR ZStatueGargoyleStripeTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -669,7 +621,6 @@ ACTOR ZStatueGargoyleStripeTall ACTOR ZStatueGargoyleDarkRedTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -683,7 +634,6 @@ ACTOR ZStatueGargoyleDarkRedTall ACTOR ZStatueGargoyleRedTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -697,7 +647,6 @@ ACTOR ZStatueGargoyleRedTall ACTOR ZStatueGargoyleTanTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -711,7 +660,6 @@ ACTOR ZStatueGargoyleTanTall ACTOR ZStatueGargoyleRustTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -725,7 +673,6 @@ ACTOR ZStatueGargoyleRustTall ACTOR ZStatueGargoyleDarkRedShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -739,7 +686,6 @@ ACTOR ZStatueGargoyleDarkRedShort ACTOR ZStatueGargoyleRedShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -753,7 +699,6 @@ ACTOR ZStatueGargoyleRedShort ACTOR ZStatueGargoyleTanShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -767,7 +712,6 @@ ACTOR ZStatueGargoyleTanShort ACTOR ZStatueGargoyleRustShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -781,7 +725,6 @@ ACTOR ZStatueGargoyleRustShort ACTOR ZBannerTattered { - Game Hexen Radius 8 Height 120 +SOLID @@ -795,7 +738,6 @@ ACTOR ZBannerTattered ACTOR ZTreeLarge1 { - Game Hexen Radius 15 Height 180 +SOLID @@ -809,7 +751,6 @@ ACTOR ZTreeLarge1 ACTOR ZTreeLarge2 { - Game Hexen Radius 15 Height 180 +SOLID @@ -823,7 +764,6 @@ ACTOR ZTreeLarge2 ACTOR ZTreeGnarled1 { - Game Hexen Radius 22 Height 100 +SOLID @@ -837,7 +777,6 @@ ACTOR ZTreeGnarled1 ACTOR ZTreeGnarled2 { - Game Hexen Radius 22 Height 100 +SOLID @@ -851,7 +790,6 @@ ACTOR ZTreeGnarled2 ACTOR ZLog { - Game Hexen Radius 20 Height 25 +SOLID @@ -865,7 +803,6 @@ ACTOR ZLog ACTOR ZStalactiteIceLarge { - Game Hexen Radius 8 Height 66 +SOLID @@ -881,7 +818,6 @@ ACTOR ZStalactiteIceLarge ACTOR ZStalactiteIceMedium { - Game Hexen Radius 5 Height 50 +SOLID @@ -897,7 +833,6 @@ ACTOR ZStalactiteIceMedium ACTOR ZStalactiteIceSmall { - Game Hexen Radius 4 Height 32 +SOLID @@ -913,7 +848,6 @@ ACTOR ZStalactiteIceSmall ACTOR ZStalactiteIceTiny { - Game Hexen Radius 4 Height 8 +SOLID @@ -929,7 +863,6 @@ ACTOR ZStalactiteIceTiny ACTOR ZStalagmiteIceLarge { - Game Hexen Radius 8 Height 66 +SOLID @@ -943,7 +876,6 @@ ACTOR ZStalagmiteIceLarge ACTOR ZStalagmiteIceMedium { - Game Hexen Radius 5 Height 50 +SOLID @@ -957,7 +889,6 @@ ACTOR ZStalagmiteIceMedium ACTOR ZStalagmiteIceSmall { - Game Hexen Radius 4 Height 32 +SOLID @@ -971,7 +902,6 @@ ACTOR ZStalagmiteIceSmall ACTOR ZStalagmiteIceTiny { - Game Hexen Radius 4 Height 8 +SOLID @@ -985,7 +915,6 @@ ACTOR ZStalagmiteIceTiny ACTOR ZRockBrown1 { - Game Hexen Radius 17 Height 72 +SOLID @@ -999,7 +928,6 @@ ACTOR ZRockBrown1 ACTOR ZRockBrown2 { - Game Hexen Radius 15 Height 50 +SOLID @@ -1013,7 +941,6 @@ ACTOR ZRockBrown2 ACTOR ZRockBlack { - Game Hexen Radius 20 Height 40 +SOLID @@ -1027,7 +954,6 @@ ACTOR ZRockBlack ACTOR ZRubble1 { - Game Hexen Radius 20 Height 16 States @@ -1040,7 +966,6 @@ ACTOR ZRubble1 ACTOR ZRubble2 { - Game Hexen Radius 20 Height 16 States @@ -1053,7 +978,6 @@ ACTOR ZRubble2 ACTOR ZRubble3 { - Game Hexen Radius 20 Height 16 States @@ -1066,7 +990,6 @@ ACTOR ZRubble3 ACTOR ZVasePillar { - Game Hexen Radius 12 Height 54 +SOLID @@ -1080,7 +1003,6 @@ ACTOR ZVasePillar ACTOR ZCorpseLynched { - Game Hexen Radius 11 Height 95 +SOLID @@ -1096,7 +1018,6 @@ ACTOR ZCorpseLynched ACTOR ZCandle { - Game Hexen Radius 20 Height 16 +NOGRAVITY @@ -1111,7 +1032,6 @@ ACTOR ZCandle ACTOR ZBarrel { - Game Hexen Radius 15 Height 32 +SOLID @@ -1125,7 +1045,6 @@ ACTOR ZBarrel ACTOR ZBucket { - Game Hexen Radius 8 Height 72 +SOLID @@ -1141,7 +1060,6 @@ ACTOR ZBucket ACTOR FireThing { - Game Hexen Radius 5 Height 10 +SOLID @@ -1163,7 +1081,6 @@ ACTOR FireThing ACTOR BrassTorch { - Game Hexen Radius 6 Height 35 +SOLID @@ -1177,7 +1094,6 @@ ACTOR BrassTorch ACTOR ZBlueCandle { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1191,7 +1107,6 @@ ACTOR ZBlueCandle ACTOR ZIronMaiden { - Game Hexen Radius 12 Height 60 +SOLID @@ -1205,7 +1120,6 @@ ACTOR ZIronMaiden ACTOR ZChainBit32 { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1221,7 +1135,6 @@ ACTOR ZChainBit32 ACTOR ZChainBit64 { - Game Hexen Radius 4 Height 64 +SPAWNCEILING @@ -1237,7 +1150,6 @@ ACTOR ZChainBit64 ACTOR ZChainEndHeart { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1253,7 +1165,6 @@ ACTOR ZChainEndHeart ACTOR ZChainEndHook1 { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1269,7 +1180,6 @@ ACTOR ZChainEndHook1 ACTOR ZChainEndHook2 { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1285,7 +1195,6 @@ ACTOR ZChainEndHook2 ACTOR ZChainEndSpike { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1301,7 +1210,6 @@ ACTOR ZChainEndSpike ACTOR ZChainEndSkull { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1317,7 +1225,6 @@ ACTOR ZChainEndSkull ACTOR TableShit1 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1331,7 +1238,6 @@ ACTOR TableShit1 ACTOR TableShit2 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1345,7 +1251,6 @@ ACTOR TableShit2 ACTOR TableShit3 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1359,7 +1264,6 @@ ACTOR TableShit3 ACTOR TableShit4 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1373,7 +1277,6 @@ ACTOR TableShit4 ACTOR TableShit5 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1387,7 +1290,6 @@ ACTOR TableShit5 ACTOR TableShit6 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1401,7 +1303,6 @@ ACTOR TableShit6 ACTOR TableShit7 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1415,7 +1316,6 @@ ACTOR TableShit7 ACTOR TableShit8 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1429,7 +1329,6 @@ ACTOR TableShit8 ACTOR TableShit9 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1443,7 +1342,6 @@ ACTOR TableShit9 ACTOR TableShit10 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1457,7 +1355,6 @@ ACTOR TableShit10 ACTOR TeleSmoke { - Game Hexen Radius 20 Height 16 +NOGRAVITY diff --git a/wadsrc/static/actors/hexen/hexenkeys.txt b/wadsrc/static/actors/hexen/hexenkeys.txt index f52b416ec..54e0a52ec 100644 --- a/wadsrc/static/actors/hexen/hexenkeys.txt +++ b/wadsrc/static/actors/hexen/hexenkeys.txt @@ -7,8 +7,6 @@ ACTOR HexenKey : Key ACTOR KeySteel : HexenKey { - Game Hexen - SpawnID 85 Inventory.Icon KEYSLOT1 Inventory.PickupMessage "$TXT_KEY_STEEL" States @@ -21,8 +19,6 @@ ACTOR KeySteel : HexenKey ACTOR KeyCave : HexenKey { - Game Hexen - SpawnID 86 Inventory.Icon KEYSLOT2 Inventory.PickupMessage "$TXT_KEY_CAVE" States @@ -35,8 +31,6 @@ ACTOR KeyCave : HexenKey ACTOR KeyAxe : HexenKey { - Game Hexen - SpawnID 87 Inventory.Icon KEYSLOT3 Inventory.PickupMessage "$TXT_KEY_AXE" States @@ -49,8 +43,6 @@ ACTOR KeyAxe : HexenKey ACTOR KeyFire : HexenKey { - Game Hexen - SpawnID 88 Inventory.Icon KEYSLOT4 Inventory.PickupMessage "$TXT_KEY_FIRE" States @@ -63,8 +55,6 @@ ACTOR KeyFire : HexenKey ACTOR KeyEmerald : HexenKey { - Game Hexen - SpawnID 89 Inventory.Icon KEYSLOT5 Inventory.PickupMessage "$TXT_KEY_EMERALD" States @@ -77,8 +67,6 @@ ACTOR KeyEmerald : HexenKey ACTOR KeyDungeon : HexenKey { - Game Hexen - SpawnID 90 Inventory.Icon KEYSLOT6 Inventory.PickupMessage "$TXT_KEY_DUNGEON" States @@ -91,8 +79,6 @@ ACTOR KeyDungeon : HexenKey ACTOR KeySilver : HexenKey { - Game Hexen - SpawnID 91 Inventory.Icon KEYSLOT7 Inventory.PickupMessage "$TXT_KEY_SILVER" States @@ -105,8 +91,6 @@ ACTOR KeySilver : HexenKey ACTOR KeyRusted : HexenKey { - Game Hexen - SpawnID 92 Inventory.Icon KEYSLOT8 Inventory.PickupMessage "$TXT_KEY_RUSTED" States @@ -119,8 +103,6 @@ ACTOR KeyRusted : HexenKey ACTOR KeyHorn : HexenKey { - Game Hexen - SpawnID 93 Inventory.Icon KEYSLOT9 Inventory.PickupMessage "$TXT_KEY_HORN" States @@ -133,8 +115,6 @@ ACTOR KeyHorn : HexenKey ACTOR KeySwamp : HexenKey { - Game Hexen - SpawnID 94 Inventory.Icon KEYSLOTA Inventory.PickupMessage "$TXT_KEY_SWAMP" States @@ -147,7 +127,6 @@ ACTOR KeySwamp : HexenKey ACTOR KeyCastle : HexenKey { - Game Hexen Inventory.Icon KEYSLOTB Inventory.PickupMessage "$TXT_KEY_CASTLE" States diff --git a/wadsrc/static/actors/hexen/hexenspecialdecs.txt b/wadsrc/static/actors/hexen/hexenspecialdecs.txt index 61dc0cb19..33ce577c7 100644 --- a/wadsrc/static/actors/hexen/hexenspecialdecs.txt +++ b/wadsrc/static/actors/hexen/hexenspecialdecs.txt @@ -3,7 +3,6 @@ ACTOR ZWingedStatueNoSkull : SwitchingDecoration { - Game Hexen Radius 10 Height 62 +SOLID @@ -23,7 +22,6 @@ ACTOR ZWingedStatueNoSkull : SwitchingDecoration ACTOR ZGemPedestal : SwitchingDecoration { - Game Hexen Radius 10 Height 40 +SOLID @@ -43,7 +41,6 @@ ACTOR ZGemPedestal : SwitchingDecoration ACTOR TreeDestructible { - Game Hexen Health 70 Radius 15 Height 180 @@ -79,7 +76,6 @@ ACTOR TreeDestructible ACTOR Pottery1 native { - Game Hexen Health 15 Speed 10 Height 32 @@ -104,7 +100,6 @@ ACTOR Pottery1 native ACTOR Pottery2 : Pottery1 { - Game Hexen Height 25 States { @@ -118,7 +113,6 @@ ACTOR Pottery2 : Pottery1 ACTOR Pottery3 : Pottery1 { - Game Hexen Height 25 States { @@ -177,7 +171,6 @@ ACTOR PotteryBit ACTOR BloodPool { - Game Hexen States { Spawn: @@ -191,7 +184,6 @@ ACTOR BloodPool ACTOR ZCorpseLynchedNoHeart native { - Game Hexen Radius 10 Height 100 +SOLID +SPAWNCEILING +NOGRAVITY @@ -257,7 +249,6 @@ ACTOR CorpseBit ACTOR ZCorpseSitting { - Game Hexen Health 30 Radius 15 Height 35 @@ -283,7 +274,6 @@ ACTOR ZCorpseSitting ACTOR LeafSpawner { - Game Hexen +NOBLOCKMAP +NOSECTOR +INVISIBLE @@ -359,7 +349,6 @@ ACTOR Leaf2 : Leaf1 ACTOR ZTwinedTorch : SwitchableDecoration { - Game Hexen Radius 10 Height 64 +SOLID @@ -378,7 +367,6 @@ ACTOR ZTwinedTorch : SwitchableDecoration ACTOR ZTwinedTorchUnlit : ZTwinedTorch { - Game Hexen States { Spawn: @@ -391,7 +379,6 @@ ACTOR ZTwinedTorchUnlit : ZTwinedTorch ACTOR ZWallTorch : SwitchableDecoration { - Game Hexen +NOBLOCKMAP +NOGRAVITY +FIXMAPTHINGPOS @@ -411,7 +398,6 @@ ACTOR ZWallTorch : SwitchableDecoration ACTOR ZWallTorchUnlit : ZWallTorch { - Game Hexen States { Spawn: @@ -424,7 +410,6 @@ ACTOR ZWallTorchUnlit : ZWallTorch ACTOR ZShrub1 { - Game Hexen Radius 8 Height 24 Health 20 @@ -449,7 +434,6 @@ ACTOR ZShrub1 ACTOR ZShrub2 { - Game Hexen Radius 16 Height 40 Health 20 @@ -475,7 +459,6 @@ ACTOR ZShrub2 ACTOR ZFireBull : SwitchableDecoration { - Game Hexen Radius 20 Height 80 +SOLID @@ -496,7 +479,6 @@ ACTOR ZFireBull : SwitchableDecoration ACTOR ZFireBullUnlit : ZFireBull { - Game Hexen States { Spawn: @@ -509,7 +491,6 @@ ACTOR ZFireBullUnlit : ZFireBull ACTOR ZSuitOfArmor { - Game Hexen Health 60 Radius 16 Height 72 @@ -569,7 +550,6 @@ ACTOR ZArmorChunk ACTOR ZBell native { - Game Hexen Health 5 Radius 56 Height 120 @@ -629,7 +609,6 @@ ACTOR ZBell native ACTOR ZXmasTree { - Game Hexen Radius 11 Height 130 Health 20 @@ -660,7 +639,6 @@ ACTOR ZXmasTree ACTOR ZCauldron : SwitchableDecoration { - Game Hexen Radius 12 Height 26 +SOLID @@ -679,7 +657,6 @@ ACTOR ZCauldron : SwitchableDecoration ACTOR ZCauldronUnlit : ZCauldron { - Game Hexen States { Spawn: @@ -692,8 +669,6 @@ ACTOR ZCauldronUnlit : ZCauldron ACTOR HWaterDrip { - Game Hexen - SpawnID 95 +MISSILE +LOWGRAVITY +NOTELEPORT diff --git a/wadsrc/static/actors/hexen/iceguy.txt b/wadsrc/static/actors/hexen/iceguy.txt index aaf16d4c6..a972c48e0 100644 --- a/wadsrc/static/actors/hexen/iceguy.txt +++ b/wadsrc/static/actors/hexen/iceguy.txt @@ -3,8 +3,6 @@ ACTOR IceGuy { - Game Hexen - SpawnID 20 Health 120 PainChance 144 Speed 14 diff --git a/wadsrc/static/actors/hexen/korax.txt b/wadsrc/static/actors/hexen/korax.txt index da48b580d..e0d634bbe 100644 --- a/wadsrc/static/actors/hexen/korax.txt +++ b/wadsrc/static/actors/hexen/korax.txt @@ -1,6 +1,5 @@ ACTOR Korax { - Game Hexen Health 5000 Painchance 20 Speed 10 diff --git a/wadsrc/static/actors/hexen/mageboss.txt b/wadsrc/static/actors/hexen/mageboss.txt index f8c5dc9e3..16aaee985 100644 --- a/wadsrc/static/actors/hexen/mageboss.txt +++ b/wadsrc/static/actors/hexen/mageboss.txt @@ -3,7 +3,6 @@ ACTOR MageBoss { - Game Hexen Health 800 PainChance 50 Speed 25 diff --git a/wadsrc/static/actors/hexen/magecone.txt b/wadsrc/static/actors/hexen/magecone.txt index a39dbcb86..ac37f98b8 100644 --- a/wadsrc/static/actors/hexen/magecone.txt +++ b/wadsrc/static/actors/hexen/magecone.txt @@ -3,8 +3,6 @@ ACTOR MWeapFrost : MageWeapon { - Game Hexen - SpawnID 36 +BLOODSPLATTER Weapon.SelectionOrder 1700 Weapon.AmmoUse1 3 @@ -79,8 +77,6 @@ ACTOR FrostMissile native ACTOR IceShard : FrostMissile { - Game Hexen - SpawnID 65 DamageType "Ice" -ACTIVATEIMPACT -ACTIVATEPCROSS diff --git a/wadsrc/static/actors/hexen/magelightning.txt b/wadsrc/static/actors/hexen/magelightning.txt index 0e507db58..daf65df95 100644 --- a/wadsrc/static/actors/hexen/magelightning.txt +++ b/wadsrc/static/actors/hexen/magelightning.txt @@ -3,7 +3,6 @@ ACTOR MWeapLightning : MageWeapon { - Game Hexen +NOGRAVITY Weapon.SelectionOrder 1100 Weapon.AmmoUse1 5 diff --git a/wadsrc/static/actors/hexen/magestaff.txt b/wadsrc/static/actors/hexen/magestaff.txt index 91864ff6f..4d56432bd 100644 --- a/wadsrc/static/actors/hexen/magestaff.txt +++ b/wadsrc/static/actors/hexen/magestaff.txt @@ -14,8 +14,6 @@ ACTOR MageWeaponPiece : WeaponPiece ACTOR MWeaponPiece1 : MageWeaponPiece { - Game Hexen - SpawnID 37 WeaponPiece.Number 1 States { @@ -29,8 +27,6 @@ ACTOR MWeaponPiece1 : MageWeaponPiece ACTOR MWeaponPiece2 : MageWeaponPiece { - Game Hexen - SpawnID 38 WeaponPiece.Number 2 States { @@ -44,8 +40,6 @@ ACTOR MWeaponPiece2 : MageWeaponPiece ACTOR MWeaponPiece3 : MageWeaponPiece { - Game Hexen - SpawnID 39 WeaponPiece.Number 3 States { @@ -72,7 +66,6 @@ ACTOR BloodscourgeDrop ACTOR MWeapBloodscourge : MageWeapon native { - Game Hexen Health 3 Weapon.SelectionOrder 3100 Weapon.AmmoUse1 15 diff --git a/wadsrc/static/actors/hexen/magewand.txt b/wadsrc/static/actors/hexen/magewand.txt index aaac9e5da..a27d6c446 100644 --- a/wadsrc/static/actors/hexen/magewand.txt +++ b/wadsrc/static/actors/hexen/magewand.txt @@ -3,7 +3,6 @@ ACTOR MWeapWand : MageWeapon { - Game Hexen Weapon.SelectionOrder 3600 Weapon.KickBack 0 Weapon.YAdjust 9 diff --git a/wadsrc/static/actors/hexen/mana.txt b/wadsrc/static/actors/hexen/mana.txt index c38bbcb8a..8123c3eb5 100644 --- a/wadsrc/static/actors/hexen/mana.txt +++ b/wadsrc/static/actors/hexen/mana.txt @@ -2,8 +2,6 @@ ACTOR Mana1 : Ammo { - Game Hexen - SpawnID 11 Inventory.Amount 15 Inventory.MaxAmount 200 Ammo.BackpackAmount 15 @@ -25,8 +23,6 @@ ACTOR Mana1 : Ammo ACTOR Mana2 : Ammo { - Game Hexen - SpawnID 12 Inventory.Amount 15 Inventory.MaxAmount 200 Ammo.BackpackAmount 15 @@ -48,8 +44,6 @@ ACTOR Mana2 : Ammo ACTOR Mana3 : CustomInventory { - Game Hexen - SpawnID 75 Radius 8 Height 8 +FLOATBOB @@ -70,8 +64,6 @@ ACTOR Mana3 : CustomInventory ACTOR ArtiBoostMana : CustomInventory { - Game Hexen - SpawnID 26 +FLOATBOB +COUNTITEM +INVENTORY.INVBAR diff --git a/wadsrc/static/actors/hexen/puzzleitems.txt b/wadsrc/static/actors/hexen/puzzleitems.txt index af571a336..b28470580 100644 --- a/wadsrc/static/actors/hexen/puzzleitems.txt +++ b/wadsrc/static/actors/hexen/puzzleitems.txt @@ -3,8 +3,6 @@ ACTOR PuzzSkull : PuzzleItem { - Game Hexen - SpawnID 76 PuzzleItem.Number 0 Inventory.Icon ARTISKLL Inventory.PickupMessage "$TXT_ARTIPUZZSKULL" @@ -22,8 +20,6 @@ ACTOR PuzzSkull : PuzzleItem ACTOR PuzzGemBig : PuzzleItem { - Game Hexen - SpawnID 77 PuzzleItem.Number 1 Inventory.Icon ARTIBGEM Inventory.PickupMessage "$TXT_ARTIPUZZGEMBIG" @@ -40,8 +36,6 @@ ACTOR PuzzGemBig : PuzzleItem ACTOR PuzzGemRed : PuzzleItem { - Game Hexen - SpawnID 78 PuzzleItem.Number 2 Inventory.Icon ARTIGEMR Inventory.PickupMessage "$TXT_ARTIPUZZGEMRED" @@ -59,8 +53,6 @@ ACTOR PuzzGemRed : PuzzleItem ACTOR PuzzGemGreen1 : PuzzleItem { - Game Hexen - SpawnID 79 PuzzleItem.Number 3 Inventory.Icon ARTIGEMG Inventory.PickupMessage "$TXT_ARTIPUZZGEMGREEN1" @@ -78,8 +70,6 @@ ACTOR PuzzGemGreen1 : PuzzleItem ACTOR PuzzGemGreen2 : PuzzleItem { - Game Hexen - SpawnID 80 PuzzleItem.Number 4 Inventory.Icon ARTIGMG2 Inventory.PickupMessage "$TXT_ARTIPUZZGEMGREEN2" @@ -97,8 +87,6 @@ ACTOR PuzzGemGreen2 : PuzzleItem ACTOR PuzzGemBlue1 : PuzzleItem { - Game Hexen - SpawnID 81 PuzzleItem.Number 5 Inventory.Icon ARTIGEMB Inventory.PickupMessage "$TXT_ARTIPUZZGEMBLUE1" @@ -116,8 +104,6 @@ ACTOR PuzzGemBlue1 : PuzzleItem ACTOR PuzzGemBlue2 : PuzzleItem { - Game Hexen - SpawnID 82 PuzzleItem.Number 6 Inventory.Icon ARTIGMB2 Inventory.PickupMessage "$TXT_ARTIPUZZGEMBLUE2" @@ -135,8 +121,6 @@ ACTOR PuzzGemBlue2 : PuzzleItem ACTOR PuzzBook1 : PuzzleItem { - Game Hexen - SpawnID 83 PuzzleItem.Number 7 Inventory.Icon ARTIBOK1 Inventory.PickupMessage "$TXT_ARTIPUZZBOOK1" @@ -154,8 +138,6 @@ ACTOR PuzzBook1 : PuzzleItem ACTOR PuzzBook2 : PuzzleItem { - Game Hexen - SpawnID 84 PuzzleItem.Number 8 Inventory.Icon ARTIBOK2 Inventory.PickupMessage "$TXT_ARTIPUZZBOOK2" @@ -174,7 +156,6 @@ ACTOR PuzzBook2 : PuzzleItem ACTOR PuzzFlameMask : PuzzleItem { - Game Hexen PuzzleItem.Number 9 Inventory.Icon ARTISKL2 Inventory.PickupMessage "$TXT_ARTIPUZZSKULL2" @@ -191,7 +172,6 @@ ACTOR PuzzFlameMask : PuzzleItem ACTOR PuzzFWeapon : PuzzleItem { - Game Hexen PuzzleItem.Number 10 Inventory.Icon ARTIFWEP Inventory.PickupMessage "$TXT_ARTIPUZZFWEAPON" @@ -209,7 +189,6 @@ ACTOR PuzzFWeapon : PuzzleItem ACTOR PuzzCWeapon : PuzzleItem { - Game Hexen PuzzleItem.Number 11 Inventory.Icon ARTICWEP Inventory.PickupMessage "$TXT_ARTIPUZZCWEAPON" @@ -227,7 +206,6 @@ ACTOR PuzzCWeapon : PuzzleItem ACTOR PuzzMWeapon : PuzzleItem { - Game Hexen PuzzleItem.Number 12 Inventory.Icon ARTIMWEP Inventory.PickupMessage "$TXT_ARTIPUZZMWEAPON" @@ -244,7 +222,6 @@ ACTOR PuzzMWeapon : PuzzleItem ACTOR PuzzGear1 : PuzzleItem { - Game Hexen PuzzleItem.Number 13 Inventory.Icon ARTIGEAR Inventory.PickupMessage "$TXT_ARTIPUZZGEAR" @@ -262,7 +239,6 @@ ACTOR PuzzGear1 : PuzzleItem ACTOR PuzzGear2 : PuzzleItem { - Game Hexen PuzzleItem.Number 14 Inventory.Icon ARTIGER2 Inventory.PickupMessage "$TXT_ARTIPUZZGEAR" @@ -280,7 +256,6 @@ ACTOR PuzzGear2 : PuzzleItem ACTOR PuzzGear3 : PuzzleItem { - Game Hexen PuzzleItem.Number 15 Inventory.Icon ARTIGER3 Inventory.PickupMessage "$TXT_ARTIPUZZGEAR" @@ -298,7 +273,6 @@ ACTOR PuzzGear3 : PuzzleItem ACTOR PuzzGear4 : PuzzleItem { - Game Hexen PuzzleItem.Number 16 Inventory.Icon ARTIGER4 Inventory.PickupMessage "$TXT_ARTIPUZZGEAR" diff --git a/wadsrc/static/actors/hexen/scriptprojectiles.txt b/wadsrc/static/actors/hexen/scriptprojectiles.txt index 9ad06b07b..d4d79f6e7 100644 --- a/wadsrc/static/actors/hexen/scriptprojectiles.txt +++ b/wadsrc/static/actors/hexen/scriptprojectiles.txt @@ -2,8 +2,6 @@ ACTOR FireBall { - Game Hexen - SpawnID 10 Speed 2 Radius 8 Height 8 @@ -28,8 +26,6 @@ ACTOR FireBall ACTOR Arrow { - Game Hexen - SpawnID 50 Speed 6 Radius 8 Height 4 @@ -51,8 +47,6 @@ ACTOR Arrow ACTOR Dart { - Game Hexen - SpawnID 51 Speed 6 Radius 8 Height 4 @@ -74,8 +68,6 @@ ACTOR Dart ACTOR PoisonDart : Dart { - Game Hexen - SpawnID 52 PoisonDamage 20 } @@ -83,8 +75,6 @@ ACTOR PoisonDart : Dart ACTOR RipperBall { - Game Hexen - SpawnID 53 Speed 6 Radius 8 Damage 2 @@ -114,8 +104,6 @@ ACTOR RipperBall ACTOR ProjectileBlade { - Game Hexen - SpawnID 64 Speed 6 Radius 6 Height 6 diff --git a/wadsrc/static/actors/hexen/serpent.txt b/wadsrc/static/actors/hexen/serpent.txt index ab666174a..b0337ccbe 100644 --- a/wadsrc/static/actors/hexen/serpent.txt +++ b/wadsrc/static/actors/hexen/serpent.txt @@ -3,8 +3,6 @@ ACTOR Serpent { - Game Hexen - SpawnID 6 Health 90 PainChance 96 Speed 12 @@ -104,8 +102,6 @@ ACTOR Serpent ACTOR SerpentLeader : Serpent { - Game Hexen - SpawnID 7 Mass 200 Obituary "$OB_SERPENT" States diff --git a/wadsrc/static/actors/hexen/speedboots.txt b/wadsrc/static/actors/hexen/speedboots.txt index 3644a659b..45c78472b 100644 --- a/wadsrc/static/actors/hexen/speedboots.txt +++ b/wadsrc/static/actors/hexen/speedboots.txt @@ -2,8 +2,6 @@ ACTOR ArtiSpeedBoots : PowerupGiver { - Game Hexen - SpawnID 13 +FLOATBOB +COUNTITEM +INVENTORY.PICKUPFLASH diff --git a/wadsrc/static/actors/hexen/spike.txt b/wadsrc/static/actors/hexen/spike.txt index 77691e915..9ca580970 100644 --- a/wadsrc/static/actors/hexen/spike.txt +++ b/wadsrc/static/actors/hexen/spike.txt @@ -81,8 +81,6 @@ ACTOR ThrustFloor native ACTOR ThrustFloorUp : ThrustFloor { - Game Hexen - SpawnID 104 +SOLID +NOTELEPORT +FLOORCLIP States @@ -96,10 +94,8 @@ ACTOR ThrustFloorUp : ThrustFloor ACTOR ThrustFloorDown : ThrustFloor { - Game Hexen +NOTELEPORT +FLOORCLIP +INVISIBLE - SpawnID 105 States { Spawn: diff --git a/wadsrc/static/actors/hexen/summon.txt b/wadsrc/static/actors/hexen/summon.txt index 1fb482d6c..ce76ceb77 100644 --- a/wadsrc/static/actors/hexen/summon.txt +++ b/wadsrc/static/actors/hexen/summon.txt @@ -3,8 +3,6 @@ ACTOR ArtiDarkServant : Inventory native { - Game Hexen - SpawnID 16 +COUNTITEM +FLOATBOB Inventory.RespawnTics 4230 @@ -27,7 +25,6 @@ ACTOR ArtiDarkServant : Inventory native ACTOR SummoningDoll { - Game Hexen Speed 20 +NOBLOCKMAP +DROPOFF +MISSILE +NOTELEPORT @@ -50,7 +47,6 @@ ACTOR SummoningDoll ACTOR MinotaurSmoke { - Game Hexen +NOBLOCKMAP +NOGRAVITY +NOTELEPORT RenderStyle Translucent diff --git a/wadsrc/static/actors/hexen/teleportother.txt b/wadsrc/static/actors/hexen/teleportother.txt index 48f8ba733..c74eeec8c 100644 --- a/wadsrc/static/actors/hexen/teleportother.txt +++ b/wadsrc/static/actors/hexen/teleportother.txt @@ -3,8 +3,6 @@ ACTOR ArtiTeleportOther : Inventory native { - Game Hexen - SpawnID 17 +COUNTITEM +FLOATBOB +INVENTORY.INVBAR diff --git a/wadsrc/static/actors/hexen/wraith.txt b/wadsrc/static/actors/hexen/wraith.txt index b1522681d..2bada5209 100644 --- a/wadsrc/static/actors/hexen/wraith.txt +++ b/wadsrc/static/actors/hexen/wraith.txt @@ -3,8 +3,6 @@ ACTOR Wraith { - Game Hexen - SpawnID 8 Health 150 PainChance 25 Speed 11 @@ -83,8 +81,6 @@ ACTOR Wraith ACTOR WraithBuried : Wraith { - Game Hexen - SpawnID 9 Height 68 -SHOOTABLE -SOLID @@ -151,8 +147,6 @@ ACTOR WraithFX1 ACTOR WraithFX2 { - Game Hexen - SpawnID 108 Radius 2 Height 5 Mass 5 @@ -191,8 +185,6 @@ ACTOR WraithFX3 ACTOR WraithFX4 { - Game Hexen - SpawnID 106 Radius 2 Height 5 Mass 5 @@ -214,8 +206,6 @@ ACTOR WraithFX4 ACTOR WraithFX5 : WraithFX4 { - Game Hexen - SpawnID 107 States { Spawn: diff --git a/wadsrc/static/actors/raven/artiegg.txt b/wadsrc/static/actors/raven/artiegg.txt index 0c168c4d2..33fde6d86 100644 --- a/wadsrc/static/actors/raven/artiegg.txt +++ b/wadsrc/static/actors/raven/artiegg.txt @@ -3,8 +3,6 @@ ACTOR EggFX : MorphProjectile { - Game Heretic - SpawnID 40 Radius 8 Height 8 Speed 18 @@ -27,8 +25,6 @@ ACTOR EggFX : MorphProjectile ACTOR ArtiEgg : CustomInventory { - Game Heretic - SpawnID 14 +COUNTITEM +FLOATBOB +INVENTORY.INVBAR @@ -58,8 +54,6 @@ ACTOR ArtiEgg : CustomInventory ACTOR PorkFX : MorphProjectile { - Game Hexen - SpawnID 40 Radius 8 Height 8 Speed 18 @@ -81,8 +75,6 @@ ACTOR PorkFX : MorphProjectile ACTOR ArtiPork : CustomInventory { - Game Hexen - SpawnID 14 +COUNTITEM +FLOATBOB +INVENTORY.INVBAR diff --git a/wadsrc/static/actors/raven/artitele.txt b/wadsrc/static/actors/raven/artitele.txt index 6dad46781..216c99c4a 100644 --- a/wadsrc/static/actors/raven/artitele.txt +++ b/wadsrc/static/actors/raven/artitele.txt @@ -3,8 +3,6 @@ ACTOR ArtiTeleport : Inventory native { - Game Raven - SpawnID 18 +COUNTITEM +FLOATBOB +INVENTORY.INVBAR diff --git a/wadsrc/static/actors/raven/minotaur.txt b/wadsrc/static/actors/raven/minotaur.txt index ba844fa93..6597b6adb 100644 --- a/wadsrc/static/actors/raven/minotaur.txt +++ b/wadsrc/static/actors/raven/minotaur.txt @@ -1,6 +1,5 @@ ACTOR Minotaur native { - Game Heretic Health 3000 Radius 28 Height 100 diff --git a/wadsrc/static/actors/raven/ravenambient.txt b/wadsrc/static/actors/raven/ravenambient.txt index 6b259e09a..b0dd64807 100644 --- a/wadsrc/static/actors/raven/ravenambient.txt +++ b/wadsrc/static/actors/raven/ravenambient.txt @@ -4,8 +4,6 @@ ACTOR SoundWind { - Game Heretic - SpawnID 110 +NOBLOCKMAP +NOSECTOR +DONTSPLASH @@ -19,8 +17,6 @@ ACTOR SoundWind ACTOR SoundWindHexen : SoundWind { - Game Hexen - SpawnID 110 } @@ -28,8 +24,6 @@ ACTOR SoundWindHexen : SoundWind ACTOR SoundWaterfall { - Game Heretic - SpawnID 111 +NOBLOCKMAP +NOSECTOR +DONTSPLASH diff --git a/wadsrc/static/actors/raven/ravenartifacts.txt b/wadsrc/static/actors/raven/ravenartifacts.txt index c80800502..6e48faeae 100644 --- a/wadsrc/static/actors/raven/ravenartifacts.txt +++ b/wadsrc/static/actors/raven/ravenartifacts.txt @@ -3,8 +3,6 @@ ACTOR ArtiHealth : HealthPickup { - Game Raven - SpawnID 24 Health 25 +COUNTITEM +FLOATBOB @@ -27,8 +25,6 @@ ACTOR ArtiHealth : HealthPickup ACTOR ArtiSuperHealth : HealthPickup { - Game Raven - SpawnID 25 Health 100 +COUNTITEM +FLOATBOB @@ -51,8 +47,6 @@ ACTOR ArtiSuperHealth : HealthPickup ACTOR ArtiFly : PowerupGiver { - Game Raven - SpawnID 15 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -74,8 +68,6 @@ ACTOR ArtiFly : PowerupGiver ACTOR ArtiInvulnerability : PowerupGiver { - Game Heretic - SpawnID 133 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -97,8 +89,6 @@ ACTOR ArtiInvulnerability : PowerupGiver ACTOR ArtiInvulnerability2 : PowerupGiver { - Game Hexen - SpawnID 133 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -119,8 +109,6 @@ ACTOR ArtiInvulnerability2 : PowerupGiver ACTOR ArtiTorch : PowerupGiver { - Game Raven - SpawnID 73 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH diff --git a/wadsrc/static/actors/raven/ravenhealth.txt b/wadsrc/static/actors/raven/ravenhealth.txt index 526666532..861239839 100644 --- a/wadsrc/static/actors/raven/ravenhealth.txt +++ b/wadsrc/static/actors/raven/ravenhealth.txt @@ -1,7 +1,5 @@ ACTOR CrystalVial : Health { - Game Raven - SpawnID 23 +FLOATBOB Inventory.Amount 10 Inventory.PickupMessage "$TXT_ITEMHEALTH" diff --git a/wadsrc/static/actors/shared/blood.txt b/wadsrc/static/actors/shared/blood.txt index 1a294c6af..9cde14858 100644 --- a/wadsrc/static/actors/shared/blood.txt +++ b/wadsrc/static/actors/shared/blood.txt @@ -3,7 +3,6 @@ ACTOR Blood { - SpawnID 130 Mass 5 +NOBLOCKMAP +NOTELEPORT diff --git a/wadsrc/static/actors/shared/bridge.txt b/wadsrc/static/actors/shared/bridge.txt index 9a0224a93..8386f25b9 100644 --- a/wadsrc/static/actors/shared/bridge.txt +++ b/wadsrc/static/actors/shared/bridge.txt @@ -53,8 +53,6 @@ ACTOR CustomBridge native ACTOR Bridge : CustomBridge { - Game Raven - SpawnID 21 RenderStyle None Args 32, 2, 3, 0 } @@ -63,8 +61,6 @@ ACTOR Bridge : CustomBridge ACTOR ZBridge : CustomBridge { - Game Doom - SpawnID 21 Args 36, 4, 0, 0 } diff --git a/wadsrc/static/actors/shared/debris.txt b/wadsrc/static/actors/shared/debris.txt index 5d48a2217..eb2eb0358 100644 --- a/wadsrc/static/actors/shared/debris.txt +++ b/wadsrc/static/actors/shared/debris.txt @@ -3,7 +3,6 @@ ACTOR Rock1 { - SpawnID 41 +NOBLOCKMAP +DROPOFF +MISSILE @@ -21,7 +20,6 @@ ACTOR Rock1 ACTOR Rock2 { - SpawnID 42 +NOBLOCKMAP +DROPOFF +MISSILE @@ -40,7 +38,6 @@ ACTOR Rock2 ACTOR Rock3 { - SpawnID 43 +NOBLOCKMAP +DROPOFF +MISSILE @@ -61,7 +58,6 @@ ACTOR Rock3 ACTOR Dirt1 { - SpawnID 44 +NOBLOCKMAP +DROPOFF +MISSILE @@ -79,7 +75,6 @@ ACTOR Dirt1 ACTOR Dirt2 { - SpawnID 45 +NOBLOCKMAP +DROPOFF +MISSILE @@ -97,7 +92,6 @@ ACTOR Dirt2 ACTOR Dirt3 { - SpawnID 46 +NOBLOCKMAP +DROPOFF +MISSILE @@ -115,7 +109,6 @@ ACTOR Dirt3 ACTOR Dirt4 { - SpawnID 47 +NOBLOCKMAP +DROPOFF +MISSILE @@ -133,7 +126,6 @@ ACTOR Dirt4 ACTOR Dirt5 { - SpawnID 48 +NOBLOCKMAP +DROPOFF +MISSILE @@ -151,7 +143,6 @@ ACTOR Dirt5 ACTOR Dirt6 { - SpawnID 49 +NOBLOCKMAP +DROPOFF +MISSILE @@ -182,7 +173,6 @@ ACTOR GlassShard native ACTOR SGShard1 : GlassShard { - SpawnID 54 States { Spawn: @@ -196,7 +186,6 @@ ACTOR SGShard1 : GlassShard ACTOR SGShard2 : GlassShard { - SpawnID 55 States { Spawn: @@ -210,7 +199,6 @@ ACTOR SGShard2 : GlassShard ACTOR SGShard3 : GlassShard { - SpawnID 56 States { Spawn: @@ -224,7 +212,6 @@ ACTOR SGShard3 : GlassShard ACTOR SGShard4 : GlassShard { - SpawnID 57 States { Spawn: @@ -238,7 +225,6 @@ ACTOR SGShard4 : GlassShard ACTOR SGShard5 : GlassShard { - SpawnID 58 States { Spawn: @@ -252,7 +238,6 @@ ACTOR SGShard5 : GlassShard ACTOR SGShard6 : GlassShard { - SpawnID 59 States { Spawn: @@ -266,7 +251,6 @@ ACTOR SGShard6 : GlassShard ACTOR SGShard7 : GlassShard { - SpawnID 60 States { Spawn: @@ -280,7 +264,6 @@ ACTOR SGShard7 : GlassShard ACTOR SGShard8 : GlassShard { - SpawnID 61 States { Spawn: @@ -294,7 +277,6 @@ ACTOR SGShard8 : GlassShard ACTOR SGShard9 : GlassShard { - SpawnID 62 States { Spawn: @@ -308,7 +290,6 @@ ACTOR SGShard9 : GlassShard ACTOR SGShard0 : GlassShard { - SpawnID 63 States { Spawn: diff --git a/wadsrc/static/actors/shared/sharedmisc.txt b/wadsrc/static/actors/shared/sharedmisc.txt index fa65ea589..69b1abb15 100644 --- a/wadsrc/static/actors/shared/sharedmisc.txt +++ b/wadsrc/static/actors/shared/sharedmisc.txt @@ -105,8 +105,6 @@ ACTOR RealGibs ACTOR Gibs : RealGibs { - Game Doom - SpawnID 146 ClearFlags } diff --git a/wadsrc/static/actors/shared/soundsequence.txt b/wadsrc/static/actors/shared/soundsequence.txt index 868251a04..463d582ae 100644 --- a/wadsrc/static/actors/shared/soundsequence.txt +++ b/wadsrc/static/actors/shared/soundsequence.txt @@ -29,61 +29,51 @@ ACTOR SoundSequence native ACTOR HereticSoundSequence1 : SoundSequence { - Game Heretic Args 0 } ACTOR HereticSoundSequence2 : SoundSequence { - Game Heretic Args 1 } ACTOR HereticSoundSequence3 : SoundSequence { - Game Heretic Args 2 } ACTOR HereticSoundSequence4 : SoundSequence { - Game Heretic Args 3 } ACTOR HereticSoundSequence5 : SoundSequence { - Game Heretic Args 4 } ACTOR HereticSoundSequence6 : SoundSequence { - Game Heretic Args 5 } ACTOR HereticSoundSequence7 : SoundSequence { - Game Heretic Args 6 } ACTOR HereticSoundSequence8 : SoundSequence { - Game Heretic Args 7 } ACTOR HereticSoundSequence9 : SoundSequence { - Game Heretic Args 8 } ACTOR HereticSoundSequence10 : SoundSequence { - Game Heretic Args 9 } diff --git a/wadsrc/static/actors/strife/acolyte.txt b/wadsrc/static/actors/strife/acolyte.txt index a111bd4df..12d4aab51 100644 --- a/wadsrc/static/actors/strife/acolyte.txt +++ b/wadsrc/static/actors/strife/acolyte.txt @@ -80,7 +80,6 @@ ACTOR Acolyte : StrifeHumanoid ACTOR AcolyteTan : Acolyte { - Game Strife ConversationID 53, 52, 53 +MISSILEMORE +MISSILEEVENMORE DropItem "ClipOfBullets" @@ -90,7 +89,6 @@ ACTOR AcolyteTan : Acolyte ACTOR AcolyteRed : Acolyte { - Game Strife ConversationID 54, 53, 54 +MISSILEMORE +MISSILEEVENMORE Translation 0 @@ -100,7 +98,6 @@ ACTOR AcolyteRed : Acolyte ACTOR AcolyteRust : Acolyte { - Game Strife ConversationID 55, 54, 55 +MISSILEMORE +MISSILEEVENMORE Translation 1 @@ -110,7 +107,6 @@ ACTOR AcolyteRust : Acolyte ACTOR AcolyteGray : Acolyte { - Game Strife ConversationID 56, 55, 56 +MISSILEMORE +MISSILEEVENMORE Translation 2 @@ -120,7 +116,6 @@ ACTOR AcolyteGray : Acolyte ACTOR AcolyteDGreen : Acolyte { - Game Strife ConversationID 57, 56, 57 +MISSILEMORE +MISSILEEVENMORE Translation 3 @@ -130,7 +125,6 @@ ACTOR AcolyteDGreen : Acolyte ACTOR AcolyteGold : Acolyte { - Game Strife ConversationID 58, 57, 58 +MISSILEMORE +MISSILEEVENMORE Translation 4 @@ -140,7 +134,6 @@ ACTOR AcolyteGold : Acolyte ACTOR AcolyteLGreen : Acolyte { - Game Strife Health 60 ConversationID 59, -1, -1 Translation 5 @@ -150,7 +143,6 @@ ACTOR AcolyteLGreen : Acolyte ACTOR AcolyteBlue : Acolyte { - Game Strife Health 60 ConversationID 60, -1, -1 Translation 6 @@ -160,7 +152,6 @@ ACTOR AcolyteBlue : Acolyte ACTOR AcolyteShadow : Acolyte { - Game Strife ConversationID 61, 58, 59 +MISSILEMORE DropItem "ClipOfBullets" @@ -180,7 +171,6 @@ ACTOR AcolyteShadow : Acolyte ACTOR AcolyteToBe : Acolyte { - Game Strife ConversationID 29, -1, -1 Health 61 Radius 20 diff --git a/wadsrc/static/actors/strife/alienspectres.txt b/wadsrc/static/actors/strife/alienspectres.txt index 6391ebf22..3f6ffe549 100644 --- a/wadsrc/static/actors/strife/alienspectres.txt +++ b/wadsrc/static/actors/strife/alienspectres.txt @@ -3,7 +3,6 @@ ACTOR AlienSpectre1 : SpectralMonster { - Game Strife ConversationID 67,-1,-1 Health 1000 Painchance 250 @@ -82,7 +81,6 @@ ACTOR AlienSpectre1 : SpectralMonster ACTOR AlienSpectre2 : AlienSpectre1 { - Game Strife ConversationID 70 Health 1200 Painchance 50 @@ -103,7 +101,6 @@ ACTOR AlienSpectre2 : AlienSpectre1 ACTOR AlienSpectre3 : AlienSpectre1 { - Game Strife ConversationID 71,-1,-1 Health 1500 Painchance 50 @@ -145,7 +142,6 @@ ACTOR AlienSpectre3 : AlienSpectre1 ACTOR AlienSpectre4 : AlienSpectre1 { - Game Strife ConversationID 72,-1,-1 Health 1700 Painchance 50 @@ -166,7 +162,6 @@ ACTOR AlienSpectre4 : AlienSpectre1 ACTOR AlienSpectre5 : AlienSpectre1 { - Game Strife ConversationID 73,-1,-1 Health 2000 Painchance 50 diff --git a/wadsrc/static/actors/strife/beggars.txt b/wadsrc/static/actors/strife/beggars.txt index 9f529c7b3..e7555a139 100644 --- a/wadsrc/static/actors/strife/beggars.txt +++ b/wadsrc/static/actors/strife/beggars.txt @@ -64,34 +64,29 @@ ACTOR Beggar : StrifeHumanoid ACTOR Beggar1 : Beggar { - Game Strife ConversationID 38, 37, 38 } ACTOR Beggar2 : Beggar { - Game Strife ConversationID 39, 38, 39 } ACTOR Beggar3 : Beggar { - Game Strife ConversationID 40, 39, 40 } ACTOR Beggar4 : Beggar { - Game Strife ConversationID 41, 40, 41 } ACTOR Beggar5 : Beggar { - Game Strife ConversationID 42, 41, 42 } diff --git a/wadsrc/static/actors/strife/coin.txt b/wadsrc/static/actors/strife/coin.txt index 4fc5825f1..ff55b7b52 100644 --- a/wadsrc/static/actors/strife/coin.txt +++ b/wadsrc/static/actors/strife/coin.txt @@ -3,7 +3,6 @@ ACTOR Coin : Inventory native { - Game Strife ConversationID 168, 161, 165 +DROPPED +NOTDMATCH @@ -26,7 +25,6 @@ ACTOR Coin : Inventory native ACTOR Gold10 : Coin { - Game Strife ConversationID 169, 162, 166 Inventory.Amount 10 Tag "$TAG_10GOLD" @@ -43,7 +41,6 @@ ACTOR Gold10 : Coin ACTOR Gold25 : Coin { - Game Strife ConversationID 170, 163, 167 Inventory.Amount 25 Tag "$TAG_25GOLD" @@ -60,7 +57,6 @@ ACTOR Gold25 : Coin ACTOR Gold50 : Coin { - Game Strife ConversationID 171, 164, 168 Inventory.Amount 50 Tag "$TAG_50GOLD" diff --git a/wadsrc/static/actors/strife/crusader.txt b/wadsrc/static/actors/strife/crusader.txt index 22aaecdb5..2c1a6fd7f 100644 --- a/wadsrc/static/actors/strife/crusader.txt +++ b/wadsrc/static/actors/strife/crusader.txt @@ -3,7 +3,6 @@ ACTOR Crusader { - Game Strife ConversationID 63,-1,-1 Speed 8 Radius 40 @@ -112,7 +111,6 @@ ACTOR CrusaderMissile ACTOR DeadCrusader { - Game Strife ConversationID 230 States { diff --git a/wadsrc/static/actors/strife/entityboss.txt b/wadsrc/static/actors/strife/entityboss.txt index 90769d4b0..81daf7d0f 100644 --- a/wadsrc/static/actors/strife/entityboss.txt +++ b/wadsrc/static/actors/strife/entityboss.txt @@ -3,7 +3,6 @@ ACTOR EntityNest { - Game Strife ConversationID 76,-1,-1 Radius 84 Height 47 @@ -22,7 +21,6 @@ ACTOR EntityNest ACTOR EntityPod { - Game Strife ConversationID 77,-1,-1 Radius 25 Height 91 @@ -52,7 +50,6 @@ ACTOR EntityPod ACTOR EntityBoss : SpectralMonster { - Game Strife ConversationID 74,-1,-1 Health 2500 Painchance 255 diff --git a/wadsrc/static/actors/strife/inquisitor.txt b/wadsrc/static/actors/strife/inquisitor.txt index 211dc0755..f3a766b0d 100644 --- a/wadsrc/static/actors/strife/inquisitor.txt +++ b/wadsrc/static/actors/strife/inquisitor.txt @@ -3,7 +3,6 @@ ACTOR Inquisitor { - Game Strife ConversationID 93,-1,-1 Health 1000 Speed 12 diff --git a/wadsrc/static/actors/strife/loremaster.txt b/wadsrc/static/actors/strife/loremaster.txt index 8c6f5caa9..03b25c9d3 100644 --- a/wadsrc/static/actors/strife/loremaster.txt +++ b/wadsrc/static/actors/strife/loremaster.txt @@ -3,7 +3,6 @@ ACTOR Loremaster { - Game Strife ConversationID 66, 63, 64 Health 800 Speed 10 diff --git a/wadsrc/static/actors/strife/macil.txt b/wadsrc/static/actors/strife/macil.txt index c479dd4b3..ae437bd19 100644 --- a/wadsrc/static/actors/strife/macil.txt +++ b/wadsrc/static/actors/strife/macil.txt @@ -3,7 +3,6 @@ ACTOR Macil1 { - Game Strife ConversationID 49, 48, 49 Health 95 Radius 20 @@ -60,7 +59,6 @@ ACTOR Macil1 ACTOR Macil2 : Macil1 { - Game Strife ConversationID 50, 49, 50 Painchance 200 +COUNTKILL diff --git a/wadsrc/static/actors/strife/merchants.txt b/wadsrc/static/actors/strife/merchants.txt index 4c8265892..a690fc676 100644 --- a/wadsrc/static/actors/strife/merchants.txt +++ b/wadsrc/static/actors/strife/merchants.txt @@ -56,7 +56,6 @@ ACTOR Merchant ACTOR WeaponSmith : Merchant { - Game Strife ConversationID 2 PainSound "smith/pain" Tag "$TAG_WEAPONSMITH" @@ -67,7 +66,6 @@ ACTOR WeaponSmith : Merchant ACTOR BarKeep : Merchant { - Game Strife Translation 4 ConversationID 3 PainSound "barkeep/pain" @@ -80,7 +78,6 @@ ACTOR BarKeep : Merchant ACTOR Armorer : Merchant { - Game Strife Translation 5 ConversationID 4 PainSound "armorer/pain" @@ -92,7 +89,6 @@ ACTOR Armorer : Merchant ACTOR Medic : Merchant { - Game Strife Translation 6 ConversationID 5 PainSound "medic/pain" diff --git a/wadsrc/static/actors/strife/oracle.txt b/wadsrc/static/actors/strife/oracle.txt index 43e5dcaa4..ce81ebf05 100644 --- a/wadsrc/static/actors/strife/oracle.txt +++ b/wadsrc/static/actors/strife/oracle.txt @@ -3,7 +3,6 @@ ACTOR Oracle { - Game Strife ConversationID 65, 62, 63 Health 1 Radius 15 diff --git a/wadsrc/static/actors/strife/peasants.txt b/wadsrc/static/actors/strife/peasants.txt index 08e5ef09c..b6c100e7c 100644 --- a/wadsrc/static/actors/strife/peasants.txt +++ b/wadsrc/static/actors/strife/peasants.txt @@ -69,28 +69,24 @@ ACTOR Peasant : StrifeHumanoid ACTOR Peasant1 : Peasant { - Game Strife ConversationID 6 Speed 4 } ACTOR Peasant2 : Peasant { - Game Strife ConversationID 7 Speed 5 } ACTOR Peasant3 : Peasant { - Game Strife ConversationID 8 Speed 5 } ACTOR Peasant4 : Peasant { - Game Strife Translation 0 ConversationID 9 Speed 7 @@ -98,7 +94,6 @@ ACTOR Peasant4 : Peasant ACTOR Peasant5 : Peasant { - Game Strife Translation 0 ConversationID 10 Speed 7 @@ -106,7 +101,6 @@ ACTOR Peasant5 : Peasant ACTOR Peasant6 : Peasant { - Game Strife Translation 0 ConversationID 11 Speed 7 @@ -114,112 +108,96 @@ ACTOR Peasant6 : Peasant ACTOR Peasant7 : Peasant { - Game Strife Translation 2 ConversationID 12 } ACTOR Peasant8 : Peasant { - Game Strife Translation 2 ConversationID 13 } ACTOR Peasant9 : Peasant { - Game Strife Translation 2 ConversationID 14 } ACTOR Peasant10 : Peasant { - Game Strife Translation 1 ConversationID 15 } ACTOR Peasant11 : Peasant { - Game Strife Translation 1 ConversationID 16 } ACTOR Peasant12 : Peasant { - Game Strife Translation 1 ConversationID 17 } ACTOR Peasant13 : Peasant { - Game Strife Translation 3 ConversationID 18 } ACTOR Peasant14 : Peasant { - Game Strife Translation 3 ConversationID 19 } ACTOR Peasant15 : Peasant { - Game Strife Translation 3 ConversationID 20 } ACTOR Peasant16 : Peasant { - Game Strife Translation 5 ConversationID 21 } ACTOR Peasant17 : Peasant { - Game Strife Translation 5 ConversationID 22 } ACTOR Peasant18 : Peasant { - Game Strife Translation 5 ConversationID 23 } ACTOR Peasant19 : Peasant { - Game Strife Translation 4 ConversationID 24 } ACTOR Peasant20 : Peasant { - Game Strife Translation 4 ConversationID 25 } ACTOR Peasant21 : Peasant { - Game Strife Translation 4 ConversationID 26 } ACTOR Peasant22 : Peasant { - Game Strife Translation 6 ConversationID 27 } diff --git a/wadsrc/static/actors/strife/programmer.txt b/wadsrc/static/actors/strife/programmer.txt index 4b6fef390..f1833ffdc 100644 --- a/wadsrc/static/actors/strife/programmer.txt +++ b/wadsrc/static/actors/strife/programmer.txt @@ -3,7 +3,6 @@ ACTOR Programmer { - Game Strife ConversationID 95, -1, -1 Health 1100 PainChance 50 diff --git a/wadsrc/static/actors/strife/ratbuddy.txt b/wadsrc/static/actors/strife/ratbuddy.txt index 646323c43..fa7deef89 100644 --- a/wadsrc/static/actors/strife/ratbuddy.txt +++ b/wadsrc/static/actors/strife/ratbuddy.txt @@ -1,7 +1,6 @@ ACTOR RatBuddy { - Game Strife ConversationID 202, 196, 200 Health 5 Speed 13 diff --git a/wadsrc/static/actors/strife/reaver.txt b/wadsrc/static/actors/strife/reaver.txt index 8df0f9d75..76db1cfda 100644 --- a/wadsrc/static/actors/strife/reaver.txt +++ b/wadsrc/static/actors/strife/reaver.txt @@ -1,7 +1,6 @@ ACTOR Reaver { - Game Strife Health 150 Painchance 128 Speed 12 diff --git a/wadsrc/static/actors/strife/rebels.txt b/wadsrc/static/actors/strife/rebels.txt index 2ac3469ad..60c61eabf 100644 --- a/wadsrc/static/actors/strife/rebels.txt +++ b/wadsrc/static/actors/strife/rebels.txt @@ -66,7 +66,6 @@ ACTOR Rebel : StrifeHumanoid ACTOR Rebel1 : Rebel { - Game Strife ConversationID 43, 42, 43 DropItem "ClipOfBullets" } @@ -75,7 +74,6 @@ ACTOR Rebel1 : Rebel ACTOR Rebel2 : Rebel { - Game Strife ConversationID 44, 43, 44 } @@ -83,7 +81,6 @@ ACTOR Rebel2 : Rebel ACTOR Rebel3 : Rebel { - Game Strife ConversationID 45, 44, 45 } @@ -91,7 +88,6 @@ ACTOR Rebel3 : Rebel ACTOR Rebel4 : Rebel { - Game Strife ConversationID 46, 45, 56 } @@ -99,7 +95,6 @@ ACTOR Rebel4 : Rebel ACTOR Rebel5 : Rebel { - Game Strife ConversationID 47, 46, 47 } @@ -107,7 +102,6 @@ ACTOR Rebel5 : Rebel ACTOR Rebel6 : Rebel { - Game Strife ConversationID 48, 47, 48 } @@ -115,7 +109,6 @@ ACTOR Rebel6 : Rebel ACTOR TeleporterBeacon : Inventory native { - Game Strife ConversationID 166,-1,-1 Health 5 Radius 16 diff --git a/wadsrc/static/actors/strife/sentinel.txt b/wadsrc/static/actors/strife/sentinel.txt index e7a1866ca..3da2c5436 100644 --- a/wadsrc/static/actors/strife/sentinel.txt +++ b/wadsrc/static/actors/strife/sentinel.txt @@ -3,7 +3,6 @@ ACTOR Sentinel { - Game Strife ConversationID 91,-1,-1 Health 100 Painchance 255 diff --git a/wadsrc/static/actors/strife/sigil.txt b/wadsrc/static/actors/strife/sigil.txt index 3c6899430..482b2c908 100644 --- a/wadsrc/static/actors/strife/sigil.txt +++ b/wadsrc/static/actors/strife/sigil.txt @@ -3,7 +3,6 @@ ACTOR Sigil : Weapon native { - Game Strife Weapon.Kickback 100 Weapon.SelectionOrder 4000 @@ -125,7 +124,6 @@ ACTOR Sigil : Weapon native ACTOR Sigil1 : Sigil { - Game Strife ConversationID 196, 190, 194 Inventory.Icon "I_SGL1" Health 1 @@ -135,7 +133,6 @@ ACTOR Sigil1 : Sigil ACTOR Sigil2 : Sigil { - Game Strife ConversationID 197, 191, 195 Inventory.Icon "I_SGL2" Health 2 @@ -145,7 +142,6 @@ ACTOR Sigil2 : Sigil ACTOR Sigil3 : Sigil { - Game Strife ConversationID 198, 192, 196 Inventory.Icon "I_SGL3" Health 3 @@ -155,7 +151,6 @@ ACTOR Sigil3 : Sigil ACTOR Sigil4 : Sigil { - Game Strife ConversationID 199, 193, 197 Inventory.Icon "I_SGL4" Health 4 @@ -165,7 +160,6 @@ ACTOR Sigil4 : Sigil ACTOR Sigil5 : Sigil { - Game Strife ConversationID 200, 194, 198 Inventory.Icon "I_SGL5" Health 5 diff --git a/wadsrc/static/actors/strife/stalker.txt b/wadsrc/static/actors/strife/stalker.txt index f0792743f..aaddc8dab 100644 --- a/wadsrc/static/actors/strife/stalker.txt +++ b/wadsrc/static/actors/strife/stalker.txt @@ -4,7 +4,6 @@ ACTOR Stalker { - Game Strife ConversationID 92,-1,-1 Health 80 Painchance 40 diff --git a/wadsrc/static/actors/strife/strifeammo.txt b/wadsrc/static/actors/strife/strifeammo.txt index 5d5e35c8d..b1548f3dd 100644 --- a/wadsrc/static/actors/strife/strifeammo.txt +++ b/wadsrc/static/actors/strife/strifeammo.txt @@ -2,7 +2,6 @@ ACTOR HEGrenadeRounds : Ammo { - Game Strife +FLOORCLIP ConversationID 177, 170, 174 Inventory.Amount 6 @@ -24,7 +23,6 @@ ACTOR HEGrenadeRounds : Ammo ACTOR PhosphorusGrenadeRounds : Ammo { - Game Strife +FLOORCLIP ConversationID 178, 171, 175 Inventory.Amount 4 @@ -46,8 +44,6 @@ ACTOR PhosphorusGrenadeRounds : Ammo ACTOR ClipOfBullets : Ammo { - Game Strife - SpawnID 11 ConversationID 179, 173, 177 +FLOORCLIP Inventory.Amount 10 @@ -69,8 +65,6 @@ ACTOR ClipOfBullets : Ammo ACTOR BoxOfBullets : ClipOfBullets { - Game Strife - SpawnID 139 ConversationID 180, 174, 178 Inventory.Amount 50 Tag "$TAG_BOXOFBULLETS" @@ -87,8 +81,6 @@ ACTOR BoxOfBullets : ClipOfBullets ACTOR MiniMissiles : Ammo { - Game Strife - SpawnID 140 ConversationID 181, 175, 179 +FLOORCLIP Inventory.Amount 4 @@ -110,8 +102,6 @@ ACTOR MiniMissiles : Ammo ACTOR CrateOfMissiles : MiniMissiles { - Game Strife - SpawnID 141 ConversationID 182, 176, 180 Inventory.Amount 20 Tag "$TAG_CRATEOFMISSILES" @@ -128,8 +118,6 @@ ACTOR CrateOfMissiles : MiniMissiles ACTOR EnergyPod : Ammo { - Game Strife - SpawnID 75 ConversationID 183, 177, 181 +FLOORCLIP Inventory.Amount 20 @@ -152,8 +140,6 @@ ACTOR EnergyPod : Ammo ACTOR EnergyPack : EnergyPod { - Game Strife - SpawnID 142 ConversationID 184, 178, 182 Inventory.Amount 100 Tag "$TAG_ENERGYPACK" @@ -170,7 +156,6 @@ ACTOR EnergyPack : EnergyPod ACTOR PoisonBolts : Ammo { - Game Strife ConversationID 185, 179, 183 +FLOORCLIP Inventory.Amount 10 @@ -192,7 +177,6 @@ ACTOR PoisonBolts : Ammo ACTOR ElectricBolts : Ammo { - Game Strife ConversationID 186, 180, 184 +FLOORCLIP Inventory.Amount 20 @@ -214,8 +198,6 @@ ACTOR ElectricBolts : Ammo ACTOR AmmoSatchel : BackpackItem { - Game Strife - SpawnID 144 ConversationID 187, 181, 184 +FLOORCLIP Inventory.Icon "I_BKPK" diff --git a/wadsrc/static/actors/strife/strifearmor.txt b/wadsrc/static/actors/strife/strifearmor.txt index 590a46ea9..9201bc047 100644 --- a/wadsrc/static/actors/strife/strifearmor.txt +++ b/wadsrc/static/actors/strife/strifearmor.txt @@ -1,8 +1,6 @@ ACTOR MetalArmor : BasicArmorPickup { - Game Strife - SpawnID 69 ConversationID 129, 125, 128 Radius 20 Height 16 @@ -25,8 +23,6 @@ ACTOR MetalArmor : BasicArmorPickup ACTOR LeatherArmor : BasicArmorPickup { - Game Strife - SpawnID 68 ConversationID 130, 126, 129 Radius 20 Height 16 diff --git a/wadsrc/static/actors/strife/strifebishop.txt b/wadsrc/static/actors/strife/strifebishop.txt index 71ad18c26..25f33f5e1 100644 --- a/wadsrc/static/actors/strife/strifebishop.txt +++ b/wadsrc/static/actors/strife/strifebishop.txt @@ -3,7 +3,6 @@ ACTOR StrifeBishop { - Game Strife ConversationID 64,-1,-1 Health 500 Painchance 128 diff --git a/wadsrc/static/actors/strife/strifeitems.txt b/wadsrc/static/actors/strife/strifeitems.txt index 89e098848..289210ba2 100644 --- a/wadsrc/static/actors/strife/strifeitems.txt +++ b/wadsrc/static/actors/strife/strifeitems.txt @@ -2,7 +2,6 @@ ACTOR MedPatch : HealthPickup { - Game Strife ConversationID 125, 121, 124 Health 10 +FLOORCLIP @@ -25,7 +24,6 @@ ACTOR MedPatch : HealthPickup ACTOR MedicalKit : HealthPickup { - Game Strife ConversationID 126, 122, 125 Health 25 +FLOORCLIP @@ -48,7 +46,6 @@ ACTOR MedicalKit : HealthPickup ACTOR SurgeryKit : HealthPickup { - Game Strife ConversationID 127, 123, 126 +FLOORCLIP +INVENTORY.INVBAR @@ -70,8 +67,6 @@ ACTOR SurgeryKit : HealthPickup ACTOR StrifeMap : MapRevealer { - Game Strife - SpawnID 137 ConversationID 164, 160, 163 +FLOORCLIP Inventory.PickupSound "misc/p_pkup" @@ -89,7 +84,6 @@ ACTOR StrifeMap : MapRevealer ACTOR BeldinsRing : Inventory { - Game Strife +NOTDMATCH +FLOORCLIP +INVENTORY.INVBAR @@ -111,7 +105,6 @@ ACTOR BeldinsRing : Inventory ACTOR OfferingChalice : Inventory { - Game Strife +DROPPED +FLOORCLIP +INVENTORY.INVBAR @@ -135,7 +128,6 @@ ACTOR OfferingChalice : Inventory ACTOR Ear : Inventory { - Game Strife +FLOORCLIP +INVENTORY.INVBAR ConversationID 175, 167, 171 @@ -156,7 +148,6 @@ ACTOR Ear : Inventory ACTOR BrokenPowerCoupling : Inventory { - Game Strife ConversationID 289, -1, -1 Health 40 +DROPPED @@ -182,8 +173,6 @@ ACTOR BrokenPowerCoupling : Inventory ACTOR ShadowArmor : PowerupGiver { - Game Strife - SpawnID 135 ConversationID 160, 156, 159 +FLOORCLIP +VISIBILITYPULSE @@ -209,8 +198,6 @@ ACTOR ShadowArmor : PowerupGiver ACTOR EnvironmentalSuit : PowerupGiver { - Game Strife - SpawnID 136 ConversationID 161, 157, 160 +FLOORCLIP +INVENTORY.INVBAR @@ -234,7 +221,6 @@ ACTOR EnvironmentalSuit : PowerupGiver ACTOR GuardUniform : Inventory { - Game Strife ConversationID 162, 158, 161 +FLOORCLIP +INVENTORY.INVBAR @@ -255,7 +241,6 @@ ACTOR GuardUniform : Inventory ACTOR OfficersUniform : Inventory { - Game Strife ConversationID 163, 159, 162 +FLOORCLIP +INVENTORY.INVBAR @@ -275,7 +260,6 @@ ACTOR OfficersUniform : Inventory ACTOR FlameThrowerParts : Inventory { - Game Strife ConversationID 191, 185, 189 +FLOORCLIP +INVENTORY.INVBAR @@ -297,7 +281,6 @@ ACTOR FlameThrowerParts : Inventory ACTOR InterrogatorReport : Inventory { - Game Strife ConversationID 308, 289, 306 +FLOORCLIP Tag "$TAG_REPORT" @@ -315,7 +298,6 @@ ACTOR InterrogatorReport : Inventory ACTOR Info : Inventory { - Game Strife ConversationID 300, 282, 299 +FLOORCLIP +INVENTORY.INVBAR @@ -335,7 +317,6 @@ ACTOR Info : Inventory ACTOR Targeter : PowerupGiver { - Game Strife ConversationID 167, 169, 173 +FLOORCLIP +INVENTORY.INVBAR @@ -358,7 +339,6 @@ ACTOR Targeter : PowerupGiver ACTOR Communicator : Inventory { - Game Strife ConversationID 176, 168, 172 +NOTDMATCH Tag "$TAG_COMMUNICATOR" @@ -377,7 +357,6 @@ ACTOR Communicator : Inventory ACTOR DegninOre : Inventory native { - Game Strife ConversationID 128, 124, 127 Health 10 Radius 16 @@ -412,7 +391,6 @@ ACTOR DegninOre : Inventory native ACTOR GunTraining : Inventory { - Game Strife ConversationID 310,-1,-1 +FLOORCLIP +INVENTORY.INVBAR @@ -432,7 +410,6 @@ ACTOR GunTraining : Inventory ACTOR HealthTraining : Inventory native { - Game Strife ConversationID 309,-1,-1 +FLOORCLIP +INVENTORY.INVBAR @@ -454,7 +431,6 @@ ACTOR HealthTraining : Inventory native ACTOR Scanner : PowerupGiver native { - Game Strife ConversationID 165,-1,-1 +FLOORCLIP +INVENTORY.FANCYPICKUPSOUND @@ -476,7 +452,6 @@ ACTOR Scanner : PowerupGiver native ACTOR PrisonPass : Key native { - Game Strife ConversationID 304, 286, 303 Inventory.Icon "I_TOKN" Tag "$TAG_PRISONPASS" diff --git a/wadsrc/static/actors/strife/strifekeys.txt b/wadsrc/static/actors/strife/strifekeys.txt index 1a1dc99c2..ca8949417 100644 --- a/wadsrc/static/actors/strife/strifekeys.txt +++ b/wadsrc/static/actors/strife/strifekeys.txt @@ -10,7 +10,6 @@ ACTOR StrifeKey : Key ACTOR BaseKey : StrifeKey { - Game Strife ConversationID 133, 129, 132 Inventory.Icon "I_FUSL" Tag "$TAG_BASEKEY" @@ -28,7 +27,6 @@ ACTOR BaseKey : StrifeKey ACTOR GovsKey : StrifeKey { - Game Strife ConversationID 134, 130, 133 Inventory.Icon "I_REBL" Tag "$TAG_GOVSKEY" @@ -46,7 +44,6 @@ ACTOR GovsKey : StrifeKey ACTOR Passcard : StrifeKey { - Game Strife ConversationID 135, 131, 134 Inventory.Icon "I_TPAS" Tag "$TAG_PASSCARD" @@ -64,7 +61,6 @@ ACTOR Passcard : StrifeKey ACTOR IDBadge : StrifeKey { - Game Strife ConversationID 136, 132, 135 Inventory.Icon "I_CRD1" Tag "$TAG_IDBADGE" @@ -82,7 +78,6 @@ ACTOR IDBadge : StrifeKey ACTOR PrisonKey : StrifeKey { - Game Strife ConversationID 137, 133, 136 Inventory.Icon "I_PRIS" Tag "$TAG_PRISONKEY" @@ -101,7 +96,6 @@ ACTOR PrisonKey : StrifeKey ACTOR SeveredHand : StrifeKey { - Game Strife ConversationID 138, 134, 137 Inventory.Icon "I_HAND" Tag "$TAG_SEVEREDHAND" @@ -120,7 +114,6 @@ ACTOR SeveredHand : StrifeKey ACTOR Power1Key : StrifeKey { - Game Strife ConversationID 139, 135, 138 Inventory.Icon "I_PWR1" Tag "$TAG_POWER1KEY" @@ -138,7 +131,6 @@ ACTOR Power1Key : StrifeKey ACTOR Power2Key : StrifeKey { - Game Strife ConversationID 140, 136, 139 Inventory.Icon "I_PWR2" Tag "$TAG_POWER2KEY" @@ -156,7 +148,6 @@ ACTOR Power2Key : StrifeKey ACTOR Power3Key : StrifeKey { - Game Strife ConversationID 141, 137, 140 Inventory.Icon "I_PWR3" Tag "$TAG_POWER3KEY" @@ -174,7 +165,6 @@ ACTOR Power3Key : StrifeKey ACTOR GoldKey : StrifeKey { - Game Strife ConversationID 142, 138, 141 Inventory.Icon "I_KY1G" Tag "$TAG_GOLDKEY" @@ -192,7 +182,6 @@ ACTOR GoldKey : StrifeKey ACTOR IDCard : StrifeKey { - Game Strife ConversationID 143, 139, 142 Inventory.Icon "I_CRD2" Tag "$TAG_IDCARD" @@ -210,7 +199,6 @@ ACTOR IDCard : StrifeKey ACTOR SilverKey : StrifeKey { - Game Strife ConversationID 144, 140, 143 Inventory.Icon "I_KY2S" Tag "$TAG_SILVERKEY" @@ -228,7 +216,6 @@ ACTOR SilverKey : StrifeKey ACTOR OracleKey : StrifeKey { - Game Strife ConversationID 145, 141, 144 Inventory.Icon "I_ORAC" Tag "$TAG_ORACLEKEY" @@ -246,7 +233,6 @@ ACTOR OracleKey : StrifeKey ACTOR MilitaryID : StrifeKey { - Game Strife ConversationID 146, 142, 145 Inventory.Icon "I_GYID" Tag "$TAG_MILITARYID" @@ -264,7 +250,6 @@ ACTOR MilitaryID : StrifeKey ACTOR OrderKey : StrifeKey { - Game Strife ConversationID 147, 143, 146 Inventory.Icon "I_FUBR" Tag "$TAG_ORDERKEY" @@ -282,7 +267,6 @@ ACTOR OrderKey : StrifeKey ACTOR WarehouseKey : StrifeKey { - Game Strife ConversationID 148, 144, 147 Inventory.Icon "I_WARE" Tag "$TAG_WAREHOUSEKEY" @@ -300,7 +284,6 @@ ACTOR WarehouseKey : StrifeKey ACTOR BrassKey : StrifeKey { - Game Strife ConversationID 149, 145, 148 Inventory.Icon "I_KY3B" Tag "$TAG_BRASSKEY" @@ -318,7 +301,6 @@ ACTOR BrassKey : StrifeKey ACTOR RedCrystalKey : StrifeKey { - Game Strife ConversationID 150, 146, 149 Inventory.Icon "I_RCRY" Tag "$TAG_REDCRYSTALKEY" @@ -336,7 +318,6 @@ ACTOR RedCrystalKey : StrifeKey ACTOR BlueCrystalKey : StrifeKey { - Game Strife ConversationID 151, 147, 150 Inventory.Icon "I_BCRY" Tag "$TAG_BLUECRYSTALKEY" @@ -354,7 +335,6 @@ ACTOR BlueCrystalKey : StrifeKey ACTOR ChapelKey : StrifeKey { - Game Strife ConversationID 152, 148, 151 Inventory.Icon "I_CHAP" Tag "$TAG_CHAPELKEY" @@ -372,7 +352,6 @@ ACTOR ChapelKey : StrifeKey ACTOR CatacombKey : StrifeKey { - Game Strife ConversationID 153, 149, 152 Inventory.Icon "I_TUNL" Tag "$TAG_CATACOMBKEY" @@ -391,7 +370,6 @@ ACTOR CatacombKey : StrifeKey ACTOR SecurityKey : StrifeKey { - Game Strife ConversationID 154, 150, 153 Inventory.Icon "I_SECK" Tag "$TAG_SECURITYKEY" @@ -409,7 +387,6 @@ ACTOR SecurityKey : StrifeKey ACTOR CoreKey : StrifeKey { - Game Strife ConversationID 155, 151, 154 Inventory.Icon "I_GOID" Tag "$TAG_COREKEY" @@ -427,7 +404,6 @@ ACTOR CoreKey : StrifeKey ACTOR MaulerKey : StrifeKey { - Game Strife ConversationID 156, 152, 155 Inventory.Icon "I_BLTK" Tag "$TAG_MAULERKEY" @@ -445,7 +421,6 @@ ACTOR MaulerKey : StrifeKey ACTOR FactoryKey : StrifeKey { - Game Strife ConversationID 157, 153, 156 Inventory.Icon "I_PROC" Tag "$TAG_FACTORYKEY" @@ -463,7 +438,6 @@ ACTOR FactoryKey : StrifeKey ACTOR MineKey : StrifeKey { - Game Strife ConversationID 158, 154, 157 Inventory.Icon "I_MINE" Tag "$TAG_MINEKEY" @@ -481,7 +455,6 @@ ACTOR MineKey : StrifeKey ACTOR NewKey5 : StrifeKey { - Game Strife ConversationID 159, 155, 158 Inventory.Icon "I_BLTK" Tag "$TAG_NEWKEY5" @@ -499,7 +472,6 @@ ACTOR NewKey5 : StrifeKey ACTOR OraclePass : Inventory { - Game Strife ConversationID 311, 292, 309 +INVENTORY.INVBAR Inventory.Icon "I_OTOK" diff --git a/wadsrc/static/actors/strife/strifestuff.txt b/wadsrc/static/actors/strife/strifestuff.txt index af72541e6..25ed31d66 100644 --- a/wadsrc/static/actors/strife/strifestuff.txt +++ b/wadsrc/static/actors/strife/strifestuff.txt @@ -2,7 +2,6 @@ ACTOR Tank1 { - Game Strife Radius 16 Height 192 +SOLID @@ -21,7 +20,6 @@ ACTOR Tank1 ACTOR Tank2 { - Game Strife Radius 16 Height 192 +SOLID @@ -40,7 +38,6 @@ ACTOR Tank2 ACTOR Tank3 { - Game Strife Radius 16 Height 192 +SOLID @@ -59,7 +56,6 @@ ACTOR Tank3 ACTOR Tank4 { - Game Strife Radius 16 Height 56 +SOLID @@ -78,7 +74,6 @@ ACTOR Tank4 ACTOR Tank5 { - Game Strife Radius 16 Height 56 +SOLID @@ -97,7 +92,6 @@ ACTOR Tank5 ACTOR Tank6 { - Game Strife Radius 16 Height 56 +SOLID @@ -116,7 +110,6 @@ ACTOR Tank6 ACTOR WaterBottle { - Game Strife ConversationID 131, -1, -1 States { @@ -130,7 +123,6 @@ ACTOR WaterBottle ACTOR Mug { - Game Strife ConversationID 132, -1, -1 States { @@ -144,7 +136,6 @@ ACTOR Mug ACTOR WoodenBarrel { - Game Strife Health 10 Radius 10 Height 32 @@ -171,7 +162,6 @@ ACTOR WoodenBarrel ACTOR ExplosiveBarrel2 { - Game Strife Health 30 Radius 10 Height 32 @@ -200,7 +190,6 @@ ACTOR ExplosiveBarrel2 ACTOR LightSilverFluorescent { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -218,7 +207,6 @@ ACTOR LightSilverFluorescent ACTOR LightBrownFluorescent { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -236,7 +224,6 @@ ACTOR LightBrownFluorescent ACTOR LightGoldFluorescent { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -254,7 +241,6 @@ ACTOR LightGoldFluorescent ACTOR LightGlobe { - Game Strife Radius 16 Height 16 +SOLID @@ -271,7 +257,6 @@ ACTOR LightGlobe ACTOR PillarTechno { - Game Strife Radius 20 Height 128 +SOLID @@ -288,7 +273,6 @@ ACTOR PillarTechno ACTOR PillarAztec { - Game Strife Radius 16 Height 128 +SOLID @@ -305,7 +289,6 @@ ACTOR PillarAztec ACTOR PillarAztecDamaged { - Game Strife Radius 16 Height 80 +SOLID @@ -322,7 +305,6 @@ ACTOR PillarAztecDamaged ACTOR PillarAztecRuined { - Game Strife Radius 16 Height 40 +SOLID @@ -339,7 +321,6 @@ ACTOR PillarAztecRuined ACTOR PillarHugeTech { - Game Strife Radius 24 Height 192 +SOLID @@ -356,7 +337,6 @@ ACTOR PillarHugeTech ACTOR PillarAlienPower { - Game Strife Radius 24 Height 192 +SOLID @@ -374,7 +354,6 @@ ACTOR PillarAlienPower ACTOR SStalactiteBig { - Game Strife Radius 16 Height 54 +SOLID +SPAWNCEILING +NOGRAVITY @@ -391,7 +370,6 @@ ACTOR SStalactiteBig ACTOR SStalactiteSmall { - Game Strife Radius 16 Height 40 +SOLID +SPAWNCEILING +NOGRAVITY @@ -408,7 +386,6 @@ ACTOR SStalactiteSmall ACTOR SStalagmiteBig { - Game Strife Radius 16 Height 40 +SOLID @@ -425,7 +402,6 @@ ACTOR SStalagmiteBig ACTOR CavePillarTop { - Game Strife Radius 16 Height 128 +SOLID +SPAWNCEILING +NOGRAVITY @@ -442,7 +418,6 @@ ACTOR CavePillarTop ACTOR CavePillarBottom { - Game Strife Radius 16 Height 128 +SOLID @@ -459,7 +434,6 @@ ACTOR CavePillarBottom ACTOR SStalagmiteSmall { - Game Strife Radius 16 Height 25 +SOLID @@ -476,7 +450,6 @@ ACTOR SStalagmiteSmall ACTOR Candle { - Game Strife ConversationID 222, -1, -1 States { @@ -490,7 +463,6 @@ ACTOR Candle ACTOR StrifeCandelabra { - Game Strife Radius 16 Height 40 +SOLID @@ -507,7 +479,6 @@ ACTOR StrifeCandelabra ACTOR WaterDropOnFloor { - Game Strife +NOBLOCKMAP ConversationID 224, -1, -1 ActiveSound "world/waterdrip" @@ -528,7 +499,6 @@ ACTOR WaterDropOnFloor ACTOR WaterfallSplash { - Game Strife +NOBLOCKMAP ConversationID 225, -1, -1 ActiveSound "world/waterfall" @@ -545,7 +515,6 @@ ACTOR WaterfallSplash ACTOR WaterDrip { - Game Strife Height 1 +NOBLOCKMAP +SPAWNCEILING +NOGRAVITY ConversationID 226, -1, -1 @@ -562,7 +531,6 @@ ACTOR WaterDrip ACTOR WaterFountain { - Game Strife +NOBLOCKMAP ConversationID 227, -1, -1 ActiveSound "world/watersplash" @@ -579,7 +547,6 @@ ACTOR WaterFountain ACTOR HeartsInTank { - Game Strife Radius 16 Height 56 +SOLID @@ -596,7 +563,6 @@ ACTOR HeartsInTank ACTOR TeleportSwirl { - Game Strife +NOBLOCKMAP RenderStyle Add Alpha 0.25 @@ -614,7 +580,6 @@ ACTOR TeleportSwirl ACTOR DeadStrifePlayer { - Game Strife ConversationID 231, -1, -1 States { @@ -630,7 +595,6 @@ ACTOR DeadStrifePlayer ACTOR DeadPeasant { - Game Strife ConversationID 232, -1, -1 States { @@ -645,7 +609,6 @@ ACTOR DeadPeasant ACTOR DeadAcolyte { - Game Strife ConversationID 233, -1, -1 States { @@ -659,7 +622,6 @@ ACTOR DeadAcolyte ACTOR DeadReaver { - Game Strife ConversationID 234, -1, -1 States { @@ -673,7 +635,6 @@ ACTOR DeadReaver ACTOR DeadRebel { - Game Strife ConversationID 235, -1, -1 States { @@ -687,7 +648,6 @@ ACTOR DeadRebel ACTOR SacrificedGuy { - Game Strife ConversationID 236, -1, -1 States { @@ -704,7 +664,6 @@ ACTOR PileOfGuts // Strife used a doomednum, which is the same as the Aztec Pillar. Since // the pillar came first in the mobjinfo list, you could not spawn this // in a map. Pity. - Game Strife ConversationID 237, -1, -1 States { @@ -718,7 +677,6 @@ ACTOR PileOfGuts ACTOR StrifeBurningBarrel { - Game Strife Radius 16 Height 48 +SOLID @@ -735,7 +693,6 @@ ACTOR StrifeBurningBarrel ACTOR BurningBowl { - Game Strife Radius 16 Height 16 +SOLID @@ -753,7 +710,6 @@ ACTOR BurningBowl ACTOR BurningBrazier { - Game Strife Radius 10 Height 32 +SOLID @@ -771,7 +727,6 @@ ACTOR BurningBrazier ACTOR SmallTorchLit { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -792,7 +747,6 @@ ACTOR SmallTorchLit ACTOR SmallTorchUnlit { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -810,7 +764,6 @@ ACTOR SmallTorchUnlit ACTOR CeilingChain { - Game Strife Radius 20 Height 93 +NOBLOCKMAP +SPAWNCEILING +NOGRAVITY @@ -828,7 +781,6 @@ ACTOR CeilingChain ACTOR CageLight { // No, it's not bright even though it's a light. - Game Strife Height 3 +NOBLOCKMAP +SPAWNCEILING +NOGRAVITY ConversationID 244, -1, -1 @@ -844,7 +796,6 @@ ACTOR CageLight ACTOR Statue { - Game Strife Radius 20 Height 64 +SOLID @@ -861,7 +812,6 @@ ACTOR Statue ACTOR StatueRuined { - Game Strife Radius 20 Height 56 +SOLID @@ -878,7 +828,6 @@ ACTOR StatueRuined ACTOR MediumTorch { - Game Strife Radius 4 Height 72 +SOLID @@ -896,7 +845,6 @@ ACTOR MediumTorch ACTOR OutsideLamp { // No, it's not bright. - Game Strife Radius 3 Height 80 +SOLID @@ -914,7 +862,6 @@ ACTOR OutsideLamp ACTOR PoleLantern { // No, it's not bright. - Game Strife Radius 3 Height 80 +SOLID @@ -931,7 +878,6 @@ ACTOR PoleLantern ACTOR SRock1 { - Game Strife +NOBLOCKMAP ConversationID 250, -1, -1 States @@ -946,7 +892,6 @@ ACTOR SRock1 ACTOR SRock2 { - Game Strife +NOBLOCKMAP ConversationID 251, -1, -1 States @@ -961,7 +906,6 @@ ACTOR SRock2 ACTOR SRock3 { - Game Strife +NOBLOCKMAP ConversationID 252, -1, -1 States @@ -976,7 +920,6 @@ ACTOR SRock3 ACTOR SRock4 { - Game Strife +NOBLOCKMAP ConversationID 253, -1, -1 States @@ -991,7 +934,6 @@ ACTOR SRock4 ACTOR StickInWater { - Game Strife +NOBLOCKMAP +FLOORCLIP ConversationID 254, -1, -1 @@ -1008,7 +950,6 @@ ACTOR StickInWater ACTOR Rubble1 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 255, -1, -1 States @@ -1023,7 +964,6 @@ ACTOR Rubble1 ACTOR Rubble2 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 256, -1, -1 States @@ -1038,7 +978,6 @@ ACTOR Rubble2 ACTOR Rubble3 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 257, -1, -1 States @@ -1053,7 +992,6 @@ ACTOR Rubble3 ACTOR Rubble4 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 258, -1, -1 States @@ -1068,7 +1006,6 @@ ACTOR Rubble4 ACTOR Rubble5 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 259, -1, -1 States @@ -1083,7 +1020,6 @@ ACTOR Rubble5 ACTOR Rubble6 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 260, -1, -1 States @@ -1098,7 +1034,6 @@ ACTOR Rubble6 ACTOR Rubble7 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 261, -1, -1 States @@ -1113,7 +1048,6 @@ ACTOR Rubble7 ACTOR Rubble8 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 262, -1, -1 States @@ -1128,7 +1062,6 @@ ACTOR Rubble8 ACTOR SurgeryCrab { - Game Strife +SOLID +SPAWNCEILING +NOGRAVITY Radius 20 Height 16 @@ -1145,7 +1078,6 @@ ACTOR SurgeryCrab ACTOR LargeTorch { - Game Strife Radius 10 Height 72 +SOLID @@ -1163,7 +1095,6 @@ ACTOR LargeTorch ACTOR HugeTorch { - Game Strife Radius 10 Height 80 +SOLID @@ -1181,7 +1112,6 @@ ACTOR HugeTorch ACTOR PalmTree { - Game Strife Radius 15 Height 109 +SOLID @@ -1198,7 +1128,6 @@ ACTOR PalmTree ACTOR BigTree2 { - Game Strife Radius 15 Height 109 +SOLID @@ -1215,7 +1144,6 @@ ACTOR BigTree2 ACTOR PottedTree { - Game Strife Radius 15 Height 64 +SOLID @@ -1232,7 +1160,6 @@ ACTOR PottedTree ACTOR TreeStub { - Game Strife Radius 15 Height 80 +SOLID @@ -1249,7 +1176,6 @@ ACTOR TreeStub ACTOR ShortBush { - Game Strife Radius 15 Height 40 +SOLID @@ -1266,7 +1192,6 @@ ACTOR ShortBush ACTOR TallBush { - Game Strife Radius 20 Height 64 +SOLID @@ -1283,7 +1208,6 @@ ACTOR TallBush ACTOR ChimneyStack { - Game Strife Radius 20 Height 64 // This height does not fit the sprite +SOLID @@ -1300,7 +1224,6 @@ ACTOR ChimneyStack ACTOR BarricadeColumn { - Game Strife Radius 16 Height 128 +SOLID @@ -1317,7 +1240,6 @@ ACTOR BarricadeColumn ACTOR Pot { - Game Strife Radius 12 Height 24 +SOLID @@ -1334,7 +1256,6 @@ ACTOR Pot ACTOR Pitcher { - Game Strife Radius 12 Height 32 +SOLID @@ -1351,7 +1272,6 @@ ACTOR Pitcher ACTOR Stool { - Game Strife Radius 6 Height 24 +SOLID @@ -1368,7 +1288,6 @@ ACTOR Stool ACTOR MetalPot { - Game Strife +NOBLOCKMAP ConversationID 277, -1, -1 States @@ -1383,7 +1302,6 @@ ACTOR MetalPot ACTOR Tub { - Game Strife +NOBLOCKMAP ConversationID 278, -1, -1 States @@ -1398,7 +1316,6 @@ ACTOR Tub ACTOR Anvil { - Game Strife Radius 16 Height 32 +SOLID @@ -1415,7 +1332,6 @@ ACTOR Anvil ACTOR TechLampSilver { - Game Strife Radius 11 Height 64 +SOLID @@ -1432,7 +1348,6 @@ ACTOR TechLampSilver ACTOR TechLampBrass { - Game Strife Radius 8 Height 64 +SOLID @@ -1449,7 +1364,6 @@ ACTOR TechLampBrass ACTOR Tray { - Game Strife Radius 24 Height 40 +SOLID @@ -1466,7 +1380,6 @@ ACTOR Tray ACTOR AmmoFiller { - Game Strife Radius 12 Height 24 +SOLID @@ -1483,7 +1396,6 @@ ACTOR AmmoFiller ACTOR SigilBanner { - Game Strife Radius 24 Height 96 +NOBLOCKMAP // I take it this was once solid, yes? @@ -1500,7 +1412,6 @@ ACTOR SigilBanner ACTOR RebelBoots { - Game Strife +NOBLOCKMAP ConversationID 285, -1, -1 States @@ -1515,7 +1426,6 @@ ACTOR RebelBoots ACTOR RebelHelmet { - Game Strife +NOBLOCKMAP ConversationID 286, -1, -1 States @@ -1530,7 +1440,6 @@ ACTOR RebelHelmet ACTOR RebelShirt { - Game Strife +NOBLOCKMAP ConversationID 287, -1, -1 States @@ -1545,7 +1454,6 @@ ACTOR RebelShirt ACTOR AlienBubbleColumn { - Game Strife Radius 16 Height 128 +SOLID @@ -1563,7 +1471,6 @@ ACTOR AlienBubbleColumn ACTOR AlienFloorBubble { - Game Strife Radius 16 Height 72 +SOLID @@ -1581,7 +1488,6 @@ ACTOR AlienFloorBubble ACTOR AlienCeilingBubble { - Game Strife Radius 16 Height 72 +SOLID +SPAWNCEILING +NOGRAVITY @@ -1599,7 +1505,6 @@ ACTOR AlienCeilingBubble ACTOR AlienAspClimber { - Game Strife Radius 16 Height 128 +SOLID @@ -1617,7 +1522,6 @@ ACTOR AlienAspClimber ACTOR AlienSpiderLight { - Game Strife Radius 32 Height 56 +SOLID @@ -1635,7 +1539,6 @@ ACTOR AlienSpiderLight ACTOR TargetPractice { - Game Strife Health 99999999 PainChance 255 Radius 10 @@ -1661,7 +1564,6 @@ ACTOR TargetPractice ACTOR ForceFieldGuard native { - Game Strife Health 10 Radius 2 Height 1 @@ -1685,7 +1587,6 @@ ACTOR ForceFieldGuard native ACTOR KneelingGuy { - Game Strife ConversationID 37,-1,-1 Health 51 Painchance 255 @@ -1734,7 +1635,6 @@ ACTOR KneelingGuy ACTOR KlaxonWarningLight { - Game Strife ConversationID 121,-1,-1 ReactionTime 60 Radius 5 @@ -1759,7 +1659,6 @@ ACTOR KlaxonWarningLight ACTOR CeilingTurret { - Game Strife ConversationID 122,-1,-1 Health 125 Speed 0 @@ -1803,7 +1702,6 @@ ACTOR CeilingTurret ACTOR PowerCoupling native { - Game Strife ConversationID 288,-1,-1 Health 40 Radius 17 diff --git a/wadsrc/static/actors/strife/strifeweapons.txt b/wadsrc/static/actors/strife/strifeweapons.txt index dc60db3cc..785ebfaae 100644 --- a/wadsrc/static/actors/strife/strifeweapons.txt +++ b/wadsrc/static/actors/strife/strifeweapons.txt @@ -45,7 +45,6 @@ ACTOR StrifeSpark : StrifePuff ACTOR PunchDagger : StrifeWeapon { - Game Strife Weapon.SelectionOrder 3900 +WEAPON.NOALERT Obituary "$OB_MPPUNCHDAGGER" @@ -152,7 +151,6 @@ ACTOR PoisonBolt native ACTOR StrifeCrossbow : StrifeWeapon { - Game Strife +FLOORCLIP ConversationID 194, 188, 192 Weapon.SelectionOrder 1200 @@ -203,7 +201,6 @@ ACTOR StrifeCrossbow : StrifeWeapon ACTOR StrifeCrossbow2 : StrifeCrossbow { - Game Strife Weapon.SelectionOrder 2700 Weapon.AmmoUse1 1 Weapon.AmmoGive1 0 @@ -240,7 +237,6 @@ ACTOR StrifeCrossbow2 : StrifeCrossbow actor AssaultGun : StrifeWeapon { - Game Strife ConversationID 188, 182, 186 +FLOORCLIP Weapon.SelectionOrder 600 @@ -279,7 +275,6 @@ actor AssaultGun : StrifeWeapon ACTOR AssaultGunStanding : WeaponGiver { - Game Strife ConversationID 189, 183, 187 DropItem "AssaultGun" Inventory.PickupMessage "$TXT_ASSAULTGUN" @@ -297,7 +292,6 @@ ACTOR AssaultGunStanding : WeaponGiver ACTOR MiniMissileLauncher : StrifeWeapon { - Game Strife ConversationID 192, 186, 190 +FLOORCLIP Weapon.SelectionOrder 1800 @@ -371,7 +365,6 @@ ACTOR MiniMissilePuff : StrifePuff ACTOR MiniMissile { - Game Strife ConversationID 99,-1,-1 Speed 20 Radius 10 @@ -403,7 +396,6 @@ ACTOR MiniMissile ACTOR FlameThrower : StrifeWeapon { - Game Strife ConversationID 190, 184, 188 +FLOORCLIP Weapon.SelectionOrder 2100 @@ -482,7 +474,6 @@ ACTOR FlameMissile ACTOR Mauler : StrifeWeapon { - Game Strife ConversationID 193, 187, 191 +FLOORCLIP Weapon.SelectionOrder 300 @@ -528,7 +519,6 @@ ACTOR Mauler : StrifeWeapon ACTOR Mauler2 : Mauler { - Game Strife Weapon.SelectionOrder 3300 Weapon.AmmoUse1 30 Weapon.AmmoGive1 0 @@ -643,7 +633,6 @@ ACTOR MaulerTorpedoWave ACTOR HEGrenade { - Game Strife ConversationID 106,-1,-1 Speed 15 Radius 13 @@ -681,7 +670,6 @@ ACTOR HEGrenade ACTOR PhosphorousGrenade { - Game Strife ConversationID 107,-1,-1 Speed 15 Radius 13 @@ -754,7 +742,6 @@ ACTOR PhosphorousFire native ACTOR StrifeGrenadeLauncher : StrifeWeapon { - Game Strife ConversationID 195, 189, 193 +FLOORCLIP Weapon.SelectionOrder 2400 @@ -803,7 +790,6 @@ ACTOR StrifeGrenadeLauncher : StrifeWeapon ACTOR StrifeGrenadeLauncher2 : StrifeGrenadeLauncher { - Game Strife Weapon.SelectionOrder 3200 Weapon.AmmoUse1 1 Weapon.AmmoGive1 0 diff --git a/wadsrc/static/actors/strife/templar.txt b/wadsrc/static/actors/strife/templar.txt index 00316ff43..e11321e82 100644 --- a/wadsrc/static/actors/strife/templar.txt +++ b/wadsrc/static/actors/strife/templar.txt @@ -1,7 +1,6 @@ ACTOR Templar { - Game Strife ConversationID 62, 61, 62 Health 300 Painchance 100 diff --git a/wadsrc/static/actors/strife/thingstoblowup.txt b/wadsrc/static/actors/strife/thingstoblowup.txt index c2b9b1916..2860cea11 100644 --- a/wadsrc/static/actors/strife/thingstoblowup.txt +++ b/wadsrc/static/actors/strife/thingstoblowup.txt @@ -23,7 +23,6 @@ ACTOR Bang4Cloud ACTOR Piston { - Game Strife ConversationID 123,-1,-1 Health 100 Speed 16 @@ -60,7 +59,6 @@ ACTOR Piston ACTOR Computer { - Game Strife ConversationID 124,-1,-1 Health 80 Speed 27 @@ -100,7 +98,6 @@ ACTOR Computer ACTOR PowerCrystal { - Game Strife ConversationID 201,-1,-1 Health 50 Speed 14 diff --git a/wadsrc/static/actors/strife/zombie.txt b/wadsrc/static/actors/strife/zombie.txt index f92cc5a0d..064cf4ffa 100644 --- a/wadsrc/static/actors/strife/zombie.txt +++ b/wadsrc/static/actors/strife/zombie.txt @@ -3,7 +3,6 @@ ACTOR Zombie : StrifeHumanoid { - Game Strife Health 31 Radius 20 Height 56 @@ -45,7 +44,6 @@ ACTOR Zombie : StrifeHumanoid ACTOR ZombieSpawner { - Game Strife Health 20 +SHOOTABLE +NOSECTOR diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt index 7202a6265..5e83ee727 100644 --- a/wadsrc/static/mapinfo/common.txt +++ b/wadsrc/static/mapinfo/common.txt @@ -222,6 +222,30 @@ DoomEdNums 32000 = DoomBuilderCamera } +SpawnNums +{ + 41 = Rock1 + 42 = Rock2 + 43 = Rock3 + 44 = Dirt1 + 45 = Dirt2 + 46 = Dirt3 + 47 = Dirt4 + 48 = Dirt5 + 49 = Dirt6 + 54 = SGShard1 + 55 = SGShard2 + 56 = SGShard3 + 57 = SGShard4 + 58 = SGShard5 + 59 = SGShard6 + 60 = SGShard7 + 61 = SGShard8 + 62 = SGShard9 + 63 = SGShard0 + 130 = Blood +} + Intermission Inter_Titlescreen { diff --git a/wadsrc/static/mapinfo/doomcommon.txt b/wadsrc/static/mapinfo/doomcommon.txt index 8138c905d..60be71ea4 100644 --- a/wadsrc/static/mapinfo/doomcommon.txt +++ b/wadsrc/static/mapinfo/doomcommon.txt @@ -67,6 +67,97 @@ gameinfo statscreen_enteringpatch = "WIENTER" } +spawnnums +{ + 1 = ShotgunGuy + 2 = ChaingunGuy + 3 = BaronOfHell + 4 = Zombieman + 5 = DoomImp + 6 = Arachnotron + 7 = SpiderMastermind + 8 = Demon + 9 = Spectre + 10 = DoomImpBall + 11 = Clip + 12 = Shell + 19 = Cacodemon + 20 = Revenant + 21 = ZBridge + 22 = ArmorBonus + 23 = Stimpack + 24 = Medikit + 25 = Soulsphere + 27 = Shotgun + 28 = Chaingun + 29 = RocketLauncher + 30 = PlasmaRifle + 31 = BFG9000 + 32 = Chainsaw + 33 = SuperShotgun + 51 = PlasmaBall + 53 = RevenantTracer + 68 = GreenArmor + 69 = BlueArmor + 75 = Cell + 85 = BlueCard + 86 = RedCard + 87 = YellowCard + 88 = YellowSkull + 89 = RedSkull + 90 = BlueSkull + 98 = ArchvileFire + 100 = StealthBaron + 101 = StealthHellKnight + 102 = StealthZombieMan + 103 = StealthShotgunGuy + 110 = LostSoul + 111 = Archvile + 112 = Fatso + 113 = HellKnight + 114 = Cyberdemon + 115 = PainElemental + 116 = WolfensteinSS + 117 = StealthArachnotron + 118 = StealthArchvile + 119 = StealthCacodemon + 120 = StealthChaingunGuy + 121 = StealthDemon + 122 = StealthDoomImp + 123 = StealthFatso + 124 = StealthRevenant + 125 = ExplosiveBarrel + 126 = CacodemonBall + 127 = Rocket + 128 = BFGBall + 129 = ArachnotronPlasma + 131 = BulletPuff + 132 = Megasphere + 133 = InvulnerabilitySphere + 134 = Berserk + 135 = BlurSphere + 136 = RadSuit + 137 = Allmap + 138 = Infrared + 139 = ClipBox + 140 = RocketAmmo + 141 = RocketBox + 142 = CellPack + 143 = ShellBox + 144 = Backpack + 145 = GibbedMarine + 146 = Gibs + 147 = ColonGibs + 148 = SmallBloodPool + 149 = BurningBarrel + 150 = BrainStem + 151 = ScriptedMarine + 152 = HealthBonus + 153 = FatShot + 154 = BaronBall + 216 = Grenade +} + skill baby { AutoUseHealth diff --git a/wadsrc/static/mapinfo/heretic.txt b/wadsrc/static/mapinfo/heretic.txt index a4b8c3ece..71d9a9949 100644 --- a/wadsrc/static/mapinfo/heretic.txt +++ b/wadsrc/static/mapinfo/heretic.txt @@ -165,6 +165,100 @@ DoomEdNums 9042 = GoldWand } +SpawnNums +{ + 1 = Clink + 2 = MummyLeader + 3 = Beast + 4 = Mummy + 5 = HereticImp + 6 = Knight + 7 = HereticImpLeader + 8 = MummyGhost + 9 = MummyLeaderGhost + 10 = HereticImpBall + 11 = GoldWandAmmo + 12 = GoldWandHefty + 14 = ArtiEgg + 15 = ArtiFly + 18 = ArtiTeleport + 19 = Wizard + 20 = Ironlich + 21 = Bridge + 23 = CrystalVial + 24 = ArtiHealth + 25 = ArtiSuperHealth + 27 = Crossbow + 28 = Blaster + 29 = PhoenixRod + 30 = SkullRod + 31 = Mace + 32 = Gauntlets + 33 = CrossbowAmmo + 34 = CrossbowHefty + 35 = MaceAmmo + 36 = MaceHefty + 37 = BlasterAmmo + 38 = BlasterHefty + 40 = EggFX + 68 = SilverShield + 69 = EnchantedShield + 72 = ArtiTimeBomb + 73 = ArtiTorch + 85 = KeyBlue + 86 = KeyGreen + 87 = KeyYellow + 110 = SoundWind + 111 = SoundWaterfall + 120 = BeastBall + 121 = Feather + 122 = Chicken + 123 = VolcanoBlast + 124 = VolcanoTBlast + 125 = Pod + 126 = PodGenerator + 127 = KnightAxe + 128 = RedAxe + 129 = KnightGhost + 131 = MummyFX1 + 132 = Snake + 133 = ArtiInvulnerability + 134 = ArtiTomeOfPower + 135 = ArtiInvisibility + 136 = BagOfHolding + 137 = SuperMap + 138 = SnakeProjA + 139 = SnakeProjB + 140 = WizardFX1 + 141 = BossSpot + 142 = Sorcerer1 + 143 = Sorcerer2 + 144 = SorcererFX1 + 145 = Sorcerer2FX1 + 146 = Sorcerer2FX2 + 147 = CrossbowFX1 + 148 = CrossbowFX2 + 149 = CrossbowFX3 + 150 = Volcano + 151 = GoldWandFX1 + 152 = GoldWandFX2 + 153 = MaceFX4 + 154 = MaceFX1 + 155 = MaceFX3 + 156 = MaceFX2 + 157 = Ripper + 158 = SkullRodAmmo + 159 = SkullRodHefty + 160 = HornRodFX1 + 161 = PhoenixRodAmmo + 162 = PhoenixRodHefty + 163 = PhoenixFX1 + 164 = HeadFX1 + 165 = Whirlwind + 166 = TeleGlitterGenerator1 + 167 = TeleGlitterGenerator2 +} + skill baby { AutoUseHealth diff --git a/wadsrc/static/mapinfo/hexen.txt b/wadsrc/static/mapinfo/hexen.txt index 2788947a5..508d546aa 100644 --- a/wadsrc/static/mapinfo/hexen.txt +++ b/wadsrc/static/mapinfo/hexen.txt @@ -299,6 +299,101 @@ DoomEdNums 10503 = FlameLarge } +SpawnNums +{ + 1 = Centaur + 2 = CentaurLeader + 3 = Demon1 + 4 = Ettin + 5 = FireDemon + 6 = Serpent + 7 = SerpentLeader + 8 = Wraith + 9 = WraithBuried + 10 = FireBall + 11 = Mana1 + 12 = Mana2 + 13 = ArtiSpeedBoots + 14 = ArtiPork + 15 = ArtiFly + 16 = ArtiDarkServant + 17 = ArtiTeleportOther + 18 = ArtiTeleport + 19 = Bishop + 20 = IceGuy + 21 = Bridge + 22 = ArtiBoostArmor + 23 = CrystalVial + 24 = ArtiHealth + 25 = ArtiSuperHealth + 26 = ArtiBoostMana + 27 = FWeapAxe + 28 = FWeapHammer + 29 = FWeaponPiece1 + 30 = FWeaponPiece2 + 31 = FWeaponPiece3 + 32 = CWeapStaff + 33 = CWeaponPiece1 + 34 = CWeaponPiece2 + 35 = CWeaponPiece3 + 36 = MWeapFrost + 37 = MWeaponPiece1 + 38 = MWeaponPiece2 + 39 = MWeaponPiece3 + 40 = PorkFX + 50 = Arrow + 51 = Dart + 52 = PoisonDart + 53 = RipperBall + 64 = ProjectileBlade + 65 = IceShard + 66 = FlameSmall2 + 67 = FlameLarge2 + 68 = MeshArmor + 69 = FalconShield + 70 = PlatinumHelm + 71 = AmuletOfWarding + 72 = ArtiPoisonBag + 73 = ArtiTorch + 74 = ArtiBlastRadius + 75 = Mana3 + 76 = PuzzSkull + 77 = PuzzGemBig + 78 = PuzzGemRed + 79 = PuzzGemGreen1 + 80 = PuzzGemGreen2 + 81 = PuzzGemBlue1 + 82 = PuzzGemBlue2 + 83 = PuzzBook1 + 84 = PuzzBook2 + 85 = KeySteel + 86 = KeyCave + 87 = KeyAxe + 88 = KeyFire + 89 = KeyEmerald + 90 = KeyDungeon + 91 = KeySilver + 92 = KeyRusted + 93 = KeyHorn + 94 = KeySwamp + 95 = HWaterDrip + 96 = FlameSmallTemp + 97 = FlameSmall + 98 = FlameLargeTemp + 99 = FlameLarge + 100 = Demon1Mash + 101 = Demon2Mash + 102 = EttinMash + 103 = CentaurMash + 104 = ThrustFloorUp + 105 = ThrustFloorDown + 106 = WraithFX4 + 107 = WraithFX5 + 108 = WraithFX2 + 110 = SoundWindHexen + 133 = ArtiInvulnerability2 +} + skill baby { AutoUseHealth diff --git a/wadsrc/static/mapinfo/strife.txt b/wadsrc/static/mapinfo/strife.txt index 6d00d1214..06fb13fbe 100644 --- a/wadsrc/static/mapinfo/strife.txt +++ b/wadsrc/static/mapinfo/strife.txt @@ -321,6 +321,22 @@ DoomEdNums 3006 = Sentinel } +SpawnNums +{ + 11 = ClipOfBullets + 68 = LeatherArmor + 69 = MetalArmor + 75 = EnergyPod + 135 = ShadowArmor + 136 = EnvironmentalSuit + 137 = StrifeMap + 139 = BoxOfBullets + 140 = MiniMissiles + 141 = CrateOfMissiles + 142 = EnergyPack + 144 = AmmoSatchel +} + Intermission Inter_Strife_Good { Image