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 0000000000..50321440db
--- /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 0000000000..2244eceaee
--- /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
zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq005@|000mO0{{R3L<gS}0000mP)t-s0000(
z002h-08an_TL1uy006T90Gj{+%K!j>006%L0CNBUrvL!g0083v0A~OIJ{u_?00001
zbW%=J06^y0W&i*Jmq|oHRCwCem0N=BDhNeGx`NVTnE!0=1|QM789*ODs)!;idFXNc
zBZJPLpOZrPe17Qfa$d|SI8)B)4|7UNos)m%4|5i|0*@}`5}fokj%V_F^QLlax^HT<
zO?-L!zvIyF0+p0HXNxD1u;$F1(@BMEuZ2Z?+)KWFur!PJ-4B}X`_Wwu_KBpmX6Qn(
zhJ{*deAfQK(3$mE-EreQ&l3w3oMcJ0STPeLGEwWCk2w6>4O7XiD1O}wbIS<n&69I8
z*e4_vW9)%*Ng`f)3{Wyty|aq>l8kzcJX5(YXyyE?5ilIy!_$YAGC8L>0BUAyS}@={
zm02CsIcKSF1|u;EN>EN^NiYaB1g_|2A2ZL%_qTY$59{TeRCMFChtqaW6v7A^dNEuh
zo~kXKlXExN;^QFTl#R1z8NAw$(-nH20a-pDvyTL)2PH<us;8(7&M9_)v~U)zfhY!~
zbmz&r8EnTZgsl<JR*-kDsNYr;+)Ktek#W@V$g^+o`jp?ssYsq7dSXxTk7E&EIHBHB
zf!!!H-8dJ6u?-0pYk9{9{!xmroCPZwqaL*te~TxMyX0L|M&2KBa%LT87@Ua;nw9Iq
zxf$%?bjy)eZ@nl+)Oyc*?ZPbJ$vN(&c#n{ZymBU!Z*le!jK_pZiH>A%fwFV%2IFh#
zCeHx1p3I{@yRgUaXb0<kdHKC0nRBgiKpa>EQuN{!p9`n57Z;}z_mXiOv|#sL?NM6|
z#{JVcdF6yc6L8b&h^H*?Ir`Ybre8dtxaV=Hd1FM3u#7L?v53zF?uYcNF<ukHwb%{l
z@+7PVsXx;0&FdeN9R`(1{TXipCTtce+@C}zZ4cwiv-K^$y_>uA`n<mRpw0Os>|Fl=
XTnQukgKc!=00000NkvXXu0mjf-`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
zcmV-(1dRKMP)<h;3K|Lk000e1NJLTq009jE000mO0{{R3JM-Gh0000#P)t-s0000(
z001W^C(8f;X8-^%FE4)p0CNBU*8l*g003J60RI30n*ac_006%L0E++sPXGYp002h-
z05>-`?*IVw5$9C^0004WQchC<K<3zH000BxNkl<Zc-rk&i<ToP2#u=)n#G<}cK`od
z_X1L-R%d>o*E452A<E;z1s;$8&vH^q@ppXs!RN1>%P&KNa;9HD91X6yJq?Zaca<Mr
z97%fn`u#FAj{ZBHoLPC3=Cg~opZ|0<-3@$m|2u`JaJT(fe)()G9NpT&@_VAzd!x6b
zLH2<1p$FeC@8qZ^thKUxM!n_SdzLqzX2@%AU5HbXI&SuGwsaho$=$$BwcERNAYt8#
z7Q#?)+4k$)qpp+WEb2q0G}2vLa_J)-2M_6SxT+#hZ{Cxl0Y6*A9b7O$Ibd8$;fDWD
z?^sBPNbpvDh7vp~Tnd$>!Qw$-=GR-lme!8ksFV{8k!G*?ZeUkEUR*j7<2Og6_1$({
zr#3z(Xwo<EM<waSfG!Ow0`Hzoq+U!Fl~*YOAIN-ZdZhdVG_s;mb1zmmidwo=uJqg-
zL^@@p$y-jZS*AjUIe0OuaWk;1KJA4Lz$N5p^hh9WOhG0B4Mb*;6_Wrbh0>)?1chS|
zAvK{gGX-eiM(<BY12xy9=13Z+I~p1}w-t>ni+c%iwX5xT+=KkPflc-GD0Da)excH4
z`z)ms4MK?;8pXoanoC2v6G8o=d2qOH$%m9~XvpL&(}{-j_{bG}9o@!`($kotonrv6
zksM24B-%DwBzQ5fsh-dnIus3Xq+<AKcUWzoaEGhIYsH6+waiveX3B}6DHy3Y?p|#e
z7rrEwT)%R?q2chx=xGAQ5@<9;uJ}9MkQ$f+0ln4S&@jmPhK3s0RDX{KGK<zi1C7~s
zw6#bwl#){fFH*$dQcFEvqdm0^jb>dHg{xIg$ZMbx<ke0zq0z0@v7Q)H`ckd&DN+Q^
zFKB=$6inF-Y^o<Th7N=;JQ!K;wg=pF_6_geS{1lFAakjrA+U1>%Y6(AEl?XFipJxu
zmHw|y3sj^zmm2Xk@f1{Zt@@~vn(4k2Txi&>sWz^!yMbNx)Hm`#V-V2MSZ$vMqzsva
z4+xzxQN}p3+3%_6K;x0J6z`(sXt3Cp@j@}@{xk|!T@8>Yo+j++GEmc*QYd$A6;>(A
z{H(N&p^OD2w*`%B&D{;`s?SHELqi=i#WOM6jwX)@iSJoAiypV(7Djn=E3pP=3K*}C
zT5Q6C-T0hGZ9GReem_C{x9?Tx!=&?k+P=t|kqt2N9Zg3xd#h&c8QM8$baw6JQ?tee
z;c3rY4BS*-t#^dQ<TMDH&$dsUhze@8`lF<6>{1z%Or<(*LqYSJNiSVDaMO38Wrf|w
z>AsnN*pBbJ_4fSZp8rAhX7Ziz?~j}L&7E2DX<xs;`wuq%HZ|bgzUKe{002ovPDHLk
FV1hBG5Gw!x

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
zcmV+p1o8WcP)<h;3K|Lk000e1NJLTq007ni000mO0{{R3U5s(H0000vP)t-s0000(
z0046U0E++sX8-_y005@|0OJ4v?*IVH006T90M`Hjn*ad6002h-052O0LqkJP003J6
z06OkecK`qY0d!JMQvg8b*k%9#1A|FKK~#9!?N;rQ+aL@KG9N)G?&aS9VY@4^jp<#d
zKiipdH%Y(}Xwk0Z$K(I_n@6~YPi2!Zp2QTxKMO0DQl8Ie)kF+In;x)|*}n@b#cfkF
z)faIEQ)1b7W^0!#k6}&gGR~zhiSV6QSd7Q7Yvn7SWvkPF_BtNcR`rDSqt+jQ6;r_6
zapFO1hH0(lUePQ!jJ%p$aVE{Rs#e>vyPJRum7Bm194VSl!UyhFISr-s)nKK-Ddfs?
zG^-_<0!X#^9;stry~b$mb;9~kZ1NF=uw+mX=PGth$so88bHp(5lkO%5s%SY&lt_gF
z2%-u>b2B=`l(OOPu!nIniE7a=sjosF^oh7MoFyXfJzfD6EMr}=`F!!h7lc)w?bTW*
zAwmSS?X?9F!ZPckgCmnChzpYx-zN+1CMUVw{uq{%BBE?EaY?IYcNELKGJl$~_AD~M
z#GDh{wNVcM+=@O2YmkoB>k&46mQA-UkI;a=ZTQq(wgZ;$r;Uf;*0|SHBo~uoF;B3(
ztR}*eiT9x%umCqWtPVqS_PZOfs!jX!0A%pq3!7ib-HW%{o|6#mg<1$yTa+|lfm`4`
zK8&zPJ2K`5Yce^K1z0{h3xEsBPlpCe!GG1-)g&Yk0`+W3_CXnynmP%ouAYq%fK9M`
zVeulYs#8IN${}kif_!&a!hllhuv{v?z?w`>SQ&9p6g{!w&7U1sveNJzC}og0`_2Ov
z?_HaKP97iyiqH`crPl+PVPW4dyn=0Woz41cHSW7ehm{UFbXZ_tBnjgL>uz#j)jJ8*
z-ZAy=0nyen^#xBB-JQ(B;v&pW^8ioI#$E|M0MnWWEIDBP>NWM6O>0qft#=|5y-N2h
z9k94J?iY7=O5|>GY-FuYC8Hp}?<iJWM51-NNmx#WLtIO81bB@Bs|V27k2o^K#+2T@
zR#=Zul-<Z5)OdV!9sA+cTaI!XSl*$*R@t}iCTD?9&`#s=a4Xq*mUD4p>&1H(8X2&d
zwa5T5fp2Nv8=yk!)=T*rfHf_YCn}>C{JR%vmv65~pP&0U@6A^YXeNe3LF`e|iy5S1
zY$o2?W|ONOqpMNR;u7~K{AMd+qrYH{ceLO##C3F2CeI_KuBfg=JzoJNa+ZB@6xy2?
zsguI;?mPVmd%*wiU!LwJfBN!tvwD1U!m`Qoj<rrMuZ4s^0fSm78_L_F>i_@%07*qo
IM6N<$g7AIS@c;k-

literal 0
HcmV?d00001

diff --git a/wadsrc_extra/static/iwadinfo.txt b/wadsrc_extra/static/iwadinfo.txt
index f9c1679bcd..1e500e1a39 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"