This reverts commit 9b25e1447a.
The first level of the game is very prominent and I'm not convinced that
this had sufficient debate on the original PR. Opinions on the original
PR seemed mixed to lukewarm.
I'm also not convinced that this is an improvement over the previous
E1M1 but that is just my personal opinion. If we want to make this
change then we can, but it should be discussed more first.
Nothing else in FD's repetoire quite matches the deep, rich, earthy green-brown that these textures have. They're perfect for certain outdoor environments - except in Final Doom they're part of this really unnatural fade-in fade-out animation. This doesn't really matter in FD in isolation but if you try to load a Final Doom-compatible animation definition then the entire intended effect is ruined.
This commit also updates E1M1 to use these new textures.
Two small issues that Eureka flagged:
* Sector #133 the flesh worm and the stealth worm were overlapping.
Moved the flesh worm back.
* Sector #100 removed unused tag #8.
- Made E1M1 more beginner friendly (keycards is optional for secret)
- Upper starting area door opens consistently from both sides. Switch is gone and that corridor is shortened
- There is a little trail of health bonuses guiding the player to the least damaging way to reach the armour
- Soul sphere in upper area is now red armour
E1M1
- All the monsters in the trench are now +ambush, so they don't move until you're down there. On easy the zombieman even faces away from the start.
- More monster blockers added to prevent invisi-blocks jumping into the starting room trench or down from the cliffs in the outdoor area.
E2M7
- Armour bonuses still floating on sector 599. They now adorn the side pillars instead.
- The minigun is comically easy to miss - pretty much every passage into that area is designed for you to look the other way or overshoot it jumping in there, and you might go through the next 80% of the map before having any reason to go back into that part of the room. Its platform has been moved to the lower area, with the upper platform being ostensibly a shotgun but the shotgun guy now standing there took it.
E3M4
- Stealth worm 16 stuck on overlapping ledge.
- Changed the St. Pete's cross into a sealed-off fireblu portal.
- Extended the stairs up from that long bridge so that it's more obvious from a distance at low resolution that those are legit stairs up and you're actually expected to backtrack that way.
- Redecorated the exit room.
E3M5
- Jump down into painlord courtyard in the west would be invisi-blocked by said painlords. Monster blocking line added to keep the way down clear. Moved the tree out of the way too, for good measure.
- Addressed #996.
E3M9
- Fixed numerous tutti-frutti textures and unstraightened some unintentional fake-contrasts in some organic areas.
E4M2
- Got rid of the flat bleed trick in that slime tunnel. It's just a big steady spotlight now - and it doesn't mitigate any nukage damage.
- The secret exit room multiplayer contingency entrance is now opened immediately after the trap-bars are triggered. The trap-bars themselves are no longer crushing, preventing a possible immobilization softlock.
- Said multi-contingency entrance area is remodeled to make it clear it has been jump-proofed.
- Aligned hex textures in secret exit room.
E4M9
- Flagged line 1765 as monster blocking. It's possible for a monster, while that platform is descending, to step right onto that window ledge and get stuck there as the platform continues its movement.
- Added glass to the sides of sector 230 to prevent the player from falling in under certain circumstances.
Map02
- Changed the multi-wallpart elevator so that the middle is the "rungs" that the side "pulleys" are lifting up the platform against.
Map04
- Numerous cosmetic fixes to the starting area.
Map05
- A couple lines on the edge of the stream used the surrounding brown rock instead of the zimmer brown.
- Made the helipad symmetrical and made it look more weathered, including adding a small tree where there would once have been a light.
Map11
- The walk line to open the yellow door switch is now south of the minigun, so those who "know" how it works (without knowing the exact location of the line) don't have to go all the way up to the door to intentionally trigger it.
- Removed some hard-only monsters from the eastern branch, removing some matribites and octaminators and replacing one of the former with a formerly easy-only trilobite and one of the latter with a stealth worm.
- The dock area is now opened up by the same switch that lowers the two platforms, which are now lowered permanently.
- The red skull shootable switches are now located so high up that it's impossible to gamble on a stray SSG shot hitting them from below.
- Addressed #996 in some small gaps in the final arena.
Map23
- Moved all health bonuses around the broken teleporter to look less like mushrooms.
Map26
- Blue skull door trim was misaligned, obscuring the shape of the horns.
- Zombieman 130 stuck inside a monster blocking line.
- Moved all health bonuses around the starting area corpse to look less like mushrooms.
Map29
- Addressed #996.
Map32
- Added a way to climb out of the lava pit.
Many of these found thanks to Inuk's new floating-item-bug script!
E1M1
- Replaced the health boosts in the exit to the upper cave with a trail leading into the cave, to let the player know right away that this is not a decorative area. (It's not even counted as a secret!)
E1M7
- Shells no. 174 was floating on that bit of wire connecting the two computer banks around it.
E2M7
- Floaty armour boosts 57 and 62.
E2M9
- Floaty anti-nukage supplies 102 and 132. Moved 133 as well just in case.
E3M3
- Floaty candle in sector 232. All moved for symmetry.
E3M8
- Replaced one hanging gore actor. See #941.
- Made the panel behind that replaced gore actor a marble face.
E4M2
- Armour boosts on east side of bridge were close enough to be subject to the floating bug, stopped only by the impassable line.
E4M9
- Light no. 117 submerged illusion pit was smaller than the light hitbox and the wrong shape.
- Floaty serpentipede no. 236.
E1M1
- Easy-only south shotgun now moved to climbable crates.
- The column-lowering switch now starts in the "1" position, done after what happened with line 1728 in E4M2.
E4M2
- Closes#1109 by making the bridge to the one-way blue key route raisable repeatedly (but collapsible only once). While it is raised, the bridge is also usable as a safety lift, as the normal safety lift is inaccessible if you fall in on the north side. There is now only one teleporter onto that patio/boardwalk thingy, down where the radsuit was; the only way to get back to the blue key after a successful run is to raise the bridge again, crossing which a second time will (a) undo the raising floor in the next room and (b) not cause the bridge to collapse again, thus allowing free movement back and forth without touching any hurtfloor.
- Adds some stairs out of the slime pit in between that switch and that bridge.
- That raising floor is no longer crushing and if you're caught in it you can slip out back into the main slime area. This avoids the (extremely improbable but theoretically possible) situation where you can actually get softlocked by getting caught in there but not dying from the resulting damage.
- Made the silver trim on the switch in line 2287 almost fully visible as it was already awkwardly peeking out slightly and all the obfuscation did at this point was risk it being missed.
- The slow up elevator in the northwest is now activated by a switch *inside* the car, and made both switches repeatable. The old regular-lift use line is now a second move-down line, just in case you want to get back up there after someone's gone up in multiplayer and then rocketed themselves.
- The slime pit with the bridge leading to those elevators now also has safety stairs and the bridge itself is a usable lift.
- That first chunk of pre-raised bridge leading to the exit is now a usable safety lift.
- "Not on map"'d a bunch of control sectors.
- The lines on sector 592 were a flat-bleed trick and should not have had textures.
- Line 1728 now starts in the 1 position rather than 2, because I ran three laps around this area thinking I had already hit this switch.
- The big super-bright lift en route to the yellow key is now called down by using it directly. The remote switch simply raises it to the correct position so it can be called down.
E4M9
- Closes#1110 by removing the forcefield as soon as the player jumps off the switch ledge into the slime pit.
- Added safety lift to southeast nukage pit.
- Reduced all green nukage damage to 10%.
Map05
- Numerous attempts to fix#996.
- The switch letting down the red key now also releases the trilobites, removing the need for those additional walk lines which were preventing the player from activating the switch at the usually permitted distance.
- Massive makeover to the first courtyard. The orange walls are now only on the west and the insides are tan.
- Darkened all outside areas so the distance fade does something.
- Made all TANROCK5s STONE6 instead where it should be lit up by the "sunset" implied by the new STARG walls.
- Got rid of a lot of the weird unnatural zig-zags in the river.
E1M1
The main goals here are to make things actually easy on easy skill, and to make the lower route actually a viable starting choice instead of a shitty gotcha (or, more charitably, an extra challenge). Tested by using only keyboard in Chocolate while trying to avoid moving and turning at the same time.
- In the courtyard room, there is now in easy a dead shotgunguy and a shotgun, right by the door.
- Removed the soulsphere in the starting corridor. Sorry, it's just too much especially given the *second* one outside, and it really doesn't help mitigate...
- In accordance with the above, removed pinky no. 244 and serpentipede 241 from easy skill. An ambush being totally surrounded by 3 serps at once is not exactly an E1M1 easy mode sort of encounter!
- The easy-only shotgun in the southern route is now moved to where those two shotgun shell pickups are above the lift, rather than requiring the trick jump.
- Pinky 214 has been moved somewhere where it's less likely to be hit by a stray bullet from below and alerted prematurely.
- One of the starting medikits has been moved to the door after the lowering pillars, swapping places with the stimpack.
- Southwestern blue key corridor had a lone pinkie on easy. Added two zombiemen instead.
- Removed easy-only shotgun from said corridor. Zombieman 88 is now on easy as well.
- Removed shotgunguy 96 from easy skill.
- Removed zombieman 176 from easy skill and added an easy-only zombieman behind the door.
- More attempts to fix#996.
Map09
- Added a couple health boosts on top of that crate that needs to be moved away, to remind the player that they might need to revisit that spot later.
- Changed the texture on the door leading into the lava pit since the new one doesn't really work with it.
E1M1
- First door switch sector needed to be 72 units high to avoid tutti-frutti effects.
- Removed fake contrasts on corner "AGM" pillar.
- Removed secret flag on that crate you can jump onto, after feedback by various people.
* levels: minor tweaks/fixes.
E2M1
The little pass-over route in the north with the medikit now blocks monsters so you don't get a surprise invisible obstruction.
The armour bonuses on the steps in the main path between the outdoor areas are now closer to the ledge. You can still miss some if you charge down the steps at full speed but it only takes a slight slowdown to get them all in one go.
Map11
The health bonus in the starting room pillar is replaced in hard mode by a shellbox.
Untagged the thin panel armour bonus secret.
Replaced the evil eyes in the SKAG room with skull rocks.
Made all 3 doors in the starting room green.
Fixed texture alignment on castle corpse hanger lift.
Map09
Flagged some secret area entrance lines as secret.
* levels: fix E1M1 texture stuff.
The fake barred doors in the dark halls were missized and tutti-fruttied.
The use-to-lower function of the crate has been removed since you can easily jump onto it from the lift and it never really made sense.
The two sets of computer banks have been reversed so that the 64-tall one is on top, as trying to accommodate it was resulting in weird texture misalignments elsewhere.
* levels: raise light fixture in E2M3 red key room.
This one's a bit petty maybe, but it bothers me that you can run onto those terminals just fine, but the light fixture is just low enough that once you're on the terminals you can't jump off of them without crouching.
The diegetically "normal" solution would be to raise the terminals to 25 units off the floor, but making the player go around to reach the red key - when in a typical game you will have already killed any monster that has line of fire on you anywhere in that room - adds nothing to gameplay whatsoever.
* levels: minor fixes to E3M7-9.
See #999.
E3M7 still had some orthogonal lines that looked misleadingly like secret doors, which would needlessly exacerbate how obscure the actual secret is. I haven't bothered touching the texture alignment since the repetition on the same texture being used over such a huge area is going to be pretty bad anyway.
* levels: rip+tear more lines from e3m7 huge guts.
There should be basically no fake contrast in that area at all now.
Also added a light texture to explain why the doorway is lit up like that.
* levels: minor fixes to E1M1 and Map28.
E1M1
Added a light source to the exit switch room.
Made the COMPUTE4 line only 3 screens wide and filled the empty space with vent speaker thingies.
Map28
Realigned SKSPINE2 on Sector 359.
Both latter fixes motivated by #995.
* levels: minor Phase 1 fixes.
This should address all outstanding issues in #698 and then some.
E1M1
Simplified the corridor behind the west blue key entrance.
Removed the serpentipede inside the secret in easy skill, and unflagged it as ambush so you don't need to necessarily *find* the secret to get 100% kills.
E1M7
Addressed #698 by getting rid of the potential soft-lock crusher trap altogether.
E2M8
Addressed #698 by keeping two tripods at all skill levels but making the polaric available immediately, along with a soulsphere and red armour. In the polaric's place in the hard-to-reach room is a second soulsphere.
I've also made the (medium/hard) polaric room door look like a door to reflect its actual use.
E3M6
Addressed #698 by not just marking the illusory wall as a secret line but also the inside of the room not-on-map. Added a light source to the inside of the room but it wasn't really necessary.
E3M7
Addressed #698 by removing the crusher tags for both sector and line.
Also dded some sound blockers to the entrance to the colon.
E4M6
Addressed the texture alignment issues in #698.
As for the descending sector potential crash, that is (a) *literally impossible* to fix in SLADE; and (b) a far too complex sector touching many things to trust not to break all over again on the slightest future adjustment to map geometry. The intended resulting sector type isn't even a hurtfloor, so there's no gameplay effect with the change. I've added a trim around the edges to make it look half decent when it's descended with no texture change.
E4M8
Addressed #698 map line meta.
Added one more escape lift for a slime pit that was still missing one.
Added a SKAG.
* levels: remove testing e4m8 start.
yeah that was where the SKAG is.
* levels: bugfix: remove E1M2 wall midtex.
The level had a decorative door-the-player-had-come-in-from that was obscured by a wall texture.
Thanks to Smokey on Discord for pointing this out.
I've also removed the Doom Builder camera thing.
* levels: Cleanup Eureka errors in seven levels
Relatively minor Eureka fixes following the level changes at the start
of 2023
freedoom1.wad
E1M2 Outside wall ceiling lower than floor. Raise ceiling to 100.
Fix stuck shotgun zombies in hidden in triangular sector #319
Fix unused transparent CGRATE1 texture on linedef #747 by
clearing it
E1M9 Remove unused back sidedef on lower side of door jamb sector
#255 in the upper right hand corner of the map.
E3M7 Sector #182 cleared unused tag #31
Sector # 58 cleared unused tag #35
freedoom2.wad
MAP14 Replaced missing textures with GRAY1 in monster closest upper
left of map
MAP16 Fix missing textures in inaccessible outside area with ASHWALL2
MAP26 Delete unused tag #2 in sector #38
MAP27 Replace four missing textures above four short red torches with
MARBGRAY in the switch maze room
Replace transparent texture AQTRIM03 with AQRUST10 on lower
trim for door below the switch maze room
* levels: rebuild nodes
Ran "make rebuild-nodes"
---------
Co-authored-by: mc776 <24984517+mc776@users.noreply.github.com>
* Add files via upload
**Map01**
Swapped out the impassable line for narrowing the big door gap enough for it to actually clearly visibly block the player's movement.
Used the flat bleeding trick to get rid of that little spotlight under the exit sign. The distracting bottom light on the sign itself has also been removed.
**Map03**
Unflagged some invisible impassable lines in front of screens and switches in the first corridor since they weren't needed in the first place.
Changed floor/ceiling textures on the curvy screen corner so it wasn't blatantly conflicting with the tile pattern.
Added a railing onto the big nukage rooms.
**Map12**
Flyers in the far northwest room could not figure out how to get into the big arena if they're in the dead ends. The side doors can now be opened by them.
Fixed some misunpegged lowering platforms/item closets in the south.
**Map15**
Second attempt to fix the rising shipping elevator. No more moving bridge (at all - the new safety lifts are still there), both switches available again, everything actually takes some time and moves visibly now.
Tag 56 changed to the four lines on the border of the pit.
Moved the cells even deeper into the expanded secret room as parts of the hitbox were still sticking out on the other side of something.
**Map16**
Unaligned the MIDSPACE in the new back alley.
**Map21**
Added an implied ladder leading down into the starting room.
Fixed the plasma secret in the library. If you went inside the room and let it close behind you, there was no way out; the way you came is now given the same lift tag. The secret itself is marked with something better than just suspiciously secret-tagged linedefs on the automap. The library south wall is also no longer incorrectly tagged as not to show up on the map.
Fixed the misaligned, improperly pegged door side texture in the big wall that opens up to the north of the big lava pit.
The lift leading into that room overlooking the big lava pit can now be traversed both ways.
You can actually fall into the lava in (-948,1836) with no way out. Narrowed that section accordingly.
**Map23**
Reduced number of sectors and number of secret sectors (doorway into the actual secret also flagged as secret) in the southeastern secret.
Fixed lone floating rocket by the crate north of the G.
**Map25**
Northwest baron/chaingunner teleport ambush was double-triggered and one of them did the opposite of what it was supposed to do. That entire area has been redone as a creepy wooden shack, to get rid of the arbitrary anti-jump invisible blocking lines.
Also added a sector to make sure noises pass through to those two individual monsters.
Unstuck serpentipede # 444.
The exit room seemed a bit dark for that lava so I took the liberty of changing it to 5% and a hot (but solid) rock texture.
Overhauled the starting entrance to explain why you were stuck in a little cramped chamber that you could only exit by shooting something behind you.
**Map32**
Got rid of the double-sector red key lift, in favour of just the outside portion being the lift.
Fixed all the windows so you can't jump through them in GZDoom under normal circumstances. Added some decorative railings.
Marked the berserk secret so it can be found without checking the automap (and can no longer be found by checking the automap), but in that specifically annoying, obtuse way that everything else is intentionally done on this map.
(NOTE: these Map32 fixes are pending another major improvement to this map that rednakhla is working on and may be overridden by other decisions in their version. I'm just throwing this out there as a temporary fix as we do not appear to have a timeline for that version yet. If it is completed before this PR is merged I'm more than happy to add it here.)
* levels: fix map15 western secret lift bug.
Using the lift from the bottom would sometimes fail if there are monsters. This seems to be an unusual nodebuilding-related glitch.
Moving the bottom activation to a separate wall switch seems to get around this.
* levels: allow map15 supersecret armor in easy/med.
Easy also allows one of the medikits.
Before this change that room was completely empty outside of hard.
* levels: use new texture on map16.
* levels: map21 fixes.
The lava groove border could be jumped into as it was exactly 32 units wide. Reduced this all around to 24, and added a damagefloor there just in case.
One lava damage floor had 20% for no apparent reason where everywhere else the player would be expecting it to do 10. It now does 10.
Rearranged a bunch of stuff in the final corridor for the bricks to line up.
* levels: tutti-frutti on southern computers.
There's now a gap between the ceiling and floor computers. It looks less bad than either the tutti-frutti or lowering the main ceiling so that the wall textures are cropped off.
* levels: remove map26 obligatory damage.
It appears that the collapsing bridge may have been intentionally designed to be impossible to cross without jumping, requiring the use of the damagefloor route to progress. There is now a radiation suit just before the blue key door, and stimpacks along the damagefloor route are now replaced with a bunch of health bonuses and a stimpack on the other end of the teleport.
Some of the sectors in the early part of the map have been simplified and useless line triggers (W1 on one-sided, etc.) removed.
(A similar note applies to this as for Map32 in this PR, but I'm the one working on the bigger change this time.)
THIS IS A COLLAB EDIT. By me (shinobody) and mc776. Please credit both of us.
All changes in previous commits by me, all changes in this commit by mc775.
For levels/e1m[13].wad I should've used AQRUST10 to replace AQTRIM03
instead of AQCONC03. With the fix the texture changes are:
E1M1 Near floor around 464, 1936
Near ceiling around 2400, -32
E1M3 Behind player spawns at -767, -258
In levels/e1m*.wad files fix errors flagged by Eureka when F9 (Check /
ALL) is pressed. This is mostly missing textures and similar errors.
E1M1 Replace transparent texture AQTRIM03 on walls with AQCONC03
E1M3 Replace transparent texture AQTRIM03 on walls with AQCONC03
Floor one unit higher than ceiling in a door
Delete unused tags
Replaced transparent texture in a secret room
E1M6 Deleted inner mismatched sector in outdoor water pond
Fix Missing textures
E1M7 Fix missing textures
E1M8 Fix missing textures
Delete unused tags
E1M9 Fix missing textures
A generic term like this isn’t really suitable for trademark, nor
likely to ever be disputed. The community and the engine both heavily
bias toward “episode” and indeed most other games do.
Closes: #682
