From e8c69d27573f1990e3c914a373ee357ce748c769 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Sun, 19 Jan 2020 20:01:06 -0500
Subject: [PATCH] - add support for xbox 360 versions of Doom/Doom2

---
 wadsrc/static/mapinfo/doom2xbox.txt           |  40 ++++++++++++++++++
 wadsrc/static/mapinfo/doomxbox.txt            |  25 +++++++++++
 .../graphics/m_epi1.png                       | Bin 0 -> 793 bytes
 .../graphics/m_epi2.png                       | Bin 0 -> 1139 bytes
 .../graphics/m_episod.png                     | Bin 0 -> 1038 bytes
 wadsrc_extra/static/iwadinfo.txt              |  36 ++++++++++++++++
 6 files changed, 101 insertions(+)
 create mode 100644 wadsrc/static/mapinfo/doom2xbox.txt
 create mode 100644 wadsrc/static/mapinfo/doomxbox.txt
 create mode 100644 wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi1.png
 create mode 100644 wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi2.png
 create mode 100644 wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_episod.png

diff --git a/wadsrc/static/mapinfo/doom2xbox.txt b/wadsrc/static/mapinfo/doom2xbox.txt
new file mode 100644
index 000000000..50321440d
--- /dev/null
+++ b/wadsrc/static/mapinfo/doom2xbox.txt
@@ -0,0 +1,40 @@
+// MAPINFO for Doom 2: XBox Edition
+include "mapinfo/doom2.txt"
+
+clearepisodes
+episode map01
+{
+	name = "Hell On Earth"
+	picname = "M_EPI1"
+	key = "h"
+}
+
+episode level01
+{
+	name = "No Rest for the Living"
+	picname = "M_EPI2"
+	key = "n"
+	optional
+}
+
+map MAP02 lookup "HUSTR_2"
+{
+	titlepatch = "CWILV01"
+	next = "MAP03"
+	secretnext = "MAP33"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 90
+	music = "$MUSIC_STALKS"
+}
+
+map MAP33 lookup "HUSTR_33"
+{
+	titlepatch = "CWILV32"
+	next = "MAP03"
+	secretnext = "MAP03"
+	sky1 = "SKY3"
+	cluster = 5
+	music = "$MUSIC_READ_M"
+}
+
diff --git a/wadsrc/static/mapinfo/doomxbox.txt b/wadsrc/static/mapinfo/doomxbox.txt
new file mode 100644
index 000000000..2244eceae
--- /dev/null
+++ b/wadsrc/static/mapinfo/doomxbox.txt
@@ -0,0 +1,25 @@
+// MAPINFO for Doom: XBox Edition
+include "mapinfo/ultdoom.txt"
+
+map E1M1 lookup "HUSTR_E1M1"
+{
+	levelnum = 1
+	titlepatch = "WILV00"
+	next = "E1M2"
+	secretnext = "E1M10"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 30
+	music = "$MUSIC_E1M1"
+}
+
+map E1M10 lookup "HUSTR_E1M10"
+{
+	titlepatch = "SEWERS"
+	next = "E1M2"
+	secretnext = "E1M2"
+	sky1 = "SKY1"
+	cluster = 1
+	music = "$MUSIC_E2M1"
+}
+
diff --git a/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi1.png b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf057b942e983ced981f8f1838fffd72e1e0be31
GIT binary patch
literal 793
zcmeAS@N?(olHy`uVBq!ia0y~yU|7z;z#zcE%)r3l!aiS^fq}swz$e6&fq}u9fx(@D
z!JmO4nt`F4fnhTP!)ykI(+mvt3=I1j7>dC<uQM<_W?)EXV6c<clxJXIU@Qsp3ubV5
zb|Z~}foZy@i(^Q|t*cX`o8D+~xH|7@x|B5If6jY0`HQ<G9pvp-btvgnz9{^o+<b2S
z{K-x~YU*CRFN!;(X%T$xC4aG(*WAhVPx*_*b~5$rJr$bs#k4Q|Q}yR%MLE0jv$puw
zRQ}rk_`-XpsZ*@dyVWOdcy?yaWzW{^^{uWocf9x2ZZPToewTmNyWbaMdB1fo*_!sk
zX=7V!RCdj^e+Mtj{2Fn$@UhK#VQ$emDV|#+426}A0$<PRxA=3LH~8cljk>$s#iu!5
zo}FB5d_!GDH2F<qv8Pg86;FUs@ZQZ`KPUB6_1FaO)XRAKXSJY#%)P^x+ou{?F1KLF
zO3RKicwjv>Quc~v`pSGZWkXJ{0KZgE0}d0GbuZH7jnAL_zP;iQ|Ldo7LP{QQX}?_N
zCvu2Gs>(1%dEP4Bxs!{{Z#;Ue@L)>s=5)zDxB4%OR?TCKw3FZ5&$66d)$Qo2<tup3
zX_hr?DG*!JsKK_R<oU^+k~zn<Th<Dm51UZFZpHmDkvrbUEGHIT`FLV;{)b;v?jKv}
zF;B57$^S!tvS7T$!h1oDcQs7zT8KAq<mD90t~}2EFR*L<99C_K#d2Fk>$}zac0Y*?
zal0p9Sd=E4E-|N*Yu41)hjvQ7d029KVp#rO4Yw;*=d0fy(s^*w^4-#k{s~=siqt0O
z7k(4$Io{&c*_V>vxT*LZ+vDt)YUdfY&O5W%Zuf@c?=#q6*H-@At1`2AZJ~oq1WVAD
zM<VmNmv0gmUoP~0QlZS2gzvF$1EYD5{k?2a`LxAJxZv`uj^#S<Eq~oOv@G6c{*LE`
zD=U*-dN%av-{07Ap7mY(m(_-G!iTrs;C=B)WewX(`%CZ6zLuXX%Qn^HuVg-xT8^03
zo%t^6x%`h$Z~m&gZ}05gUw-Y`_jAG7pUQ7y{ximKD*tNEEqTJgz`)??>gTe~DWM4f
D-`i-1

literal 0
HcmV?d00001

diff --git a/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi2.png b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e1bfe02d88d0108a3517047b8c8b4822e55c39
GIT binary patch
literal 1139
zcmeAS@N?(olHy`uVBq!ia0y~yVB}?BU=ZM7W?*2j{(S2+0|SG7fKP}k0|SFI1B1G{
z`e_D+bOr`}ef@d{hGGVW>kJIb85p7&82&Rb%w}NN%)qdpfuWm$!JmQQF$04;1B1D_
z`FjS2FM`iQ85kHCOM?7@862M7NMm4Ne&p%m7*cWTZCLj-WlfIW)y%Vw&I>8~|3CUW
zQ_#||^tuJtjnl0ZPdz@wD%b!2d{L0s$MTwA2cNH>b6VfIxoBCuy$tWVowmHa-^!=T
z$H{nB{r>gW$fWO|_1rm;m6M-s?%p>4e~IZ`-kRe7)~(A6w*QT&`<bIHbNAMvPt}XA
zRWIJY*zsG#r-khI_1-^Op|)o0rfRpnPw!MuGoP1sB0E2}BY2Wk-nW8nB{EY_-aX*E
z_4e)(g~YpEVuu0>Zhm`xXYsnpPjp^6FEzOo8(s8LS(csuW#NuhN&)%zCNE;Nk3K9L
zW8i3+5aac*?Z5x~2#*er4`H=!LN;14TvL}EeB_w;?0WS6Y1jJhte7IqJ27qj&%A_i
z+qf7jp~vR#i@)A2i&<`Fr=D@i{DZsd%cBi?yqZk!=lLv&^AVjIuE`{Sq9(Iy$scBu
zO^X7H^~21&qIQL@`*KId#VU2l$!Ndzk;|OgEGrCG6&i0?ZTGg7?||x)j4vJvxjv3+
zOuQ~>6GSI7sJC8P>c`TWETCw*(8!oI<AK|Ie|Kin>x-XxNG-RPlCs<`+N;xD%~`m0
z_1lU&&3|?``hNYYQDPxgxA0QhZ=I#WyiT1`Qb!M6o8|4iOW5)6qRN6Dc_-Va<Yk<A
zqI0>k?emWlqBXL2kM&);JY&(^WQO$<WxNwqZka`?R2XhpIq!mml?ZRalB6G*<q^5_
z3))v7&OX}SyY)<%f7+?e1)35o&ELi4N{H`MnHsadXz#*@ACA4qWI8I8VdApxhxOeF
zQZtwt_g=ko!QjNtwl=97A@%)iM%~w(n0s%QZQ1H!G-XmSi+<3N2SMJpaf@xY^7f|1
zingu}^*fQhK=8>`Ka+(Q*IwH=Pa^nN(AtlhK`iI=Ga58Rd~WjQtWq~=<7?5kk%)Z1
zjr~r^H{SR6qC|JtC={<;q`0A&?Q|^<mu`TxV%M?9Yp4EO@5>#s#B#dSN7IiYA;oKd
zt(Y|H<vx*^j2mlLnyp*EyD|3b74uIH$pRNHM&!<CTf#H5g`Z=tVc;=~O*h}KeD3gg
z;wF*zi=Jd`xH0Xcli~A!CR|~$yc5*tsl9n=6mWTFkVbi~Xqe`yKWn!1E$m@c+0NRV
zefBQzn^ouC7dku38Xq+_yxphP&)NAt(!5)4`$I9e$`b93Z0TGQ>-(c}4mI8VF~>dE
z#@)Qm-to`&_n|KiFZo<^Yu|}k6L}3j$@;pRRIg5ZD|yQ@qonNZli<zASRZDdkKwr!
z62G>*<>(U=j#=lo`Ood(%G&yC@siv(L6VbwmRjXGJAR(!sUK@zaJhV8YU|x&FZa!?
zztQ)8_t$TK9?$#l_%-d*+z;>jXa77qH}X?v{QmvF`OW^DnLfC??>Pel1B0ilpUXO@
GgeCwnrVuLt

literal 0
HcmV?d00001

diff --git a/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_episod.png b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_episod.png
new file mode 100644
index 0000000000000000000000000000000000000000..a62c58c5f861687afd05ebe7d70d2472b9e1b6e0
GIT binary patch
literal 1038
zcmeAS@N?(olHy`uVBq!ia0y~yV7SJ>z#zcE%)r19+f%refq}s?z$e6&fq}u9fuWdz
zp__proq?gAfnhlV!(#@9_Y4fD85lM*FkEL~n9abjpMk-hfk9uI+u7OKpMfEofx+rs
zNI3%o17k^$UoeBivm0p)49v}*E{-7;x88=mopf7)hsQ|XQRCgyd;b%6Yj5a%8N1y6
z_RJ!4&jUgk7uP*G{`mio+3q{q{8J|z%sV1-*q&Q^deFS{=~rEN9B0dIm~?YLxAxK8
zVB@Reg{;9zH_Owqr)&2o`o1<gw^YCL!`$$Qp5yDYpK8xfU46O!o0Z(Pu&*s&7hjWa
z5Dh+Xr|^+uc3bA!XK@#G%zO6CiYZh(yLDCA?Tx!<H*im#eSlv^bC&-h_IF{Hyi31a
zO;~zB^U0}Vlhvv-nLM`skXxA?zxP<i+tNe70&+eHwrofV5PYsx=6h0Mhd}WWgO8Kn
zsj;uhu=Jkd(aOZJh|96q*y_lXO%LC1XfHJC%(|$*a=nw>m(Cp~b5xby+r}}9=p@H(
z`dRbwka$bzyth}Q)D@jrw!GcSDtO4~^`d6w$?6^4lSS^UbH7tl-+A|+#I(sui*k$#
zJy)ldi=5tLR6lFeHyxt`N9G9M*&4{taHq?TJ$pjm)z^Y%wbOjJ>-Jx0*q8g`O6)e~
zY44Z!wm-PG<9djS_~c|m{|$TAs2!Tr`F)|>1_pDBHGIy+-*!uHSmpcs3q#6>d)%|*
zPu}g`erw)jfw!$u93jzDOcENSAK2RUZ1Au)dd8M*WI2g7!p@4jf%~L?JDc~x`m49D
zs;CGsea-Rw<|sLJmKEp9b@O@!8+<p^Bz{y{vntrJ>6Bu&R#Q!R#G!_uR~urq_8*w#
z;};=W7$9Q1@!{F|vSFJpeUQ;eonZd^9JAQ_*x3z!atf?n7X<m2UT2<>n0Q}*Pg8F3
z+_S&3OyBMHXrIbwSrU;DufqA5<#k?B!c}X|tM?4QzGJ+2&FCwuzu4WmXAV75I^*}5
z!T;Q`I8IxJ%d^;ZEEE2|GW|NsH#@LoZMl;0Ua#-kvKw}ozY{Mn_j;07l#{a7Pj#`v
z{`VSTF)oWrcX>wmwK~Um7qL|IGOlL7aHHSC=*Y1t_x6TG^!rb_dqVz7MNNt9?}t~T
z`--F@?kzkRc60kXwe&{+3x1D37HHqBnpRwx^!jMEn3Uv(8Cy><7&hi--jiP7^y-@T
zPss*T-6`r?i^c!!7SEiXzusg1{NEPu&xZ46sI@sez6re4Ex9BqNA2FNw8^Vw7q1RH
z|48V&`kyrIq{aIadds&wFgj9N60CM!dFi?p>s)N(8C8m=)fS4}nk~L^@}W=ftp9RU
zANc=1e%?E^`d^<)HdoaYAKG;CQ{PrUz4fgv_KeL@8q%k3FM7?uz`)??>gTe~DWM4f
D@O{<s

literal 0
HcmV?d00001

diff --git a/wadsrc_extra/static/iwadinfo.txt b/wadsrc_extra/static/iwadinfo.txt
index f9c1679bc..1e500e1a3 100644
--- a/wadsrc_extra/static/iwadinfo.txt
+++ b/wadsrc_extra/static/iwadinfo.txt
@@ -364,6 +364,22 @@ IWad
 	IgnoreTitlePatches = 1
 }
 
+IWad
+{
+	Name = "DOOM: XBox Edition"
+	Autoname = "doom.id.doom1.ultimate.xbox"
+	Game = "Doom"
+	Config = "Doom"
+	IWADName = "doom.wad"
+	Mapinfo = "mapinfo/doomxbox.txt"
+	Compatibility = "Shorttex"
+	MustContain = "E1M1","E2M1","E2M2","E2M3","E2M4","E2M5","E2M6","E2M7","E2M8","E2M9",
+		          "E3M1","E3M2","E3M3","E3M4","E3M5","E3M6","E3M7","E3M8","E3M9",
+		          "DPHOOF","BFGGA0","HEADA1","CYBRA1","SPIDA1D1", "E4M2", "E1M10", "SEWERS"
+	BannerColors = "18 18 18", "a8 a8 a8"
+	IgnoreTitlePatches = 1
+}
+
 IWad
 {
 	Name = "The Ultimate DOOM"
@@ -493,6 +509,22 @@ IWad
 	IgnoreTitlePatches = 1
 }
 
+IWad
+{
+	Name = "DOOM 2: XBox Edition"
+	Autoname = "doom.id.doom2.commercial.xbox"
+	Game = "Doom"
+	Config = "Doom"
+	IWADName = "doom2.wad", 1
+	Mapinfo = "mapinfo/doom2xbox.txt"
+	Compatibility = "Shorttex"
+	MustContain = "MAP01", "MAP33", "CWILV32"
+	BannerColors = "18 18 18", "a8 a8 a8"
+	IgnoreTitlePatches = 1
+	Load = "NERVE.WAD"
+	DeleteLumps = "M_EPI1", "M_EPI2", "M_EPISOD"
+}
+
 // Doom 2 must be last to be checked because MAP01 is its only requirement
 IWad
 {
@@ -522,6 +554,8 @@ Names
 	"doom2bfg.wad"
 	"bfgdoom.wad"
 	"doombfg.wad"
+	"doomxbox.wad"
+	"doom2xbox.wad"
 	"doomunity.wad"
 	"doom2unity.wad"
 	"doom2f.wad"
@@ -567,6 +601,8 @@ Order	// Order in the IWAD selection box
 	"DOOM Shareware"
 	"DOOM 2: BFG Edition"
 	"DOOM: BFG Edition"
+	"DOOM: XBox Edition"
+	"DOOM 2: XBox Edition"
 	"DOOM: Unity Edition"
 	"DOOM 2: Unity Edition"
 	"Final Doom: Plutonia Experiment: Unity Edition"