diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 138fcf5a2..01ec2e4e3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -871,6 +871,7 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE f_wipe.cpp farchive.cpp files.cpp + g_doomedmap.cpp g_game.cpp g_hub.cpp g_level.cpp diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 4bb53e3fe..4a46a93cd 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -253,7 +253,7 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize) //========================================================================== // -// Lool for IWAD definition lump +// Look for IWAD definition lump // //========================================================================== @@ -302,11 +302,11 @@ int FIWadManager::ScanIWAD (const char *iwad) FResourceLump *lump = iwadfile->GetLump(ii); CheckLumpName(lump->Name); - if (lump->FullName != NULL) + if (lump->FullName.IsNotEmpty()) { if (strnicmp(lump->FullName, "maps/", 5) == 0) { - FString mapname(lump->FullName+5, strcspn(lump->FullName+5, ".")); + FString mapname(&lump->FullName[5], strcspn(&lump->FullName[5], ".")); CheckLumpName(mapname); } } diff --git a/src/d_main.cpp b/src/d_main.cpp index 8b9e54680..ab2459788 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -1992,6 +1992,9 @@ static void D_DoomInit() static void AddAutoloadFiles(const char *group, const char *autoname) { + LumpFilterGroup = group; + LumpFilterIWAD = autoname; + if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload")) { FString file; @@ -2440,6 +2443,8 @@ void D_DoomMain (void) // Create replacements for dehacked pickups FinishDehPatch(); + InitActorNumsFromMapinfo(); + InitSpawnablesFromMapinfo(); FActorInfo::StaticSetActorNums (); //Added by MC: diff --git a/src/doomdata.h b/src/doomdata.h index f190be37d..1dcd8e6b4 100644 --- a/src/doomdata.h +++ b/src/doomdata.h @@ -429,10 +429,10 @@ struct FPlayerStart short angle, type; FPlayerStart() { } - FPlayerStart(const FMapThing *mthing) + FPlayerStart(const FMapThing *mthing, int pnum) : x(mthing->x), y(mthing->y), z(mthing->z), angle(mthing->angle), - type(mthing->type) + type(pnum) { } }; // Player spawn spots for deathmatch. diff --git a/src/doomstat.cpp b/src/doomstat.cpp index 27c50b81e..697ef3afe 100644 --- a/src/doomstat.cpp +++ b/src/doomstat.cpp @@ -69,3 +69,4 @@ int SinglePlayerClass[MAXPLAYERS]; bool ToggleFullscreen; int BorderTopRefresh; +FString LumpFilterGroup, LumpFilterIWAD; diff --git a/src/doomstat.h b/src/doomstat.h index b1784530f..d7f3796ac 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -250,4 +250,7 @@ EXTERN_CVAR (Int, compatflags); EXTERN_CVAR (Int, compatflags2); extern int i_compatflags, i_compatflags2, ii_compatflags, ii_compatflags2, ib_compatflags; +// Filters from AddAutoloadFiles(). Used to filter files from archives. +extern FString LumpFilterGroup, LumpFilterIWAD; + #endif diff --git a/src/g_doomedmap.cpp b/src/g_doomedmap.cpp new file mode 100644 index 000000000..c3e586bc2 --- /dev/null +++ b/src/g_doomedmap.cpp @@ -0,0 +1,264 @@ +/* +** g_doomedmap.cpp +** +**--------------------------------------------------------------------------- +** Copyright 1998-2015 Randy Heit +** Copyright 2015 Christoph Oelckers +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** 2. Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** 3. The name of the author may not be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +**--------------------------------------------------------------------------- +** +** +*/ + +#include "info.h" +#include "p_lnspec.h" +#include "m_fixed.h" +#include "c_dispatch.h" +#include "templates.h" +#include "cmdlib.h" +#include "g_level.h" +#include "v_text.h" +#include "i_system.h" + + +const char *SpecialMapthingNames[] = { + "$PLAYER1START", + "$PLAYER2START", + "$PLAYER3START", + "$PLAYER4START", + "$PLAYER5START", + "$PLAYER6START", + "$PLAYER7START", + "$PLAYER8START", + "$DEATHMATCHSTART", + "$SSEQOVERRIDE", + "$POLYANCHOR", + "$POLYSPAWN", + "$POLYSPAWNCRUSH", + "$POLYSPAWNHURT" +}; +//========================================================================== +// +// Stuff that's only valid during definition time +// +//========================================================================== + +struct MapinfoEdMapItem +{ + FName classname; // DECORATE is read after MAPINFO so we do not have the actual classes available here yet. + int special; + int args[5]; + // 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 IdMap; + +static IdMap DoomEdFromMapinfo; + +//========================================================================== +// +// +//========================================================================== + +FDoomEdMap DoomEdMap; + +static int STACK_ARGS sortnums (const void *a, const void *b) +{ + return (*(const FDoomEdMap::Pair**)a)->Key - (*(const FDoomEdMap::Pair**)b)->Key; +} + +CCMD (dumpmapthings) +{ + TArray infos(DoomEdMap.CountUsed()); + FDoomEdMap::Iterator it(DoomEdMap); + FDoomEdMap::Pair *pair; + + while (it.NextPair(pair)) + { + infos.Push(pair); + } + + if (infos.Size () == 0) + { + Printf ("No map things registered\n"); + } + else + { + qsort (&infos[0], infos.Size (), sizeof(FDoomEdMap::Pair*), sortnums); + + for (unsigned i = 0; i < infos.Size (); ++i) + { + if (infos[i]->Value.Type != NULL) + { + Printf("%6d %s\n", infos[i]->Key, infos[i]->Value.Type->TypeName.GetChars()); + } + else if (infos[i]->Value.Special > 0) + { + Printf("%6d %s\n", infos[i]->Key, SpecialMapthingNames[infos[i]->Value.Special - 1]); + } + else + { + Printf("%6d none", infos[i]->Key); + } + + } + } +} + + +void FMapInfoParser::ParseDoomEdNums() +{ + TMap defined; + int error = 0; + + MapinfoEdMapItem 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("Editor Number %d defined more than once", ednum); + error++; + } + defined[ednum] = true; + if (sc.String[0] == '$') + { + // todo: add special stuff like playerstarts and sound sequence overrides here, too. + editem.classname = NAME_None; + editem.special = sc.MustMatchString(SpecialMapthingNames) + 1; // todo: assign proper constants + } + else + { + editem.classname = sc.String; + editem.special = -1; + } + memset(editem.args, 0, sizeof(editem.args)); + + int minargs = 0; + int maxargs = 5; + FString specialname; + if (sc.CheckString(",")) + { + // todo: parse a special or args + if (editem.special < 0) editem.special = 0; // mark args as used - if this is done we need to prevent assignment of map args in P_SpawnMapThing. + if (!sc.CheckNumber()) + { + sc.MustGetString(); + specialname = sc.String; // save for later error reporting. + editem.special = P_FindLineSpecial(sc.String, &minargs, &maxargs); + if (editem.special == 0 || minargs == -1) + { + sc.ScriptMessage("Invalid special %s for Editor Number %d", sc.String, ednum); + error++; + minargs = 0; + maxargs = 5; + } + if (!sc.CheckString(",")) + { + // special case: Special without arguments + if (minargs != 0) + { + sc.ScriptMessage("Incorrect number of args for special %s, min = %d, max = %d, found = 0", specialname.GetChars(), minargs, maxargs); + error++; + } + DoomEdFromMapinfo.Insert(ednum, editem); + continue; + } + sc.MustGetStringName(","); + sc.MustGetNumber(); + } + int i = 0; + while (i < 5) + { + editem.args[i++] = sc.Number; + i++; + if (!sc.CheckString(",")) break; + sc.MustGetNumber(); + } + if (specialname.IsNotEmpty() && (i < minargs || i > maxargs)) + { + sc.ScriptMessage("Incorrect number of args for special %s, min = %d, max = %d, found = %d", specialname.GetChars(), minargs, maxargs, i); + error++; + } + } + DoomEdFromMapinfo.Insert(ednum, editem); + } + else + { + sc.ScriptError("Number expected"); + } + } + if (error > 0) + { + sc.ScriptError("%d errors encountered in DoomEdNum definition"); + } +} + +void InitActorNumsFromMapinfo() +{ + DoomEdMap.Clear(); + IdMap::Iterator it(DoomEdFromMapinfo); + IdMap::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++; + } + } + FDoomEdEntry ent; + ent.Type = cls; + ent.Special = pair->Value.special; + memcpy(ent.Args, pair->Value.args, sizeof(ent.Args)); + DoomEdMap.Insert(pair->Key, ent); + } + if (error > 0) + { + I_Error("%d unknown actor classes found", error); + } + DoomEdFromMapinfo.Clear(); // we do not need this any longer +} diff --git a/src/g_level.h b/src/g_level.h index f94fefa42..27fc41fdb 100644 --- a/src/g_level.h +++ b/src/g_level.h @@ -104,6 +104,8 @@ 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 306c3645a..93e365941 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -1876,6 +1876,30 @@ void FMapInfoParser::ParseMapInfo (int lump, level_info_t &gamedefaults, level_i sc.ScriptError("intermission definitions not supported with old MAPINFO syntax"); } } + else if (sc.Compare("doomednums")) + { + if (format_type != FMT_Old) + { + format_type = FMT_New; + ParseDoomEdNums(); + } + else + { + 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/gi.cpp b/src/gi.cpp index b0edf2a04..ac3818870 100644 --- a/src/gi.cpp +++ b/src/gi.cpp @@ -335,7 +335,6 @@ void FMapInfoParser::ParseGameInfo() GAMEINFOKEY_INT(defaultrespawntime, "defaultrespawntime") GAMEINFOKEY_INT(defaultdropstyle, "defaultdropstyle") GAMEINFOKEY_STRING(Endoom, "endoom") - GAMEINFOKEY_INT(player5start, "player5start") GAMEINFOKEY_STRINGARRAY(quitmessages, "addquitmessages", 0, false) GAMEINFOKEY_STRINGARRAY(quitmessages, "quitmessages", 0, true) GAMEINFOKEY_STRING(mTitleColor, "menufontcolor_title") diff --git a/src/gi.h b/src/gi.h index d8d19a14b..490981f77 100644 --- a/src/gi.h +++ b/src/gi.h @@ -153,7 +153,6 @@ struct gameinfo_t int definventorymaxamount; int defaultrespawntime; int defaultdropstyle; - int player5start; DWORD pickupcolor; TArray quitmessages; FName mTitleColor; diff --git a/src/info.cpp b/src/info.cpp index e26ac3b8e..bba646ee5 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -141,9 +141,6 @@ void FActorInfo::StaticInit () void FActorInfo::StaticSetActorNums () { - SpawnableThings.Clear(); - DoomEdMap.Empty (); - for (unsigned int i = 0; i < PClass::m_RuntimeActors.Size(); ++i) { PClass::m_RuntimeActors[i]->ActorInfo->RegisterIDs (); @@ -171,7 +168,16 @@ void FActorInfo::RegisterIDs () } if (DoomEdNum != -1) { - DoomEdMap.AddType (DoomEdNum, cls); + FDoomEdEntry *oldent = DoomEdMap.CheckKey(DoomEdNum); + if (oldent != NULL && oldent->Special == -2) + { + Printf(TEXTCOLOR_RED"Editor number %d defined twice for classes '%s' and '%s'\n", DoomEdNum, cls->TypeName.GetChars(), oldent->Type->TypeName.GetChars()); + } + FDoomEdEntry ent; + memset(&ent, 0, sizeof(ent)); + ent.Type = cls; + ent.Special = -2; // use -2 instead of -1 so that we can recognize DECORATE defined entries and print a warning message if duplicates occur. + DoomEdMap.Insert(DoomEdNum, ent); if (cls != Class) { Printf(TEXTCOLOR_RED"Editor number %d refers to hidden class type '%s'\n", DoomEdNum, cls->TypeName.GetChars()); @@ -179,15 +185,6 @@ void FActorInfo::RegisterIDs () } } // Fill out the list for Chex Quest with Doom's actors - if (gameinfo.gametype == GAME_Chex && DoomEdMap.FindType(DoomEdNum) == NULL && - (GameFilter & GAME_Doom)) - { - DoomEdMap.AddType (DoomEdNum, Class, true); - if (cls != Class) - { - Printf(TEXTCOLOR_RED"Editor number %d refers to hidden class type '%s'\n", DoomEdNum, cls->TypeName.GetChars()); - } - } } //========================================================================== @@ -389,139 +386,6 @@ fixed_t *DmgFactors::CheckFactor(FName type) return pdf; } -//========================================================================== -// -// -//========================================================================== - -FDoomEdMap DoomEdMap; - -FDoomEdMap::FDoomEdEntry *FDoomEdMap::DoomEdHash[DOOMED_HASHSIZE]; - -FDoomEdMap::~FDoomEdMap() -{ - Empty(); -} - -void FDoomEdMap::AddType (int doomednum, const PClass *type, bool temporary) -{ - unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE; - FDoomEdEntry *entry = DoomEdHash[hash]; - while (entry && entry->DoomEdNum != doomednum) - { - entry = entry->HashNext; - } - if (entry == NULL) - { - entry = new FDoomEdEntry; - entry->HashNext = DoomEdHash[hash]; - entry->DoomEdNum = doomednum; - DoomEdHash[hash] = entry; - } - else if (!entry->temp) - { - Printf (PRINT_BOLD, "Warning: %s and %s both have doomednum %d.\n", - type->TypeName.GetChars(), entry->Type->TypeName.GetChars(), doomednum); - } - entry->temp = temporary; - entry->Type = type; -} - -void FDoomEdMap::DelType (int doomednum) -{ - unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE; - FDoomEdEntry **prev = &DoomEdHash[hash]; - FDoomEdEntry *entry = *prev; - while (entry && entry->DoomEdNum != doomednum) - { - prev = &entry->HashNext; - entry = entry->HashNext; - } - if (entry != NULL) - { - *prev = entry->HashNext; - delete entry; - } -} - -void FDoomEdMap::Empty () -{ - int bucket; - - for (bucket = 0; bucket < DOOMED_HASHSIZE; ++bucket) - { - FDoomEdEntry *probe = DoomEdHash[bucket]; - - while (probe != NULL) - { - FDoomEdEntry *next = probe->HashNext; - delete probe; - probe = next; - } - DoomEdHash[bucket] = NULL; - } -} - -const PClass *FDoomEdMap::FindType (int doomednum) const -{ - unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE; - FDoomEdEntry *entry = DoomEdHash[hash]; - while (entry && entry->DoomEdNum != doomednum) - entry = entry->HashNext; - return entry ? entry->Type : NULL; -} - -struct EdSorting -{ - const PClass *Type; - int DoomEdNum; -}; - -static int STACK_ARGS sortnums (const void *a, const void *b) -{ - return ((const EdSorting *)a)->DoomEdNum - - ((const EdSorting *)b)->DoomEdNum; -} - -void FDoomEdMap::DumpMapThings () -{ - TArray infos (PClass::m_Types.Size()); - int i; - - for (i = 0; i < DOOMED_HASHSIZE; ++i) - { - FDoomEdEntry *probe = DoomEdHash[i]; - - while (probe != NULL) - { - EdSorting sorting = { probe->Type, probe->DoomEdNum }; - infos.Push (sorting); - probe = probe->HashNext; - } - } - - if (infos.Size () == 0) - { - Printf ("No map things registered\n"); - } - else - { - qsort (&infos[0], infos.Size (), sizeof(EdSorting), sortnums); - - for (i = 0; i < (int)infos.Size (); ++i) - { - Printf ("%6d %s\n", - infos[i].DoomEdNum, infos[i].Type->TypeName.GetChars()); - } - } -} - -CCMD (dumpmapthings) -{ - FDoomEdMap::DumpMapThings (); -} - - static void SummonActor (int command, int command2, FCommandLine argv) { if (CheckCheatmode ()) diff --git a/src/info.h b/src/info.h index 13a8eb5e1..2ab0a82d6 100644 --- a/src/info.h +++ b/src/info.h @@ -278,34 +278,39 @@ struct FActorInfo TArray ForbiddenToPlayerClass; }; -class FDoomEdMap +struct FDoomEdEntry { -public: - ~FDoomEdMap(); - - const PClass *FindType (int doomednum) const; - void AddType (int doomednum, const PClass *type, bool temporary = false); - void DelType (int doomednum); - void Empty (); - - static void DumpMapThings (); - -private: - enum { DOOMED_HASHSIZE = 256 }; - - struct FDoomEdEntry - { - FDoomEdEntry *HashNext; - const PClass *Type; - int DoomEdNum; - bool temp; - }; - - static FDoomEdEntry *DoomEdHash[DOOMED_HASHSIZE]; + const PClass *Type; + int Special; + int Args[5]; }; +enum ESpecialMapthings +{ + SMT_PLAYER1START = 1, + SMT_PLAYER2START, + SMT_PLAYER3START, + SMT_PLAYER4START, + SMT_PLAYER5START, + SMT_PLAYER6START, + SMT_PLAYER7START, + SMT_PLAYER8START, + SMT_DEATHMATCHSTART, + SMT_SSEQOVERRIDE, + SMT_POLYANCHOR, + SMT_POLYSPAWN, + SMT_POLYSPAWNCRUSH, + SMT_POLYSPAWNHURT, +}; + + +typedef TMap FDoomEdMap; + extern FDoomEdMap DoomEdMap; +void InitActorNumsFromMapinfo(); + + int GetSpriteIndex(const char * spritename, bool add = true); TArray &MakeStateNameList(const char * fname); void AddStateLight(FState *state, const char *lname); diff --git a/src/p_buildmap.cpp b/src/p_buildmap.cpp index 2ee2ae83a..c12c79608 100644 --- a/src/p_buildmap.cpp +++ b/src/p_buildmap.cpp @@ -723,7 +723,7 @@ static int LoadSprites (spritetype *sprites, Xsprite *xsprites, int numsprites, if (xsprites[i].Data1 < 4) mapthings[count].type = 1 + xsprites[i].Data1; else - mapthings[count].type = gameinfo.player5start + xsprites[i].Data1 - 4; + mapthings[count].type = 4001 + xsprites[i].Data1 - 4; } else if (xsprites != NULL && sprites[i].lotag == 2) { // Bloodbath start diff --git a/src/p_local.h b/src/p_local.h index fe7958807..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 @@ -591,19 +592,6 @@ struct polyspawns_t short type; }; -enum -{ - PO_HEX_ANCHOR_TYPE = 3000, - PO_HEX_SPAWN_TYPE, - PO_HEX_SPAWNCRUSH_TYPE, - - // [RH] Thing numbers that don't conflict with Doom things - PO_ANCHOR_TYPE = 9300, - PO_SPAWN_TYPE, - PO_SPAWNCRUSH_TYPE, - PO_SPAWNHURT_TYPE -}; - extern int po_NumPolyobjs; extern polyspawns_t *polyspawns; // [RH] list of polyobject things to spawn diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 9dd9f1ddc..5eb806b02 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -4600,67 +4600,80 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position) if (mthing->type == 0 || mthing->type == -1) return NULL; - // count deathmatch start positions - if (mthing->type == 11) - { - FPlayerStart start(mthing); - deathmatchstarts.Push(start); - return NULL; - } + // find which type to spawn + FDoomEdEntry *mentry = DoomEdMap.CheckKey(mthing->type); - // Convert Strife starts to Hexen-style starts - if (gameinfo.gametype == GAME_Strife && mthing->type >= 118 && mthing->type <= 127) + if (mentry == NULL) { - mthing->args[0] = mthing->type - 117; - mthing->type = 1; - } - - // [RH] Record polyobject-related things - if (gameinfo.gametype == GAME_Hexen) - { - switch (mthing->type) + // [RH] Don't die if the map tries to spawn an unknown thing + Printf ("Unknown type %i at (%i, %i)\n", + mthing->type, + mthing->x>>FRACBITS, mthing->y>>FRACBITS); + mentry = DoomEdMap.CheckKey(0); + if (mentry == NULL) // we need a valid entry for the rest of this function so if we can't find a default, let's exit right away. { - case PO_HEX_ANCHOR_TYPE: - mthing->type = PO_ANCHOR_TYPE; - break; - case PO_HEX_SPAWN_TYPE: - mthing->type = PO_SPAWN_TYPE; - break; - case PO_HEX_SPAWNCRUSH_TYPE: - mthing->type = PO_SPAWNCRUSH_TYPE; - break; + return NULL; } } - - if (mthing->type == PO_ANCHOR_TYPE || - mthing->type == PO_SPAWN_TYPE || - mthing->type == PO_SPAWNCRUSH_TYPE || - mthing->type == PO_SPAWNHURT_TYPE) + if (mentry->Type == NULL && mentry->Special <= 0) { - polyspawns_t *polyspawn = new polyspawns_t; - polyspawn->next = polyspawns; - polyspawn->x = mthing->x; - polyspawn->y = mthing->y; - polyspawn->angle = mthing->angle; - polyspawn->type = mthing->type; - polyspawns = polyspawn; - if (mthing->type != PO_ANCHOR_TYPE) - po_NumPolyobjs++; + // has been explicitly set to not spawning anything. return NULL; } - // check for players specially - int pnum = -1; - - if (mthing->type <= 4 && mthing->type > 0) + // copy args to mapthing so that we have them in one place for the rest of this function + if (mentry->Special >= 0) { - pnum = mthing->type - 1; + mthing->special = mentry->Special; + memcpy(mthing->args, mentry->Args, sizeof(mthing->args)); } - else + + int pnum = -1; + if (mentry->Type == NULL) { - if (mthing->type >= gameinfo.player5start && mthing->type < gameinfo.player5start + MAXPLAYERS - 4) + + switch (mentry->Special) { - pnum = mthing->type - gameinfo.player5start + 4; + case SMT_DEATHMATCHSTART: + { + // count deathmatch start positions + FPlayerStart start(mthing, 0); + deathmatchstarts.Push(start); + return NULL; + } + + case SMT_POLYANCHOR: + case SMT_POLYSPAWN: + case SMT_POLYSPAWNCRUSH: + case SMT_POLYSPAWNHURT: + { + polyspawns_t *polyspawn = new polyspawns_t; + polyspawn->next = polyspawns; + polyspawn->x = mthing->x; + polyspawn->y = mthing->y; + polyspawn->angle = mthing->angle; + polyspawn->type = mentry->Special; + polyspawns = polyspawn; + if (mentry->Special != SMT_POLYANCHOR) + po_NumPolyobjs++; + return NULL; + } + + case SMT_PLAYER1START: + case SMT_PLAYER2START: + case SMT_PLAYER3START: + case SMT_PLAYER4START: + case SMT_PLAYER5START: + case SMT_PLAYER6START: + case SMT_PLAYER7START: + case SMT_PLAYER8START: + pnum = mentry->Special - SMT_PLAYER1START; + break; + + // Sound sequence override will be handled later + default: + break; + } } @@ -4728,7 +4741,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position) return NULL; // save spots for respawning in network games - FPlayerStart start(mthing); + FPlayerStart start(mthing, pnum+1); playerstarts[pnum] = start; AllPlayerStarts.Push(start); if (!deathmatch && !(level.flags2 & LEVEL2_RANDOMPLAYERSTARTS)) @@ -4739,20 +4752,10 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position) } // [RH] sound sequence overriders - if (mthing->type >= 1400 && mthing->type < 1410) + if (mentry->Type == NULL && mentry->Special == SMT_SSEQOVERRIDE) { - P_PointInSector (mthing->x, mthing->y)->seqType = mthing->type - 1400; - return NULL; - } - else if (mthing->type == 1411) - { - int type; - - if (mthing->args[0] == 255) - type = -1; - else - type = mthing->args[0]; - + int type = mentry->Args[0]; + if (type == 255) type = -1; if (type > 63) { Printf ("Sound sequence %d out of range\n", type); @@ -4764,51 +4767,25 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position) return NULL; } - // [RH] Determine if it is an old ambient thing, and if so, - // map it to MT_AMBIENT with the proper parameter. - if (mthing->type >= 14001 && mthing->type <= 14064) - { - mthing->args[0] = mthing->type - 14000; - mthing->type = 14065; - } - else if (mthing->type >= 14101 && mthing->type <= 14164) - { - mthing->args[0] = mthing->type - 14100; - mthing->type = 14165; - } - // find which type to spawn - i = DoomEdMap.FindType (mthing->type); - - if (i == NULL) - { - // [RH] Don't die if the map tries to spawn an unknown thing - Printf ("Unknown type %i at (%i, %i)\n", - mthing->type, - mthing->x>>FRACBITS, mthing->y>>FRACBITS); - i = PClass::FindClass("Unknown"); - } // [RH] If the thing's corresponding sprite has no frames, also map // it to the unknown thing. - else + // Handle decorate replacements explicitly here + // to check for missing frames in the replacement object. + i = mentry->Type->GetReplacement(); + + const AActor *defaults = GetDefaultByType (i); + if (defaults->SpawnState == NULL || + sprites[defaults->SpawnState->sprite].numframes == 0) { - // Handle decorate replacements explicitly here - // to check for missing frames in the replacement object. - i = i->GetReplacement(); + // We don't load mods for shareware games so we'll just ignore + // missing actors. Heretic needs this since the shareware includes + // the retail weapons in Deathmatch. + if (gameinfo.flags & GI_SHAREWARE) + return NULL; - const AActor *defaults = GetDefaultByType (i); - if (defaults->SpawnState == NULL || - sprites[defaults->SpawnState->sprite].numframes == 0) - { - // We don't load mods for shareware games so we'll just ignore - // missing actors. Heretic needs this since the shareware includes - // the retail weapons in Deathmatch. - if (gameinfo.flags & GI_SHAREWARE) - return NULL; - - Printf ("%s at (%i, %i) has no frames\n", - i->TypeName.GetChars(), mthing->x>>FRACBITS, mthing->y>>FRACBITS); - i = PClass::FindClass("Unknown"); - } + Printf ("%s at (%i, %i) has no frames\n", + i->TypeName.GetChars(), mthing->x>>FRACBITS, mthing->y>>FRACBITS); + i = PClass::FindClass("Unknown"); } const AActor *info = GetDefaultByType (i); @@ -4898,6 +4875,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position) P_FindFloorCeiling(mobj, FFCF_SAMESECTOR | FFCF_ONLY3DFLOORS | FFCF_3DRESTRICT); } + // if the actor got args defined either in DECORATE or MAPINFO we must ignore the map's properties. if (!(mobj->flags2 & MF2_ARGSDEFINED)) { // [RH] Set the thing's special diff --git a/src/p_setup.cpp b/src/p_setup.cpp index e374f0249..eaa0d4027 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -3334,32 +3334,16 @@ void P_GetPolySpots (MapData * map, TArray &spots, TAr { if (map->HasBehavior) { - int spot1, spot2, spot3, anchor; - - if (gameinfo.gametype == GAME_Hexen) - { - spot1 = PO_HEX_SPAWN_TYPE; - spot2 = PO_HEX_SPAWNCRUSH_TYPE; - anchor = PO_HEX_ANCHOR_TYPE; - } - else - { - spot1 = PO_SPAWN_TYPE; - spot2 = PO_SPAWNCRUSH_TYPE; - anchor = PO_ANCHOR_TYPE; - } - spot3 = PO_SPAWNHURT_TYPE; - for (unsigned int i = 0; i < MapThingsConverted.Size(); ++i) { - if (MapThingsConverted[i].type == spot1 || MapThingsConverted[i].type == spot2 || - MapThingsConverted[i].type == spot3 || MapThingsConverted[i].type == anchor) + FDoomEdEntry *mentry = DoomEdMap.CheckKey(MapThingsConverted[i].type); + if (mentry != NULL && mentry->Type == NULL && mentry->Special >= SMT_POLYANCHOR && mentry->Special <= SMT_POLYSPAWNHURT) { FNodeBuilder::FPolyStart newvert; newvert.x = MapThingsConverted[i].x; newvert.y = MapThingsConverted[i].y; newvert.polynum = MapThingsConverted[i].angle; - if (MapThingsConverted[i].type == anchor) + if (mentry->Special == SMT_POLYANCHOR) { anchors.Push (newvert); } 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/po_man.cpp b/src/po_man.cpp index 4a3345d5b..9158a7027 100644 --- a/src/po_man.cpp +++ b/src/po_man.cpp @@ -1561,8 +1561,8 @@ static void SpawnPolyobj (int index, int tag, int type) sd->linedef->args[0] = 0; IterFindPolySides(&polyobjs[index], sd); po->MirrorNum = sd->linedef->args[1]; - po->crush = (type != PO_SPAWN_TYPE) ? 3 : 0; - po->bHurtOnTouch = (type == PO_SPAWNHURT_TYPE); + po->crush = (type != SMT_POLYSPAWN) ? 3 : 0; + po->bHurtOnTouch = (type == SMT_POLYSPAWNHURT); po->tag = tag; po->seqType = sd->linedef->args[2]; if (po->seqType < 0 || po->seqType > 63) @@ -1632,8 +1632,8 @@ static void SpawnPolyobj (int index, int tag, int type) } if (po->Sidedefs.Size() > 0) { - po->crush = (type != PO_SPAWN_TYPE) ? 3 : 0; - po->bHurtOnTouch = (type == PO_SPAWNHURT_TYPE); + po->crush = (type != SMT_POLYSPAWN) ? 3 : 0; + po->bHurtOnTouch = (type == SMT_POLYSPAWNHURT); po->tag = tag; po->seqType = po->Sidedefs[0]->linedef->args[3]; po->MirrorNum = po->Sidedefs[0]->linedef->args[2]; @@ -1756,9 +1756,7 @@ void PO_Init (void) for (polyspawn = polyspawns, prev = &polyspawns; polyspawn;) { // 9301 (3001) = no crush, 9302 (3002) = crushing, 9303 = hurting touch - if (polyspawn->type == PO_SPAWN_TYPE || - polyspawn->type == PO_SPAWNCRUSH_TYPE || - polyspawn->type == PO_SPAWNHURT_TYPE) + if (polyspawn->type >= SMT_POLYSPAWN && polyspawn->type <= SMT_POLYSPAWNHURT) { // Polyobj StartSpot Pt. polyobjs[polyIndex].StartSpot.x = polyspawn->x; @@ -1778,7 +1776,7 @@ void PO_Init (void) for (polyspawn = polyspawns; polyspawn;) { polyspawns_t *next = polyspawn->next; - if (polyspawn->type == PO_ANCHOR_TYPE) + if (polyspawn->type == SMT_POLYANCHOR) { // Polyobj Anchor Pt. TranslateToStartSpot (polyspawn->angle, polyspawn->x, polyspawn->y); diff --git a/src/resourcefiles/file_7z.cpp b/src/resourcefiles/file_7z.cpp index 21c11ed25..1fb553932 100644 --- a/src/resourcefiles/file_7z.cpp +++ b/src/resourcefiles/file_7z.cpp @@ -179,7 +179,7 @@ struct F7ZLump : public FResourceLump //========================================================================== // -// Zip file +// 7-zip file // //========================================================================== @@ -190,8 +190,6 @@ class F7ZFile : public FResourceFile F7ZLump *Lumps; C7zArchive *Archive; - static int STACK_ARGS lumpcmp(const void * a, const void * b); - public: F7ZFile(const char * filename, FileReader *filer); bool Open(bool quiet); @@ -201,15 +199,6 @@ public: -int STACK_ARGS F7ZFile::lumpcmp(const void * a, const void * b) -{ - F7ZLump * rec1 = (F7ZLump *)a; - F7ZLump * rec2 = (F7ZLump *)b; - - return stricmp(rec1->FullName, rec2->FullName); -} - - //========================================================================== // // 7Z file @@ -328,8 +317,7 @@ bool F7ZFile::Open(bool quiet) if (!quiet) Printf(", %d lumps\n", NumLumps); - // Entries in archives are sorted alphabetically - qsort(&Lumps[0], NumLumps, sizeof(F7ZLump), lumpcmp); + PostProcessArchive(&Lumps[0], sizeof(F7ZLump)); return true; } diff --git a/src/resourcefiles/file_directory.cpp b/src/resourcefiles/file_directory.cpp index 024ef0633..f6adf0723 100644 --- a/src/resourcefiles/file_directory.cpp +++ b/src/resourcefiles/file_directory.cpp @@ -86,8 +86,6 @@ class FDirectory : public FResourceFile { TArray Lumps; - static int STACK_ARGS lumpcmp(const void * a, const void * b); - int AddDirectory(const char *dirpath); void AddEntry(const char *fullpath, int size); @@ -113,29 +111,18 @@ FDirectory::FDirectory(const char * directory) #ifdef _WIN32 directory = _fullpath(NULL, directory, _MAX_PATH); #else - // Todo for Linux: Resolve the path befire using it + // Todo for Linux: Resolve the path before using it #endif dirname = directory; + #ifdef _WIN32 + free((void *)directory); + #endif dirname.ReplaceChars('\\', '/'); if (dirname[dirname.Len()-1] != '/') dirname += '/'; Filename = copystring(dirname); } -//========================================================================== -// -// -// -//========================================================================== - -int STACK_ARGS FDirectory::lumpcmp(const void * a, const void * b) -{ - FDirectoryLump * rec1 = (FDirectoryLump *)a; - FDirectoryLump * rec2 = (FDirectoryLump *)b; - - return stricmp(rec1->FullName, rec2->FullName); -} - #ifdef _WIN32 //========================================================================== // @@ -299,8 +286,7 @@ bool FDirectory::Open(bool quiet) { NumLumps = AddDirectory(Filename); if (!quiet) Printf(", %d lumps\n", NumLumps); - // Entries in Zips are sorted alphabetically. - qsort(&Lumps[0], NumLumps, sizeof(FDirectoryLump), lumpcmp); + PostProcessArchive(&Lumps[0], sizeof(FDirectoryLump)); return true; } diff --git a/src/resourcefiles/file_zip.cpp b/src/resourcefiles/file_zip.cpp index 7ae0e90a5..5d6ff6c9e 100644 --- a/src/resourcefiles/file_zip.cpp +++ b/src/resourcefiles/file_zip.cpp @@ -138,8 +138,6 @@ class FZipFile : public FResourceFile { FZipLump *Lumps; - static int STACK_ARGS lumpcmp(const void * a, const void * b); - public: FZipFile(const char * filename, FileReader *file); virtual ~FZipFile(); @@ -148,16 +146,6 @@ public: }; - -int STACK_ARGS FZipFile::lumpcmp(const void * a, const void * b) -{ - FZipLump * rec1 = (FZipLump *)a; - FZipLump * rec2 = (FZipLump *)b; - - return stricmp(rec1->FullName, rec2->FullName); -} - - //========================================================================== // // Zip file @@ -274,8 +262,7 @@ bool FZipFile::Open(bool quiet) if (!quiet) Printf(", %d lumps\n", NumLumps); - // Entries in Zips are sorted alphabetically. - qsort(Lumps, NumLumps, sizeof(FZipLump), lumpcmp); + PostProcessArchive(&Lumps[0], sizeof(FZipLump)); return true; } diff --git a/src/resourcefiles/resourcefile.cpp b/src/resourcefiles/resourcefile.cpp index 15a4337b1..64fe9b6cf 100644 --- a/src/resourcefiles/resourcefile.cpp +++ b/src/resourcefiles/resourcefile.cpp @@ -38,7 +38,8 @@ #include "cmdlib.h" #include "w_wad.h" #include "doomerrors.h" - +#include "gi.h" +#include "doomstat.h" //========================================================================== @@ -74,11 +75,6 @@ public: FResourceLump::~FResourceLump() { - if (FullName != NULL) - { - delete [] FullName; - FullName = NULL; - } if (Cache != NULL && RefCount >= 0) { delete [] Cache; @@ -102,7 +98,7 @@ void FResourceLump::LumpNameSetup(const char *iname) base = base.Left(base.LastIndexOf('.')); uppercopy(Name, base); Name[8] = 0; - FullName = copystring(iname); + FullName = iname; // Map some directories to WAD namespaces. // Note that some of these namespaces don't exist in WADS. @@ -321,6 +317,194 @@ FResourceFile::~FResourceFile() delete Reader; } +int STACK_ARGS lumpcmp(const void * a, const void * b) +{ + FResourceLump * rec1 = (FResourceLump *)a; + FResourceLump * rec2 = (FResourceLump *)b; + + return rec1->FullName.CompareNoCase(rec2->FullName); +} + +//========================================================================== +// +// FResourceFile :: PostProcessArchive +// +// Sorts files by name. +// For files named "filter//*": Using the same filter rules as config +// autoloading, move them to the end and rename them without the "filter/" +// prefix. Filtered files that don't match are deleted. +// +//========================================================================== + +void FResourceFile::PostProcessArchive(void *lumps, size_t lumpsize) +{ + // Entries in archives are sorted alphabetically + qsort(lumps, NumLumps, lumpsize, lumpcmp); + + // Filter out lumps using the same names as the Autoload.* sections + // in the ini file use. We reduce the maximum lump concidered after + // each one so that we don't risk refiltering already filtered lumps. + DWORD max = NumLumps; + max -= FilterLumps(gameinfo.ConfigName, lumps, lumpsize, max); + max -= FilterLumps(LumpFilterGroup, lumps, lumpsize, max); + max -= FilterLumps(LumpFilterIWAD, lumps, lumpsize, max); + JunkLeftoverFilters(lumps, lumpsize, max); +} + +//========================================================================== +// +// FResourceFile :: FilterLumps +// +// Finds any lumps between [0,) that match the pattern +// "filter//*" and moves them to the end of the lump list. +// Returns the number of lumps moved. +// +//========================================================================== + +int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, DWORD max) +{ + FString filter; + DWORD start, end; + + if (filtername.IsEmpty()) + { + return 0; + } + filter << "filter/" << filtername << '/'; + if (FindPrefixRange(filter, lumps, lumpsize, max, start, end)) + { + void *from = (BYTE *)lumps + start * lumpsize; + + // Remove filter prefix from every name + void *lump_p = from; + for (DWORD i = start; i < end; ++i, lump_p = (BYTE *)lump_p + lumpsize) + { + FResourceLump *lump = (FResourceLump *)lump_p; + assert(lump->FullName.CompareNoCase(filter, (int)filter.Len()) == 0); + lump->LumpNameSetup(&lump->FullName[filter.Len()]); + } + + // Move filtered lumps to the end of the lump list. + size_t count = (end - start) * lumpsize; + void *to = (BYTE *)lumps + NumLumps * lumpsize - count; + assert (to >= from); + + if (from != to) + { + // Copy filtered lumps to a temporary buffer. + BYTE *filteredlumps = new BYTE[count]; + memcpy(filteredlumps, from, count); + + // Shift lumps left to make room for the filtered ones at the end. + memmove(from, (BYTE *)from + count, (NumLumps - end) * lumpsize); + + // Copy temporary buffer to newly freed space. + memcpy(to, filteredlumps, count); + + delete[] filteredlumps; + } + } + return end - start; +} + +//========================================================================== +// +// FResourceFile :: JunkLeftoverFilters +// +// Deletes any lumps beginning with "filter/" that were not matched. +// +//========================================================================== + +void FResourceFile::JunkLeftoverFilters(void *lumps, size_t lumpsize, DWORD max) +{ + DWORD start, end; + if (FindPrefixRange("filter/", lumps, lumpsize, max, start, end)) + { + // Since the resource lumps may contain non-POD data besides the + // full name, we "delete" them by erasing their names so they + // can't be found. + void *stop = (BYTE *)lumps + end * lumpsize; + for (void *p = (BYTE *)lumps + start * lumpsize; p < stop; p = (BYTE *)p + lumpsize) + { + FResourceLump *lump = (FResourceLump *)p; + lump->FullName = 0; + lump->Name[0] = '\0'; + lump->Namespace = ns_invalid; + } + } +} + +//========================================================================== +// +// FResourceFile :: FindPrefixRange +// +// Finds a range of lumps that start with the prefix string. is left +// indicating the first matching one. is left at one plus the last +// matching one. +// +//========================================================================== + +bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize, DWORD maxlump, DWORD &start, DWORD &end) +{ + DWORD min, max, mid, inside; + FResourceLump *lump; + int cmp; + + // Pretend that our range starts at 1 instead of 0 so that we can avoid + // unsigned overflow if the range starts at the first lump. + lumps = (BYTE *)lumps - lumpsize; + + // Binary search to find any match at all. + min = 1, max = maxlump; + while (min <= max) + { + mid = min + (max - min) / 2; + lump = (FResourceLump *)((BYTE *)lumps + mid * lumpsize); + cmp = lump->FullName.CompareNoCase(filter, (int)filter.Len()); + if (cmp == 0) + break; + else if (cmp < 0) + min = mid + 1; + else + max = mid - 1; + } + if (max < min) + { // matched nothing + return false; + } + + // Binary search to find first match. + inside = mid; + min = 1, max = mid; + while (min <= max) + { + mid = min + (max - min) / 2; + lump = (FResourceLump *)((BYTE *)lumps + mid * lumpsize); + cmp = lump->FullName.CompareNoCase(filter, (int)filter.Len()); + // Go left on matches and right on misses. + if (cmp == 0) + max = mid - 1; + else + min = mid + 1; + } + start = mid + (cmp != 0) - 1; + + // Binary search to find last match. + min = inside, max = maxlump; + while (min <= max) + { + mid = min + (max - min) / 2; + lump = (FResourceLump *)((BYTE *)lumps + mid * lumpsize); + cmp = lump->FullName.CompareNoCase(filter, (int)filter.Len()); + // Go right on matches and left on misses. + if (cmp == 0) + min = mid + 1; + else + max = mid - 1; + } + end = mid - (cmp != 0); + return true; +} //========================================================================== // diff --git a/src/resourcefiles/resourcefile.h b/src/resourcefiles/resourcefile.h index 517b5eef4..9927b1eae 100644 --- a/src/resourcefiles/resourcefile.h +++ b/src/resourcefiles/resourcefile.h @@ -13,7 +13,7 @@ struct FResourceLump friend class FResourceFile; int LumpSize; - char * FullName; // only valid for files loaded from a .zip file + FString FullName; // only valid for files loaded from a non-wad archive union { char Name[9]; @@ -30,7 +30,6 @@ struct FResourceLump FResourceLump() { - FullName = NULL; Cache = NULL; Owner = NULL; Flags = 0; @@ -66,9 +65,16 @@ protected: FResourceFile(const char *filename, FileReader *r); + // for archives that can contain directories + void PostProcessArchive(void *lumps, size_t lumpsize); + private: DWORD FirstLump; + int FilterLumps(FString filtername, void *lumps, size_t lumpsize, DWORD max); + bool FindPrefixRange(FString filter, void *lumps, size_t lumpsize, DWORD max, DWORD &start, DWORD &end); + void JunkLeftoverFilters(void *lumps, size_t lumpsize, DWORD max); + public: static FResourceFile *OpenResourceFile(const char *filename, FileReader *file, bool quiet = false); static FResourceFile *OpenDirectory(const char *filename, bool quiet = false); 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/src/w_wad.cpp b/src/w_wad.cpp index abbac5763..4d0b51623 100644 --- a/src/w_wad.cpp +++ b/src/w_wad.cpp @@ -290,14 +290,9 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo) FResourceLump *lump = resfile->GetLump(i); if (lump->Flags & LUMPF_EMBEDDED) { - char path[256]; - - mysnprintf(path, countof(path), "%s:", filename); - char *wadstr = path + strlen(path); - + FString path; + path.Format("%s:%s", filename, lump->FullName.GetChars()); FileReader *embedded = lump->NewReader(); - strcpy(wadstr, lump->FullName); - AddFile(path, embedded); } } @@ -345,7 +340,9 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo) sprintf(cksumout + (j * 2), "%02X", cksum[j]); } - fprintf(hashfile, "file: %s, lump: %s, hash: %s, size: %d\n", filename, lump->FullName ? lump->FullName : lump->Name, cksumout, lump->LumpSize); + fprintf(hashfile, "file: %s, lump: %s, hash: %s, size: %d\n", filename, + lump->FullName.IsNotEmpty() ? lump->FullName.GetChars() : lump->Name, + cksumout, lump->LumpSize); delete reader; } @@ -737,7 +734,7 @@ void FWadCollection::InitHashChains (void) FirstLumpIndex[j] = i; // Do the same for the full paths - if (LumpInfo[i].lump->FullName!=NULL) + if (LumpInfo[i].lump->FullName.IsNotEmpty()) { j = MakeKey(LumpInfo[i].lump->FullName) % NumLumps; NextLumpIndex_FullName[i] = FirstLumpIndex_FullName[j]; @@ -1088,7 +1085,7 @@ const char *FWadCollection::GetLumpFullName (int lump) const { if ((size_t)lump >= NumLumps) return NULL; - else if (LumpInfo[lump].lump->FullName != NULL) + else if (LumpInfo[lump].lump->FullName.IsNotEmpty()) return LumpInfo[lump].lump->FullName; else return LumpInfo[lump].lump->Name; @@ -1574,3 +1571,33 @@ static void PrintLastError () Printf (TEXTCOLOR_RED " %s\n", strerror(errno)); } #endif + +#ifdef _DEBUG +//========================================================================== +// +// CCMD LumpNum +// +//========================================================================== + +CCMD(lumpnum) +{ + for (int i = 1; i < argv.argc(); ++i) + { + Printf("%s: %d\n", argv[i], Wads.CheckNumForName(argv[i])); + } +} + +//========================================================================== +// +// CCMD LumpNumFull +// +//========================================================================== + +CCMD(lumpnumfull) +{ + for (int i = 1; i < argv.argc(); ++i) + { + Printf("%s: %d\n", argv[i], Wads.CheckNumForFullName(argv[i])); + } +} +#endif diff --git a/src/w_wad.h b/src/w_wad.h index 4dfe3434d..262a332c6 100644 --- a/src/w_wad.h +++ b/src/w_wad.h @@ -52,6 +52,8 @@ struct wadlump_t // [RH] Namespaces from BOOM. typedef enum { + ns_invalid = -1, + ns_global = 0, ns_sprites, ns_flats, diff --git a/wadsrc/static/actors/chex/chexammo.txt b/wadsrc/static/actors/chex/chexammo.txt index b7d644876..27c5d419b 100644 --- a/wadsrc/static/actors/chex/chexammo.txt +++ b/wadsrc/static/actors/chex/chexammo.txt @@ -2,15 +2,13 @@ // Mini Zorch ----------------------------------------------------------------- -actor MiniZorchRecharge : Clip 2007 +actor MiniZorchRecharge : Clip { - Game Chex inventory.pickupmessage "$GOTZORCHRECHARGE" } -actor MiniZorchPack : Clip 2048 +actor MiniZorchPack : Clip { - Game Chex Inventory.PickupMessage "$GOTMINIZORCHPACK" Inventory.Amount 50 States @@ -23,15 +21,13 @@ actor MiniZorchPack : Clip 2048 // Large Zorch ---------------------------------------------------------------- -actor LargeZorchRecharge : Shell 2008 +actor LargeZorchRecharge : Shell { - Game Chex inventory.pickupmessage "$GOTLARGEZORCHERRECHARGE" } -actor LargeZorchPack : Shell 2049 +actor LargeZorchPack : Shell { - Game Chex Inventory.PickupMessage "$GOTLARGEZORCHERPACK" Inventory.Amount 20 States @@ -44,15 +40,13 @@ actor LargeZorchPack : Shell 2049 // Zorch Propulsor ------------------------------------------------------------ -actor PropulsorZorch : RocketAmmo 2010 +actor PropulsorZorch : RocketAmmo { - Game Chex inventory.pickupmessage "$GOTPROPULSORRECHARGE" } -actor PropulsorZorchPack : RocketAmmo 2046 +actor PropulsorZorchPack : RocketAmmo { - Game Chex Inventory.PickupMessage "$GOTPROPULSORPACK" Inventory.Amount 5 States @@ -65,16 +59,13 @@ actor PropulsorZorchPack : RocketAmmo 2046 // Phasing Zorch -------------------------------------------------------------- -actor PhasingZorch : Cell 2047 +actor PhasingZorch : Cell { - Game Chex inventory.pickupmessage "$GOTPHASINGZORCHERRECHARGE" } -actor PhasingZorchPack : Cell 17 +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 29b0099c1..6515061c5 100644 --- a/wadsrc/static/actors/chex/chexdecorations.txt +++ b/wadsrc/static/actors/chex/chexdecorations.txt @@ -2,81 +2,69 @@ // Civilians ------------------------------------------------------------------ -actor ChexCivilian1 : GreenTorch 45 +actor ChexCivilian1 : GreenTorch { - game Chex height 54 } -actor ChexCivilian2 : ShortGreenTorch 56 +actor ChexCivilian2 : ShortGreenTorch { - game Chex height 54 } -actor ChexCivilian3 : ShortRedTorch 57 +actor ChexCivilian3 : ShortRedTorch { - game Chex height 48 } // Landing Zone --------------------------------------------------------------- -actor ChexLandingLight : Column 2028 +actor ChexLandingLight : Column { - game Chex height 35 } -actor ChexSpaceship : TechPillar 48 +actor ChexSpaceship : TechPillar { - game Chex height 52 } // Trees and Plants ----------------------------------------------------------- -actor ChexAppleTree : Stalagtite 47 +actor ChexAppleTree : Stalagtite { - game Chex height 92 } -actor ChexBananaTree : BigTree 54 +actor ChexBananaTree : BigTree { - game Chex height 108 } -actor ChexOrangeTree : TorchTree 43 +actor ChexOrangeTree : TorchTree { - game Chex height 92 } -actor ChexSubmergedPlant : ShortGreenColumn 31 +actor ChexSubmergedPlant : ShortGreenColumn { - game Chex height 42 } -actor ChexTallFlower : HeadsOnAStick 28 +actor ChexTallFlower : HeadsOnAStick { - game Chex height 25 } -actor ChexTallFlower2 : DeadStick 25 +actor ChexTallFlower2 : DeadStick { - game Chex height 25 } // Slime Fountain ------------------------------------------------------------- -actor ChexSlimeFountain : BlueTorch 44 +actor ChexSlimeFountain : BlueTorch { - game Chex height 48 States { @@ -88,53 +76,45 @@ actor ChexSlimeFountain : BlueTorch 44 // Cavern Decorations --------------------------------------------------------- -actor ChexCavernColumn : TallRedColumn 32 +actor ChexCavernColumn : TallRedColumn { - game Chex height 128 } -actor ChexCavernStalagmite : TallGreenColumn 30 +actor ChexCavernStalagmite : TallGreenColumn { - game Chex height 60 } // Misc. Props ---------------------------------------------------------------- -actor ChexChemicalBurner : EvilEye 41 +actor ChexChemicalBurner : EvilEye { - game Chex height 25 } -actor ChexChemicalFlask : Candlestick 34 +actor ChexChemicalFlask : Candlestick { - game Chex renderstyle translucent alpha 0.75 } -actor ChexFlagOnPole : SkullColumn 37 +actor ChexFlagOnPole : SkullColumn { - game Chex height 128 } -actor ChexGasTank : Candelabra 35 +actor ChexGasTank : Candelabra { - game Chex height 36 } -actor ChexLightColumn : ShortBlueTorch 55 +actor ChexLightColumn : ShortBlueTorch { - game Chex height 86 } -actor ChexMineCart : ShortRedColumn 33 +actor ChexMineCart : ShortRedColumn { - game Chex height 30 } diff --git a/wadsrc/static/actors/chex/chexitems.txt b/wadsrc/static/actors/chex/chexitems.txt index bbdc68dea..431728e07 100644 --- a/wadsrc/static/actors/chex/chexitems.txt +++ b/wadsrc/static/actors/chex/chexitems.txt @@ -3,67 +3,57 @@ // Health --------------------------------------------------------------------- -actor GlassOfWater : HealthBonus 2014 +actor GlassOfWater : HealthBonus { - game Chex inventory.pickupmessage "$GOTWATER" } -actor BowlOfFruit : Stimpack 2011 +actor BowlOfFruit : Stimpack { - game Chex inventory.pickupmessage "$GOTFRUIT" } -actor BowlOfVegetables : Medikit 2012 +actor BowlOfVegetables : Medikit { - game Chex inventory.pickupmessage "$GOTVEGETABLES" health.lowmessage 25, "$GOTVEGETABLESNEED" } -actor SuperchargeBreakfast : Soulsphere 2013 +actor SuperchargeBreakfast : Soulsphere { - game Chex inventory.pickupmessage "$GOTBREAKFAST" } // Armor ---------------------------------------------------------------------- -actor SlimeRepellent : ArmorBonus 2015 +actor SlimeRepellent : ArmorBonus { - game Chex inventory.pickupmessage "$GOTREPELLENT" } -actor ChexArmor : GreenArmor 2018 +actor ChexArmor : GreenArmor { - game Chex inventory.pickupmessage "$GOTCHEXARMOR" } -actor SuperChexArmor : BlueArmor 2019 +actor SuperChexArmor : BlueArmor { - game Chex inventory.pickupmessage "$GOTSUPERCHEXARMOR" } // Powerups =================================================================== -actor ComputerAreaMap : Allmap 2026 +actor ComputerAreaMap : Allmap { - game Chex inventory.pickupmessage "$GOTCHEXMAP" } -actor SlimeProofSuit : RadSuit 2025 +actor SlimeProofSuit : RadSuit { - game Chex inventory.pickupmessage "$GOTSLIMESUIT" } -actor Zorchpack : Backpack 8 +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 60c9ce54e..0d5156392 100644 --- a/wadsrc/static/actors/chex/chexkeys.txt +++ b/wadsrc/static/actors/chex/chexkeys.txt @@ -1,19 +1,16 @@ // These are merely renames of the Doom cards -actor ChexBlueCard : BlueCard 5 +actor ChexBlueCard : BlueCard { - Game Chex inventory.pickupmessage "$GOTCBLUEKEY" } -actor ChexYellowCard : YellowCard 6 +actor ChexYellowCard : YellowCard { - Game Chex inventory.pickupmessage "$GOTCYELLOWKEY" } -actor ChexRedCard : RedCard 13 +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 3941e8eb9..0ee3c34c5 100644 --- a/wadsrc/static/actors/chex/chexmonsters.txt +++ b/wadsrc/static/actors/chex/chexmonsters.txt @@ -5,9 +5,8 @@ // //=========================================================================== -actor FlemoidusCommonus : ZombieMan 3004 +actor FlemoidusCommonus : ZombieMan { - Game Chex DropItem "" Obituary "$OB_COMMONUS" States @@ -25,9 +24,8 @@ actor FlemoidusCommonus : ZombieMan 3004 // //=========================================================================== -actor FlemoidusBipedicus : ShotgunGuy 9 +actor FlemoidusBipedicus : ShotgunGuy { - Game Chex DropItem "" Obituary "$OB_BIPEDICUS" States @@ -45,9 +43,8 @@ actor FlemoidusBipedicus : ShotgunGuy 9 // //=========================================================================== -actor ArmoredFlemoidusBipedicus : DoomImp 3001 +actor ArmoredFlemoidusBipedicus : DoomImp { - Game Chex Obituary "$OB_BIPEDICUS2" HitObituary "$OB_BIPEDICUS2" } @@ -58,9 +55,8 @@ actor ArmoredFlemoidusBipedicus : DoomImp 3001 // //=========================================================================== -actor FlemoidusCycloptisCommonus : Demon 3002 +actor FlemoidusCycloptisCommonus : Demon { - Game Chex Obituary "$OB_CYCLOPTIS" } @@ -70,9 +66,8 @@ actor FlemoidusCycloptisCommonus : Demon 3002 // //=========================================================================== -actor Flembrane : BaronOfHell 3003 +actor Flembrane : BaronOfHell { - Game Chex radius 44 height 100 speed 0 @@ -88,8 +83,7 @@ actor Flembrane : BaronOfHell 3003 //=========================================================================== -actor ChexSoul : LostSoul 3006 +actor ChexSoul : LostSoul { - Game Chex height 0 } diff --git a/wadsrc/static/actors/chex/chexweapons.txt b/wadsrc/static/actors/chex/chexweapons.txt index 96d8b4c4b..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 2005 +actor SuperBootspork : Chainsaw { - game Chex obituary "$OB_MPBOOTSPORK" Inventory.PickupMessage "$GOTSUPERBOOTSPORK" Tag "$TAG_SPORK" @@ -17,7 +15,6 @@ actor SuperBootspork : Chainsaw 2005 actor MiniZorcher : Pistol { - game Chex obituary "$OB_MPZORCH" inventory.pickupmessage "$GOTMINIZORCHER" Tag "$TAG_MINIZORCHER" @@ -28,33 +25,29 @@ actor MiniZorcher : Pistol } } -actor LargeZorcher : Shotgun 2001 +actor LargeZorcher : Shotgun { - game Chex obituary "$OB_MPZORCH" inventory.pickupmessage "$GOTLARGEZORCHER" Tag "$TAG_LARGEZORCHER" } -actor SuperLargeZorcher : SuperShotgun 82 +actor SuperLargeZorcher : SuperShotgun { - game Chex obituary "$OB_MPMEGAZORCH" inventory.pickupmessage "$GOTSUPERLARGEZORCHER" Tag "$TAG_SUPERLARGEZORCHER" } -actor RapidZorcher : Chaingun 2002 +actor RapidZorcher : Chaingun { - game Chex obituary "$OB_MPRAPIDZORCH" inventory.pickupmessage "$GOTRAPIDZORCHER" Tag "$TAG_RAPIDZORCHER" } -actor ZorchPropulsor : RocketLauncher 2003 +actor ZorchPropulsor : RocketLauncher { - game Chex obituary "" inventory.pickupmessage "$GOTZORCHPROPULSOR" Tag "$TAG_ZORCHPROPULSOR" @@ -77,9 +70,8 @@ actor PropulsorMissile : Rocket Alpha 0.75 } -actor PhasingZorcher : PlasmaRifle 2004 +actor PhasingZorcher : PlasmaRifle { - game Chex obituary "" inventory.pickupmessage "$GOTPHASINGZORCHER" Tag "$TAG_PHASINGZORCHER" @@ -107,9 +99,8 @@ actor PhaseZorchMissile : PlasmaBall Alpha 0.75 } -actor LAZDevice : BFG9000 2006 +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 9348339d5..16e4ebe55 100644 --- a/wadsrc/static/actors/doom/arachnotron.txt +++ b/wadsrc/static/actors/doom/arachnotron.txt @@ -3,10 +3,8 @@ // Arachnotron // //=========================================================================== -ACTOR Arachnotron 68 +ACTOR Arachnotron { - Game Doom - SpawnID 6 Health 500 Radius 64 Height 64 @@ -63,8 +61,6 @@ ACTOR Arachnotron 68 //=========================================================================== 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 96503d717..29108cda2 100644 --- a/wadsrc/static/actors/doom/archvile.txt +++ b/wadsrc/static/actors/doom/archvile.txt @@ -4,10 +4,8 @@ // //=========================================================================== -ACTOR Archvile 64 +ACTOR Archvile { - Game Doom - SpawnID 111 Health 700 Radius 20 Height 56 @@ -67,8 +65,6 @@ ACTOR Archvile 64 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 492cb1f80..999f2da62 100644 --- a/wadsrc/static/actors/doom/bossbrain.txt +++ b/wadsrc/static/actors/doom/bossbrain.txt @@ -5,9 +5,8 @@ // //=========================================================================== -ACTOR BossBrain 88 +ACTOR BossBrain { - Game Doom Health 250 Mass 10000000 PainChance 255 @@ -43,9 +42,8 @@ ACTOR BossBrain 88 // //=========================================================================== -ACTOR BossEye 89 +ACTOR BossEye { - Game Doom Height 32 +NOBLOCKMAP +NOSECTOR @@ -67,9 +65,8 @@ ACTOR BossEye 89 // //=========================================================================== -ACTOR BossTarget : SpecialSpot 87 +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 3f461f585..0bc4a7f96 100644 --- a/wadsrc/static/actors/doom/bruiser.txt +++ b/wadsrc/static/actors/doom/bruiser.txt @@ -3,10 +3,8 @@ // Baron of Hell // //=========================================================================== -ACTOR BaronOfHell 3003 +ACTOR BaronOfHell { - Game Doom - SpawnID 3 Health 1000 Radius 24 Height 64 @@ -59,10 +57,8 @@ ACTOR BaronOfHell 3003 // Hell Knight // //=========================================================================== -ACTOR HellKnight : BaronOfHell 69 +ACTOR HellKnight : BaronOfHell { - Game Doom - SpawnID 113 Health 500 -BOSSDEATH SeeSound "knight/sight" @@ -110,8 +106,6 @@ ACTOR HellKnight : BaronOfHell 69 //=========================================================================== 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 89761e014..bf7b8ddf2 100644 --- a/wadsrc/static/actors/doom/cacodemon.txt +++ b/wadsrc/static/actors/doom/cacodemon.txt @@ -3,10 +3,8 @@ // Cacodemon // //=========================================================================== -ACTOR Cacodemon 3005 +ACTOR Cacodemon { - Game Doom - SpawnID 19 Health 400 Radius 31 Height 56 @@ -61,8 +59,6 @@ ACTOR Cacodemon 3005 //=========================================================================== 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 60bcbcc4b..80c1ba2da 100644 --- a/wadsrc/static/actors/doom/cyberdemon.txt +++ b/wadsrc/static/actors/doom/cyberdemon.txt @@ -4,10 +4,8 @@ // Cyberdemon // //=========================================================================== -ACTOR Cyberdemon 16 +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 b8faa2288..5b9835e79 100644 --- a/wadsrc/static/actors/doom/deadthings.txt +++ b/wadsrc/static/actors/doom/deadthings.txt @@ -1,9 +1,7 @@ // Gibbed marine ----------------------------------------------------------- -actor GibbedMarine 10 +actor GibbedMarine { - Game Doom - SpawnID 145 States { Spawn: @@ -14,16 +12,14 @@ actor GibbedMarine 10 // Gibbed marine (extra copy) ---------------------------------------------- -actor GibbedMarineExtra : GibbedMarine 12 +actor GibbedMarineExtra : GibbedMarine { - Game Doom } // Dead marine ------------------------------------------------------------- -actor DeadMarine 15 +actor DeadMarine { - Game Doom States { Spawn: @@ -39,10 +35,9 @@ actor DeadMarine 15 // Dead zombie man --------------------------------------------------------- -actor DeadZombieMan : ZombieMan 18 +actor DeadZombieMan : ZombieMan { Skip_Super - Game Doom DropItem None States { @@ -53,10 +48,9 @@ actor DeadZombieMan : ZombieMan 18 // Dead shotgun guy -------------------------------------------------------- -actor DeadShotgunGuy : ShotgunGuy 19 +actor DeadShotgunGuy : ShotgunGuy { Skip_Super - Game Doom DropItem None States { @@ -67,10 +61,9 @@ actor DeadShotgunGuy : ShotgunGuy 19 // Dead imp ---------------------------------------------------------------- -actor DeadDoomImp : DoomImp 20 +actor DeadDoomImp : DoomImp { Skip_Super - Game Doom States { Spawn: @@ -80,10 +73,9 @@ actor DeadDoomImp : DoomImp 20 // Dead demon -------------------------------------------------------------- -actor DeadDemon : Demon 21 +actor DeadDemon : Demon { Skip_Super - Game Doom States { Spawn: @@ -93,10 +85,9 @@ actor DeadDemon : Demon 21 // Dead cacodemon ---------------------------------------------------------- -actor DeadCacodemon : Cacodemon 22 +actor DeadCacodemon : Cacodemon { Skip_Super - Game Doom States { Spawn: @@ -112,10 +103,9 @@ actor DeadCacodemon : Cacodemon 22 * a holdover from that.) */ -actor DeadLostSoul : LostSoul 23 +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 ecd6fa8a6..a1ff8ccfb 100644 --- a/wadsrc/static/actors/doom/demon.txt +++ b/wadsrc/static/actors/doom/demon.txt @@ -3,10 +3,8 @@ // Pink Demon // //=========================================================================== -ACTOR Demon 3002 +ACTOR Demon { - Game Doom - SpawnID 8 Health 150 PainChance 180 Speed 10 @@ -57,10 +55,8 @@ ACTOR Demon 3002 // Spectre // //=========================================================================== -ACTOR Spectre : Demon 58 +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 78ddc0af9..8e137b3a8 100644 --- a/wadsrc/static/actors/doom/doomammo.txt +++ b/wadsrc/static/actors/doom/doomammo.txt @@ -1,9 +1,7 @@ // Clip -------------------------------------------------------------------- -ACTOR Clip : Ammo 2007 +ACTOR Clip : Ammo { - Game Doom - SpawnID 11 Inventory.PickupMessage "$GOTCLIP" Inventory.Amount 10 Inventory.MaxAmount 200 @@ -20,10 +18,8 @@ ACTOR Clip : Ammo 2007 // Clip box ---------------------------------------------------------------- -ACTOR ClipBox : Clip 2048 +ACTOR ClipBox : Clip { - Game Doom - SpawnID 139 Inventory.PickupMessage "$GOTCLIPBOX" Inventory.Amount 50 States @@ -36,10 +32,8 @@ ACTOR ClipBox : Clip 2048 // Rocket ------------------------------------------------------------------ -ACTOR RocketAmmo : Ammo 2010 +ACTOR RocketAmmo : Ammo { - Game Doom - SpawnID 140 Inventory.PickupMessage "$GOTROCKET" Inventory.Amount 1 Inventory.MaxAmount 50 @@ -56,10 +50,8 @@ ACTOR RocketAmmo : Ammo 2010 // Rocket box -------------------------------------------------------------- -ACTOR RocketBox : RocketAmmo 2046 +ACTOR RocketBox : RocketAmmo { - Game Doom - SpawnID 141 Inventory.PickupMessage "$GOTROCKBOX" Inventory.Amount 5 States @@ -72,10 +64,8 @@ ACTOR RocketBox : RocketAmmo 2046 // Cell -------------------------------------------------------------------- -ACTOR Cell : Ammo 2047 +ACTOR Cell : Ammo { - Game Doom - SpawnID 75 Inventory.PickupMessage "$GOTCELL" Inventory.Amount 20 Inventory.MaxAmount 300 @@ -92,10 +82,8 @@ ACTOR Cell : Ammo 2047 // Cell pack --------------------------------------------------------------- -ACTOR CellPack : Cell 17 +ACTOR CellPack : Cell { - Game Doom - SpawnID 142 Inventory.PickupMessage "$GOTCELLBOX" Inventory.Amount 100 States @@ -108,10 +96,8 @@ ACTOR CellPack : Cell 17 // Shells ------------------------------------------------------------------ -ACTOR Shell : Ammo 2008 +ACTOR Shell : Ammo { - Game Doom - SpawnID 12 Inventory.PickupMessage "$GOTSHELLS" Inventory.Amount 4 Inventory.MaxAmount 50 @@ -128,10 +114,8 @@ ACTOR Shell : Ammo 2008 // Shell box --------------------------------------------------------------- -ACTOR ShellBox : Shell 2049 +ACTOR ShellBox : Shell { - Game Doom - SpawnID 143 Inventory.PickupMessage "$GOTSHELLBOX" Inventory.Amount 20 States @@ -144,10 +128,8 @@ ACTOR ShellBox : Shell 2049 // Backpack --------------------------------------------------------------- -ACTOR Backpack : BackpackItem 8 +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 c40bd1dc1..dd6e2d1a8 100644 --- a/wadsrc/static/actors/doom/doomarmor.txt +++ b/wadsrc/static/actors/doom/doomarmor.txt @@ -1,10 +1,8 @@ // Armor bonus -------------------------------------------------------------- -Actor ArmorBonus : BasicArmorBonus 2015 +Actor ArmorBonus : BasicArmorBonus { - Game Doom - SpawnID 22 Radius 20 Height 16 Inventory.Pickupmessage "$GOTARMBONUS" @@ -24,10 +22,8 @@ Actor ArmorBonus : BasicArmorBonus 2015 // Green armor -------------------------------------------------------------- -Actor GreenArmor : BasicArmorPickup 2018 +Actor GreenArmor : BasicArmorPickup { - Game Doom - SpawnID 68 Radius 20 Height 16 Inventory.Pickupmessage "$GOTARMOR" @@ -45,10 +41,8 @@ Actor GreenArmor : BasicArmorPickup 2018 // Blue armor --------------------------------------------------------------- -Actor BlueArmor : BasicArmorPickup 2019 +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 fb822f30f..8702155e8 100644 --- a/wadsrc/static/actors/doom/doomartifacts.txt +++ b/wadsrc/static/actors/doom/doomartifacts.txt @@ -1,9 +1,7 @@ // Invulnerability Sphere --------------------------------------------------- -ACTOR InvulnerabilitySphere : PowerupGiver 2022 +ACTOR InvulnerabilitySphere : PowerupGiver { - Game Doom - SpawnID 133 +COUNTITEM +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -22,10 +20,8 @@ ACTOR InvulnerabilitySphere : PowerupGiver 2022 // Soulsphere -------------------------------------------------------------- -ACTOR Soulsphere : Health 2013 +ACTOR Soulsphere : Health { - Game Doom - SpawnID 25 +COUNTITEM +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -58,10 +54,8 @@ actor BlueArmorForMegasphere : BlueArmor Armor.SaveAmount 200 } -ACTOR Megasphere : CustomInventory 83 +ACTOR Megasphere : CustomInventory { - Game Doom - SpawnID 132 +COUNTITEM +INVENTORY.ALWAYSPICKUP Inventory.PickupMessage "$GOTMSPHERE" @@ -80,10 +74,8 @@ ACTOR Megasphere : CustomInventory 83 // Invisibility ------------------------------------------------------------- -ACTOR BlurSphere : PowerupGiver 2024 +ACTOR BlurSphere : PowerupGiver { - Game Doom - SpawnID 135 +COUNTITEM +VISIBILITYPULSE +INVENTORY.AUTOACTIVATE @@ -103,10 +95,8 @@ ACTOR BlurSphere : PowerupGiver 2024 // Radiation suit (aka iron feet) ------------------------------------------- -ACTOR RadSuit : PowerupGiver 2025 +ACTOR RadSuit : PowerupGiver { - Game Doom - SpawnID 136 Height 46 +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -123,10 +113,8 @@ ACTOR RadSuit : PowerupGiver 2025 // infrared ----------------------------------------------------------------- -ACTOR Infrared : PowerupGiver 2045 +ACTOR Infrared : PowerupGiver { - Game Doom - SpawnID 138 +COUNTITEM +INVENTORY.AUTOACTIVATE +INVENTORY.ALWAYSPICKUP @@ -144,10 +132,8 @@ ACTOR Infrared : PowerupGiver 2045 // Allmap ------------------------------------------------------------------- -ACTOR Allmap : MapRevealer 2026 +ACTOR Allmap : MapRevealer { - Game Doom - SpawnID 137 +COUNTITEM +INVENTORY.FANCYPICKUPSOUND +INVENTORY.ALWAYSPICKUP @@ -164,10 +150,8 @@ ACTOR Allmap : MapRevealer 2026 // Berserk ------------------------------------------------------------------ -ACTOR Berserk : CustomInventory 2023 +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 9d2d230eb..1a5688b58 100644 --- a/wadsrc/static/actors/doom/doomdecorations.txt +++ b/wadsrc/static/actors/doom/doomdecorations.txt @@ -1,9 +1,8 @@ // Tech lamp --------------------------------------------------------------- -ACTOR TechLamp 85 +ACTOR TechLamp { - Game Doom Radius 16 Height 80 ProjectilePassHeight -16 @@ -18,9 +17,8 @@ ACTOR TechLamp 85 // Tech lamp 2 ------------------------------------------------------------- -ACTOR TechLamp2 86 +ACTOR TechLamp2 { - Game Doom Radius 16 Height 60 ProjectilePassHeight -16 @@ -35,9 +33,8 @@ ACTOR TechLamp2 86 // Column ------------------------------------------------------------------ -ACTOR Column 2028 +ACTOR Column { - Game Doom Radius 16 Height 48 ProjectilePassHeight -16 @@ -52,9 +49,8 @@ ACTOR Column 2028 // Tall green column ------------------------------------------------------- -ACTOR TallGreenColumn 30 +ACTOR TallGreenColumn { - Game Doom Radius 16 Height 52 ProjectilePassHeight -16 @@ -69,9 +65,8 @@ ACTOR TallGreenColumn 30 // Short green column ------------------------------------------------------ -ACTOR ShortGreenColumn 31 +ACTOR ShortGreenColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -86,9 +81,8 @@ ACTOR ShortGreenColumn 31 // Tall red column --------------------------------------------------------- -ACTOR TallRedColumn 32 +ACTOR TallRedColumn { - Game Doom Radius 16 Height 52 ProjectilePassHeight -16 @@ -103,9 +97,8 @@ ACTOR TallRedColumn 32 // Short red column -------------------------------------------------------- -ACTOR ShortRedColumn 33 +ACTOR ShortRedColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -120,9 +113,8 @@ ACTOR ShortRedColumn 33 // Skull column ------------------------------------------------------------ -ACTOR SkullColumn 37 +ACTOR SkullColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -137,9 +129,8 @@ ACTOR SkullColumn 37 // Heart column ------------------------------------------------------------ -ACTOR HeartColumn 36 +ACTOR HeartColumn { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -154,9 +145,8 @@ ACTOR HeartColumn 36 // Evil eye ---------------------------------------------------------------- -ACTOR EvilEye 41 +ACTOR EvilEye { - Game Doom Radius 16 Height 54 ProjectilePassHeight -16 @@ -171,9 +161,8 @@ ACTOR EvilEye 41 // Floating skull ---------------------------------------------------------- -ACTOR FloatingSkull 42 +ACTOR FloatingSkull { - Game Doom Radius 16 Height 26 ProjectilePassHeight -16 @@ -188,9 +177,8 @@ ACTOR FloatingSkull 42 // Torch tree -------------------------------------------------------------- -ACTOR TorchTree 43 +ACTOR TorchTree { - Game Doom Radius 16 Height 56 ProjectilePassHeight -16 @@ -205,9 +193,8 @@ ACTOR TorchTree 43 // Blue torch -------------------------------------------------------------- -ACTOR BlueTorch 44 +ACTOR BlueTorch { - Game Doom Radius 16 Height 68 ProjectilePassHeight -16 @@ -222,9 +209,8 @@ ACTOR BlueTorch 44 // Green torch ------------------------------------------------------------- -ACTOR GreenTorch 45 +ACTOR GreenTorch { - Game Doom Radius 16 Height 68 ProjectilePassHeight -16 @@ -239,9 +225,8 @@ ACTOR GreenTorch 45 // Red torch --------------------------------------------------------------- -ACTOR RedTorch 46 +ACTOR RedTorch { - Game Doom Radius 16 Height 68 ProjectilePassHeight -16 @@ -256,9 +241,8 @@ ACTOR RedTorch 46 // Short blue torch -------------------------------------------------------- -ACTOR ShortBlueTorch 55 +ACTOR ShortBlueTorch { - Game Doom Radius 16 Height 37 ProjectilePassHeight -16 @@ -273,9 +257,8 @@ ACTOR ShortBlueTorch 55 // Short green torch ------------------------------------------------------- -ACTOR ShortGreenTorch 56 +ACTOR ShortGreenTorch { - Game Doom Radius 16 Height 37 ProjectilePassHeight -16 @@ -290,9 +273,8 @@ ACTOR ShortGreenTorch 56 // Short red torch --------------------------------------------------------- -ACTOR ShortRedTorch 57 +ACTOR ShortRedTorch { - Game Doom Radius 16 Height 37 ProjectilePassHeight -16 @@ -307,9 +289,8 @@ ACTOR ShortRedTorch 57 // Stalagtite -------------------------------------------------------------- -ACTOR Stalagtite 47 +ACTOR Stalagtite { - Game Doom Radius 16 Height 40 ProjectilePassHeight -16 @@ -324,9 +305,8 @@ ACTOR Stalagtite 47 // Tech pillar ------------------------------------------------------------- -ACTOR TechPillar 48 +ACTOR TechPillar { - Game Doom Radius 16 Height 128 ProjectilePassHeight -16 @@ -341,9 +321,8 @@ ACTOR TechPillar 48 // Candle stick ------------------------------------------------------------ -ACTOR Candlestick 34 +ACTOR Candlestick { - Game Doom Radius 20 Height 14 ProjectilePassHeight -16 @@ -357,9 +336,8 @@ ACTOR Candlestick 34 // Candelabra -------------------------------------------------------------- -ACTOR Candelabra 35 +ACTOR Candelabra { - Game Doom Radius 16 Height 60 ProjectilePassHeight -16 @@ -374,9 +352,8 @@ ACTOR Candelabra 35 // Bloody twitch ----------------------------------------------------------- -ACTOR BloodyTwitch 49 +ACTOR BloodyTwitch { - Game Doom Radius 16 Height 68 +SOLID @@ -395,9 +372,8 @@ ACTOR BloodyTwitch 49 // Meat 2 ------------------------------------------------------------------ -ACTOR Meat2 50 +ACTOR Meat2 { - Game Doom Radius 16 Height 84 +SOLID @@ -413,9 +389,8 @@ ACTOR Meat2 50 // Meat 3 ------------------------------------------------------------------ -ACTOR Meat3 51 +ACTOR Meat3 { - Game Doom Radius 16 Height 84 +SOLID @@ -431,9 +406,8 @@ ACTOR Meat3 51 // Meat 4 ------------------------------------------------------------------ -ACTOR Meat4 52 +ACTOR Meat4 { - Game Doom Radius 16 Height 68 +SOLID @@ -449,9 +423,8 @@ ACTOR Meat4 52 // Meat 5 ------------------------------------------------------------------ -ACTOR Meat5 53 +ACTOR Meat5 { - Game Doom Radius 16 Height 52 +SOLID @@ -467,48 +440,42 @@ ACTOR Meat5 53 // Nonsolid meat ----------------------------------------------------------- -ACTOR NonsolidMeat2 : Meat2 59 +ACTOR NonsolidMeat2 : Meat2 { - Game Doom -SOLID Radius 20 } -ACTOR NonsolidMeat3 : Meat3 61 +ACTOR NonsolidMeat3 : Meat3 { - Game Doom -SOLID Radius 20 } -ACTOR NonsolidMeat4 : Meat4 60 +ACTOR NonsolidMeat4 : Meat4 { - Game Doom -SOLID Radius 20 } -ACTOR NonsolidMeat5 : Meat5 62 +ACTOR NonsolidMeat5 : Meat5 { - Game Doom -SOLID Radius 20 } // Nonsolid bloody twitch -------------------------------------------------- -ACTOR NonsolidTwitch : BloodyTwitch 63 +ACTOR NonsolidTwitch : BloodyTwitch { - Game Doom -SOLID Radius 20 } // Head on a stick --------------------------------------------------------- -ACTOR HeadOnAStick 27 +ACTOR HeadOnAStick { - Game Doom Radius 16 Height 56 ProjectilePassHeight -16 @@ -523,9 +490,8 @@ ACTOR HeadOnAStick 27 // Heads (plural!) on a stick ---------------------------------------------- -ACTOR HeadsOnAStick 28 +ACTOR HeadsOnAStick { - Game Doom Radius 16 Height 64 ProjectilePassHeight -16 @@ -540,9 +506,8 @@ ACTOR HeadsOnAStick 28 // Head candles ------------------------------------------------------------ -ACTOR HeadCandles 29 +ACTOR HeadCandles { - Game Doom Radius 16 Height 42 ProjectilePassHeight -16 @@ -557,9 +522,8 @@ ACTOR HeadCandles 29 // Dead on a stick --------------------------------------------------------- -ACTOR DeadStick 25 +ACTOR DeadStick { - Game Doom Radius 16 Height 64 ProjectilePassHeight -16 @@ -574,9 +538,8 @@ ACTOR DeadStick 25 // Still alive on a stick -------------------------------------------------- -ACTOR LiveStick 26 +ACTOR LiveStick { - Game Doom Radius 16 Height 64 ProjectilePassHeight -16 @@ -592,9 +555,8 @@ ACTOR LiveStick 26 // Big tree ---------------------------------------------------------------- -ACTOR BigTree 54 +ACTOR BigTree { - Game Doom Radius 32 Height 108 ProjectilePassHeight -16 @@ -609,10 +571,8 @@ ACTOR BigTree 54 // Burning barrel ---------------------------------------------------------- -ACTOR BurningBarrel 70 +ACTOR BurningBarrel { - Game Doom - SpawnID 149 Radius 16 Height 32 ProjectilePassHeight -16 @@ -627,9 +587,8 @@ ACTOR BurningBarrel 70 // Hanging with no guts ---------------------------------------------------- -ACTOR HangNoGuts 73 +ACTOR HangNoGuts { - Game Doom Radius 16 Height 88 +SOLID @@ -645,9 +604,8 @@ ACTOR HangNoGuts 73 // Hanging from bottom with no brain --------------------------------------- -ACTOR HangBNoBrain 74 +ACTOR HangBNoBrain { - Game Doom Radius 16 Height 88 +SOLID @@ -663,9 +621,8 @@ ACTOR HangBNoBrain 74 // Hanging from top, looking down ------------------------------------------ -ACTOR HangTLookingDown 75 +ACTOR HangTLookingDown { - Game Doom Radius 16 Height 64 +SOLID @@ -681,9 +638,8 @@ ACTOR HangTLookingDown 75 // Hanging from top, looking up -------------------------------------------- -ACTOR HangTLookingUp 77 +ACTOR HangTLookingUp { - Game Doom Radius 16 Height 64 +SOLID @@ -699,9 +655,8 @@ ACTOR HangTLookingUp 77 // Hanging from top, skully ------------------------------------------------ -ACTOR HangTSkull 76 +ACTOR HangTSkull { - Game Doom Radius 16 Height 64 +SOLID @@ -717,9 +672,8 @@ ACTOR HangTSkull 76 // Hanging from top without a brain ---------------------------------------- -ACTOR HangTNoBrain 78 +ACTOR HangTNoBrain { - Game Doom Radius 16 Height 64 +SOLID @@ -735,10 +689,8 @@ ACTOR HangTNoBrain 78 // Colon gibs -------------------------------------------------------------- -ACTOR ColonGibs 79 +ACTOR ColonGibs { - Game Doom - SpawnID 147 Radius 20 Height 4 +NOBLOCKMAP @@ -753,10 +705,8 @@ ACTOR ColonGibs 79 // Small pool o' blood ----------------------------------------------------- -ACTOR SmallBloodPool 80 +ACTOR SmallBloodPool { - Game Doom - SpawnID 148 Radius 20 Height 1 +NOBLOCKMAP @@ -771,10 +721,8 @@ ACTOR SmallBloodPool 80 // brain stem lying on the ground ------------------------------------------ -ACTOR BrainStem 81 +ACTOR BrainStem { - Game Doom - SpawnID 150 Radius 20 Height 4 +NOBLOCKMAP @@ -790,9 +738,8 @@ ACTOR BrainStem 81 // Grey stalagmite (unused Doom sprite, definition taken from Skulltag ----- -ACTOR Stalagmite 5050 +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 dce00ace9..77fc6eaeb 100644 --- a/wadsrc/static/actors/doom/doomhealth.txt +++ b/wadsrc/static/actors/doom/doomhealth.txt @@ -1,9 +1,7 @@ // Health bonus ------------------------------------------------------------- -ACTOR HealthBonus : Health 2014 +ACTOR HealthBonus : Health { - Game Doom - SpawnID 152 +COUNTITEM +INVENTORY.ALWAYSPICKUP Inventory.Amount 1 @@ -19,10 +17,8 @@ ACTOR HealthBonus : Health 2014 // Stimpack ----------------------------------------------------------------- -ACTOR Stimpack : Health 2011 +ACTOR Stimpack : Health { - Game Doom - SpawnID 23 Inventory.Amount 10 Inventory.PickupMessage "$GOTSTIM" States @@ -35,10 +31,8 @@ ACTOR Stimpack : Health 2011 // Medikit ----------------------------------------------------------------- -ACTOR Medikit : Health 2012 +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 d91227484..938663e35 100644 --- a/wadsrc/static/actors/doom/doomimp.txt +++ b/wadsrc/static/actors/doom/doomimp.txt @@ -3,10 +3,8 @@ // Imp // //=========================================================================== -ACTOR DoomImp 3001 +ACTOR DoomImp { - Game Doom - SpawnID 5 Health 60 Radius 20 Height 56 @@ -66,8 +64,6 @@ ACTOR DoomImp 3001 //=========================================================================== 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 9072582d1..5472193af 100644 --- a/wadsrc/static/actors/doom/doomkeys.txt +++ b/wadsrc/static/actors/doom/doomkeys.txt @@ -8,10 +8,8 @@ Actor DoomKey : Key // Blue key card ------------------------------------------------------------ -Actor BlueCard : DoomKey 5 +Actor BlueCard : DoomKey { - Game Doom - SpawnID 85 Inventory.Pickupmessage "$GOTBLUECARD" Inventory.Icon "STKEYS0" States @@ -25,10 +23,8 @@ Actor BlueCard : DoomKey 5 // Yellow key card ---------------------------------------------------------- -Actor YellowCard : DoomKey 6 +Actor YellowCard : DoomKey { - Game Doom - SpawnID 87 Inventory.Pickupmessage "$GOTYELWCARD" Inventory.Icon "STKEYS1" States @@ -42,10 +38,8 @@ Actor YellowCard : DoomKey 6 // Red key card ------------------------------------------------------------- -Actor RedCard : DoomKey 13 +Actor RedCard : DoomKey { - Game Doom - SpawnID 86 Inventory.Pickupmessage "$GOTREDCARD" Inventory.Icon "STKEYS2" States @@ -59,10 +53,8 @@ Actor RedCard : DoomKey 13 // Blue skull key ----------------------------------------------------------- -Actor BlueSkull : DoomKey 40 +Actor BlueSkull : DoomKey { - Game Doom - SpawnID 90 Inventory.Pickupmessage "$GOTBLUESKUL" Inventory.Icon "STKEYS3" States @@ -76,10 +68,8 @@ Actor BlueSkull : DoomKey 40 // Yellow skull key --------------------------------------------------------- -Actor YellowSkull : DoomKey 39 +Actor YellowSkull : DoomKey { - Game Doom - SpawnID 88 Inventory.Pickupmessage "$GOTYELWSKUL" Inventory.Icon "STKEYS4" States @@ -93,10 +83,8 @@ Actor YellowSkull : DoomKey 39 // Red skull key ------------------------------------------------------------ -Actor RedSkull : DoomKey 38 +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 fadab2b05..d860f855a 100644 --- a/wadsrc/static/actors/doom/doommisc.txt +++ b/wadsrc/static/actors/doom/doommisc.txt @@ -1,9 +1,7 @@ // The barrel of green goop ------------------------------------------------ -ACTOR ExplosiveBarrel 2035 +ACTOR ExplosiveBarrel { - Game Doom - SpawnID 125 Health 20 Radius 10 Height 42 @@ -37,8 +35,6 @@ ACTOR ExplosiveBarrel 2035 ACTOR BulletPuff { - Game Doom - SpawnID 131 +NOBLOCKMAP +NOGRAVITY +ALLOWPARTICLES @@ -85,9 +81,8 @@ ACTOR DoomUnusedStates // MBF Beta emulation items -Actor EvilSceptre : ScoreItem 2016 +Actor EvilSceptre : ScoreItem { - Game Doom Inventory.PickupMessage "$BETA_BONUS3" States { @@ -97,9 +92,8 @@ Actor EvilSceptre : ScoreItem 2016 } } -Actor UnholyBible : ScoreItem 2017 +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 8be33c0ca..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" @@ -52,9 +51,8 @@ ACTOR Fist : Weapon // // -------------------------------------------------------------------------- -ACTOR Pistol : DoomWeapon 5010 +ACTOR Pistol : DoomWeapon { - Game Doom Weapon.SelectionOrder 1900 Weapon.AmmoUse 1 Weapon.AmmoGive 20 @@ -97,10 +95,8 @@ ACTOR Pistol : DoomWeapon 5010 // // -------------------------------------------------------------------------- -ACTOR Chainsaw : Weapon 2005 +ACTOR Chainsaw : Weapon { - Game Doom - SpawnID 32 Weapon.Kickback 0 Weapon.SelectionOrder 2200 Weapon.UpSound "weapons/sawup" @@ -137,10 +133,8 @@ ACTOR Chainsaw : Weapon 2005 // // -------------------------------------------------------------------------- -ACTOR Shotgun : DoomWeapon 2001 +ACTOR Shotgun : DoomWeapon { - Game Doom - SpawnID 27 Weapon.SelectionOrder 1300 Weapon.AmmoUse 1 Weapon.AmmoGive 8 @@ -184,10 +178,8 @@ ACTOR Shotgun : DoomWeapon 2001 // // -------------------------------------------------------------------------- -ACTOR SuperShotgun : DoomWeapon 82 +ACTOR SuperShotgun : DoomWeapon { - Game Doom - SpawnID 33 Weapon.SelectionOrder 400 Weapon.AmmoUse 2 Weapon.AmmoGive 8 @@ -238,10 +230,8 @@ ACTOR SuperShotgun : DoomWeapon 82 // // -------------------------------------------------------------------------- -ACTOR Chaingun : DoomWeapon 2002 +ACTOR Chaingun : DoomWeapon { - Game Doom - SpawnID 28 Weapon.SelectionOrder 700 Weapon.AmmoUse 1 Weapon.AmmoGive 20 @@ -281,10 +271,8 @@ ACTOR Chaingun : DoomWeapon 2002 // // -------------------------------------------------------------------------- -ACTOR RocketLauncher : DoomWeapon 2003 +ACTOR RocketLauncher : DoomWeapon { - Game Doom - SpawnID 29 Weapon.SelectionOrder 2500 Weapon.AmmoUse 1 Weapon.AmmoGive 2 @@ -321,8 +309,6 @@ ACTOR RocketLauncher : DoomWeapon 2003 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 @@ -404,10 +388,8 @@ ACTOR Grenade // // -------------------------------------------------------------------------- -ACTOR PlasmaRifle : DoomWeapon 2004 +ACTOR PlasmaRifle : DoomWeapon { - Game Doom - SpawnID 30 Weapon.SelectionOrder 100 Weapon.AmmoUse 1 Weapon.AmmoGive 40 @@ -442,8 +424,6 @@ ACTOR PlasmaRifle : DoomWeapon 2004 ACTOR PlasmaBall { - Game Doom - SpawnID 51 Radius 13 Height 8 Speed 25 @@ -508,11 +488,9 @@ ACTOR PlasmaBall2 : PlasmaBall1 // // -------------------------------------------------------------------------- -ACTOR BFG9000 : DoomWeapon 2006 +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 2006 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 63ae511aa..1ad40fd93 100644 --- a/wadsrc/static/actors/doom/fatso.txt +++ b/wadsrc/static/actors/doom/fatso.txt @@ -3,10 +3,8 @@ // Mancubus // //=========================================================================== -ACTOR Fatso 67 +ACTOR Fatso { - Game Doom - SpawnID 112 Health 600 Radius 48 Height 64 @@ -65,8 +63,6 @@ ACTOR Fatso 67 //=========================================================================== 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 fef060435..2c07e5b32 100644 --- a/wadsrc/static/actors/doom/keen.txt +++ b/wadsrc/static/actors/doom/keen.txt @@ -3,9 +3,8 @@ // Commander Keen // //=========================================================================== -ACTOR CommanderKeen 72 +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 beb9ef4dd..80599d62a 100644 --- a/wadsrc/static/actors/doom/lostsoul.txt +++ b/wadsrc/static/actors/doom/lostsoul.txt @@ -3,10 +3,8 @@ // Lost Soul // //=========================================================================== -ACTOR LostSoul 3006 +ACTOR LostSoul { - Game Doom - SpawnID 110 Health 100 Radius 16 Height 56 @@ -50,7 +48,7 @@ ACTOR LostSoul 3006 } } -Actor BetaSkull : LostSoul 9037 +Actor BetaSkull : LostSoul { States { diff --git a/wadsrc/static/actors/doom/painelemental.txt b/wadsrc/static/actors/doom/painelemental.txt index e8e359cf3..5951afd6b 100644 --- a/wadsrc/static/actors/doom/painelemental.txt +++ b/wadsrc/static/actors/doom/painelemental.txt @@ -3,10 +3,8 @@ // Pain Elemental // //=========================================================================== -ACTOR PainElemental 71 +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 62a41a80a..7dfee1f9e 100644 --- a/wadsrc/static/actors/doom/possessed.txt +++ b/wadsrc/static/actors/doom/possessed.txt @@ -4,10 +4,8 @@ // Zombie man // //=========================================================================== -ACTOR ZombieMan 3004 +ACTOR ZombieMan { - Game Doom - SpawnID 4 Health 20 Radius 20 Height 56 @@ -65,10 +63,8 @@ ACTOR ZombieMan 3004 // Sergeant / Shotgun guy // //=========================================================================== -ACTOR ShotgunGuy 9 +ACTOR ShotgunGuy { - Game Doom - SpawnID 1 Health 30 Radius 20 Height 56 @@ -127,10 +123,8 @@ ACTOR ShotgunGuy 9 // Chaingunner // //=========================================================================== -ACTOR ChaingunGuy 65 +ACTOR ChaingunGuy { - Game Doom - SpawnID 2 Health 70 Radius 20 Height 56 @@ -189,10 +183,8 @@ ACTOR ChaingunGuy 65 // SS Nazi // //=========================================================================== -ACTOR WolfensteinSS 84 +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 5ef97789b..ce072bec4 100644 --- a/wadsrc/static/actors/doom/revenant.txt +++ b/wadsrc/static/actors/doom/revenant.txt @@ -3,10 +3,8 @@ // Revenant // //=========================================================================== -ACTOR Revenant 66 +ACTOR Revenant { - Game Doom - SpawnID 20 Health 300 Radius 20 Height 56 @@ -70,8 +68,6 @@ ACTOR Revenant 66 //=========================================================================== 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 fecd0ac0d..7341498be 100644 --- a/wadsrc/static/actors/doom/scriptedmarine.txt +++ b/wadsrc/static/actors/doom/scriptedmarine.txt @@ -1,10 +1,8 @@ // Scriptable marine ------------------------------------------------------- -ACTOR ScriptedMarine 9100 native +ACTOR ScriptedMarine native { - Game Doom - SpawnID 151 Health 100 Radius 16 Height 56 @@ -172,9 +170,8 @@ ACTOR ScriptedMarine 9100 native //--------------------------------------------------------------------------- -ACTOR MarineFist : ScriptedMarine 9101 +ACTOR MarineFist : ScriptedMarine { - Game Doom States { Melee: @@ -187,9 +184,8 @@ ACTOR MarineFist : ScriptedMarine 9101 //--------------------------------------------------------------------------- -ACTOR MarineBerserk : MarineFist 9102 +ACTOR MarineBerserk : MarineFist { - Game Doom States { Melee: @@ -200,9 +196,8 @@ ACTOR MarineBerserk : MarineFist 9102 } //--------------------------------------------------------------------------- -ACTOR MarineChainsaw : ScriptedMarine 9103 +ACTOR MarineChainsaw : ScriptedMarine { - Game Doom States { Melee: @@ -216,9 +211,8 @@ ACTOR MarineChainsaw : ScriptedMarine 9103 //--------------------------------------------------------------------------- -ACTOR MarinePistol : ScriptedMarine 9104 +ACTOR MarinePistol : ScriptedMarine { - Game Doom States { Missile: @@ -229,9 +223,8 @@ ACTOR MarinePistol : ScriptedMarine 9104 //--------------------------------------------------------------------------- -ACTOR MarineShotgun : ScriptedMarine 9105 +ACTOR MarineShotgun : ScriptedMarine { - Game Doom States { Missile: @@ -244,9 +237,8 @@ ACTOR MarineShotgun : ScriptedMarine 9105 //--------------------------------------------------------------------------- -ACTOR MarineSSG : ScriptedMarine 9106 +ACTOR MarineSSG : ScriptedMarine { - Game Doom States { Missile: @@ -256,9 +248,8 @@ ACTOR MarineSSG : ScriptedMarine 9106 //--------------------------------------------------------------------------- -ACTOR MarineChaingun : ScriptedMarine 9107 +ACTOR MarineChaingun : ScriptedMarine { - Game Doom States { Missile: @@ -269,9 +260,8 @@ ACTOR MarineChaingun : ScriptedMarine 9107 //--------------------------------------------------------------------------- -ACTOR MarineRocket : MarineFist 9108 +ACTOR MarineRocket : MarineFist { - Game Doom States { Missile: @@ -282,9 +272,8 @@ ACTOR MarineRocket : MarineFist 9108 //--------------------------------------------------------------------------- -ACTOR MarinePlasma : ScriptedMarine 9109 +ACTOR MarinePlasma : ScriptedMarine { - Game Doom States { Missile: @@ -295,9 +284,8 @@ ACTOR MarinePlasma : ScriptedMarine 9109 //--------------------------------------------------------------------------- -ACTOR MarineRailgun : ScriptedMarine 9110 +ACTOR MarineRailgun : ScriptedMarine { - Game Doom States { Missile: @@ -308,9 +296,8 @@ ACTOR MarineRailgun : ScriptedMarine 9110 //--------------------------------------------------------------------------- -ACTOR MarineBFG : ScriptedMarine 9111 +ACTOR MarineBFG : ScriptedMarine { - Game Doom States { Missile: diff --git a/wadsrc/static/actors/doom/spidermaster.txt b/wadsrc/static/actors/doom/spidermaster.txt index d2939c8ea..97ebbf143 100644 --- a/wadsrc/static/actors/doom/spidermaster.txt +++ b/wadsrc/static/actors/doom/spidermaster.txt @@ -3,10 +3,8 @@ // Spider boss // //=========================================================================== -ACTOR SpiderMastermind 7 +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 f5d7ae31b..5a35533ea 100644 --- a/wadsrc/static/actors/doom/stealthmonsters.txt +++ b/wadsrc/static/actors/doom/stealthmonsters.txt @@ -1,28 +1,22 @@ -ACTOR StealthArachnotron : Arachnotron 9050 +ACTOR StealthArachnotron : Arachnotron { - Game Doom - SpawnID 117 +STEALTH RenderStyle Translucent Alpha 0 Obituary "$OB_STEALTHBABY" } -ACTOR StealthArchvile : Archvile 9051 +ACTOR StealthArchvile : Archvile { - Game Doom - SpawnID 118 +STEALTH RenderStyle Translucent Alpha 0 Obituary "$OB_STEALTHVILE" } -ACTOR StealthBaron : BaronOfHell 9052 +ACTOR StealthBaron : BaronOfHell { - Game Doom - SpawnID 100 +STEALTH RenderStyle Translucent Alpha 0 @@ -30,10 +24,8 @@ ACTOR StealthBaron : BaronOfHell 9052 HitObituary "$OB_STEALTHBARON" } -ACTOR StealthCacodemon : Cacodemon 9053 +ACTOR StealthCacodemon : Cacodemon { - Game Doom - SpawnID 119 +STEALTH RenderStyle Translucent Alpha 0 @@ -41,20 +33,16 @@ ACTOR StealthCacodemon : Cacodemon 9053 HitObituary "$OB_STEALTHCACO" } -ACTOR StealthChaingunGuy : ChaingunGuy 9054 +ACTOR StealthChaingunGuy : ChaingunGuy { - Game Doom - SpawnID 120 +STEALTH RenderStyle Translucent Alpha 0 Obituary "$OB_STEALTHCHAINGUY" } -ACTOR StealthDemon : Demon 9055 +ACTOR StealthDemon : Demon { - Game Doom - SpawnID 121 +STEALTH RenderStyle Translucent Alpha 0 @@ -62,10 +50,8 @@ ACTOR StealthDemon : Demon 9055 HitObituary "$OB_STEALTHDEMON" } -ACTOR StealthHellKnight : HellKnight 9056 +ACTOR StealthHellKnight : HellKnight { - Game Doom - SpawnID 101 +STEALTH RenderStyle Translucent Alpha 0 @@ -73,10 +59,8 @@ ACTOR StealthHellKnight : HellKnight 9056 HitObituary "$OB_STEALTHKNIGHT" } -ACTOR StealthDoomImp : DoomImp 9057 +ACTOR StealthDoomImp : DoomImp { - Game Doom - SpawnID 122 +STEALTH RenderStyle Translucent Alpha 0 @@ -84,20 +68,16 @@ ACTOR StealthDoomImp : DoomImp 9057 HitObituary "$OB_STEALTHIMP" } -ACTOR StealthFatso : Fatso 9058 +ACTOR StealthFatso : Fatso { - Game Doom - SpawnID 123 +STEALTH RenderStyle Translucent Alpha 0 Obituary "$OB_STEALTHFATSO" } -ACTOR StealthRevenant : Revenant 9059 +ACTOR StealthRevenant : Revenant { - Game Doom - SpawnID 124 +STEALTH RenderStyle Translucent Alpha 0 @@ -105,20 +85,16 @@ ACTOR StealthRevenant : Revenant 9059 HitObituary "$OB_STEALTHUNDEAD" } -ACTOR StealthShotgunGuy : ShotgunGuy 9060 +ACTOR StealthShotgunGuy : ShotgunGuy { - Game Doom - SpawnID 103 +STEALTH RenderStyle Translucent Alpha 0 Obituary "$OB_STEALTHSHOTGUNGUY" } -ACTOR StealthZombieMan : ZombieMan 9061 +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 7f54c3442..757414883 100644 --- a/wadsrc/static/actors/heretic/beast.txt +++ b/wadsrc/static/actors/heretic/beast.txt @@ -1,10 +1,8 @@ // Beast -------------------------------------------------------------------- -ACTOR Beast 70 +ACTOR Beast { - Game Heretic - SpawnID 3 Health 220 Radius 32 Height 74 @@ -61,8 +59,6 @@ ACTOR Beast 70 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 ec8cf6b9c..f7a483331 100644 --- a/wadsrc/static/actors/heretic/clink.txt +++ b/wadsrc/static/actors/heretic/clink.txt @@ -1,8 +1,6 @@ -ACTOR Clink 90 +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 6ecef5b5c..47fada3e6 100644 --- a/wadsrc/static/actors/heretic/dsparil.txt +++ b/wadsrc/static/actors/heretic/dsparil.txt @@ -1,19 +1,15 @@ // Boss spot ---------------------------------------------------------------- -ACTOR BossSpot : SpecialSpot 56 +ACTOR BossSpot : SpecialSpot { - Game Heretic - SpawnID 141 +INVISIBLE } // Sorcerer (D'Sparil on his serpent) --------------------------------------- -ACTOR Sorcerer1 7 +ACTOR Sorcerer1 { - Game Heretic - SpawnID 142 Health 2000 Radius 28 Height 100 @@ -84,8 +80,6 @@ ACTOR Sorcerer1 7 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 96a20352b..cfbc29702 100644 --- a/wadsrc/static/actors/heretic/hereticammo.txt +++ b/wadsrc/static/actors/heretic/hereticammo.txt @@ -1,10 +1,8 @@ // Wimpy ammo --------------------------------------------------------------- -ACTOR GoldWandAmmo : Ammo 10 +ACTOR GoldWandAmmo : Ammo { - Game Heretic - SpawnID 11 Inventory.PickupMessage "$TXT_AMMOGOLDWAND1" Inventory.Amount 10 Inventory.MaxAmount 100 @@ -21,10 +19,8 @@ ACTOR GoldWandAmmo : Ammo 10 // Hefty ammo --------------------------------------------------------------- -ACTOR GoldWandHefty : GoldWandAmmo 12 +ACTOR GoldWandHefty : GoldWandAmmo { - Game Heretic - SpawnID 12 Inventory.PickupMessage "$TXT_AMMOGOLDWAND2" Inventory.Amount 50 States @@ -36,10 +32,8 @@ ACTOR GoldWandHefty : GoldWandAmmo 12 } // Wimpy ammo --------------------------------------------------------------- -ACTOR CrossbowAmmo : Ammo 18 +ACTOR CrossbowAmmo : Ammo { - Game Heretic - SpawnID 33 Inventory.PickupMessage "$TXT_AMMOCROSSBOW1" Inventory.Amount 5 Inventory.MaxAmount 50 @@ -56,10 +50,8 @@ ACTOR CrossbowAmmo : Ammo 18 // Hefty ammo --------------------------------------------------------------- -ACTOR CrossbowHefty : CrossbowAmmo 19 +ACTOR CrossbowHefty : CrossbowAmmo { - Game Heretic - SpawnID 34 Inventory.PickupMessage "$TXT_AMMOCROSSBOW2" Inventory.Amount 20 States @@ -71,10 +63,8 @@ ACTOR CrossbowHefty : CrossbowAmmo 19 } // Wimpy ammo --------------------------------------------------------------- -ACTOR MaceAmmo : Ammo 13 +ACTOR MaceAmmo : Ammo { - Game Heretic - SpawnID 35 Inventory.PickupMessage "$TXT_AMMOMACE1" Inventory.Amount 20 Inventory.MaxAmount 150 @@ -91,10 +81,8 @@ ACTOR MaceAmmo : Ammo 13 // Hefty ammo --------------------------------------------------------------- -ACTOR MaceHefty : MaceAmmo 16 +ACTOR MaceHefty : MaceAmmo { - Game Heretic - SpawnID 36 Inventory.PickupMessage "$TXT_AMMOMACE2" Inventory.Amount 100 States @@ -107,10 +95,8 @@ ACTOR MaceHefty : MaceAmmo 16 // Wimpy ammo --------------------------------------------------------------- -ACTOR BlasterAmmo : Ammo 54 +ACTOR BlasterAmmo : Ammo { - Game Heretic - SpawnID 37 Inventory.PickupMessage "$TXT_AMMOBLASTER1" Inventory.Amount 10 Inventory.MaxAmount 200 @@ -127,10 +113,8 @@ ACTOR BlasterAmmo : Ammo 54 // Hefty ammo --------------------------------------------------------------- -ACTOR BlasterHefty : BlasterAmmo 55 +ACTOR BlasterHefty : BlasterAmmo { - Game Heretic - SpawnID 38 Inventory.PickupMessage "$TXT_AMMOBLASTER2" Inventory.Amount 25 States @@ -143,10 +127,8 @@ ACTOR BlasterHefty : BlasterAmmo 55 // Wimpy ammo --------------------------------------------------------------- -ACTOR SkullRodAmmo : Ammo 20 +ACTOR SkullRodAmmo : Ammo { - Game Heretic - SpawnID 158 Inventory.PickupMessage "$TXT_AMMOSKULLROD1" Inventory.Amount 20 Inventory.MaxAmount 200 @@ -163,10 +145,8 @@ ACTOR SkullRodAmmo : Ammo 20 // Hefty ammo --------------------------------------------------------------- -ACTOR SkullRodHefty : SkullRodAmmo 21 +ACTOR SkullRodHefty : SkullRodAmmo { - Game Heretic - SpawnID 159 Inventory.PickupMessage "$TXT_AMMOSKULLROD2" Inventory.Amount 100 States @@ -179,10 +159,8 @@ ACTOR SkullRodHefty : SkullRodAmmo 21 // Wimpy ammo --------------------------------------------------------------- -ACTOR PhoenixRodAmmo : Ammo 22 +ACTOR PhoenixRodAmmo : Ammo { - Game Heretic - SpawnID 161 Inventory.PickupMessage "$TXT_AMMOPHOENIXROD1" Inventory.Amount 1 Inventory.MaxAmount 20 @@ -198,10 +176,8 @@ ACTOR PhoenixRodAmmo : Ammo 22 } // Hefty ammo --------------------------------------------------------------- -ACTOR PhoenixRodHefty : PhoenixRodAmmo 23 +ACTOR PhoenixRodHefty : PhoenixRodAmmo { - Game Heretic - SpawnID 162 Inventory.PickupMessage "$TXT_AMMOPHOENIXROD2" Inventory.Amount 10 States @@ -214,10 +190,8 @@ ACTOR PhoenixRodHefty : PhoenixRodAmmo 23 // --- Bag of holding ------------------------------------------------------- -ACTOR BagOfHolding : BackpackItem 8 +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 e027f4f47..c6e28b030 100644 --- a/wadsrc/static/actors/heretic/hereticarmor.txt +++ b/wadsrc/static/actors/heretic/hereticarmor.txt @@ -1,10 +1,8 @@ // Silver Shield (Shield1) -------------------------------------------------- -Actor SilverShield : BasicArmorPickup 85 +Actor SilverShield : BasicArmorPickup { - Game Heretic - SpawnID 68 +FLOATBOB Inventory.Pickupmessage "$TXT_ITEMSHIELD1" Inventory.Icon "SHLDA0" @@ -20,10 +18,8 @@ Actor SilverShield : BasicArmorPickup 85 // Enchanted shield (Shield2) ----------------------------------------------- -Actor EnchantedShield : BasicArmorPickup 31 +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 67d3946b9..91e954b1b 100644 --- a/wadsrc/static/actors/heretic/hereticartifacts.txt +++ b/wadsrc/static/actors/heretic/hereticartifacts.txt @@ -1,9 +1,7 @@ // Super map ---------------------------------------------------------------- -ACTOR SuperMap : MapRevealer 35 +ACTOR SuperMap : MapRevealer { - Game Heretic - SpawnID 137 +COUNTITEM +INVENTORY.ALWAYSPICKUP +FLOATBOB @@ -20,10 +18,8 @@ ACTOR SuperMap : MapRevealer 35 // Invisibility ------------------------------------------------------------- -ACTOR ArtiInvisibility : PowerupGiver 75 +ACTOR ArtiInvisibility : PowerupGiver { - Game Heretic - SpawnID 135 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -45,10 +41,8 @@ ACTOR ArtiInvisibility : PowerupGiver 75 // Tome of power ------------------------------------------------------------ -ACTOR ArtiTomeOfPower : PowerupGiver 86 native +ACTOR ArtiTomeOfPower : PowerupGiver native { - Game Heretic - SpawnID 134 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -88,10 +82,8 @@ ACTOR ActivatedTimeBomb } -ACTOR ArtiTimeBomb : Inventory 34 native +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 cb090d0ea..27bd98540 100644 --- a/wadsrc/static/actors/heretic/hereticdecorations.txt +++ b/wadsrc/static/actors/heretic/hereticdecorations.txt @@ -1,6 +1,5 @@ -ACTOR SkullHang70 17 +ACTOR SkullHang70 { - Game Heretic Radius 20 Height 70 +SPAWNCEILING @@ -13,9 +12,8 @@ ACTOR SkullHang70 17 } } -ACTOR SkullHang60 24 +ACTOR SkullHang60 { - Game Heretic Radius 20 Height 60 +SPAWNCEILING @@ -28,9 +26,8 @@ ACTOR SkullHang60 24 } } -ACTOR SkullHang45 25 +ACTOR SkullHang45 { - Game Heretic Radius 20 Height 45 +SPAWNCEILING @@ -43,9 +40,8 @@ ACTOR SkullHang45 25 } } -ACTOR SkullHang35 26 +ACTOR SkullHang35 { - Game Heretic Radius 20 Height 35 +SPAWNCEILING @@ -58,9 +54,8 @@ ACTOR SkullHang35 26 } } -ACTOR Chandelier 28 +ACTOR Chandelier { - Game Heretic Radius 20 Height 60 +SPAWNCEILING @@ -73,9 +68,8 @@ ACTOR Chandelier 28 } } -ACTOR SerpentTorch 27 +ACTOR SerpentTorch { - Game Heretic Radius 12 Height 54 +SOLID @@ -87,9 +81,8 @@ ACTOR SerpentTorch 27 } } -ACTOR SmallPillar 29 +ACTOR SmallPillar { - Game Heretic Radius 16 Height 34 +SOLID @@ -101,9 +94,8 @@ ACTOR SmallPillar 29 } } -ACTOR StalagmiteSmall 37 +ACTOR StalagmiteSmall { - Game Heretic Radius 8 Height 32 +SOLID @@ -115,9 +107,8 @@ ACTOR StalagmiteSmall 37 } } -ACTOR StalagmiteLarge 38 +ACTOR StalagmiteLarge { - Game Heretic Radius 12 Height 64 +SOLID @@ -129,9 +120,8 @@ ACTOR StalagmiteLarge 38 } } -ACTOR StalactiteSmall 39 +ACTOR StalactiteSmall { - Game Heretic Radius 8 Height 36 +SOLID @@ -145,9 +135,8 @@ ACTOR StalactiteSmall 39 } } -ACTOR StalactiteLarge 40 +ACTOR StalactiteLarge { - Game Heretic Radius 12 Height 68 +SOLID @@ -161,9 +150,8 @@ ACTOR StalactiteLarge 40 } } -ACTOR FireBrazier 76 +ACTOR FireBrazier { - Game Heretic Radius 16 Height 44 +SOLID @@ -175,9 +163,8 @@ ACTOR FireBrazier 76 } } -ACTOR Barrel 44 +ACTOR Barrel { - Game Heretic Radius 12 Height 32 +SOLID @@ -189,9 +176,8 @@ ACTOR Barrel 44 } } -ACTOR BrownPillar 47 +ACTOR BrownPillar { - Game Heretic Radius 14 Height 128 +SOLID @@ -203,9 +189,8 @@ ACTOR BrownPillar 47 } } -ACTOR Moss1 48 +ACTOR Moss1 { - Game Heretic Radius 20 Height 23 +SPAWNCEILING @@ -218,9 +203,8 @@ ACTOR Moss1 48 } } -ACTOR Moss2 49 +ACTOR Moss2 { - Game Heretic Radius 20 Height 27 +SPAWNCEILING @@ -233,9 +217,8 @@ ACTOR Moss2 49 } } -ACTOR WallTorch 50 +ACTOR WallTorch { - Game Heretic Radius 6 Height 16 +NOGRAVITY @@ -248,9 +231,8 @@ ACTOR WallTorch 50 } } -ACTOR HangingCorpse 51 +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 2659d248a..b91cf1160 100644 --- a/wadsrc/static/actors/heretic/hereticimp.txt +++ b/wadsrc/static/actors/heretic/hereticimp.txt @@ -1,10 +1,8 @@ // Heretic imp (as opposed to the Doom variety) ----------------------------- -ACTOR HereticImp 66 +ACTOR HereticImp { - Game Heretic - SpawnID 5 Health 40 Radius 16 Height 36 @@ -78,10 +76,8 @@ ACTOR HereticImp 66 // Heretic imp leader ------------------------------------------------------- -ACTOR HereticImpLeader : HereticImp 5 +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 71beab253..69d906e55 100644 --- a/wadsrc/static/actors/heretic/heretickeys.txt +++ b/wadsrc/static/actors/heretic/heretickeys.txt @@ -8,10 +8,8 @@ ACTOR HereticKey : Key // Green key ------------------------------------------------------------ -ACTOR KeyGreen : HereticKey 73 +ACTOR KeyGreen : HereticKey { - Game Heretic - SpawnID 86 Inventory.PickupMessage "$TXT_GOTGREENKEY" Inventory.Icon "GKEYICON" States @@ -24,10 +22,8 @@ ACTOR KeyGreen : HereticKey 73 // Blue key ----------------------------------------------------------------- -ACTOR KeyBlue : HereticKey 79 +ACTOR KeyBlue : HereticKey { - Game Heretic - SpawnID 85 Inventory.PickupMessage "$TXT_GOTBLUEKEY" Inventory.Icon "BKEYICON" States @@ -40,10 +36,8 @@ ACTOR KeyBlue : HereticKey 79 // Yellow key --------------------------------------------------------------- -ACTOR KeyYellow : HereticKey 80 +ACTOR KeyYellow : HereticKey { - Game Heretic - SpawnID 87 Inventory.PickupMessage "$TXT_GOTYELLOWKEY" Inventory.Icon "YKEYICON" States @@ -57,9 +51,8 @@ ACTOR KeyYellow : HereticKey 80 // --- Blue Key gizmo ----------------------------------------------------------- -ACTOR KeyGizmoBlue 94 +ACTOR KeyGizmoBlue { - Game Heretic Radius 16 Height 50 +SOLID @@ -89,9 +82,8 @@ ACTOR KeyGizmoFloatBlue // --- Green Key gizmo ----------------------------------------------------------- -ACTOR KeyGizmoGreen 95 +ACTOR KeyGizmoGreen { - Game Heretic Radius 16 Height 50 +SOLID @@ -121,9 +113,8 @@ ACTOR KeyGizmoFloatGreen // --- Yellow Key gizmo ----------------------------------------------------------- -ACTOR KeyGizmoYellow 96 +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 b6644e444..a8ef81b5d 100644 --- a/wadsrc/static/actors/heretic/hereticmisc.txt +++ b/wadsrc/static/actors/heretic/hereticmisc.txt @@ -1,10 +1,8 @@ // Pod ---------------------------------------------------------------------- -ACTOR Pod 2035 +ACTOR Pod { - Game Heretic - SpawnID 125 Health 45 Radius 16 Height 54 @@ -62,10 +60,8 @@ ACTOR PodGoo // Pod generator ------------------------------------------------------------ -ACTOR PodGenerator 43 +ACTOR PodGenerator { - Game Heretic - SpawnID 126 +NOBLOCKMAP +NOSECTOR +DONTSPLASH @@ -84,10 +80,8 @@ ACTOR PodGenerator 43 // Teleglitter generator 1 -------------------------------------------------- -ACTOR TeleGlitterGenerator1 74 +ACTOR TeleGlitterGenerator1 { - Game Heretic - SpawnID 166 +NOBLOCKMAP +NOGRAVITY +DONTSPLASH @@ -102,10 +96,8 @@ ACTOR TeleGlitterGenerator1 74 // Teleglitter generator 2 -------------------------------------------------- -ACTOR TeleGlitterGenerator2 52 +ACTOR TeleGlitterGenerator2 { - Game Heretic - SpawnID 167 +NOBLOCKMAP +NOGRAVITY +DONTSPLASH @@ -160,10 +152,8 @@ ACTOR TeleGlitter2 : TeleGlitter1 // --- Volcano -------------------------------------------------------------- -ACTOR Volcano 87 +ACTOR Volcano { - Game Heretic - SpawnID 150 Radius 12 Height 20 +SOLID @@ -187,8 +177,6 @@ ACTOR Volcano 87 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 ca85437e0..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 @@ -110,9 +108,8 @@ ACTOR StaffPuff2 // Gold wand ---------------------------------------------------------------- -ACTOR GoldWand : HereticWeapon 9042 +ACTOR GoldWand : HereticWeapon { - Game Heretic +BLOODSPLATTER Weapon.SelectionOrder 2000 Weapon.AmmoGive 25 @@ -151,7 +148,6 @@ ACTOR GoldWand : HereticWeapon 9042 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 "" @@ -248,10 +240,8 @@ ACTOR GoldWandPuff2 : GoldWandFX1 // Crossbow ----------------------------------------------------------------- -ACTOR Crossbow : HereticWeapon 2001 +ACTOR Crossbow : HereticWeapon { - Game Heretic - SpawnID 27 Weapon.SelectionOrder 800 Weapon.AmmoUse 1 Weapon.AmmoGive 10 @@ -289,7 +279,6 @@ ACTOR Crossbow : HereticWeapon 2001 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 "" @@ -400,10 +383,8 @@ ACTOR CrossbowFX4 // Gauntlets ---------------------------------------------------------------- -ACTOR Gauntlets : Weapon 2005 +ACTOR Gauntlets : Weapon { - Game Heretic - SpawnID 32 +BLOODSPLATTER Weapon.SelectionOrder 2300 +WEAPON.WIMPY_WEAPON @@ -446,7 +427,6 @@ ACTOR Gauntlets : Weapon 2005 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 @@ -681,9 +650,8 @@ ACTOR MaceFX4 native // Mace spawn spot ---------------------------------------------------------- -ACTOR MaceSpawner : SpecialSpot 2002 +ACTOR MaceSpawner : SpecialSpot { - Game Heretic +NOSECTOR +NOBLOCKMAP States @@ -698,10 +666,8 @@ ACTOR MaceSpawner : SpecialSpot 2002 // Blaster ------------------------------------------------------------------ -ACTOR Blaster : HereticWeapon 53 +ACTOR Blaster : HereticWeapon { - Game Heretic - SpawnID 28 +BLOODSPLATTER Weapon.SelectionOrder 500 Weapon.AmmoUse 1 @@ -741,7 +707,6 @@ ACTOR Blaster : HereticWeapon 53 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 @@ -854,10 +817,8 @@ ACTOR BlasterPuff // Skull (Horn) Rod --------------------------------------------------------- -ACTOR SkullRod : HereticWeapon 2004 +ACTOR SkullRod : HereticWeapon { - Game Heretic - SpawnID 30 Weapon.SelectionOrder 200 Weapon.AmmoUse1 1 Weapon.AmmoGive1 50 @@ -892,7 +853,6 @@ ACTOR SkullRod : HereticWeapon 2004 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 @@ -1028,10 +986,8 @@ ACTOR RainTracker : Inventory native // Phoenix Rod -------------------------------------------------------------- -ACTOR PhoenixRod : Weapon 2003 native +ACTOR PhoenixRod : Weapon native { - Game Heretic - SpawnID 29 +WEAPON.NOAUTOFIRE Weapon.SelectionOrder 2600 Weapon.Kickback 150 @@ -1070,7 +1026,6 @@ ACTOR PhoenixRod : Weapon 2003 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 21234cf52..4b3527a4f 100644 --- a/wadsrc/static/actors/heretic/ironlich.txt +++ b/wadsrc/static/actors/heretic/ironlich.txt @@ -1,10 +1,8 @@ // Ironlich ----------------------------------------------------------------- -ACTOR Ironlich 6 +ACTOR Ironlich { - Game Heretic - SpawnID 20 Health 700 Radius 40 Height 72 @@ -59,8 +57,6 @@ ACTOR Ironlich 6 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 584bcd72e..4249f9549 100644 --- a/wadsrc/static/actors/heretic/knight.txt +++ b/wadsrc/static/actors/heretic/knight.txt @@ -1,10 +1,8 @@ // Knight ------------------------------------------------------------------- -ACTOR Knight 64 +ACTOR Knight { - Game Heretic - SpawnID 6 Health 200 Radius 24 Height 78 @@ -60,10 +58,8 @@ ACTOR Knight 64 // Knight ghost ------------------------------------------------------------- -ACTOR KnightGhost : Knight 65 +ACTOR KnightGhost : Knight { - Game Heretic - SpawnID 129 +SHADOW +GHOST RenderStyle Translucent @@ -74,8 +70,6 @@ ACTOR KnightGhost : Knight 65 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 af4ff0c23..46e9deaba 100644 --- a/wadsrc/static/actors/heretic/mummy.txt +++ b/wadsrc/static/actors/heretic/mummy.txt @@ -1,10 +1,8 @@ // Mummy -------------------------------------------------------------------- -ACTOR Mummy 68 +ACTOR Mummy { - Game Heretic - SpawnID 4 Health 80 Radius 22 Height 62 @@ -51,10 +49,8 @@ ACTOR Mummy 68 // Mummy leader ------------------------------------------------------------- -ACTOR MummyLeader : Mummy 45 +ACTOR MummyLeader : Mummy { - Game Heretic - SpawnID 2 Species "MummyLeader" Health 100 Painchance 64 @@ -74,10 +70,8 @@ ACTOR MummyLeader : Mummy 45 // Mummy ghost -------------------------------------------------------------- -ACTOR MummyGhost : Mummy 69 +ACTOR MummyGhost : Mummy { - Game Heretic - SpawnID 8 +SHADOW +GHOST RenderStyle Translucent @@ -86,10 +80,8 @@ ACTOR MummyGhost : Mummy 69 // Mummy leader ghost ------------------------------------------------------- -ACTOR MummyLeaderGhost : MummyLeader 46 +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 0184da170..93ed830db 100644 --- a/wadsrc/static/actors/heretic/snake.txt +++ b/wadsrc/static/actors/heretic/snake.txt @@ -1,8 +1,6 @@ -ACTOR Snake 92 +ACTOR Snake { - Game Heretic - SpawnID 132 Health 280 Radius 22 Height 70 @@ -50,8 +48,6 @@ ACTOR Snake 92 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 18188a321..f8f59a0ac 100644 --- a/wadsrc/static/actors/heretic/wizard.txt +++ b/wadsrc/static/actors/heretic/wizard.txt @@ -1,10 +1,8 @@ // Wizard -------------------------------------------------------- -ACTOR Wizard 15 +ACTOR Wizard { - Game Heretic - SpawnID 19 Health 180 Radius 16 Height 68 @@ -75,8 +73,6 @@ ACTOR Wizard 15 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 0d1e08081..e7c5b9de7 100644 --- a/wadsrc/static/actors/hexen/bats.txt +++ b/wadsrc/static/actors/hexen/bats.txt @@ -1,9 +1,8 @@ // Bat Spawner -------------------------------------------------------------- -ACTOR BatSpawner : SwitchableDecoration 10225 +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 8901a95b3..6d08d8d7b 100644 --- a/wadsrc/static/actors/hexen/bishop.txt +++ b/wadsrc/static/actors/hexen/bishop.txt @@ -1,10 +1,8 @@ // Bishop ------------------------------------------------------------------- -ACTOR Bishop 114 +ACTOR Bishop { - Game Hexen - SpawnID 19 Health 130 Radius 22 Height 65 @@ -81,7 +79,6 @@ ACTOR Bishop 114 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 ad98d7ecc..47802de5d 100644 --- a/wadsrc/static/actors/hexen/blastradius.txt +++ b/wadsrc/static/actors/hexen/blastradius.txt @@ -1,8 +1,6 @@ -ACTOR ArtiBlastRadius : CustomInventory 10110 +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 607c8d66a..f06ffa7ca 100644 --- a/wadsrc/static/actors/hexen/boostarmor.txt +++ b/wadsrc/static/actors/hexen/boostarmor.txt @@ -1,10 +1,8 @@ // Boost Armor Artifact (Dragonskin Bracers) -------------------------------- -ACTOR ArtiBoostArmor : Inventory 8041 native +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 8044fa2ab..7ea7f5f32 100644 --- a/wadsrc/static/actors/hexen/centaur.txt +++ b/wadsrc/static/actors/hexen/centaur.txt @@ -1,9 +1,7 @@ // Centaur ------------------------------------------------------------------ -ACTOR Centaur 107 +ACTOR Centaur { - Game Hexen - SpawnID 1 Health 200 Painchance 135 Speed 13 @@ -78,10 +76,8 @@ ACTOR Centaur 107 // Centaur Leader ----------------------------------------------------------- -ACTOR CentaurLeader : Centaur 115 +ACTOR CentaurLeader : Centaur { - Game Hexen - SpawnID 2 Health 250 PainChance 96 Speed 10 @@ -105,8 +101,6 @@ ACTOR CentaurLeader : Centaur 115 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 3947f6c6d..e3b028b32 100644 --- a/wadsrc/static/actors/hexen/clericboss.txt +++ b/wadsrc/static/actors/hexen/clericboss.txt @@ -1,9 +1,8 @@ // Cleric Boss (Traductus) -------------------------------------------------- -ACTOR ClericBoss 10101 +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 5fb4175fd..c467c8469 100644 --- a/wadsrc/static/actors/hexen/clericflame.txt +++ b/wadsrc/static/actors/hexen/clericflame.txt @@ -1,9 +1,8 @@ // The Cleric's Flame Strike ------------------------------------------------ -ACTOR CWeapFlame : ClericWeapon 8009 +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 e97be8b17..745d58fd8 100644 --- a/wadsrc/static/actors/hexen/clericholy.txt +++ b/wadsrc/static/actors/hexen/clericholy.txt @@ -12,10 +12,8 @@ ACTOR ClericWeaponPiece : WeaponPiece // Cleric Weapon Piece 1 ---------------------------------------------------- -ACTOR CWeaponPiece1 : ClericWeaponPiece 18 +ACTOR CWeaponPiece1 : ClericWeaponPiece { - Game Hexen - SpawnID 33 WeaponPiece.Number 1 States { @@ -27,10 +25,8 @@ ACTOR CWeaponPiece1 : ClericWeaponPiece 18 // Cleric Weapon Piece 2 ---------------------------------------------------- -ACTOR CWeaponPiece2 : ClericWeaponPiece 19 +ACTOR CWeaponPiece2 : ClericWeaponPiece { - Game Hexen - SpawnID 34 WeaponPiece.Number 2 States { @@ -42,10 +38,8 @@ ACTOR CWeaponPiece2 : ClericWeaponPiece 19 // Cleric Weapon Piece 3 ---------------------------------------------------- -ACTOR CWeaponPiece3 : ClericWeaponPiece 20 +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 e55674fa5..7a2926023 100644 --- a/wadsrc/static/actors/hexen/clericstaff.txt +++ b/wadsrc/static/actors/hexen/clericstaff.txt @@ -1,10 +1,8 @@ // The Cleric's Serpent Staff ----------------------------------------------- -ACTOR CWeapStaff : ClericWeapon 10 +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 1ecb2222c..561608f64 100644 --- a/wadsrc/static/actors/hexen/demons.txt +++ b/wadsrc/static/actors/hexen/demons.txt @@ -1,10 +1,8 @@ // Demon, type 1 (green, like D'Sparil's) ----------------------------------- -ACTOR Demon1 31 +ACTOR Demon1 { - Game Hexen - SpawnID 3 Health 250 Painchance 50 Speed 13 @@ -70,8 +68,6 @@ ACTOR Demon1 31 ACTOR Demon1Mash : Demon1 { - Game Hexen - SpawnID 100 +NOBLOOD +BLASTED -TELESTOMP @@ -212,9 +208,8 @@ ACTOR Demon1FX1 // Demon, type 2 (brown) ---------------------------------------------------- -ACTOR Demon2 : Demon1 8080 +ACTOR Demon2 : Demon1 { - Game Hexen Obituary "$OB_DEMON2" Species "Demon2" States @@ -262,8 +257,6 @@ ACTOR Demon2 : Demon1 8080 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 904b2f953..ea3b01293 100644 --- a/wadsrc/static/actors/hexen/dragon.txt +++ b/wadsrc/static/actors/hexen/dragon.txt @@ -1,9 +1,8 @@ // Dragon ------------------------------------------------------------------- -ACTOR Dragon 254 +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 e5104aa11..04f920aa1 100644 --- a/wadsrc/static/actors/hexen/ettin.txt +++ b/wadsrc/static/actors/hexen/ettin.txt @@ -1,10 +1,8 @@ // Ettin -------------------------------------------------------------------- -ACTOR Ettin 10030 +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 502de5030..b3bea4007 100644 --- a/wadsrc/static/actors/hexen/fighteraxe.txt +++ b/wadsrc/static/actors/hexen/fighteraxe.txt @@ -1,10 +1,8 @@ // The Fighter's Axe -------------------------------------------------------- -ACTOR FWeapAxe : FighterWeapon 8010 native +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 1caf10d12..a41dd422c 100644 --- a/wadsrc/static/actors/hexen/fighterboss.txt +++ b/wadsrc/static/actors/hexen/fighterboss.txt @@ -1,9 +1,8 @@ // Fighter Boss (Zedek) ----------------------------------------------------- -ACTOR FighterBoss 10100 +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 5c7d6dc25..f2b53ea93 100644 --- a/wadsrc/static/actors/hexen/fighterhammer.txt +++ b/wadsrc/static/actors/hexen/fighterhammer.txt @@ -1,10 +1,8 @@ // The Fighter's Hammer ----------------------------------------------------- -ACTOR FWeapHammer : FighterWeapon 123 +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 a77e851d8..fa249a932 100644 --- a/wadsrc/static/actors/hexen/fighterquietus.txt +++ b/wadsrc/static/actors/hexen/fighterquietus.txt @@ -12,10 +12,8 @@ ACTOR FighterWeaponPiece : WeaponPiece // Fighter Weapon Piece 1 --------------------------------------------------- -ACTOR FWeaponPiece1 : FighterWeaponPiece 12 +ACTOR FWeaponPiece1 : FighterWeaponPiece { - Game Hexen - SpawnID 29 WeaponPiece.Number 1 States { @@ -27,10 +25,8 @@ ACTOR FWeaponPiece1 : FighterWeaponPiece 12 // Fighter Weapon Piece 2 --------------------------------------------------- -ACTOR FWeaponPiece2 : FighterWeaponPiece 13 +ACTOR FWeaponPiece2 : FighterWeaponPiece { - Game Hexen - SpawnID 30 WeaponPiece.Number 2 States { @@ -42,10 +38,8 @@ ACTOR FWeaponPiece2 : FighterWeaponPiece 13 // Fighter Weapon Piece 3 --------------------------------------------------- -ACTOR FWeaponPiece3 : FighterWeaponPiece 16 +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 4873e2609..5a735f106 100644 --- a/wadsrc/static/actors/hexen/firedemon.txt +++ b/wadsrc/static/actors/hexen/firedemon.txt @@ -1,10 +1,8 @@ // FireDemon ---------------------------------------------------------------- -ACTOR FireDemon 10060 +ACTOR FireDemon { - Game Hexen - SpawnID 5 Health 80 ReactionTime 8 PainChance 1 @@ -76,7 +74,6 @@ ACTOR FireDemon 10060 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 984c2d90c..3fc9fa595 100644 --- a/wadsrc/static/actors/hexen/flame.txt +++ b/wadsrc/static/actors/hexen/flame.txt @@ -1,9 +1,7 @@ // Temp Small Flame -------------------------------------------------------- -ACTOR FlameSmallTemp 10500 +ACTOR FlameSmallTemp { - Game Hexen - SpawnID 96 +NOTELEPORT RenderStyle Add States @@ -21,10 +19,8 @@ ACTOR FlameSmallTemp 10500 // Temp Large Flame --------------------------------------------------------- -ACTOR FlameLargeTemp 10502 +ACTOR FlameLargeTemp { - Game Hexen - SpawnID 98 +NOTELEPORT RenderStyle Add States @@ -52,10 +48,8 @@ ACTOR FlameLargeTemp 10502 // Small Flame -------------------------------------------------------------- -ACTOR FlameSmall : SwitchableDecoration 10501 +ACTOR FlameSmall : SwitchableDecoration { - Game Hexen - SpawnID 97 +NOTELEPORT +INVISIBLE Radius 15 @@ -79,16 +73,12 @@ ACTOR FlameSmall : SwitchableDecoration 10501 ACTOR FlameSmall2 : FlameSmall { - Game Hexen - SpawnID 66 } // Large Flame -------------------------------------------------------------- -ACTOR FlameLarge : SwitchableDecoration 10503 +ACTOR FlameLarge : SwitchableDecoration { - Game Hexen - SpawnID 99 +NOTELEPORT +INVISIBLE Radius 15 @@ -112,7 +102,5 @@ ACTOR FlameLarge : SwitchableDecoration 10503 ACTOR FlameLarge2 : FlameLarge { - Game Hexen - SpawnID 67 } diff --git a/wadsrc/static/actors/hexen/flechette.txt b/wadsrc/static/actors/hexen/flechette.txt index 6e12bff53..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 @@ -94,10 +92,8 @@ ACTOR ThrowingBomb // Poison Bag Artifact (Flechette) ------------------------------------------ -ACTOR ArtiPoisonBag : Inventory 8000 native +ACTOR ArtiPoisonBag : Inventory native { - Game Hexen - SpawnID 72 +FLOATBOB Inventory.DefMaxAmount Inventory.PickupFlash "PickupFlash" @@ -189,9 +185,8 @@ ACTOR PoisonCloud native // Poison Shroom ------------------------------------------------------------ -ACTOR ZPoisonShroom : PoisonBag 8104 +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 6be4a749f..e297cc289 100644 --- a/wadsrc/static/actors/hexen/flies.txt +++ b/wadsrc/static/actors/hexen/flies.txt @@ -1,9 +1,8 @@ // Buzzy fly ---------------------------------------------------------------- -ACTOR LittleFly 112 +ACTOR LittleFly { - Game Hexen +NOBLOCKMAP +NOGRAVITY +CANPASS diff --git a/wadsrc/static/actors/hexen/fog.txt b/wadsrc/static/actors/hexen/fog.txt index 91fdfc3ee..1689b5061 100644 --- a/wadsrc/static/actors/hexen/fog.txt +++ b/wadsrc/static/actors/hexen/fog.txt @@ -1,9 +1,8 @@ // Fog Spawner -------------------------------------------------------------- -ACTOR FogSpawner 10000 +ACTOR FogSpawner { - Game Hexen +NOSECTOR +NOBLOCKMAP +FLOATBOB +NOGRAVITY @@ -21,9 +20,8 @@ ACTOR FogSpawner 10000 // Small Fog Patch ---------------------------------------------------------- -ACTOR FogPatchSmall 10001 +ACTOR FogPatchSmall { - Game Hexen Speed 1 +NOBLOCKMAP +NOGRAVITY +NOCLIP +FLOAT +NOTELEPORT @@ -45,9 +43,8 @@ ACTOR FogPatchSmall 10001 // Medium Fog Patch --------------------------------------------------------- -ACTOR FogPatchMedium : FogPatchSmall 10002 +ACTOR FogPatchMedium : FogPatchSmall { - Game Hexen States { Spawn: @@ -61,9 +58,8 @@ ACTOR FogPatchMedium : FogPatchSmall 10002 // Large Fog Patch ---------------------------------------------------------- -ACTOR FogPatchLarge : FogPatchMedium 10003 +ACTOR FogPatchLarge : FogPatchMedium { - Game Hexen States { Spawn: diff --git a/wadsrc/static/actors/hexen/healingradius.txt b/wadsrc/static/actors/hexen/healingradius.txt index e0556915b..04187c898 100644 --- a/wadsrc/static/actors/hexen/healingradius.txt +++ b/wadsrc/static/actors/hexen/healingradius.txt @@ -1,9 +1,8 @@ // Healing Radius Artifact -------------------------------------------------- -ACTOR ArtiHealingRadius : Inventory 10120 native +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 5a77240fc..90f11bfb0 100644 --- a/wadsrc/static/actors/hexen/heresiarch.txt +++ b/wadsrc/static/actors/hexen/heresiarch.txt @@ -1,9 +1,8 @@ // The Heresiarch him/itself ------------------------------------------------ -ACTOR Heresiarch 10080 native +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 8aa830654..97b9e0266 100644 --- a/wadsrc/static/actors/hexen/hexenarmor.txt +++ b/wadsrc/static/actors/hexen/hexenarmor.txt @@ -1,10 +1,8 @@ // Mesh Armor (1) ----------------------------------------------------------- -ACTOR MeshArmor : HexenArmor 8005 +ACTOR MeshArmor : HexenArmor { - Game Hexen - SpawnID 68 +NOGRAVITY Health 0 // Armor class Inventory.Amount 0 @@ -19,10 +17,8 @@ ACTOR MeshArmor : HexenArmor 8005 // Falcon Shield (2) -------------------------------------------------------- -ACTOR FalconShield : HexenArmor 8006 +ACTOR FalconShield : HexenArmor { - Game Hexen - SpawnID 69 +NOGRAVITY Health 1 // Armor class Inventory.Amount 0 @@ -37,10 +33,8 @@ ACTOR FalconShield : HexenArmor 8006 // Platinum Helm (3) -------------------------------------------------------- -ACTOR PlatinumHelm : HexenArmor 8007 +ACTOR PlatinumHelm : HexenArmor { - Game Hexen - SpawnID 70 +NOGRAVITY Health 2 // Armor class Inventory.Amount 0 @@ -55,10 +49,8 @@ ACTOR PlatinumHelm : HexenArmor 8007 // Amulet of Warding (4) ---------------------------------------------------- -ACTOR AmuletOfWarding : HexenArmor 8008 +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 572c29568..4fd673a44 100644 --- a/wadsrc/static/actors/hexen/hexendecorations.txt +++ b/wadsrc/static/actors/hexen/hexendecorations.txt @@ -1,6 +1,5 @@ -ACTOR ZWingedStatue 5 +ACTOR ZWingedStatue { - Game Hexen Radius 10 Height 62 +SOLID @@ -12,9 +11,8 @@ ACTOR ZWingedStatue 5 } } -ACTOR ZRock1 6 +ACTOR ZRock1 { - Game Hexen Radius 20 Height 16 States @@ -25,9 +23,8 @@ ACTOR ZRock1 6 } } -ACTOR ZRock2 7 +ACTOR ZRock2 { - Game Hexen Radius 20 Height 16 States @@ -38,9 +35,8 @@ ACTOR ZRock2 7 } } -ACTOR ZRock3 9 +ACTOR ZRock3 { - Game Hexen Radius 20 Height 16 States @@ -51,9 +47,8 @@ ACTOR ZRock3 9 } } -ACTOR ZRock4 15 +ACTOR ZRock4 { - Game Hexen Radius 20 Height 16 States @@ -64,9 +59,8 @@ ACTOR ZRock4 15 } } -ACTOR ZChandelier 17 +ACTOR ZChandelier { - Game Hexen Radius 20 Height 60 +SPAWNCEILING @@ -79,9 +73,8 @@ ACTOR ZChandelier 17 } } -ACTOR ZChandelierUnlit 8063 +ACTOR ZChandelierUnlit { - Game Hexen Radius 20 Height 60 +SPAWNCEILING @@ -94,9 +87,8 @@ ACTOR ZChandelierUnlit 8063 } } -ACTOR ZTreeDead 24 +ACTOR ZTreeDead { - Game Hexen Radius 10 Height 96 +SOLID @@ -108,9 +100,8 @@ ACTOR ZTreeDead 24 } } -ACTOR ZTree 25 +ACTOR ZTree { - Game Hexen Radius 15 Height 128 +SOLID @@ -122,9 +113,8 @@ ACTOR ZTree 25 } } -ACTOR ZTreeSwamp150 26 +ACTOR ZTreeSwamp150 { - Game Hexen Radius 10 Height 150 +SOLID @@ -136,9 +126,8 @@ ACTOR ZTreeSwamp150 26 } } -ACTOR ZTreeSwamp120 27 +ACTOR ZTreeSwamp120 { - Game Hexen Radius 10 Height 120 +SOLID @@ -150,9 +139,8 @@ ACTOR ZTreeSwamp120 27 } } -ACTOR ZStumpBurned 28 +ACTOR ZStumpBurned { - Game Hexen Radius 12 Height 20 +SOLID @@ -164,9 +152,8 @@ ACTOR ZStumpBurned 28 } } -ACTOR ZStumpBare 29 +ACTOR ZStumpBare { - Game Hexen Radius 12 Height 20 +SOLID @@ -178,9 +165,8 @@ ACTOR ZStumpBare 29 } } -ACTOR ZStumpSwamp1 37 +ACTOR ZStumpSwamp1 { - Game Hexen Radius 20 Height 16 States @@ -191,9 +177,8 @@ ACTOR ZStumpSwamp1 37 } } -ACTOR ZStumpSwamp2 38 +ACTOR ZStumpSwamp2 { - Game Hexen Radius 20 Height 16 States @@ -204,9 +189,8 @@ ACTOR ZStumpSwamp2 38 } } -ACTOR ZShroomLarge1 39 +ACTOR ZShroomLarge1 { - Game Hexen Radius 20 Height 16 States @@ -217,9 +201,8 @@ ACTOR ZShroomLarge1 39 } } -ACTOR ZShroomLarge2 40 +ACTOR ZShroomLarge2 { - Game Hexen Radius 20 Height 16 States @@ -230,9 +213,8 @@ ACTOR ZShroomLarge2 40 } } -ACTOR ZShroomLarge3 41 +ACTOR ZShroomLarge3 { - Game Hexen Radius 20 Height 16 States @@ -243,9 +225,8 @@ ACTOR ZShroomLarge3 41 } } -ACTOR ZShroomSmall1 42 +ACTOR ZShroomSmall1 { - Game Hexen Radius 20 Height 16 States @@ -256,9 +237,8 @@ ACTOR ZShroomSmall1 42 } } -ACTOR ZShroomSmall2 44 +ACTOR ZShroomSmall2 { - Game Hexen Radius 20 Height 16 States @@ -269,9 +249,8 @@ ACTOR ZShroomSmall2 44 } } -ACTOR ZShroomSmall3 45 +ACTOR ZShroomSmall3 { - Game Hexen Radius 20 Height 16 States @@ -282,9 +261,8 @@ ACTOR ZShroomSmall3 45 } } -ACTOR ZShroomSmall4 46 +ACTOR ZShroomSmall4 { - Game Hexen Radius 20 Height 16 States @@ -295,9 +273,8 @@ ACTOR ZShroomSmall4 46 } } -ACTOR ZShroomSmall5 47 +ACTOR ZShroomSmall5 { - Game Hexen Radius 20 Height 16 States @@ -308,9 +285,8 @@ ACTOR ZShroomSmall5 47 } } -ACTOR ZStalagmitePillar 48 +ACTOR ZStalagmitePillar { - Game Hexen Radius 8 Height 138 +SOLID @@ -322,9 +298,8 @@ ACTOR ZStalagmitePillar 48 } } -ACTOR ZStalagmiteLarge 49 +ACTOR ZStalagmiteLarge { - Game Hexen Radius 8 Height 48 +SOLID @@ -336,9 +311,8 @@ ACTOR ZStalagmiteLarge 49 } } -ACTOR ZStalagmiteMedium 50 +ACTOR ZStalagmiteMedium { - Game Hexen Radius 6 Height 40 +SOLID @@ -350,9 +324,8 @@ ACTOR ZStalagmiteMedium 50 } } -ACTOR ZStalagmiteSmall 51 +ACTOR ZStalagmiteSmall { - Game Hexen Radius 8 Height 36 +SOLID @@ -364,9 +337,8 @@ ACTOR ZStalagmiteSmall 51 } } -ACTOR ZStalactiteLarge 52 +ACTOR ZStalactiteLarge { - Game Hexen Radius 8 Height 66 +SOLID @@ -380,9 +352,8 @@ ACTOR ZStalactiteLarge 52 } } -ACTOR ZStalactiteMedium 56 +ACTOR ZStalactiteMedium { - Game Hexen Radius 6 Height 50 +SOLID @@ -396,9 +367,8 @@ ACTOR ZStalactiteMedium 56 } } -ACTOR ZStalactiteSmall 57 +ACTOR ZStalactiteSmall { - Game Hexen Radius 8 Height 40 +SOLID @@ -412,9 +382,8 @@ ACTOR ZStalactiteSmall 57 } } -ACTOR ZMossCeiling1 58 +ACTOR ZMossCeiling1 { - Game Hexen Radius 20 Height 20 +SPAWNCEILING @@ -427,9 +396,8 @@ ACTOR ZMossCeiling1 58 } } -ACTOR ZMossCeiling2 59 +ACTOR ZMossCeiling2 { - Game Hexen Radius 20 Height 24 +SPAWNCEILING @@ -442,9 +410,8 @@ ACTOR ZMossCeiling2 59 } } -ACTOR ZSwampVine 60 +ACTOR ZSwampVine { - Game Hexen Radius 8 Height 52 +SOLID @@ -456,9 +423,8 @@ ACTOR ZSwampVine 60 } } -ACTOR ZCorpseKabob 61 +ACTOR ZCorpseKabob { - Game Hexen Radius 10 Height 92 +SOLID @@ -470,9 +436,8 @@ ACTOR ZCorpseKabob 61 } } -ACTOR ZCorpseSleeping 62 +ACTOR ZCorpseSleeping { - Game Hexen Radius 20 Height 16 States @@ -483,9 +448,8 @@ ACTOR ZCorpseSleeping 62 } } -ACTOR ZTombstoneRIP 63 +ACTOR ZTombstoneRIP { - Game Hexen Radius 10 Height 46 +SOLID @@ -497,9 +461,8 @@ ACTOR ZTombstoneRIP 63 } } -ACTOR ZTombstoneShane 64 +ACTOR ZTombstoneShane { - Game Hexen Radius 10 Height 46 +SOLID @@ -511,9 +474,8 @@ ACTOR ZTombstoneShane 64 } } -ACTOR ZTombstoneBigCross 65 +ACTOR ZTombstoneBigCross { - Game Hexen Radius 10 Height 46 +SOLID @@ -525,9 +487,8 @@ ACTOR ZTombstoneBigCross 65 } } -ACTOR ZTombstoneBrianR 66 +ACTOR ZTombstoneBrianR { - Game Hexen Radius 10 Height 52 +SOLID @@ -539,9 +500,8 @@ ACTOR ZTombstoneBrianR 66 } } -ACTOR ZTombstoneCrossCircle 67 +ACTOR ZTombstoneCrossCircle { - Game Hexen Radius 10 Height 52 +SOLID @@ -553,9 +513,8 @@ ACTOR ZTombstoneCrossCircle 67 } } -ACTOR ZTombstoneSmallCross 68 +ACTOR ZTombstoneSmallCross { - Game Hexen Radius 8 Height 46 +SOLID @@ -567,9 +526,8 @@ ACTOR ZTombstoneSmallCross 68 } } -ACTOR ZTombstoneBrianP 69 +ACTOR ZTombstoneBrianP { - Game Hexen Radius 8 Height 46 +SOLID @@ -581,9 +539,8 @@ ACTOR ZTombstoneBrianP 69 } } -ACTOR ZCorpseHanging 71 +ACTOR ZCorpseHanging { - Game Hexen Radius 6 Height 75 +SOLID @@ -597,9 +554,8 @@ ACTOR ZCorpseHanging 71 } } -ACTOR ZStatueGargoyleGreenTall 72 +ACTOR ZStatueGargoyleGreenTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -611,9 +567,8 @@ ACTOR ZStatueGargoyleGreenTall 72 } } -ACTOR ZStatueGargoyleBlueTall 73 +ACTOR ZStatueGargoyleBlueTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -625,9 +580,8 @@ ACTOR ZStatueGargoyleBlueTall 73 } } -ACTOR ZStatueGargoyleGreenShort 74 +ACTOR ZStatueGargoyleGreenShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -639,9 +593,8 @@ ACTOR ZStatueGargoyleGreenShort 74 } } -ACTOR ZStatueGargoyleBlueShort 76 +ACTOR ZStatueGargoyleBlueShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -653,9 +606,8 @@ ACTOR ZStatueGargoyleBlueShort 76 } } -ACTOR ZStatueGargoyleStripeTall 8044 +ACTOR ZStatueGargoyleStripeTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -667,9 +619,8 @@ ACTOR ZStatueGargoyleStripeTall 8044 } } -ACTOR ZStatueGargoyleDarkRedTall 8045 +ACTOR ZStatueGargoyleDarkRedTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -681,9 +632,8 @@ ACTOR ZStatueGargoyleDarkRedTall 8045 } } -ACTOR ZStatueGargoyleRedTall 8046 +ACTOR ZStatueGargoyleRedTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -695,9 +645,8 @@ ACTOR ZStatueGargoyleRedTall 8046 } } -ACTOR ZStatueGargoyleTanTall 8047 +ACTOR ZStatueGargoyleTanTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -709,9 +658,8 @@ ACTOR ZStatueGargoyleTanTall 8047 } } -ACTOR ZStatueGargoyleRustTall 8048 +ACTOR ZStatueGargoyleRustTall { - Game Hexen Radius 14 Height 108 +SOLID @@ -723,9 +671,8 @@ ACTOR ZStatueGargoyleRustTall 8048 } } -ACTOR ZStatueGargoyleDarkRedShort 8049 +ACTOR ZStatueGargoyleDarkRedShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -737,9 +684,8 @@ ACTOR ZStatueGargoyleDarkRedShort 8049 } } -ACTOR ZStatueGargoyleRedShort 8050 +ACTOR ZStatueGargoyleRedShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -751,9 +697,8 @@ ACTOR ZStatueGargoyleRedShort 8050 } } -ACTOR ZStatueGargoyleTanShort 8051 +ACTOR ZStatueGargoyleTanShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -765,9 +710,8 @@ ACTOR ZStatueGargoyleTanShort 8051 } } -ACTOR ZStatueGargoyleRustShort 8052 +ACTOR ZStatueGargoyleRustShort { - Game Hexen Radius 14 Height 62 +SOLID @@ -779,9 +723,8 @@ ACTOR ZStatueGargoyleRustShort 8052 } } -ACTOR ZBannerTattered 77 +ACTOR ZBannerTattered { - Game Hexen Radius 8 Height 120 +SOLID @@ -793,9 +736,8 @@ ACTOR ZBannerTattered 77 } } -ACTOR ZTreeLarge1 78 +ACTOR ZTreeLarge1 { - Game Hexen Radius 15 Height 180 +SOLID @@ -807,9 +749,8 @@ ACTOR ZTreeLarge1 78 } } -ACTOR ZTreeLarge2 79 +ACTOR ZTreeLarge2 { - Game Hexen Radius 15 Height 180 +SOLID @@ -821,9 +762,8 @@ ACTOR ZTreeLarge2 79 } } -ACTOR ZTreeGnarled1 80 +ACTOR ZTreeGnarled1 { - Game Hexen Radius 22 Height 100 +SOLID @@ -835,9 +775,8 @@ ACTOR ZTreeGnarled1 80 } } -ACTOR ZTreeGnarled2 87 +ACTOR ZTreeGnarled2 { - Game Hexen Radius 22 Height 100 +SOLID @@ -849,9 +788,8 @@ ACTOR ZTreeGnarled2 87 } } -ACTOR ZLog 88 +ACTOR ZLog { - Game Hexen Radius 20 Height 25 +SOLID @@ -863,9 +801,8 @@ ACTOR ZLog 88 } } -ACTOR ZStalactiteIceLarge 89 +ACTOR ZStalactiteIceLarge { - Game Hexen Radius 8 Height 66 +SOLID @@ -879,9 +816,8 @@ ACTOR ZStalactiteIceLarge 89 } } -ACTOR ZStalactiteIceMedium 90 +ACTOR ZStalactiteIceMedium { - Game Hexen Radius 5 Height 50 +SOLID @@ -895,9 +831,8 @@ ACTOR ZStalactiteIceMedium 90 } } -ACTOR ZStalactiteIceSmall 91 +ACTOR ZStalactiteIceSmall { - Game Hexen Radius 4 Height 32 +SOLID @@ -911,9 +846,8 @@ ACTOR ZStalactiteIceSmall 91 } } -ACTOR ZStalactiteIceTiny 92 +ACTOR ZStalactiteIceTiny { - Game Hexen Radius 4 Height 8 +SOLID @@ -927,9 +861,8 @@ ACTOR ZStalactiteIceTiny 92 } } -ACTOR ZStalagmiteIceLarge 93 +ACTOR ZStalagmiteIceLarge { - Game Hexen Radius 8 Height 66 +SOLID @@ -941,9 +874,8 @@ ACTOR ZStalagmiteIceLarge 93 } } -ACTOR ZStalagmiteIceMedium 94 +ACTOR ZStalagmiteIceMedium { - Game Hexen Radius 5 Height 50 +SOLID @@ -955,9 +887,8 @@ ACTOR ZStalagmiteIceMedium 94 } } -ACTOR ZStalagmiteIceSmall 95 +ACTOR ZStalagmiteIceSmall { - Game Hexen Radius 4 Height 32 +SOLID @@ -969,9 +900,8 @@ ACTOR ZStalagmiteIceSmall 95 } } -ACTOR ZStalagmiteIceTiny 96 +ACTOR ZStalagmiteIceTiny { - Game Hexen Radius 4 Height 8 +SOLID @@ -983,9 +913,8 @@ ACTOR ZStalagmiteIceTiny 96 } } -ACTOR ZRockBrown1 97 +ACTOR ZRockBrown1 { - Game Hexen Radius 17 Height 72 +SOLID @@ -997,9 +926,8 @@ ACTOR ZRockBrown1 97 } } -ACTOR ZRockBrown2 98 +ACTOR ZRockBrown2 { - Game Hexen Radius 15 Height 50 +SOLID @@ -1011,9 +939,8 @@ ACTOR ZRockBrown2 98 } } -ACTOR ZRockBlack 99 +ACTOR ZRockBlack { - Game Hexen Radius 20 Height 40 +SOLID @@ -1025,9 +952,8 @@ ACTOR ZRockBlack 99 } } -ACTOR ZRubble1 100 +ACTOR ZRubble1 { - Game Hexen Radius 20 Height 16 States @@ -1038,9 +964,8 @@ ACTOR ZRubble1 100 } } -ACTOR ZRubble2 101 +ACTOR ZRubble2 { - Game Hexen Radius 20 Height 16 States @@ -1051,9 +976,8 @@ ACTOR ZRubble2 101 } } -ACTOR ZRubble3 102 +ACTOR ZRubble3 { - Game Hexen Radius 20 Height 16 States @@ -1064,9 +988,8 @@ ACTOR ZRubble3 102 } } -ACTOR ZVasePillar 103 +ACTOR ZVasePillar { - Game Hexen Radius 12 Height 54 +SOLID @@ -1078,9 +1001,8 @@ ACTOR ZVasePillar 103 } } -ACTOR ZCorpseLynched 108 +ACTOR ZCorpseLynched { - Game Hexen Radius 11 Height 95 +SOLID @@ -1094,9 +1016,8 @@ ACTOR ZCorpseLynched 108 } } -ACTOR ZCandle 119 +ACTOR ZCandle { - Game Hexen Radius 20 Height 16 +NOGRAVITY @@ -1109,9 +1030,8 @@ ACTOR ZCandle 119 } } -ACTOR ZBarrel 8100 +ACTOR ZBarrel { - Game Hexen Radius 15 Height 32 +SOLID @@ -1123,9 +1043,8 @@ ACTOR ZBarrel 8100 } } -ACTOR ZBucket 8103 +ACTOR ZBucket { - Game Hexen Radius 8 Height 72 +SOLID @@ -1139,9 +1058,8 @@ ACTOR ZBucket 8103 } } -ACTOR FireThing 8060 +ACTOR FireThing { - Game Hexen Radius 5 Height 10 +SOLID @@ -1161,9 +1079,8 @@ ACTOR FireThing 8060 } } -ACTOR BrassTorch 8061 +ACTOR BrassTorch { - Game Hexen Radius 6 Height 35 +SOLID @@ -1175,9 +1092,8 @@ ACTOR BrassTorch 8061 } } -ACTOR ZBlueCandle 8066 +ACTOR ZBlueCandle { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1189,9 +1105,8 @@ ACTOR ZBlueCandle 8066 } } -ACTOR ZIronMaiden 8067 +ACTOR ZIronMaiden { - Game Hexen Radius 12 Height 60 +SOLID @@ -1203,9 +1118,8 @@ ACTOR ZIronMaiden 8067 } } -ACTOR ZChainBit32 8071 +ACTOR ZChainBit32 { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1219,9 +1133,8 @@ ACTOR ZChainBit32 8071 } } -ACTOR ZChainBit64 8072 +ACTOR ZChainBit64 { - Game Hexen Radius 4 Height 64 +SPAWNCEILING @@ -1235,9 +1148,8 @@ ACTOR ZChainBit64 8072 } } -ACTOR ZChainEndHeart 8073 +ACTOR ZChainEndHeart { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1251,9 +1163,8 @@ ACTOR ZChainEndHeart 8073 } } -ACTOR ZChainEndHook1 8074 +ACTOR ZChainEndHook1 { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1267,9 +1178,8 @@ ACTOR ZChainEndHook1 8074 } } -ACTOR ZChainEndHook2 8075 +ACTOR ZChainEndHook2 { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1283,9 +1193,8 @@ ACTOR ZChainEndHook2 8075 } } -ACTOR ZChainEndSpike 8076 +ACTOR ZChainEndSpike { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1299,9 +1208,8 @@ ACTOR ZChainEndSpike 8076 } } -ACTOR ZChainEndSkull 8077 +ACTOR ZChainEndSkull { - Game Hexen Radius 4 Height 32 +SPAWNCEILING @@ -1315,9 +1223,8 @@ ACTOR ZChainEndSkull 8077 } } -ACTOR TableShit1 8500 +ACTOR TableShit1 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1329,9 +1236,8 @@ ACTOR TableShit1 8500 } } -ACTOR TableShit2 8501 +ACTOR TableShit2 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1343,9 +1249,8 @@ ACTOR TableShit2 8501 } } -ACTOR TableShit3 8502 +ACTOR TableShit3 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1357,9 +1262,8 @@ ACTOR TableShit3 8502 } } -ACTOR TableShit4 8503 +ACTOR TableShit4 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1371,9 +1275,8 @@ ACTOR TableShit4 8503 } } -ACTOR TableShit5 8504 +ACTOR TableShit5 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1385,9 +1288,8 @@ ACTOR TableShit5 8504 } } -ACTOR TableShit6 8505 +ACTOR TableShit6 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1399,9 +1301,8 @@ ACTOR TableShit6 8505 } } -ACTOR TableShit7 8506 +ACTOR TableShit7 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1413,9 +1314,8 @@ ACTOR TableShit7 8506 } } -ACTOR TableShit8 8507 +ACTOR TableShit8 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1427,9 +1327,8 @@ ACTOR TableShit8 8507 } } -ACTOR TableShit9 8508 +ACTOR TableShit9 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1441,9 +1340,8 @@ ACTOR TableShit9 8508 } } -ACTOR TableShit10 8509 +ACTOR TableShit10 { - Game Hexen Radius 20 Height 16 +NOBLOCKMAP @@ -1455,9 +1353,8 @@ ACTOR TableShit10 8509 } } -ACTOR TeleSmoke 140 +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 e58693e69..54e0a52ec 100644 --- a/wadsrc/static/actors/hexen/hexenkeys.txt +++ b/wadsrc/static/actors/hexen/hexenkeys.txt @@ -5,10 +5,8 @@ ACTOR HexenKey : Key Height 20 } -ACTOR KeySteel : HexenKey 8030 +ACTOR KeySteel : HexenKey { - Game Hexen - SpawnID 85 Inventory.Icon KEYSLOT1 Inventory.PickupMessage "$TXT_KEY_STEEL" States @@ -19,10 +17,8 @@ ACTOR KeySteel : HexenKey 8030 } } -ACTOR KeyCave : HexenKey 8031 +ACTOR KeyCave : HexenKey { - Game Hexen - SpawnID 86 Inventory.Icon KEYSLOT2 Inventory.PickupMessage "$TXT_KEY_CAVE" States @@ -33,10 +29,8 @@ ACTOR KeyCave : HexenKey 8031 } } -ACTOR KeyAxe : HexenKey 8032 +ACTOR KeyAxe : HexenKey { - Game Hexen - SpawnID 87 Inventory.Icon KEYSLOT3 Inventory.PickupMessage "$TXT_KEY_AXE" States @@ -47,10 +41,8 @@ ACTOR KeyAxe : HexenKey 8032 } } -ACTOR KeyFire : HexenKey 8033 +ACTOR KeyFire : HexenKey { - Game Hexen - SpawnID 88 Inventory.Icon KEYSLOT4 Inventory.PickupMessage "$TXT_KEY_FIRE" States @@ -61,10 +53,8 @@ ACTOR KeyFire : HexenKey 8033 } } -ACTOR KeyEmerald : HexenKey 8034 +ACTOR KeyEmerald : HexenKey { - Game Hexen - SpawnID 89 Inventory.Icon KEYSLOT5 Inventory.PickupMessage "$TXT_KEY_EMERALD" States @@ -75,10 +65,8 @@ ACTOR KeyEmerald : HexenKey 8034 } } -ACTOR KeyDungeon : HexenKey 8035 +ACTOR KeyDungeon : HexenKey { - Game Hexen - SpawnID 90 Inventory.Icon KEYSLOT6 Inventory.PickupMessage "$TXT_KEY_DUNGEON" States @@ -89,10 +77,8 @@ ACTOR KeyDungeon : HexenKey 8035 } } -ACTOR KeySilver : HexenKey 8036 +ACTOR KeySilver : HexenKey { - Game Hexen - SpawnID 91 Inventory.Icon KEYSLOT7 Inventory.PickupMessage "$TXT_KEY_SILVER" States @@ -103,10 +89,8 @@ ACTOR KeySilver : HexenKey 8036 } } -ACTOR KeyRusted : HexenKey 8037 +ACTOR KeyRusted : HexenKey { - Game Hexen - SpawnID 92 Inventory.Icon KEYSLOT8 Inventory.PickupMessage "$TXT_KEY_RUSTED" States @@ -117,10 +101,8 @@ ACTOR KeyRusted : HexenKey 8037 } } -ACTOR KeyHorn : HexenKey 8038 +ACTOR KeyHorn : HexenKey { - Game Hexen - SpawnID 93 Inventory.Icon KEYSLOT9 Inventory.PickupMessage "$TXT_KEY_HORN" States @@ -131,10 +113,8 @@ ACTOR KeyHorn : HexenKey 8038 } } -ACTOR KeySwamp : HexenKey 8039 +ACTOR KeySwamp : HexenKey { - Game Hexen - SpawnID 94 Inventory.Icon KEYSLOTA Inventory.PickupMessage "$TXT_KEY_SWAMP" States @@ -145,9 +125,8 @@ ACTOR KeySwamp : HexenKey 8039 } } -ACTOR KeyCastle : HexenKey 8200 +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 e36451e7f..33ce577c7 100644 --- a/wadsrc/static/actors/hexen/hexenspecialdecs.txt +++ b/wadsrc/static/actors/hexen/hexenspecialdecs.txt @@ -1,9 +1,8 @@ // Winged Statue (no skull) ------------------------------------------------- -ACTOR ZWingedStatueNoSkull : SwitchingDecoration 9011 +ACTOR ZWingedStatueNoSkull : SwitchingDecoration { - Game Hexen Radius 10 Height 62 +SOLID @@ -21,9 +20,8 @@ ACTOR ZWingedStatueNoSkull : SwitchingDecoration 9011 // Gem pedestal ------------------------------------------------------------- -ACTOR ZGemPedestal : SwitchingDecoration 9012 +ACTOR ZGemPedestal : SwitchingDecoration { - Game Hexen Radius 10 Height 40 +SOLID @@ -41,9 +39,8 @@ ACTOR ZGemPedestal : SwitchingDecoration 9012 // Tree (destructible) ------------------------------------------------------ -ACTOR TreeDestructible 8062 +ACTOR TreeDestructible { - Game Hexen Health 70 Radius 15 Height 180 @@ -77,9 +74,8 @@ ACTOR TreeDestructible 8062 // Pottery1 ------------------------------------------------------------------ -ACTOR Pottery1 104 native +ACTOR Pottery1 native { - Game Hexen Health 15 Speed 10 Height 32 @@ -102,9 +98,8 @@ ACTOR Pottery1 104 native // Pottery2 ----------------------------------------------------------------- -ACTOR Pottery2 : Pottery1 105 +ACTOR Pottery2 : Pottery1 { - Game Hexen Height 25 States { @@ -116,9 +111,8 @@ ACTOR Pottery2 : Pottery1 105 // Pottery3 ----------------------------------------------------------------- -ACTOR Pottery3 : Pottery1 106 +ACTOR Pottery3 : Pottery1 { - Game Hexen Height 25 States { @@ -175,9 +169,8 @@ ACTOR PotteryBit // Blood pool --------------------------------------------------------------- -ACTOR BloodPool 111 +ACTOR BloodPool { - Game Hexen States { Spawn: @@ -189,9 +182,8 @@ ACTOR BloodPool 111 // Lynched corpse (no heart) ------------------------------------------------ -ACTOR ZCorpseLynchedNoHeart 109 native +ACTOR ZCorpseLynchedNoHeart native { - Game Hexen Radius 10 Height 100 +SOLID +SPAWNCEILING +NOGRAVITY @@ -255,9 +247,8 @@ ACTOR CorpseBit // Corpse (sitting, splatterable) ------------------------------------------- -ACTOR ZCorpseSitting 110 +ACTOR ZCorpseSitting { - Game Hexen Health 30 Radius 15 Height 35 @@ -281,9 +272,8 @@ ACTOR ZCorpseSitting 110 // Leaf Spawner ------------------------------------------------------------- -ACTOR LeafSpawner 113 +ACTOR LeafSpawner { - Game Hexen +NOBLOCKMAP +NOSECTOR +INVISIBLE @@ -357,9 +347,8 @@ ACTOR Leaf2 : Leaf1 // Twined torch ------------------------------------------------------------- -ACTOR ZTwinedTorch : SwitchableDecoration 116 +ACTOR ZTwinedTorch : SwitchableDecoration { - Game Hexen Radius 10 Height 64 +SOLID @@ -376,9 +365,8 @@ ACTOR ZTwinedTorch : SwitchableDecoration 116 } } -ACTOR ZTwinedTorchUnlit : ZTwinedTorch 117 +ACTOR ZTwinedTorchUnlit : ZTwinedTorch { - Game Hexen States { Spawn: @@ -389,9 +377,8 @@ ACTOR ZTwinedTorchUnlit : ZTwinedTorch 117 // Wall torch --------------------------------------------------------------- -ACTOR ZWallTorch : SwitchableDecoration 54 +ACTOR ZWallTorch : SwitchableDecoration { - Game Hexen +NOBLOCKMAP +NOGRAVITY +FIXMAPTHINGPOS @@ -409,9 +396,8 @@ ACTOR ZWallTorch : SwitchableDecoration 54 } } -ACTOR ZWallTorchUnlit : ZWallTorch 55 +ACTOR ZWallTorchUnlit : ZWallTorch { - Game Hexen States { Spawn: @@ -422,9 +408,8 @@ ACTOR ZWallTorchUnlit : ZWallTorch 55 // Shrub1 ------------------------------------------------------------------- -ACTOR ZShrub1 8101 +ACTOR ZShrub1 { - Game Hexen Radius 8 Height 24 Health 20 @@ -447,9 +432,8 @@ ACTOR ZShrub1 8101 // Shrub2 ------------------------------------------------------------------- -ACTOR ZShrub2 8102 +ACTOR ZShrub2 { - Game Hexen Radius 16 Height 40 Health 20 @@ -473,9 +457,8 @@ ACTOR ZShrub2 8102 // Fire Bull ---------------------------------------------------------------- -ACTOR ZFireBull : SwitchableDecoration 8042 +ACTOR ZFireBull : SwitchableDecoration { - Game Hexen Radius 20 Height 80 +SOLID @@ -494,9 +477,8 @@ ACTOR ZFireBull : SwitchableDecoration 8042 } } -ACTOR ZFireBullUnlit : ZFireBull 8043 +ACTOR ZFireBullUnlit : ZFireBull { - Game Hexen States { Spawn: @@ -507,9 +489,8 @@ ACTOR ZFireBullUnlit : ZFireBull 8043 // Suit of armor ------------------------------------------------------------ -ACTOR ZSuitOfArmor 8064 +ACTOR ZSuitOfArmor { - Game Hexen Health 60 Radius 16 Height 72 @@ -567,9 +548,8 @@ ACTOR ZArmorChunk // Bell --------------------------------------------------------------------- -ACTOR ZBell 8065 native +ACTOR ZBell native { - Game Hexen Health 5 Radius 56 Height 120 @@ -627,9 +607,8 @@ ACTOR ZBell 8065 native // "Christmas" Tree --------------------------------------------------------- -ACTOR ZXmasTree 8068 +ACTOR ZXmasTree { - Game Hexen Radius 11 Height 130 Health 20 @@ -658,9 +637,8 @@ ACTOR ZXmasTree 8068 // Cauldron ----------------------------------------------------------------- -ACTOR ZCauldron : SwitchableDecoration 8069 +ACTOR ZCauldron : SwitchableDecoration { - Game Hexen Radius 12 Height 26 +SOLID @@ -677,9 +655,8 @@ ACTOR ZCauldron : SwitchableDecoration 8069 } } -ACTOR ZCauldronUnlit : ZCauldron 8070 +ACTOR ZCauldronUnlit : ZCauldron { - Game Hexen States { Spawn: @@ -692,8 +669,6 @@ ACTOR ZCauldronUnlit : ZCauldron 8070 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 0a5fdce3f..a972c48e0 100644 --- a/wadsrc/static/actors/hexen/iceguy.txt +++ b/wadsrc/static/actors/hexen/iceguy.txt @@ -1,10 +1,8 @@ // Ice Guy ------------------------------------------------------------------ -ACTOR IceGuy 8020 +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 3c857df95..e0d634bbe 100644 --- a/wadsrc/static/actors/hexen/korax.txt +++ b/wadsrc/static/actors/hexen/korax.txt @@ -1,6 +1,5 @@ -ACTOR Korax 10200 +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 7e11d2cd1..16aaee985 100644 --- a/wadsrc/static/actors/hexen/mageboss.txt +++ b/wadsrc/static/actors/hexen/mageboss.txt @@ -1,9 +1,8 @@ // Mage Boss (Menelkir) ----------------------------------------------------- -ACTOR MageBoss 10102 +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 b5dfdb546..ac37f98b8 100644 --- a/wadsrc/static/actors/hexen/magecone.txt +++ b/wadsrc/static/actors/hexen/magecone.txt @@ -1,10 +1,8 @@ // The Mage's Frost Cone ---------------------------------------------------- -ACTOR MWeapFrost : MageWeapon 53 +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 85402f223..daf65df95 100644 --- a/wadsrc/static/actors/hexen/magelightning.txt +++ b/wadsrc/static/actors/hexen/magelightning.txt @@ -1,9 +1,8 @@ // The Mage's Lightning Arc of Death ---------------------------------------- -ACTOR MWeapLightning : MageWeapon 8040 +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 aa75ed446..4d56432bd 100644 --- a/wadsrc/static/actors/hexen/magestaff.txt +++ b/wadsrc/static/actors/hexen/magestaff.txt @@ -12,10 +12,8 @@ ACTOR MageWeaponPiece : WeaponPiece // Mage Weapon Piece 1 ------------------------------------------------------ -ACTOR MWeaponPiece1 : MageWeaponPiece 21 +ACTOR MWeaponPiece1 : MageWeaponPiece { - Game Hexen - SpawnID 37 WeaponPiece.Number 1 States { @@ -27,10 +25,8 @@ ACTOR MWeaponPiece1 : MageWeaponPiece 21 // Mage Weapon Piece 2 ------------------------------------------------------ -ACTOR MWeaponPiece2 : MageWeaponPiece 22 +ACTOR MWeaponPiece2 : MageWeaponPiece { - Game Hexen - SpawnID 38 WeaponPiece.Number 2 States { @@ -42,10 +38,8 @@ ACTOR MWeaponPiece2 : MageWeaponPiece 22 // Mage Weapon Piece 3 ------------------------------------------------------ -ACTOR MWeaponPiece3 : MageWeaponPiece 23 +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 ee7ddd37c..8123c3eb5 100644 --- a/wadsrc/static/actors/hexen/mana.txt +++ b/wadsrc/static/actors/hexen/mana.txt @@ -1,9 +1,7 @@ // Blue mana ---------------------------------------------------------------- -ACTOR Mana1 : Ammo 122 +ACTOR Mana1 : Ammo { - Game Hexen - SpawnID 11 Inventory.Amount 15 Inventory.MaxAmount 200 Ammo.BackpackAmount 15 @@ -23,10 +21,8 @@ ACTOR Mana1 : Ammo 122 // Green mana --------------------------------------------------------------- -ACTOR Mana2 : Ammo 124 +ACTOR Mana2 : Ammo { - Game Hexen - SpawnID 12 Inventory.Amount 15 Inventory.MaxAmount 200 Ammo.BackpackAmount 15 @@ -46,10 +42,8 @@ ACTOR Mana2 : Ammo 124 // Combined mana ------------------------------------------------------------ -ACTOR Mana3 : CustomInventory 8004 +ACTOR Mana3 : CustomInventory { - Game Hexen - SpawnID 75 Radius 8 Height 8 +FLOATBOB @@ -68,10 +62,8 @@ ACTOR Mana3 : CustomInventory 8004 // Boost Mana Artifact Krater of Might ------------------------------------ -ACTOR ArtiBoostMana : CustomInventory 8003 +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 dd15fc8fd..b28470580 100644 --- a/wadsrc/static/actors/hexen/puzzleitems.txt +++ b/wadsrc/static/actors/hexen/puzzleitems.txt @@ -1,10 +1,8 @@ // Yorick's Skull ----------------------------------------------------------- -ACTOR PuzzSkull : PuzzleItem 9002 +ACTOR PuzzSkull : PuzzleItem { - Game Hexen - SpawnID 76 PuzzleItem.Number 0 Inventory.Icon ARTISKLL Inventory.PickupMessage "$TXT_ARTIPUZZSKULL" @@ -20,10 +18,8 @@ ACTOR PuzzSkull : PuzzleItem 9002 // Heart of D'Sparil -------------------------------------------------------- -ACTOR PuzzGemBig : PuzzleItem 9003 +ACTOR PuzzGemBig : PuzzleItem { - Game Hexen - SpawnID 77 PuzzleItem.Number 1 Inventory.Icon ARTIBGEM Inventory.PickupMessage "$TXT_ARTIPUZZGEMBIG" @@ -38,10 +34,8 @@ ACTOR PuzzGemBig : PuzzleItem 9003 // Red Gem (Ruby Planet) ---------------------------------------------------- -ACTOR PuzzGemRed : PuzzleItem 9004 +ACTOR PuzzGemRed : PuzzleItem { - Game Hexen - SpawnID 78 PuzzleItem.Number 2 Inventory.Icon ARTIGEMR Inventory.PickupMessage "$TXT_ARTIPUZZGEMRED" @@ -57,10 +51,8 @@ ACTOR PuzzGemRed : PuzzleItem 9004 // Green Gem 1 (Emerald Planet) --------------------------------------------- -ACTOR PuzzGemGreen1 : PuzzleItem 9005 +ACTOR PuzzGemGreen1 : PuzzleItem { - Game Hexen - SpawnID 79 PuzzleItem.Number 3 Inventory.Icon ARTIGEMG Inventory.PickupMessage "$TXT_ARTIPUZZGEMGREEN1" @@ -76,10 +68,8 @@ ACTOR PuzzGemGreen1 : PuzzleItem 9005 // Green Gem 2 (Emerald Planet) --------------------------------------------- -ACTOR PuzzGemGreen2 : PuzzleItem 9009 +ACTOR PuzzGemGreen2 : PuzzleItem { - Game Hexen - SpawnID 80 PuzzleItem.Number 4 Inventory.Icon ARTIGMG2 Inventory.PickupMessage "$TXT_ARTIPUZZGEMGREEN2" @@ -95,10 +85,8 @@ ACTOR PuzzGemGreen2 : PuzzleItem 9009 // Blue Gem 1 (Sapphire Planet) --------------------------------------------- -ACTOR PuzzGemBlue1 : PuzzleItem 9006 +ACTOR PuzzGemBlue1 : PuzzleItem { - Game Hexen - SpawnID 81 PuzzleItem.Number 5 Inventory.Icon ARTIGEMB Inventory.PickupMessage "$TXT_ARTIPUZZGEMBLUE1" @@ -114,10 +102,8 @@ ACTOR PuzzGemBlue1 : PuzzleItem 9006 // Blue Gem 2 (Sapphire Planet) --------------------------------------------- -ACTOR PuzzGemBlue2 : PuzzleItem 9010 +ACTOR PuzzGemBlue2 : PuzzleItem { - Game Hexen - SpawnID 82 PuzzleItem.Number 6 Inventory.Icon ARTIGMB2 Inventory.PickupMessage "$TXT_ARTIPUZZGEMBLUE2" @@ -133,10 +119,8 @@ ACTOR PuzzGemBlue2 : PuzzleItem 9010 // Book 1 (Daemon Codex) ---------------------------------------------------- -ACTOR PuzzBook1 : PuzzleItem 9007 +ACTOR PuzzBook1 : PuzzleItem { - Game Hexen - SpawnID 83 PuzzleItem.Number 7 Inventory.Icon ARTIBOK1 Inventory.PickupMessage "$TXT_ARTIPUZZBOOK1" @@ -152,10 +136,8 @@ ACTOR PuzzBook1 : PuzzleItem 9007 // Book 2 (Liber Oscura) ---------------------------------------------------- -ACTOR PuzzBook2 : PuzzleItem 9008 +ACTOR PuzzBook2 : PuzzleItem { - Game Hexen - SpawnID 84 PuzzleItem.Number 8 Inventory.Icon ARTIBOK2 Inventory.PickupMessage "$TXT_ARTIPUZZBOOK2" @@ -172,9 +154,8 @@ ACTOR PuzzBook2 : PuzzleItem 9008 // Flame Mask --------------------------------------------------------------- -ACTOR PuzzFlameMask : PuzzleItem 9014 +ACTOR PuzzFlameMask : PuzzleItem { - Game Hexen PuzzleItem.Number 9 Inventory.Icon ARTISKL2 Inventory.PickupMessage "$TXT_ARTIPUZZSKULL2" @@ -189,9 +170,8 @@ ACTOR PuzzFlameMask : PuzzleItem 9014 // Fighter Weapon (Glaive Seal) --------------------------------------------- -ACTOR PuzzFWeapon : PuzzleItem 9015 +ACTOR PuzzFWeapon : PuzzleItem { - Game Hexen PuzzleItem.Number 10 Inventory.Icon ARTIFWEP Inventory.PickupMessage "$TXT_ARTIPUZZFWEAPON" @@ -207,9 +187,8 @@ ACTOR PuzzFWeapon : PuzzleItem 9015 // Cleric Weapon (Holy Relic) ----------------------------------------------- -ACTOR PuzzCWeapon : PuzzleItem 9016 +ACTOR PuzzCWeapon : PuzzleItem { - Game Hexen PuzzleItem.Number 11 Inventory.Icon ARTICWEP Inventory.PickupMessage "$TXT_ARTIPUZZCWEAPON" @@ -225,9 +204,8 @@ ACTOR PuzzCWeapon : PuzzleItem 9016 // Mage Weapon (Sigil of the Magus) ----------------------------------------- -ACTOR PuzzMWeapon : PuzzleItem 9017 +ACTOR PuzzMWeapon : PuzzleItem { - Game Hexen PuzzleItem.Number 12 Inventory.Icon ARTIMWEP Inventory.PickupMessage "$TXT_ARTIPUZZMWEAPON" @@ -242,9 +220,8 @@ ACTOR PuzzMWeapon : PuzzleItem 9017 // Clock Gear 1 ------------------------------------------------------------- -ACTOR PuzzGear1 : PuzzleItem 9018 +ACTOR PuzzGear1 : PuzzleItem { - Game Hexen PuzzleItem.Number 13 Inventory.Icon ARTIGEAR Inventory.PickupMessage "$TXT_ARTIPUZZGEAR" @@ -260,9 +237,8 @@ ACTOR PuzzGear1 : PuzzleItem 9018 // Clock Gear 2 ------------------------------------------------------------- -ACTOR PuzzGear2 : PuzzleItem 9019 +ACTOR PuzzGear2 : PuzzleItem { - Game Hexen PuzzleItem.Number 14 Inventory.Icon ARTIGER2 Inventory.PickupMessage "$TXT_ARTIPUZZGEAR" @@ -278,9 +254,8 @@ ACTOR PuzzGear2 : PuzzleItem 9019 // Clock Gear 3 ------------------------------------------------------------- -ACTOR PuzzGear3 : PuzzleItem 9020 +ACTOR PuzzGear3 : PuzzleItem { - Game Hexen PuzzleItem.Number 15 Inventory.Icon ARTIGER3 Inventory.PickupMessage "$TXT_ARTIPUZZGEAR" @@ -296,9 +271,8 @@ ACTOR PuzzGear3 : PuzzleItem 9020 // Clock Gear 4 ------------------------------------------------------------- -ACTOR PuzzGear4 : PuzzleItem 9021 +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 41d69fe1b..b0337ccbe 100644 --- a/wadsrc/static/actors/hexen/serpent.txt +++ b/wadsrc/static/actors/hexen/serpent.txt @@ -1,10 +1,8 @@ // Serpent ------------------------------------------------------------------ -ACTOR Serpent 121 +ACTOR Serpent { - Game Hexen - SpawnID 6 Health 90 PainChance 96 Speed 12 @@ -102,10 +100,8 @@ ACTOR Serpent 121 // Serpent Leader ----------------------------------------------------------- -ACTOR SerpentLeader : Serpent 120 +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 5fd6703b8..45c78472b 100644 --- a/wadsrc/static/actors/hexen/speedboots.txt +++ b/wadsrc/static/actors/hexen/speedboots.txt @@ -1,9 +1,7 @@ -ACTOR ArtiSpeedBoots : PowerupGiver 8002 +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 13b1a9c9b..9ca580970 100644 --- a/wadsrc/static/actors/hexen/spike.txt +++ b/wadsrc/static/actors/hexen/spike.txt @@ -79,10 +79,8 @@ ACTOR ThrustFloor native // Spike up ----------------------------------------------------------------- -ACTOR ThrustFloorUp : ThrustFloor 10091 +ACTOR ThrustFloorUp : ThrustFloor { - Game Hexen - SpawnID 104 +SOLID +NOTELEPORT +FLOORCLIP States @@ -94,12 +92,10 @@ ACTOR ThrustFloorUp : ThrustFloor 10091 // Spike down --------------------------------------------------------------- -ACTOR ThrustFloorDown : ThrustFloor 10090 +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 a4b3b8584..ce76ceb77 100644 --- a/wadsrc/static/actors/hexen/summon.txt +++ b/wadsrc/static/actors/hexen/summon.txt @@ -1,10 +1,8 @@ // Dark Servant Artifact ---------------------------------------------------- -ACTOR ArtiDarkServant : Inventory 86 native +ACTOR ArtiDarkServant : Inventory native { - Game Hexen - SpawnID 16 +COUNTITEM +FLOATBOB Inventory.RespawnTics 4230 @@ -27,7 +25,6 @@ ACTOR ArtiDarkServant : Inventory 86 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 77a05f6af..c74eeec8c 100644 --- a/wadsrc/static/actors/hexen/teleportother.txt +++ b/wadsrc/static/actors/hexen/teleportother.txt @@ -1,10 +1,8 @@ // Teleport Other Artifact -------------------------------------------------- -ACTOR ArtiTeleportOther : Inventory 10040 native +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 0472427fc..2bada5209 100644 --- a/wadsrc/static/actors/hexen/wraith.txt +++ b/wadsrc/static/actors/hexen/wraith.txt @@ -1,10 +1,8 @@ // Wraith ------------------------------------------------------------------- -ACTOR Wraith 34 +ACTOR Wraith { - Game Hexen - SpawnID 8 Health 150 PainChance 25 Speed 11 @@ -81,10 +79,8 @@ ACTOR Wraith 34 // Buried wraith ------------------------------------------------------------ -ACTOR WraithBuried : Wraith 10011 +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 d94f00151..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 @@ -25,10 +23,8 @@ ACTOR EggFX : MorphProjectile // Morph Ovum ---------------------------------------------------------------- -ACTOR ArtiEgg : CustomInventory 30 +ACTOR ArtiEgg : CustomInventory { - Game Heretic - SpawnID 14 +COUNTITEM +FLOATBOB +INVENTORY.INVBAR @@ -58,8 +54,6 @@ ACTOR ArtiEgg : CustomInventory 30 ACTOR PorkFX : MorphProjectile { - Game Hexen - SpawnID 40 Radius 8 Height 8 Speed 18 @@ -79,10 +73,8 @@ ACTOR PorkFX : MorphProjectile // Porkalator --------------------------------------------------------------- -ACTOR ArtiPork : CustomInventory 30 +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 79811fd53..216c99c4a 100644 --- a/wadsrc/static/actors/raven/artitele.txt +++ b/wadsrc/static/actors/raven/artitele.txt @@ -1,10 +1,8 @@ // Teleport (self) ---------------------------------------------------------- -ACTOR ArtiTeleport : Inventory 36 native +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 81d20efeb..6597b6adb 100644 --- a/wadsrc/static/actors/raven/minotaur.txt +++ b/wadsrc/static/actors/raven/minotaur.txt @@ -1,6 +1,5 @@ -ACTOR Minotaur 9 native +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 8489803e5..b0dd64807 100644 --- a/wadsrc/static/actors/raven/ravenambient.txt +++ b/wadsrc/static/actors/raven/ravenambient.txt @@ -2,10 +2,8 @@ // Wind --------------------------------------------------------------------- -ACTOR SoundWind 42 +ACTOR SoundWind { - Game Heretic - SpawnID 110 +NOBLOCKMAP +NOSECTOR +DONTSPLASH @@ -17,19 +15,15 @@ ACTOR SoundWind 42 } } -ACTOR SoundWindHexen : SoundWind 1410 +ACTOR SoundWindHexen : SoundWind { - Game Hexen - SpawnID 110 } // Waterfall ---------------------------------------------------------------- -ACTOR SoundWaterfall 41 +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 c02c19c3b..6e48faeae 100644 --- a/wadsrc/static/actors/raven/ravenartifacts.txt +++ b/wadsrc/static/actors/raven/ravenartifacts.txt @@ -1,10 +1,8 @@ // Health ------------------------------------------------------------------- -ACTOR ArtiHealth : HealthPickup 82 +ACTOR ArtiHealth : HealthPickup { - Game Raven - SpawnID 24 Health 25 +COUNTITEM +FLOATBOB @@ -25,10 +23,8 @@ ACTOR ArtiHealth : HealthPickup 82 // Super health ------------------------------------------------------------- -ACTOR ArtiSuperHealth : HealthPickup 32 +ACTOR ArtiSuperHealth : HealthPickup { - Game Raven - SpawnID 25 Health 100 +COUNTITEM +FLOATBOB @@ -49,10 +45,8 @@ ACTOR ArtiSuperHealth : HealthPickup 32 // Flight ------------------------------------------------------------------- -ACTOR ArtiFly : PowerupGiver 83 +ACTOR ArtiFly : PowerupGiver { - Game Raven - SpawnID 15 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -72,10 +66,8 @@ ACTOR ArtiFly : PowerupGiver 83 // Invulnerability Heretic (Ring of invincibility) -------------------------- -ACTOR ArtiInvulnerability : PowerupGiver 84 +ACTOR ArtiInvulnerability : PowerupGiver { - Game Heretic - SpawnID 133 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -95,10 +87,8 @@ ACTOR ArtiInvulnerability : PowerupGiver 84 // Invulnerability Hexen (Icon of the defender) ----------------------------- -ACTOR ArtiInvulnerability2 : PowerupGiver 84 +ACTOR ArtiInvulnerability2 : PowerupGiver { - Game Hexen - SpawnID 133 +COUNTITEM +FLOATBOB +INVENTORY.PICKUPFLASH @@ -117,10 +107,8 @@ ACTOR ArtiInvulnerability2 : PowerupGiver 84 // Torch -------------------------------------------------------------------- -ACTOR ArtiTorch : PowerupGiver 33 +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 af951be1b..861239839 100644 --- a/wadsrc/static/actors/raven/ravenhealth.txt +++ b/wadsrc/static/actors/raven/ravenhealth.txt @@ -1,7 +1,5 @@ -ACTOR CrystalVial : Health 81 +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 f4d979738..8386f25b9 100644 --- a/wadsrc/static/actors/shared/bridge.txt +++ b/wadsrc/static/actors/shared/bridge.txt @@ -20,7 +20,7 @@ ACTOR BridgeBall // The bridge itself ------------------------------------------------------- -ACTOR CustomBridge 9991 native +ACTOR CustomBridge native { +SOLID +NOGRAVITY @@ -51,27 +51,23 @@ ACTOR CustomBridge 9991 native // The Hexen bridge ------------------------------------------------------- -ACTOR Bridge : CustomBridge 118 +ACTOR Bridge : CustomBridge { - Game Raven - SpawnID 21 RenderStyle None Args 32, 2, 3, 0 } // The ZDoom bridge ------------------------------------------------------- -ACTOR ZBridge : CustomBridge 118 +ACTOR ZBridge : CustomBridge { - Game Doom - SpawnID 21 Args 36, 4, 0, 0 } // Invisible bridge -------------------------------------------------------- -ACTOR InvisibleBridge 9990 native +ACTOR InvisibleBridge native { RenderStyle None Radius 32 @@ -90,19 +86,19 @@ ACTOR InvisibleBridge 9990 native // And some invisible bridges from Skull Tag ------------------------------- -ACTOR InvisibleBridge32 : InvisibleBridge 5061 +ACTOR InvisibleBridge32 : InvisibleBridge { Radius 32 Height 8 } -ACTOR InvisibleBridge16 : InvisibleBridge 5064 +ACTOR InvisibleBridge16 : InvisibleBridge { Radius 16 Height 8 } -ACTOR InvisibleBridge8 : InvisibleBridge 5065 +ACTOR InvisibleBridge8 : InvisibleBridge { Radius 8 Height 8 diff --git a/wadsrc/static/actors/shared/camera.txt b/wadsrc/static/actors/shared/camera.txt index f2b0220b5..2868c7ec9 100644 --- a/wadsrc/static/actors/shared/camera.txt +++ b/wadsrc/static/actors/shared/camera.txt @@ -1,4 +1,4 @@ -ACTOR DoomBuilderCamera 32000 +ACTOR DoomBuilderCamera { States { @@ -9,7 +9,7 @@ ACTOR DoomBuilderCamera 32000 } -ACTOR SecurityCamera 9025 native +ACTOR SecurityCamera native { +NOBLOCKMAP +NOGRAVITY @@ -17,6 +17,6 @@ ACTOR SecurityCamera 9025 native RenderStyle None } -ACTOR AimingCamera : SecurityCamera 9073 native +ACTOR AimingCamera : SecurityCamera native { } 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/decal.txt b/wadsrc/static/actors/shared/decal.txt index 132d226f9..ed887ca2f 100644 --- a/wadsrc/static/actors/shared/decal.txt +++ b/wadsrc/static/actors/shared/decal.txt @@ -1,3 +1,3 @@ -ACTOR Decal 9200 native +ACTOR Decal native { } diff --git a/wadsrc/static/actors/shared/dog.txt b/wadsrc/static/actors/shared/dog.txt index 439060d41..5aa88d721 100644 --- a/wadsrc/static/actors/shared/dog.txt +++ b/wadsrc/static/actors/shared/dog.txt @@ -1,4 +1,4 @@ -ACTOR MBFHelperDog 888 +ACTOR MBFHelperDog { Health 500 Speed 10 diff --git a/wadsrc/static/actors/shared/fountain.txt b/wadsrc/static/actors/shared/fountain.txt index 35062d888..e7a66ed0b 100644 --- a/wadsrc/static/actors/shared/fountain.txt +++ b/wadsrc/static/actors/shared/fountain.txt @@ -6,37 +6,37 @@ ACTOR ParticleFountain native +INVISIBLE } -ACTOR RedParticleFountain : ParticleFountain 9027 +ACTOR RedParticleFountain : ParticleFountain { Health 1 } -ACTOR GreenParticleFountain : ParticleFountain 9028 +ACTOR GreenParticleFountain : ParticleFountain { Health 2 } -ACTOR BlueParticleFountain : ParticleFountain 9029 +ACTOR BlueParticleFountain : ParticleFountain { Health 3 } -ACTOR YellowParticleFountain : ParticleFountain 9030 +ACTOR YellowParticleFountain : ParticleFountain { Health 4 } -ACTOR PurpleParticleFountain : ParticleFountain 9031 +ACTOR PurpleParticleFountain : ParticleFountain { Health 5 } -ACTOR BlackParticleFountain : ParticleFountain 9032 +ACTOR BlackParticleFountain : ParticleFountain { Health 6 } -ACTOR WhiteParticleFountain : ParticleFountain 9033 +ACTOR WhiteParticleFountain : ParticleFountain { Health 7 } diff --git a/wadsrc/static/actors/shared/hatetarget.txt b/wadsrc/static/actors/shared/hatetarget.txt index 293656d40..fccf21444 100644 --- a/wadsrc/static/actors/shared/hatetarget.txt +++ b/wadsrc/static/actors/shared/hatetarget.txt @@ -2,7 +2,7 @@ // Hate Target -------------------------------------------------------------- -ACTOR HateTarget 9076 native +ACTOR HateTarget native { Radius 20 Height 56 diff --git a/wadsrc/static/actors/shared/mapmarker.txt b/wadsrc/static/actors/shared/mapmarker.txt index 8333a550a..24cf11e8f 100644 --- a/wadsrc/static/actors/shared/mapmarker.txt +++ b/wadsrc/static/actors/shared/mapmarker.txt @@ -1,5 +1,5 @@ -ACTOR MapMarker 9040 native +ACTOR MapMarker native { +NOBLOCKMAP +NOGRAVITY diff --git a/wadsrc/static/actors/shared/movingcamera.txt b/wadsrc/static/actors/shared/movingcamera.txt index 435368b3a..22473512f 100644 --- a/wadsrc/static/actors/shared/movingcamera.txt +++ b/wadsrc/static/actors/shared/movingcamera.txt @@ -1,4 +1,4 @@ -ACTOR InterpolationPoint 9070 native +ACTOR InterpolationPoint native { +NOBLOCKMAP +NOGRAVITY @@ -6,7 +6,7 @@ ACTOR InterpolationPoint 9070 native RenderStyle None } -ACTOR InterpolationSpecial 9075 native +ACTOR InterpolationSpecial native { +NOBLOCKMAP +NOSECTOR @@ -14,7 +14,7 @@ ACTOR InterpolationSpecial 9075 native +DONTSPLASH } -ACTOR PathFollower 9071 native +ACTOR PathFollower native { +NOBLOCKMAP +NOSECTOR @@ -22,11 +22,11 @@ ACTOR PathFollower 9071 native +DONTSPLASH } -ACTOR ActorMover : PathFollower 9074 native +ACTOR ActorMover : PathFollower native { } -ACTOR MovingCamera : PathFollower 9072 native +ACTOR MovingCamera : PathFollower native { } diff --git a/wadsrc/static/actors/shared/secrettrigger.txt b/wadsrc/static/actors/shared/secrettrigger.txt index b131ac588..498138046 100644 --- a/wadsrc/static/actors/shared/secrettrigger.txt +++ b/wadsrc/static/actors/shared/secrettrigger.txt @@ -1,5 +1,5 @@ -ACTOR SecretTrigger 9046 native +ACTOR SecretTrigger native { +NOBLOCKMAP +NOSECTOR diff --git a/wadsrc/static/actors/shared/sectoraction.txt b/wadsrc/static/actors/shared/sectoraction.txt index 2d7fe2a80..233364331 100644 --- a/wadsrc/static/actors/shared/sectoraction.txt +++ b/wadsrc/static/actors/shared/sectoraction.txt @@ -9,73 +9,73 @@ ACTOR SectorAction native // Triggered when entering sector ------------------------------------------- -ACTOR SecActEnter : SectorAction 9998 native +ACTOR SecActEnter : SectorAction native { } // Triggered when leaving sector -------------------------------------------- -ACTOR SecActExit : SectorAction 9997 native +ACTOR SecActExit : SectorAction native { } // Triggered when hitting sector's floor ------------------------------------ -ACTOR SecActHitFloor : SectorAction 9999 native +ACTOR SecActHitFloor : SectorAction native { } // Triggered when hitting sector's ceiling ---------------------------------- -ACTOR SecActHitCeil : SectorAction 9996 native +ACTOR SecActHitCeil : SectorAction native { } // Triggered when using inside sector --------------------------------------- -ACTOR SecActUse : SectorAction 9995 native +ACTOR SecActUse : SectorAction native { } // Triggered when using a sector's wall ------------------------------------- -ACTOR SecActUseWall : SectorAction 9994 native +ACTOR SecActUseWall : SectorAction native { } // Triggered when eyes go below fake floor ---------------------------------- -ACTOR SecActEyesDive : SectorAction 9993 native +ACTOR SecActEyesDive : SectorAction native { } // Triggered when eyes go above fake floor ---------------------------------- -ACTOR SecActEyesSurface : SectorAction 9992 native +ACTOR SecActEyesSurface : SectorAction native { } // Triggered when eyes go below fake floor ---------------------------------- -ACTOR SecActEyesBelowC : SectorAction 9983 native +ACTOR SecActEyesBelowC : SectorAction native { } // Triggered when eyes go above fake floor ---------------------------------- -ACTOR SecActEyesAboveC : SectorAction 9982 native +ACTOR SecActEyesAboveC : SectorAction native { } // Triggered when eyes go below fake floor ---------------------------------- -ACTOR SecActHitFakeFloor : SectorAction 9989 native +ACTOR SecActHitFakeFloor : SectorAction native { } // Music changer ---------------------------------- -ACTOR MusicChanger : SectorAction 14165 native +ACTOR MusicChanger : SectorAction native { } diff --git a/wadsrc/static/actors/shared/setcolor.txt b/wadsrc/static/actors/shared/setcolor.txt index a41a62926..5b5fcd911 100644 --- a/wadsrc/static/actors/shared/setcolor.txt +++ b/wadsrc/static/actors/shared/setcolor.txt @@ -1,4 +1,4 @@ -ACTOR ColorSetter 9038 native +ACTOR ColorSetter native { +NOBLOCKMAP +NOGRAVITY @@ -7,7 +7,7 @@ ACTOR ColorSetter 9038 native } -ACTOR FadeSetter 9039 native +ACTOR FadeSetter native { +NOBLOCKMAP +NOGRAVITY diff --git a/wadsrc/static/actors/shared/sharedmisc.txt b/wadsrc/static/actors/shared/sharedmisc.txt index 6a71025d2..69b1abb15 100644 --- a/wadsrc/static/actors/shared/sharedmisc.txt +++ b/wadsrc/static/actors/shared/sharedmisc.txt @@ -18,7 +18,7 @@ ACTOR Unknown // Route node for monster patrols ------------------------------------------- -ACTOR PatrolPoint 9024 +ACTOR PatrolPoint { Radius 8 Height 8 @@ -31,7 +31,7 @@ ACTOR PatrolPoint 9024 // A special to execute when a monster reaches a matching patrol point ------ -ACTOR PatrolSpecial 9047 +ACTOR PatrolSpecial { Radius 8 Height 8 @@ -44,7 +44,7 @@ ACTOR PatrolSpecial 9047 // Map spot ---------------------------------------------------------------- -ACTOR MapSpot 9001 +ACTOR MapSpot { +NOBLOCKMAP +NOSECTOR @@ -55,13 +55,13 @@ ACTOR MapSpot 9001 // same with different editor number for Legacy maps ----------------------- -ACTOR FS_Mapspot : Mapspot 5004 +ACTOR FS_Mapspot : Mapspot { } // Map spot with gravity --------------------------------------------------- -ACTOR MapSpotGravity : MapSpot 9013 +ACTOR MapSpotGravity : MapSpot { -NOBLOCKMAP -NOSECTOR @@ -70,13 +70,13 @@ ACTOR MapSpotGravity : MapSpot 9013 // Point Pushers ----------------------------------------------------------- -ACTOR PointPusher 5001 +ACTOR PointPusher { +NOBLOCKMAP +INVISIBLE } -ACTOR PointPuller 5002 +ACTOR PointPuller { +NOBLOCKMAP +INVISIBLE @@ -103,16 +103,14 @@ ACTOR RealGibs // a deh patch to change the gibs, since ZDoom actually creates a gib actor // for actors that get crushed instead of changing their state as Doom did. -ACTOR Gibs : RealGibs 24 +ACTOR Gibs : RealGibs { - Game Doom - SpawnID 146 ClearFlags } // Needed for loading Build maps ------------------------------------------- -ACTOR CustomSprite 9988 native +ACTOR CustomSprite native { +NOBLOCKMAP +NOGRAVITY @@ -154,7 +152,7 @@ ACTOR FastProjectile native // Sector flag setter ------------------------------------------------------ -ACTOR SectorFlagSetter 9041 native +ACTOR SectorFlagSetter native { +NOBLOCKMAP +NOGRAVITY diff --git a/wadsrc/static/actors/shared/skies.txt b/wadsrc/static/actors/shared/skies.txt index 3b531d527..b21b02f3d 100644 --- a/wadsrc/static/actors/shared/skies.txt +++ b/wadsrc/static/actors/shared/skies.txt @@ -1,4 +1,4 @@ -ACTOR SkyViewpoint 9080 native +ACTOR SkyViewpoint native { +NOSECTOR +NOBLOCKMAP @@ -6,7 +6,7 @@ ACTOR SkyViewpoint 9080 native +DONTSPLASH } -ACTOR SkyPicker 9081 native +ACTOR SkyPicker native { +NOSECTOR +NOBLOCKMAP @@ -14,7 +14,7 @@ ACTOR SkyPicker 9081 native +DONTSPLASH } -Actor SkyCamCompat : SkyViewpoint 9083 native +Actor SkyCamCompat : SkyViewpoint native { } @@ -22,16 +22,16 @@ ACTOR StackPoint : SkyViewpoint native { } -ACTOR UpperStackLookOnly : StackPoint 9077 +ACTOR UpperStackLookOnly : StackPoint { } -ACTOR LowerStackLookOnly : StackPoint 9078 +ACTOR LowerStackLookOnly : StackPoint { } -ACTOR SectorSilencer 9082 native +ACTOR SectorSilencer native { +NOBLOCKMAP +NOGRAVITY diff --git a/wadsrc/static/actors/shared/soundenvironment.txt b/wadsrc/static/actors/shared/soundenvironment.txt index 9e6dad381..8d325909e 100644 --- a/wadsrc/static/actors/shared/soundenvironment.txt +++ b/wadsrc/static/actors/shared/soundenvironment.txt @@ -1,5 +1,5 @@ -ACTOR SoundEnvironment 9048 native +ACTOR SoundEnvironment native { +NOSECTOR +NOBLOCKMAP diff --git a/wadsrc/static/actors/shared/soundsequence.txt b/wadsrc/static/actors/shared/soundsequence.txt index ff240ba9c..463d582ae 100644 --- a/wadsrc/static/actors/shared/soundsequence.txt +++ b/wadsrc/static/actors/shared/soundsequence.txt @@ -1,12 +1,12 @@ -ACTOR AmbientSound 14065 native +ACTOR AmbientSound native { +NOBLOCKMAP +NOSECTOR +DONTSPLASH } -ACTOR AmbientSoundNoGravity : AmbientSound 14067 +ACTOR AmbientSoundNoGravity : AmbientSound { +NOGRAVITY } @@ -18,7 +18,7 @@ ACTOR SoundSequenceSlot native +DONTSPLASH } -ACTOR SoundSequence 14066 native +ACTOR SoundSequence native { +NOSECTOR +NOBLOCKMAP @@ -27,63 +27,53 @@ ACTOR SoundSequence 14066 native // Heretic Sound sequences ----------------------------------------------------------- -ACTOR HereticSoundSequence1 : SoundSequence 1200 +ACTOR HereticSoundSequence1 : SoundSequence { - Game Heretic Args 0 } -ACTOR HereticSoundSequence2 : SoundSequence 1201 +ACTOR HereticSoundSequence2 : SoundSequence { - Game Heretic Args 1 } -ACTOR HereticSoundSequence3 : SoundSequence 1202 +ACTOR HereticSoundSequence3 : SoundSequence { - Game Heretic Args 2 } -ACTOR HereticSoundSequence4 : SoundSequence 1203 +ACTOR HereticSoundSequence4 : SoundSequence { - Game Heretic Args 3 } -ACTOR HereticSoundSequence5 : SoundSequence 1204 +ACTOR HereticSoundSequence5 : SoundSequence { - Game Heretic Args 4 } -ACTOR HereticSoundSequence6 : SoundSequence 1205 +ACTOR HereticSoundSequence6 : SoundSequence { - Game Heretic Args 5 } -ACTOR HereticSoundSequence7 : SoundSequence 1206 +ACTOR HereticSoundSequence7 : SoundSequence { - Game Heretic Args 6 } -ACTOR HereticSoundSequence8 : SoundSequence 1207 +ACTOR HereticSoundSequence8 : SoundSequence { - Game Heretic Args 7 } -ACTOR HereticSoundSequence9 : SoundSequence 1208 +ACTOR HereticSoundSequence9 : SoundSequence { - Game Heretic Args 8 } -ACTOR HereticSoundSequence10 : SoundSequence 1209 +ACTOR HereticSoundSequence10 : SoundSequence { - Game Heretic Args 9 } diff --git a/wadsrc/static/actors/shared/spark.txt b/wadsrc/static/actors/shared/spark.txt index 4637ccaa9..008a27d40 100644 --- a/wadsrc/static/actors/shared/spark.txt +++ b/wadsrc/static/actors/shared/spark.txt @@ -1,5 +1,5 @@ -ACTOR Spark 9026 native +ACTOR Spark native { +NOSECTOR +NOBLOCKMAP diff --git a/wadsrc/static/actors/shared/teleport.txt b/wadsrc/static/actors/shared/teleport.txt index a91eaf9d4..d45dbbd7b 100644 --- a/wadsrc/static/actors/shared/teleport.txt +++ b/wadsrc/static/actors/shared/teleport.txt @@ -23,19 +23,19 @@ ACTOR TeleportFog native -ACTOR TeleportDest 14 +ACTOR TeleportDest { +NOBLOCKMAP +NOSECTOR +DONTSPLASH } -ACTOR TeleportDest2 : TeleportDest 9044 +ACTOR TeleportDest2 : TeleportDest { +NOGRAVITY } -ACTOR TeleportDest3 : TeleportDest2 9043 +ACTOR TeleportDest3 : TeleportDest2 { -NOGRAVITY } diff --git a/wadsrc/static/actors/shared/waterzone.txt b/wadsrc/static/actors/shared/waterzone.txt index 6bd5dbbb7..ddb223e2d 100644 --- a/wadsrc/static/actors/shared/waterzone.txt +++ b/wadsrc/static/actors/shared/waterzone.txt @@ -1,4 +1,4 @@ -ACTOR WaterZone 9045 native +ACTOR WaterZone native { +NOSECTOR +NOBLOCKMAP diff --git a/wadsrc/static/actors/strife/acolyte.txt b/wadsrc/static/actors/strife/acolyte.txt index 3ca1dec62..12d4aab51 100644 --- a/wadsrc/static/actors/strife/acolyte.txt +++ b/wadsrc/static/actors/strife/acolyte.txt @@ -78,9 +78,8 @@ ACTOR Acolyte : StrifeHumanoid // Acolyte 1 ---------------------------------------------------------------- -ACTOR AcolyteTan : Acolyte 3002 +ACTOR AcolyteTan : Acolyte { - Game Strife ConversationID 53, 52, 53 +MISSILEMORE +MISSILEEVENMORE DropItem "ClipOfBullets" @@ -88,9 +87,8 @@ ACTOR AcolyteTan : Acolyte 3002 // Acolyte 2 ---------------------------------------------------------------- -ACTOR AcolyteRed : Acolyte 142 +ACTOR AcolyteRed : Acolyte { - Game Strife ConversationID 54, 53, 54 +MISSILEMORE +MISSILEEVENMORE Translation 0 @@ -98,9 +96,8 @@ ACTOR AcolyteRed : Acolyte 142 // Acolyte 3 ---------------------------------------------------------------- -ACTOR AcolyteRust : Acolyte 143 +ACTOR AcolyteRust : Acolyte { - Game Strife ConversationID 55, 54, 55 +MISSILEMORE +MISSILEEVENMORE Translation 1 @@ -108,9 +105,8 @@ ACTOR AcolyteRust : Acolyte 143 // Acolyte 4 ---------------------------------------------------------------- -ACTOR AcolyteGray : Acolyte 146 +ACTOR AcolyteGray : Acolyte { - Game Strife ConversationID 56, 55, 56 +MISSILEMORE +MISSILEEVENMORE Translation 2 @@ -118,9 +114,8 @@ ACTOR AcolyteGray : Acolyte 146 // Acolyte 5 ---------------------------------------------------------------- -ACTOR AcolyteDGreen : Acolyte 147 +ACTOR AcolyteDGreen : Acolyte { - Game Strife ConversationID 57, 56, 57 +MISSILEMORE +MISSILEEVENMORE Translation 3 @@ -128,9 +123,8 @@ ACTOR AcolyteDGreen : Acolyte 147 // Acolyte 6 ---------------------------------------------------------------- -ACTOR AcolyteGold : Acolyte 148 +ACTOR AcolyteGold : Acolyte { - Game Strife ConversationID 58, 57, 58 +MISSILEMORE +MISSILEEVENMORE Translation 4 @@ -138,9 +132,8 @@ ACTOR AcolyteGold : Acolyte 148 // Acolyte 7 ---------------------------------------------------------------- -ACTOR AcolyteLGreen : Acolyte 232 +ACTOR AcolyteLGreen : Acolyte { - Game Strife Health 60 ConversationID 59, -1, -1 Translation 5 @@ -148,9 +141,8 @@ ACTOR AcolyteLGreen : Acolyte 232 // Acolyte 8 ---------------------------------------------------------------- -ACTOR AcolyteBlue : Acolyte 231 +ACTOR AcolyteBlue : Acolyte { - Game Strife Health 60 ConversationID 60, -1, -1 Translation 6 @@ -158,9 +150,8 @@ ACTOR AcolyteBlue : Acolyte 231 // Shadow Acolyte ----------------------------------------------------------- -ACTOR AcolyteShadow : Acolyte 58 +ACTOR AcolyteShadow : Acolyte { - Game Strife ConversationID 61, 58, 59 +MISSILEMORE DropItem "ClipOfBullets" @@ -178,9 +169,8 @@ ACTOR AcolyteShadow : Acolyte 58 // Some guy turning into an acolyte ----------------------------------------- -ACTOR AcolyteToBe : Acolyte 201 +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 6e56f680d..3f6ffe549 100644 --- a/wadsrc/static/actors/strife/alienspectres.txt +++ b/wadsrc/static/actors/strife/alienspectres.txt @@ -1,9 +1,8 @@ // Alien Spectre 1 ----------------------------------------------------------- -ACTOR AlienSpectre1 : SpectralMonster 129 +ACTOR AlienSpectre1 : SpectralMonster { - Game Strife ConversationID 67,-1,-1 Health 1000 Painchance 250 @@ -80,9 +79,8 @@ ACTOR AlienSpectre1 : SpectralMonster 129 // Alien Spectre 2 ----------------------------------------------------------- -ACTOR AlienSpectre2 : AlienSpectre1 75 +ACTOR AlienSpectre2 : AlienSpectre1 { - Game Strife ConversationID 70 Health 1200 Painchance 50 @@ -101,9 +99,8 @@ ACTOR AlienSpectre2 : AlienSpectre1 75 // Alien Spectre 3 ---------------------------------------------------------- // This is the Oracle's personal spectre, so it's a little different. -ACTOR AlienSpectre3 : AlienSpectre1 76 +ACTOR AlienSpectre3 : AlienSpectre1 { - Game Strife ConversationID 71,-1,-1 Health 1500 Painchance 50 @@ -143,9 +140,8 @@ ACTOR AlienSpectre3 : AlienSpectre1 76 // Alien Spectre 4 ----------------------------------------------------------- -ACTOR AlienSpectre4 : AlienSpectre1 167 +ACTOR AlienSpectre4 : AlienSpectre1 { - Game Strife ConversationID 72,-1,-1 Health 1700 Painchance 50 @@ -164,9 +160,8 @@ ACTOR AlienSpectre4 : AlienSpectre1 167 // Alien Spectre 5 ----------------------------------------------------------- -ACTOR AlienSpectre5 : AlienSpectre1 168 +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 b24080b1a..e7555a139 100644 --- a/wadsrc/static/actors/strife/beggars.txt +++ b/wadsrc/static/actors/strife/beggars.txt @@ -62,36 +62,31 @@ ACTOR Beggar : StrifeHumanoid // Beggars ----------------------------------------------------------------- -ACTOR Beggar1 : Beggar 141 +ACTOR Beggar1 : Beggar { - Game Strife ConversationID 38, 37, 38 } -ACTOR Beggar2 : Beggar 155 +ACTOR Beggar2 : Beggar { - Game Strife ConversationID 39, 38, 39 } -ACTOR Beggar3 : Beggar 156 +ACTOR Beggar3 : Beggar { - Game Strife ConversationID 40, 39, 40 } -ACTOR Beggar4 : Beggar 157 +ACTOR Beggar4 : Beggar { - Game Strife ConversationID 41, 40, 41 } -ACTOR Beggar5 : Beggar 158 +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 e4e50af77..ff55b7b52 100644 --- a/wadsrc/static/actors/strife/coin.txt +++ b/wadsrc/static/actors/strife/coin.txt @@ -1,9 +1,8 @@ // Coin --------------------------------------------------------------------- -ACTOR Coin : Inventory 93 native +ACTOR Coin : Inventory native { - Game Strife ConversationID 168, 161, 165 +DROPPED +NOTDMATCH @@ -24,9 +23,8 @@ ACTOR Coin : Inventory 93 native // 10 Gold ------------------------------------------------------------------ -ACTOR Gold10 : Coin 138 +ACTOR Gold10 : Coin { - Game Strife ConversationID 169, 162, 166 Inventory.Amount 10 Tag "$TAG_10GOLD" @@ -41,9 +39,8 @@ ACTOR Gold10 : Coin 138 // 25 Gold ------------------------------------------------------------------ -ACTOR Gold25 : Coin 139 +ACTOR Gold25 : Coin { - Game Strife ConversationID 170, 163, 167 Inventory.Amount 25 Tag "$TAG_25GOLD" @@ -58,9 +55,8 @@ ACTOR Gold25 : Coin 139 // 50 Gold ------------------------------------------------------------------ -ACTOR Gold50 : Coin 140 +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 eb1ceec6d..2c1a6fd7f 100644 --- a/wadsrc/static/actors/strife/crusader.txt +++ b/wadsrc/static/actors/strife/crusader.txt @@ -1,9 +1,8 @@ // Crusader ----------------------------------------------------------------- -ACTOR Crusader 3005 +ACTOR Crusader { - Game Strife ConversationID 63,-1,-1 Speed 8 Radius 40 @@ -110,9 +109,8 @@ ACTOR CrusaderMissile // Dead Crusader ------------------------------------------------------------ -ACTOR DeadCrusader 22 +ACTOR DeadCrusader { - Game Strife ConversationID 230 States { diff --git a/wadsrc/static/actors/strife/entityboss.txt b/wadsrc/static/actors/strife/entityboss.txt index 3980eb04e..81daf7d0f 100644 --- a/wadsrc/static/actors/strife/entityboss.txt +++ b/wadsrc/static/actors/strife/entityboss.txt @@ -1,9 +1,8 @@ // Entity Nest -------------------------------------------------------------- -ACTOR EntityNest 26 +ACTOR EntityNest { - Game Strife ConversationID 76,-1,-1 Radius 84 Height 47 @@ -20,9 +19,8 @@ ACTOR EntityNest 26 // Entity Pod --------------------------------------------------------------- -ACTOR EntityPod 198 +ACTOR EntityPod { - Game Strife ConversationID 77,-1,-1 Radius 25 Height 91 @@ -50,9 +48,8 @@ ACTOR EntityPod 198 // Entity Boss -------------------------------------------------------------- -ACTOR EntityBoss : SpectralMonster 128 +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 e792e5803..f3a766b0d 100644 --- a/wadsrc/static/actors/strife/inquisitor.txt +++ b/wadsrc/static/actors/strife/inquisitor.txt @@ -1,9 +1,8 @@ // Inquisitor --------------------------------------------------------------- -ACTOR Inquisitor 16 +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 fee3eb0f0..03b25c9d3 100644 --- a/wadsrc/static/actors/strife/loremaster.txt +++ b/wadsrc/static/actors/strife/loremaster.txt @@ -1,9 +1,8 @@ // Loremaster (aka Priest) -------------------------------------------------- -ACTOR Loremaster 12 +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 ac23e4e66..ae437bd19 100644 --- a/wadsrc/static/actors/strife/macil.txt +++ b/wadsrc/static/actors/strife/macil.txt @@ -1,9 +1,8 @@ // Macil (version 1) --------------------------------------------------------- -ACTOR Macil1 64 +ACTOR Macil1 { - Game Strife ConversationID 49, 48, 49 Health 95 Radius 20 @@ -58,9 +57,8 @@ ACTOR Macil1 64 // Macil (version 2) --------------------------------------------------------- -ACTOR Macil2 : Macil1 200 +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 b6a2e09a5..a690fc676 100644 --- a/wadsrc/static/actors/strife/merchants.txt +++ b/wadsrc/static/actors/strife/merchants.txt @@ -54,9 +54,8 @@ ACTOR Merchant // Weapon Smith ------------------------------------------------------------- -ACTOR WeaponSmith : Merchant 116 +ACTOR WeaponSmith : Merchant { - Game Strife ConversationID 2 PainSound "smith/pain" Tag "$TAG_WEAPONSMITH" @@ -65,9 +64,8 @@ ACTOR WeaponSmith : Merchant 116 // Bar Keep ----------------------------------------------------------------- -ACTOR BarKeep : Merchant 72 +ACTOR BarKeep : Merchant { - Game Strife Translation 4 ConversationID 3 PainSound "barkeep/pain" @@ -78,9 +76,8 @@ ACTOR BarKeep : Merchant 72 // Armorer ------------------------------------------------------------------ -ACTOR Armorer : Merchant 73 +ACTOR Armorer : Merchant { - Game Strife Translation 5 ConversationID 4 PainSound "armorer/pain" @@ -90,9 +87,8 @@ ACTOR Armorer : Merchant 73 // Medic -------------------------------------------------------------------- -ACTOR Medic : Merchant 74 +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 2e0aff948..ce81ebf05 100644 --- a/wadsrc/static/actors/strife/oracle.txt +++ b/wadsrc/static/actors/strife/oracle.txt @@ -1,9 +1,8 @@ // Oracle ------------------------------------------------------------------- -ACTOR Oracle 199 +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 af12b75df..b6c100e7c 100644 --- a/wadsrc/static/actors/strife/peasants.txt +++ b/wadsrc/static/actors/strife/peasants.txt @@ -67,159 +67,137 @@ ACTOR Peasant : StrifeHumanoid // Peasant Variant 1 -------------------------------------------------------- -ACTOR Peasant1 : Peasant 3004 +ACTOR Peasant1 : Peasant { - Game Strife ConversationID 6 Speed 4 } -ACTOR Peasant2 : Peasant 130 +ACTOR Peasant2 : Peasant { - Game Strife ConversationID 7 Speed 5 } -ACTOR Peasant3 : Peasant 131 +ACTOR Peasant3 : Peasant { - Game Strife ConversationID 8 Speed 5 } -ACTOR Peasant4 : Peasant 65 +ACTOR Peasant4 : Peasant { - Game Strife Translation 0 ConversationID 9 Speed 7 } -ACTOR Peasant5 : Peasant 132 +ACTOR Peasant5 : Peasant { - Game Strife Translation 0 ConversationID 10 Speed 7 } -ACTOR Peasant6 : Peasant 133 +ACTOR Peasant6 : Peasant { - Game Strife Translation 0 ConversationID 11 Speed 7 } -ACTOR Peasant7 : Peasant 66 +ACTOR Peasant7 : Peasant { - Game Strife Translation 2 ConversationID 12 } -ACTOR Peasant8 : Peasant 134 +ACTOR Peasant8 : Peasant { - Game Strife Translation 2 ConversationID 13 } -ACTOR Peasant9 : Peasant 135 +ACTOR Peasant9 : Peasant { - Game Strife Translation 2 ConversationID 14 } -ACTOR Peasant10 : Peasant 67 +ACTOR Peasant10 : Peasant { - Game Strife Translation 1 ConversationID 15 } -ACTOR Peasant11 : Peasant 136 +ACTOR Peasant11 : Peasant { - Game Strife Translation 1 ConversationID 16 } -ACTOR Peasant12 : Peasant 137 +ACTOR Peasant12 : Peasant { - Game Strife Translation 1 ConversationID 17 } -ACTOR Peasant13 : Peasant 172 +ACTOR Peasant13 : Peasant { - Game Strife Translation 3 ConversationID 18 } -ACTOR Peasant14 : Peasant 173 +ACTOR Peasant14 : Peasant { - Game Strife Translation 3 ConversationID 19 } -ACTOR Peasant15 : Peasant 174 +ACTOR Peasant15 : Peasant { - Game Strife Translation 3 ConversationID 20 } -ACTOR Peasant16 : Peasant 175 +ACTOR Peasant16 : Peasant { - Game Strife Translation 5 ConversationID 21 } -ACTOR Peasant17 : Peasant 176 +ACTOR Peasant17 : Peasant { - Game Strife Translation 5 ConversationID 22 } -ACTOR Peasant18 : Peasant 177 +ACTOR Peasant18 : Peasant { - Game Strife Translation 5 ConversationID 23 } -ACTOR Peasant19 : Peasant 178 +ACTOR Peasant19 : Peasant { - Game Strife Translation 4 ConversationID 24 } -ACTOR Peasant20 : Peasant 179 +ACTOR Peasant20 : Peasant { - Game Strife Translation 4 ConversationID 25 } -ACTOR Peasant21 : Peasant 180 +ACTOR Peasant21 : Peasant { - Game Strife Translation 4 ConversationID 26 } -ACTOR Peasant22 : Peasant 181 +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 755b453be..f1833ffdc 100644 --- a/wadsrc/static/actors/strife/programmer.txt +++ b/wadsrc/static/actors/strife/programmer.txt @@ -1,9 +1,8 @@ // Programmer --------------------------------------------------------------- -ACTOR Programmer 71 +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 eaefda35d..fa7deef89 100644 --- a/wadsrc/static/actors/strife/ratbuddy.txt +++ b/wadsrc/static/actors/strife/ratbuddy.txt @@ -1,7 +1,6 @@ -ACTOR RatBuddy 85 +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 a69947373..76db1cfda 100644 --- a/wadsrc/static/actors/strife/reaver.txt +++ b/wadsrc/static/actors/strife/reaver.txt @@ -1,7 +1,6 @@ -ACTOR Reaver 3001 +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 3c539bca4..60c61eabf 100644 --- a/wadsrc/static/actors/strife/rebels.txt +++ b/wadsrc/static/actors/strife/rebels.txt @@ -64,58 +64,51 @@ ACTOR Rebel : StrifeHumanoid // Rebel 1 ------------------------------------------------------------------ -ACTOR Rebel1 : Rebel 9 +ACTOR Rebel1 : Rebel { - Game Strife ConversationID 43, 42, 43 DropItem "ClipOfBullets" } // Rebel 2 ------------------------------------------------------------------ -ACTOR Rebel2 : Rebel 144 +ACTOR Rebel2 : Rebel { - Game Strife ConversationID 44, 43, 44 } // Rebel 3 ------------------------------------------------------------------ -ACTOR Rebel3 : Rebel 145 +ACTOR Rebel3 : Rebel { - Game Strife ConversationID 45, 44, 45 } // Rebel 4 ------------------------------------------------------------------ -ACTOR Rebel4 : Rebel 149 +ACTOR Rebel4 : Rebel { - Game Strife ConversationID 46, 45, 56 } // Rebel 5 ------------------------------------------------------------------ -ACTOR Rebel5 : Rebel 150 +ACTOR Rebel5 : Rebel { - Game Strife ConversationID 47, 46, 47 } // Rebel 6 ------------------------------------------------------------------ -ACTOR Rebel6 : Rebel 151 +ACTOR Rebel6 : Rebel { - Game Strife ConversationID 48, 47, 48 } // Teleporter Beacon -------------------------------------------------------- -ACTOR TeleporterBeacon : Inventory 10 native +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 14bbaf8e1..3da2c5436 100644 --- a/wadsrc/static/actors/strife/sentinel.txt +++ b/wadsrc/static/actors/strife/sentinel.txt @@ -1,9 +1,8 @@ // Sentinel ----------------------------------------------------------------- -ACTOR Sentinel 3006 +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 a2cc66c7b..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 @@ -123,9 +122,8 @@ ACTOR Sigil : Weapon native // Sigil 1 ------------------------------------------------------------------ -ACTOR Sigil1 : Sigil 77 +ACTOR Sigil1 : Sigil { - Game Strife ConversationID 196, 190, 194 Inventory.Icon "I_SGL1" Health 1 @@ -133,9 +131,8 @@ ACTOR Sigil1 : Sigil 77 // Sigil 2 ------------------------------------------------------------------ -ACTOR Sigil2 : Sigil 78 +ACTOR Sigil2 : Sigil { - Game Strife ConversationID 197, 191, 195 Inventory.Icon "I_SGL2" Health 2 @@ -143,9 +140,8 @@ ACTOR Sigil2 : Sigil 78 // Sigil 3 ------------------------------------------------------------------ -ACTOR Sigil3 : Sigil 79 +ACTOR Sigil3 : Sigil { - Game Strife ConversationID 198, 192, 196 Inventory.Icon "I_SGL3" Health 3 @@ -153,9 +149,8 @@ ACTOR Sigil3 : Sigil 79 // Sigil 4 ------------------------------------------------------------------ -ACTOR Sigil4 : Sigil 80 +ACTOR Sigil4 : Sigil { - Game Strife ConversationID 199, 193, 197 Inventory.Icon "I_SGL4" Health 4 @@ -163,9 +158,8 @@ ACTOR Sigil4 : Sigil 80 // Sigil 5 ------------------------------------------------------------------ -ACTOR Sigil5 : Sigil 81 +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 0a537c762..aaddc8dab 100644 --- a/wadsrc/static/actors/strife/stalker.txt +++ b/wadsrc/static/actors/strife/stalker.txt @@ -2,9 +2,8 @@ // Stalker ------------------------------------------------------------------ -ACTOR Stalker 186 +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 801714434..b1548f3dd 100644 --- a/wadsrc/static/actors/strife/strifeammo.txt +++ b/wadsrc/static/actors/strife/strifeammo.txt @@ -1,8 +1,7 @@ // HE-Grenade Rounds -------------------------------------------------------- -ACTOR HEGrenadeRounds : Ammo 152 +ACTOR HEGrenadeRounds : Ammo { - Game Strife +FLOORCLIP ConversationID 177, 170, 174 Inventory.Amount 6 @@ -22,9 +21,8 @@ ACTOR HEGrenadeRounds : Ammo 152 // Phosphorus-Grenade Rounds ------------------------------------------------ -ACTOR PhosphorusGrenadeRounds : Ammo 153 +ACTOR PhosphorusGrenadeRounds : Ammo { - Game Strife +FLOORCLIP ConversationID 178, 171, 175 Inventory.Amount 4 @@ -44,10 +42,8 @@ ACTOR PhosphorusGrenadeRounds : Ammo 153 // Clip of Bullets ---------------------------------------------------------- -ACTOR ClipOfBullets : Ammo 2007 +ACTOR ClipOfBullets : Ammo { - Game Strife - SpawnID 11 ConversationID 179, 173, 177 +FLOORCLIP Inventory.Amount 10 @@ -67,10 +63,8 @@ ACTOR ClipOfBullets : Ammo 2007 // Box of Bullets ----------------------------------------------------------- -ACTOR BoxOfBullets : ClipOfBullets 2048 +ACTOR BoxOfBullets : ClipOfBullets { - Game Strife - SpawnID 139 ConversationID 180, 174, 178 Inventory.Amount 50 Tag "$TAG_BOXOFBULLETS" @@ -85,10 +79,8 @@ ACTOR BoxOfBullets : ClipOfBullets 2048 // Mini Missiles ------------------------------------------------------------ -ACTOR MiniMissiles : Ammo 2010 +ACTOR MiniMissiles : Ammo { - Game Strife - SpawnID 140 ConversationID 181, 175, 179 +FLOORCLIP Inventory.Amount 4 @@ -108,10 +100,8 @@ ACTOR MiniMissiles : Ammo 2010 // Crate of Missiles -------------------------------------------------------- -ACTOR CrateOfMissiles : MiniMissiles 2046 +ACTOR CrateOfMissiles : MiniMissiles { - Game Strife - SpawnID 141 ConversationID 182, 176, 180 Inventory.Amount 20 Tag "$TAG_CRATEOFMISSILES" @@ -126,10 +116,8 @@ ACTOR CrateOfMissiles : MiniMissiles 2046 // Energy Pod --------------------------------------------------------------- -ACTOR EnergyPod : Ammo 2047 +ACTOR EnergyPod : Ammo { - Game Strife - SpawnID 75 ConversationID 183, 177, 181 +FLOORCLIP Inventory.Amount 20 @@ -150,10 +138,8 @@ ACTOR EnergyPod : Ammo 2047 // Energy pack --------------------------------------------------------------- -ACTOR EnergyPack : EnergyPod 17 +ACTOR EnergyPack : EnergyPod { - Game Strife - SpawnID 142 ConversationID 184, 178, 182 Inventory.Amount 100 Tag "$TAG_ENERGYPACK" @@ -168,9 +154,8 @@ ACTOR EnergyPack : EnergyPod 17 // Poison Bolt Quiver ------------------------------------------------------- -ACTOR PoisonBolts : Ammo 115 +ACTOR PoisonBolts : Ammo { - Game Strife ConversationID 185, 179, 183 +FLOORCLIP Inventory.Amount 10 @@ -190,9 +175,8 @@ ACTOR PoisonBolts : Ammo 115 // Electric Bolt Quiver ------------------------------------------------------- -ACTOR ElectricBolts : Ammo 114 +ACTOR ElectricBolts : Ammo { - Game Strife ConversationID 186, 180, 184 +FLOORCLIP Inventory.Amount 20 @@ -212,10 +196,8 @@ ACTOR ElectricBolts : Ammo 114 // Ammo Satchel ------------------------------------------------------------- -ACTOR AmmoSatchel : BackpackItem 183 +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 2431e9438..9201bc047 100644 --- a/wadsrc/static/actors/strife/strifearmor.txt +++ b/wadsrc/static/actors/strife/strifearmor.txt @@ -1,8 +1,6 @@ -ACTOR MetalArmor : BasicArmorPickup 2019 +ACTOR MetalArmor : BasicArmorPickup { - Game Strife - SpawnID 69 ConversationID 129, 125, 128 Radius 20 Height 16 @@ -23,10 +21,8 @@ ACTOR MetalArmor : BasicArmorPickup 2019 } } -ACTOR LeatherArmor : BasicArmorPickup 2018 +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 6f38247fb..25f33f5e1 100644 --- a/wadsrc/static/actors/strife/strifebishop.txt +++ b/wadsrc/static/actors/strife/strifebishop.txt @@ -1,9 +1,8 @@ // Bishop ------------------------------------------------------------------- -ACTOR StrifeBishop 187 +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 74b957b83..289210ba2 100644 --- a/wadsrc/static/actors/strife/strifeitems.txt +++ b/wadsrc/static/actors/strife/strifeitems.txt @@ -1,8 +1,7 @@ // Med patch ----------------------------------------------------------------- -ACTOR MedPatch : HealthPickup 2011 +ACTOR MedPatch : HealthPickup { - Game Strife ConversationID 125, 121, 124 Health 10 +FLOORCLIP @@ -23,9 +22,8 @@ ACTOR MedPatch : HealthPickup 2011 // Medical Kit --------------------------------------------------------------- -ACTOR MedicalKit : HealthPickup 2012 +ACTOR MedicalKit : HealthPickup { - Game Strife ConversationID 126, 122, 125 Health 25 +FLOORCLIP @@ -46,9 +44,8 @@ ACTOR MedicalKit : HealthPickup 2012 // Surgery Kit -------------------------------------------------------------- -ACTOR SurgeryKit : HealthPickup 83 +ACTOR SurgeryKit : HealthPickup { - Game Strife ConversationID 127, 123, 126 +FLOORCLIP +INVENTORY.INVBAR @@ -68,10 +65,8 @@ ACTOR SurgeryKit : HealthPickup 83 // StrifeMap ---------------------------------------------------------------- -ACTOR StrifeMap : MapRevealer 2026 +ACTOR StrifeMap : MapRevealer { - Game Strife - SpawnID 137 ConversationID 164, 160, 163 +FLOORCLIP Inventory.PickupSound "misc/p_pkup" @@ -89,7 +84,6 @@ ACTOR StrifeMap : MapRevealer 2026 ACTOR BeldinsRing : Inventory { - Game Strife +NOTDMATCH +FLOORCLIP +INVENTORY.INVBAR @@ -109,9 +103,8 @@ ACTOR BeldinsRing : Inventory // Offering Chalice --------------------------------------------------------- -ACTOR OfferingChalice : Inventory 205 +ACTOR OfferingChalice : Inventory { - Game Strife +DROPPED +FLOORCLIP +INVENTORY.INVBAR @@ -135,7 +128,6 @@ ACTOR OfferingChalice : Inventory 205 ACTOR Ear : Inventory { - Game Strife +FLOORCLIP +INVENTORY.INVBAR ConversationID 175, 167, 171 @@ -154,9 +146,8 @@ ACTOR Ear : Inventory // Broken Power Coupling ---------------------------------------------------- -ACTOR BrokenPowerCoupling : Inventory 226 +ACTOR BrokenPowerCoupling : Inventory { - Game Strife ConversationID 289, -1, -1 Health 40 +DROPPED @@ -180,10 +171,8 @@ ACTOR BrokenPowerCoupling : Inventory 226 // Shadow Armor ------------------------------------------------------------- -ACTOR ShadowArmor : PowerupGiver 2024 +ACTOR ShadowArmor : PowerupGiver { - Game Strife - SpawnID 135 ConversationID 160, 156, 159 +FLOORCLIP +VISIBILITYPULSE @@ -207,10 +196,8 @@ ACTOR ShadowArmor : PowerupGiver 2024 // Environmental suit ------------------------------------------------------- -ACTOR EnvironmentalSuit : PowerupGiver 2025 +ACTOR EnvironmentalSuit : PowerupGiver { - Game Strife - SpawnID 136 ConversationID 161, 157, 160 +FLOORCLIP +INVENTORY.INVBAR @@ -232,9 +219,8 @@ ACTOR EnvironmentalSuit : PowerupGiver 2025 // Guard Uniform ------------------------------------------------------------ -ACTOR GuardUniform : Inventory 90 +ACTOR GuardUniform : Inventory { - Game Strife ConversationID 162, 158, 161 +FLOORCLIP +INVENTORY.INVBAR @@ -253,9 +239,8 @@ ACTOR GuardUniform : Inventory 90 // Officer's Uniform -------------------------------------------------------- -ACTOR OfficersUniform : Inventory 52 +ACTOR OfficersUniform : Inventory { - Game Strife ConversationID 163, 159, 162 +FLOORCLIP +INVENTORY.INVBAR @@ -275,7 +260,6 @@ ACTOR OfficersUniform : Inventory 52 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 @@ -333,9 +315,8 @@ ACTOR Info : Inventory // Targeter ----------------------------------------------------------------- -ACTOR Targeter : PowerupGiver 207 +ACTOR Targeter : PowerupGiver { - Game Strife ConversationID 167, 169, 173 +FLOORCLIP +INVENTORY.INVBAR @@ -356,9 +337,8 @@ ACTOR Targeter : PowerupGiver 207 // Communicator ----------------------------------------------------------------- -ACTOR Communicator : Inventory 206 +ACTOR Communicator : Inventory { - Game Strife ConversationID 176, 168, 172 +NOTDMATCH Tag "$TAG_COMMUNICATOR" @@ -375,9 +355,8 @@ ACTOR Communicator : Inventory 206 // Degnin Ore --------------------------------------------------------------- -ACTOR DegninOre : Inventory 59 native +ACTOR DegninOre : Inventory native { - Game Strife ConversationID 128, 124, 127 Health 10 Radius 16 @@ -412,7 +391,6 @@ ACTOR DegninOre : Inventory 59 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 @@ -452,9 +429,8 @@ ACTOR HealthTraining : Inventory native // Scanner ------------------------------------------------------------------ -ACTOR Scanner : PowerupGiver 2027 native +ACTOR Scanner : PowerupGiver native { - Game Strife ConversationID 165,-1,-1 +FLOORCLIP +INVENTORY.FANCYPICKUPSOUND @@ -476,7 +452,6 @@ ACTOR Scanner : PowerupGiver 2027 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 b304f83bc..ca8949417 100644 --- a/wadsrc/static/actors/strife/strifekeys.txt +++ b/wadsrc/static/actors/strife/strifekeys.txt @@ -8,9 +8,8 @@ ACTOR StrifeKey : Key // Base Key ----------------------------------------------------------------- -ACTOR BaseKey : StrifeKey 230 +ACTOR BaseKey : StrifeKey { - Game Strife ConversationID 133, 129, 132 Inventory.Icon "I_FUSL" Tag "$TAG_BASEKEY" @@ -28,7 +27,6 @@ ACTOR BaseKey : StrifeKey 230 ACTOR GovsKey : StrifeKey { - Game Strife ConversationID 134, 130, 133 Inventory.Icon "I_REBL" Tag "$TAG_GOVSKEY" @@ -44,9 +42,8 @@ ACTOR GovsKey : StrifeKey // Passcard ----------------------------------------------------------------- -ACTOR Passcard : StrifeKey 185 +ACTOR Passcard : StrifeKey { - Game Strife ConversationID 135, 131, 134 Inventory.Icon "I_TPAS" Tag "$TAG_PASSCARD" @@ -62,9 +59,8 @@ ACTOR Passcard : StrifeKey 185 // ID Badge ----------------------------------------------------------------- -ACTOR IDBadge : StrifeKey 184 +ACTOR IDBadge : StrifeKey { - Game Strife ConversationID 136, 132, 135 Inventory.Icon "I_CRD1" Tag "$TAG_IDBADGE" @@ -82,7 +78,6 @@ ACTOR IDBadge : StrifeKey 184 ACTOR PrisonKey : StrifeKey { - Game Strife ConversationID 137, 133, 136 Inventory.Icon "I_PRIS" Tag "$TAG_PRISONKEY" @@ -99,9 +94,8 @@ ACTOR PrisonKey : StrifeKey // Severed Hand ------------------------------------------------------------- -ACTOR SeveredHand : StrifeKey 91 +ACTOR SeveredHand : StrifeKey { - Game Strife ConversationID 138, 134, 137 Inventory.Icon "I_HAND" Tag "$TAG_SEVEREDHAND" @@ -120,7 +114,6 @@ ACTOR SeveredHand : StrifeKey 91 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" @@ -172,9 +163,8 @@ ACTOR Power3Key : StrifeKey // Gold Key ----------------------------------------------------------------- -ACTOR GoldKey : StrifeKey 40 +ACTOR GoldKey : StrifeKey { - Game Strife ConversationID 142, 138, 141 Inventory.Icon "I_KY1G" Tag "$TAG_GOLDKEY" @@ -190,9 +180,8 @@ ACTOR GoldKey : StrifeKey 40 // ID Card ------------------------------------------------------------------ -ACTOR IDCard : StrifeKey 13 +ACTOR IDCard : StrifeKey { - Game Strife ConversationID 143, 139, 142 Inventory.Icon "I_CRD2" Tag "$TAG_IDCARD" @@ -208,9 +197,8 @@ ACTOR IDCard : StrifeKey 13 // Silver Key --------------------------------------------------------------- -ACTOR SilverKey : StrifeKey 38 +ACTOR SilverKey : StrifeKey { - Game Strife ConversationID 144, 140, 143 Inventory.Icon "I_KY2S" Tag "$TAG_SILVERKEY" @@ -226,9 +214,8 @@ ACTOR SilverKey : StrifeKey 38 // Oracle Key --------------------------------------------------------------- -ACTOR OracleKey : StrifeKey 61 +ACTOR OracleKey : StrifeKey { - Game Strife ConversationID 145, 141, 144 Inventory.Icon "I_ORAC" Tag "$TAG_ORACLEKEY" @@ -246,7 +233,6 @@ ACTOR OracleKey : StrifeKey 61 ACTOR MilitaryID : StrifeKey { - Game Strife ConversationID 146, 142, 145 Inventory.Icon "I_GYID" Tag "$TAG_MILITARYID" @@ -262,9 +248,8 @@ ACTOR MilitaryID : StrifeKey // Order Key ---------------------------------------------------------------- -ACTOR OrderKey : StrifeKey 86 +ACTOR OrderKey : StrifeKey { - Game Strife ConversationID 147, 143, 146 Inventory.Icon "I_FUBR" Tag "$TAG_ORDERKEY" @@ -280,9 +265,8 @@ ACTOR OrderKey : StrifeKey 86 // Warehouse Key ------------------------------------------------------------ -ACTOR WarehouseKey : StrifeKey 166 +ACTOR WarehouseKey : StrifeKey { - Game Strife ConversationID 148, 144, 147 Inventory.Icon "I_WARE" Tag "$TAG_WAREHOUSEKEY" @@ -298,9 +282,8 @@ ACTOR WarehouseKey : StrifeKey 166 // Brass Key ---------------------------------------------------------------- -ACTOR BrassKey : StrifeKey 39 +ACTOR BrassKey : StrifeKey { - Game Strife ConversationID 149, 145, 148 Inventory.Icon "I_KY3B" Tag "$TAG_BRASSKEY" @@ -316,9 +299,8 @@ ACTOR BrassKey : StrifeKey 39 // Red Crystal Key ---------------------------------------------------------- -ACTOR RedCrystalKey : StrifeKey 192 +ACTOR RedCrystalKey : StrifeKey { - Game Strife ConversationID 150, 146, 149 Inventory.Icon "I_RCRY" Tag "$TAG_REDCRYSTALKEY" @@ -334,9 +316,8 @@ ACTOR RedCrystalKey : StrifeKey 192 // Blue Crystal Key --------------------------------------------------------- -ACTOR BlueCrystalKey : StrifeKey 193 +ACTOR BlueCrystalKey : StrifeKey { - Game Strife ConversationID 151, 147, 150 Inventory.Icon "I_BCRY" Tag "$TAG_BLUECRYSTALKEY" @@ -352,9 +333,8 @@ ACTOR BlueCrystalKey : StrifeKey 193 // Chapel Key --------------------------------------------------------------- -ACTOR ChapelKey : StrifeKey 195 +ACTOR ChapelKey : StrifeKey { - Game Strife ConversationID 152, 148, 151 Inventory.Icon "I_CHAP" Tag "$TAG_CHAPELKEY" @@ -372,7 +352,6 @@ ACTOR ChapelKey : StrifeKey 195 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" @@ -407,9 +385,8 @@ ACTOR SecurityKey : StrifeKey // Core Key ----------------------------------------------------------------- -ACTOR CoreKey : StrifeKey 236 +ACTOR CoreKey : StrifeKey { - Game Strife ConversationID 155, 151, 154 Inventory.Icon "I_GOID" Tag "$TAG_COREKEY" @@ -425,9 +402,8 @@ ACTOR CoreKey : StrifeKey 236 // Mauler Key --------------------------------------------------------------- -ACTOR MaulerKey : StrifeKey 233 +ACTOR MaulerKey : StrifeKey { - Game Strife ConversationID 156, 152, 155 Inventory.Icon "I_BLTK" Tag "$TAG_MAULERKEY" @@ -443,9 +419,8 @@ ACTOR MaulerKey : StrifeKey 233 // Factory Key -------------------------------------------------------------- -ACTOR FactoryKey : StrifeKey 234 +ACTOR FactoryKey : StrifeKey { - Game Strife ConversationID 157, 153, 156 Inventory.Icon "I_PROC" Tag "$TAG_FACTORYKEY" @@ -461,9 +436,8 @@ ACTOR FactoryKey : StrifeKey 234 // Mine Key ----------------------------------------------------------------- -ACTOR MineKey : StrifeKey 235 +ACTOR MineKey : StrifeKey { - Game Strife ConversationID 158, 154, 157 Inventory.Icon "I_MINE" Tag "$TAG_MINEKEY" @@ -481,7 +455,6 @@ ACTOR MineKey : StrifeKey 235 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 ef762cbb6..25ed31d66 100644 --- a/wadsrc/static/actors/strife/strifestuff.txt +++ b/wadsrc/static/actors/strife/strifestuff.txt @@ -1,8 +1,7 @@ // Tank 1 Huge ------------------------------------------------------------ -ACTOR Tank1 209 +ACTOR Tank1 { - Game Strife Radius 16 Height 192 +SOLID @@ -19,9 +18,8 @@ ACTOR Tank1 209 // Tank 2 Huge ------------------------------------------------------------ -ACTOR Tank2 210 +ACTOR Tank2 { - Game Strife Radius 16 Height 192 +SOLID @@ -38,9 +36,8 @@ ACTOR Tank2 210 // Tank 3 Huge ------------------------------------------------------------ -ACTOR Tank3 211 +ACTOR Tank3 { - Game Strife Radius 16 Height 192 +SOLID @@ -57,9 +54,8 @@ ACTOR Tank3 211 // Tank 4 ------------------------------------------------------------------- -ACTOR Tank4 213 +ACTOR Tank4 { - Game Strife Radius 16 Height 56 +SOLID @@ -76,9 +72,8 @@ ACTOR Tank4 213 // Tank 5 ------------------------------------------------------------------- -ACTOR Tank5 214 +ACTOR Tank5 { - Game Strife Radius 16 Height 56 +SOLID @@ -95,9 +90,8 @@ ACTOR Tank5 214 // Tank 6 ------------------------------------------------------------------- -ACTOR Tank6 229 +ACTOR Tank6 { - Game Strife Radius 16 Height 56 +SOLID @@ -114,9 +108,8 @@ ACTOR Tank6 229 // Water Bottle ------------------------------------------------------------- -ACTOR WaterBottle 2014 +ACTOR WaterBottle { - Game Strife ConversationID 131, -1, -1 States { @@ -128,9 +121,8 @@ ACTOR WaterBottle 2014 // Mug ---------------------------------------------------------------------- -ACTOR Mug 164 +ACTOR Mug { - Game Strife ConversationID 132, -1, -1 States { @@ -142,9 +134,8 @@ ACTOR Mug 164 // Wooden Barrel ------------------------------------------------------------ -ACTOR WoodenBarrel 82 +ACTOR WoodenBarrel { - Game Strife Health 10 Radius 10 Height 32 @@ -169,9 +160,8 @@ ACTOR WoodenBarrel 82 // Strife's explosive barrel ------------------------------------------------ -ACTOR ExplosiveBarrel2 94 +ACTOR ExplosiveBarrel2 { - Game Strife Health 30 Radius 10 Height 32 @@ -198,9 +188,8 @@ ACTOR ExplosiveBarrel2 94 // Light Silver, Fluorescent ---------------------------------------------- -ACTOR LightSilverFluorescent 95 +ACTOR LightSilverFluorescent { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -216,9 +205,8 @@ ACTOR LightSilverFluorescent 95 // Light Brown, Fluorescent ----------------------------------------------- -ACTOR LightBrownFluorescent 96 +ACTOR LightBrownFluorescent { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -234,9 +222,8 @@ ACTOR LightBrownFluorescent 96 // Light Gold, Fluorescent ------------------------------------------------ -ACTOR LightGoldFluorescent 97 +ACTOR LightGoldFluorescent { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -252,9 +239,8 @@ ACTOR LightGoldFluorescent 97 // Light Globe -------------------------------------------------------------- -ACTOR LightGlobe 2028 +ACTOR LightGlobe { - Game Strife Radius 16 Height 16 +SOLID @@ -269,9 +255,8 @@ ACTOR LightGlobe 2028 // Techno Pillar ------------------------------------------------------------ -ACTOR PillarTechno 48 +ACTOR PillarTechno { - Game Strife Radius 20 Height 128 +SOLID @@ -286,9 +271,8 @@ ACTOR PillarTechno 48 // Aztec Pillar ------------------------------------------------------------- -ACTOR PillarAztec 54 +ACTOR PillarAztec { - Game Strife Radius 16 Height 128 +SOLID @@ -303,9 +287,8 @@ ACTOR PillarAztec 54 // Damaged Aztec Pillar ----------------------------------------------------- -ACTOR PillarAztecDamaged 55 +ACTOR PillarAztecDamaged { - Game Strife Radius 16 Height 80 +SOLID @@ -320,9 +303,8 @@ ACTOR PillarAztecDamaged 55 // Ruined Aztec Pillar ------------------------------------------------------ -ACTOR PillarAztecRuined 56 +ACTOR PillarAztecRuined { - Game Strife Radius 16 Height 40 +SOLID @@ -337,9 +319,8 @@ ACTOR PillarAztecRuined 56 // Huge Tech Pillar --------------------------------------------------------- -ACTOR PillarHugeTech 57 +ACTOR PillarHugeTech { - Game Strife Radius 24 Height 192 +SOLID @@ -354,9 +335,8 @@ ACTOR PillarHugeTech 57 // Alien Power Crystal in a Pillar ------------------------------------------ -ACTOR PillarAlienPower 227 +ACTOR PillarAlienPower { - Game Strife Radius 24 Height 192 +SOLID @@ -372,9 +352,8 @@ ACTOR PillarAlienPower 227 // SStalactiteBig ----------------------------------------------------------- -ACTOR SStalactiteBig 98 +ACTOR SStalactiteBig { - Game Strife Radius 16 Height 54 +SOLID +SPAWNCEILING +NOGRAVITY @@ -389,9 +368,8 @@ ACTOR SStalactiteBig 98 // SStalactiteSmall --------------------------------------------------------- -ACTOR SStalactiteSmall 161 +ACTOR SStalactiteSmall { - Game Strife Radius 16 Height 40 +SOLID +SPAWNCEILING +NOGRAVITY @@ -406,9 +384,8 @@ ACTOR SStalactiteSmall 161 // SStalagmiteBig ----------------------------------------------------------- -ACTOR SStalagmiteBig 160 +ACTOR SStalagmiteBig { - Game Strife Radius 16 Height 40 +SOLID @@ -423,9 +400,8 @@ ACTOR SStalagmiteBig 160 // Cave Pillar Top ---------------------------------------------------------- -ACTOR CavePillarTop 159 +ACTOR CavePillarTop { - Game Strife Radius 16 Height 128 +SOLID +SPAWNCEILING +NOGRAVITY @@ -440,9 +416,8 @@ ACTOR CavePillarTop 159 // Cave Pillar Bottom ------------------------------------------------------- -ACTOR CavePillarBottom 162 +ACTOR CavePillarBottom { - Game Strife Radius 16 Height 128 +SOLID @@ -457,9 +432,8 @@ ACTOR CavePillarBottom 162 // SStalagmiteSmall --------------------------------------------------------- -ACTOR SStalagmiteSmall 163 +ACTOR SStalagmiteSmall { - Game Strife Radius 16 Height 25 +SOLID @@ -474,9 +448,8 @@ ACTOR SStalagmiteSmall 163 // Candle ------------------------------------------------------------------- -ACTOR Candle 34 +ACTOR Candle { - Game Strife ConversationID 222, -1, -1 States { @@ -488,9 +461,8 @@ ACTOR Candle 34 // StrifeCandelabra --------------------------------------------------------- -ACTOR StrifeCandelabra 35 +ACTOR StrifeCandelabra { - Game Strife Radius 16 Height 40 +SOLID @@ -505,9 +477,8 @@ ACTOR StrifeCandelabra 35 // Floor Water Drop --------------------------------------------------------- -ACTOR WaterDropOnFloor 103 +ACTOR WaterDropOnFloor { - Game Strife +NOBLOCKMAP ConversationID 224, -1, -1 ActiveSound "world/waterdrip" @@ -526,9 +497,8 @@ ACTOR WaterDropOnFloor 103 // Waterfall Splash --------------------------------------------------------- -ACTOR WaterfallSplash 104 +ACTOR WaterfallSplash { - Game Strife +NOBLOCKMAP ConversationID 225, -1, -1 ActiveSound "world/waterfall" @@ -543,9 +513,8 @@ ACTOR WaterfallSplash 104 // Ceiling Water Drip ------------------------------------------------------- -ACTOR WaterDrip 53 +ACTOR WaterDrip { - Game Strife Height 1 +NOBLOCKMAP +SPAWNCEILING +NOGRAVITY ConversationID 226, -1, -1 @@ -560,9 +529,8 @@ ACTOR WaterDrip 53 // WaterFountain ------------------------------------------------------------ -ACTOR WaterFountain 112 +ACTOR WaterFountain { - Game Strife +NOBLOCKMAP ConversationID 227, -1, -1 ActiveSound "world/watersplash" @@ -577,9 +545,8 @@ ACTOR WaterFountain 112 // Hearts in Tank ----------------------------------------------------------- -ACTOR HeartsInTank 113 +ACTOR HeartsInTank { - Game Strife Radius 16 Height 56 +SOLID @@ -594,9 +561,8 @@ ACTOR HeartsInTank 113 // Teleport Swirl ----------------------------------------------------------- -ACTOR TeleportSwirl 23 +ACTOR TeleportSwirl { - Game Strife +NOBLOCKMAP RenderStyle Add Alpha 0.25 @@ -612,9 +578,8 @@ ACTOR TeleportSwirl 23 // Dead Player -------------------------------------------------------------- // Strife's disappeared. This one doesn't. -ACTOR DeadStrifePlayer 15 +ACTOR DeadStrifePlayer { - Game Strife ConversationID 231, -1, -1 States { @@ -628,9 +593,8 @@ ACTOR DeadStrifePlayer 15 // Dead Peasant ------------------------------------------------------------- // Unlike Strife's, this one does not turn into gibs and disappear. -ACTOR DeadPeasant 18 +ACTOR DeadPeasant { - Game Strife ConversationID 232, -1, -1 States { @@ -643,9 +607,8 @@ ACTOR DeadPeasant 18 // Dead Acolyte ------------------------------------------------------------- // Unlike Strife's, this one does not turn into gibs and disappear. -ACTOR DeadAcolyte 21 +ACTOR DeadAcolyte { - Game Strife ConversationID 233, -1, -1 States { @@ -657,9 +620,8 @@ ACTOR DeadAcolyte 21 // Dead Reaver -------------------------------------------------------------- -ACTOR DeadReaver 20 +ACTOR DeadReaver { - Game Strife ConversationID 234, -1, -1 States { @@ -671,9 +633,8 @@ ACTOR DeadReaver 20 // Dead Rebel --------------------------------------------------------------- -ACTOR DeadRebel 19 +ACTOR DeadRebel { - Game Strife ConversationID 235, -1, -1 States { @@ -685,9 +646,8 @@ ACTOR DeadRebel 19 // Sacrificed Guy ----------------------------------------------------------- -ACTOR SacrificedGuy 212 +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 { @@ -716,9 +675,8 @@ ACTOR PileOfGuts // Burning Barrel ----------------------------------------------------------- -ACTOR StrifeBurningBarrel 70 +ACTOR StrifeBurningBarrel { - Game Strife Radius 16 Height 48 +SOLID @@ -733,9 +691,8 @@ ACTOR StrifeBurningBarrel 70 // Burning Bowl ----------------------------------------------------------- -ACTOR BurningBowl 105 +ACTOR BurningBowl { - Game Strife Radius 16 Height 16 +SOLID @@ -751,9 +708,8 @@ ACTOR BurningBowl 105 // Burning Brazier ----------------------------------------------------------- -ACTOR BurningBrazier 106 +ACTOR BurningBrazier { - Game Strife Radius 10 Height 32 +SOLID @@ -769,9 +725,8 @@ ACTOR BurningBrazier 106 // Small Torch Lit -------------------------------------------------------- -ACTOR SmallTorchLit 107 +ACTOR SmallTorchLit { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -790,9 +745,8 @@ ACTOR SmallTorchLit 107 // Small Torch Unlit -------------------------------------------------------- -ACTOR SmallTorchUnlit 108 +ACTOR SmallTorchUnlit { - Game Strife Radius 2.5 Height 16 +NOBLOCKMAP @@ -808,9 +762,8 @@ ACTOR SmallTorchUnlit 108 // Ceiling Chain ------------------------------------------------------------ -ACTOR CeilingChain 109 +ACTOR CeilingChain { - Game Strife Radius 20 Height 93 +NOBLOCKMAP +SPAWNCEILING +NOGRAVITY @@ -825,10 +778,9 @@ ACTOR CeilingChain 109 // Cage Light --------------------------------------------------------------- -ACTOR CageLight 28 +ACTOR CageLight { // No, it's not bright even though it's a light. - Game Strife Height 3 +NOBLOCKMAP +SPAWNCEILING +NOGRAVITY ConversationID 244, -1, -1 @@ -842,9 +794,8 @@ ACTOR CageLight 28 // Statue ------------------------------------------------------------------- -ACTOR Statue 110 +ACTOR Statue { - Game Strife Radius 20 Height 64 +SOLID @@ -859,9 +810,8 @@ ACTOR Statue 110 // Ruined Statue ------------------------------------------------------------ -ACTOR StatueRuined 44 +ACTOR StatueRuined { - Game Strife Radius 20 Height 56 +SOLID @@ -876,9 +826,8 @@ ACTOR StatueRuined 44 // Medium Torch ------------------------------------------------------------- -ACTOR MediumTorch 111 +ACTOR MediumTorch { - Game Strife Radius 4 Height 72 +SOLID @@ -893,10 +842,9 @@ ACTOR MediumTorch 111 // Outside Lamp ------------------------------------------------------------- -ACTOR OutsideLamp 43 +ACTOR OutsideLamp { // No, it's not bright. - Game Strife Radius 3 Height 80 +SOLID @@ -911,10 +859,9 @@ ACTOR OutsideLamp 43 // Pole Lantern ------------------------------------------------------------- -ACTOR PoleLantern 46 +ACTOR PoleLantern { // No, it's not bright. - Game Strife Radius 3 Height 80 +SOLID @@ -929,9 +876,8 @@ ACTOR PoleLantern 46 // Rock 1 ------------------------------------------------------------------- -ACTOR SRock1 99 +ACTOR SRock1 { - Game Strife +NOBLOCKMAP ConversationID 250, -1, -1 States @@ -944,9 +890,8 @@ ACTOR SRock1 99 // Rock 2 ------------------------------------------------------------------- -ACTOR SRock2 100 +ACTOR SRock2 { - Game Strife +NOBLOCKMAP ConversationID 251, -1, -1 States @@ -959,9 +904,8 @@ ACTOR SRock2 100 // Rock 3 ------------------------------------------------------------------- -ACTOR SRock3 101 +ACTOR SRock3 { - Game Strife +NOBLOCKMAP ConversationID 252, -1, -1 States @@ -974,9 +918,8 @@ ACTOR SRock3 101 // Rock 4 ------------------------------------------------------------------- -ACTOR SRock4 102 +ACTOR SRock4 { - Game Strife +NOBLOCKMAP ConversationID 253, -1, -1 States @@ -989,9 +932,8 @@ ACTOR SRock4 102 // Stick in Water ----------------------------------------------------------- -ACTOR StickInWater 215 +ACTOR StickInWater { - Game Strife +NOBLOCKMAP +FLOORCLIP ConversationID 254, -1, -1 @@ -1006,9 +948,8 @@ ACTOR StickInWater 215 // Rubble 1 ----------------------------------------------------------------- -ACTOR Rubble1 29 +ACTOR Rubble1 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 255, -1, -1 States @@ -1021,9 +962,8 @@ ACTOR Rubble1 29 // Rubble 2 ----------------------------------------------------------------- -ACTOR Rubble2 30 +ACTOR Rubble2 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 256, -1, -1 States @@ -1036,9 +976,8 @@ ACTOR Rubble2 30 // Rubble 3 ----------------------------------------------------------------- -ACTOR Rubble3 31 +ACTOR Rubble3 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 257, -1, -1 States @@ -1051,9 +990,8 @@ ACTOR Rubble3 31 // Rubble 4 ----------------------------------------------------------------- -ACTOR Rubble4 32 +ACTOR Rubble4 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 258, -1, -1 States @@ -1066,9 +1004,8 @@ ACTOR Rubble4 32 // Rubble 5 ----------------------------------------------------------------- -ACTOR Rubble5 36 +ACTOR Rubble5 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 259, -1, -1 States @@ -1081,9 +1018,8 @@ ACTOR Rubble5 36 // Rubble 6 ----------------------------------------------------------------- -ACTOR Rubble6 37 +ACTOR Rubble6 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 260, -1, -1 States @@ -1096,9 +1032,8 @@ ACTOR Rubble6 37 // Rubble 7 ----------------------------------------------------------------- -ACTOR Rubble7 41 +ACTOR Rubble7 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 261, -1, -1 States @@ -1111,9 +1046,8 @@ ACTOR Rubble7 41 // Rubble 8 ----------------------------------------------------------------- -ACTOR Rubble8 42 +ACTOR Rubble8 { - Game Strife +NOBLOCKMAP +NOCLIP ConversationID 262, -1, -1 States @@ -1126,9 +1060,8 @@ ACTOR Rubble8 42 // Surgery Crab ------------------------------------------------------------- -ACTOR SurgeryCrab 117 +ACTOR SurgeryCrab { - Game Strife +SOLID +SPAWNCEILING +NOGRAVITY Radius 20 Height 16 @@ -1143,9 +1076,8 @@ ACTOR SurgeryCrab 117 // Large Torch -------------------------------------------------------------- -ACTOR LargeTorch 47 +ACTOR LargeTorch { - Game Strife Radius 10 Height 72 +SOLID @@ -1161,9 +1093,8 @@ ACTOR LargeTorch 47 // Huge Torch -------------------------------------------------------------- -ACTOR HugeTorch 50 +ACTOR HugeTorch { - Game Strife Radius 10 Height 80 +SOLID @@ -1179,9 +1110,8 @@ ACTOR HugeTorch 50 // Palm Tree ---------------------------------------------------------------- -ACTOR PalmTree 51 +ACTOR PalmTree { - Game Strife Radius 15 Height 109 +SOLID @@ -1196,9 +1126,8 @@ ACTOR PalmTree 51 // Big Tree ---------------------------------------------------------------- -ACTOR BigTree2 202 +ACTOR BigTree2 { - Game Strife Radius 15 Height 109 +SOLID @@ -1213,9 +1142,8 @@ ACTOR BigTree2 202 // Potted Tree ---------------------------------------------------------------- -ACTOR PottedTree 203 +ACTOR PottedTree { - Game Strife Radius 15 Height 64 +SOLID @@ -1230,9 +1158,8 @@ ACTOR PottedTree 203 // Tree Stub ---------------------------------------------------------------- -ACTOR TreeStub 33 +ACTOR TreeStub { - Game Strife Radius 15 Height 80 +SOLID @@ -1247,9 +1174,8 @@ ACTOR TreeStub 33 // Short Bush --------------------------------------------------------------- -ACTOR ShortBush 60 +ACTOR ShortBush { - Game Strife Radius 15 Height 40 +SOLID @@ -1264,9 +1190,8 @@ ACTOR ShortBush 60 // Tall Bush --------------------------------------------------------------- -ACTOR TallBush 62 +ACTOR TallBush { - Game Strife Radius 20 Height 64 +SOLID @@ -1281,9 +1206,8 @@ ACTOR TallBush 62 // Chimney Stack ------------------------------------------------------------ -ACTOR ChimneyStack 63 +ACTOR ChimneyStack { - Game Strife Radius 20 Height 64 // This height does not fit the sprite +SOLID @@ -1298,9 +1222,8 @@ ACTOR ChimneyStack 63 // Barricade Column --------------------------------------------------------- -ACTOR BarricadeColumn 69 +ACTOR BarricadeColumn { - Game Strife Radius 16 Height 128 +SOLID @@ -1315,9 +1238,8 @@ ACTOR BarricadeColumn 69 // Pot ---------------------------------------------------------------------- -ACTOR Pot 165 +ACTOR Pot { - Game Strife Radius 12 Height 24 +SOLID @@ -1332,9 +1254,8 @@ ACTOR Pot 165 // Pitcher ------------------------------------------------------------------ -ACTOR Pitcher 188 +ACTOR Pitcher { - Game Strife Radius 12 Height 32 +SOLID @@ -1349,9 +1270,8 @@ ACTOR Pitcher 188 // Stool -------------------------------------------------------------------- -ACTOR Stool 189 +ACTOR Stool { - Game Strife Radius 6 Height 24 +SOLID @@ -1366,9 +1286,8 @@ ACTOR Stool 189 // Metal Pot ---------------------------------------------------------------- -ACTOR MetalPot 190 +ACTOR MetalPot { - Game Strife +NOBLOCKMAP ConversationID 277, -1, -1 States @@ -1381,9 +1300,8 @@ ACTOR MetalPot 190 // Tub ---------------------------------------------------------------------- -ACTOR Tub 191 +ACTOR Tub { - Game Strife +NOBLOCKMAP ConversationID 278, -1, -1 States @@ -1396,9 +1314,8 @@ ACTOR Tub 191 // Anvil -------------------------------------------------------------------- -ACTOR Anvil 194 +ACTOR Anvil { - Game Strife Radius 16 Height 32 +SOLID @@ -1413,9 +1330,8 @@ ACTOR Anvil 194 // Silver Tech Lamp ---------------------------------------------------------- -ACTOR TechLampSilver 196 +ACTOR TechLampSilver { - Game Strife Radius 11 Height 64 +SOLID @@ -1430,9 +1346,8 @@ ACTOR TechLampSilver 196 // Brass Tech Lamp ---------------------------------------------------------- -ACTOR TechLampBrass 197 +ACTOR TechLampBrass { - Game Strife Radius 8 Height 64 +SOLID @@ -1447,9 +1362,8 @@ ACTOR TechLampBrass 197 // Tray -------------------------------------------------------------------- -ACTOR Tray 68 +ACTOR Tray { - Game Strife Radius 24 Height 40 +SOLID @@ -1464,9 +1378,8 @@ ACTOR Tray 68 // AmmoFiller --------------------------------------------------------------- -ACTOR AmmoFiller 228 +ACTOR AmmoFiller { - Game Strife Radius 12 Height 24 +SOLID @@ -1481,9 +1394,8 @@ ACTOR AmmoFiller 228 // Sigil Banner ------------------------------------------------------------- -ACTOR SigilBanner 216 +ACTOR SigilBanner { - Game Strife Radius 24 Height 96 +NOBLOCKMAP // I take it this was once solid, yes? @@ -1498,9 +1410,8 @@ ACTOR SigilBanner 216 // RebelBoots --------------------------------------------------------------- -ACTOR RebelBoots 217 +ACTOR RebelBoots { - Game Strife +NOBLOCKMAP ConversationID 285, -1, -1 States @@ -1513,9 +1424,8 @@ ACTOR RebelBoots 217 // RebelHelmet -------------------------------------------------------------- -ACTOR RebelHelmet 218 +ACTOR RebelHelmet { - Game Strife +NOBLOCKMAP ConversationID 286, -1, -1 States @@ -1528,9 +1438,8 @@ ACTOR RebelHelmet 218 // RebelShirt --------------------------------------------------------------- -ACTOR RebelShirt 219 +ACTOR RebelShirt { - Game Strife +NOBLOCKMAP ConversationID 287, -1, -1 States @@ -1543,9 +1452,8 @@ ACTOR RebelShirt 219 // Alien Bubble Column ------------------------------------------------------ -ACTOR AlienBubbleColumn 221 +ACTOR AlienBubbleColumn { - Game Strife Radius 16 Height 128 +SOLID @@ -1561,9 +1469,8 @@ ACTOR AlienBubbleColumn 221 // Alien Floor Bubble ------------------------------------------------------- -ACTOR AlienFloorBubble 222 +ACTOR AlienFloorBubble { - Game Strife Radius 16 Height 72 +SOLID @@ -1579,9 +1486,8 @@ ACTOR AlienFloorBubble 222 // Alien Ceiling Bubble ----------------------------------------------------- -ACTOR AlienCeilingBubble 223 +ACTOR AlienCeilingBubble { - Game Strife Radius 16 Height 72 +SOLID +SPAWNCEILING +NOGRAVITY @@ -1597,9 +1503,8 @@ ACTOR AlienCeilingBubble 223 // Alien Asp Climber -------------------------------------------------------- -ACTOR AlienAspClimber 224 +ACTOR AlienAspClimber { - Game Strife Radius 16 Height 128 +SOLID @@ -1615,9 +1520,8 @@ ACTOR AlienAspClimber 224 // Alien Spider Light ------------------------------------------------------- -ACTOR AlienSpiderLight 225 +ACTOR AlienSpiderLight { - Game Strife Radius 32 Height 56 +SOLID @@ -1633,9 +1537,8 @@ ACTOR AlienSpiderLight 225 // Target Practice ----------------------------------------------------------- -ACTOR TargetPractice 208 +ACTOR TargetPractice { - Game Strife Health 99999999 PainChance 255 Radius 10 @@ -1659,9 +1562,8 @@ ACTOR TargetPractice 208 // Force Field Guard -------------------------------------------------------- -ACTOR ForceFieldGuard 25 native +ACTOR ForceFieldGuard native { - Game Strife Health 10 Radius 2 Height 1 @@ -1683,9 +1585,8 @@ ACTOR ForceFieldGuard 25 native // Kneeling Guy ------------------------------------------------------------- -ACTOR KneelingGuy 204 +ACTOR KneelingGuy { - Game Strife ConversationID 37,-1,-1 Health 51 Painchance 255 @@ -1732,9 +1633,8 @@ ACTOR KneelingGuy 204 // Klaxon Warning Light ----------------------------------------------------- -ACTOR KlaxonWarningLight 24 +ACTOR KlaxonWarningLight { - Game Strife ConversationID 121,-1,-1 ReactionTime 60 Radius 5 @@ -1757,9 +1657,8 @@ ACTOR KlaxonWarningLight 24 // CeilingTurret ------------------------------------------------------------ -ACTOR CeilingTurret 27 +ACTOR CeilingTurret { - Game Strife ConversationID 122,-1,-1 Health 125 Speed 0 @@ -1801,9 +1700,8 @@ ACTOR CeilingTurret 27 // Power Coupling ----------------------------------------------------------- -ACTOR PowerCoupling 220 native +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 3b256e226..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" @@ -150,9 +149,8 @@ ACTOR PoisonBolt native // Strife's Crossbow -------------------------------------------------------- -ACTOR StrifeCrossbow : StrifeWeapon 2001 +ACTOR StrifeCrossbow : StrifeWeapon { - Game Strife +FLOORCLIP ConversationID 194, 188, 192 Weapon.SelectionOrder 1200 @@ -203,7 +201,6 @@ ACTOR StrifeCrossbow : StrifeWeapon 2001 ACTOR StrifeCrossbow2 : StrifeCrossbow { - Game Strife Weapon.SelectionOrder 2700 Weapon.AmmoUse1 1 Weapon.AmmoGive1 0 @@ -238,9 +235,8 @@ ACTOR StrifeCrossbow2 : StrifeCrossbow // Assault Gun -------------------------------------------------------------- -actor AssaultGun : StrifeWeapon 2002 +actor AssaultGun : StrifeWeapon { - Game Strife ConversationID 188, 182, 186 +FLOORCLIP Weapon.SelectionOrder 600 @@ -277,9 +273,8 @@ actor AssaultGun : StrifeWeapon 2002 // Standing variant of the assault gun -------------------------------------- -ACTOR AssaultGunStanding : WeaponGiver 2006 +ACTOR AssaultGunStanding : WeaponGiver { - Game Strife ConversationID 189, 183, 187 DropItem "AssaultGun" Inventory.PickupMessage "$TXT_ASSAULTGUN" @@ -295,9 +290,8 @@ ACTOR AssaultGunStanding : WeaponGiver 2006 // Mini-Missile Launcher ---------------------------------------------------- -ACTOR MiniMissileLauncher : StrifeWeapon 2003 +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 @@ -401,9 +394,8 @@ ACTOR MiniMissile // Flame Thrower ------------------------------------------------------------ -ACTOR FlameThrower : StrifeWeapon 2005 +ACTOR FlameThrower : StrifeWeapon { - Game Strife ConversationID 190, 184, 188 +FLOORCLIP Weapon.SelectionOrder 2100 @@ -480,9 +472,8 @@ ACTOR FlameMissile // Mauler ------------------------------------------------------------------- // The scatter version -ACTOR Mauler : StrifeWeapon 2004 +ACTOR Mauler : StrifeWeapon { - Game Strife ConversationID 193, 187, 191 +FLOORCLIP Weapon.SelectionOrder 300 @@ -528,7 +519,6 @@ ACTOR Mauler : StrifeWeapon 2004 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 @@ -752,9 +740,8 @@ ACTOR PhosphorousFire native // High-Explosive Grenade Launcher ------------------------------------------ -ACTOR StrifeGrenadeLauncher : StrifeWeapon 154 +ACTOR StrifeGrenadeLauncher : StrifeWeapon { - Game Strife ConversationID 195, 189, 193 +FLOORCLIP Weapon.SelectionOrder 2400 @@ -803,7 +790,6 @@ ACTOR StrifeGrenadeLauncher : StrifeWeapon 154 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 c20aed49b..e11321e82 100644 --- a/wadsrc/static/actors/strife/templar.txt +++ b/wadsrc/static/actors/strife/templar.txt @@ -1,7 +1,6 @@ -ACTOR Templar 3003 +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 2b8f3d93e..2860cea11 100644 --- a/wadsrc/static/actors/strife/thingstoblowup.txt +++ b/wadsrc/static/actors/strife/thingstoblowup.txt @@ -21,9 +21,8 @@ ACTOR Bang4Cloud // Piston ------------------------------------------------------------------- -ACTOR Piston 45 +ACTOR Piston { - Game Strife ConversationID 123,-1,-1 Health 100 Speed 16 @@ -58,9 +57,8 @@ ACTOR Piston 45 // Computer ----------------------------------------------------------------- -ACTOR Computer 182 +ACTOR Computer { - Game Strife ConversationID 124,-1,-1 Health 80 Speed 27 @@ -98,9 +96,8 @@ ACTOR Computer 182 // Power Crystal ------------------------------------------------------------ -ACTOR PowerCrystal 92 +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 9788bc00f..064cf4ffa 100644 --- a/wadsrc/static/actors/strife/zombie.txt +++ b/wadsrc/static/actors/strife/zombie.txt @@ -1,9 +1,8 @@ // Zombie ------------------------------------------------------------------- -ACTOR Zombie : StrifeHumanoid 169 +ACTOR Zombie : StrifeHumanoid { - Game Strife Health 31 Radius 20 Height 56 @@ -43,9 +42,8 @@ ACTOR Zombie : StrifeHumanoid 169 // Zombie Spawner ----------------------------------------------------------- -ACTOR ZombieSpawner 170 +ACTOR ZombieSpawner { - Game Strife Health 20 +SHOOTABLE +NOSECTOR diff --git a/wadsrc/static/filter/doom/sndinfo.txt b/wadsrc/static/filter/doom/sndinfo.txt new file mode 100644 index 000000000..6028b11f0 --- /dev/null +++ b/wadsrc/static/filter/doom/sndinfo.txt @@ -0,0 +1,451 @@ +/****************************************************************************/ +/* */ +/* DOOM SOUNDS */ +/* */ +/****************************************************************************/ + +// BOOM has pitch shifting equivalent to a range of 4. I never got to hear +// Doom when it used pitch shifting, so I don't know if this is correct or not. +$pitchshiftrange 4 + +// This sound is never actually used. It's just defined here for +// compatibility with DeHackEd patches that reference dsskldth. +misc/unused dsskldth // Sounds just like dsoof + +//=========================================================================== +// +// Doom-specific player sounds +// +//=========================================================================== + +$playersound player male *death dspldeth +$playersound player male *xdeath dspdiehi +$playersound player male *gibbed dsslop +$playersound player male *pain100 dsplpain +$playersounddup player male *pain75 *pain100 +$playersounddup player male *pain50 *pain100 +$playersounddup player male *pain25 *pain100 +$playersound player male *grunt dsoof +$playersounddup player male *land *grunt +$playersound player male *jump dsjump +$playersound player male *fist dspunch +$playersound player male *usefail dsnoway + +$playersound player female *death dsfldeth +$playersound player female *xdeath dsfdiehi +$playersound player female *gibbed dsslop +$playersound player female *pain100 dsflpain +$playersounddup player female *pain75 *pain100 +$playersounddup player female *pain50 *pain100 +$playersounddup player female *pain25 *pain100 +$playersound player female *grunt dsfoof +$playersounddup player female *land *grunt +$playersound player female *jump dsfjump +$playersound player female *fist dspunch +$playersound player female *usefail dsfnoway + +$playersound player other *death dscldeth +$playersound player other *xdeath dscdiehi +$playersound player other *gibbed dsslop +$playersound player other *pain100 dsclpain +$playersounddup player other *pain75 *pain100 +$playersounddup player other *pain50 *pain100 +$playersounddup player other *pain25 *pain100 +$playersound player other *grunt dscoof +$playersounddup player other *land *grunt +$playersound player other *jump dscjump +$playersound player other *fist dspunch +$playersound player other *usefail dscnoway + +// Alternate names for some player sounds needed for ZDoom <= 1.22 compatibility +// +// If any sounds with these names are defined later, they will redefine +// the corresponding player sounds instead. Likewise, if they are played, +// they will play the corresponding player sound instead. + +$playercompat player male *death player/male/death1 +$playercompat player male *death player/male/death2 +$playercompat player male *death player/male/death3 +$playercompat player male *death player/male/death4 +$playercompat player male *xdeath player/male/xdeath1 +$playercompat player male *pain100 player/male/pain100_1 +$playercompat player male *pain100 player/male/pain100_2 +$playercompat player male *pain75 player/male/pain75_1 +$playercompat player male *pain75 player/male/pain75_2 +$playercompat player male *pain50 player/male/pain50_1 +$playercompat player male *pain50 player/male/pain50_2 +$playercompat player male *pain25 player/male/pain25_1 +$playercompat player male *pain25 player/male/pain25_2 +$playercompat player male *grunt player/male/grunt1 +$playercompat player male *land player/male/land1 +$playercompat player male *jump player/male/jump1 +$playercompat player male *gibbed player/male/gibbed +$playercompat player male *fist player/male/fist + +$playercompat player female *death player/female/death1 +$playercompat player female *death player/female/death2 +$playercompat player female *death player/female/death3 +$playercompat player female *death player/female/death4 +$playercompat player female *xdeath player/female/xdeath1 +$playercompat player female *pain100 player/female/pain100_1 +$playercompat player female *pain100 player/female/pain100_2 +$playercompat player female *pain75 player/female/pain75_1 +$playercompat player female *pain75 player/female/pain75_2 +$playercompat player female *pain50 player/female/pain50_1 +$playercompat player female *pain50 player/female/pain50_2 +$playercompat player female *pain25 player/female/pain25_1 +$playercompat player female *pain25 player/female/pain25_2 +$playercompat player female *grunt player/female/grunt1 +$playercompat player female *land player/female/land1 +$playercompat player female *jump player/female/jump1 +$playercompat player female *gibbed player/female/gibbed +$playercompat player female *fist player/female/fist + +$playercompat player other *death player/cyborg/death1 +$playercompat player other *death player/cyborg/death2 +$playercompat player other *death player/cyborg/death3 +$playercompat player other *death player/cyborg/death4 +$playercompat player other *xdeath player/cyborg/xdeath1 +$playercompat player other *pain100 player/cyborg/pain100_1 +$playercompat player other *pain100 player/cyborg/pain100_2 +$playercompat player other *pain75 player/cyborg/pain75_1 +$playercompat player other *pain75 player/cyborg/pain75_2 +$playercompat player other *pain50 player/cyborg/pain50_1 +$playercompat player other *pain50 player/cyborg/pain50_2 +$playercompat player other *pain25 player/cyborg/pain25_1 +$playercompat player other *pain25 player/cyborg/pain25_2 +$playercompat player other *grunt player/cyborg/grunt1 +$playercompat player other *land player/cyborg/land1 +$playercompat player other *jump player/cyborg/jump1 +$playercompat player other *gibbed player/cyborg/gibbed +$playercompat player other *fist player/cyborg/fist + +// +// Weapons +// + +$pitchshiftrange 3 +weapons/sawup dssawup +weapons/sawidle dssawidl +weapons/sawfull dssawful +weapons/sawhit dssawhit +$pitchshiftrange 4 + +weapons/pistol dspistol +weapons/shotgf dsshotgn +weapons/shotgr dssgcock +weapons/sshotf dsdshtgn +weapons/sshoto dsdbopn +weapons/sshotc dsdbcls +weapons/sshotl dsdbload +weapons/chngun dspistol +weapons/rocklx dsbarexp +weapons/rocklf dsrlaunc +weapons/plasmaf dsplasma +weapons/plasmax dsfirxpl +weapons/bfgf dsbfg +weapons/bfgx dsrxplod +weapons/railgf railgf1 +weapons/grbnce dsbounce +weapons/grenlx dsgrnexp +weapons/grenlf dsglaunc + +// Problem: weapons/rocklx needs to be unlimited but +// is also used for the MAP30 brain explosion. +// This alias remaps to the original but has its own limit +// attached so that it doesn't become too loud. +$alias misc/brainexplode weapons/rocklx +$limit misc/brainexplode 4 + +$limit weapons/plasmaf 0 +$limit weapons/chngun 0 +$limit weapons/rocklf 0 // because normal running is almost as fast as a rocket +$limit weapons/rocklx 0 // and the cyberdemon shoots 3 at once + +//=========================================================================== +// +// MONSTER SOUNDS +// +//=========================================================================== + +misc/gibbed dsslop + +// Zombie man + +$random grunt/sight { grunt/sight1 grunt/sight2 grunt/sight3 } +$random grunt/death { grunt/death1 grunt/death2 grunt/death3 } +grunt/sight1 dsposit1 +grunt/sight2 dsposit2 +grunt/sight3 dsposit3 +grunt/active dsposact +grunt/pain dspopain +grunt/death1 dspodth1 +grunt/death2 dspodth2 +grunt/death3 dspodth3 +grunt/attack dspistol + +// Shotgun guy + +$random shotguy/sight { shotguy/sight1 shotguy/sight2 shotguy/sight3 } +$random shotguy/death { shotguy/death1 shotguy/death2 shotguy/death3 } +shotguy/sight1 dsposit1 +shotguy/sight2 dsposit2 +shotguy/sight3 dsposit3 +shotguy/active dsposact +shotguy/pain dspopain +shotguy/death1 dspodth1 +shotguy/death2 dspodth2 +shotguy/death3 dspodth3 +shotguy/attack dsshotgn + +// Archvile + +vile/sight dsvilsit +vile/active dsvilact +vile/pain dsvipain +vile/death dsvildth +vile/raise dsslop +vile/start dsvilatk +vile/stop dsbarexp +vile/firestrt dsflamst +vile/firecrkl dsflame + +// Revenant + +skeleton/sight dsskesit +skeleton/active dsskeact +skeleton/pain dspopain +skeleton/melee dsskepch +skeleton/swing dsskeswg +skeleton/death dsskedth +skeleton/attack dsskeatk +skeleton/tracex dsbarexp + +// Fatso + +fatso/sight dsmansit +fatso/active dsposact +fatso/pain dsmnpain +fatso/raiseguns dsmanatk +fatso/death dsmandth +fatso/attack dsfirsht +fatso/shotx dsfirxpl + +// Chainguy + +$random chainguy/sight { chainguy/sight1 chainguy/sight2 chainguy/sight3 } +$random chainguy/death { chainguy/death1 chainguy/death2 chainguy/death3 } +chainguy/sight1 dsposit1 +chainguy/sight2 dsposit2 +chainguy/sight3 dsposit3 +chainguy/active dsposact +chainguy/pain dspopain +chainguy/death1 dspodth1 +chainguy/death2 dspodth2 +chainguy/death3 dspodth3 +chainguy/attack dsshotgn +$limit chainguy/attack 0 + +// Imp + +$random imp/sight { imp/sight1 imp/sight2 } +$random imp/death { imp/death1 imp/death2 } +imp/sight1 dsbgsit1 +imp/sight2 dsbgsit2 +imp/active dsbgact +imp/pain dspopain +imp/melee dsclaw +imp/death1 dsbgdth1 +imp/death2 dsbgdth2 +imp/attack dsfirsht +imp/shotx dsfirxpl +$limit imp/active 6 + +// Demon + +demon/sight dssgtsit +demon/active dsdmact +demon/pain dsdmpain +demon/melee dssgtatk +demon/death dssgtdth +$limit demon/melee 4 + +// Spectre + +spectre/sight dssgtsit +spectre/active dsdmact +spectre/pain dsdmpain +spectre/melee dssgtatk +spectre/death dssgtdth + +// Cacodemon + +caco/sight dscacsit +caco/active dsdmact +caco/pain dsdmpain +caco/death dscacdth +caco/attack dsfirsht +caco/shotx dsfirxpl + +// Baron of Hell + +baron/sight dsbrssit +baron/active dsdmact +baron/pain dsdmpain +baron/melee dsclaw +baron/death dsbrsdth +baron/attack dsfirsht +baron/shotx dsfirxpl + +// Hell Knight + +knight/sight dskntsit +knight/active dsdmact +knight/pain dsdmpain +knight/death dskntdth + +// Lost Soul + +skull/active dsdmact +skull/pain dsdmpain +skull/melee dssklatk +skull/death dsfirxpl + +// Spider Mastermind + +spider/sight dsspisit +spider/active dsdmact +spider/pain dsdmpain +spider/attack dsshotgn +spider/death dsspidth +spider/walk dsmetal + +// Arachnotron + +baby/sight dsbspsit +baby/active dsbspact +baby/pain dsdmpain +baby/death dsbspdth +baby/walk dsbspwlk +baby/attack dsplasma +baby/shotx dsfirxpl + +$limit baby/attack 0 + +// Cyber Demon + +cyber/sight dscybsit +cyber/active dsdmact +cyber/pain dsdmpain +cyber/death dscybdth +cyber/hoof dshoof + +// Pain Elemental + +pain/sight dspesit +pain/active dsdmact +pain/pain dspepain +pain/death dspedth + +// Wolfenstein SS + +wolfss/sight dssssit +wolfss/active dsposact +wolfss/pain dspopain +wolfss/death dsssdth +wolfss/attack dsshotgn + +// Commander Keen + +keen/pain dskeenpn +keen/death dskeendt + +// Boss Brain + +brain/sight dsbossit +brain/pain dsbospn +brain/death dsbosdth +brain/spit dsbospit +brain/cube dsboscub +brain/cubeboom dsfirxpl +$alias brain/spawn misc/teleport + + +//============================================================================ +// +// WORLD SOUNDS +// +//=========================================================================== + +world/barrelx dsbarexp + +world/drip dsempty +world/watersplash dsempty +world/sludgegloop dsempty +world/lavasizzle dsempty + +// +// +// Platform Sounds +// + +plats/pt1_strt dspstart +plats/pt1_stop dspstop +plats/pt1_mid dsstnmov + +// +// Door Sounds +// + +doors/dr1_open dsdoropn +doors/dr1_clos dsdorcls +doors/dr2_open dsbdopn +doors/dr2_clos dsbdcls + +//=========================================================================== +// +// MISCELLANEOUS SOUNDS +// +//=========================================================================== + +misc/secret dssecret +misc/w_pkup dswpnup // Pickup weapon +misc/p_pkup dsgetpow // Pickup powerup +misc/i_pkup dsitemup // Pickup item +misc/k_pkup dsitemup // Pickup key +misc/spawn dsitmbk // Item respawn +misc/chat dsradio // Doom 2 chat sound +misc/chat2 dstink // Chat sound for everything else + +$limit misc/i_pkup 1 +$limit misc/k_pkup 1 +$limit misc/w_pkup 1 +$limit misc/p_pkup 1 +$pitchshift misc/i_pkup 0 +$pitchshift misc/k_pkup 0 +$pitchshift misc/chat2 0 + +switches/normbutn dsswtchn +switches/exitbutn dsswtchx + +misc/teleport dstelept + +menu/activate dsswtchn // Activate a new menu +menu/backup dsswtchn // Backup to previous menu +menu/prompt dsswtchn // Activate a prompt "menu" +menu/cursor dspstop // Move cursor up/down +menu/change dsstnmov // Select new value for option +menu/invalid dsoof // Menu not available +menu/dismiss dsswtchx // Dismiss a prompt message +menu/choose dspistol // Choose a menu item +menu/clear dsswtchx // Close top menu + +$random menu/quit1 { player/male/death1 demon/pain grunt/pain misc/gibbed misc/teleport grunt/sight1 grunt/sight3 demon/melee } +$random menu/quit2 { vile/active misc/p_pkup brain/cube misc/gibbed skeleton/swing knight/death baby/active demon/melee } + +$alias intermission/tick weapons/pistol +$alias intermission/cooptotal *death +$alias intermission/nextstage weapons/rocklx +$alias intermission/paststats weapons/shotgr +$alias intermission/pastcoopstats weapons/shotgr +$alias intermission/pastdmstats *gibbed diff --git a/wadsrc/static/filter/heretic/sndinfo.txt b/wadsrc/static/filter/heretic/sndinfo.txt new file mode 100644 index 000000000..cb3fe1e73 --- /dev/null +++ b/wadsrc/static/filter/heretic/sndinfo.txt @@ -0,0 +1,291 @@ +/****************************************************************************/ +/* */ +/* HERETIC SOUNDS */ +/* */ +/****************************************************************************/ + +$rolloff * custom 0 1600 + +$pitchshiftrange 2 + +$playersound player male *wimpydeath plrwdth +$playersound player male *death plrdth +$playersound player male *crazydeath plrcdth +$playersound player male *gibbed gibdth +$playersound player male *pain100 plrpai +$playersounddup player male *pain75 *pain100 +$playersounddup player male *pain50 *pain100 +$playersounddup player male *pain25 *pain100 +$playersound player male *weaponlaugh wpnup +$playersounddup player male *evillaugh *weaponlaugh +$playersound player male *grunt plroof +$playersounddup player male *usefail *grunt +$playersounddup player male *land *grunt +$playersound player male *jump plrjmp +$playersound player male *burndeath hedat1 + +$playeralias chicken male *usefail chicken/peck +$PlayerAlias Chicken Male *Grunt chicken/pain +$PlayerAlias Chicken Male *Land chicken/pain +$PlayerAlias Chicken Male *Jump chicken/active +$PlayerAlias Chicken Male *EvilLaugh chicken/active + +chicken/sight chicpai +chicken/pain chicpai +chicken/death chicdth +chicken/attack chicatk + +misc/burn hedat1 + +weapons/staffhit stfhit +weapons/staffpowerhit stfpow +weapons/staffcrackle stfcrk +weapons/wandhit gldhit +weapons/bowshoot bowsht +weapons/bowhit hrnhit +weapons/gauntletsactivate gntact +weapons/gauntletsuse gntuse +weapons/gauntletson gntful +weapons/gauntletshit gnthit +weapons/gauntletspowhit gntpow +weapons/maceshoot lobsht +weapons/macebounce bounce +weapons/macehit lobhit +weapons/macestop pstop +weapons/maceexplode phohit +weapons/blasterhit blshit +weapons/blasterpowhit hrnhit +weapons/blastershoot blssht +weapons/hornrodshoot hrnsht +weapons/hornrodhit hrnhit +weapons/hornrodpowshoot hrnpow +weapons/hornrodpowhit ramphit +weapons/phoenixshoot phosht +weapons/phoenixhit phohit +weapons/phoenixpowshoot phopow + +$limit weapons/gauntletson 0 +$limit weapons/gauntletshit 0 +$limit weapons/gauntletspowhit 0 +$limit weapons/gauntletsactivate 0 +$limit weapons/gauntletsuse 0 +$limit weapons/maceexplode 0 +$limit weapons/phoenixhit 0 +$limit weapons/phoenixpowshoot 1 + +// [RH] Heretic didn't have these limitless, but they can sound bad if they're not +$limit weapons/bowhit 0 +$limit weapons/hornrodshoot 0 +$limit weapons/hornrodhit 0 +$limit weapons/maceshoot 0 + +himp/sight impsit +himp/attack impat1 +himp/pain imppai +himp/death impdth +himp/active impsit +himp/leaderattack impat2 + +misc/invuse artiuse + +$limit misc/invuse 1 + +world/podexplode podexp +world/podgrow newpod +world/wind wind +world/waterfall waterfl + +$limit world/podexplode 0 +$limit world/podgrow 0 +$limit world/wind 1 + +misc/i_pkup itemup +misc/k_pkup keyup +misc/p_pkup artiup +$alias misc/w_pkup *weaponlaugh + +misc/rain ramrain +misc/spawn respawn + +$limit misc/spawn 1 + +// +// Minotaur sounds +// + +minotaur/sight minsit +minotaur/melee stfpow +minotaur/attack1 minat1 +minotaur/attack2 minat2 +minotaur/attack3 minat3 +minotaur/pain minpai +minotaur/death mindth +minotaur/active minact +minotaur/fx2hit phohit +minotaur/fx3hit phohit + +// +// Wizard sounds +// + +wizard/sight wizsit +wizard/attack wizatk +wizard/death wizdth +wizard/pain wizpai +wizard/active1 wizact +$random wizard/active { wizard/sight wizard/active1 } + +// +// Switch sounds +// + +switches/normbutn switch +$alias switches/exitbutn switches/normbutn // Heretic has no special exit button sound + +// +// +// Platform Sounds +// + +plats/pt1_strt pstart +plats/pt1_stop pstop +plats/pt1_mid dormov + +// +// Door Sounds +// + +doors/dr1_open doropn +doors/dr1_clos dorcls +doors/dr2_open doropn +doors/dr2_clos dorcls + +// +// Ambient sounds +// + +world/amb1 amb1 +world/amb2 amb2 +world/amb3 amb3 +world/amb4 amb4 +world/amb5 amb5 +world/amb6 amb6 +world/amb7 amb7 +world/amb8 amb8 +world/amb9 amb9 +world/amb10 amb10 +world/amb11 amb11 +world/amb12 bstsit + +$limit world/amb1 1 +$limit world/amb2 1 +$limit world/amb3 1 +$limit world/amb4 1 +$limit world/amb5 1 +$limit world/amb6 1 +$limit world/amb7 1 +$limit world/amb8 1 +$limit world/amb9 1 +$limit world/amb10 1 +$limit world/amb11 0 + +misc/chat chat +misc/teleport telept +misc/ripslop ripslop + +$limit misc/chat 1 + +world/drip gloop +world/watersplash gloop +world/lavasizzle burn +world/sludgegloop dsempty + +mummy/sight mumsit +mummy/attack1 mumat1 +mummy/attack2 mumat2 +mummy/pain mumpai +mummy/death mumdth +mummy/active mumsit +mummy/head mumhed + +beast/sight bstsit +beast/attack bstatk +beast/pain bstpai +beast/death bstdth +beast/active bstact + +snake/attack snkatk +snake/sight snksit +snake/pain snkpai +snake/death snkdth +snake/active snkact + +clink/sight clksit +clink/attack clkatk +clink/pain clkpai +clink/death clkdth +clink/active clkact + +hknight/sight kgtsit +hknight/attack kgtatk +hknight/melee kgtat2 +hknight/pain kgtpai +hknight/death kgtdth +hknight/active kgtsit +hknight/hit hrnhit +hknight/axewhoosh kgtatk + +misc/timebomb phohit +world/volcano/blast lobhit +world/volcano/shoot bstatk + +ironlich/sight hedsit +ironlich/attack1 hedat1 +ironlich/attack2 hedat2 +ironlich/attack3 hedat3 +ironlich/pain hedpai +ironlich/death heddth +ironlich/active hedact + +dsparilserpent/sight bstsit +dsparilserpent/attack bstatk +dsparilserpent/pain sbtpai +dsparilserpent/death sbtdth +dsparilserpent/active sbtact + +dsparil/sight sorsit +dsparil/attack soratk +dsparil/pain sorpai +dsparil/active soract +dsparil/rise sorrise +dsparil/zap sorzap +dsparil/scream sordsph +dsparil/explode sordexp +dsparil/bones sordbon + +chicken/active chicact +chicken/attack chicatk +chicken/pain chicpai +chicken/death chicdth +chicken/peck1 chicpk1 +chicken/peck2 chicpk2 +chicken/peck3 chicpk3 +$random chicken/peck { chicken/peck1 chicken/peck2 chicken/peck3 } + +menu/activate dorcls +menu/backup switch +menu/prompt chat +menu/choose dorcls +menu/cursor switch +menu/change keyup +menu/invalid plroof +menu/dismiss dorcls +menu/clear dorcls + +misc/secret dssecret + +$alias intermission/cooptotal *death +$alias intermission/nextstage doors/dr1_clos +$alias intermission/paststats plats/pt1_stop +$alias intermission/pastcoopstats plats/pt1_stop +$alias intermission/pastdmstats *gibbed diff --git a/wadsrc/static/filter/hexen/sndinfo.txt b/wadsrc/static/filter/hexen/sndinfo.txt new file mode 100644 index 000000000..85d7a75dd --- /dev/null +++ b/wadsrc/static/filter/hexen/sndinfo.txt @@ -0,0 +1,190 @@ +/****************************************************************************/ +/* */ +/* HEXEN SOUNDS */ +/* */ +/****************************************************************************/ + +$rolloff * custom 0 2025 + +$pitchshiftrange 3 + +$random PlayerFighterExtremeDeathPicker { PlayerFighterExtreme1Death + PlayerFighterExtreme2Death + PlayerFighterExtreme3Death } + +$playeralias fighter male *death PlayerFighterNormalDeath +$playeralias fighter male *crazydeath PlayerFighterCrazyDeath +$playeralias fighter male *burndeath PlayerFighterBurnDeath +$playeralias fighter male *xdeath PlayerFighterExtremeDeathPicker +$playeralias fighter male *pain100 PlayerFighterPain +$playersounddup fighter male *pain75 *pain100 +$playersounddup fighter male *pain50 *pain100 +$playersounddup fighter male *pain25 *pain100 +$playeralias fighter male *grunt PlayerFighterGrunt +$playeralias fighter male *land PlayerLand +$playeralias fighter male *poison PlayerPoisonCough +$playeralias fighter male *falling PlayerFighterFallingScream +$playeralias fighter male *splat PlayerFallingSplat +$playeralias fighter male *usefail PlayerFighterFailedUse +$playeralias fighter male *puzzfail PuzzleFailFighter +$playersound fighter male *jump fgtjump +$playeralias fighter male *fistgrunt FighterGrunt + +$random PlayerClericExtremeDeathPicker { PlayerClericExtreme1Death + PlayerClericExtreme2Death + PlayerClericExtreme3Death } + +$playeralias cleric male *death PlayerClericNormalDeath +$playeralias cleric male *crazydeath PlayerClericCrazyDeath +$playeralias cleric male *burndeath PlayerClericBurnDeath +$playeralias cleric male *xdeath PlayerClericExtremeDeathPicker +$playeralias cleric male *pain100 PlayerClericPain +$playersounddup cleric male *pain75 *pain100 +$playersounddup cleric male *pain50 *pain100 +$playersounddup cleric male *pain25 *pain100 +$playeralias cleric male *grunt PlayerClericGrunt +$playeralias cleric male *land PlayerLand +$playeralias cleric male *poison PlayerPoisonCough +$playeralias cleric male *falling PlayerClericFallingScream +$playeralias cleric male *splat PlayerFallingSplat +$playeralias cleric male *usefail PlayerClericFailedUse +$playeralias cleric male *puzzfail PuzzleFailCleric +$playersound cleric male *jump plrjump + +$random PlayerMageExtremeDeathPicker { PlayerMageExtreme1Death + PlayerMageExtreme2Death + PlayerMageExtreme3Death } + +$playeralias mage male *death PlayerMageNormalDeath +$playeralias mage male *crazydeath PlayerMageCrazyDeath +$playeralias mage male *burndeath PlayerMageBurnDeath +$playeralias mage male *xdeath PlayerMageExtremeDeathPicker +$playeralias mage male *pain100 PlayerMagePain +$playersounddup mage male *pain75 *pain100 +$playersounddup mage male *pain50 *pain100 +$playersounddup mage male *pain25 *pain100 +$playeralias mage male *grunt PlayerMageGrunt +$playeralias mage male *land PlayerLand +$playeralias mage male *poison PlayerPoisonCough +$playeralias mage male *falling PlayerMageFallingScream +$playeralias mage male *splat PlayerFallingSplat +$playeralias mage male *usefail PlayerMageFailedUse +$playeralias mage male *puzzfail PuzzleFailMage +$playersound mage male *jump mgjump + +$playeralias pig male *usefail PigActive1 +$playeralias pig male *puzzfail PigActive2 +$playeralias pig male *grunt PigActive1 +$playeralias pig male *land PigActive2 +$playeralias pig male *jump PigActive1 +$playeralias pig male *poison PigActive2 +$playeralias pig male *falling PigPain +$playeralias pig male *splat PigDeath + +$alias world/drip Ambient10 +$alias world/watersplash WaterSplash +$alias world/lavasizzle LavaSizzle +$alias world/sludgegloop SludgeGloop +$alias world/wind Wind +$alias world/quake Earthquake +$alias world/thunder ThunderCrash + +$alias misc/w_pkup PickupWeapon +$alias misc/p_pkup PickupArtifact +$alias misc/k_pkup PickupKey +$alias misc/i_pkup PickupItem +$alias misc/spawn Respawn +$alias misc/teleport Teleport +$alias misc/keytry DoorLocked +$alias misc/invuse UseArtifact +$alias misc/freeze FreezeDeath +$alias misc/icebreak FreezeShatter + +$alias misc/chat Chat +$alias misc/chat2 Chat + +$alias misc/fallingsplat PlayerFallingSplat + +$alias minotaur/sight MaulatorSight +$alias minotaur/pain MaulatorPain +$alias minotaur/death MaulatorDeath +$alias minotaur/active MaulatorActive +$alias minotaur/attack1 MaulatorHamHit +$alias minotaur/attack2 MaulatorHamSwing + +$random BishopActiveSounds { BishopActive BishopSight } +$random PigActive { PigActive1 PigActive2 } + +$limit PlayerFighterFailedUse 1 +$limit PlayerClericFailedUse 1 +$limit PlayerMageFailedUse 1 +$limit SorcererBallWoosh 4 +$limit SorcererBallBounce 3 +$limit SorcererBallExplode 3 +$limit SorcererBallPop 3 +$limit SorcererBigBallExplode 3 +$limit Ambient1 1 +$limit Ambient2 1 +$limit Ambient3 1 +$limit Ambient4 1 +$limit Ambient5 1 +$limit Ambient6 1 +$limit Ambient7 1 +$limit Ambient8 1 +$limit Ambient9 1 +$limit Ambient10 1 +$limit Ambient11 1 +$limit Ambient12 1 +$limit Ambient13 1 +$limit Ambient14 1 +$limit Ambient15 1 +$limit MysticIncant 4 + +$pitchshift PlayerMageNormalDeath 0 +$pitchshift PlayerMageCrazyDeath 0 +$pitchshift PlayerMageExtreme1Death 0 +$pitchshift PlayerMageExtreme2Death 0 +$pitchshift PlayerMageExtreme3Death 0 +$pitchshift PlayerMageBurnDeath 0 +$pitchshift PlayerMagePain 0 +$pitchshift PlayerMageGrunt 0 +$pitchshift PlayerMageFallingScream 0 +$pitchshift PlayerMageFailedUse 0 +$pitchshift PickupWeapon 0 +$pitchshift PickupPiece 0 +$pitchshift WeaponBuild 0 +$pitchshift BellRing 0 + +$alias menu/activate DoorCloseLight +$alias menu/backup PickupKey +$alias menu/prompt Chat +$alias menu/cursor FighterHammerHitWall +$alias menu/change PickupKey +$alias menu/invalid DoorCloseMetal // Hexen does not use this, but I do +$alias menu/dismiss PlatformStop +$alias menu/choose DoorCloseLight +$alias menu/clear PlatformStop + +// Hexen does not have ripslop sound like Heretic +misc/ripslop dsempty +misc/netnotch blddrp1 + +$alias intermission/cooptotal *death +$alias intermission/nextstage DoorCloseLight +$alias intermission/paststats PlatformStop +$alias intermission/pastcoopstats PlatformStop +$alias intermission/pastdmstats *gibbed + +$limit DoorCloseLight 4 + +$limit PuppyBeat 0 +$limit CeantaurPain 0 +$limit BishopPain 0 +$limit SerpentPain 0 +$limit DemonPain 0 +$limit WraithPain 0 +$limit MaulatorPain 0 +$limit EttinPain 0 +$limit FireDemonPain 0 +$limit SorcererPain 0 +$limit DragonPain 0 diff --git a/wadsrc/static/filter/strife/sndinfo.txt b/wadsrc/static/filter/strife/sndinfo.txt new file mode 100644 index 000000000..877bba50a --- /dev/null +++ b/wadsrc/static/filter/strife/sndinfo.txt @@ -0,0 +1,314 @@ +/****************************************************************************/ +/* */ +/* STRIFE SOUNDS */ +/* */ +/****************************************************************************/ + +$rolloff * 200 1200 + +$playersound player male *death dspldeth +$playersound player male *xdeath dspdiehi +$playersound player male *gibbed dsslop +$playersound player male *pain100 dsplpain +$playersounddup player male *pain75 *pain100 +$playersounddup player male *pain50 *pain100 +$playersounddup player male *pain25 *pain100 +$playersound player male *grunt dsoof +$playersounddup player male *land *grunt +$playersound player male *jump dsjump +$playersound player male *fist dspunch +$playersound player male *usefail dsnoway + +$playersound player female *death dsfldeth +$playersound player female *xdeath dsfdiehi +$playersound player female *gibbed dsslop +$playersound player female *pain100 dsflpain +$playersounddup player female *pain75 *pain100 +$playersounddup player female *pain50 *pain100 +$playersounddup player female *pain25 *pain100 +$playersound player female *grunt dsfoof +$playersounddup player female *land *grunt +$playersound player female *jump dsfjump +$playersound player female *fist dspunch +$playersound player female *usefail dsfnoway + +$playersound player other *death dscldeth +$playersound player other *xdeath dscdiehi +$playersound player other *gibbed dsslop +$playersound player other *pain100 dsclpain +$playersounddup player other *pain75 *pain100 +$playersounddup player other *pain50 *pain100 +$playersounddup player other *pain25 *pain100 +$playersound player other *grunt dscoof +$playersounddup player other *land *grunt +$playersound player other *jump dscjump +$playersound player other *fist dspunch +$playersound player other *usefail dscnoway + +weapons/xbowshoot dsxbow +weapons/xbowhit dsfirxpl +weapons/assaultgun dsrifle +weapons/minimissile dsrlaunc +weapons/minimissilehit dsmislht +weapons/flamethrower dsflburn +weapons/flameidle dsflidl +weapons/mauler1 dspgrdat +weapons/mauler2charge dsproton +weapons/mauler2fire dsprotfl +weapons/mauler2hit dsexplod +weapons/hegrenadeshoot dsphoot +weapons/hegrenadebang dsexplod +weapons/phgrenadeshoot dsphoot +weapons/phgrenadebang dsexplod +weapons/sigil dssigil +weapons/sigilhit dssglhit +weapons/sigilcharge dssiglup + +monsters/rifle dsrifle + +switches/normbutn dsswtchn +$alias switches/exitbutn switches/normbutn +switches/chain dspulchn +switches/knob dsswknob +switches/keycard dskeycrd +switches/stone dsswston +switches/bolt dsswbolt +switches/boltback dsempty +switches/scanner dsswscan +switches/fool dsdifool +switches/valve dsvalve +switches/sizzle dsfirxpl + +world/glassbreak dsbglass +world/barrelx dsbarexp +world/smallfire dssmfire +world/largefire dslgfire +world/river dswriver +world/waterfall dswfall +world/waterdrip dswdrip +world/watersplash dswsplsh + +$limit world/river 1 +$limit world/waterfall 1 +$limit world/waterdrip 1 + +world/drip dsempty // These four satisfy the Heretic/Hexen terrain definitions +world/sludgegloop dsempty +world/lavasizzle dsempty +world/lavasizzle dsempty + +menu/activate dsswtchn // Activate a new menu +menu/backup dsswtchn // Backup to previous menu +menu/prompt dsswtchn // Activate a prompt "menu" +menu/cursor dspstop // Move cursor up/down +menu/change dsstnmov // Select new value for option +menu/invalid dsoof // Menu not available +menu/dismiss dsswish // Dismiss a prompt message +menu/choose dsrifl // Choose a menu item +menu/clear dsmtalht // Close top menu + +misc/startupdone dspsdtha +misc/teleport dstelept +misc/swish dsswish +misc/meathit dsmeatht +misc/metalhit dsmtalht +misc/pcrush dspcrush +misc/gibbed dsslop +misc/explosion dsexplod +misc/reactor dsreactr +misc/missileinflight dsrflite +misc/static dsstatic +misc/chant dschant +misc/alarm dsalarm +misc/disruptordeath dsdsrptr +$singular misc/alarm + +misc/secret dsyeah +misc/w_pkup dswpnup +misc/p_pkup dsyeah +misc/i_pkup dsitemup +misc/k_pkup dsitemup +misc/spawn dsitmbk +misc/chat dsradio +misc/invuse dsitemup +misc/mask dsmask + +plats/pt1_strt dspstart +plats/pt1_stop dspstop +plats/pt1_mid dsstnmov + +doors/dr2_open dsbdopn +doors/dr2_clos dsbdcls + +doors/stone_open dsdrston +doors/stone_close dsdrston + +doors/large_metal_open dsdrlmto +doors/large_metal_close dsdrlmtc + +doors/small_metal_open dsdrsmto +doors/small_metal_close dsdrsmtc + +doors/large_wood_open dsdrlwud +doors/large_wood_close dsdrlwud + +doors/small_wood_open dsdrswud +doors/small_wood_close dsdrswud + +doors/airlock_open dsairlck +doors/airlock_close dsairlck + +doors/chain_open dsdrchno +doors/chain_close dsdrchnc + +woodenbarrel/death dswbrldt + +human/imonfire dsburnme + +ambient/alien1 dsamaln1 +ambient/alien2 dsamaln2 +ambient/alien3 dsamaln3 +ambient/alien4 dsamaln4 +ambient/alien5 dsamaln5 +ambient/alien6 dsamaln6 + +reaver/sight dsrevsee +reaver/pain dsreavpn +reaver/death dsrevdth +reaver/active dsrevact +reaver/attack dsreavat +reaver/blade dsrevbld + +crusader/sight dsrb2see +crusader/pain dsrb2pn +crusader/death dsrb2dth +crusader/active dsrb2act +crusader/misl dsrlaunc +crusader/mislx dsmislht + +bishop/sight dsrb2see +bishop/pain dsrb2pn +bishop/death dspgrdth +bishop/active dsrb2act +bishop/misl dsrlaunc +bishop/mislx dsmislht + +sentinel/sight dssntsee +sentinel/death dssntdth +sentinel/active dssntact +sentinel/plasma dsplasma + +$random peasant/pain { peasant/pain1 peasant/pain2 peasant/pain3 peasant/pain4 } +peasant/pain1 dspespna +peasant/pain2 dspespnb +peasant/pain3 dspespnc +peasant/pain4 dspespnd + +//$random peasant/death { peasant/death1 peasant/death2 peasant/death3 } +$alias peasant/death peasant/death1 +peasant/death1 dspsdtha +peasant/death2 dspsdthb +peasant/death3 dspsdthc + +peasant/sight dsrebact +peasant/attack dsmeatht +peasant/active dsrebact + +beggar/attack dsmeatht +$alias beggar/pain peasant/pain +$alias beggar/death peasant/death + +rebel/sight dswpnup +$alias rebel/pain peasant/pain +rebel/death dsrebdth +rebel/active dsrebact + +barkeep/pain dsambbar +barkeep/active dsambppl +$singular barkeep/pain +$singular barkeep/active + +$alias smith/pain peasant/pain +$alias armorer/pain peasant/pain +$alias medic/pain peasant/pain +$alias zombie/death peasant/death +$alias becoming/death peasant/death +zombie/spawner dstelept + +acolyte/sight dsagrsee +acolyte/pain dsagrdpn +acolyte/death dsagrdth +acolyte/rifle dsrifle +$random acolyte/active { acolyte/active1 acolyte/active2 acolyte/active3 acolyte/active4 } +acolyte/active1 dsagrac1 +acolyte/active2 dsagrac2 +acolyte/active3 dsagrac3 +acolyte/active4 dsagrac4 + +macil/sight dsagrsee +$alias macil/pain peasant/pain +macil/active dsrebact +macil/slop dsslop + +alienspectre/sight dsalnsee +alienspectre/blade dsrevbld +alienspectre/pain dsalnpn +alienspectre/death dsalndth +alienspectre/active dsalnact + +turret/death dsmislht + +ore/explode dsexplod + +rat/sight dsratact +rat/death dsratact +rat/active dsratact +$singular rat/sight + +loremaster/chain dschain +loremaster/swish dsswish +loremaster/sight dslorsee +loremaster/attack dsrevbld +loremaster/pain dslorpn +loremaster/death dsslop +loremaster/active dstend + +stalker/sight dsspisit +stalker/attack dsspdatk +stalker/pain dsspdatk +stalker/death dsspidth +stalker/active dsspisit +stalker/walk dsspdwlk + +templar/sight dspgrsee +templar/pain dspgrdpn +templar/death dspgrdth +templar/active dspgract +templar/shoot dspgrdat + +inquisitor/sight dsinqsee +inquisitor/death dsinqdth +inquisitor/active dsinqact +inquisitor/walk dsinqact +inquisitor/jump dsinqjmp +inquisitor/attack dsphoot +inquisitor/atkexplode dsexplod + +programmer/clank dsmtalht +programmer/attack dsrevbld // Unused? +programmer/pain dsprgpn +programmer/death dsrb2dth +programmer/active dsprogac + +entity/sight dsmnalse +entity/melee dsrevbld +entity/pain dsalnpn +entity/death dsmnaldt +entity/active dsalnact + +$alias intermission/tick weapons/assaultgun +$alias intermission/cooptotal *death +$alias intermission/nextstage misc/explosion +$alias intermission/paststats world/barrelx +$alias intermission/pastcoopstats world/barrelx +$alias intermission/pastdmstats *gibbed diff --git a/wadsrc/static/mapinfo/chex.txt b/wadsrc/static/mapinfo/chex.txt index 1edaf9256..9bd974bc7 100644 --- a/wadsrc/static/mapinfo/chex.txt +++ b/wadsrc/static/mapinfo/chex.txt @@ -1,5 +1,6 @@ // MAPINFO for Chex Quest include "mapinfo/common.txt" +include "mapinfo/doomitems.txt" gameinfo { @@ -67,6 +68,64 @@ gameinfo statscreen_enteringpatch = "WIENTER" } +DoomEdNums +{ + 5 = ChexBlueCard + 6 = ChexYellowCard + 8 = Zorchpack + 9 = FlemoidusBipedicus + 13 = ChexRedCard + 17 = PhasingZorchPack + 25 = ChexTallFlower2 + 28 = ChexTallFlower + 30 = ChexCavernStalagmite + 31 = ChexSubmergedPlant + 32 = ChexCavernColumn + 33 = ChexMineCart + 34 = ChexChemicalFlask + 35 = ChexGasTank + 37 = ChexFlagOnPole + 41 = ChexChemicalBurner + 43 = ChexOrangeTree + 44 = ChexSlimeFountain + 45 = ChexCivilian1 + 47 = ChexAppleTree + 48 = ChexSpaceship + 54 = ChexBananaTree + 55 = ChexLightColumn + 56 = ChexCivilian2 + 57 = ChexCivilian3 + 82 = SuperLargeZorcher + 2001 = LargeZorcher + 2002 = RapidZorcher + 2003 = ZorchPropulsor + 2004 = PhasingZorcher + 2005 = SuperBootspork + 2006 = LAZDevice + 2007 = MiniZorchRecharge + 2008 = LargeZorchRecharge + 2010 = PropulsorZorch + 2011 = BowlOfFruit + 2012 = BowlOfVegetables + 2013 = SuperchargeBreakfast + 2014 = GlassOfWater + 2015 = SlimeRepellent + 2018 = ChexArmor + 2019 = SuperChexArmor + 2025 = SlimeProofSuit + 2026 = ComputerAreaMap + 2028 = ChexLandingLight + 2046 = PropulsorZorchPack + 2047 = PhasingZorch + 2048 = MiniZorchPack + 2049 = LargeZorchPack + 3001 = ArmoredFlemoidusBipedicus + 3002 = FlemoidusCycloptisCommonus + 3003 = Flembrane + 3004 = FlemoidusCommonus + 3006 = ChexSoul +} + skill baby { AutoUseHealth diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt index fc6379d01..5e83ee727 100644 --- a/wadsrc/static/mapinfo/common.txt +++ b/wadsrc/static/mapinfo/common.txt @@ -4,6 +4,249 @@ Gameinfo EasyKey = "maparrows/ravenkey.txt" } +DoomEdNums +{ + 0 = Unknown + 1 = "$Player1Start" + 2 = "$Player2Start" + 3 = "$Player3Start" + 4 = "$Player4Start" + 11 = "$DeathmatchStart" + 14 = TeleportDest + 118 = ZBridge + 888 = MBFHelperDog + 1400 = "$SSeqOverride", 0 + 1401 = "$SSeqOverride", 1 + 1402 = "$SSeqOverride", 2 + 1403 = "$SSeqOverride", 3 + 1404 = "$SSeqOverride", 4 + 1405 = "$SSeqOverride", 5 + 1406 = "$SSeqOverride", 6 + 1407 = "$SSeqOverride", 7 + 1408 = "$SSeqOverride", 8 + 1409 = "$SSeqOverride", 9 + 1411 = "$SSeqOverride" + 5001 = PointPusher + 5002 = PointPuller + 5004 = FS_Mapspot + 5061 = InvisibleBridge32 + 5064 = InvisibleBridge16 + 5065 = InvisibleBridge8 + 9001 = MapSpot + 9013 = MapSpotGravity + 9024 = PatrolPoint + 9025 = SecurityCamera + 9026 = Spark + 9027 = RedParticleFountain + 9028 = GreenParticleFountain + 9029 = BlueParticleFountain + 9030 = YellowParticleFountain + 9031 = PurpleParticleFountain + 9032 = BlackParticleFountain + 9033 = WhiteParticleFountain + 9037 = BetaSkull + 9038 = ColorSetter + 9039 = FadeSetter + 9040 = MapMarker + 9041 = SectorFlagSetter + 9043 = TeleportDest3 + 9044 = TeleportDest2 + 9045 = Waterzone + 9046 = SecretTrigger + 9047 = PatrolSpecial + 9048 = SoundEnvironment + 9070 = InterpolationPoint + 9071 = PathFollower + 9072 = MovingCamera + 9073 = AimingCamera + 9074 = ActorMover + 9075 = InterpolationSpecial + 9076 = HateTarget + 9077 = UpperStackLookOnly + 9078 = LowerStackLookOnly + 9080 = SkyViewpoint + 9081 = SkyPicker + 9082 = SectorSilencer + 9083 = SkyCamCompat + 9200 = Decal + 9300 = "$PolyAnchor" + 9301 = "$PolySpawn" + 9302 = "$PolySpawnCrush" + 9303 = "$PolySpawnHurt" + 9982 = SecActEyesAboveC + 9983 = SecActEyesBelowC + 9988 = CustomSprite + 9989 = SecActHitFakeFloor + 9990 = InvisibleBridge + 9991 = CustomBridge + 9992 = SecActEyesSurface + 9993 = SecActEyesDive + 9994 = SecActUseWall + 9995 = SecActUse + 9996 = SecActHitCeil + 9997 = SecActExit + 9998 = SecActEnter + 9999 = SecActHitFloor + 14001 = AmbientSound, 1 + 14002 = AmbientSound, 2 + 14003 = AmbientSound, 3 + 14004 = AmbientSound, 4 + 14005 = AmbientSound, 5 + 14006 = AmbientSound, 6 + 14007 = AmbientSound, 7 + 14008 = AmbientSound, 8 + 14009 = AmbientSound, 9 + 14010 = AmbientSound, 10 + 14011 = AmbientSound, 11 + 14012 = AmbientSound, 12 + 14013 = AmbientSound, 13 + 14014 = AmbientSound, 14 + 14015 = AmbientSound, 15 + 14016 = AmbientSound, 16 + 14017 = AmbientSound, 17 + 14018 = AmbientSound, 18 + 14019 = AmbientSound, 19 + 14020 = AmbientSound, 20 + 14021 = AmbientSound, 21 + 14022 = AmbientSound, 22 + 14023 = AmbientSound, 23 + 14024 = AmbientSound, 24 + 14025 = AmbientSound, 25 + 14026 = AmbientSound, 26 + 14027 = AmbientSound, 27 + 14028 = AmbientSound, 28 + 14029 = AmbientSound, 29 + 14030 = AmbientSound, 30 + 14031 = AmbientSound, 31 + 14032 = AmbientSound, 32 + 14033 = AmbientSound, 33 + 14034 = AmbientSound, 34 + 14035 = AmbientSound, 35 + 14036 = AmbientSound, 36 + 14037 = AmbientSound, 37 + 14038 = AmbientSound, 38 + 14039 = AmbientSound, 39 + 14040 = AmbientSound, 40 + 14041 = AmbientSound, 41 + 14042 = AmbientSound, 42 + 14043 = AmbientSound, 43 + 14044 = AmbientSound, 44 + 14045 = AmbientSound, 45 + 14046 = AmbientSound, 46 + 14047 = AmbientSound, 47 + 14048 = AmbientSound, 48 + 14049 = AmbientSound, 49 + 14050 = AmbientSound, 50 + 14051 = AmbientSound, 51 + 14052 = AmbientSound, 52 + 14053 = AmbientSound, 53 + 14054 = AmbientSound, 54 + 14055 = AmbientSound, 55 + 14056 = AmbientSound, 56 + 14057 = AmbientSound, 57 + 14058 = AmbientSound, 58 + 14059 = AmbientSound, 59 + 14060 = AmbientSound, 60 + 14061 = AmbientSound, 61 + 14062 = AmbientSound, 62 + 14063 = AmbientSound, 63 + 14064 = AmbientSound, 64 + 14065 = AmbientSound + 14066 = SoundSequence + 14067 = AmbientSoundNoGravity + 14101 = MusicChanger, 1 + 14102 = MusicChanger, 2 + 14103 = MusicChanger, 3 + 14104 = MusicChanger, 4 + 14105 = MusicChanger, 5 + 14106 = MusicChanger, 6 + 14107 = MusicChanger, 7 + 14108 = MusicChanger, 8 + 14109 = MusicChanger, 9 + 14110 = MusicChanger, 10 + 14111 = MusicChanger, 11 + 14112 = MusicChanger, 12 + 14113 = MusicChanger, 13 + 14114 = MusicChanger, 14 + 14115 = MusicChanger, 15 + 14116 = MusicChanger, 16 + 14117 = MusicChanger, 17 + 14118 = MusicChanger, 18 + 14119 = MusicChanger, 19 + 14120 = MusicChanger, 20 + 14121 = MusicChanger, 21 + 14122 = MusicChanger, 22 + 14123 = MusicChanger, 23 + 14124 = MusicChanger, 24 + 14125 = MusicChanger, 25 + 14126 = MusicChanger, 26 + 14127 = MusicChanger, 27 + 14128 = MusicChanger, 28 + 14129 = MusicChanger, 29 + 14130 = MusicChanger, 30 + 14131 = MusicChanger, 31 + 14132 = MusicChanger, 32 + 14133 = MusicChanger, 33 + 14134 = MusicChanger, 34 + 14135 = MusicChanger, 35 + 14136 = MusicChanger, 36 + 14137 = MusicChanger, 37 + 14138 = MusicChanger, 38 + 14139 = MusicChanger, 39 + 14140 = MusicChanger, 40 + 14141 = MusicChanger, 41 + 14142 = MusicChanger, 42 + 14143 = MusicChanger, 43 + 14144 = MusicChanger, 44 + 14145 = MusicChanger, 45 + 14146 = MusicChanger, 46 + 14147 = MusicChanger, 47 + 14148 = MusicChanger, 48 + 14149 = MusicChanger, 49 + 14150 = MusicChanger, 50 + 14151 = MusicChanger, 51 + 14152 = MusicChanger, 52 + 14153 = MusicChanger, 53 + 14154 = MusicChanger, 54 + 14155 = MusicChanger, 55 + 14156 = MusicChanger, 56 + 14157 = MusicChanger, 57 + 14158 = MusicChanger, 58 + 14159 = MusicChanger, 59 + 14160 = MusicChanger, 60 + 14161 = MusicChanger, 61 + 14162 = MusicChanger, 62 + 14163 = MusicChanger, 63 + 14164 = MusicChanger, 64 + 14165 = MusicChanger + 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 { GotoTitle diff --git a/wadsrc/static/mapinfo/doomcommon.txt b/wadsrc/static/mapinfo/doomcommon.txt index 9e3665533..60be71ea4 100644 --- a/wadsrc/static/mapinfo/doomcommon.txt +++ b/wadsrc/static/mapinfo/doomcommon.txt @@ -1,4 +1,5 @@ include "mapinfo/common.txt" +include "mapinfo/doomitems.txt" gameinfo { @@ -41,7 +42,6 @@ gameinfo defaultrespawntime = 12 defaultdropstyle = 1 endoom = "ENDOOM" - player5start = 4001 pickupcolor = "d7 ba 45" quitmessages = "$QUITMSG", "$QUITMSG1", "$QUITMSG2", "$QUITMSG3", "$QUITMSG4", "$QUITMSG5", "$QUITMSG6", "$QUITMSG7", "$QUITMSG8", "$QUITMSG9", "$QUITMSG10", "$QUITMSG11", "$QUITMSG12", "$QUITMSG13", "$QUITMSG14" @@ -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/doomitems.txt b/wadsrc/static/mapinfo/doomitems.txt new file mode 100644 index 000000000..95f02cdb1 --- /dev/null +++ b/wadsrc/static/mapinfo/doomitems.txt @@ -0,0 +1,152 @@ +DoomEdNums +{ + 5 = BlueCard + 6 = YellowCard + 7 = SpiderMastermind + 8 = Backpack + 9 = ShotgunGuy + 10 = GibbedMarine + 12 = GibbedMarineExtra + 13 = RedCard + 15 = DeadMarine + 16 = Cyberdemon + 17 = CellPack + 18 = DeadZombieMan + 19 = DeadShotgunGuy + 20 = DeadDoomImp + 21 = DeadDemon + 22 = DeadCacodemon + 23 = DeadLostSoul + 24 = Gibs + 25 = DeadStick + 26 = LiveStick + 27 = HeadOnAStick + 28 = HeadsOnAStick + 29 = HeadCandles + 30 = TallGreenColumn + 31 = ShortGreenColumn + 32 = TallRedColumn + 33 = ShortRedColumn + 34 = Candlestick + 35 = Candelabra + 36 = HeartColumn + 37 = SkullColumn + 38 = RedSkull + 39 = YellowSkull + 40 = BlueSkull + 41 = EvilEye + 42 = FloatingSkull + 43 = TorchTree + 44 = BlueTorch + 45 = GreenTorch + 46 = RedTorch + 47 = Stalagtite + 48 = TechPillar + 49 = BloodyTwitch + 50 = Meat2 + 51 = Meat3 + 52 = Meat4 + 53 = Meat5 + 54 = BigTree + 55 = ShortBlueTorch + 56 = ShortGreenTorch + 57 = ShortRedTorch + 58 = Spectre + 59 = NonsolidMeat2 + 60 = NonsolidMeat4 + 61 = NonsolidMeat3 + 62 = NonsolidMeat5 + 63 = NonsolidTwitch + 64 = Archvile + 65 = ChaingunGuy + 66 = Revenant + 67 = Fatso + 68 = Arachnotron + 69 = HellKnight + 70 = BurningBarrel + 71 = PainElemental + 72 = CommanderKeen + 73 = HangNoGuts + 74 = HangBNoBrain + 75 = HangTLookingDown + 76 = HangTSkull + 77 = HangTLookingUp + 78 = HangTNoBrain + 79 = ColonGibs + 80 = SmallBloodPool + 81 = BrainStem + 82 = SuperShotgun + 83 = Megasphere + 84 = WolfensteinSS + 85 = TechLamp + 86 = TechLamp2 + 87 = BossTarget + 88 = BossBrain + 89 = BossEye + 2001 = Shotgun + 2002 = Chaingun + 2003 = RocketLauncher + 2004 = PlasmaRifle + 2005 = Chainsaw + 2006 = BFG9000 + 2007 = Clip + 2008 = Shell + 2010 = RocketAmmo + 2011 = Stimpack + 2012 = Medikit + 2013 = Soulsphere + 2014 = HealthBonus + 2015 = ArmorBonus + 2016 = EvilSceptre + 2017 = UnholyBible + 2018 = GreenArmor + 2019 = BlueArmor + 2022 = InvulnerabilitySphere + 2023 = Berserk + 2024 = BlurSphere + 2025 = RadSuit + 2026 = Allmap + 2028 = Column + 2035 = ExplosiveBarrel + 2045 = Infrared + 2046 = RocketBox + 2047 = Cell + 2048 = ClipBox + 2049 = ShellBox + 3001 = DoomImp + 3002 = Demon + 3003 = BaronOfHell + 3004 = Zombieman + 3005 = Cacodemon + 3006 = LostSoul + 4001 = "$Player5Start" + 4002 = "$Player6Start" + 4003 = "$Player7Start" + 4004 = "$Player8Start" + 5010 = Pistol + 5050 = Stalagmite + 9050 = StealthArachnotron + 9051 = StealthArchvile + 9052 = StealthBaron + 9053 = StealthCacodemon + 9054 = StealthChaingunGuy + 9055 = StealthDemon + 9056 = StealthHellKnight + 9057 = StealthDoomImp + 9058 = StealthFatso + 9059 = StealthRevenant + 9060 = StealthShotgunGuy + 9061 = StealthZombieMan + 9100 = ScriptedMarine + 9101 = MarineFist + 9102 = MarineBerserk + 9103 = MarineChainsaw + 9104 = MarinePistol + 9105 = MarineShotgun + 9106 = MarineSSG + 9107 = MarineChaingun + 9108 = MarineRocket + 9109 = MarinePlasma + 9110 = MarineRailgun + 9111 = MarineBFG +} \ No newline at end of file diff --git a/wadsrc/static/mapinfo/heretic.txt b/wadsrc/static/mapinfo/heretic.txt index 196e81c50..71d9a9949 100644 --- a/wadsrc/static/mapinfo/heretic.txt +++ b/wadsrc/static/mapinfo/heretic.txt @@ -41,7 +41,6 @@ gameinfo defaultrespawntime = 12 defaultdropstyle = 1 endoom = "ENDTEXT" - player5start = 4001 pickupcolor = "d7 ba 45" quitmessages = "$*RAVENQUITMSG" menufontcolor_title = "UNTRANSLATED" @@ -66,6 +65,200 @@ gameinfo statscreen_enteringfont = "SmallFont" } +DoomEdNums +{ + 5 = HereticImpLeader + 6 = Ironlich + 7 = Sorcerer1 + 8 = BagOfHolding + 9 = Minotaur + 10 = GoldWandAmmo + 12 = GoldWandHefty + 13 = MaceAmmo + 15 = Wizard + 16 = MaceHefty + 17 = SkullHang70 + 18 = CrossbowAmmo + 19 = CrossbowHefty + 20 = SkullRodAmmo + 21 = SkullRodHefty + 22 = PhoenixRodAmmo + 23 = PhoenixRodHefty + 24 = SkullHang60 + 25 = SkullHang45 + 26 = SkullHang35 + 27 = SerpentTorch + 28 = Chandelier + 29 = SmallPillar + 30 = ArtiEgg + 31 = EnchantedShield + 32 = ArtiSuperHealth + 33 = ArtiTorch + 34 = ArtiTimeBomb + 35 = SuperMap + 36 = ArtiTeleport + 37 = StalagmiteSmall + 38 = StalagmiteLarge + 39 = StalactiteSmall + 40 = StalactiteLarge + 41 = SoundWaterfall + 42 = SoundWind + 43 = PodGenerator + 44 = Barrel + 45 = MummyLeader + 46 = MummyLeaderGhost + 47 = BrownPillar + 48 = Moss1 + 49 = Moss2 + 50 = WallTorch + 51 = HangingCorpse + 52 = TeleGlitterGenerator2 + 53 = Blaster + 54 = BlasterAmmo + 55 = BlasterHefty + 56 = BossSpot + 64 = Knight + 65 = KnightGhost + 66 = HereticImp + 68 = Mummy + 69 = MummyGhost + 70 = Beast + 73 = KeyGreen + 74 = TeleGlitterGenerator1 + 75 = ArtiInvisibility + 76 = FireBrazier + 79 = KeyBlue + 80 = KeyYellow + 81 = CrystalVial + 82 = ArtiHealth + 83 = ArtiFly + 84 = ArtiInvulnerability + 85 = SilverShield + 86 = ArtiTomeOfPower + 87 = Volcano + 90 = Clink + 92 = Snake + 94 = KeyGizmoBlue + 95 = KeyGizmoGreen + 96 = KeyGizmoYellow + 118 = Bridge + 1200 = HereticSoundSequence1 + 1201 = HereticSoundSequence2 + 1202 = HereticSoundSequence3 + 1203 = HereticSoundSequence4 + 1204 = HereticSoundSequence5 + 1205 = HereticSoundSequence6 + 1206 = HereticSoundSequence7 + 1207 = HereticSoundSequence8 + 1208 = HereticSoundSequence9 + 1209 = HereticSoundSequence10 + 2001 = Crossbow + 2002 = MaceSpawner + 2003 = PhoenixRod + 2004 = SkullRod + 2005 = Gauntlets + 2035 = Pod + 4001 = "$Player5Start" + 4002 = "$Player6Start" + 4003 = "$Player7Start" + 4004 = "$Player8Start" + 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 631c6d1e9..508d546aa 100644 --- a/wadsrc/static/mapinfo/hexen.txt +++ b/wadsrc/static/mapinfo/hexen.txt @@ -39,7 +39,6 @@ gameinfo definventorymaxamount = 25 defaultrespawntime = 12 defaultdropstyle = 1 - player5start = 9100 pickupcolor = "d7 ba 45" quitmessages = "$*RAVENQUITMSG" menufontcolor_title = "UNTRANSLATED" @@ -64,6 +63,337 @@ gameinfo statscreen_enteringfont = "SmallFont" } +DoomEdNums +{ + 5 = ZWingedStatue + 6 = ZRock1 + 7 = ZRock2 + 9 = ZRock3 + 10 = CWeapStaff + 12 = FWeaponPiece1 + 13 = FWeaponPiece2 + 15 = ZRock4 + 16 = FWeaponPiece3 + 17 = ZChandelier + 18 = CWeaponPiece1 + 19 = CWeaponPiece2 + 20 = CWeaponPiece3 + 21 = MWeaponPiece1 + 22 = MWeaponPiece2 + 23 = MWeaponPiece3 + 24 = ZTreeDead + 25 = ZTree + 26 = ZTreeSwamp150 + 27 = ZTreeSwamp120 + 28 = ZStumpBurned + 29 = ZStumpBare + 30 = ArtiPork + 31 = Demon1 + 32 = ArtiSuperHealth + 33 = ArtiTorch + 34 = Wraith + 36 = ArtiTeleport + 37 = ZStumpSwamp1 + 38 = ZStumpSwamp2 + 39 = ZShroomLarge1 + 40 = ZShroomLarge2 + 41 = ZShroomLarge3 + 42 = ZShroomSmall1 + 44 = ZShroomSmall2 + 45 = ZShroomSmall3 + 46 = ZShroomSmall4 + 47 = ZShroomSmall5 + 48 = ZStalagmitePillar + 49 = ZStalagmiteLarge + 50 = ZStalagmiteMedium + 51 = ZStalagmiteSmall + 52 = ZStalactiteLarge + 53 = MWeapFrost + 54 = ZWallTorch + 55 = ZWallTorchUnlit + 56 = ZStalactiteMedium + 57 = ZStalactiteSmall + 58 = ZMossCeiling1 + 59 = ZMossCeiling2 + 60 = ZSwampVine + 61 = ZCorpseKabob + 62 = ZCorpseSleeping + 63 = ZTombstoneRIP + 64 = ZTombstoneShane + 65 = ZTombstoneBigCross + 66 = ZTombstoneBrianR + 67 = ZTombstoneCrossCircle + 68 = ZTombstoneSmallCross + 69 = ZTombstoneBrianP + 71 = ZCorpseHanging + 72 = ZStatueGargoyleGreenTall + 73 = ZStatueGargoyleBlueTall + 74 = ZStatueGargoyleGreenShort + 76 = ZStatueGargoyleBlueShort + 77 = ZBannerTattered + 78 = ZTreeLarge1 + 79 = ZTreeLarge2 + 80 = ZTreeGnarled1 + 81 = CrystalVial + 82 = ArtiHealth + 83 = ArtiFly + 84 = ArtiInvulnerability2 + 86 = ArtiDarkServant + 87 = ZTreeGnarled2 + 88 = ZLog + 89 = ZStalactiteIceLarge + 90 = ZStalactiteIceMedium + 91 = ZStalactiteIceSmall + 92 = ZStalactiteIceTiny + 93 = ZStalagmiteIceLarge + 94 = ZStalagmiteIceMedium + 95 = ZStalagmiteIceSmall + 96 = ZStalagmiteIceTiny + 97 = ZRockBrown1 + 98 = ZRockBrown2 + 99 = ZRockBlack + 100 = ZRubble1 + 101 = ZRubble2 + 102 = ZRubble3 + 103 = ZVasePillar + 104 = Pottery1 + 105 = Pottery2 + 106 = Pottery3 + 107 = Centaur + 108 = ZCorpseLynched + 109 = ZCorpseLynchedNoHeart + 110 = ZCorpseSitting + 111 = BloodPool + 112 = LittleFly + 113 = LeafSpawner + 114 = Bishop + 115 = CentaurLeader + 116 = ZTwinedTorch + 117 = ZTwinedTorchUnlit + 118 = Bridge + 119 = ZCandle + 120 = SerpentLeader + 121 = Serpent + 122 = Mana1 + 123 = FWeapHammer + 124 = Mana2 + 140 = TeleSmoke + 254 = Dragon + 1410 = SoundWindHexen + 3000 = "$PolyAnchor" + 3001 = "$PolySpawn" + 3002 = "$PolySpawnCrush" + 8000 = ArtiPoisonBag + 8002 = ArtiSpeedBoots + 8003 = ArtiBoostMana + 8004 = Mana3 + 8005 = MeshArmor + 8006 = FalconShield + 8007 = PlatinumHelm + 8008 = AmuletOfWarding + 8009 = CWeapFlame + 8010 = FWeapAxe + 8020 = IceGuy + 8030 = KeySteel + 8031 = KeyCave + 8032 = KeyAxe + 8033 = KeyFire + 8034 = KeyEmerald + 8035 = KeyDungeon + 8036 = KeySilver + 8037 = KeyRusted + 8038 = KeyHorn + 8039 = KeySwamp + 8040 = MWeapLightning + 8041 = ArtiBoostArmor + 8042 = ZFireBull + 8043 = ZFireBullUnlit + 8044 = ZStatueGargoyleStripeTall + 8045 = ZStatueGargoyleDarkRedTall + 8046 = ZStatueGargoyleRedTall + 8047 = ZStatueGargoyleTanTall + 8048 = ZStatueGargoyleRustTall + 8049 = ZStatueGargoyleDarkRedShort + 8050 = ZStatueGargoyleRedShort + 8051 = ZStatueGargoyleTanShort + 8052 = ZStatueGargoyleRustShort + 8060 = FireThing + 8061 = BrassTorch + 8062 = TreeDestructible + 8063 = ZChandelierUnlit + 8064 = ZSuitOfArmor + 8065 = ZBell + 8066 = ZBlueCandle + 8067 = ZIronMaiden + 8068 = ZXmasTree + 8069 = ZCauldron + 8070 = ZCauldronUnlit + 8071 = ZChainBit32 + 8072 = ZChainBit64 + 8073 = ZChainEndHeart + 8074 = ZChainEndHook1 + 8075 = ZChainEndHook2 + 8076 = ZChainEndSpike + 8077 = ZChainEndSkull + 8080 = Demon2 + 8100 = ZBarrel + 8101 = ZShrub1 + 8102 = ZShrub2 + 8103 = ZBucket + 8104 = ZPoisonShroom + 8200 = KeyCastle + 8500 = TableShit1 + 8501 = TableShit2 + 8502 = TableShit3 + 8503 = TableShit4 + 8504 = TableShit5 + 8505 = TableShit6 + 8506 = TableShit7 + 8507 = TableShit8 + 8508 = TableShit9 + 8509 = TableShit10 + 9002 = PuzzSkull + 9003 = PuzzGemBig + 9004 = PuzzGemRed + 9005 = PuzzGemGreen1 + 9006 = PuzzGemBlue1 + 9007 = PuzzBook1 + 9008 = PuzzBook2 + 9009 = PuzzGemGreen2 + 9010 = PuzzGemBlue2 + 9011 = ZWingedStatueNoSkull + 9012 = ZGemPedestal + 9014 = PuzzFlameMask + 9015 = PuzzFWeapon + 9016 = PuzzCWeapon + 9017 = PuzzMWeapon + 9018 = PuzzGear1 + 9019 = PuzzGear2 + 9020 = PuzzGear3 + 9021 = PuzzGear4 + 9100 = "$Player5Start" + 9101 = "$Player6Start" + 9102 = "$Player7Start" + 9103 = "$Player8Start" + 10000 = FogSpawner + 10001 = FogPatchSmall + 10002 = FogPatchMedium + 10003 = FogPatchLarge + 10011 = WraithBuried + 10030 = Ettin + 10040 = ArtiTeleportOther + 10060 = FireDemon + 10080 = Heresiarch + 10090 = ThrustFloorDown + 10091 = ThrustFloorUp + 10100 = FighterBoss + 10101 = ClericBoss + 10102 = MageBoss + 10110 = ArtiBlastRadius + 10120 = ArtiHealingRadius + 10200 = Korax + 10225 = BatSpawner + 10500 = FlameSmallTemp + 10501 = FlameSmall + 10502 = FlameLargeTemp + 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 5a25f3779..06fb13fbe 100644 --- a/wadsrc/static/mapinfo/strife.txt +++ b/wadsrc/static/mapinfo/strife.txt @@ -66,6 +66,277 @@ gameinfo statscreen_enteringfont = "BigFont", "white" } +DoomEdNums +{ + 5 = "$Player5Start" + 6 = "$Player6Start" + 7 = "$Player7Start" + 8 = "$Player8Start" + 9 = Rebel1 + 10 = TeleporterBeacon + 12 = Loremaster + 13 = IDCard + 15 = DeadStrifePlayer + 16 = Inquisitor + 17 = EnergyPack + 18 = DeadPeasant + 19 = DeadRebel + 20 = DeadReaver + 21 = DeadAcolyte + 22 = DeadCrusader + 23 = TeleportSwirl + 24 = KlaxonWarningLight + 25 = ForceFieldGuard + 26 = EntityNest + 27 = CeilingTurret + 28 = CageLight + 29 = Rubble1 + 30 = Rubble2 + 31 = Rubble3 + 32 = Rubble4 + 33 = TreeStub + 34 = Candle + 35 = StrifeCandelabra + 36 = Rubble5 + 37 = Rubble6 + 38 = SilverKey + 39 = BrassKey + 40 = GoldKey + 41 = Rubble7 + 42 = Rubble8 + 43 = OutsideLamp + 44 = StatueRuined + 45 = Piston + 46 = PoleLantern + 47 = LargeTorch + 48 = PillarTechno + 50 = HugeTorch + 51 = PalmTree + 52 = OfficersUniform + 53 = WaterDrip + 54 = PillarAztec + 55 = PillarAztecDamaged + 56 = PillarAztecRuined + 57 = PillarHugeTech + 58 = AcolyteShadow + 59 = DegninOre + 60 = ShortBush + 61 = OracleKey + 62 = TallBush + 63 = ChimneyStack + 64 = Macil1 + 65 = Peasant4 + 66 = Peasant7 + 67 = Peasant10 + 68 = Tray + 69 = BarricadeColumn + 70 = StrifeBurningBarrel + 71 = Programmer + 72 = BarKeep + 73 = Armorer + 74 = Medic + 75 = AlienSpectre2 + 76 = AlienSpectre3 + 77 = Sigil1 + 78 = Sigil2 + 79 = Sigil3 + 80 = Sigil4 + 81 = Sigil5 + 82 = WoodenBarrel + 83 = SurgeryKit + 85 = RatBuddy + 86 = OrderKey + 90 = GuardUniform + 91 = SeveredHand + 92 = PowerCrystal + 93 = Coin + 94 = ExplosiveBarrel2 + 95 = LightSilverFluorescent + 96 = LightBrownFluorescent + 97 = LightGoldFluorescent + 98 = SStalactiteBig + 99 = SRock1 + 100 = SRock2 + 101 = SRock3 + 102 = SRock4 + 103 = WaterDropOnFloor + 104 = WaterfallSplash + 105 = BurningBowl + 106 = BurningBrazier + 107 = SmallTorchLit + 108 = SmallTorchUnlit + 109 = CeilingChain + 110 = Statue + 111 = MediumTorch + 112 = WaterFountain + 113 = HeartsInTank + 114 = ElectricBolts + 115 = PoisonBolts + 116 = WeaponSmith + 117 = SurgeryCrab + 118 = "$Player1Start", 1 + 119 = "$Player1Start", 2 + 120 = "$Player1Start", 3 + 121 = "$Player1Start", 4 + 122 = "$Player1Start", 5 + 123 = "$Player1Start", 6 + 124 = "$Player1Start", 7 + 125 = "$Player1Start", 8 + 126 = "$Player1Start", 9 + 127 = "$Player1Start", 10 + 128 = EntityBoss + 129 = AlienSpectre1 + 130 = Peasant2 + 131 = Peasant3 + 132 = Peasant5 + 133 = Peasant6 + 134 = Peasant8 + 135 = Peasant9 + 136 = Peasant11 + 137 = Peasant12 + 138 = Gold10 + 139 = Gold25 + 140 = Gold50 + 141 = Beggar1 + 142 = AcolyteRed + 143 = AcolyteRust + 144 = Rebel2 + 145 = Rebel3 + 146 = AcolyteGray + 147 = AcolyteDGreen + 148 = AcolyteGold + 149 = Rebel4 + 150 = Rebel5 + 151 = Rebel6 + 152 = HEGrenadeRounds + 153 = PhosphorusGrenadeRounds + 154 = StrifeGrenadeLauncher + 155 = Beggar2 + 156 = Beggar3 + 157 = Beggar4 + 158 = Beggar5 + 159 = CavePillarTop + 160 = SStalagmiteBig + 161 = SStalactiteSmall + 162 = CavePillarBottom + 163 = SStalagmiteSmall + 164 = Mug + 165 = Pot + 166 = WarehouseKey + 167 = AlienSpectre4 + 168 = AlienSpectre5 + 169 = Zombie + 170 = ZombieSpawner + 172 = Peasant13 + 173 = Peasant14 + 174 = Peasant15 + 175 = Peasant16 + 176 = Peasant17 + 177 = Peasant18 + 178 = Peasant19 + 179 = Peasant20 + 180 = Peasant21 + 181 = Peasant22 + 182 = Computer + 183 = AmmoSatchel + 184 = IDBadge + 185 = Passcard + 186 = Stalker + 187 = StrifeBishop + 188 = Pitcher + 189 = Stool + 190 = MetalPot + 191 = Tub + 192 = RedCrystalKey + 193 = BlueCrystalKey + 194 = Anvil + 195 = ChapelKey + 196 = TechLampSilver + 197 = TechLampBrass + 198 = EntityPod + 199 = Oracle + 200 = Macil2 + 201 = AcolyteToBe + 202 = BigTree2 + 203 = PottedTree + 204 = KneelingGuy + 205 = OfferingChalice + 206 = Communicator + 207 = Targeter + 208 = TargetPractice + 209 = Tank1 + 210 = Tank2 + 211 = Tank3 + 212 = SacrificedGuy + 213 = Tank4 + 214 = Tank5 + 215 = StickInWater + 216 = SigilBanner + 217 = RebelBoots + 218 = RebelHelmet + 219 = RebelShirt + 220 = PowerCoupling + 221 = AlienBubbleColumn + 222 = AlienFloorBubble + 223 = AlienCeilingBubble + 224 = AlienAspClimber + 225 = AlienSpiderLight + 226 = BrokenPowerCoupling + 227 = PillarAlienPower + 228 = AmmoFiller + 229 = Tank6 + 230 = BaseKey + 231 = AcolyteBlue + 232 = AcolyteLGreen + 233 = MaulerKey + 234 = FactoryKey + 235 = MineKey + 236 = CoreKey + 2001 = StrifeCrossbow + 2002 = AssaultGun + 2003 = MiniMissileLauncher + 2004 = Mauler + 2005 = FlameThrower + 2006 = AssaultGunStanding + 2007 = ClipOfBullets + 2010 = MiniMissiles + 2011 = MedPatch + 2012 = MedicalKit + 2014 = WaterBottle + 2018 = LeatherArmor + 2019 = MetalArmor + 2024 = ShadowArmor + 2025 = EnvironmentalSuit + 2026 = StrifeMap + 2027 = Scanner + 2028 = LightGlobe + 2046 = CrateOfMissiles + 2047 = EnergyPod + 2048 = BoxOfBullets + 3001 = Reaver + 3002 = AcolyteTan + 3003 = Templar + 3004 = Peasant1 + 3005 = Crusader + 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 diff --git a/wadsrc/static/sndinfo.txt b/wadsrc/static/sndinfo.txt index be2ecd987..562681043 100644 --- a/wadsrc/static/sndinfo.txt +++ b/wadsrc/static/sndinfo.txt @@ -56,1274 +56,3 @@ dog/attack dsdgatk dog/death dsdgdth dog/pain dsdgpain dog/sight dsdgsit - -/****************************************************************************/ -/* */ -/* DOOM SOUNDS */ -/* */ -/****************************************************************************/ - -$ifdoom - - -// BOOM has pitch shifting equivalent to a range of 4. I never got to hear -// Doom when it used pitch shifting, so I don't know if this is correct or not. -$pitchshiftrange 4 - -// This sound is never actually used. It's just defined here for -// compatibility with DeHackEd patches that reference dsskldth. -misc/unused dsskldth // Sounds just like dsoof - -//=========================================================================== -// -// Doom-specific player sounds -// -//=========================================================================== - -$playersound player male *death dspldeth -$playersound player male *xdeath dspdiehi -$playersound player male *gibbed dsslop -$playersound player male *pain100 dsplpain -$playersounddup player male *pain75 *pain100 -$playersounddup player male *pain50 *pain100 -$playersounddup player male *pain25 *pain100 -$playersound player male *grunt dsoof -$playersounddup player male *land *grunt -$playersound player male *jump dsjump -$playersound player male *fist dspunch -$playersound player male *usefail dsnoway - -$playersound player female *death dsfldeth -$playersound player female *xdeath dsfdiehi -$playersound player female *gibbed dsslop -$playersound player female *pain100 dsflpain -$playersounddup player female *pain75 *pain100 -$playersounddup player female *pain50 *pain100 -$playersounddup player female *pain25 *pain100 -$playersound player female *grunt dsfoof -$playersounddup player female *land *grunt -$playersound player female *jump dsfjump -$playersound player female *fist dspunch -$playersound player female *usefail dsfnoway - -$playersound player other *death dscldeth -$playersound player other *xdeath dscdiehi -$playersound player other *gibbed dsslop -$playersound player other *pain100 dsclpain -$playersounddup player other *pain75 *pain100 -$playersounddup player other *pain50 *pain100 -$playersounddup player other *pain25 *pain100 -$playersound player other *grunt dscoof -$playersounddup player other *land *grunt -$playersound player other *jump dscjump -$playersound player other *fist dspunch -$playersound player other *usefail dscnoway - -// Alternate names for some player sounds needed for ZDoom <= 1.22 compatibility -// -// If any sounds with these names are defined later, they will redefine -// the corresponding player sounds instead. Likewise, if they are played, -// they will play the corresponding player sound instead. - -$playercompat player male *death player/male/death1 -$playercompat player male *death player/male/death2 -$playercompat player male *death player/male/death3 -$playercompat player male *death player/male/death4 -$playercompat player male *xdeath player/male/xdeath1 -$playercompat player male *pain100 player/male/pain100_1 -$playercompat player male *pain100 player/male/pain100_2 -$playercompat player male *pain75 player/male/pain75_1 -$playercompat player male *pain75 player/male/pain75_2 -$playercompat player male *pain50 player/male/pain50_1 -$playercompat player male *pain50 player/male/pain50_2 -$playercompat player male *pain25 player/male/pain25_1 -$playercompat player male *pain25 player/male/pain25_2 -$playercompat player male *grunt player/male/grunt1 -$playercompat player male *land player/male/land1 -$playercompat player male *jump player/male/jump1 -$playercompat player male *gibbed player/male/gibbed -$playercompat player male *fist player/male/fist - -$playercompat player female *death player/female/death1 -$playercompat player female *death player/female/death2 -$playercompat player female *death player/female/death3 -$playercompat player female *death player/female/death4 -$playercompat player female *xdeath player/female/xdeath1 -$playercompat player female *pain100 player/female/pain100_1 -$playercompat player female *pain100 player/female/pain100_2 -$playercompat player female *pain75 player/female/pain75_1 -$playercompat player female *pain75 player/female/pain75_2 -$playercompat player female *pain50 player/female/pain50_1 -$playercompat player female *pain50 player/female/pain50_2 -$playercompat player female *pain25 player/female/pain25_1 -$playercompat player female *pain25 player/female/pain25_2 -$playercompat player female *grunt player/female/grunt1 -$playercompat player female *land player/female/land1 -$playercompat player female *jump player/female/jump1 -$playercompat player female *gibbed player/female/gibbed -$playercompat player female *fist player/female/fist - -$playercompat player other *death player/cyborg/death1 -$playercompat player other *death player/cyborg/death2 -$playercompat player other *death player/cyborg/death3 -$playercompat player other *death player/cyborg/death4 -$playercompat player other *xdeath player/cyborg/xdeath1 -$playercompat player other *pain100 player/cyborg/pain100_1 -$playercompat player other *pain100 player/cyborg/pain100_2 -$playercompat player other *pain75 player/cyborg/pain75_1 -$playercompat player other *pain75 player/cyborg/pain75_2 -$playercompat player other *pain50 player/cyborg/pain50_1 -$playercompat player other *pain50 player/cyborg/pain50_2 -$playercompat player other *pain25 player/cyborg/pain25_1 -$playercompat player other *pain25 player/cyborg/pain25_2 -$playercompat player other *grunt player/cyborg/grunt1 -$playercompat player other *land player/cyborg/land1 -$playercompat player other *jump player/cyborg/jump1 -$playercompat player other *gibbed player/cyborg/gibbed -$playercompat player other *fist player/cyborg/fist - -// -// Weapons -// - -$pitchshiftrange 3 -weapons/sawup dssawup -weapons/sawidle dssawidl -weapons/sawfull dssawful -weapons/sawhit dssawhit -$pitchshiftrange 4 - -weapons/pistol dspistol -weapons/shotgf dsshotgn -weapons/shotgr dssgcock -weapons/sshotf dsdshtgn -weapons/sshoto dsdbopn -weapons/sshotc dsdbcls -weapons/sshotl dsdbload -weapons/chngun dspistol -weapons/rocklx dsbarexp -weapons/rocklf dsrlaunc -weapons/plasmaf dsplasma -weapons/plasmax dsfirxpl -weapons/bfgf dsbfg -weapons/bfgx dsrxplod -weapons/railgf railgf1 -weapons/grbnce dsbounce -weapons/grenlx dsgrnexp -weapons/grenlf dsglaunc - -// Problem: weapons/rocklx needs to be unlimited but -// is also used for the MAP30 brain explosion. -// This alias remaps to the original but has its own limit -// attached so that it doesn't become too loud. -$alias misc/brainexplode weapons/rocklx -$limit misc/brainexplode 4 - -$limit weapons/plasmaf 0 -$limit weapons/chngun 0 -$limit weapons/rocklf 0 // because normal running is almost as fast as a rocket -$limit weapons/rocklx 0 // and the cyberdemon shoots 3 at once - -//=========================================================================== -// -// MONSTER SOUNDS -// -//=========================================================================== - -misc/gibbed dsslop - -// Zombie man - -$random grunt/sight { grunt/sight1 grunt/sight2 grunt/sight3 } -$random grunt/death { grunt/death1 grunt/death2 grunt/death3 } -grunt/sight1 dsposit1 -grunt/sight2 dsposit2 -grunt/sight3 dsposit3 -grunt/active dsposact -grunt/pain dspopain -grunt/death1 dspodth1 -grunt/death2 dspodth2 -grunt/death3 dspodth3 -grunt/attack dspistol - -// Shotgun guy - -$random shotguy/sight { shotguy/sight1 shotguy/sight2 shotguy/sight3 } -$random shotguy/death { shotguy/death1 shotguy/death2 shotguy/death3 } -shotguy/sight1 dsposit1 -shotguy/sight2 dsposit2 -shotguy/sight3 dsposit3 -shotguy/active dsposact -shotguy/pain dspopain -shotguy/death1 dspodth1 -shotguy/death2 dspodth2 -shotguy/death3 dspodth3 -shotguy/attack dsshotgn - -// Archvile - -vile/sight dsvilsit -vile/active dsvilact -vile/pain dsvipain -vile/death dsvildth -vile/raise dsslop -vile/start dsvilatk -vile/stop dsbarexp -vile/firestrt dsflamst -vile/firecrkl dsflame - -// Revenant - -skeleton/sight dsskesit -skeleton/active dsskeact -skeleton/pain dspopain -skeleton/melee dsskepch -skeleton/swing dsskeswg -skeleton/death dsskedth -skeleton/attack dsskeatk -skeleton/tracex dsbarexp - -// Fatso - -fatso/sight dsmansit -fatso/active dsposact -fatso/pain dsmnpain -fatso/raiseguns dsmanatk -fatso/death dsmandth -fatso/attack dsfirsht -fatso/shotx dsfirxpl - -// Chainguy - -$random chainguy/sight { chainguy/sight1 chainguy/sight2 chainguy/sight3 } -$random chainguy/death { chainguy/death1 chainguy/death2 chainguy/death3 } -chainguy/sight1 dsposit1 -chainguy/sight2 dsposit2 -chainguy/sight3 dsposit3 -chainguy/active dsposact -chainguy/pain dspopain -chainguy/death1 dspodth1 -chainguy/death2 dspodth2 -chainguy/death3 dspodth3 -chainguy/attack dsshotgn -$limit chainguy/attack 0 - -// Imp - -$random imp/sight { imp/sight1 imp/sight2 } -$random imp/death { imp/death1 imp/death2 } -imp/sight1 dsbgsit1 -imp/sight2 dsbgsit2 -imp/active dsbgact -imp/pain dspopain -imp/melee dsclaw -imp/death1 dsbgdth1 -imp/death2 dsbgdth2 -imp/attack dsfirsht -imp/shotx dsfirxpl -$limit imp/active 6 - -// Demon - -demon/sight dssgtsit -demon/active dsdmact -demon/pain dsdmpain -demon/melee dssgtatk -demon/death dssgtdth -$limit demon/melee 4 - -// Spectre - -spectre/sight dssgtsit -spectre/active dsdmact -spectre/pain dsdmpain -spectre/melee dssgtatk -spectre/death dssgtdth - -// Cacodemon - -caco/sight dscacsit -caco/active dsdmact -caco/pain dsdmpain -caco/death dscacdth -caco/attack dsfirsht -caco/shotx dsfirxpl - -// Baron of Hell - -baron/sight dsbrssit -baron/active dsdmact -baron/pain dsdmpain -baron/melee dsclaw -baron/death dsbrsdth -baron/attack dsfirsht -baron/shotx dsfirxpl - -// Hell Knight - -knight/sight dskntsit -knight/active dsdmact -knight/pain dsdmpain -knight/death dskntdth - -// Lost Soul - -skull/active dsdmact -skull/pain dsdmpain -skull/melee dssklatk -skull/death dsfirxpl - -// Spider Mastermind - -spider/sight dsspisit -spider/active dsdmact -spider/pain dsdmpain -spider/attack dsshotgn -spider/death dsspidth -spider/walk dsmetal - -// Arachnotron - -baby/sight dsbspsit -baby/active dsbspact -baby/pain dsdmpain -baby/death dsbspdth -baby/walk dsbspwlk -baby/attack dsplasma -baby/shotx dsfirxpl - -$limit baby/attack 0 - -// Cyber Demon - -cyber/sight dscybsit -cyber/active dsdmact -cyber/pain dsdmpain -cyber/death dscybdth -cyber/hoof dshoof - -// Pain Elemental - -pain/sight dspesit -pain/active dsdmact -pain/pain dspepain -pain/death dspedth - -// Wolfenstein SS - -wolfss/sight dssssit -wolfss/active dsposact -wolfss/pain dspopain -wolfss/death dsssdth -wolfss/attack dsshotgn - -// Commander Keen - -keen/pain dskeenpn -keen/death dskeendt - -// Boss Brain - -brain/sight dsbossit -brain/pain dsbospn -brain/death dsbosdth -brain/spit dsbospit -brain/cube dsboscub -brain/cubeboom dsfirxpl -$alias brain/spawn misc/teleport - - -//============================================================================ -// -// WORLD SOUNDS -// -//=========================================================================== - -world/barrelx dsbarexp - -world/drip dsempty -world/watersplash dsempty -world/sludgegloop dsempty -world/lavasizzle dsempty - -// -// -// Platform Sounds -// - -plats/pt1_strt dspstart -plats/pt1_stop dspstop -plats/pt1_mid dsstnmov - -// -// Door Sounds -// - -doors/dr1_open dsdoropn -doors/dr1_clos dsdorcls -doors/dr2_open dsbdopn -doors/dr2_clos dsbdcls - -//=========================================================================== -// -// MISCELLANEOUS SOUNDS -// -//=========================================================================== - -misc/secret dssecret -misc/w_pkup dswpnup // Pickup weapon -misc/p_pkup dsgetpow // Pickup powerup -misc/i_pkup dsitemup // Pickup item -misc/k_pkup dsitemup // Pickup key -misc/spawn dsitmbk // Item respawn -misc/chat dsradio // Doom 2 chat sound -misc/chat2 dstink // Chat sound for everything else - -$limit misc/i_pkup 1 -$limit misc/k_pkup 1 -$limit misc/w_pkup 1 -$limit misc/p_pkup 1 -$pitchshift misc/i_pkup 0 -$pitchshift misc/k_pkup 0 -$pitchshift misc/chat2 0 - -switches/normbutn dsswtchn -switches/exitbutn dsswtchx - -misc/teleport dstelept - -menu/activate dsswtchn // Activate a new menu -menu/backup dsswtchn // Backup to previous menu -menu/prompt dsswtchn // Activate a prompt "menu" -menu/cursor dspstop // Move cursor up/down -menu/change dsstnmov // Select new value for option -menu/invalid dsoof // Menu not available -menu/dismiss dsswtchx // Dismiss a prompt message -menu/choose dspistol // Choose a menu item -menu/clear dsswtchx // Close top menu - -$random menu/quit1 { player/male/death1 demon/pain grunt/pain misc/gibbed misc/teleport grunt/sight1 grunt/sight3 demon/melee } -$random menu/quit2 { vile/active misc/p_pkup brain/cube misc/gibbed skeleton/swing knight/death baby/active demon/melee } - -$alias intermission/tick weapons/pistol -$alias intermission/cooptotal *death -$alias intermission/nextstage weapons/rocklx -$alias intermission/paststats weapons/shotgr -$alias intermission/pastcoopstats weapons/shotgr -$alias intermission/pastdmstats *gibbed - - -$endif // ifdoom - - -/****************************************************************************/ -/* */ -/* HERETIC SOUNDS */ -/* */ -/****************************************************************************/ - -$ifheretic - -$rolloff * custom 0 1600 - -$pitchshiftrange 2 - -$playersound player male *wimpydeath plrwdth -$playersound player male *death plrdth -$playersound player male *crazydeath plrcdth -$playersound player male *gibbed gibdth -$playersound player male *pain100 plrpai -$playersounddup player male *pain75 *pain100 -$playersounddup player male *pain50 *pain100 -$playersounddup player male *pain25 *pain100 -$playersound player male *weaponlaugh wpnup -$playersounddup player male *evillaugh *weaponlaugh -$playersound player male *grunt plroof -$playersounddup player male *usefail *grunt -$playersounddup player male *land *grunt -$playersound player male *jump plrjmp -$playersound player male *burndeath hedat1 - -$playeralias chicken male *usefail chicken/peck -$PlayerAlias Chicken Male *Grunt chicken/pain -$PlayerAlias Chicken Male *Land chicken/pain -$PlayerAlias Chicken Male *Jump chicken/active -$PlayerAlias Chicken Male *EvilLaugh chicken/active - -chicken/sight chicpai -chicken/pain chicpai -chicken/death chicdth -chicken/attack chicatk - -misc/burn hedat1 - -weapons/staffhit stfhit -weapons/staffpowerhit stfpow -weapons/staffcrackle stfcrk -weapons/wandhit gldhit -weapons/bowshoot bowsht -weapons/bowhit hrnhit -weapons/gauntletsactivate gntact -weapons/gauntletsuse gntuse -weapons/gauntletson gntful -weapons/gauntletshit gnthit -weapons/gauntletspowhit gntpow -weapons/maceshoot lobsht -weapons/macebounce bounce -weapons/macehit lobhit -weapons/macestop pstop -weapons/maceexplode phohit -weapons/blasterhit blshit -weapons/blasterpowhit hrnhit -weapons/blastershoot blssht -weapons/hornrodshoot hrnsht -weapons/hornrodhit hrnhit -weapons/hornrodpowshoot hrnpow -weapons/hornrodpowhit ramphit -weapons/phoenixshoot phosht -weapons/phoenixhit phohit -weapons/phoenixpowshoot phopow - -$limit weapons/gauntletson 0 -$limit weapons/gauntletshit 0 -$limit weapons/gauntletspowhit 0 -$limit weapons/gauntletsactivate 0 -$limit weapons/gauntletsuse 0 -$limit weapons/maceexplode 0 -$limit weapons/phoenixhit 0 -$limit weapons/phoenixpowshoot 1 - -// [RH] Heretic didn't have these limitless, but they can sound bad if they're not -$limit weapons/bowhit 0 -$limit weapons/hornrodshoot 0 -$limit weapons/hornrodhit 0 -$limit weapons/maceshoot 0 - -himp/sight impsit -himp/attack impat1 -himp/pain imppai -himp/death impdth -himp/active impsit -himp/leaderattack impat2 - -misc/invuse artiuse - -$limit misc/invuse 1 - -world/podexplode podexp -world/podgrow newpod -world/wind wind -world/waterfall waterfl - -$limit world/podexplode 0 -$limit world/podgrow 0 -$limit world/wind 1 - -misc/i_pkup itemup -misc/k_pkup keyup -misc/p_pkup artiup -$alias misc/w_pkup *weaponlaugh - -misc/rain ramrain -misc/spawn respawn - -$limit misc/spawn 1 - -// -// Minotaur sounds -// - -minotaur/sight minsit -minotaur/melee stfpow -minotaur/attack1 minat1 -minotaur/attack2 minat2 -minotaur/attack3 minat3 -minotaur/pain minpai -minotaur/death mindth -minotaur/active minact -minotaur/fx2hit phohit -minotaur/fx3hit phohit - -// -// Wizard sounds -// - -wizard/sight wizsit -wizard/attack wizatk -wizard/death wizdth -wizard/pain wizpai -wizard/active1 wizact -$random wizard/active { wizard/sight wizard/active1 } - -// -// Switch sounds -// - -switches/normbutn switch -$alias switches/exitbutn switches/normbutn // Heretic has no special exit button sound - -// -// -// Platform Sounds -// - -plats/pt1_strt pstart -plats/pt1_stop pstop -plats/pt1_mid dormov - -// -// Door Sounds -// - -doors/dr1_open doropn -doors/dr1_clos dorcls -doors/dr2_open doropn -doors/dr2_clos dorcls - -// -// Ambient sounds -// - -world/amb1 amb1 -world/amb2 amb2 -world/amb3 amb3 -world/amb4 amb4 -world/amb5 amb5 -world/amb6 amb6 -world/amb7 amb7 -world/amb8 amb8 -world/amb9 amb9 -world/amb10 amb10 -world/amb11 amb11 -world/amb12 bstsit - -$limit world/amb1 1 -$limit world/amb2 1 -$limit world/amb3 1 -$limit world/amb4 1 -$limit world/amb5 1 -$limit world/amb6 1 -$limit world/amb7 1 -$limit world/amb8 1 -$limit world/amb9 1 -$limit world/amb10 1 -$limit world/amb11 0 - -misc/chat chat -misc/teleport telept -misc/ripslop ripslop - -$limit misc/chat 1 - -world/drip gloop -world/watersplash gloop -world/lavasizzle burn -world/sludgegloop dsempty - -mummy/sight mumsit -mummy/attack1 mumat1 -mummy/attack2 mumat2 -mummy/pain mumpai -mummy/death mumdth -mummy/active mumsit -mummy/head mumhed - -beast/sight bstsit -beast/attack bstatk -beast/pain bstpai -beast/death bstdth -beast/active bstact - -snake/attack snkatk -snake/sight snksit -snake/pain snkpai -snake/death snkdth -snake/active snkact - -clink/sight clksit -clink/attack clkatk -clink/pain clkpai -clink/death clkdth -clink/active clkact - -hknight/sight kgtsit -hknight/attack kgtatk -hknight/melee kgtat2 -hknight/pain kgtpai -hknight/death kgtdth -hknight/active kgtsit -hknight/hit hrnhit -hknight/axewhoosh kgtatk - -misc/timebomb phohit -world/volcano/blast lobhit -world/volcano/shoot bstatk - -ironlich/sight hedsit -ironlich/attack1 hedat1 -ironlich/attack2 hedat2 -ironlich/attack3 hedat3 -ironlich/pain hedpai -ironlich/death heddth -ironlich/active hedact - -dsparilserpent/sight bstsit -dsparilserpent/attack bstatk -dsparilserpent/pain sbtpai -dsparilserpent/death sbtdth -dsparilserpent/active sbtact - -dsparil/sight sorsit -dsparil/attack soratk -dsparil/pain sorpai -dsparil/active soract -dsparil/rise sorrise -dsparil/zap sorzap -dsparil/scream sordsph -dsparil/explode sordexp -dsparil/bones sordbon - -chicken/active chicact -chicken/attack chicatk -chicken/pain chicpai -chicken/death chicdth -chicken/peck1 chicpk1 -chicken/peck2 chicpk2 -chicken/peck3 chicpk3 -$random chicken/peck { chicken/peck1 chicken/peck2 chicken/peck3 } - -menu/activate dorcls -menu/backup switch -menu/prompt chat -menu/choose dorcls -menu/cursor switch -menu/change keyup -menu/invalid plroof -menu/dismiss dorcls -menu/clear dorcls - -misc/secret dssecret - -$alias intermission/cooptotal *death -$alias intermission/nextstage doors/dr1_clos -$alias intermission/paststats plats/pt1_stop -$alias intermission/pastcoopstats plats/pt1_stop -$alias intermission/pastdmstats *gibbed - - -$endif // ifheretic - - -/****************************************************************************/ -/* */ -/* HEXEN SOUNDS */ -/* */ -/****************************************************************************/ - -$ifhexen - -$rolloff * custom 0 2025 - -$pitchshiftrange 3 - -$random PlayerFighterExtremeDeathPicker { PlayerFighterExtreme1Death - PlayerFighterExtreme2Death - PlayerFighterExtreme3Death } - -$playeralias fighter male *death PlayerFighterNormalDeath -$playeralias fighter male *crazydeath PlayerFighterCrazyDeath -$playeralias fighter male *burndeath PlayerFighterBurnDeath -$playeralias fighter male *xdeath PlayerFighterExtremeDeathPicker -$playeralias fighter male *pain100 PlayerFighterPain -$playersounddup fighter male *pain75 *pain100 -$playersounddup fighter male *pain50 *pain100 -$playersounddup fighter male *pain25 *pain100 -$playeralias fighter male *grunt PlayerFighterGrunt -$playeralias fighter male *land PlayerLand -$playeralias fighter male *poison PlayerPoisonCough -$playeralias fighter male *falling PlayerFighterFallingScream -$playeralias fighter male *splat PlayerFallingSplat -$playeralias fighter male *usefail PlayerFighterFailedUse -$playeralias fighter male *puzzfail PuzzleFailFighter -$playersound fighter male *jump fgtjump -$playeralias fighter male *fistgrunt FighterGrunt - -$random PlayerClericExtremeDeathPicker { PlayerClericExtreme1Death - PlayerClericExtreme2Death - PlayerClericExtreme3Death } - -$playeralias cleric male *death PlayerClericNormalDeath -$playeralias cleric male *crazydeath PlayerClericCrazyDeath -$playeralias cleric male *burndeath PlayerClericBurnDeath -$playeralias cleric male *xdeath PlayerClericExtremeDeathPicker -$playeralias cleric male *pain100 PlayerClericPain -$playersounddup cleric male *pain75 *pain100 -$playersounddup cleric male *pain50 *pain100 -$playersounddup cleric male *pain25 *pain100 -$playeralias cleric male *grunt PlayerClericGrunt -$playeralias cleric male *land PlayerLand -$playeralias cleric male *poison PlayerPoisonCough -$playeralias cleric male *falling PlayerClericFallingScream -$playeralias cleric male *splat PlayerFallingSplat -$playeralias cleric male *usefail PlayerClericFailedUse -$playeralias cleric male *puzzfail PuzzleFailCleric -$playersound cleric male *jump plrjump - -$random PlayerMageExtremeDeathPicker { PlayerMageExtreme1Death - PlayerMageExtreme2Death - PlayerMageExtreme3Death } - -$playeralias mage male *death PlayerMageNormalDeath -$playeralias mage male *crazydeath PlayerMageCrazyDeath -$playeralias mage male *burndeath PlayerMageBurnDeath -$playeralias mage male *xdeath PlayerMageExtremeDeathPicker -$playeralias mage male *pain100 PlayerMagePain -$playersounddup mage male *pain75 *pain100 -$playersounddup mage male *pain50 *pain100 -$playersounddup mage male *pain25 *pain100 -$playeralias mage male *grunt PlayerMageGrunt -$playeralias mage male *land PlayerLand -$playeralias mage male *poison PlayerPoisonCough -$playeralias mage male *falling PlayerMageFallingScream -$playeralias mage male *splat PlayerFallingSplat -$playeralias mage male *usefail PlayerMageFailedUse -$playeralias mage male *puzzfail PuzzleFailMage -$playersound mage male *jump mgjump - -$playeralias pig male *usefail PigActive1 -$playeralias pig male *puzzfail PigActive2 -$playeralias pig male *grunt PigActive1 -$playeralias pig male *land PigActive2 -$playeralias pig male *jump PigActive1 -$playeralias pig male *poison PigActive2 -$playeralias pig male *falling PigPain -$playeralias pig male *splat PigDeath - -$alias world/drip Ambient10 -$alias world/watersplash WaterSplash -$alias world/lavasizzle LavaSizzle -$alias world/sludgegloop SludgeGloop -$alias world/wind Wind -$alias world/quake Earthquake -$alias world/thunder ThunderCrash - -$alias misc/w_pkup PickupWeapon -$alias misc/p_pkup PickupArtifact -$alias misc/k_pkup PickupKey -$alias misc/i_pkup PickupItem -$alias misc/spawn Respawn -$alias misc/teleport Teleport -$alias misc/keytry DoorLocked -$alias misc/invuse UseArtifact -$alias misc/freeze FreezeDeath -$alias misc/icebreak FreezeShatter - -$alias misc/chat Chat -$alias misc/chat2 Chat - -$alias misc/fallingsplat PlayerFallingSplat - -$alias minotaur/sight MaulatorSight -$alias minotaur/pain MaulatorPain -$alias minotaur/death MaulatorDeath -$alias minotaur/active MaulatorActive -$alias minotaur/attack1 MaulatorHamHit -$alias minotaur/attack2 MaulatorHamSwing - -$random BishopActiveSounds { BishopActive BishopSight } -$random PigActive { PigActive1 PigActive2 } - -$limit PlayerFighterFailedUse 1 -$limit PlayerClericFailedUse 1 -$limit PlayerMageFailedUse 1 -$limit SorcererBallWoosh 4 -$limit SorcererBallBounce 3 -$limit SorcererBallExplode 3 -$limit SorcererBallPop 3 -$limit SorcererBigBallExplode 3 -$limit Ambient1 1 -$limit Ambient2 1 -$limit Ambient3 1 -$limit Ambient4 1 -$limit Ambient5 1 -$limit Ambient6 1 -$limit Ambient7 1 -$limit Ambient8 1 -$limit Ambient9 1 -$limit Ambient10 1 -$limit Ambient11 1 -$limit Ambient12 1 -$limit Ambient13 1 -$limit Ambient14 1 -$limit Ambient15 1 -$limit MysticIncant 4 - -$pitchshift PlayerMageNormalDeath 0 -$pitchshift PlayerMageCrazyDeath 0 -$pitchshift PlayerMageExtreme1Death 0 -$pitchshift PlayerMageExtreme2Death 0 -$pitchshift PlayerMageExtreme3Death 0 -$pitchshift PlayerMageBurnDeath 0 -$pitchshift PlayerMagePain 0 -$pitchshift PlayerMageGrunt 0 -$pitchshift PlayerMageFallingScream 0 -$pitchshift PlayerMageFailedUse 0 -$pitchshift PickupWeapon 0 -$pitchshift PickupPiece 0 -$pitchshift WeaponBuild 0 -$pitchshift BellRing 0 - -$alias menu/activate DoorCloseLight -$alias menu/backup PickupKey -$alias menu/prompt Chat -$alias menu/cursor FighterHammerHitWall -$alias menu/change PickupKey -$alias menu/invalid DoorCloseMetal // Hexen does not use this, but I do -$alias menu/dismiss PlatformStop -$alias menu/choose DoorCloseLight -$alias menu/clear PlatformStop - -// Hexen does not have ripslop sound like Heretic -misc/ripslop dsempty -misc/netnotch blddrp1 - -$alias intermission/cooptotal *death -$alias intermission/nextstage DoorCloseLight -$alias intermission/paststats PlatformStop -$alias intermission/pastcoopstats PlatformStop -$alias intermission/pastdmstats *gibbed - -$limit DoorCloseLight 4 - -$limit PuppyBeat 0 -$limit CeantaurPain 0 -$limit BishopPain 0 -$limit SerpentPain 0 -$limit DemonPain 0 -$limit WraithPain 0 -$limit MaulatorPain 0 -$limit EttinPain 0 -$limit FireDemonPain 0 -$limit SorcererPain 0 -$limit DragonPain 0 - -$endif // ifhexen - -/****************************************************************************/ -/* */ -/* STRIFE SOUNDS */ -/* */ -/****************************************************************************/ - -$ifstrife - -$rolloff * 200 1200 - -$playersound player male *death dspldeth -$playersound player male *xdeath dspdiehi -$playersound player male *gibbed dsslop -$playersound player male *pain100 dsplpain -$playersounddup player male *pain75 *pain100 -$playersounddup player male *pain50 *pain100 -$playersounddup player male *pain25 *pain100 -$playersound player male *grunt dsoof -$playersounddup player male *land *grunt -$playersound player male *jump dsjump -$playersound player male *fist dspunch -$playersound player male *usefail dsnoway - -$playersound player female *death dsfldeth -$playersound player female *xdeath dsfdiehi -$playersound player female *gibbed dsslop -$playersound player female *pain100 dsflpain -$playersounddup player female *pain75 *pain100 -$playersounddup player female *pain50 *pain100 -$playersounddup player female *pain25 *pain100 -$playersound player female *grunt dsfoof -$playersounddup player female *land *grunt -$playersound player female *jump dsfjump -$playersound player female *fist dspunch -$playersound player female *usefail dsfnoway - -$playersound player other *death dscldeth -$playersound player other *xdeath dscdiehi -$playersound player other *gibbed dsslop -$playersound player other *pain100 dsclpain -$playersounddup player other *pain75 *pain100 -$playersounddup player other *pain50 *pain100 -$playersounddup player other *pain25 *pain100 -$playersound player other *grunt dscoof -$playersounddup player other *land *grunt -$playersound player other *jump dscjump -$playersound player other *fist dspunch -$playersound player other *usefail dscnoway - -weapons/xbowshoot dsxbow -weapons/xbowhit dsfirxpl -weapons/assaultgun dsrifle -weapons/minimissile dsrlaunc -weapons/minimissilehit dsmislht -weapons/flamethrower dsflburn -weapons/flameidle dsflidl -weapons/mauler1 dspgrdat -weapons/mauler2charge dsproton -weapons/mauler2fire dsprotfl -weapons/mauler2hit dsexplod -weapons/hegrenadeshoot dsphoot -weapons/hegrenadebang dsexplod -weapons/phgrenadeshoot dsphoot -weapons/phgrenadebang dsexplod -weapons/sigil dssigil -weapons/sigilhit dssglhit -weapons/sigilcharge dssiglup - -monsters/rifle dsrifle - -switches/normbutn dsswtchn -$alias switches/exitbutn switches/normbutn -switches/chain dspulchn -switches/knob dsswknob -switches/keycard dskeycrd -switches/stone dsswston -switches/bolt dsswbolt -switches/boltback dsempty -switches/scanner dsswscan -switches/fool dsdifool -switches/valve dsvalve -switches/sizzle dsfirxpl - -world/glassbreak dsbglass -world/barrelx dsbarexp -world/smallfire dssmfire -world/largefire dslgfire -world/river dswriver -world/waterfall dswfall -world/waterdrip dswdrip -world/watersplash dswsplsh - -$limit world/river 1 -$limit world/waterfall 1 -$limit world/waterdrip 1 - -world/drip dsempty // These four satisfy the Heretic/Hexen terrain definitions -world/sludgegloop dsempty -world/lavasizzle dsempty -world/lavasizzle dsempty - -menu/activate dsswtchn // Activate a new menu -menu/backup dsswtchn // Backup to previous menu -menu/prompt dsswtchn // Activate a prompt "menu" -menu/cursor dspstop // Move cursor up/down -menu/change dsstnmov // Select new value for option -menu/invalid dsoof // Menu not available -menu/dismiss dsswish // Dismiss a prompt message -menu/choose dsrifl // Choose a menu item -menu/clear dsmtalht // Close top menu - -misc/startupdone dspsdtha -misc/teleport dstelept -misc/swish dsswish -misc/meathit dsmeatht -misc/metalhit dsmtalht -misc/pcrush dspcrush -misc/gibbed dsslop -misc/explosion dsexplod -misc/reactor dsreactr -misc/missileinflight dsrflite -misc/static dsstatic -misc/chant dschant -misc/alarm dsalarm -misc/disruptordeath dsdsrptr -$singular misc/alarm - -misc/secret dsyeah -misc/w_pkup dswpnup -misc/p_pkup dsyeah -misc/i_pkup dsitemup -misc/k_pkup dsitemup -misc/spawn dsitmbk -misc/chat dsradio -misc/invuse dsitemup -misc/mask dsmask - -plats/pt1_strt dspstart -plats/pt1_stop dspstop -plats/pt1_mid dsstnmov - -doors/dr2_open dsbdopn -doors/dr2_clos dsbdcls - -doors/stone_open dsdrston -doors/stone_close dsdrston - -doors/large_metal_open dsdrlmto -doors/large_metal_close dsdrlmtc - -doors/small_metal_open dsdrsmto -doors/small_metal_close dsdrsmtc - -doors/large_wood_open dsdrlwud -doors/large_wood_close dsdrlwud - -doors/small_wood_open dsdrswud -doors/small_wood_close dsdrswud - -doors/airlock_open dsairlck -doors/airlock_close dsairlck - -doors/chain_open dsdrchno -doors/chain_close dsdrchnc - -woodenbarrel/death dswbrldt - -human/imonfire dsburnme - -ambient/alien1 dsamaln1 -ambient/alien2 dsamaln2 -ambient/alien3 dsamaln3 -ambient/alien4 dsamaln4 -ambient/alien5 dsamaln5 -ambient/alien6 dsamaln6 - -reaver/sight dsrevsee -reaver/pain dsreavpn -reaver/death dsrevdth -reaver/active dsrevact -reaver/attack dsreavat -reaver/blade dsrevbld - -crusader/sight dsrb2see -crusader/pain dsrb2pn -crusader/death dsrb2dth -crusader/active dsrb2act -crusader/misl dsrlaunc -crusader/mislx dsmislht - -bishop/sight dsrb2see -bishop/pain dsrb2pn -bishop/death dspgrdth -bishop/active dsrb2act -bishop/misl dsrlaunc -bishop/mislx dsmislht - -sentinel/sight dssntsee -sentinel/death dssntdth -sentinel/active dssntact -sentinel/plasma dsplasma - -$random peasant/pain { peasant/pain1 peasant/pain2 peasant/pain3 peasant/pain4 } -peasant/pain1 dspespna -peasant/pain2 dspespnb -peasant/pain3 dspespnc -peasant/pain4 dspespnd - -//$random peasant/death { peasant/death1 peasant/death2 peasant/death3 } -$alias peasant/death peasant/death1 -peasant/death1 dspsdtha -peasant/death2 dspsdthb -peasant/death3 dspsdthc - -peasant/sight dsrebact -peasant/attack dsmeatht -peasant/active dsrebact - -beggar/attack dsmeatht -$alias beggar/pain peasant/pain -$alias beggar/death peasant/death - -rebel/sight dswpnup -$alias rebel/pain peasant/pain -rebel/death dsrebdth -rebel/active dsrebact - -barkeep/pain dsambbar -barkeep/active dsambppl -$singular barkeep/pain -$singular barkeep/active - -$alias smith/pain peasant/pain -$alias armorer/pain peasant/pain -$alias medic/pain peasant/pain -$alias zombie/death peasant/death -$alias becoming/death peasant/death -zombie/spawner dstelept - -acolyte/sight dsagrsee -acolyte/pain dsagrdpn -acolyte/death dsagrdth -acolyte/rifle dsrifle -$random acolyte/active { acolyte/active1 acolyte/active2 acolyte/active3 acolyte/active4 } -acolyte/active1 dsagrac1 -acolyte/active2 dsagrac2 -acolyte/active3 dsagrac3 -acolyte/active4 dsagrac4 - -macil/sight dsagrsee -$alias macil/pain peasant/pain -macil/active dsrebact -macil/slop dsslop - -alienspectre/sight dsalnsee -alienspectre/blade dsrevbld -alienspectre/pain dsalnpn -alienspectre/death dsalndth -alienspectre/active dsalnact - -turret/death dsmislht - -ore/explode dsexplod - -rat/sight dsratact -rat/death dsratact -rat/active dsratact -$singular rat/sight - -loremaster/chain dschain -loremaster/swish dsswish -loremaster/sight dslorsee -loremaster/attack dsrevbld -loremaster/pain dslorpn -loremaster/death dsslop -loremaster/active dstend - -stalker/sight dsspisit -stalker/attack dsspdatk -stalker/pain dsspdatk -stalker/death dsspidth -stalker/active dsspisit -stalker/walk dsspdwlk - -templar/sight dspgrsee -templar/pain dspgrdpn -templar/death dspgrdth -templar/active dspgract -templar/shoot dspgrdat - -inquisitor/sight dsinqsee -inquisitor/death dsinqdth -inquisitor/active dsinqact -inquisitor/walk dsinqact -inquisitor/jump dsinqjmp -inquisitor/attack dsphoot -inquisitor/atkexplode dsexplod - -programmer/clank dsmtalht -programmer/attack dsrevbld // Unused? -programmer/pain dsprgpn -programmer/death dsrb2dth -programmer/active dsprogac - -entity/sight dsmnalse -entity/melee dsrevbld -entity/pain dsalnpn -entity/death dsmnaldt -entity/active dsalnact - -$alias intermission/tick weapons/assaultgun -$alias intermission/cooptotal *death -$alias intermission/nextstage misc/explosion -$alias intermission/paststats world/barrelx -$alias intermission/pastcoopstats world/barrelx -$alias intermission/pastdmstats *gibbed - -$endif diff --git a/zdoom.vcproj b/zdoom.vcproj index 9c3367ff2..ef356b44a 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -1942,6 +1942,10 @@ RelativePath=".\src\win32\fb_ddraw.cpp" > + +