Merge pull request #7 from LocalInsomniac/dev

1.0-ALPHA-RC3
LocalInsomniac · Feb 6, 2023 · 66ee366 · 66ee366
2 parents 088390f + b458a45
commit 66ee366
Show file tree

Hide file tree

Showing 1,474 changed files with 4,123 additions and 1,040 deletions.
diff --git a/animdefs.txt b/animdefs.txt
@@ -589,4 +589,10 @@ texture optional ROCKRED3
 	pic NROCKR06 tics 4
 	pic NROCKR07 tics 4
 	pic NROCKR08 tics 4
-	pic NROCKR09 tics 4
+	pic NROCKR09 tics 4
+
+texture optional M_SKULL1
+	pic NSKULL1 tics 8
+	pic NSKULL2 tics 4
+	pic NSKULL3 tics 10
+	pic NSKULL2 tics 4
diff --git a/credits.txt b/credits.txt
@@ -6,37 +6,38 @@ Created by Can't Sleep
 ==========
 [GRAPHICS]
 
-3D Realms, Lobotomy Software, • Base Graphics
-         id Software, Midway, •
-        Monolith Productions, •
-               Raven Software •
+00_Zombie_00, borogk, Megaherz, President People, Virtue • "AD MORTEM" Enemies
+
+3D Realms, Banjo Software, Lobotomy Software, id Software, • Base Graphics
+			 Midway, Monolith Productions, Raven Software, •
+									   Rogue Entertainment •
 
 Ac!d, RoastBeefo • HUD Graphics
 
-Can't Sleep, David G, DenisBelmondo, • Graphics Editing
-    Enjay, Gifty, horselessheadsman, •
-     KaZudra, neoworm, osjclatchford •
+Amuscaria, osjclatchford • "Major Crisis" Zombie
+
+Can't Sleep, David G, DenisBelmondo, ElectricPulse, Gifty, • Graphics Editing
+	 Hellfire, HorrorMovieGuy, horselessheadsman, KaZudra, •
+							neoworm, osjclatchford, Xaser, •
 
 Captain Toenail • "Forgotten One" Lost Soul
 
-Craneo, Dr_Cosmobyte, Mr. Enchanter, • Mighty Foot
-Ninhil                               •
+Craneo, Dr_Cosmobyte, Mr. Enchanter, Ninhil • Mighty Foot
+
+Craneo, Jimmy, Jimmy91, • "DOOM 2016/Eternal Monsters" Arachnotron
+       LitteWhiteMouse, •
+          Logan McCloud •
 
-         Craneo, • "DOOM 2016/Eternal Monsters" Arachnotron
- Jimmy, Jimmy91, •
-LitteWhiteMouse, •
-   Logan McCloud •
+Craneo, Mike12, Minigunner, Uboa, wildweasel • Angled Pistol
 
-fgsfds, Kinsie, • Menu Graphics
-    NightFright •
+Espi, Ebola • "Scythe 2" Afrit
+
+fgsfds, Kinsie, NightFright • Menu Graphics
 
 gerolf • "Wolfenstein 3D" Helmeted SS Guard
 
-hidfan, Honey16, • "DOOM Neural Upscale 2X"
-         Lollie, •
-    NightFright, •
-    Scuba Steve, •
-           Teder •
+hidfan, Honey16, Lollie, NightFright, Scuba Steve, • "DOOM Neural Upscale 2X"
+											 Teder •
 
 Jekyll Grim Payne • "Beautiful Doom" Zombieman Chainsaw Death
 
@@ -45,23 +46,34 @@ jdredalert • "Angled DOOM" Weapon Graphics
 Nash Muhandes • "Nash's Gore Mod", "Nash's Gore Mod: Vengeance Edition"
               • Gore Graphics
 
+Scuba Steve • Flamethrower
+
 ShallowB • "DOOM 64" Imp
 
 ========
 [AUDIO]
 
-3D Realms, id Software, SD EnterNET, Valve Software • Base Sounds
+3D Realms, id Software, Midway, Monolith Productions, • Base Sounds
+		  Raven Software, SD EnterNET, Valve Software •
 
-Antares031, Can't Sleep, Dynamo, Kinsie • Sound Mixing
+Antares031, Can't Sleep, Dynamo, Jaxxoon R, Kinsie, • Sound Mixing
+				     Nash Muhandes, Yukes Von Faust •
+
+James "Jimmy" Paddock • "Cabin - Shut In"
+					  • "Scattered Evil - Horde of Locusts"
+					  • "Speed of Doom - Unknown Organism"
+
+Nathan "Lippeth" Maxx • "URE 2020 - Tomb Sweet Tomb"
+					  • "URE 2020 - Turning Tricks"
 
 silentzora • "Project: Redux - DOOM 64 Main Theme"
 
 ======
 [CODE]
 
