Last minute updates to SIGIL II support

res/DEHACKED.lmp

@@ -158,15 +158,15 @@ HUSTR_E5M6 = Unspeakable Persecution
 HUSTR_E5M7 = Nightmare Underworld
 HUSTR_E5M8 = Halls Of Perdition
 HUSTR_E5M9 = Realm Of Iblis
-HUSTR_E6M1 = Baphomet's Demesne
-HUSTR_E6M2 = Sheol
-HUSTR_E6M3 = Cages Of The Damned
-HUSTR_E6M4 = Paths Of Wretchedness
-HUSTR_E6M5 = Abaddon's Void
-HUSTR_E6M6 = Unspeakable Persecution
-HUSTR_E6M7 = Nightmare Underworld
-HUSTR_E6M8 = Halls Of Perdition
-HUSTR_E6M9 = Realm Of Iblis
+HUSTR_E6M1 = Cursed Darkness
+HUSTR_E6M2 = Violent Hatred
+HUSTR_E6M3 = Twilight Desolation
+HUSTR_E6M4 = Fragments of Sanity
+HUSTR_E6M5 = Wrathful Reckoning
+HUSTR_E6M6 = Vengeance Unleashed
+HUSTR_E6M7 = Descent Into Terror
+HUSTR_E6M8 = Abyss of Despair
+HUSTR_E6M9 = Shattered Homecoming
 HUSTR_1 = Entryway
 HUSTR_2 = Underhalls
 HUSTR_3 = The Gantlet
@@ -347,6 +347,7 @@ E2TEXT = You've done it! The hideous Cyber-\ndemon lord that ruled the lost Deim
 E3TEXT = The loathsome spiderdemon that\nmasterminded the invasion of the moon\nbases and caused so much death has had\nits ass kicked for all time.\n\nA hidden doorway opens and you enter.\nYou've proven too tough for Hell to\ncontain, and now Hell at last plays\nfair - for you emerge from the door\nto see the green fields of Earth!\nHome at last.\n\nYou wonder what's been happening on\nEarth while you were battling evil\nunleashed. It's good that no Hell-\nspawn could have come through that\ndoor with you...
 E4TEXT = The Spider Mastermind must have sent forth\nits legions of Hellspawn before your\nfinal confrontation with that terrible\nbeast from Hell. But you stepped forward\nand brought forth eternal damnation and\nsuffering upon the horde as a true hero\nwould in the face of something so evil.\n\nBesides, someone was gonna pay for what\nhappened to Daisy, your pet rabbit.\n\nBut now, you see spread before you more\npotential pain and gibbitude as a nation\nof demons run amok among our cities.\n\nNext stop, Hell on Earth!
 E5TEXT = Baphomet was only doing Satan's bidding\nby bringing you back to Hell. Somehow they\ndidn't understand that you're the reason\nthey failed in the first place.\n\nAfter mopping up the place with your\narsenal, you're ready to face the more\nadvanced demons that were sent to Earth.\n\nLock and load. Rip and tear.
+E6TEXT = Satan erred in casting you to Hell's\ndarker depths. His plan failed. He has\ntried for so long to destroy you, and he\nhas lost every single time. His only\noption is to flood Earth with demons\nand hope you go down fighting.\n\nPrepare for HELLION!
 C1TEXT = You have entered deeply into the infested\nstarport. But something is wrong. The\nmonsters have brought their own reality\nwith them, and the starport's technology\nis being subverted by their presence.\n\nAhead, you see an outpost of Hell, a\nfortified zone. If you can get past it,\nyou can penetrate into the haunted heart\nof the starbase and find the controlling\nswitch which holds Earth's population\nhostage.
 C2TEXT = You have won! Your victory has enabled\nhumankind to evacuate Earth and escape\nthe nightmare. Now you are the only\nhuman left on the face of the planet.\nCannibal mutations, carnivorous aliens,\nand evil spirits are your only neighbors.\nYou sit back and wait for death, content\nthat you have saved your species.\n\nBut then, Earth Control beams down a\nmessage from space: "Sensors have located\nthe source of the alien invasion. If you\ngo there, you may be able to block their\nentry. The alien base is in the heart of\nyour own home city, not far from the\nstarport." Slowly and painfully you get\nup and return to the fray.
 C3TEXT = You are at the corrupt heart of the city,\nsurrounded by the corpses of your enemies.\nYou see no way to destroy the creatures'\nentryway on this side, so you clench your\nteeth and plunge through it.\n\nThere must be a way to close it on the\nother side. What do you care if you've\ngot to go through Hell to get to it?
