From 43f0732120f871532d0161f4e6e4b0393cc5f817 Mon Sep 17 00:00:00 2001 From: Georgy Samoilov Date: Sat, 21 Sep 2024 01:13:57 +0500 Subject: [PATCH] Fixes --- lumps/fdmgconf.lmp | 5 +- lumps/p1_gconf.lmp | 5 +- lumps/p1_uminf.lmp | 173 ++++++++++++++++++++------------------- lumps/p2_gconf.lmp | 5 +- lumps/p2_uminf.lmp | 198 ++++++++++++++++++++++----------------------- 5 files changed, 196 insertions(+), 190 deletions(-) diff --git a/lumps/fdmgconf.lmp b/lumps/fdmgconf.lmp index a4fb3d70..9f06c9ff 100644 --- a/lumps/fdmgconf.lmp +++ b/lumps/fdmgconf.lmp @@ -9,9 +9,8 @@ "description": "The Freedoom project aims to create a complete, free content first person shooter game.", "version": "0.13.0", "iwad": null, - "pwadfiles": null, - "dehfiles": null, - "executable": "doom1.9", + "pwads": null, + "executable": "limitremoving", "mode": "commercial", "options": null } diff --git a/lumps/p1_gconf.lmp b/lumps/p1_gconf.lmp index 4e66efe4..3e61e971 100644 --- a/lumps/p1_gconf.lmp +++ b/lumps/p1_gconf.lmp @@ -9,9 +9,8 @@ "description": "The Freedoom project aims to create a complete, free content first person shooter game.", "version": "0.13.0", "iwad": null, - "pwadfiles": null, - "dehfiles": null, - "executable": "doom1.9", + "pwads": null, + "executable": "limitremoving", "mode": "retail", "options": null } diff --git a/lumps/p1_uminf.lmp b/lumps/p1_uminf.lmp index 89f4ed8e..87cf5125 100644 --- a/lumps/p1_uminf.lmp +++ b/lumps/p1_uminf.lmp @@ -3,111 +3,120 @@ // SPDX-License-Identifier: BSD-3-Clause -// Episode 4 music playback -MAP E4M1 +// Episode 4, fixes music playback +map E4M1 { - levelname = "Maintenance Area" - levelpic = "WILV30" - skytexture = "SKY4" - next = "E4M2" - music = "D_E4M1" - author = "RottKing and Ralphis" + levelname = "Maintenance Area" + levelpic = "WILV30" + label = "E4M1" + skytexture = "SKY4" + next = "E4M2" + music = "D_E4M1" + author = "RottKing and Ralphis" } -MAP E4M2 +map E4M2 { - levelname = "Research Complex" - levelpic = "WILV31" - skytexture = "SKY4" - next = "E4M3" - nextsecret = "E4M9" - music = "D_E4M2" - author = "RottKing and Ralphis" + levelname = "Research Complex" + levelpic = "WILV31" + label = "E4M2" + skytexture = "SKY4" + next = "E4M3" + nextsecret = "E4M9" + music = "D_E4M2" + author = "RottKing and Ralphis" } -MAP E4M3 +map E4M3 { - levelname = "Central Computing" - levelpic = "WILV32" - skytexture = "SKY4" - next = "E4M4" - music = "D_E4M3" - author = "RottKing and Ralphis" + levelname = "Central Computing" + levelpic = "WILV32" + label = "E4M3" + skytexture = "SKY4" + next = "E4M4" + music = "D_E4M3" + author = "RottKing and Ralphis" } -MAP E4M4 +map E4M4 { - levelname = "Hydroponic Facility" - levelpic = "WILV33" - skytexture = "SKY4" - next = "E4M5" - music = "D_E4M4" - author = "RottKing and Ralphis" + levelname = "Hydroponic Facility" + levelpic = "WILV33" + label = "E4M4" + skytexture = "SKY4" + next = "E4M5" + music = "D_E4M4" + author = "RottKing and Ralphis" } -MAP E4M5 +map E4M5 { - levelname = "Engineering Station" - levelpic = "WILV34" - skytexture = "SKY4" - next = "E4M6" - music = "D_E4M5" - author = "RottKing and Ralphis" + levelname = "Engineering Station" + levelpic = "WILV34" + label = "E4M5" + skytexture = "SKY4" + next = "E4M6" + music = "D_E4M5" + author = "RottKing and Ralphis" } -MAP E4M6 +map E4M6 { - levelname = "Command Center" - levelpic = "WILV35" - skytexture = "SKY4" - next = "E4M7" - music = "D_E4M6" - author = "RottKing and Ralphis" + levelname = "Command Center" + levelpic = "WILV35" + label = "E4M6" + skytexture = "SKY4" + next = "E4M7" + music = "D_E4M6" + author = "RottKing and Ralphis" } -MAP E4M7 +map E4M7 { - levelname = "Waste Treatment" - levelpic = "WILV36" - skytexture = "SKY4" - next = "E4M8" - music = "D_E4M7" - author = "RottKing and Ralphis" + levelname = "Waste Treatment" + levelpic = "WILV36" + label = "E4M7" + skytexture = "SKY4" + next = "E4M8" + music = "D_E4M7" + author = "RottKing and Ralphis" } -MAP E4M8 +map E4M8 { - levelname = "Launch Bay" - levelpic = "WILV37" - skytexture = "SKY4" - music = "D_E4M8" - interbackdrop = "AQF075" - author = "RottKing and Ralphis" - 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. - -Fifty-nine. Fifty-eight. Fifty-seven. . . -You melt into the pilot's seat, lost in the -voice of an automated assembly of angels -delivering you from this wretched rock. - -The ship rumbles as she wakes up; -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. - -Destination: Earth!" + levelname = "Launch Bay" + levelpic = "WILV37" + label = "E4M8" + skytexture = "SKY4" + music = "D_E4M8" + interbackdrop = "AQF075" + author = "RottKing and Ralphis" + 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.", + " ", + "Fifty-nine. Fifty-eight. Fifty-seven. . .", + "You melt into the pilot's seat, lost in the", + "voice of an automated assembly of angels", + "delivering you from this wretched rock.", + " ", + "The ship rumbles as she wakes up;", + "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.", + " ", + "Destination: Earth!" } -MAP E4M9 +map E4M9 { - levelname = "Operations" - levelpic = "WILV38" - skytexture = "SKY4" - next = "E4M3" - music = "D_E4M9" - author = "RottKing and Ralphis" + levelname = "Operations" + levelpic = "WILV38" + label = "E4M9" + skytexture = "SKY4" + next = "E4M3" + music = "D_E4M9" + author = "RottKing and Ralphis" } diff --git a/lumps/p2_gconf.lmp b/lumps/p2_gconf.lmp index df189a08..a57abe90 100644 --- a/lumps/p2_gconf.lmp +++ b/lumps/p2_gconf.lmp @@ -9,9 +9,8 @@ "description": "The Freedoom project aims to create a complete, free content first person shooter game.", "version": "0.13.0", "iwad": null, - "pwadfiles": null, - "dehfiles": null, - "executable": "doom1.9", + "pwads": null, + "executable": "limitremoving", "mode": "commercial", "options": "comp_soul 0" } diff --git a/lumps/p2_uminf.lmp b/lumps/p2_uminf.lmp index a5c3fa63..33cad253 100644 --- a/lumps/p2_uminf.lmp +++ b/lumps/p2_uminf.lmp @@ -55,23 +55,23 @@ map MAP06 skytexture = "SKY1" music = "D_THE_DA" interbackdrop = "AQF016" - intertext = "Not even Earth is safe. The monsters show -up ahead of you everywhere you run. -Where are they even coming from? - -Despite all the other destruction they've -wrought, the teleportation infrastructure -remains intact - you might be able to -get back to civilization this way. - -You find an old pad and boot it up. -Connection live. Handshake established. - -Growling and chittering on the intercom. - -Planted your feet. -Checked your weapons. -Time to punch through." + intertext = "Not even Earth is safe. The monsters show", + "up ahead of you everywhere you run.", + "Where are they even coming from?", + " ", + "Despite all the other destruction they've", + "wrought, the teleportation infrastructure", + "remains intact - you might be able to", + "get back to civilization this way.", + " ", + "You find an old pad and boot it up.", + "Connection live. Handshake established.", + " ", + "Growling and chittering on the intercom.", + " ", + "Planted your feet.", + "Checked your weapons.", + "Time to punch through." } map MAP07 @@ -118,22 +118,22 @@ map MAP11 skytexture = "SKY1" music = "D_STLKS2" interbackdrop = "AQF001" - intertext = "You didn't find anyone alive. Again. - -The fighting is taking its toll on you. -The pain. The brutality. The loneliness. -There's got to be a way to somewhere, -something that isn't... this. - -A train rumbles in the distance. - -You follow the sound down the empty road -and reach the edge of a railyard. - -Trains mean cities. -Cities mean people. - -Right?" + intertext = "You didn't find anyone alive. Again.", + " ", + "The fighting is taking its toll on you.", + "The pain. The brutality. The loneliness.", + "There's got to be a way to somewhere,", + "something that isn't... this.", + " ", + "A train rumbles in the distance.", + " ", + "You follow the sound down the empty road", + "and reach the edge of a railyard.", + " ", + "Trains mean cities.", + "Cities mean people.", + " ", + "Right?" } map MAP12 @@ -172,23 +172,23 @@ map MAP15 skytexture = "SKY2" music = "D_RUNNI2" interbackdrop = "AQF004" - intertextsecret = "You step into the teleporter. You feel a -familiar flash and... you're in a cage? -Jailed? - -There are other cages in here. Occupied. -So is this how they capture humans? -Or did they set this up specially for you, -as a reward for being such a monkey wrench -in their plans? - -The guards haven't noticed you - yet. -Any noise could mean death. Or worse. - -When they zombify you, are you awake the -entire time, locked inside of your brain? - -You'd rather not find out." + intertextsecret = "You step into the teleporter. You feel a", + "familiar flash and... you're in a cage?", + "Jailed?", + " ", + "There are other cages in here. Occupied.", + "So is this how they capture humans?", + "Or did they set this up specially for you,", + "as a reward for being such a monkey wrench", + "in their plans?", + " ", + "The guards haven't noticed you - yet.", + "Any noise could mean death. Or worse.", + " ", + "When they zombify you, are you awake the", + "entire time, locked inside of your brain?", + " ", + "You'd rather not find out." } map MAP16 @@ -235,23 +235,23 @@ map MAP20 skytexture = "SKY2" music = "D_MESSAG" interbackdrop = "FLAT5_6" - intertext = "Here is no AGM but only monsters. -Monsters, no humans and dusty days -sleeping in old ruins and eating scraps. -No one has escaped this wasteland alive. - -You've been tracking their movements. -AGM records and alien scrawlings point -to something big worming its way through -the entire teleportation network. -Sending its nightmare armies of brain- -scrambled sapients - including humans - -to conquer all known space. - -And now you're fighting at its doorstep. - -This could be the beginning -of your freedom - or your doom." + intertext = "Here is no AGM but only monsters.", + "Monsters, no humans and dusty days", + "sleeping in old ruins and eating scraps.", + "No one has escaped this wasteland alive.", + " ", + "You've been tracking their movements.", + "AGM records and alien scrawlings point", + "to something big worming its way through", + "the entire teleportation network.", + "Sending its nightmare armies of brain-", + "scrambled sapients - including humans -", + "to conquer all known space.", + " ", + "And now you're fighting at its doorstep.", + " ", + "This could be the beginning", + "of your freedom - or your doom." } map MAP21 @@ -343,22 +343,22 @@ map MAP30 endcast = true music = "D_OPENIN" interbackdrop = "SLIME13" - intertext = "The evil thing becomes unstable. -Its final roars echo throughout the room -until it crumples into scrap metal. - -A targeting portal opens, blissfully -unaware of its master's demise. - -On the other side you see a small town. -You ditch your weapons and slip through, -leaving AGM and all its horrors behind. - -No one will know who saved them. - -No one will know what happened here. - -No one will ever find you again." + intertext = "The evil thing becomes unstable.", + "Its final roars echo throughout the room", + "until it crumples into scrap metal.", + " ", + "A targeting portal opens, blissfully", + "unaware of its master's demise.", + " ", + "On the other side you see a small town.", + "You ditch your weapons and slip through,", + "leaving AGM and all its horrors behind.", + " ", + "No one will know who saved them.", + " ", + "No one will know what happened here.", + " ", + "No one will ever find you again." } map MAP31 @@ -370,22 +370,22 @@ map MAP31 skytexture = "SKY2" music = "D_EVIL" interbackdrop = "AQF021" - intertextsecret = "Forcibly uncaged again. Good job. - -But where are you? The air and gravity -still feel like whatever planet that -strange prison had been on. - -You look around and the layout triggers -some old memories from history class. - -This is an arena. -Where they send prisoners to die. -That wasn't an exit - but an entrance. - -You will find your way back to the city, -but it will have to be on the other side -of a few homicidal mutants..." + intertextsecret = "Forcibly uncaged again. Good job.", + " ", + "But where are you? The air and gravity", + "still feel like whatever planet that", + "strange prison had been on.", + " ", + "You look around and the layout triggers", + "some old memories from history class.", + " ", + "This is an arena.", + "Where they send prisoners to die.", + "That wasn't an exit - but an entrance.", + " ", + "You will find your way back to the city,", + "but it will have to be on the other side", + "of a few homicidal mutants..." } map MAP32