diff --git a/graphics/text/config.py b/graphics/text/config.py index 9d3099d6..1ffb709f 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -102,7 +102,7 @@ red_graphics = { 'm_epi1': 'First Episode', 'm_epi2': 'Second Episode', 'm_epi3': 'Third Episode', - 'm_epi4': 'Fourth Episode', + 'm_epi4': 'Double Impact', 'm_jkill': 'Please don\'t kill me!', 'm_rough': 'Will this hurt?', diff --git a/levels/dbimpact/dbimpact.txt b/levels/dbimpact/dbimpact.txt new file mode 100644 index 00000000..a1ce629c --- /dev/null +++ b/levels/dbimpact/dbimpact.txt @@ -0,0 +1,73 @@ +Title : Double Impact +Filename : DBIMPACT.WAD +Release date : 03/30/2011 +Author : RottKing & Ralphis +Email Address : ralphis@unidoom.org rottking@sbcglobal.net + +Other Files By Author : Unidoom Deathmatch 1, Unidoom Deathmatch 2, Unidoom Deathmatch 3, Unidoom Deathmatch X, Odamex CTF 1 + +Misc. Author Info : Visit us at http://www.unidoom.org and #unidoom on irc.quakenet.org! + +Description : A nine map episode 1 replacement. + +Additional Credits to : infurnus for the sky texture, esselfortium for the titlepic, and dewww, st.alfonzo, NaturalTvventy, Xenaero, glortho, joshsmith, and whiteboy567 for helping out with play testing. + +=========================================================================== + +* What is included * + +=========================================================================== + +New levels : 9 +Sounds : No +Music : Yes +Graphics : Yes +Dehacked/BEX Patch : Yes +Demos : Yes +Other : Yes +Other files required : No + +* Play Information * + +Game : Ultimate DOOM +Single Player : Yes +Cooperative 2-4 Player : Yes +Deathmatch 2-4 Player : Yes +Other game styles : None +Difficulty Settings : Yes + +* Construction * + +Build Time : About a year and a half. +Editor(s) used : Doombuilder, Wintex, XWE, Slumped +Known Bugs : None +May Not Run With... : doom.exe. Requires at least a limit removing engine. + +=========================================================================== + +* Level Information * + +=========================================================================== + +---------- + +* Copyright / Permissions * + +Authors MAY use the contents of this file as a base for +modification or reuse. + +You MAY distribute this file, provided you include this text file with +no modifications. You may distribute this file in any electronic +format (BBS, diskette, CD, etc.) as long as you include this file +intact. + +You MAY edit and release any maps contained in the WAD as you wish under the conditions that the original authors and Unidoom are credited. + + +* Where to get the file that this text file describes * + +The Usual: ftp://archives.3dgamers.com/pub/idgames/ and mirrors +Web sites: http://www.unidoom.org + + + diff --git a/levels/dbimpact/e4m1.wad b/levels/dbimpact/e4m1.wad new file mode 100644 index 00000000..489281ff Binary files /dev/null and b/levels/dbimpact/e4m1.wad differ diff --git a/levels/dbimpact/e4m2.wad b/levels/dbimpact/e4m2.wad new file mode 100644 index 00000000..f7c6c88a Binary files /dev/null and b/levels/dbimpact/e4m2.wad differ diff --git a/levels/dbimpact/e4m3.wad b/levels/dbimpact/e4m3.wad new file mode 100644 index 00000000..e4c35b93 Binary files /dev/null and b/levels/dbimpact/e4m3.wad differ diff --git a/levels/dbimpact/e4m4.wad b/levels/dbimpact/e4m4.wad new file mode 100644 index 00000000..ad3d9c9b Binary files /dev/null and b/levels/dbimpact/e4m4.wad differ diff --git a/levels/dbimpact/e4m5.wad b/levels/dbimpact/e4m5.wad new file mode 100644 index 00000000..271361e2 Binary files /dev/null and b/levels/dbimpact/e4m5.wad differ diff --git a/levels/dbimpact/e4m6.wad b/levels/dbimpact/e4m6.wad new file mode 100644 index 00000000..04df1558 Binary files /dev/null and b/levels/dbimpact/e4m6.wad differ diff --git a/levels/dbimpact/e4m7.wad b/levels/dbimpact/e4m7.wad new file mode 100644 index 00000000..1cb815be Binary files /dev/null and b/levels/dbimpact/e4m7.wad differ diff --git a/levels/dbimpact/e4m8.wad b/levels/dbimpact/e4m8.wad new file mode 100644 index 00000000..465eaa09 Binary files /dev/null and b/levels/dbimpact/e4m8.wad differ diff --git a/levels/dbimpact/e4m9.wad b/levels/dbimpact/e4m9.wad new file mode 100644 index 00000000..fa792786 Binary files /dev/null and b/levels/dbimpact/e4m9.wad differ diff --git a/levels/e4m1.wad b/levels/e4m1.wad index 6be15489..dcd6a3fa 120000 --- a/levels/e4m1.wad +++ b/levels/e4m1.wad @@ -1 +1 @@ -nb_nmare/e4m1.wad \ No newline at end of file +dbimpact/e4m1.wad \ No newline at end of file diff --git a/levels/e4m2.wad b/levels/e4m2.wad index 78029f8b..9758e4be 120000 --- a/levels/e4m2.wad +++ b/levels/e4m2.wad @@ -1 +1 @@ -ghostlydeath/e4m2.wad \ No newline at end of file +dbimpact/e4m2.wad \ No newline at end of file diff --git a/levels/e4m3.wad b/levels/e4m3.wad new file mode 120000 index 00000000..6de43003 --- /dev/null +++ b/levels/e4m3.wad @@ -0,0 +1 @@ +dbimpact/e4m3.wad \ No newline at end of file diff --git a/levels/e4m4.wad b/levels/e4m4.wad new file mode 120000 index 00000000..706fbc29 --- /dev/null +++ b/levels/e4m4.wad @@ -0,0 +1 @@ +dbimpact/e4m4.wad \ No newline at end of file diff --git a/levels/e4m5.wad b/levels/e4m5.wad new file mode 120000 index 00000000..f2474456 --- /dev/null +++ b/levels/e4m5.wad @@ -0,0 +1 @@ +dbimpact/e4m5.wad \ No newline at end of file diff --git a/levels/e4m6.wad b/levels/e4m6.wad new file mode 120000 index 00000000..015f8822 --- /dev/null +++ b/levels/e4m6.wad @@ -0,0 +1 @@ +dbimpact/e4m6.wad \ No newline at end of file diff --git a/levels/e4m7.wad b/levels/e4m7.wad new file mode 120000 index 00000000..10273172 --- /dev/null +++ b/levels/e4m7.wad @@ -0,0 +1 @@ +dbimpact/e4m7.wad \ No newline at end of file diff --git a/levels/e4m8.wad b/levels/e4m8.wad new file mode 120000 index 00000000..8db481f3 --- /dev/null +++ b/levels/e4m8.wad @@ -0,0 +1 @@ +dbimpact/e4m8.wad \ No newline at end of file diff --git a/levels/e4m9.wad b/levels/e4m9.wad new file mode 120000 index 00000000..1dd0b6ca --- /dev/null +++ b/levels/e4m9.wad @@ -0,0 +1 @@ +dbimpact/e4m9.wad \ No newline at end of file diff --git a/levels/ghostlydeath/e4m2.txt b/levels/ghostlydeath/e4m2.txt deleted file mode 100644 index b66e4a70..00000000 --- a/levels/ghostlydeath/e4m2.txt +++ /dev/null @@ -1,25 +0,0 @@ -THIS IS A LEVEL FOR FREEDOM, IT'S NOT YET COMPLETE SO DON'T GO NUTS! - -OCCUPIES E4M2 - -AUTHOR(S): GhostlyDeath (ghostlydeath@gmail.com) - -*************************** -*** FILE IDENTIFICATION *** -*************************** - - File: `GhostlyDeath_UltFreeDoom_E4M2_20090712.wad' - Size: 76214 Blocks: 160 IO Block: 4096 regular file -Device: 13h/19d Inode: 1540299 Links: 1 -Access: (0644/-rw-r--r--) Uid: ( 1000/ steven) Gid: ( 1000/ steven) -Access: 2009-07-12 02:04:02.000000000 -0400 -Modify: 2009-07-12 02:04:05.000000000 -0400 -Change: 2009-07-12 02:08:25.000000000 -0400 - -MD5SUM: 2aa508fccfde03aba9120828cb051566 -SHA1SUM: 1d001a4c382a3eb4d101720f4777551ec3a5252e -SHA224SUM: c256c56f9642ced6f819e5ba5c34f6d3494bbcf4e936a5f077c56a60 -SHA256SUM: 1a5e2a47518f4ad9a7931363d2e500fba81226aba32b7f9d52545ab433a278a3 -SHA384SUM: e8cd707c981a7f0addd9d6b7c7c067d92f370dc37c13255b5e74647360ce31e201804c194b1fbddad14eadf2f1f3c67d -SHA512SUM: af74a1b8838fedf62e72fec6f615c801582f0dd0a6734d82381107109667d4b5399a40aa7046405074f06ed6803ca0084a1d97d121ed87db7ab93aad460d4c06 - diff --git a/levels/ghostlydeath/e4m2.wad b/levels/ghostlydeath/e4m2.wad deleted file mode 100644 index 65c28c9e..00000000 Binary files a/levels/ghostlydeath/e4m2.wad and /dev/null differ diff --git a/levels/nb_nmare/e4m1.wad b/levels/nb_nmare/e4m1.wad deleted file mode 100644 index e27af191..00000000 Binary files a/levels/nb_nmare/e4m1.wad and /dev/null differ diff --git a/levels/nb_nmare/n_fdlv22.txt b/levels/nb_nmare/n_fdlv22.txt deleted file mode 100644 index 8688fda4..00000000 --- a/levels/nb_nmare/n_fdlv22.txt +++ /dev/null @@ -1,9 +0,0 @@ -name : The Catacombs -map # : 22 -author : Nick Baker - -This is a work-in-progress level, strongly inspired by the Ultimate Doom Episode 4 and the Talosian Incident. - -The level originally started life as one of the three L.I.N.K. levels, and was started buy Chris Hansen, with some work also done by C. Celizic. - -Chris has allowed me to complete the level due to lack of interest in the L.I.N.K. project. \ No newline at end of file diff --git a/levels/nb_nmare/nb_e4m1.txt b/levels/nb_nmare/nb_e4m1.txt deleted file mode 100644 index e87dada6..00000000 --- a/levels/nb_nmare/nb_e4m1.txt +++ /dev/null @@ -1,16 +0,0 @@ -New stuff: - -- more detail has been added to the four switches area - -- a tiny bit of detail has been added elsewhere - - -To do: - -- the southern most corridor still needs a bit more detailing. - -- a secret bonus round in the four switches area! This will completely reset it (caco walls go back up, bars raise again, etc), but makes it even harder, with monsters teleporting in as well as the caco's :) There will be a suitable reward at the end though. - -- a couple of rooms beyond the blue door. - -- the last room is still in a very rough state (as should hopefully be obvious) \ No newline at end of file diff --git a/lumps/fraggle/freedoom.bex b/lumps/fraggle/freedoom.bex index 1226c66d..99ec2d77 100644 --- a/lumps/fraggle/freedoom.bex +++ b/lumps/fraggle/freedoom.bex @@ -78,15 +78,15 @@ HUSTR_E3M6 = E3M6 HUSTR_E3M7 = E3M7 HUSTR_E3M8 = E3M8 HUSTR_E3M9 = E3M9 -HUSTR_E4M1 = E4M1 -HUSTR_E4M2 = E4M2 -HUSTR_E4M3 = E4M3 -HUSTR_E4M4 = E4M4 -HUSTR_E4M5 = E4M5 -HUSTR_E4M6 = E4M6 -HUSTR_E4M7 = E4M7 -HUSTR_E4M8 = E4M8 -HUSTR_E4M9 = E4M9 +HUSTR_E4M1 = E4M1: Maintenance Area +HUSTR_E4M2 = E4M2: Research Complex +HUSTR_E4M3 = E4M3: Central Computing +HUSTR_E4M4 = E4M4: Hydroponic Facility +HUSTR_E4M5 = E4M5: Engineering Station +HUSTR_E4M6 = E4M6: Command Center +HUSTR_E4M7 = E4M7: Waste Treatment +HUSTR_E4M8 = E4M8: Launch Bay +HUSTR_E4M9 = E4M9: Operations CC_ZOMBIE = zombie CC_SHOTGUN = shotgun zombie CC_HEAVY = mini-gun zombie diff --git a/patches/rjy/sky4a.gif b/patches/rjy/sky4a.gif new file mode 100644 index 00000000..04339efe Binary files /dev/null and b/patches/rjy/sky4a.gif differ diff --git a/patches/rjy/sky4b.gif b/patches/rjy/sky4b.gif new file mode 100644 index 00000000..0d5881c2 Binary files /dev/null and b/patches/rjy/sky4b.gif differ diff --git a/patches/sky4a.gif b/patches/sky4a.gif new file mode 120000 index 00000000..53edce0f --- /dev/null +++ b/patches/sky4a.gif @@ -0,0 +1 @@ +rjy/sky4a.gif \ No newline at end of file diff --git a/patches/sky4b.gif b/patches/sky4b.gif new file mode 120000 index 00000000..e55fb1e2 --- /dev/null +++ b/patches/sky4b.gif @@ -0,0 +1 @@ +rjy/sky4b.gif \ No newline at end of file diff --git a/textures/combined.txt b/textures/combined.txt index 556d6e5b..2a349dcf 100644 --- a/textures/combined.txt +++ b/textures/combined.txt @@ -1935,8 +1935,11 @@ WFALL4 64 128 ; These textures are only in Ultimate Doom -SKY4 256 128 -* SKY4 0 0 +SKY4 1024 128 +* SKY4A 0 0 +* SKY4A 256 0 +* SKY4B 512 0 +* SKY4A 768 0 #endif