From 86d4da230b173f6086552f5599b880d11079f841 Mon Sep 17 00:00:00 2001 From: Georgy Samoilov <160278208+GeorgePieVG@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:52:46 +0500 Subject: [PATCH] lumps: umapinfo fixes (#1454) Using endbunny instead of endgame in E3 is mandatory to fix the crashing in dsda --- lumps/p1_uminf.lmp | 36 ++++++++++++--------- lumps/p2_uminf.lmp | 78 +++++++++++++++++++++++++--------------------- 2 files changed, 63 insertions(+), 51 deletions(-) diff --git a/lumps/p1_uminf.lmp b/lumps/p1_uminf.lmp index fa7edf18..4baed95f 100644 --- a/lumps/p1_uminf.lmp +++ b/lumps/p1_uminf.lmp @@ -92,23 +92,24 @@ map E1M8 ParTime = 60 Endgame = true InterBackdrop = "AQF051" + InterMusic = "D_VICTOR" InterText = "Free at last from that dreadful outpost!", "But you're still stuck on this rock\, with", "AGM and all their monstrous \"experiments.\"", "Best not to dwell on what evil horrors", "they were going to create from you...", " ", - "You need a functioning starship to", - "get back to Earth. The best chance at", - "one is the facility they had you in", - "when they first brought you planetside.", - "When they first gave you your powers.", + "Damn alien teleporter ate your gear.", + "The air is hot and muggy\, and smells of", + "strange\, intoxicating vegetation. You see", + "what looks like AGM corpo tech patched", + "over old\, overgrown alien structures.", + "Nothing close to the tech needed for this", + "existed at the outpost\, meaning there must", + "be a starport nearby. To Earth. To freedom.", " ", - "When the nightmare first began...", - " ", - "Perfect time for the teleporter to", - "glitch out your gear as you get ready", - "to raid the Military Labs." + "Just gotta hope that ship will launch", + "from these routed\, infested ruins..." } map E1M9 @@ -131,7 +132,7 @@ map E2M1 Music = "D_E2M1" SkyTexture = "SKY2" ParTime = 120 - Episode = "M_EPI2", "Military Labs", "2" + Episode = "M_EPI2", "Ruin Upon Ruin", "2" } map E2M2 @@ -211,6 +212,7 @@ map E2M8 ParTime = 120 Endgame = true InterBackdrop = "AQF054" + InterMusic = "D_VICTOR" InterText = "The massive brutes collapse onto the", "ground\, falling apart bit by bit.", "The starport is yours.", @@ -327,8 +329,9 @@ map E3M8 Music = "D_E3M8" SkyTexture = "SKY3" ParTime = 60 - Endgame = true + Endbunny = true InterBackdrop = "FLAT5_2" + InterMusic = "D_VICTOR" InterText = "The abomination explodes into oblivion.", "What the hell even was that?", " ", @@ -455,7 +458,8 @@ map E4M8 ParTime = 0 Endgame = true InterBackdrop = "AQF075" - Intertext = "Suppressing fire echoes above as the last", + InterMusic = "D_VICTOR" + InterText = "Suppressing fire echoes above as the last", "survivors flee the ship. The launch process", "is irreversible: killing you now would only", "bring a slow death drifting through space.", @@ -469,7 +473,9 @@ map E4M8 "you think of Earth as she lifts off.", "Hopefully AGM won't find you there:", "they've got the outbreak to deal with,", - "so that'll give you some time." + "so that'll give you some time.", + " ", + "Destination: Earth!" Author = "RottKing and Ralphis" } @@ -479,7 +485,7 @@ map E4M9 LevelPic = "WILV38" Label = "E4M9" Next = "E4M3" - Music = "D_E1M9" + Music = "D_E4M9" SkyTexture = "SKY4" ParTime = 0 Author = "RottKing and Ralphis" diff --git a/lumps/p2_uminf.lmp b/lumps/p2_uminf.lmp index aed576e0..246b4070 100644 --- a/lumps/p2_uminf.lmp +++ b/lumps/p2_uminf.lmp @@ -10,7 +10,7 @@ map MAP01 Next = "MAP02" Music = "D_RUNNIN" SkyTexture = "SKY1" - Parime = 30 + ParTime = 30 Episode = clear Episode = "M_EPI1", "Phase 2", "1" } @@ -23,7 +23,7 @@ map MAP02 Next = "MAP03" Music = "D_STALKS" SkyTexture = "SKY1" - Parime = 90 + ParTime = 90 } map MAP03 @@ -34,7 +34,7 @@ map MAP03 Next = "MAP04" Music = "D_COUNTD" SkyTexture = "SKY1" - Parime = 120 + ParTime = 120 } map MAP04 @@ -45,7 +45,7 @@ map MAP04 Next = "MAP05" Music = "D_BETWEE" SkyTexture = "SKY1" - Parime = 120 + ParTime = 120 } map MAP05 @@ -56,7 +56,7 @@ map MAP05 Next = "MAP06" Music = "D_DOOM" SkyTexture = "SKY1" - Parime = 150 + ParTime = 150 } map MAP06 @@ -67,8 +67,9 @@ map MAP06 Next = "MAP07" Music = "D_THE_DA" SkyTexture = "SKY1" - Parime = 90 + ParTime = 90 InterBackdrop = "AQF016" + InterMusic = "D_READ_M" InterText = "Not even Earth is safe. The monsters show", "up ahead of you everywhere you run.", "Where are they even coming from?", @@ -96,7 +97,7 @@ map MAP07 Next = "MAP08" Music = "D_SHAWN" SkyTexture = "SKY1" - Parime = 150 + ParTime = 150 } map MAP08 @@ -107,7 +108,7 @@ map MAP08 Next = "MAP09" Music = "D_DDTBLU" SkyTexture = "SKY1" - Parime = 330 + ParTime = 330 } map MAP09 @@ -118,7 +119,7 @@ map MAP09 Next = "MAP10" Music = "D_IN_CIT" SkyTexture = "SKY1" - Parime = 150 + ParTime = 150 } map MAP10 @@ -129,7 +130,7 @@ map MAP10 Next = "MAP11" Music = "D_DEAD" SkyTexture = "SKY1" - Parime = 120 + ParTime = 120 } map MAP11 @@ -140,8 +141,9 @@ map MAP11 Next = "MAP12" Music = "D_STLKS2" SkyTexture = "SKY1" - Parime = 420 - InterBackdrop = + ParTime = 420 + InterBackdrop = "AQF001" + InterMusic = "D_READ_M" InterText = "You didn\'t find anyone alive. Again.", " ", "The fighting is taking its toll on you.", @@ -168,7 +170,7 @@ map MAP12 Next = "MAP13" Music = "D_THEDA2" SkyTexture = "SKY2" - Parime = 630 + ParTime = 630 } map MAP13 @@ -179,7 +181,7 @@ map MAP13 Next = "MAP14" Music = "D_DOOM2" SkyTexture = "SKY2" - Parime = 180 + ParTime = 180 } map MAP14 @@ -190,7 +192,7 @@ map MAP14 Next = "MAP15" Music = "D_DDTBL2" SkyTexture = "SKY2" - Parime = 150 + ParTime = 150 } map MAP15 @@ -202,8 +204,9 @@ map MAP15 NextSecret = "MAP31" Music = "D_RUNNI2" SkyTexture = "SKY2" - Parime = 510 + ParTime = 510 InterBackdrop = "AQF004" + InterMusic = "D_READ_M" InterTextSecret = "You step into the teleporter. You feel a", "familiar flash and... you\'re in a cage?", "Jailed?", @@ -231,7 +234,7 @@ map MAP16 Next = "MAP17" Music = "D_DEAD2" SkyTexture = "SKY2" - Parime = 120 + ParTime = 120 } map MAP17 @@ -242,7 +245,7 @@ map MAP17 Next = "MAP18" Music = "D_STLKS3" SkyTexture = "SKY2" - Parime = 120 + ParTime = 120 } map MAP18 @@ -253,7 +256,7 @@ map MAP18 Next = "MAP19" Music = "D_ROMERO" SkyTexture = "SKY2" - Parime = 180 + ParTime = 180 } map MAP19 @@ -264,7 +267,7 @@ map MAP19 Next = "MAP20" Music = "D_SHAWN2" SkyTexture = "SKY2" - Parime = 210 + ParTime = 210 } map MAP20 @@ -275,8 +278,9 @@ map MAP20 Next = "MAP21" Music = "D_MESSAG" SkyTexture = "SKY2" - Parime = 420 + ParTime = 420 InterBackdrop = "FLAT5_6" + InterMusic = "D_READ_M" InterText = "Here is no AGM but only monsters.", "Monsters\, no humans and dusty days", "sleeping in old ruins and eating scraps.", @@ -304,7 +308,7 @@ map MAP21 Next = "MAP22" Music = "D_COUNT2" SkyTexture = "SKY3" - Parime = 330 + ParTime = 330 } map MAP22 @@ -315,7 +319,7 @@ map MAP22 Next = "MAP23" Music = "D_DDTBL3" SkyTexture = "SKY3" - Parime = 420 + ParTime = 420 } map MAP23 @@ -326,7 +330,7 @@ map MAP23 Next = "MAP24" Music = "D_AMPIE" SkyTexture = "SKY3" - Parime = 240 + ParTime = 240 } map MAP24 @@ -337,7 +341,7 @@ map MAP24 Next = "MAP25" Music = "D_THEDA3" SkyTexture = "SKY3" - Parime = 420 + ParTime = 420 } map MAP25 @@ -348,7 +352,7 @@ map MAP25 Next = "MAP26" Music = "D_ADRIAN" SkyTexture = "SKY3" - Parime = 600 + ParTime = 600 } map MAP26 @@ -359,7 +363,7 @@ map MAP26 Next = "MAP27" Music = "D_MESSG2" SkyTexture = "SKY3" - Parime = 270 + ParTime = 270 } map MAP27 @@ -370,7 +374,7 @@ map MAP27 Next = "MAP28" Music = "D_ROMER2" SkyTexture = "SKY3" - Parime = 690 + ParTime = 690 } map MAP28 @@ -381,7 +385,7 @@ map MAP28 Next = "MAP29" Music = "D_TENSE" SkyTexture = "SKY3" - Parime = 450 + ParTime = 450 } map MAP29 @@ -392,7 +396,7 @@ map MAP29 Next = "MAP30" Music = "D_SHAWN3" SkyTexture = "SKY3" - Parime = 300 + ParTime = 300 } map MAP30 @@ -403,8 +407,9 @@ map MAP30 Endcast = true Music = "D_OPENIN" SkyTexture = "SKY3" - Parime = 60 + ParTime = 60 InterBackdrop = "SLIME13" + InterMusic = "D_READ_M" InterText = "The evil thing becomes unstable.", "Its final roars echo throughout the room", "until it crumples into scrap metal.", @@ -420,7 +425,7 @@ map MAP30 " ", "No one will know what happened here.", " ", - "No one will ever find you again.", + "No one will ever find you again." } map MAP31 @@ -432,8 +437,9 @@ map MAP31 NextSecret = "MAP32" Music = "D_EVIL" SkyTexture = "SKY3" - Parime = 60 - InterBackDrop = "AQF021" + ParTime = 60 + InterBackdrop = "AQF021" + InterMusic = "D_READ_M" InterTextSecret = "Forcibly uncaged again. Good job.", " ", "But where are you? The air and gravity", @@ -449,7 +455,7 @@ map MAP31 " ", "You will find your way back to the city,", "but it will have to be on the other side", - "of a few homicidal mutants...", + "of a few homicidal mutants..." } map MAP32 @@ -460,5 +466,5 @@ map MAP32 Next = "MAP16" Music = "D_ULTIMA" SkyTexture = "SKY3" - Parime = 210 + ParTime = 210 }