Skip to content

Commit 2aaad3e

Browse files
rjyrjy
committed
Merge branch 'double_impact'
Conflicts: graphics/text/config.py lumps/fraggle/freedoom.bex
2 parents 491997d + 3d464fd commit 2aaad3e

31 files changed

+99
-64
lines changed

‎graphics/text/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
'm_epi1': 'First Episode',
103103
'm_epi2': 'Second Episode',
104104
'm_epi3': 'Third Episode',
105-
'm_epi4': 'Fourth Episode',
105+
'm_epi4': 'Double Impact',
106106

107107
'm_jkill': 'Please don\'t kill me!',
108108
'm_rough': 'Will this hurt?',

‎levels/dbimpact/dbimpact.txt

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
Title : Double Impact
2+
Filename : DBIMPACT.WAD
3+
Release date : 03/30/2011
4+
Author : RottKing & Ralphis
5+
Email Address : ralphis@unidoom.org rottking@sbcglobal.net
6+
7+
Other Files By Author : Unidoom Deathmatch 1, Unidoom Deathmatch 2, Unidoom Deathmatch 3, Unidoom Deathmatch X, Odamex CTF 1
8+
9+
Misc. Author Info : Visit us at http://www.unidoom.org and #unidoom on irc.quakenet.org!
10+
11+
Description : A nine map episode 1 replacement.
12+
13+
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.
14+
15+
===========================================================================
16+
17+
* What is included *
18+
19+
===========================================================================
20+
21+
New levels : 9
22+
Sounds : No
23+
Music : Yes
24+
Graphics : Yes
25+
Dehacked/BEX Patch : Yes
26+
Demos : Yes
27+
Other : Yes
28+
Other files required : No
29+
30+
* Play Information *
31+
32+
Game : Ultimate DOOM
33+
Single Player : Yes
34+
Cooperative 2-4 Player : Yes
35+
Deathmatch 2-4 Player : Yes
36+
Other game styles : None
37+
Difficulty Settings : Yes
38+
39+
* Construction *
40+
41+
Build Time : About a year and a half.
42+
Editor(s) used : Doombuilder, Wintex, XWE, Slumped
43+
Known Bugs : None
44+
May Not Run With... : doom.exe. Requires at least a limit removing engine.
45+
46+
===========================================================================
47+
48+
* Level Information *
49+
50+
===========================================================================
51+
52+
----------
53+
54+
* Copyright / Permissions *
55+
56+
Authors MAY use the contents of this file as a base for
57+
modification or reuse.
58+
59+
You MAY distribute this file, provided you include this text file with
60+
no modifications. You may distribute this file in any electronic
61+
format (BBS, diskette, CD, etc.) as long as you include this file
62+
intact.
63+
64+
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.
65+
66+
67+
* Where to get the file that this text file describes *
68+
69+
The Usual: ftp://archives.3dgamers.com/pub/idgames/ and mirrors
70+
Web sites: http://www.unidoom.org
71+
72+
73+

‎levels/dbimpact/e4m1.wad

252 KB
Binary file not shown.

‎levels/dbimpact/e4m2.wad

554 KB
Binary file not shown.

‎levels/dbimpact/e4m3.wad

250 KB
Binary file not shown.

‎levels/dbimpact/e4m4.wad

221 KB
Binary file not shown.

‎levels/dbimpact/e4m5.wad

239 KB
Binary file not shown.

‎levels/dbimpact/e4m6.wad

330 KB
Binary file not shown.

‎levels/dbimpact/e4m7.wad

725 KB
Binary file not shown.

‎levels/dbimpact/e4m8.wad

227 KB
Binary file not shown.

‎levels/dbimpact/e4m9.wad

471 KB
Binary file not shown.

‎levels/e4m1.wad

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nb_nmare/e4m1.wad
1+
dbimpact/e4m1.wad

‎levels/e4m2.wad

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghostlydeath/e4m2.wad
1+
dbimpact/e4m2.wad

‎levels/e4m3.wad

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dbimpact/e4m3.wad

‎levels/e4m4.wad

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dbimpact/e4m4.wad

‎levels/e4m5.wad

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dbimpact/e4m5.wad

‎levels/e4m6.wad

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dbimpact/e4m6.wad

‎levels/e4m7.wad

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dbimpact/e4m7.wad

‎levels/e4m8.wad

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dbimpact/e4m8.wad

‎levels/e4m9.wad

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dbimpact/e4m9.wad

‎levels/ghostlydeath/e4m2.txt

-25
This file was deleted.

‎levels/ghostlydeath/e4m2.wad

-70.4 KB
Binary file not shown.

‎levels/nb_nmare/e4m1.wad

-275 KB
Binary file not shown.

‎levels/nb_nmare/n_fdlv22.txt

-9
This file was deleted.

‎levels/nb_nmare/nb_e4m1.txt

-16
This file was deleted.

‎lumps/fraggle/freedoom.bex

+9-9
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ HUSTR_E3M6 = E3M6
7878
HUSTR_E3M7 = E3M7
7979
HUSTR_E3M8 = E3M8
8080
HUSTR_E3M9 = E3M9
81-
HUSTR_E4M1 = E4M1
82-
HUSTR_E4M2 = E4M2
83-
HUSTR_E4M3 = E4M3
84-
HUSTR_E4M4 = E4M4
85-
HUSTR_E4M5 = E4M5
86-
HUSTR_E4M6 = E4M6
87-
HUSTR_E4M7 = E4M7
88-
HUSTR_E4M8 = E4M8
89-
HUSTR_E4M9 = E4M9
81+
HUSTR_E4M1 = E4M1: Maintenance Area
82+
HUSTR_E4M2 = E4M2: Research Complex
83+
HUSTR_E4M3 = E4M3: Central Computing
84+
HUSTR_E4M4 = E4M4: Hydroponic Facility
85+
HUSTR_E4M5 = E4M5: Engineering Station
86+
HUSTR_E4M6 = E4M6: Command Center
87+
HUSTR_E4M7 = E4M7: Waste Treatment
88+
HUSTR_E4M8 = E4M8: Launch Bay
89+
HUSTR_E4M9 = E4M9: Operations
9090
CC_ZOMBIE = zombie
9191
CC_SHOTGUN = shotgun zombie
9292
CC_HEAVY = mini-gun zombie

‎patches/rjy/sky4a.gif

3.29 KB
Loading

‎patches/rjy/sky4b.gif

10.3 KB
Loading

‎patches/sky4a.gif

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rjy/sky4a.gif

‎patches/sky4b.gif

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rjy/sky4b.gif

‎textures/combined.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -1935,8 +1935,11 @@ WFALL4 64 128
19351935

19361936
; These textures are only in Ultimate Doom
19371937

1938-
SKY4 256 128
1939-
* SKY4 0 0
1938+
SKY4 1024 128
1939+
* SKY4A 0 0
1940+
* SKY4A 256 0
1941+
* SKY4B 512 0
1942+
* SKY4A 768 0
19401943

19411944
#endif
19421945

0 commit comments

Comments
 (0)