-Can't Sleep, Kinsie • Base Programming
+3saster • "GZDoom Utilities"
 
-Enjay • "Revised Splashes"
+Can't Sleep, Kinsie • Base Programming
 
 Matt • "Hideous Destructor" Monster Movement
 

diff --git a/cvarinfo.txt b/cvarinfo.txt
@@ -28,4 +28,5 @@ server bool sv_ntm_r_mancubus = true;
 server bool sv_ntm_r_archVile = true;
 server bool sv_ntm_r_spiderMastermind = true;
 server bool sv_ntm_r_cyberdemon = true;
-server bool sv_ntm_r_ss = true;
+server bool sv_ntm_r_ss = true;
+server bool sv_ntm_r_custom = true;
diff --git a/decaldef.txt b/decaldef.txt
@@ -92,6 +92,7 @@ generator NTM_Pistol BulletChip
 generator NTM_Shotgun BulletChip
 generator NTM_SuperShotgun BulletChip
 generator NTM_Chaingun BulletChip
+generator NTM_TommyGun BulletChip
 
 generator NTM_ZombieMan BulletChip
 generator NTM_ShotgunGuy BulletChip

diff --git a/gameinfo.txt b/gameinfo.txt
@@ -1,2 +1,2 @@
-StartUpTitle = "Nobody Told Me About id 1.0-ALPHA-RC2"
-StartUpColors = "FF 10 10", "90 00 00"
+StartUpTitle = "Nobody Told Me About id 1.0-ALPHA-RC3"
+StartUpColors = "FC FC 00", "00 00 FF"
diff --git a/graphics/NSKULL1.png b/graphics/NSKULL1.png
diff --git a/graphics/NSKULL2.png b/graphics/NSKULL2.png
diff --git a/graphics/NSKULL3.png b/graphics/NSKULL3.png
diff --git a/graphics/NSKULL4.png b/graphics/NSKULL4.png
diff --git a/graphics/TITLEPIC.png → graphics/NTMPIC.png b/graphics/TITLEPIC.png → graphics/NTMPIC.png
diff --git a/keyconf.txt b/keyconf.txt
@@ -13,7 +13,7 @@ alias NTM_UsePortableMedkit "use NTM_PortableMedkit"
 DefaultBind V NTM_UsePortableMedkit
 
 AddMenuKey "Berserk Pack" NTM_UseBerserk
-alias NTM_UseBerserk "use NTM_Berserk"
+alias NTM_UseBerserk "use NTM_BerserkPack"
 DefaultBind B NTM_UseBerserk
 
 AddMenuKey "Infrared" NTM_UseInfrared

diff --git a/language.txt b/language.txt
@@ -1,3 +1,2 @@
 [default]
-MUSIC_INTRO = "NTMAI";
-MUSIC_DM2TTL = "NTMAI";
+MUSIC_NTMAI = "NTMAI";
diff --git a/mapinfo.txt b/mapinfo.txt
@@ -3,6 +3,8 @@ GameInfo {
     PlayerClasses = "NTM_Player"
 	QuitSound = ""
 	BorderFlat = "AG128_1"
+	TitlePage = "NTMPIC"
+	TitleMusic = "$MUSIC_NTMAI"
 }
 
 Skill Baby {

diff --git a/menudef.txt b/menudef.txt
@@ -119,6 +119,11 @@ OptionMenu "NTM_ActorOptions" {
 	Option "Spider Mastermind", "sv_ntm_r_spiderMastermind", "NTM_ActorOptions_Toggle"
 	Option "Cyberdemon", "sv_ntm_r_cyberdemon", "NTM_ActorOptions_Toggle"
 	Option "SS", "sv_ntm_r_ss", "NTM_ActorOptions_Toggle"
+	StaticText ""
+	StaticText "NTMAi will automatically replace custom enemies from AD MORTEM and Scythe 2.", "White"
+	StaticText "You can disable this option if you want to play with the original enemies.", "White"
+	StaticText ""
+	Option "Custom Enemies", "sv_ntm_r_custom", "NTM_ActorOptions_Toggle"
 }
 
 AddOptionMenu "OptionsMenu" {

diff --git a/music/D_NMAY12.mid b/music/D_NMAY12.mid
diff --git a/music/D_NMAY13.mid b/music/D_NMAY13.mid
diff --git a/music/D_NMAY14.mid b/music/D_NMAY14.mid
diff --git a/music/D_NMAY2.mid b/music/D_NMAY2.mid
diff --git a/music/D_NMAY3.mid b/music/D_NMAY3.mid
diff --git a/music/D_NMAY32.mid b/music/D_NMAY32.mid
diff --git a/music/D_NMAY5.mid b/music/D_NMAY5.mid
diff --git a/music/D_NMAY9.mid b/music/D_NMAY9.mid