@@ -376,8 +377,8 @@ M_EPISODE1 = Knee-Deep in the Dead
 M_EPISODE2 = The Shores of Hell
 M_EPISODE3 = Inferno
 M_EPISODE4 = Thy Flesh Consumed
-M_EPISODE5 = Sigil
-M_EPISODE6 = Sigil II
+M_EPISODE5 = SIGIL
+M_EPISODE6 = SIGIL II
 M_WHICHEXPANSION = Which Expansion?
 M_EXPANSION1 = Hell on Earth
 M_EXPANSION2 = No Rest for the Living

src/c_cmds.c

@@ -4843,7 +4843,7 @@ static void mapstats_func2(char *cmd, char *parms)
     else if (M_StringCompare(wadname, "SIGIL_v1_21.wad")
         || M_StringCompare(wadname, "SIGIL_v1_2.wad"))
         C_TabbedOutput(tabs, INDENT "Release date\tSeptember 10, 2019");
-    else if (M_StringCompare(wadname, "SIGIL2.wad"))
+    else if (M_StringCompare(wadname, "SIGIL_II_V1_0.WAD"))
         C_TabbedOutput(tabs, INDENT "Release date\tDecember 10, 2023");
     else if (D_IsDOOM2IWAD(wadname))
     {

src/d_main.c

@@ -829,7 +829,7 @@ bool D_IsSIGIL2WAD(char *filename)
 {
     const char *file = leafname(filename);
 
-    return (M_StringCompare(file, "SIGIL2.wad"));
+    return (M_StringCompare(file, "SIGIL_II_V1_0.WAD"));
 }
 
 bool D_IsDOOM2IWAD(char *filename)
@@ -1017,6 +1017,9 @@ static void D_AutoloadSIGILWAD(void)
 {
     char    path[MAX_PATH];
 
+    if (sigil || sigil2)
+        return;
+
     M_snprintf(path, sizeof(path), "%s" DIR_SEPARATOR_S "%s", wadfolder, "SIGIL_v1_21.wad");
 
     if (W_MergeFile(path, true))
@@ -1064,10 +1067,10 @@ static void D_AutoloadSIGIL2WAD(void)
 {
     char    path[MAX_PATH];
 
-    if (!sigil)
+    if (!autosigil)
         return;
 
-    M_snprintf(path, sizeof(path), "%s" DIR_SEPARATOR_S "%s", wadfolder, "SIGIL2.wad");
+    M_snprintf(path, sizeof(path), "%s" DIR_SEPARATOR_S "%s", wadfolder, "SIGIL_II_V1_0.WAD");
 
     if (W_MergeFile(path, true))
         sigil2 = true;
@@ -2327,7 +2330,7 @@ static void D_DoomMainSetup(void)
                 autoloading |= W_AutoloadFile("SIGIL.wad", autoloadiwadsubfolder, false);
 
                 if (autoloading)
-                    autoloading |= W_AutoloadFile("SIGIL2.wad", autoloadiwadsubfolder, false);
+                    autoloading |= W_AutoloadFile("SIGIL_II_V1_0.WAD", autoloadiwadsubfolder, false);
             }
 
             autoloading |= W_AutoloadFiles(autoloadfolder, nosigil);

src/f_finale.c

@@ -1033,6 +1033,9 @@ static void F_ArtScreenDrawer(void)
                 break;
 
             case 5:
+                lump = W_CacheLastLumpName("SIGILEND");
+                break;
+
             case 6:
                 lump = W_CacheLumpName("SIGILEND");
                 break;

src/g_game.c

@@ -1252,7 +1252,7 @@ int pars[10][10] =
     // [BH] Episode 4, 5 and 6 Par Times
     { 0, 165, 255, 135, 150, 180, 390, 135, 360, 180 },
     { 0,  90, 150, 360, 420, 780, 420, 780, 300, 660 },
-    { 0,  90, 150, 360, 420, 780, 420, 780, 300, 660 }
+    { 0, 480, 300, 360, 240, 510, 840, 960, 390, 450 }
 };
 
 // DOOM II Par Times

src/m_menu.c

@@ -4431,12 +4431,8 @@ void M_Init(void)
         NewDef.prevmenu = (nerve ? &ExpDef : &MainDef);
     else if (gamemode == registered)
         EpiDef.numitems = 3;
-    else if (gamemode == retail && sigil2)
-        EpiDef.numitems = 6;
-    else if (gamemode == retail && sigil)
-        EpiDef.numitems = 5;
-    else
-        EpiDef.numitems = 4;
+    else if (gamemode == retail)
+        EpiDef.numitems = 4 + sigil + sigil2;
 
     if (EpiDef.laston >= EpiDef.numitems)
     {

src/sounds.c

@@ -84,15 +84,15 @@ musicinfo_t s_music[] =
     { "e5m7",    "e5m7",    "Watching You",                    "Far 5",                           0, 0, 0 },
     { "e5m8",    "e5m8",    "Easel",                           "Poseidon 4-6",                    0, 0, 0 },
     { "e5m9",    "e5m9",    "Adrenaline In The Blood",         "Fastpass",                        0, 0, 0 },
-    { "e6m1",    "e6m1",    "Hate Machine",                    "Romero One Mind Any Weapon",      0, 0, 0 },
-    { "e6m2",    "e6m2",    "You Ain't The Boss Of Me",        "13th Floor",                      0, 0, 0 },
-    { "e6m3",    "e6m3",    "Quell The Beast",                 "Buildor Part 2",                  0, 0, 0 },
-    { "e6m4",    "e6m4",    "Riot Squadron",                   "The Patrolman",                   0, 0, 0 },
-    { "e6m5",    "e6m5",    "Alice",                           "Cold Frost Part 6",               0, 0, 0 },
-    { "e6m6",    "e6m6",    "Besieged City",                   "Melting Man Part 2",              0, 0, 0 },
-    { "e6m7",    "e6m7",    "Watching You",                    "Far 5",                           0, 0, 0 },
-    { "e6m8",    "e6m8",    "Easel",                           "Poseidon 4-6",                    0, 0, 0 },
-    { "e6m9",    "e6m9",    "Adrenaline In The Blood",         "Fastpass",                        0, 0, 0 },
+    { "e6m1",    "e6m1",    "Nightmare Overture",              "n/a",                             0, 0, 0 },
+    { "e6m2",    "e6m2",    "Sleep Of Reason",                 "n/a",                             0, 0, 0 },
+    { "e6m3",    "e6m3",    "Cathedral Rock",                  "n/a",                             0, 0, 0 },
+    { "e6m4",    "e6m4",    "Fractures",                       "n/a",                             0, 0, 0 },
+    { "e6m5",    "e6m5",    "Hexaphobia",                      "n/a",                             0, 0, 0 },
+    { "e6m6",    "e6m6",    "Walls Of The Minotaur",           "n/a",                             0, 0, 0 },
+    { "e6m7",    "e6m7",    "The Impenetrable Dark",           "n/a",                             0, 0, 0 },
+    { "e6m8",    "e6m8",    "Final Impact",                    "n/a",                             0, 0, 0 },
+    { "e6m9",    "e6m9",    "I'm The Doomguy With The Gun",    "n/a",                             0, 0, 0 },
     { "inter",   "inter",   "Intermission From DOOM",          "Triceratoptron",                  0, 0, 0 },
     { "intro",   "intro",   "n/a",                             "Eye On Spiral Part 1",            0, 0, 0 },
     { "bunny",   "bunny",   "Sweet Little Dead Bunny",         "Sweet Little Dead Bunny",         0, 0, 0 },