From f1408bfb5bd58940338048845e0f607d9661b659 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 9 Apr 2019 00:21:06 +0200 Subject: [PATCH 1/5] - allow retroactive substitution of cluster texts This is needed to localize Harmony without swapping out the MAPINFO. --- src/gamedata/g_mapinfo.cpp | 22 ++++++++++++++++++++-- src/gamedata/stringtable.cpp | 31 ++++++++++++++++++++++++++++++- src/gamedata/stringtable.h | 2 ++ 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/gamedata/g_mapinfo.cpp b/src/gamedata/g_mapinfo.cpp index 5757703d2..9e3b1a444 100644 --- a/src/gamedata/g_mapinfo.cpp +++ b/src/gamedata/g_mapinfo.cpp @@ -765,12 +765,30 @@ void FMapInfoParser::ParseCluster() ParseAssign(); if (ParseLookupName(clusterinfo->EnterText)) clusterinfo->flags |= CLUSTER_LOOKUPENTERTEXT; + else + { + FStringf testlabel("CLUSTERENTER%d", clusterinfo->cluster); + if (GStrings.MatchDefaultString(testlabel, clusterinfo->EnterText)) + { + clusterinfo->EnterText = testlabel; + clusterinfo->flags |= CLUSTER_LOOKUPENTERTEXT; + } + } } else if (sc.Compare("exittext")) { ParseAssign(); if (ParseLookupName(clusterinfo->ExitText)) clusterinfo->flags |= CLUSTER_LOOKUPEXITTEXT; + else + { + FStringf testlabel("CLUSTEREXIT%d", clusterinfo->cluster); + if (GStrings.MatchDefaultString(testlabel, clusterinfo->ExitText)) + { + clusterinfo->ExitText = testlabel; + clusterinfo->flags |= CLUSTER_LOOKUPEXITTEXT; + } + } } else if (sc.Compare("music")) { @@ -1933,8 +1951,8 @@ level_info_t *FMapInfoParser::ParseMapHeader(level_info_t &defaultinfo) // Workaround to allow localizazion of IWADs which do not have a string label here (e.g. HACX.WAD) // This checks for a string labelled with the MapName and if that is identical to what got parsed here // the string table entry will be used. - auto c = GStrings.GetLanguageString(levelinfo->MapName, FStringTable::default_table); - if (c && !strcmp(c, sc.String)) + + if (GStrings.MatchDefaultString(levelinfo->MapName, sc.String)) { levelinfo->flags |= LEVEL_LOOKUPLEVELNAME; levelinfo->LevelName = levelinfo->MapName; diff --git a/src/gamedata/stringtable.cpp b/src/gamedata/stringtable.cpp index 3505470c2..2e249a0f9 100644 --- a/src/gamedata/stringtable.cpp +++ b/src/gamedata/stringtable.cpp @@ -250,6 +250,10 @@ bool FStringTable::ParseLanguageCSV(const TArray &buffer) { InsertString(langentry.second, strName, str); } + else + { + DeleteString(langentry.second, strName); + } } } } @@ -372,6 +376,17 @@ void FStringTable::LoadLanguage (const TArray &buffer) // //========================================================================== +void FStringTable::DeleteString(int langid, FName label) +{ + allStrings[langid].Remove(label); +} + +//========================================================================== +// +// +// +//========================================================================== + void FStringTable::InsertString(int langid, FName label, const FString &string) { const char *strlangid = (const char *)&langid; @@ -386,7 +401,7 @@ void FStringTable::InsertString(int langid, FName label, const FString &string) break; } FString macroname(te.strings[0].GetChars() + index + 2, endindex - index - 2); - FStringf lookupstr("%s/%s", strlangid, macroname.GetChars()); + FStringf lookupstr("%s/%s", strlangid, macroname.GetChars()); FStringf replacee("@[%s]", macroname.GetChars()); FName lookupname(lookupstr, true); auto replace = allMacros.CheckKey(lookupname); @@ -550,6 +565,20 @@ const char *FStringTable::GetLanguageString(const char *name, uint32_t langtable return nullptr; } +bool FStringTable::MatchDefaultString(const char *name, const char *content) const +{ + // This only compares the first line to avoid problems with bad linefeeds. For the few cases where this feature is needed it is sufficient. + auto c = GetLanguageString(name, FStringTable::default_table); + if (!c) return false; + + // Check a secondary key, in case the text comparison cannot be done due to needed orthographic fixes (see Harmony's exit text) + FStringf checkkey("%s_CHECK", name); + auto cc = GetLanguageString(checkkey, FStringTable::default_table); + if (cc) c = cc; + + return (c && !strnicmp(c, content, strcspn(content, "\n\r\t"))); +} + //========================================================================== // // Finds a string by name and returns its value. If the string does diff --git a/src/gamedata/stringtable.h b/src/gamedata/stringtable.h index f4fcfa09f..e96d29c58 100644 --- a/src/gamedata/stringtable.h +++ b/src/gamedata/stringtable.h @@ -89,6 +89,7 @@ public: } const char *GetLanguageString(const char *name, uint32_t langtable, int gender = -1) const; + bool MatchDefaultString(const char *name, const char *content) const; const char *GetString(const char *name, uint32_t *langtable, int gender = -1) const; const char *operator() (const char *name) const; // Never returns NULL const char *operator[] (const char *name) const @@ -110,6 +111,7 @@ private: bool LoadLanguageFromSpreadsheet(int lumpnum, const TArray &buffer); bool readMacros(int lumpnum); void InsertString(int langid, FName label, const FString &string); + void DeleteString(int langid, FName label); static size_t ProcessEscapes (char *str); }; From 7a01b6b0d4793b1d3717968fb0caf13c660a6ea7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 9 Apr 2019 20:15:40 +0200 Subject: [PATCH 2/5] - use Unicode font for deathmatch summary screen to bring it in line with the coop version. --- .../zscript/ui/menu/search/searchfield.zs | 2 +- .../zscript/ui/statscreen/statscreen_coop.zs | 2 +- .../zscript/ui/statscreen/statscreen_dm.zs | 51 +++++++++++-------- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/wadsrc/static/zscript/ui/menu/search/searchfield.zs b/wadsrc/static/zscript/ui/menu/search/searchfield.zs index 1a7513544..88135716a 100644 --- a/wadsrc/static/zscript/ui/menu/search/searchfield.zs +++ b/wadsrc/static/zscript/ui/menu/search/searchfield.zs @@ -41,7 +41,7 @@ class os_SearchField : OptionMenuItemTextField override String Represent() { return mEnter - ? mEnter.GetText() .. SmallFont.GetCursor() + ? mEnter.GetText() .. NewSmallFont.GetCursor() : mText; } diff --git a/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs b/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs index 3dc494d17..48bf30d93 100644 --- a/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs +++ b/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs @@ -20,7 +20,7 @@ class CoopStatusScreen : StatusScreen acceleratestage = 0; ng_state = 1; displayFont = NewSmallFont; - FontScale = max(screen.GetHeight() / 480, 1); + FontScale = max(screen.GetHeight() / 400, 1); RowHeight = int(max((displayFont.GetHeight() + 1) * FontScale, 1)); cnt_pause = Thinker.TICRATE; diff --git a/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs b/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs index ec9bdcb67..345d81405 100644 --- a/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs +++ b/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs @@ -2,6 +2,9 @@ class DeathmatchStatusScreen : StatusScreen { int textcolor; + double FontScale; + int RowHeight; + Font displayFont; //==================================================================== // @@ -13,10 +16,14 @@ class DeathmatchStatusScreen : StatusScreen { int i, j; - textcolor = (gameinfo.gametype & GAME_Raven) ? Font.CR_GREEN : Font.CR_UNTRANSLATED; - + textcolor = Font.CR_GRAY; + CurState = StatCount; acceleratestage = 0; + displayFont = NewSmallFont; + FontScale = max(screen.GetHeight() / 400, 1); + RowHeight = max((displayFont.GetHeight() + 1) * FontScale, 1); + for(i = 0; i < MAXPLAYERS; i++) { playerready[i] = false; @@ -160,7 +167,7 @@ class DeathmatchStatusScreen : StatusScreen Vector2 readyoffset = TexMan.GetScaledOffset(readyico); height = int(readysize.Y - readyoffset.Y); maxiconheight = MAX(height, maxiconheight); - height = SmallFont.GetHeight() * CleanYfac; + height = displayFont.GetHeight() * FontScale; lineheight = MAX(height, maxiconheight * CleanYfac); ypadding = (lineheight - height + 1) / 2; y += CleanYfac; @@ -169,22 +176,22 @@ class DeathmatchStatusScreen : StatusScreen //text_color = Stringtable.Localize("$SCORE_COLOR"); text_frags = Stringtable.Localize("$SCORE_FRAGS"); - icon_x = 8 * CleanXfac; - name_x = icon_x + maxscorewidth * CleanXfac; - frags_x = name_x + (maxnamewidth + MAX(SmallFont.StringWidth("XXXXX"), SmallFont.StringWidth(text_frags)) + 8) * CleanXfac; - deaths_x = frags_x + ((deaths_len = SmallFont.StringWidth(text_deaths)) + 8) * CleanXfac; - + icon_x = 8 * FontScale; + name_x = icon_x + maxscorewidth * FontScale; + frags_x = name_x + (maxnamewidth + 1 + MAX(displayFont.StringWidth("XXXXXXXXXX"), displayFont.StringWidth(text_frags)) + 16) * FontScale; + deaths_x = frags_x + ((deaths_len = displayFont.StringWidth(text_deaths)) + 16) * FontScale; + x = (Screen.GetWidth() - deaths_x) >> 1; icon_x += x; name_x += x; frags_x += x; deaths_x += x; - screen.DrawText(SmallFont, textcolor, name_x, y, Stringtable.Localize("$SCORE_NAME"), DTA_CleanNoMove, true); - screen.DrawText(SmallFont, textcolor, frags_x - SmallFont.StringWidth(text_frags) * CleanXfac, y, text_frags, DTA_CleanNoMove, true); - screen.DrawText(SmallFont, textcolor, deaths_x - deaths_len * CleanXfac, y, text_deaths, DTA_CleanNoMove, true); - y += height + 6 * CleanYfac; - + drawTextScaled(displayFont, name_x, y, Stringtable.Localize("$SCORE_NAME"), FontScale, textcolor); + drawTextScaled(displayFont, frags_x - displayFont.StringWidth(text_frags) * FontScale, y, text_frags, FontScale, textcolor); + drawTextScaled(displayFont, deaths_x - deaths_len * FontScale, y, text_deaths, FontScale, textcolor); + y += height + 6 * FontScale; + // Sort all players Array sortedplayers; GetSortedPlayers(sortedplayers, teamplay); @@ -208,22 +215,25 @@ class DeathmatchStatusScreen : StatusScreen { screen.DrawTexture(player.mo.ScoreIcon, true, icon_x, y, DTA_CleanNoMove, true); } - screen.DrawText(SmallFont, thiscolor, name_x, y + ypadding, player.GetUserName(), DTA_CleanNoMove, true); - drawNum(SmallFont, frags_x, y + ypadding, cnt_frags[pnum], 0, false, thiscolor, true); + + drawTextScaled(displayFont, name_x, y + ypadding, player.GetUserName(), FontScale, thiscolor); + drawNumScaled(displayFont, frags_x, y + ypadding, FontScale, cnt_frags[pnum], 0, textcolor); + if (ng_state >= 2) { - drawNum(SmallFont, deaths_x, y + ypadding, cnt_deaths[pnum], 0, false, thiscolor, true); + drawNumScaled(displayFont, deaths_x, y + ypadding, FontScale, cnt_deaths[pnum], 0, textcolor); } y += lineheight + CleanYfac; } // Draw "TOTAL" line y += height + 3 * CleanYfac; - screen.DrawText(SmallFont, textcolor, name_x, y, Stringtable.Localize("$SCORE_TOTAL"), DTA_CleanNoMove, true); - drawNum(SmallFont, frags_x, y, total_frags, 0, false, textcolor, true); + drawTextScaled(displayFont, name_x, y, Stringtable.Localize("$SCORE_TOTAL"), FontScale, textcolor); + drawNumScaled(displayFont, frags_x, y, FontScale, total_frags, 0, textcolor); + if (ng_state >= 4) { - drawNum(SmallFont, deaths_x, y, total_deaths, 0, false, textcolor, true); + drawNumScaled(displayFont, deaths_x, y, FontScale, total_deaths, 0, textcolor); } // Draw game time @@ -235,7 +245,6 @@ class DeathmatchStatusScreen : StatusScreen seconds = seconds % 60; String leveltime = Stringtable.Localize("$SCORE_LVLTIME") .. ": " .. String.Format("%02i:%02i:%02i", hours, minutes, seconds); - - screen.DrawText(SmallFont, textcolor, x, y, leveltime, DTA_CleanNoMove, true); + drawTextScaled(displayFont, x, y, leveltime, FontScale, textcolor); } } \ No newline at end of file From 5733e8c04965ae4e1d76a3923476ed7776e37080 Mon Sep 17 00:00:00 2001 From: drbugbait Date: Tue, 9 Apr 2019 16:31:31 -0300 Subject: [PATCH 3/5] Full character-set for Esperanto orthography. --- .../filter/game-doom/fonts/bigfont/0108.lmp | Bin 0 -> 317 bytes .../filter/game-doom/fonts/bigfont/011C.lmp | Bin 0 -> 377 bytes .../filter/game-doom/fonts/bigfont/0124.lmp | Bin 0 -> 338 bytes .../filter/game-doom/fonts/bigfont/0134.lmp | Bin 0 -> 282 bytes .../filter/game-doom/fonts/bigfont/015C.lmp | Bin 0 -> 352 bytes .../filter/game-doom/fonts/bigfont/016C.lmp | Bin 0 -> 366 bytes .../filter/game-doom/fonts/bigupper/0108.lmp | Bin 0 -> 414 bytes .../filter/game-doom/fonts/bigupper/0109.lmp | Bin 0 -> 317 bytes .../filter/game-doom/fonts/bigupper/011C.lmp | Bin 0 -> 410 bytes .../filter/game-doom/fonts/bigupper/011D.lmp | Bin 0 -> 377 bytes .../filter/game-doom/fonts/bigupper/0124.lmp | Bin 0 -> 400 bytes .../filter/game-doom/fonts/bigupper/0125.lmp | Bin 0 -> 338 bytes .../filter/game-doom/fonts/bigupper/0134.lmp | Bin 0 -> 340 bytes .../filter/game-doom/fonts/bigupper/0135.lmp | Bin 0 -> 282 bytes .../filter/game-doom/fonts/bigupper/015C.lmp | Bin 0 -> 403 bytes .../filter/game-doom/fonts/bigupper/015D.lmp | Bin 0 -> 352 bytes .../filter/game-doom/fonts/bigupper/016C.lmp | Bin 0 -> 406 bytes .../filter/game-doom/fonts/bigupper/016D.lmp | Bin 0 -> 366 bytes .../filter/game-doom/fonts/defsmallfont/0108.lmp | Bin 0 -> 141 bytes .../filter/game-doom/fonts/defsmallfont/011C.lmp | Bin 0 -> 141 bytes .../filter/game-doom/fonts/defsmallfont/0124.lmp | Bin 0 -> 142 bytes .../filter/game-doom/fonts/defsmallfont/0134.lmp | Bin 0 -> 159 bytes .../filter/game-doom/fonts/defsmallfont/015C.lmp | Bin 0 -> 127 bytes .../filter/game-doom/fonts/defsmallfont/016C.lmp | Bin 0 -> 130 bytes 24 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigfont/0108.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigfont/011C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigfont/0124.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigfont/0134.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigfont/015C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigfont/016C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/0108.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/0109.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/011C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/011D.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/0124.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/0125.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/0134.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/0135.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/015C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/015D.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/016C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/bigupper/016D.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0108.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/011C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0124.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/0134.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/015C.lmp create mode 100644 wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/016C.lmp diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0108.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0108.lmp new file mode 100644 index 0000000000000000000000000000000000000000..16e8cf28fd68163670f73c948835a8bc8cae690a GIT binary patch literal 317 zcmYk0%MHRX5JXMBfFOt~HBbasjv)#WN+c62fV2hB14YmTRZs;@P=I+GK4PTjjmP7O zGcz~F1ZKs$hAkZ63>Ub<4es!OC!_;o7O;d-B)xn(WIAgd!zW|Dn_eB;Xrh^&wQcJh z0Uu@}rMM31a>5E`ShY0WQL{}S8_-!5drXljKPvUE8DVZ}`aW*neBA<9cfYI_lvOKv k`!;p@Af>qHbRsiWrU7;Lg2et0>& zBtMhEt(|i-x5p~r3@+dbZr~0c;0a#f4f@8p4cLMm=$7`Ai9$!FlroxCAw^Ylim5=f zJ#Gku=A1Ikd<9`yOX1COf|?CbxmG8%FjLc+#c(uRwAf^~qdCaecvkU@MC|cQHEhyY p8v;%+^+CmhstHpntLjufMMNYh41eOIcqU+!Dl)#68Q%H({0EjeYsmlr literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0134.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0134.lmp new file mode 100644 index 0000000000000000000000000000000000000000..952863bd04aab7b58bda45e9547499e1f8080f9f GIT binary patch literal 282 zcmYL@y$u2}4269^&_r+`R-&XJM3xm@q=ORItiT8i!4fRN66`>6ymwb%>2sVH=h>ZX zMWmKJ@&PCqz!luU9X!AjyucfLz!!u{WCudyj4`zC`NCr19{-gYwWYhJ#OJnVI|VN` zKxkl~?koIP-s=uU&nCu@sZ|?yOJ~mo(P!=HBot5RJesP;7~wLD31YMqQ&MARwT30C Vj3@<$m=ZXD8o@MeQE<-djX&E}R0lw&WVm@#}FT59C&?}Wwi$ko-u(YQI-cv13b@4sY#0?(1lAidL{+_ zP+Uv#-RPcey%J@$E<=SHcWSK6*j1xV)7VQ>>xkjXp*c}~L7gw%fE-hb8fM+F;Nelv N%~@?FX+6z*xdV3%aD@N> literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/016C.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/016C.lmp new file mode 100644 index 0000000000000000000000000000000000000000..c83c5166c52904124eebad6ac9428a6e6260dc49 GIT binary patch literal 366 zcmZvY(FwvZ5QeYTh*Si9a0<8Z$wzAmB_t3p6d&%{Eu6wB+`$!G!5!kCw2B1}zLNX6 z++Dh&H4#l{kFN$DxPU9TfjfABCwPGfHU-fZ?7$H)P;>c4RF#P35V|fvMzs*BLmy}4 zMVU)Knh_3~)*`JviTD8HopIe@o2>i(y5`hkhAi9VROFCUi9=&WlBh9vBy^rTx}^Vg sXXl5Rxw&KSvA4IW_GfMFt>eJXK<8()$gy%NQ&5BP*H_=X?2nK^e0cd&(Lc!hUZ_4@af{+uw!oPnrx7o;TV z=}|;b)yOgClv9c^VA?A>C8mr?QHYSuMs?7TVj|O8!OmA$Q6B}n?o{_w@H71A54tmd zxxiac+?nY?br(+lp?Yf{#)H<(+H1Ycm#T66x8B>3#;p1fUb<4es!OC!_;o7O;d-B)xn(WIAgd!zW|Dn_eB;Xrh^&wQcJh z0Uu@}rMM31a>5E`ShY0WQL{}S8_-!5drXljKPvUE8DVZ}`aW*neBA<9cfYI_lvOKv k`!;p@Af>exkLb!ojxQ7C-@CM7l{-O;l(yFxrS?e!2PU#pE zQtLL}EYl%GwV<6|nvIN=T8pZR=riic6>73vRA{nVN^yhPnOWTJEvs-`_hy9>h2VvU zWR|>tGyhGF`VM^*HCrw5BF3l5%{YxwEc%F-5^7B1>lbD@9?iTGafrzm`E|4T1H7Ne o__l8Awmbka=bR3${n||Zc3ET+U(yDCiPFTosJOB?_sRcgKOAm`hyVZp literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/011D.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/011D.lmp new file mode 100644 index 0000000000000000000000000000000000000000..1ccb7d2c05d3fcbc8683ffbdad45fe7b78136d5a GIT binary patch literal 377 zcmX|+-EG1!6h=)5P*DG13YO@5AMHkwg>qHbRsiWrU7y1 zld?)G8pnxzq{Q~97@^a0uoTQPBKA=i)~U7BJ@rDkubxE>+v^z_|D9FMNXGgxC>(}Q NIxE-F9gjaf+AnSRg9rcs literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0125.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0125.lmp new file mode 100644 index 0000000000000000000000000000000000000000..60566bffa5523886908cb827354ca1c62b16b76a GIT binary patch literal 338 zcmZXP!3hE}5Jj`Pdk|a~E3gGy5NsfZA%qOX_26L|um*du2y3tgYp@6}>;Lg2et0>& zBtMhEt(|i-x5p~r3@+dbZr~0c;0a#f4f@8p4cLMm=$7`Ai9$!FlroxCAw^Ylim5=f zJ#Gku=A1Ikd<9`yOX1COf|?CbxmG8%FjLc+#c(uRwAf^~qdCaecvkU@MC|cQHEhyY p8v;%+^+CmhstHpntLjufMMNYh41eOIcqU+!Dl)#68Q%H({0EjeYsmlr literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0134.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0134.lmp new file mode 100644 index 0000000000000000000000000000000000000000..6d1bf3be57080ba65129028e3a7d5a53c951baf6 GIT binary patch literal 340 zcmYk1%?-jZ429i4;81}I9GQY0xWR?0s*o*(R22t{0a$+O3%o%Z5v{-)Y`_lWsfN|%Bh}isNVmL=c)?PyiD;0hePccvZYdQ=jIQxOS4=CenoB#j- literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0135.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0135.lmp new file mode 100644 index 0000000000000000000000000000000000000000..952863bd04aab7b58bda45e9547499e1f8080f9f GIT binary patch literal 282 zcmYL@y$u2}4269^&_r+`R-&XJM3xm@q=ORItiT8i!4fRN66`>6ymwb%>2sVH=h>ZX zMWmKJ@&PCqz!luU9X!AjyucfLz!!u{WCudyj4`zC`NCr19{-gYwWYhJ#OJnVI|VN` zKxkl~?koIP-s=uU&nCu@sZ|?yOJ~mo(P!=HBot5RJesP;7~wLD31YMqQ&MARwT30C Vj3@<$m=ZXD8o@MeQE<-djX&E}R`Kqt zeg2;D&d%+fbE7+O_2i9wkS}s3-{gn^)E=c{$;_p?edDS|0qSiJTF)>smIS~6$V pVsCB5s|!kHPNmpyskVXBK()fxHUr^?^&IEX+}N~OgYI^o-~}})f)oG% literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/015D.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/015D.lmp new file mode 100644 index 0000000000000000000000000000000000000000..aa8290d3ae50fc441e8979295eb5a85eac664c52 GIT binary patch literal 352 zcmXw!?@hxn6vW*&EfVx!KCwe*;3MCuv7VwRmRv_sRow=xzzpob5G=tItl-{R!O}1G zJ74ZSA6)C4Te??%joiow`6OTDoBWVp@<&z+=bp)lypT8Y(4el}yqC=e7*iSnNihRu zy#;#XV&VUVU>0lw&WVm@#}FT59C&?}Wwi$ko-u(YQI-cv13b@4sY#0?(1lAidL{+_ zP+Uv#-RPcey%J@$E<=SHcWSK6*j1xV)7VQ>>xkjXp*c}~L7gw%fE-hb8fM+F;Nelv N%~@?FX+6z*xdV3%aD@N> literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/016C.lmp b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/016C.lmp new file mode 100644 index 0000000000000000000000000000000000000000..24b04f056acac2ca456048e752421b077af25eed GIT binary patch literal 406 zcmZXQO$x#=5QS4}+=xGmdJV6kOCgjPW*{aMg{OPx)w7gpB61Fr zHPG6k%sJv%kALqVII4m~d(`kbLWnUQI>Th=(~g_wD7D5AvN6|4ixFBmO39#{C|epR zH4pMk{w3Xin^0|K;O|(n19l;{#4=WI6Js61BAkQMt?fEhs^r_SmyJDRDky)~djW*Y Bfc4RF#P35V|fvMzs*BLmy}4 zMVU)Knh_3~)*`JviTD8HopIe@o2>i(y5`hkhAi9VROFCUi9=&WlBh9vBy^rTx}^Vg sXXl5Rxw&KSvA4IW_GfMFt>eJXK<8()$gy%NQt+xn8Yj= rv5HN&185rws&zmHuJYUoAPV^!QkFd9lNH)yBbNWB;E0myD*LA1_l6}o literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/011C.lmp b/wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/011C.lmp new file mode 100644 index 0000000000000000000000000000000000000000..b471bae34a08ff67c67e0ef86b6833cb35ce835e GIT binary patch literal 141 zcmXYp%ME}q3_}xyL`UJ~3j?qK3$OqSumCGH{i(|pQyS%2vEsyu6A_h_x{;k6eklM6$8%P@i2Z-9SW5+HKhaGGd*j$haATfx!{{bV!CuINt literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/015C.lmp b/wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/015C.lmp new file mode 100644 index 0000000000000000000000000000000000000000..3636ec6c8f94c92c8178af2afb46846d6e71f6c7 GIT binary patch literal 127 zcmXYp(FuT12t}2s-XQ(oj}~Zw7HEMMXtDAk*>ZI&g>&$L*h>)+m4P0~L}s#(m25;6 kK+{t1+)@BXIL-`%JN7TkfFpv=vx@2&7Xls(?fy?(A0gWzZU6uP literal 0 HcmV?d00001 diff --git a/wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/016C.lmp b/wadsrc_extra/static/filter/game-doom/fonts/defsmallfont/016C.lmp new file mode 100644 index 0000000000000000000000000000000000000000..fb43845b1b90b608e4c258739b3ed64690a98695 GIT binary patch literal 130 zcmd;J;9y{2U}Vq$l7>KR1H_&{916sVK%57}l|anIq7MfD8QFmJ_HDcL_5U+)09pE* mwr&M+7}@ppx9RI|-VSANfwDo0HtTPJDgtTVwjHD%ZXf`GxgvJ} literal 0 HcmV?d00001 From 8182c80f1e6b9ef82228eccc9b1b0bc8feef1611 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 10 Apr 2019 00:15:25 +0200 Subject: [PATCH 4/5] - use the Unicode font for the scoreboard. --- src/hu_scores.cpp | 63 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp index 26252c7bb..c8164499a 100644 --- a/src/hu_scores.cpp +++ b/src/hu_scores.cpp @@ -130,6 +130,9 @@ void HU_SortPlayers */ bool SB_ForceActive = false; +static FFont *displayFont; +static int FontScale; + // PRIVATE DATA DEFINITIONS ------------------------------------------------ @@ -143,6 +146,9 @@ bool SB_ForceActive = false; void HU_DrawScores (player_t *player) { + displayFont = NewSmallFont; + FontScale = MAX(screen->GetHeight() / 400, 1); + if (deathmatch) { if (teamplay) @@ -195,7 +201,7 @@ void HU_DrawScores (player_t *player) void HU_GetPlayerWidths(int &maxnamewidth, int &maxscorewidth, int &maxiconheight) { - maxnamewidth = SmallFont->StringWidth("Name"); + maxnamewidth = displayFont->StringWidth("Name"); maxscorewidth = 0; maxiconheight = 0; @@ -203,7 +209,7 @@ void HU_GetPlayerWidths(int &maxnamewidth, int &maxscorewidth, int &maxiconheigh { if (playeringame[i]) { - int width = SmallFont->StringWidth(players[i].userinfo.GetName()); + int width = displayFont->StringWidth(players[i].userinfo.GetName()); if (width > maxnamewidth) { maxnamewidth = width; @@ -235,6 +241,11 @@ void HU_GetPlayerWidths(int &maxnamewidth, int &maxscorewidth, int &maxiconheigh // //========================================================================== +static void HU_DrawFontScaled(double x, double y, int color, const char *text) +{ + screen->DrawText(displayFont, color, x / FontScale, y / FontScale, text, DTA_VirtualWidth, screen->GetWidth() / FontScale, DTA_VirtualHeight, screen->GetHeight() / FontScale, TAG_END); +} + static void HU_DoDrawScores (player_t *player, player_t *sortedplayers[MAXPLAYERS]) { int color; @@ -258,7 +269,7 @@ static void HU_DoDrawScores (player_t *player, player_t *sortedplayers[MAXPLAYER } HU_GetPlayerWidths(maxnamewidth, maxscorewidth, maxiconheight); - height = SmallFont->GetHeight() * CleanYfac; + height = displayFont->GetHeight() * FontScale; lineheight = MAX(height, maxiconheight * CleanYfac); ypadding = (lineheight - height + 1) / 2; @@ -327,23 +338,16 @@ static void HU_DoDrawScores (player_t *player, player_t *sortedplayers[MAXPLAYER *text_name = GStrings("SCORE_NAME"), *text_delay = GStrings("SCORE_DELAY"); - col2 = (SmallFont->StringWidth(text_color) + 8) * CleanXfac; - col3 = col2 + (SmallFont->StringWidth(text_frags) + 8) * CleanXfac; - col4 = col3 + maxscorewidth * CleanXfac; - col5 = col4 + (maxnamewidth + 8) * CleanXfac; - x = (SCREENWIDTH >> 1) - (((SmallFont->StringWidth(text_delay) * CleanXfac) + col5) >> 1); + col2 = (displayFont->StringWidth(text_color) + 16) * FontScale; + col3 = col2 + (displayFont->StringWidth(text_frags) + 16) * FontScale; + col4 = col3 + maxscorewidth * FontScale; + col5 = col4 + (maxnamewidth + 16) * FontScale; + x = (SCREENWIDTH >> 1) - (((displayFont->StringWidth(text_delay) * FontScale) + col5) >> 1); - screen->DrawText (SmallFont, color, x, y, text_color, - DTA_CleanNoMove, true, TAG_DONE); - - screen->DrawText (SmallFont, color, x + col2, y, text_frags, - DTA_CleanNoMove, true, TAG_DONE); - - screen->DrawText (SmallFont, color, x + col4, y, text_name, - DTA_CleanNoMove, true, TAG_DONE); - - screen->DrawText(SmallFont, color, x + col5, y, text_delay, - DTA_CleanNoMove, true, TAG_DONE); + //HU_DrawFontScaled(x, y, color, text_color); + HU_DrawFontScaled(x + col2, y, color, text_frags); + HU_DrawFontScaled(x + col4, y, color, text_name); + HU_DrawFontScaled(x + col5, y, color, text_delay); y += height + 6 * CleanYfac; bottom -= height; @@ -385,9 +389,8 @@ static void HU_DrawTimeRemaining (int y) mysnprintf (str, countof(str), "Level ends in %d:%02d:%02d", hours, minutes, seconds); else mysnprintf (str, countof(str), "Level ends in %d:%02d", minutes, seconds); - - screen->DrawText (SmallFont, CR_GREY, SCREENWIDTH/2 - SmallFont->StringWidth (str)/2*CleanXfac, - y, str, DTA_CleanNoMove, true, TAG_DONE); + + HU_DrawFontScaled(SCREENWIDTH / 2 - displayFont->StringWidth(str) / 2 * FontScale, y, CR_GRAY, str); } } @@ -407,7 +410,7 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int col1, int col2, // The teamplay mode uses colors to show teams, so we need some // other way to do highlighting. And it may as well be used for // all modes for the sake of consistancy. - screen->Dim(MAKERGB(200,245,255), 0.125f, col1 - 12*CleanXfac, y - 1, col5 + (maxnamewidth + 24)*CleanXfac, height + 2); + screen->Dim(MAKERGB(200,245,255), 0.125f, col1 - 12*FontScale, y - 1, col5 + (maxnamewidth + 24)*FontScale, height + 2); } col2 += col1; @@ -419,8 +422,7 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int col1, int col2, HU_DrawColorBar(col1, y, height, (int)(player - players)); mysnprintf (str, countof(str), "%d", deathmatch ? player->fragcount : player->killcount); - screen->DrawText (SmallFont, color, col2, y + ypadding, player->playerstate == PST_DEAD && !deathmatch ? "DEAD" : str, - DTA_CleanNoMove, true, TAG_DONE); + HU_DrawFontScaled(col2, y + ypadding, color, player->playerstate == PST_DEAD && !deathmatch ? "DEAD" : str); auto icon = FSetTextureID(player->mo->IntVar(NAME_ScoreIcon)); if (icon.isValid()) @@ -431,8 +433,7 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int col1, int col2, TAG_DONE); } - screen->DrawText (SmallFont, color, col4, y + ypadding, player->userinfo.GetName(), - DTA_CleanNoMove, true, TAG_DONE); + HU_DrawFontScaled(col4, y + ypadding, color, player->userinfo.GetName()); int avgdelay = 0; for (int i = 0; i < BACKUPTICS; i++) @@ -443,8 +444,7 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int col1, int col2, mysnprintf(str, countof(str), "%d", (avgdelay * ticdup) * (1000 / TICRATE)); - screen->DrawText(SmallFont, color, col5, y + ypadding, str, - DTA_CleanNoMove, true, TAG_DONE); + HU_DrawFontScaled(col5, y + ypadding, color, str); if (teamplay && Teams[player->userinfo.GetTeam()].GetLogo().IsNotEmpty ()) { @@ -467,7 +467,10 @@ void HU_DrawColorBar(int x, int y, int height, int playernum) D_GetPlayerColor (playernum, &h, &s, &v, NULL); HSVtoRGB (&r, &g, &b, h, s, v); - screen->Clear (x, y, x + 24*CleanXfac, y + height, -1, + //float aspect = ActiveRatio(SCREENWIDTH, SCREENHEIGHT); + //if (!AspectTallerThanWide(aspect)) x += (screen->GetWidth() - AspectBaseWidth(aspect)) / 2; + + screen->Clear (x, y, x + 24*FontScale, y + height, -1, MAKEARGB(255,clamp(int(r*255.f),0,255), clamp(int(g*255.f),0,255), clamp(int(b*255.f),0,255))); From 8b0dd1376f18fef8119d4c9a578bd95d12f68655 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 10 Apr 2019 00:15:16 +0200 Subject: [PATCH 5/5] - changed the filter name for Doom IWADs It's "doom.id.doom1/2" instead of "doom.doom1/2" now. The config file's content will be renamed and for lump filtering a fallback has been added - note that you cannot combine both naming schemes! The old one has to be considered deprecated now. This also removes the duplicated content necessitated by the old naming scheme. --- src/gameconfigfile.cpp | 24 +- src/gamedata/resourcefiles/resourcefile.cpp | 13 +- src/version.h | 2 +- wadsrc/static/filter/doom.doom2/sprofs.txt | 162 -- .../filter/{doom.doom1 => doom.id}/sprofs.txt | 0 wadsrc/static/iwadinfo.txt | 16 +- wadsrc_bm/static/filter/doom.doom2/gldefs.bm | 2181 ----------------- .../filter/{doom.doom1 => doom.id}/gldefs.bm | 0 .../static/filter/doom.doom2/gldefs.txt | 1385 ----------- .../filter/{doom.doom1 => doom.id}/gldefs.txt | 0 10 files changed, 38 insertions(+), 3745 deletions(-) delete mode 100644 wadsrc/static/filter/doom.doom2/sprofs.txt rename wadsrc/static/filter/{doom.doom1 => doom.id}/sprofs.txt (100%) delete mode 100644 wadsrc_bm/static/filter/doom.doom2/gldefs.bm rename wadsrc_bm/static/filter/{doom.doom1 => doom.id}/gldefs.bm (100%) delete mode 100644 wadsrc_lights/static/filter/doom.doom2/gldefs.txt rename wadsrc_lights/static/filter/{doom.doom1 => doom.id}/gldefs.txt (100%) diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp index 20da4c699..18c3992fe 100644 --- a/src/gameconfigfile.cpp +++ b/src/gameconfigfile.cpp @@ -210,13 +210,23 @@ void FGameConfigFile::DoAutoloadSetup (FIWadManager *iwad_man) RenameSection("Freedoom2.Autoload", "doom.freedoom.phase2.Autoload"); RenameSection("Freedoom1.Autoload", "doom.freedoom.phase1.Autoload"); RenameSection("Freedoom.Autoload", "doom.freedoom.Autoload"); - RenameSection("DoomBFG.Autoload", "doom.doom1.bfg.Autoload"); - RenameSection("DoomU.Autoload", "doom.doom1.ultimate.Autoload"); - RenameSection("Doom1.Autoload", "doom.doom1.registered.Autoload"); - RenameSection("TNT.Autoload", "doom.doom2.tnt.Autoload"); - RenameSection("Plutonia.Autoload", "doom.doom2.plutonia.Autoload"); - RenameSection("Doom2BFG.Autoload", "doom.doom2.bfg.Autoload"); - RenameSection("Doom2.Autoload", "doom.doom2.commercial.Autoload"); + RenameSection("DoomBFG.Autoload", "doom.id.doom1.bfg.Autoload"); + RenameSection("DoomU.Autoload", "doom.id.doom1.ultimate.Autoload"); + RenameSection("Doom1.Autoload", "doom.id.doom1.registered.Autoload"); + RenameSection("TNT.Autoload", "doom.id.doom2.tnt.Autoload"); + RenameSection("Plutonia.Autoload", "doom.id.doom2.plutonia.Autoload"); + RenameSection("Doom2BFG.Autoload", "doom.id.doom2.bfg.Autoload"); + RenameSection("Doom2.Autoload", "doom.id.doom2.commercial.Autoload"); + } + else if (last < 218) + { + RenameSection("doom.doom1.bfg.Autoload", "doom.id.doom1.bfg.Autoload"); + RenameSection("doom.doom1.ultimate.Autoload", "doom.id.doom1.ultimate.Autoload"); + RenameSection("doom.doom1.registered.Autoload", "doom.id.doom1.registered.Autoload"); + RenameSection("doom.doom2.tnt.Autoload", "doom.id.doom2.tnt.Autoload"); + RenameSection("doom.doom2.plutonia.Autoload", "doom.id.doom2.plutonia.Autoload"); + RenameSection("doom.doom2.bfg.Autoload", "doom.id.doom2.bfg.Autoload"); + RenameSection("doom.doom2.commercial.Autoload", "doom.id.doom2.commercial.Autoload"); } const FString *pAuto; for (int num = 0; (pAuto = iwad_man->GetAutoname(num)) != NULL; num++) diff --git a/src/gamedata/resourcefiles/resourcefile.cpp b/src/gamedata/resourcefiles/resourcefile.cpp index fbb6e1aa2..92232e701 100644 --- a/src/gamedata/resourcefiles/resourcefile.cpp +++ b/src/gamedata/resourcefiles/resourcefile.cpp @@ -367,6 +367,7 @@ 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 @@ -406,7 +407,17 @@ int FResourceFile::FilterLumps(FString filtername, void *lumps, size_t lumpsize, return 0; } filter << "filter/" << filtername << '/'; - if (FindPrefixRange(filter, lumps, lumpsize, max, start, end)) + + bool found = FindPrefixRange(filter, lumps, lumpsize, max, start, end); + + // Workaround for old Doom filter names. + if (!found && filtername.IndexOf("doom.id.doom") == 0) + { + filter.Substitute("doom.id.doom", "doom.doom"); + found = FindPrefixRange(filter, lumps, lumpsize, max, start, end); + } + + if (found) { void *from = (uint8_t *)lumps + start * lumpsize; diff --git a/src/version.h b/src/version.h index 5e161dae2..6b0c9acf4 100644 --- a/src/version.h +++ b/src/version.h @@ -60,7 +60,7 @@ const char *GetVersionString(); // Version stored in the ini's [LastRun] section. // Bump it if you made some configuration change that you want to // be able to migrate in FGameConfigFile::DoGlobalSetup(). -#define LASTRUNVERSION "217" +#define LASTRUNVERSION "218" // Protocol version used in demos. // Bump it if you change existing DEM_ commands or add new ones. diff --git a/wadsrc/static/filter/doom.doom2/sprofs.txt b/wadsrc/static/filter/doom.doom2/sprofs.txt deleted file mode 100644 index 1485959ef..000000000 --- a/wadsrc/static/filter/doom.doom2/sprofs.txt +++ /dev/null @@ -1,162 +0,0 @@ -BAR1A0, 10, 32, iwad -BAR1B0, 10, 32, iwad -BEXPA0, 10, 32, iwad -BEXPB0, 10, 31, iwad -BEXPC0, 19, 36, iwad -BEXPD0, 27, 49, iwad -BEXPE0, 29, 52, iwad -BOS2I0, 20, 71, iwad -BOS2J0, 26, 62, iwad -BOS2K0, 26, 52, iwad -BOS2L0, 29, 33, iwad -BOS2M0, 30, 29, iwad -BOS2N0, 30, 29, iwad -BOS2O0, 30, 29, iwad -BOSSI0, 20, 72, iwad -BOSSJ0, 26, 63, iwad -BOSSK0, 26, 51, iwad -BOSSL0, 29, 33, iwad -BOSSM0, 30, 29, iwad -BOSSN0, 30, 29, iwad -BOSSO0, 30, 29, iwad -BRS1A0, 13, 8, iwad -BSPIJ0, 50, 54, iwad -BSPIK0, 50, 57, iwad -BSPIL0, 47, 52, iwad -BSPIM0, 45, 44, iwad -BSPIN0, 45, 42, iwad -BSPIO0, 45, 30, iwad -BSPIP0, 45, 28, iwad -CBRAA0, 15, 60, iwad -CEYEA0, 21, 59, iwad -CEYEB0, 21, 58, iwad -CEYEC0, 21, 59, iwad -COL1A0, 16, 51, iwad -COL2A0, 16, 39, iwad -COL3A0, 16, 52, iwad -COL4A0, 17, 39, iwad -COL5A0, 16, 44, iwad -COL5B0, 16, 45, iwad -COL6A0, 17, 47, iwad -COLUA0, 9, 45, iwad -CPOSH0, 20, 61, iwad -CPOSI0, 23, 64, iwad -CPOSJ0, 28, 59, iwad -CPOSK0, 30, 48, iwad -CPOSL0, 31, 34, iwad -CPOSM0, 32, 22, iwad -CPOSN0, 32, 18, iwad -CPOSO0, 26, 59, iwad -CPOSP0, 28, 59, iwad -CPOSQ0, 30, 48, iwad -CPOSR0, 32, 40, iwad -CPOSS0, 32, 31, iwad -CPOST0, 32, 19, iwad -CYBRH0, 60, 108, iwad -CYBRI0, 55, 110, iwad -CYBRJ0, 49, 113, iwad -CYBRK0, 56, 114, iwad -CYBRL0, 62, 121, iwad -CYBRM0, 67, 128, iwad -CYBRN0, 70, 132, iwad -CYBRO0, 69, 132, iwad -CYBRP0, 60, 28, iwad -ELECA0, 19, 125, iwad -FATTO0, 35, 43, iwad -FATTP0, 36, 41, iwad -FATTQ0, 36, 40, iwad -FATTR0, 36, 40, iwad -FATTS0, 36, 40, iwad -FATTT0, 36, 39, iwad -FCANA0, 19, 52, iwad -FCANB0, 19, 52, iwad -FCANC0, 19, 50, iwad -PLAYH0, 16, 50, iwad -PLAYI0, 11, 42, iwad -PLAYJ0, 12, 45, iwad -PLAYK0, 17, 37, iwad -PLAYL0, 27, 14, iwad -PLAYM0, 27, 14, iwad -PLAYN0, 27, 14, iwad -POB1A0, 16, 6, iwad -POB2A0, 14, 3, iwad -POL1A0, 22, 65, iwad -POL2A0, 19, 66, iwad -POL3A0, 19, 42, iwad -POL3B0, 19, 42, iwad -POL4A0, 19, 55, iwad -POL5A0, 27, 8, iwad -POL6A0, 17, 65, iwad -POL6B0, 19, 65, iwad -POSSH0, 19, 55, iwad -POSSL0, 22, 14, iwad -SARGI0, 25, 56, iwad -SARGM0, 33, 43, iwad -SARGN0, 33, 29, iwad -SKELM0, 27, 78, iwad -SKELN0, 38, 69, iwad -SKELO0, 28, 55, iwad -SKELP0, 28, 35, iwad -SKELQ0, 40, 20, iwad -SMITA0, 22, 44, iwad -SPIDJ0, 79, 102, iwad -SPIDK0, 95, 95, iwad -SPIDL0, 94, 88, iwad -SPIDM0, 94, 76, iwad -SPIDN0, 98, 71, iwad -SPIDO0, 101, 68, iwad -SPIDP0, 104, 85, iwad -SPIDQ0, 109, 90, iwad -SPIDR0, 110, 111, iwad -SPIDS0, 98, 35, iwad -SPOSH0, 14, 60, iwad -SPOSL0, 24, 15, iwad -SSWVI0, 18, 54, iwad -SSWVJ0, 15, 44, iwad -SSWVK0, 15, 40, iwad -SSWVL0, 15, 25, iwad -SSWVM0, 24, 13, iwad -SSWVN0, 15, 57, iwad -SSWVO0, 22, 59, iwad -SSWVP0, 25, 58, iwad -TBLUA0, 14, 94, iwad -TBLUB0, 14, 94, iwad -TBLUC0, 14, 94, iwad -TBLUD0, 14, 95, iwad -TGRNA0, 14, 94, iwad -TGRNB0, 14, 89, iwad -TGRNC0, 14, 89, iwad -TGRND0, 14, 95, iwad -TLMPA0, 11, 78, iwad -TLMPB0, 11, 78, iwad -TLMPC0, 11, 78, iwad -TLMPD0, 11, 78, iwad -TLP2A0, 10, 58, iwad -TLP2B0, 10, 58, iwad -TLP2C0, 10, 58, iwad -TLP2D0, 10, 58, iwad -TRE1A0, 25, 67, iwad -TREDA0, 14, 94, iwad -TREDB0, 14, 89, iwad -TREDC0, 14, 89, iwad -TREDD0, 14, 95, iwad -TROOI0, 22, 62, iwad -TROOJ0, 21, 59, iwad -TROOM0, 29, 20, iwad -TROON0, 24, 59, iwad -TROOO0, 20, 61, iwad -TROOP0, 24, 61, iwad -TROOQ0, 24, 61, iwad -TROOR0, 24, 44, iwad -TROOS0, 27, 34, iwad -TROOT0, 27, 31, iwad -TROOU0, 27, 18, iwad -VILER0, 18, 80, iwad -VILES0, 23, 76, iwad -VILET0, 27, 69, iwad -VILEU0, 35, 56, iwad -VILEV0, 34, 45, iwad -VILEW0, 34, 35, iwad -VILEX0, 34, 23, iwad -VILEY0, 34, 20, iwad -VILEZ0, 34, 20, iwad diff --git a/wadsrc/static/filter/doom.doom1/sprofs.txt b/wadsrc/static/filter/doom.id/sprofs.txt similarity index 100% rename from wadsrc/static/filter/doom.doom1/sprofs.txt rename to wadsrc/static/filter/doom.id/sprofs.txt diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt index 711c18157..c54556767 100644 --- a/wadsrc/static/iwadinfo.txt +++ b/wadsrc/static/iwadinfo.txt @@ -307,7 +307,7 @@ IWad IWad { Name = "DOOM: BFG Edition" - Autoname = "doom.doom1.bfg" + Autoname = "doom.id.doom1.bfg" Game = "Doom" Config = "Doom" IWADName = "doom.wad", 2 @@ -324,7 +324,7 @@ IWad IWad { Name = "DOOM: Complete: WadSmoosh" - Autoname = "doom.doom2.wadsmoosh" + Autoname = "doom.id.doom2.wadsmoosh" Game = "Doom" Config = "Doom" Mapinfo = "mapinfo/doom2.txt" @@ -337,7 +337,7 @@ IWad IWad { Name = "The Ultimate DOOM" - Autoname = "doom.doom1.ultimate" + Autoname = "doom.id.doom1.ultimate" Game = "Doom" Config = "Doom" IWADName = "doom.wad" @@ -353,7 +353,7 @@ IWad IWad { Name = "DOOM Registered" - Autoname = "doom.doom1.registered" + Autoname = "doom.id.doom1.registered" Game = "Doom" Config = "Doom" IWADName = "doom.wad", 1 @@ -381,7 +381,7 @@ IWad IWad { Name = "Final Doom: TNT - Evilution" - Autoname = "doom.doom2.tnt" + Autoname = "doom.id.doom2.tnt" Game = "Doom" Config = "Doom" IWADName = "tnt.wad" @@ -395,7 +395,7 @@ IWad IWad { Name = "Final Doom: Plutonia Experiment" - Autoname = "doom.doom2.plutonia" + Autoname = "doom.id.doom2.plutonia" Game = "Doom" Config = "Doom" IWADName = "plutonia.wad" @@ -409,7 +409,7 @@ IWad IWad { Name = "DOOM 2: BFG Edition" - Autoname = "doom.doom2.bfg" + Autoname = "doom.id.doom2.bfg" Game = "Doom" Config = "Doom" IWADName = "doom2.wad" @@ -425,7 +425,7 @@ IWad IWad { Name = "DOOM 2: Hell on Earth" - Autoname = "doom.doom2.commercial" + Autoname = "doom.id.doom2.commercial" Game = "Doom" Config = "Doom" IWADName = "doom2.wad", 1 diff --git a/wadsrc_bm/static/filter/doom.doom2/gldefs.bm b/wadsrc_bm/static/filter/doom.doom2/gldefs.bm deleted file mode 100644 index 78159bddd..000000000 --- a/wadsrc_bm/static/filter/doom.doom2/gldefs.bm +++ /dev/null @@ -1,2181 +0,0 @@ -brightmap sprite CELLA0 -{ - map "brightmaps/doom/cella0.png" - iwad -} - -brightmap sprite CELPA0 -{ - map "brightmaps/doom/celpa0.png" - iwad -} - -brightmap sprite PLAYF1 -{ - map "brightmaps/doom/PLAYf1.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF2F8 -{ - map "brightmaps/doom/PLAYf2f8.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF3F7 -{ - map "brightmaps/doom/PLAYf3f7.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF4F6 -{ - map "brightmaps/doom/PLAYf4f6.png" - iwad - disablefullbright -} - -brightmap sprite PLAYF5 -{ - map "brightmaps/doom/PLAYf5.png" - iwad - disablefullbright -} - -brightmap sprite POSSF1 -{ - map "brightmaps/doom/possf1.png" - iwad - disablefullbright -} - -brightmap sprite POSSF2F8 -{ - map "brightmaps/doom/possf2f8.png" - iwad - disablefullbright -} - -brightmap sprite POSSF3F7 -{ - map "brightmaps/doom/possf3f7.png" - iwad - disablefullbright -} - -brightmap sprite POSSF4F6 -{ - map "brightmaps/doom/possf4f6.png" - iwad - disablefullbright -} - -brightmap sprite POSSF5 -{ - map "brightmaps/doom/possf5.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF1 -{ - map "brightmaps/doom/SPOSf1.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF2F8 -{ - map "brightmaps/doom/SPOSf2f8.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF3F7 -{ - map "brightmaps/doom/SPOSf3f7.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF4F6 -{ - map "brightmaps/doom/SPOSf4f6.png" - iwad - disablefullbright -} - -brightmap sprite SPOSF5 -{ - iwad - map "brightmaps/doom/SPOSf5.png" - disablefullbright -} - -brightmap sprite CPOSE1 -{ - map "brightmaps/doom/CPOSE1.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE2 -{ - map "brightmaps/doom/CPOSE2.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE3 -{ - map "brightmaps/doom/CPOSE3.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE4 -{ - iwad - disablefullbright -} - -brightmap sprite CPOSE5 -{ - map "brightmaps/doom/CPOSE5.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE6 -{ - map "brightmaps/doom/CPOSE6.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE7 -{ - map "brightmaps/doom/CPOSE7.png" - iwad - disablefullbright -} - -brightmap sprite CPOSE8 -{ - map "brightmaps/doom/CPOSE8.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF1 -{ - map "brightmaps/doom/CPOSF1.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF2 -{ - map "brightmaps/doom/CPOSF2.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF3 -{ - map "brightmaps/doom/CPOSF3.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF4 -{ - map "brightmaps/doom/CPOSF4.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF5 -{ - map "brightmaps/doom/CPOSF5.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF6 -{ - map "brightmaps/doom/CPOSF6.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF7 -{ - map "brightmaps/doom/CPOSF7.png" - iwad - disablefullbright -} - -brightmap sprite CPOSF8 -{ - map "brightmaps/doom/CPOSF8.png" - iwad - disablefullbright -} - -brightmap sprite SSWVG0 -{ - map "brightmaps/doom/sswvg0.png" - iwad - disablefullbright -} - -brightmap sprite BSPIA1D1 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA2a8 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA3A7 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA4A6 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIA5D5 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIG1 -{ - map "brightmaps/doom/bspig1.png" - iwad - disablefullbright -} - -brightmap sprite BSPIG2G8 -{ - map "brightmaps/doom/bspig2g8.png" - iwad - disablefullbright -} - -brightmap sprite BSPIG3G7 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIG4G6 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIG5 -{ - iwad - disablefullbright -} - -brightmap sprite BSPIH1 -{ - map "brightmaps/doom/bspih1.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH2H8 -{ - map "brightmaps/doom/bspih2h8.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH3H7 -{ - map "brightmaps/doom/bspih3h7.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH4H6 -{ - map "brightmaps/doom/bspih4h6.png" - iwad - disablefullbright -} - -brightmap sprite BSPIH5 -{ - map "brightmaps/doom/bspih5.png" - iwad - disablefullbright -} - -brightmap sprite BOSSA1 -{ - map "brightmaps/doom/bossa1.png" - iwad -} - -brightmap sprite BOSSA2A8 -{ - map "brightmaps/doom/bossa2a8.png" - iwad -} - -brightmap sprite BOSSA3A7 -{ - map "brightmaps/doom/bossa3a7.png" - iwad -} - -brightmap sprite BOSSA4A6 -{ - map "brightmaps/doom/bossa4a6.png" - iwad -} - -brightmap sprite BOSSA5 -{ - map "brightmaps/doom/bossa5.png" - iwad -} - -brightmap sprite BOSSb1 -{ - map "brightmaps/doom/bossb1.png" - iwad -} - -brightmap sprite BOSSB2B8 -{ - map "brightmaps/doom/bossb2b8.png" - iwad -} - -brightmap sprite BOSSB3B7 -{ - map "brightmaps/doom/bossb3b7.png" - iwad -} - -brightmap sprite BOSSB4B6 -{ - map "brightmaps/doom/bossb4b6.png" - iwad -} - -brightmap sprite BOSSB5 -{ - map "brightmaps/doom/bossb5.png" - iwad -} - -brightmap sprite BOSSC1 -{ - map "brightmaps/doom/bossc1.png" - iwad -} - -brightmap sprite BOSSC2C8 -{ - map "brightmaps/doom/bossc2c8.png" - iwad -} - -brightmap sprite BOSSC3C7 -{ - map "brightmaps/doom/bossc3c7.png" - iwad -} - -brightmap sprite BOSSC4C6 -{ - map "brightmaps/doom/bossc4c6.png" - iwad -} - -brightmap sprite BOSSC5 -{ - map "brightmaps/doom/bossc5.png" - iwad -} - -brightmap sprite BOSSD1 -{ - map "brightmaps/doom/bossd1.png" - iwad -} - -brightmap sprite BOSSD2D8 -{ - map "brightmaps/doom/bossd2d8.png" - iwad -} - -brightmap sprite BOSSD3D7 -{ - map "brightmaps/doom/bossd3d7.png" - iwad -} - -brightmap sprite BOSSD4D6 -{ - map "brightmaps/doom/bossd4d6.png" - iwad -} - -brightmap sprite BOSSD5 -{ - map "brightmaps/doom/bossd5.png" - iwad -} - -brightmap sprite BOSSE1 -{ - map "brightmaps/doom/bosse1.png" - iwad -} - -brightmap sprite BOSSE2 -{ - map "brightmaps/doom/bosse2.png" - iwad -} - -brightmap sprite BOSSE3 -{ - map "brightmaps/doom/bosse3.png" - iwad -} - -brightmap sprite BOSSE4 -{ - map "brightmaps/doom/bosse4.png" - iwad -} - -brightmap sprite BOSSE5 -{ - map "brightmaps/doom/bosse5.png" - iwad -} - -brightmap sprite BOSSE6 -{ - map "brightmaps/doom/bosse6.png" - iwad -} - -brightmap sprite BOSSE7 -{ - map "brightmaps/doom/bosse7.png" - iwad -} - -brightmap sprite BOSSE8 -{ - map "brightmaps/doom/bosse8.png" - iwad -} - -brightmap sprite BOSSF1 -{ - map "brightmaps/doom/BOSSF1.png" - iwad -} - -brightmap sprite BOSSF2 -{ - map "brightmaps/doom/BOSSF2.png" - iwad -} - -brightmap sprite BOSSF3 -{ - map "brightmaps/doom/BOSSF3.png" - iwad -} - -brightmap sprite BOSSF4 -{ - map "brightmaps/doom/BOSSF4.png" - iwad -} - -brightmap sprite BOSSF5 -{ - map "brightmaps/doom/BOSSF5.png" - iwad -} - -brightmap sprite BOSSF6 -{ - map "brightmaps/doom/BOSSF6.png" - iwad -} - -brightmap sprite BOSSF7 -{ - map "brightmaps/doom/BOSSF7.png" - iwad -} - -brightmap sprite BOSSF8 -{ - map "brightmaps/doom/BOSSF8.png" - iwad -} - -brightmap sprite BOSSG1 -{ - map "brightmaps/doom/BOSSG1.png" - iwad -} - -brightmap sprite BOSSG2 -{ - map "brightmaps/doom/BOSSG2.png" - iwad -} - -brightmap sprite BOSSG3 -{ - map "brightmaps/doom/BOSSG3.png" - iwad -} - -brightmap sprite BOSSG4 -{ - map "brightmaps/doom/BOSSG4.png" - iwad -} - -brightmap sprite BOSSG5 -{ - map "brightmaps/doom/BOSSG5.png" - iwad -} - -brightmap sprite BOSSG6 -{ - map "brightmaps/doom/BOSSG6.png" - iwad -} - -brightmap sprite BOSSG7 -{ - map "brightmaps/doom/BOSSG7.png" - iwad -} - -brightmap sprite BOSSG8 -{ - map "brightmaps/doom/BOSSG8.png" - iwad -} - -brightmap sprite BOSSH1 -{ - map "brightmaps/doom/BOSSH1.png" - iwad -} - -brightmap sprite BOSSH2 -{ - map "brightmaps/doom/BOSSH2.png" - iwad -} - -brightmap sprite BOSSH3 -{ - map "brightmaps/doom/BOSSH3.png" - iwad -} - -brightmap sprite BOSSH4 -{ - map "brightmaps/doom/BOSSH4.png" - iwad -} - -brightmap sprite BOSSH5 -{ - map "brightmaps/doom/BOSSH5.png" - iwad -} - -brightmap sprite BOSSH6 -{ - map "brightmaps/doom/BOSSH6.png" - iwad -} - -brightmap sprite BOSSH7 -{ - map "brightmaps/doom/BOSSH7.png" - iwad -} - -brightmap sprite BOSSH8 -{ - map "brightmaps/doom/BOSSH8.png" - iwad -} - -brightmap sprite BOSSI0 -{ - map "brightmaps/doom/BOSSI0.png" - iwad -} - -brightmap sprite BOSSJ0 -{ - map "brightmaps/doom/BOSSJ0.png" - iwad -} - -brightmap sprite BOSSK0 -{ - map "brightmaps/doom/BOSSK0.png" - iwad -} - -brightmap sprite BOSSL0 -{ - map "brightmaps/doom/BOSSL0.png" - iwad -} - -brightmap sprite BOSSM0 -{ - map "brightmaps/doom/BOSSM0.png" - iwad -} - -brightmap sprite BOS2A1C1 -{ - map "brightmaps/doom/bossa1.png" - iwad -} - -brightmap sprite BOS2A2C8 -{ - map "brightmaps/doom/bossa2a8.png" - iwad -} - -brightmap sprite BOS2A3C7 -{ - map "brightmaps/doom/bossa3a7.png" - iwad -} - -brightmap sprite BOS2A4C6 -{ - map "brightmaps/doom/bossa4a6.png" - iwad -} - -brightmap sprite BOS2A5C5 -{ - map "brightmaps/doom/bossa5.png" - iwad -} - -brightmap sprite BOS2b1D1 -{ - map "brightmaps/doom/bossb1.png" - iwad -} - -brightmap sprite BOS2B2D8 -{ - map "brightmaps/doom/bossb2b8.png" - iwad -} - -brightmap sprite BOS2B3D7 -{ - map "brightmaps/doom/bossb3b7.png" - iwad -} - -brightmap sprite BOS2B4D6 -{ - map "brightmaps/doom/bossb4b6.png" - iwad -} - -brightmap sprite BOS2B5D5 -{ - map "brightmaps/doom/bossb5.png" - iwad -} - -brightmap sprite BOS2E1 -{ - map "brightmaps/doom/bosse1.png" - iwad -} - -brightmap sprite BOS2E2 -{ - map "brightmaps/doom/bosse2.png" - iwad -} - -brightmap sprite BOS2E3 -{ - map "brightmaps/doom/bosse3.png" - iwad -} - -brightmap sprite BOS2E4 -{ - map "brightmaps/doom/bosse4.png" - iwad -} - -brightmap sprite BOS2E5 -{ - map "brightmaps/doom/bosse5.png" - iwad -} - -brightmap sprite BOS2E6 -{ - map "brightmaps/doom/bosse6.png" - iwad -} - -brightmap sprite BOS2E7 -{ - map "brightmaps/doom/bosse7.png" - iwad -} - -brightmap sprite BOS2E8 -{ - map "brightmaps/doom/bosse8.png" - iwad -} - -brightmap sprite BOS2F1 -{ - map "brightmaps/doom/BOSSF1.png" - iwad -} - -brightmap sprite BOS2F2 -{ - map "brightmaps/doom/BOSSF2.png" - iwad -} - -brightmap sprite BOS2F3 -{ - map "brightmaps/doom/BOSSF3.png" - iwad -} - -brightmap sprite BOS2F4 -{ - map "brightmaps/doom/BOSSF4.png" - iwad -} - -brightmap sprite BOS2F5 -{ - map "brightmaps/doom/BOSSF5.png" - iwad -} - -brightmap sprite BOS2F6 -{ - map "brightmaps/doom/BOSSF6.png" - iwad -} - -brightmap sprite BOS2F7 -{ - map "brightmaps/doom/BOSSF7.png" - iwad -} - -brightmap sprite BOS2F8 -{ - map "brightmaps/doom/BOSSF8.png" - iwad -} - -brightmap sprite BOS2G1 -{ - map "brightmaps/doom/BOSSG1.png" - iwad -} - -brightmap sprite BOS2G2 -{ - map "brightmaps/doom/BOSSG2.png" - iwad -} - -brightmap sprite BOS2G3 -{ - map "brightmaps/doom/BOSSG3.png" - iwad -} - -brightmap sprite BOS2G4 -{ - map "brightmaps/doom/BOSSG4.png" - iwad -} - -brightmap sprite BOS2G5 -{ - map "brightmaps/doom/BOSSG5.png" - iwad -} - -brightmap sprite BOS2G6 -{ - map "brightmaps/doom/BOSSG6.png" - iwad -} - -brightmap sprite BOS2G7 -{ - map "brightmaps/doom/BOSSG7.png" - iwad -} - -brightmap sprite BOS2G8 -{ - map "brightmaps/doom/BOSSG8.png" - iwad -} - -brightmap sprite BOS2H1 -{ - map "brightmaps/doom/BOSSH1.png" - iwad -} - -brightmap sprite BOS2H2 -{ - map "brightmaps/doom/BOSSH2.png" - iwad -} - -brightmap sprite BOS2H3 -{ - map "brightmaps/doom/BOSSH3.png" - iwad -} - -brightmap sprite BOS2H4 -{ - map "brightmaps/doom/BOSSH4.png" - iwad -} - -brightmap sprite BOS2H5 -{ - map "brightmaps/doom/BOSSH5.png" - iwad -} - -brightmap sprite BOS2H6 -{ - map "brightmaps/doom/BOSSH6.png" - iwad -} - -brightmap sprite BOS2H7 -{ - map "brightmaps/doom/BOSSH7.png" - iwad -} - -brightmap sprite BOS2H8 -{ - map "brightmaps/doom/BOSSH8.png" - iwad -} - -brightmap sprite BOS2I0 -{ - map "brightmaps/doom/BOSSI0.png" - iwad -} - -brightmap sprite BOS2J0 -{ - map "brightmaps/doom/BOSSJ0.png" - iwad -} - -brightmap sprite BOS2K0 -{ - map "brightmaps/doom/BOSSK0.png" - iwad -} - -brightmap sprite BOS2L0 -{ - map "brightmaps/doom/BOSSL0.png" - iwad -} - -brightmap sprite BOS2M0 -{ - map "brightmaps/doom/BOSSM0.png" - iwad -} - -brightmap sprite BOS2A6C4 -{ - map "brightmaps/doom/BOS2A6C4.png" - iwad -} - -brightmap sprite BOS2A7C3 -{ - map "brightmaps/doom/BOS2A7C3.png" - iwad -} - -brightmap sprite BOS2A8C2 -{ - map "brightmaps/doom/BOS2A8C2.png" - iwad -} - -brightmap sprite BOS2B6D4 -{ - map "brightmaps/doom/BOS2B6D4.png" - iwad -} - -brightmap sprite BOS2B7D3 -{ - map "brightmaps/doom/BOS2B7D3.png" - iwad -} - -brightmap sprite BOS2B8D2 -{ - map "brightmaps/doom/BOS2B8D2.png" - iwad -} - -brightmap sprite SKELJ1 -{ - map "brightmaps/doom/SKELJ1.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ2 -{ - map "brightmaps/doom/SKELJ2.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ3 -{ - map "brightmaps/doom/SKELJ3.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ4 -{ - map "brightmaps/doom/SKELJ4.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ5 -{ - map "brightmaps/doom/SKELJ5.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ6 -{ - map "brightmaps/doom/SKELJ6.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ7 -{ - map "brightmaps/doom/SKELJ7.png" - iwad - disablefullbright -} - -brightmap sprite SKELJ8 -{ - map "brightmaps/doom/SKELJ8.png" - iwad - disablefullbright -} - -brightmap sprite FATTH1 -{ - map "brightmaps/doom/FATTH1.png" - iwad - disablefullbright -} - -brightmap sprite FATTH2H8 -{ - map "brightmaps/doom/FATTH2H8.png" - iwad - disablefullbright -} - -brightmap sprite FATTH3H7 -{ - map "brightmaps/doom/FATTH3H7.png" - iwad - disablefullbright -} - -brightmap sprite FATTH4H6 -{ - map "brightmaps/doom/FATTH4H6.png" - iwad - disablefullbright -} - -brightmap sprite FATTH5 -{ - map "brightmaps/doom/FATTH5.png" - iwad - disablefullbright -} - -brightmap sprite HEADC1 -{ - map "brightmaps/doom/HEADC1.png" - iwad - disablefullbright -} - -brightmap sprite HEADC2C8 -{ - map "brightmaps/doom/HEADC2C8.png" - iwad - disablefullbright -} - -brightmap sprite HEADC3C7 -{ - map "brightmaps/doom/HEADC3C7.png" - iwad - disablefullbright -} - -brightmap sprite HEADD1 -{ - map "brightmaps/doom/HEADD1.png" - iwad - disablefullbright -} - -brightmap sprite HEADD2D8 -{ - map "brightmaps/doom/HEADD2D8.png" - iwad - disablefullbright -} - -brightmap sprite HEADD3D7 -{ - map "brightmaps/doom/HEADD3D7.png" - iwad - disablefullbright -} - -brightmap sprite HEADD4D6 -{ - iwad - disablefullbright -} - -brightmap sprite HEADD5 -{ - iwad - disablefullbright -} - -brightmap sprite PAINF1 -{ - map "brightmaps/doom/PAINf1.png" - iwad - disablefullbright -} - -brightmap sprite PAINF2F8 -{ - map "brightmaps/doom/PAINf2f8.png" - iwad - disablefullbright -} - -brightmap sprite PAINF3F7 -{ - map "brightmaps/doom/PAINf3f7.png" - iwad - disablefullbright -} - -brightmap sprite PAINF4F6 -{ - iwad - disablefullbright -} - -brightmap sprite PAINF5 -{ - iwad - disablefullbright -} - -brightmap sprite CYBRF1 -{ - map "brightmaps/doom/CYBRF1.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF2 -{ - map "brightmaps/doom/CYBRF2.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF3 -{ - map "brightmaps/doom/CYBRF3.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF4 -{ - map "brightmaps/doom/CYBRF4.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF5 -{ - map "brightmaps/doom/CYBRF5.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF6 -{ - map "brightmaps/doom/CYBRF6.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF7 -{ - map "brightmaps/doom/CYBRF7.png" - iwad - disablefullbright -} - -brightmap sprite CYBRF8 -{ - map "brightmaps/doom/CYBRF8.png" - iwad - disablefullbright -} - -brightmap sprite CYBRJ0 -{ - map "brightmaps/doom/CYBRJ0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRK0 -{ - map "brightmaps/doom/CYBRK0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRL0 -{ - map "brightmaps/doom/CYBRL0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRM0 -{ - map "brightmaps/doom/CYBRM0.png" - iwad - disablefullbright -} - -brightmap sprite CYBRN0 -{ - map "brightmaps/doom/CYBRN0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDA1D1 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA2D8 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA3D7 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA4D6 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDA5D5 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDG1 -{ - map "brightmaps/doom/SPIDG1.png" - iwad - disablefullbright -} - -brightmap sprite SPIDG2G8 -{ - map "brightmaps/doom/SPIDG2G8.png" - iwad - disablefullbright -} - -brightmap sprite SPIDG3G7 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDG4G6 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDG5 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDH1 -{ - map "brightmaps/doom/SPIDH1.png" - iwad - disablefullbright -} - -brightmap sprite SPIDG2G8 -{ - map "brightmaps/doom/SPIDH2H8.png" - iwad - disablefullbright -} - -brightmap sprite SPIDH3H7 -{ - map "brightmaps/doom/SPIDH3H7.png" - iwad - disablefullbright -} - -brightmap sprite SPIDH4H6 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDH5 -{ - iwad - disablefullbright -} - -brightmap sprite SPIDH1 -{ - map "brightmaps/doom/SPIDH1.png" - iwad - disablefullbright -} - -brightmap sprite SPIDL0 -{ - map "brightmaps/doom/SPIDL0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDM0 -{ - map "brightmaps/doom/SPIDM0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDN0 -{ - map "brightmaps/doom/SPIDN0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDO0 -{ - map "brightmaps/doom/SPIDO0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDP0 -{ - map "brightmaps/doom/SPIDP0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDQ0 -{ - map "brightmaps/doom/SPIDQ0.png" - iwad - disablefullbright -} - -brightmap sprite SPIDR0 -{ - map "brightmaps/doom/SPIDR0.png" - iwad - disablefullbright -} - -brightmap sprite BON2B0 -{ - map "brightmaps/doom/BON2B0.png" - iwad - disablefullbright -} - -brightmap sprite BON2c0 -{ - map "brightmaps/doom/BON2c0.png" - iwad - disablefullbright -} - -brightmap sprite BON2d0 -{ - map "brightmaps/doom/BON2d0.png" - iwad - disablefullbright -} - -brightmap sprite FCANA0 -{ - map "brightmaps/doom/FCANA0.png" - iwad - disablefullbright -} - -brightmap sprite FCANb0 -{ - map "brightmaps/doom/FCANb0.png" - iwad - disablefullbright -} - -brightmap sprite FCANc0 -{ - map "brightmaps/doom/FCANc0.png" - iwad - disablefullbright -} - -brightmap sprite treda0 -{ - map "brightmaps/doom/treda0.png" - iwad - disablefullbright -} - -brightmap sprite tredb0 -{ - map "brightmaps/doom/tredb0.png" - iwad - disablefullbright -} - -brightmap sprite tredc0 -{ - map "brightmaps/doom/tredc0.png" - iwad - disablefullbright -} - -brightmap sprite tredd0 -{ - map "brightmaps/doom/tredd0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUA0 -{ - map "brightmaps/doom/treda0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUb0 -{ - map "brightmaps/doom/TBLUb0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUc0 -{ - map "brightmaps/doom/TBLUc0.png" - iwad - disablefullbright -} - -brightmap sprite TBLUd0 -{ - map "brightmaps/doom/tredd0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNA0 -{ - map "brightmaps/doom/treda0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNb0 -{ - map "brightmaps/doom/tredb0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNc0 -{ - map "brightmaps/doom/tredc0.png" - iwad - disablefullbright -} - -brightmap sprite TGRNd0 -{ - map "brightmaps/doom/tredd0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTA0 -{ - map "brightmaps/doom/SMRTA0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTb0 -{ - map "brightmaps/doom/SMRTb0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTc0 -{ - map "brightmaps/doom/SMRTc0.png" - iwad - disablefullbright -} - -brightmap sprite SMRTd0 -{ - map "brightmaps/doom/SMRTd0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTA0 -{ - map "brightmaps/doom/SMRTA0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTb0 -{ - map "brightmaps/doom/SMRTb0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTc0 -{ - map "brightmaps/doom/SMRTc0.png" - iwad - disablefullbright -} - -brightmap sprite SMbTd0 -{ - map "brightmaps/doom/SMRTd0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTA0 -{ - map "brightmaps/doom/SMRTA0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTb0 -{ - map "brightmaps/doom/SMRTb0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTc0 -{ - map "brightmaps/doom/SMRTc0.png" - iwad - disablefullbright -} - -brightmap sprite SMgTd0 -{ - map "brightmaps/doom/SMRTd0.png" - iwad - disablefullbright -} - -brightmap sprite vileg1 -{ - map "brightmaps/doom/vileg1.png" - iwad - disablefullbright -} - -brightmap sprite vileg2 -{ - map "brightmaps/doom/vileg2.png" - iwad - disablefullbright -} - -brightmap sprite vileg3 -{ - map "brightmaps/doom/vileg3.png" - iwad - disablefullbright -} - -brightmap sprite vileg4 -{ - map "brightmaps/doom/vileg4.png" - iwad - disablefullbright -} - -brightmap sprite vileg5 -{ - map "brightmaps/doom/vileg5.png" - iwad - disablefullbright -} - -brightmap sprite vileg6 -{ - map "brightmaps/doom/vileg6.png" - iwad - disablefullbright -} - -brightmap sprite vileg7 -{ - map "brightmaps/doom/vileg7.png" - iwad - disablefullbright -} - -brightmap sprite vileg8 -{ - map "brightmaps/doom/vileg8.png" - iwad - disablefullbright -} - -brightmap sprite vileh1 -{ - map "brightmaps/doom/vileh1.png" - iwad - disablefullbright -} - -brightmap sprite vileh2 -{ - map "brightmaps/doom/vileh2.png" - iwad - disablefullbright -} - -brightmap sprite vileh3 -{ - map "brightmaps/doom/vileh3.png" - iwad - disablefullbright -} - -brightmap sprite vileh4 -{ - map "brightmaps/doom/vileh4.png" - iwad - disablefullbright -} - -brightmap sprite vileh5 -{ - map "brightmaps/doom/vileh5.png" - iwad - disablefullbright -} - -brightmap sprite vileh6 -{ - map "brightmaps/doom/vileh6.png" - iwad - disablefullbright -} - -brightmap sprite vileh7 -{ - map "brightmaps/doom/vileh7.png" - iwad - disablefullbright -} - -brightmap sprite vileh8 -{ - map "brightmaps/doom/vileh8.png" - iwad - disablefullbright -} - -brightmap sprite vilei1 -{ - map "brightmaps/doom/vilei1.png" - iwad - disablefullbright -} - -brightmap sprite vilei2 -{ - map "brightmaps/doom/vilei2.png" - iwad - disablefullbright -} - -brightmap sprite vilei3 -{ - map "brightmaps/doom/vilei3.png" - iwad - disablefullbright -} - -brightmap sprite vilei4 -{ - map "brightmaps/doom/vilei4.png" - iwad - disablefullbright -} - -brightmap sprite vilei5 -{ - map "brightmaps/doom/vilei5.png" - iwad - disablefullbright -} - -brightmap sprite vilei6 -{ - map "brightmaps/doom/vilei6.png" - iwad - disablefullbright -} - -brightmap sprite vilei7 -{ - map "brightmaps/doom/vilei7.png" - iwad - disablefullbright -} - -brightmap sprite vilei8 -{ - map "brightmaps/doom/vilei8.png" - iwad - disablefullbright -} - -brightmap sprite vilej1 -{ - map "brightmaps/doom/vilej1.png" - iwad - disablefullbright -} - -brightmap sprite vilej2 -{ - map "brightmaps/doom/vilej2.png" - iwad - disablefullbright -} - -brightmap sprite vilej3 -{ - map "brightmaps/doom/vilej3.png" - iwad - disablefullbright -} - -brightmap sprite vilej4 -{ - map "brightmaps/doom/vilej4.png" - iwad - disablefullbright -} - -brightmap sprite vilej5 -{ - map "brightmaps/doom/vilej5.png" - iwad - disablefullbright -} - -brightmap sprite vilej6 -{ - map "brightmaps/doom/vilej6.png" - iwad - disablefullbright -} - -brightmap sprite vilej7 -{ - map "brightmaps/doom/vilej7.png" - iwad - disablefullbright -} - -brightmap sprite vilej8 -{ - map "brightmaps/doom/vilej8.png" - iwad - disablefullbright -} - -brightmap sprite vilek1 -{ - map "brightmaps/doom/vilek1.png" - iwad - disablefullbright -} - -brightmap sprite vilek2 -{ - map "brightmaps/doom/vilek2.png" - iwad - disablefullbright -} - -brightmap sprite vilek3 -{ - map "brightmaps/doom/vilek3.png" - iwad - disablefullbright -} - -brightmap sprite vilek4 -{ - map "brightmaps/doom/vilek4.png" - iwad - disablefullbright -} - -brightmap sprite vilek5 -{ - map "brightmaps/doom/vilek5.png" - iwad - disablefullbright -} - -brightmap sprite vilek6 -{ - map "brightmaps/doom/vilek6.png" - iwad - disablefullbright -} - -brightmap sprite vilek7 -{ - map "brightmaps/doom/vilek7.png" - iwad - disablefullbright -} - -brightmap sprite vilek8 -{ - map "brightmaps/doom/vilek8.png" - iwad - disablefullbright -} - -brightmap sprite vilel1 -{ - map "brightmaps/doom/vilel1.png" - iwad - disablefullbright -} - -brightmap sprite vilel2 -{ - map "brightmaps/doom/vilel2.png" - iwad - disablefullbright -} - -brightmap sprite vilel3 -{ - map "brightmaps/doom/vilel3.png" - iwad - disablefullbright -} - -brightmap sprite vilel4 -{ - map "brightmaps/doom/vilel4.png" - iwad - disablefullbright -} - -brightmap sprite vilel5 -{ - map "brightmaps/doom/vilel5.png" - iwad - disablefullbright -} - -brightmap sprite vilel6 -{ - map "brightmaps/doom/vilel6.png" - iwad - disablefullbright -} - -brightmap sprite vilel7 -{ - map "brightmaps/doom/vilel7.png" - iwad - disablefullbright -} - -brightmap sprite vilel8 -{ - map "brightmaps/doom/vilel8.png" - iwad - disablefullbright -} - -brightmap sprite vilem1 -{ - map "brightmaps/doom/vilem1.png" - iwad - disablefullbright -} - -brightmap sprite vilem2 -{ - map "brightmaps/doom/vilem2.png" - iwad - disablefullbright -} - -brightmap sprite vilem3 -{ - map "brightmaps/doom/vilem3.png" - iwad - disablefullbright -} - -brightmap sprite vilem4 -{ - map "brightmaps/doom/vilem4.png" - iwad - disablefullbright -} - -brightmap sprite vilem5 -{ - map "brightmaps/doom/vilem5.png" - iwad - disablefullbright -} - -brightmap sprite vilem6 -{ - map "brightmaps/doom/vilem6.png" - iwad - disablefullbright -} - -brightmap sprite vilem7 -{ - map "brightmaps/doom/vilem7.png" - iwad - disablefullbright -} - -brightmap sprite vilem8 -{ - map "brightmaps/doom/vilem8.png" - iwad - disablefullbright -} - -brightmap sprite vilen1 -{ - map "brightmaps/doom/vilen1.png" - iwad - disablefullbright -} - -brightmap sprite vilen2 -{ - map "brightmaps/doom/vilen2.png" - iwad - disablefullbright -} - -brightmap sprite vilen3 -{ - map "brightmaps/doom/vilen3.png" - iwad - disablefullbright -} - -brightmap sprite vilen4 -{ - map "brightmaps/doom/vilen4.png" - iwad - disablefullbright -} - -brightmap sprite vilen5 -{ - map "brightmaps/doom/vilen5.png" - iwad - disablefullbright -} - -brightmap sprite vilen6 -{ - map "brightmaps/doom/vilen6.png" - iwad - disablefullbright -} - -brightmap sprite vilen7 -{ - map "brightmaps/doom/vilen7.png" - iwad - disablefullbright -} - -brightmap sprite vilen8 -{ - map "brightmaps/doom/vilen8.png" - iwad - disablefullbright -} - -brightmap sprite vileo1 -{ - map "brightmaps/doom/vileo1.png" - iwad - disablefullbright -} - -brightmap sprite vileo2 -{ - map "brightmaps/doom/vileo2.png" - iwad - disablefullbright -} - -brightmap sprite vileo3 -{ - map "brightmaps/doom/vileo3.png" - iwad - disablefullbright -} - -brightmap sprite vileo4 -{ - map "brightmaps/doom/vileo4.png" - iwad - disablefullbright -} - -brightmap sprite vileo5 -{ - map "brightmaps/doom/vileo5.png" - iwad - disablefullbright -} - -brightmap sprite vileo6 -{ - map "brightmaps/doom/vileo6.png" - iwad - disablefullbright -} - -brightmap sprite vileo7 -{ - map "brightmaps/doom/vileo7.png" - iwad - disablefullbright -} - -brightmap sprite vileo8 -{ - map "brightmaps/doom/vileo8.png" - iwad - disablefullbright -} - -brightmap sprite vilep1 -{ - map "brightmaps/doom/vilep1.png" - iwad - disablefullbright -} - -brightmap sprite vilep2 -{ - map "brightmaps/doom/vilep2.png" - iwad - disablefullbright -} - -brightmap sprite vilep3 -{ - map "brightmaps/doom/vilep3.png" - iwad - disablefullbright -} - -brightmap sprite vilep4 -{ - map "brightmaps/doom/vilep4.png" - iwad - disablefullbright -} - -brightmap sprite vilep5 -{ - map "brightmaps/doom/vilep5.png" - iwad - disablefullbright -} - -brightmap sprite vilep6 -{ - map "brightmaps/doom/vilep6.png" - iwad - disablefullbright -} - -brightmap sprite vilep7 -{ - map "brightmaps/doom/vilep7.png" - iwad - disablefullbright -} - -brightmap sprite vilep8 -{ - map "brightmaps/doom/vilep8.png" - iwad - disablefullbright -} diff --git a/wadsrc_bm/static/filter/doom.doom1/gldefs.bm b/wadsrc_bm/static/filter/doom.id/gldefs.bm similarity index 100% rename from wadsrc_bm/static/filter/doom.doom1/gldefs.bm rename to wadsrc_bm/static/filter/doom.id/gldefs.bm diff --git a/wadsrc_lights/static/filter/doom.doom2/gldefs.txt b/wadsrc_lights/static/filter/doom.doom2/gldefs.txt deleted file mode 100644 index 61536f97f..000000000 --- a/wadsrc_lights/static/filter/doom.doom2/gldefs.txt +++ /dev/null @@ -1,1385 +0,0 @@ -// ------------------------------------------------------ -// ------------------ DOOM GAME LIGHTS ------------------ -// ------------------------------------------------------ - -// ------------------ -// -- Doom Weapons -- -// ------------------ - -// Bullet puff -flickerlight BPUFF1 -{ - color 0.5 0.5 0.0 - size 9 - secondarySize 12 - chance 0.8 - attenuate 1 -} - -flickerlight BPUFF2 -{ - color 0.5 0.5 0.0 - size 4 - secondarySize 6 - chance 0.8 - attenuate 1 -} - -object BulletPuff -{ - frame PUFFA { light BPUFF1 } - frame PUFFB { light BPUFF2 } -} - -// Rocket -pointlight ROCKET -{ - color 1.0 0.7 0.0 - size 84 - attenuate 1 -} - -flickerlight ROCKET_X1 -{ - color 1.0 0.7 0.5 - size 96 - secondarySize 108 - chance 0.3 - attenuate 1 -} - -flickerlight ROCKET_X2 -{ - color 0.5 0.3 0.2 - size 120 - secondarySize 132 - chance 0.3 - attenuate 1 -} - -flickerlight ROCKET_X3 -{ - color 0.3 0.1 0.1 - size 144 - secondarySize 156 - chance 0.3 - attenuate 1 -} - -object Rocket -{ - frame MISLA { light ROCKET } - - frame MISLB { light ROCKET_X1 } - frame MISLC { light ROCKET_X2 } - frame MISLD { light ROCKET_X3 } -} - -// Plasma -pointlight PLASMABALL -{ - color 0.5 0.5 1.0 - size 84 - attenuate 1 -} - -flickerlight PLASMA_X1 -{ - color 0.5 0.5 1.0 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA_X2 -{ - color 0.4 0.4 0.8 - size 120 - secondarySize 132 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA_X3 -{ - color 0.25 0.25 0.5 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA_X4 -{ - color 0.1 0.1 0.2 - size 12 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object PlasmaBall -{ - frame PLSSA { light PLASMABALL } - frame PLSSB { light PLASMABALL } - - frame PLSEA { light PLASMA_X1 } - frame PLSEB { light PLASMA_X2 } - frame PLSEC { light PLASMA_X2 } - frame PLSED { light PLASMA_X3 } - frame PLSEE { light PLASMA_X4 } -} - -// Beta Plasma 1 -pointlight PLASMABALL1 -{ - color 0.1 1.0 0.0 - size 84 - attenuate 1 -} - -flickerlight PLASMA1_X1 -{ - color 0.2 1.0 0.2 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X2 -{ - color 0.2 0.8 0.2 - size 120 - secondarySize 132 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X3 -{ - color 0.1 0.5 0.1 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X4 -{ - color 0.0 0.2 0.0 - size 12 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object PlasmaBall1 -{ - frame PLS1A { light PLASMABALL1 } - frame PLS1B { light PLASMABALL1 } - - frame PLS1C { light PLASMA1_X1 } - frame PLS1D { light PLASMA1_X2 } - frame PLS1E { light PLASMA1_X2 } - frame PLS1F { light PLASMA1_X3 } - frame PLS1G { light PLASMA1_X4 } -} - -// Beta Plasma 2 -pointlight PLASMABALL2 -{ - color 1.0 0.1 0.0 - size 84 - attenuate 1 -} - -flickerlight PLASMA1_X1 -{ - color 0.9 0.2 0.2 - size 96 - secondarySize 108 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X2 -{ - color 0.6 0.2 0.2 - size 120 - secondarySize 132 - chance 0.4 - attenuate 1 -} - -flickerlight PLASMA1_X3 -{ - color 0.2 0.0 0.0 - size 12 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object PlasmaBall2 -{ - frame PLS2A { light PLASMABALL2 } - frame PLS2B { light PLASMABALL2 } - - frame PLS2C { light PLASMA2_X1 } - frame PLS2D { light PLASMA2_X2 } - frame PLS2E { light PLASMA2_X3 } -} - -// BFG -pointlight BFGBALL -{ - color 0.5 1.0 0.5 - size 120 - attenuate 1 -} - -flickerlight BFGBALL_X1 -{ - color 0.5 1.0 0.5 - size 120 - secondarySize 132 - chance 0.3 - attenuate 1 -} - -flickerlight BFGBALL_X2 -{ - color 0.6 1.0 0.6 - size 156 - secondarySize 168 - chance 0.3 - attenuate 1 -} - -flickerlight BFGBALL_X3 -{ - color 0.7 1.0 0.7 - size 180 - secondarySize 192 - chance 0.3 - attenuate 1 -} - -flickerlight BFGBALL_X4 -{ - color 0.4 0.7 0.4 - size 84 - secondarySize 96 - chance 0.3 - attenuate 1 - attenuate 1 -} - -flickerlight BFGBALL_X5 -{ - color 0.1 0.3 0.1 - size 72 - secondarySize 84 - chance 0.3 - attenuate 1 -} - -object BFGBall -{ - frame BFS1A { light BFGBALL } - frame BFS1B { light BFGBALL } - - frame BFE1A { light BFGBALL_X1 } - frame BFE1B { light BFGBALL_X2 } - frame BFE1C { light BFGBALL_X3 } - frame BFE1D { light BFGBALL_X1 } - frame BFE1E { light BFGBALL_X4 } - frame BFE1F { light BFGBALL_X5 } -} - - -object BFGExtra -{ - frame BFE2A { light BFGBALL } - frame BFE2B { light BFGBALL_X1 } - frame BFE2C { light BFGBALL_X4 } - frame BFE2D { light BFGBALL_X5 } -} - - - -// ---------------------- -// -- Doom Decorations -- -// ---------------------- - -// Barrel -pulselight BARREL -{ - color 0.0 0.3 0.0 - size 20 - secondarySize 21 - interval 0.5 - offset 0 36 0 - dontlightself 1 - attenuate 1 -} - -object ExplosiveBarrel -{ - frame BAR1 { light BARREL } - - frame BEXPC { light ROCKET_X1 } - frame BEXPD { light ROCKET_X2 } - frame BEXPE { light ROCKET_X3 } -} - -// Floor lamp -pointlight LAMP -{ - color 1.0 1.0 0.8 - size 84 - offset 0 44 0 - attenuate 1 -} - -object Column -{ - frame COLU { light LAMP } -} - -// Short tech lamp -pulselight SMALLLAMP -{ - color 0.8 0.8 1.0 - size 84 - secondarySize 87 - interval 0.4 - offset 0 44 0 - attenuate 1 -} - -object TechLamp2 -{ - frame TLP2 { light SMALLLAMP } -} - -// Tall tech lamp -pulselight BIGLAMP -{ - color 0.8 0.8 1.0 - size 96 - secondarySize 99 - interval 0.4 - offset 0 72 0 - attenuate 1 -} - -object TechLamp -{ - frame TLMP { light BIGLAMP } -} - -// Tall red torch -flickerlight2 BIGREDTORCH -{ - color 0.7 0.35 0.14 - size 90 - secondarySize 99 - interval 0.1 - offset 0 60 0 - attenuate 1 -} - -object RedTorch -{ - frame TRED { light BIGREDTORCH } -} - -// Tall green torch -flickerlight2 BIGGREENTORCH -{ - color 0.2 0.7 0.2 - size 90 - secondarySize 99 - interval 0.1 - offset 0 60 0 - attenuate 1 -} - -object GreenTorch -{ - frame TGRN { light BIGGREENTORCH } -} - -// Tall blue torch -flickerlight2 BIGBLUETORCH -{ - color 0.2 0.2 0.7 - size 90 - secondarySize 99 - interval 0.1 - offset 0 60 0 - attenuate 1 -} - -object BlueTorch -{ - frame TBLU { light BIGBLUETORCH } -} - -// Small red torch -flickerlight2 SMALLREDTORCH -{ - color 0.7 0.35 0.14 - size 72 - secondarySize 81 - interval 0.1 - offset 0 35 0 - attenuate 1 -} - -object ShortRedTorch -{ - frame SMRT { light SMALLREDTORCH } -} - -// Small green torch -flickerlight2 SMALLGREENTORCH -{ - color 0.2 0.7 0.2 - size 72 - secondarySize 81 - interval 0.1 - offset 0 35 0 - attenuate 1 -} - -object ShortGreenTorch -{ - frame SMGT { light SMALLGREENTORCH } -} - -// Small blue torch -flickerlight2 SMALLBLUETORCH -{ - color 0.2 0.2 0.7 - size 72 - secondarySize 81 - interval 0.1 - offset 0 35 0 - attenuate 1 -} - -object ShortBlueTorch -{ - frame SMBT { light SMALLBLUETORCH } -} - -// Burning barrel -flickerlight2 FIREBARREL -{ - color 1.0 0.9 0.4 - size 72 - secondarySize 81 - interval 0.1 - offset 0 32 0 - attenuate 1 -} - -object BurningBarrel -{ - frame FCAN { light FIREBARREL } -} - -// Skulls w/candles -flickerlight2 SKULLCANDLES -{ - color 1.0 1.0 0.3 - size 48 - secondarySize 51 - interval 0.1 - offset 0 24 0 - attenuate 1 -} - -object HeadCandles -{ - frame POL3 { light SKULLCANDLES } -} - -// Candle -pointlight CANDLE -{ - color 1.0 1.0 0.3 - size 24 - offset 0 16 0 - attenuate 1 -} - -object Candlestick -{ - frame CAND { light CANDLE } -} - -// Candelabra -pointlight CANDELABRA -{ - color 1.0 1.0 0.3 - size 67 - offset 0 52 0 - attenuate 1 -} - -object Candelabra -{ - frame CBRA { light CANDELABRA } -} - - - -// ---------------- -// -- Doom Items -- -// ---------------- - -// Soul Sphere -pulselight SOULSPHERE -{ - color 0.3 0.3 1.0 - size 60 - secondarySize 63 - interval 2.0 - offset 0 16 0 - attenuate 1 -} - -object SoulSphere -{ - frame SOUL { light SOULSPHERE } -} - -pulselight MEGASPHERE -{ - color 0.5 0.5 0.4 - size 60 - secondarySize 63 - interval 2.0 - offset 0 16 0 - attenuate 1 -} - -object MegaSphere -{ - frame MEGA { light MEGASPHERE } -} - -// Invulnerability Sphere -pulselight INVULN -{ - color 0.3 1.0 0.3 - size 60 - secondarySize 63 - interval 2.0 - offset 0 16 0 - attenuate 1 -} - -object InvulnerabilitySphere -{ - frame PINV { light INVULN } -} - -// Blur Sphere -pointlight BLURSPHERE1 -{ - color 1.0 0.0 0.0 - size 60 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE2 -{ - color 0.0 0.0 1.0 - size 48 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE3 -{ - color 0.0 0.0 1.0 - size 36 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE4 -{ - color 0.0 0.0 1.0 - size 24 - offset 0 16 0 - attenuate 1 -} - -pointlight BLURSPHERE5 -{ - color 0.0 0.0 1.0 - size 12 - offset 0 16 0 - attenuate 1 -} - -object BlurSphere -{ - frame PINS { light BLURSPHERE1 } - - frame PINSA { light BLURSPHERE2 } - frame PINSB { light BLURSPHERE3 } - frame PINSC { light BLURSPHERE4 } - frame PINSD { light BLURSPHERE5 } -} - -// Health Potion -pulselight HEALTHPOTION -{ - color 0.0 0.0 0.3 - size 16 - secondarySize 20 - interval 2.0 - attenuate 1 - offset 0 10 0 -} - -object HealthBonus -{ - frame BON1 { light HEALTHPOTION } -} - -// Armour Helmet -pulselight ARMORBONUS -{ - color 0.1 0.3 0.1 - size 16 - secondarySize 20 - interval 1.0 - dontlightself 1 - attenuate 1 - offset 0 10 0 -} - -object ArmorBonus -{ - frame BON2 { light ARMORBONUS } -} - -// Blue Keys -object BlueCard -{ - frame BKEY { light HEALTHPOTION } -} - -object BlueSkull -{ - frame BSKU { light HEALTHPOTION } -} - -// Yellow Keys -pulselight YELLOWKEY -{ - color 0.6 0.6 0.0 - size 24 - secondarySize 27 - interval 2.0 - attenuate 1 - offset 0 10 0 -} - -object YellowCard -{ - frame YKEY { light YELLOWKEY } -} - -object YellowSkull -{ - frame YSKU { light YELLOWKEY } -} - -// Red Keys -pulselight REDKEY -{ - color 0.6 0.0 0.0 - size 24 - secondarySize 27 - interval 2.0 - attenuate 1 - offset 0 10 0 -} - -object RedCard -{ - frame RKEY { light REDKEY } -} - -object RedSkull -{ - frame RSKU { light REDKEY } -} - -// Green armour -pointlight GREENARMOR1 -{ - color 0.0 0.3 0.0 - size 40 - attenuate 1 - offset 0 10 0 -} - -pointlight GREENARMOR2 -{ - color 0.0 0.3 0.0 - size 30 - attenuate 1 - offset 0 10 0 -} - -object GreenArmor -{ - frame ARM1A { light GREENARMOR1 } - frame ARM1B { light GREENARMOR2 } -} - -// Blue armour -pointlight BLUEARMOR1 -{ - color 0.0 0.0 0.3 - size 40 - attenuate 1 - offset 0 10 0 -} - -pointlight BLUEARMOR2 -{ - color 0.0 0.0 0.3 - size 30 - attenuate 1 - offset 0 10 0 -} - -object BlueArmor -{ - frame ARM2A { light BLUEARMOR1 } - frame ARM2B { light BLUEARMOR2 } -} - - - -// ------------------ -// -- Doom Enemies -- -// ------------------ - -// Zombies -flickerlight2 ZOMBIEATK -{ - color 1.0 0.8 0.2 - size 72 - secondarySize 84 - interval 1 - offset 0 40 0 - attenuate 1 -} - -object ZombieMan -{ - frame POSSF { light ZOMBIEATK } -} - -object ShotgunGuy -{ - frame SPOSF { light ZOMBIEATK } -} - -object ChaingunGuy -{ - frame CPOSE { light ZOMBIEATK } - frame CPOSF { light ZOMBIEATK } -} - -object DoomPlayer -{ - frame PLAYF { light ZOMBIEATK } -} - - -// Doom Imp Fireball -pointlight IMPBALL -{ - color 1.0 0.7 0.4 - size 96 - attenuate 1 -} - -// Doom imp fireball explosion -flickerlight IMPBALL_X1 -{ - color 0.7 0.4 0.25 - size 120 - secondarySize 132 - chance 0.25 - attenuate 1 -} - -flickerlight IMPBALL_X2 -{ - color 0.4 0.2 0.1 - size 144 - secondarySize 156 - chance 0.25 - attenuate 1 -} - -flickerlight IMPBALL_X3 -{ - color 0.2 0.1 0.0 - size 168 - secondarySize 180 - chance 0.25 - attenuate 1 -} - -object DoomImpBall -{ - frame BAL1A { light IMPBALL } - frame BAL1B { light IMPBALL } - - frame BAL1C { light IMPBALL_X1 } - frame BAL1D { light IMPBALL_X2 } - frame BAL1E { light IMPBALL_X3 } -} - -pointlight SPECTRE -{ - color 0.5 0.5 0.5 - size 72 - offset 0 24 0 - subtractive 1 - attenuate 1 -} - -/* -object Spectre -{ - frame SARG { light SPECTRE } -} -*/ - -// Cacodemon fireball -flickerlight CACOBALL -{ - color 1.0 0.5 0.8 - size 84 - secondarySize 96 - chance 0.5 - attenuate 1 -} - -flickerlight CACOBALL_X1 -{ - color 0.9 0.4 0.7 - size 108 - secondarySize 120 - chance 0.25 - attenuate 1 -} - -flickerlight CACOBALL_X2 -{ - color 0.6 0.3 0.5 - size 132 - secondarySize 144 - chance 0.25 - attenuate 1 -} - -flickerlight CACOBALL_X3 -{ - color 0.3 0.1 0.1 - size 156 - secondarySize 168 - chance 0.25 - attenuate 1 -} - -object CacodemonBall -{ - frame BAL2A { light CACOBALL } - frame BAL2B { light CACOBALL } - - frame BAL2C { light CACOBALL_X1 } - frame BAL2D { light CACOBALL_X2 } - frame BAL2E { light CACOBALL_X3 } -} - -// Baron / Hell Knight fireball -pointlight BARONBALL -{ - color 0.0 1.0 0.0 - size 96 - attenuate 1 -} - -flickerlight BARONBALL_X1 -{ - color 0.6 0.9 0.6 - size 120 - secondarySize 132 - chance 0.25 - attenuate 1 -} - -flickerlight BARONBALL_X2 -{ - color 0.45 0.6 0.45 - size 144 - secondarySize 156 - chance 0.25 - attenuate 1 -} - -flickerlight BARONBALL_X3 -{ - color 0.2 0.3 0.2 - size 168 - secondarySize 180 - chance 0.25 - attenuate 1 -} - -object BaronBall -{ - frame BAL7A { light BARONBALL } - frame BAL7B { light BARONBALL } - - frame BAL7C { light BARONBALL_X1 } - frame BAL7D { light BARONBALL_X2 } - frame BAL7E { light BARONBALL_X3 } -} - -// Lost Soul -flickerlight LOSTSOUL -{ - color 1.0 0.6 0.3 - size 84 - secondarysize 64 - chance 0.1 - attenuate 1 -} - -flickerlight LOSTSOUL_X1 -{ - color 0.8 0.5 0.3 - size 108 - secondarySize 120 - chance 0.25 - attenuate 1 -} - -flickerlight LOSTSOUL_X2 -{ - color 0.6 0.3 0.2 - size 132 - secondarySize 144 - chance 0.25 - attenuate 1 -} - -flickerlight LOSTSOUL_X3 -{ - color 0.4 0.1 0.0 - size 156 - secondarySize 168 - chance 0.25 - attenuate 1 -} - -flickerlight LOSTSOUL_X4 -{ - color 0.2 0.0 0.0 - size 168 - secondarySize 180 - chance 0.25 - attenuate 1 -} - -object LostSoul -{ - frame SKULA { light LOSTSOUL } - frame SKULB { light LOSTSOUL } - frame SKULC { light LOSTSOUL } - frame SKULD { light LOSTSOUL } - frame SKULE { light LOSTSOUL } - frame SKULF { light LOSTSOUL } - frame SKULG { light LOSTSOUL } - - frame SKULH { light LOSTSOUL_X1 } - frame SKULI { light LOSTSOUL_X2 } - frame SKULJ { light LOSTSOUL_X3 } - frame SKULK { light LOSTSOUL_X4 } -} - -// Mancubus Fireball -object FatShot -{ - frame MANFA { light IMPBALL } - frame MANFB { light IMPBALL } - - frame MISLB { light ROCKET_X1 } - frame MISLC { light ROCKET_X2 } - frame MISLD { light ROCKET_X3 } -} - -// Arachnotron Fireball -pointlight ARACHPLAS -{ - color 0.6 1.0 0.4 - size 84 - attenuate 1 -} - -flickerlight ARACHPLAS_X1 -{ - color 0.4 0.8 0.3 - size 108 - secondarySize 120 - chance 0.3 - attenuate 1 -} - -flickerlight ARACHPLAS_X2 -{ - color 0.6 0.6 0.3 - size 132 - secondarySize 144 - chance 0.3 - attenuate 1 -} - -flickerlight ARACHPLAS_X3 -{ - color 0.4 0.4 0.2 - size 72 - secondarySize 48 - chance 0.3 - attenuate 1 -} - -flickerlight ARACHPLAS_X4 -{ - color 0.2 0.2 0.1 - size 36 - secondarySize 24 - chance 0.3 - attenuate 1 -} - -object ArachnotronPlasma -{ - frame APLSA { light ARACHPLAS } - frame APLSB { light ARACHPLAS } - - frame APBXA { light ARACHPLAS_X1 } - frame APBXB { light ARACHPLAS_X2 } - frame APBXC { light ARACHPLAS_X2 } - frame APBXD { light ARACHPLAS_X3 } - frame APBXE { light ARACHPLAS_X4 } -} - -// Revenant tracer -pointlight TRACER -{ - color 1.0 0.5 0.3 - size 72 - attenuate 1 -} - -flickerlight TRACER_X1 -{ - color 1.0 0.5 0.2 - size 96 - secondarySize 108 - chance 0.25 - attenuate 1 -} - -flickerlight TRACER_X2 -{ - color 0.6 0.3 0.1 - size 120 - secondarySize 132 - chance 0.25 - attenuate 1 -} - -flickerlight TRACER_X3 -{ - color 0.3 0.1 0.0 - size 144 - secondarySize 156 - chance 0.25 - attenuate 1 -} - -object RevenantTracer -{ - frame FATBA { light TRACER } - frame FATBB { light TRACER } - - frame FBXPA { light TRACER_X1 } - frame FBXPB { light TRACER_X2 } - frame FBXPC { light TRACER_X3 } -} - -// Arch Vile Fire -flickerlight ARCHFIRE1 -{ - color 1.0 1.0 0.5 - size 36 - secondarySize 48 - chance 0.3 - offset 0 8 0 - attenuate 1 -} - -flickerlight ARCHFIRE2 -{ - color 1.0 1.0 0.5 - size 60 - secondarySize 72 - chance 0.3 - offset 0 24 0 - attenuate 1 -} - -flickerlight ARCHFIRE3 -{ - color 1.0 1.0 0.5 - size 96 - secondarySize 108 - chance 0.3 - offset 0 32 0 - attenuate 1 -} - -flickerlight ARCHFIRE4 -{ - color 0.8 0.8 0.4 - size 96 - secondarySize 108 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -flickerlight ARCHFIRE5 -{ - color 0.8 0.8 0.4 - size 96 - secondarySize 108 - chance 0.3 - offset 0 48 0 - attenuate 1 -} - -flickerlight ARCHFIRE6 -{ - color 0.6 0.6 0.3 - size 72 - secondarySize 84 - chance 0.3 - offset 0 64 0 - attenuate 1 -} - -flickerlight ARCHFIRE7 -{ - color 0.4 0.4 0.2 - size 48 - secondarySize 60 - chance 0.3 - offset 0 72 0 - attenuate 1 -} - -flickerlight ARCHFIRE8 -{ - color 0.2 0.2 0.1 - size 24 - secondarySize 36 - chance 0.3 - offset 0 80 0 - attenuate 1 -} - -object ArchvileFire -{ - frame FIREA { light ARCHFIRE1 } - frame FIREB { light ARCHFIRE2 } - frame FIREC { light ARCHFIRE3 } - frame FIRED { light ARCHFIRE4 } - frame FIREE { light ARCHFIRE5 } - frame FIREF { light ARCHFIRE6 } - frame FIREG { light ARCHFIRE7 } - frame FIREH { light ARCHFIRE8 } -} - -// Arch-vile -flickerlight ARCHATK1 -{ - color 1.0 1.0 0.4 - size 48 - secondarySize 72 - chance 0.3 - offset 0 80 0 - attenuate 1 -} - -flickerlight ARCHATK2 -{ - color 1.0 1.0 0.4 - size 84 - secondarySize 96 - chance 0.3 - offset 0 80 0 - attenuate 1 -} - -flickerlight ARCHATK3 -{ - color 1.0 1.0 0.4 - size 84 - secondarySize 96 - chance 0.3 - offset 0 64 0 - attenuate 1 -} - -flickerlight ARCHATK4 -{ - color 1.0 1.0 0.4 - size 96 - secondarySize 108 - chance 0.3 - offset 0 48 0 - attenuate 1 -} - -flickerlight ARCHATK5 -{ - color 1.0 1.0 0.4 - size 120 - secondarySize 132 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -flickerlight ARCHATK6 -{ - color 0.7 0.7 0.3 - size 144 - secondarySize 156 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -flickerlight ARCHATK7 -{ - color 0.3 0.3 0.1 - size 156 - secondarySize 168 - chance 0.3 - offset 0 40 0 - attenuate 1 -} - -pulselight ARCHRES -{ - color 0.6 0.3 0.3 - size 96 - secondarySize 105 - interval 0.5 - offset 0 36 0 - attenuate 1 -} - -object Archvile -{ - frame VILEH { light ARCHATK1 } - frame VILEI { light ARCHATK2 } - frame VILEJ { light ARCHATK3 } - frame VILEK { light ARCHATK4 } - frame VILEL { light ARCHATK4 } - frame VILEM { light ARCHATK4 } - frame VILEN { light ARCHATK5 } - frame VILEO { light ARCHATK6 } - frame VILEP { light ARCHATK7 } - - frame VILE[ { light ARCHRES } - frame VILE\ { light ARCHRES } - frame VILE] { light ARCHRES } -} - -// ------------------ -// -- Doom Effects -- -// ------------------ - -// Doom Teleport fog -flickerlight DTFOG1 -{ - color 0.4 1.0 0.4 - size 84 - secondarySize 96 - chance 0.4 - attenuate 1 -} - -flickerlight DTFOG2 -{ - color 0.4 1.0 0.4 - size 60 - secondarySize 72 - chance 0.4 - attenuate 1 -} - -flickerlight DTFOG3 -{ - color 0.4 1.0 0.4 - size 36 - secondarySize 48 - chance 0.4 - attenuate 1 -} - -flickerlight DTFOG4 -{ - color 0.4 1.0 0.4 - size 15 - secondarySize 24 - chance 0.4 - attenuate 1 -} - -object TeleportFog -{ - frame TFOGA { light DTFOG1 } - frame TFOGB { light DTFOG2 } - frame TFOGC { light DTFOG2 } - frame TFOGD { light DTFOG2 } - frame TFOGE { light DTFOG3 } - frame TFOGF { light DTFOG4 } - frame TFOGI { light DTFOG4 } - frame TFOGJ { light DTFOG3 } -} diff --git a/wadsrc_lights/static/filter/doom.doom1/gldefs.txt b/wadsrc_lights/static/filter/doom.id/gldefs.txt similarity index 100% rename from wadsrc_lights/static/filter/doom.doom1/gldefs.txt rename to wadsrc_lights/static/filter/doom.id/gldefs.txt