Commit graph

2590 commits

Author SHA1 Message Date
mc776
8c076fcba9
levels: minor Phase 2 fixes. (#964)
* levels: minor Phase 2 fixes.

Mostly for addressing #694.

Map05
Realigned grey hex textures around soulsphere switch. Now the odd one out is the door.

Map09
Fixed up the lighting in the start room.
Reflagged some secret doors as secret rather than hidden.
Consolidated the two W1 Floor to LAC triggers around the yellow key.
The red key rocket launcher sequence could potentially mess someone up who - given the hatchling closet, quite reasonably - avoids grabbing the rocket launcher. It seems needlessly convoluted, but it is a funny prank how the switch makes the red key disappear entirely for a bit. Instead of untangling this I'm just going to add some health bonuses around the rocket launcher so the player will eventually go there.
Tried to mitigate the worst of the various crimes against texture alignment in the crate maze, adding a light source in the process. It would take a *lot* of work to make it actually look good, a lot more than can be done in a batch bugfix PR.

Map10
Lower unpegged sector 70 (red door leading outside) door tracks.
Added matching midtexes to the insides of the fences around the lights by the door leading to the final corridor.
Line 839 (south-southeast red armour behind waterfall) flagged secret and the lines on the other side flagged hidden.

Map11
Realigned grey hexes in corridor around minigunner switch room.
Added an evil eye right in front of the shootwall secret.

Map12
Change line 330 midtex to the new MIDSPCSM with no offset.
Lower-unpegged line 4787 doortrack.

Map13
Sectors 243 no longer uses mismatching TLITE6_5 flat. (Sector 170 actually looks okay ingame.)
Realigned line 260.

Map15
Line 163 W1 changed to WR to prevent a potential softlock.
Aligned COMPSPAN on sector 561 to match surroundings.
Fixed some textures in the green corridor in the west overlooking the nukage. Also set those zombies in there to ambush since that seems to be the intention based on their placement, and made that big block thingy on the east end of that corridor a more normal-looking door.
Touched up greyhex near sector 491.
Flagged linedef 5293 secret.
Sectors 145 and 116 (rock fringe around nukage around red key platform) consolidated into one sector, made non-damaging, and without the invisible blocking lines.

Map16
Changed Line 1089 to SR instead of S1. (Switch that opens the secret to the east)
Realigned all the SUPPORT3s in that little painlord corridor while shrinking the "ribs" a bit; also widened the little exit atrium so the space between the lights is as wide as the door. (After looking at the others I am not going to widen any more corridors at this time.)
Grossly simplified the twisty yellow key corridor, and lowered the ceiling of the outside of the door so the yellow door stripe would fit properly. One doortrack needed to be given the DOORTRAK texture. The remaining "ribs" are recessed further inside the wall so they do not impede movement at all.
Lowered the ceiling above the other yellow marked door as well. The corridor around the corner has been expanded slightly.

Map22
Flagged line 830 secret.

Map23
Fixed candle placement on east end of zombieman corridor.
Consolidated some identical sectors around the big "AGM" floor and lowered the torch platforms so they wouldn't clip into the ceiling.
Raised the ceilings on the techpillars right after the first long lift. The walls in front of them now match their surroundings.
Removed lower unpegged from lines 2066, 2082, 2062, 2075. ("Door"tracks for the route across those pillars in the southeast - they're actually lifts not doors)
SSG secret fixed. (And marked.)

Map28
Lines 2326, 622 lagged secret.
Realigned lines 4594 and 4671.
Realigned scrolling textures around sector 517.
Touched up monster closet around sector 399, changing to to 8 about HAF fast and making the closet a bit taller so there'd be a better natural threshold between those areas. The doortracks were fine, if a bit complex.
Raised sector 474 ceiling to match marble brick seams.
Made sector 147 (cubes hanging over hot rocks) do damage and sectors 91 and 115 (teleport pads) not.

Map29
Swapped out the textures on the sides of the big green skull pad.

* levels: fix up map23 southeast secret textures.

I messed up the texture replacement around the green torch, the extreme sudden darkness ruined the blue AGM text, the pillar lift-doors needed a better division between the tekwall and red rock, and that huge swathe of DOORTRAK hurt to look at in vanilla.

* levels: map07 aesthetic fixes.

Replaced BIGDOOR1 on sector 50 as it was giving tutti-frutti.

Fixed the textures on the lifts in the green area beyond the outdoor area.

Miscellaneous texture alignment fixes and added some more thresholds between materials.
2023-05-06 17:23:28 -03:00
mc776
c9710118ee
levels: minor Phase 1 fixes. (#963)
* 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.
2023-05-04 07:09:05 -03:00
mc776
0504a719b7
textures: add patches to M_xDOOR. (#962)
Addresses #961.
2023-05-03 19:59:20 -03:00
Steven Elliott
ce772c0b7f
levels: Rebuild nodes and Eureka fixes (#956)
* levels: rebuild nodes (#846)

Ran "make rebuild-nodes"

* levels: Cleanup Eureka errors in three levels

Relatively minor Eureka fixes to prepare for 0.13.0.

freedoom1.wad
  E1M3 Fix missing texture outside bottom of map with AQMETL28
  E3M3 Fix missing texture at start with ROCKRED1

freedoom2.wad
  MAP11 Fix two stuck matribites in sector 190 by moving them
        Add deathmatch start to sector 39 for a total of four (minimum)
	Remove unused sector tags 18 and 24
2023-05-03 19:36:17 -03:00
mc776
e0dde7911c
sprites: add polaric flash lighting to body. (#955)
The pre-#708 sprites had a visible blue glow on the brown foregrip and the grey was a little lighter at least on the B frame.
2023-05-03 19:24:56 -03:00
Simon Howard
8a7b6ffe3b
Merge pull request #957 from DynTylluan/master
RMS no more!
2023-05-03 16:07:35 -04:00
Cass "Owly" Python
cc0ac31dce
RSM no more!
I put a potted plant in this file so RMS is too scared to be here anymore
2023-05-03 20:59:52 +01:00
Steven Elliott
9762fa7ec0
Merge pull request #922 from DynTylluan/master
Changed copyright year plus added myself to the credits
2023-04-30 18:45:25 -04:00
Cass "Owly" Python
4603725cb2 CREDITS: Add DynTylluan to the credits 2023-04-30 18:37:52 -04:00
KorpKat
8f55008558
new map30 midi (#954)
replacing the current map30 midi due to its size, this is a new composition based on the original track while adding much more than just more instruments
2023-04-30 08:09:50 -03:00
mc776
738546f7c3
sounds: new trilobite. (#942)
Original samples by Goji! with some tweaks by me.
2023-04-30 07:36:13 -03:00
mc776
89f870397a
sprites: remove white trim from red armor. (#943)
* sprites: remove white trim from red armor.

Also fix a shading issue near the bottom of the lit-up yellow armor frame.

* sprites: correct ARM2 top perspective.

also darken some shadow lines for better readability.
2023-04-30 07:35:36 -03:00
mc776
710a10ffb3
graphics: add sbar combo key+skull icons. (#951)
addresses #759.

Won't appear in prboom-plus unless you load the iwad as a pwad, but works in gzdoom just fine.
2023-04-30 07:34:42 -03:00
mc776
7d75200549
levels: minor aesthetic changes that didn't make it into #949. (#953)
* levels: E2M3 texture issues.

A bunch of door track textures needed lower unpegged flags.

Lines 1179 and 1181 also given DOORTRAK instead of SUPPORT3 because every time I look at it I feel like the door should get snagged on those bumps. (Same with the blue key lift.)

The tekwall trim railings in the northeast have been raised to prevent accidentally walking onto them. I've also given them a texture that does not look like a misplaced door. The lowering wall monster/switch closet has also been touched up a bit.

* levels: fix up some Map04 appearances.

Changed the northernmost texture in the hatchling closet in the final room so it doesn't contrast so much that it looks like a secret.

Slightly moved two vertices on the exit flame to get rid of the fake contrast.

Fixed up the central hub aesthetics a bit:
- Aligned the pillar textures.
- Expanded the teleport destination pad, gave it some ceiling lighting, and surrounded it with a grate floor. Now it looks like an actual part of the bigger thing.
- Lowered the contrast between the lights and shadows.
- Got rid of the featureless silver above the doors, giving them tekgreen lights instead.

* levels: correct Map04 pillar texture.
2023-04-30 07:32:33 -03:00
mc776
ab6ddb2fc2
levels: more minor fixes. (#949)
E1M3
Changed the front entrance into an outdoor train platform. The train is visible from the window behind the blue door as well.
Added some escapes from some slime pits.

E1M7
Jump-proofed rocket launcher secret, the switch behind the bars in the northeast, and the two teleporters that are opened up by approaching the switch in the southeast. Duck-proofed that one rusty bar blocking the way to the northeast area. (If you're playing a mod that lets you duck less than 12 units it's not proof against that.)

E2M1
Pending final replacement of this map, here's a hacky solution to address #864 involving a door trigger and a hidden multiplayer-only barrel. In singleplayer the path beyond the other side of the gap is now blocked by a wall of rubble. At least this should better signpost that the player is not expected to go that way.

E3M7
Made the final door before the painlord stairs stay-open to let the player backtrack later if they want.

E3M8
Got rid of the sound pipes in favour of merging some sectors, fixing the gargoyle textures in the process. Raised the windows into the "snake pit" slightly to line up with the brick texture.

Map16
Addressed #591. The same trigger that "presses the button" now lowers the wall up ahead, revealing an exit portal a second or so after the bossbrain exit would normally activated.

Map17, Map18, Map31
Addressed #867.

Map30
Addressed my comment in #640 by making the platform right in front of the face a secret, so the player can 100% the map. (Not doing anything for E3M8 because you don't get a stats screen for it anyway.) Also dimmed the arena below 255 so depth can be better visible. (Some map geometry has been slightly altered to avoid orthogonal lines where the fake contrast would look bad.)
2023-04-29 08:15:55 -03:00
mc776
60dc7128da
patches: update wall25_1. (#950)
Fixes some tiling issues.

The conversion to Doom palette also resulted in some pink pixels which have been manually dealt with for this update.
2023-04-29 08:13:30 -03:00
mc776
d1f9ce5881
levels: revisit Map01 changes. (#927)
Removed the flat bleed hack in favour of some explicit bright lights at the bottom of the sign.

The gap in the giant doors is now back up to 32 units wide, but there's a visible chain behind them in some implied past attempt to either force them together or prevent them from opening. Either way, it's a midtex that clearly communicates the player shouldn't try to pass through. The slope is specifically chosen to allow the most view of the more detailed side.

The secret armour closet didn't leave any room for the door to slide through. There is now a track cutting through the inside of that room, and the "inside" edge of the door is peeking out a little.

Also finished the door on the outside. Not at all necessary for playing the map as-is, but just in case anyone in the future wanted to do a variant of this map that actually let you go out there...

The AGM logo over the waterfall in the courtyard was weirdly split up by the central orthogonal section's fake contrast so I've split the middle linedef to make a gentler curve.
2023-04-28 20:30:22 -03:00
mc776
c0e641f238
sprites: remove redundant necromancer angles. (#936)
Also fix the offset in frame X.
2023-04-28 20:29:44 -03:00
mc776
f8f860df83
sprites: polaric upgrade; sprite offset fix. (#947)
* sprites: polaric upgrade; sprite offset fix.

The current pickup sprite looks pretty much exactly like what one might expect from drawing fanart of the id plasma rifle from memory. I've changed what I could while still remaining consistent with (and hopefully becoming more consistent with) the HUD sprite.

Since the gun shoots straight forwards I've also made the flash symmetrical - along with the projectile itself (but not *too* symmetrical). This does help address #932 a bit, but if anyone's got a better design I'm all eyes.

The blue flare along the top "spine" of the gun looked a bit janky on the left so I've smoothed it out a bit. The blue also lingers a bit in the B frame.

With all the ongoing news a lot of FPS player types will be following about artillery logistics in the IRL war, the use of "cannon" referring to this short handheld PDW is aging even more poorly than Doom's "clip". The best word I can think of as a substitute happens to result in an acronym I think we might as well lean into.

I've also adjusted some other projectile sprite offsets - my last attempt at fixing them actually placed the sprites a little too high.

* sprites: smooth out some jank left by paletting.

* sprites: do polaric flash as well.
2023-04-28 20:19:31 -03:00
mc776
473eb076a8
levels/music/dehacked: complete Armory migration; add stuff to E1M9. (#944)
* levels: E1M9 adjustments.

Central room monster closet doors are no longer upper unpegged.

Changed central room stairs to use a different texture because STEP4 was tutti-fruttiing again.

Added some aesthetic improvements: the subject matter of the recycling.

Replaced the lift with stairs leading to the rocket launcher to avoid the pinkie jump block.

Tried to use the same door texture for all doors that are only remotely opened.

Used a more see-through barrier for the corner guys in the middle room, after an incident where I spent way too long and eventually resorted to IDDT to find a single zombieman - interesting challenge but probably inappropriate given the way the rest of this map works.

Fixed a bunch of miscellaneous texture issues.

* levels: move Armory name+mus to E1M5; rename E1M9.

The spooky sountrack simply does not work for a shoot-'em-up level like that.

It works better for E1M9 now that there's actually something ominous implicitly lurking in there.

* dehacked: rename E1M9 and E1M5.

* dehacked: update E1M9/5 par times.

* delete misplaced dehacked.txt
2023-04-28 20:11:32 -03:00
mc776
040790c2d7
patches: new WALL25_1 by Korp. (#946)
patches: new WALL25_1 by Korp.
2023-04-28 20:09:24 -03:00
Steven Elliott
2fb5c89cb6
Merge pull request #807 from YeldhamDev/better_desktop_name
Rewrite name section of the desktop files to "Freedoom #"
2023-04-24 07:59:03 -04:00
Michael Alexsander
2c7e8fc377 Rewrite name section of the desktop files to "Freedoom #" 2023-04-22 18:16:36 -03:00
mc776
5eae065784
levels: fix map12 softlock. (#928)
* levels: fix map12 softlock.

to replicate:
- warp to map12
- do NOT try to get the blue key yet
- get the storeroom berserk secret, then go get the plasma rifle in the east
- go back and try to get the blue key

expected:
- the blue key is now on a raised lift. use it to lower it and get the key.

actual:
- the blue key is now on a raised lift. you can't use it, because in vanilla the walk lines that open the trilobite closets, etc., block your use attempt.

This PR moves the relevant switches for the lifts - plural, to keep both ends consistent - to the sides so you can always hit them.

I've also fixed the bridge flat pattern (it's implied to be collapsed but there's no explanation for the gaps on the ends) and also some of the SUPPORT2 textures behind some of the lifts in that pre-key area, and made the bridge lift flats into something that looked a little bit more like intentional structures than a default grey flat.

* levels: fix map12 HOM.

There was a reason why those lifts were defined with so few linedefs.

Those huge spans of DOORTRAK still looked awful at low resolution though so I swapped them out for some hopefully vertical-looking bits of tekwall.
2023-04-22 11:27:58 -03:00
mc776
47780ca640
levels: bugfix: restore map27 lizardbaby on easy. (#931)
Addresses #930.
2023-04-22 11:26:49 -03:00
mc776
44c1d7e675
levels: revisit Map11. (#934) 2023-04-22 11:22:57 -03:00
mc776
974a42910e
buildcfg, levels: implement new flats. (#933)
#888 didn't actually add the new flats to the build instructions.

Now that they are usable, I've updated the Map26 crushers to use the bodies flat that I'd originally wanted instead of the skulls.
2023-04-22 11:21:29 -03:00
mc776
789287b301
levels: address map29 artificial difficulty. (#938)
If you pistol start this map, on the teleport into the tower you will be forced to get helplessly shredded by serpentipedes while you're switching to the polaric that's right at the destination. A second one has been added on the platform with the backpack that leads to the teleporter, and the current one has been flagged as multiplayer-only.

Right after this is the blue key, which cannot be retrieved without taking damage from the hurtfloor below. There's no reason to be anywhere near this pit after the blue key so the double telepads doesn't even make sense, except to warp the occasional spider into the starting room which just looks silly. To address all these issues, there is only one pad, right next to the rocket launcher switch, which lines are monster blockers, and the blue key platform is now *higher* than the ledge you reach it from so you can see it moving, retreat back into the tower, and go back to the RL platform and reach the telepad without touching the lava.

The medikit with the blue key has been moved into the main ground area in the northwest.

The jump from the wood tower onto the teleport to get into the stone tower is now surrounded by monster blocking lines.

Got rid of two things that seemed intended only to spite the player:
- the sub-shotgun in the green room, which would cause a weapon-switch just as you face the painlord at the top of the lift, is now just two packs of shells.
- all four doors of the minigunner shack are usable. (They are also equally lit, unlike previously when one of them was slightly darker and it wasn't the one that was usable.)

Added a radsuit and medikit to the back of the green building, so that exploring that area isn't merely unmitigatedly punished.

Added a visible light source to each of the indoor areas.
2023-04-22 11:18:42 -03:00
mc776
7e86777832
levels: build e4m1 nodes. (#940)
Addresses #939.
2023-04-14 21:00:02 -03:00
Steven Elliott
5b4db2b7d1
CREDITS: Add Jaden LeMieux (iRedMC) (#929) 2023-04-09 13:39:35 -03:00
Steven Elliott
062018479f
Merge pull request #925 from andOlga/master
Update GitHub Actions "make" script
2023-04-02 14:28:40 -04:00
&Olga
aef5a102dd github: Update GitHub Actions "make" script
Update to the latest supported GitHub API:
  * Update from v2 to v3 of actions/checkout.
  * Update from ::set-output to $GITHUB_OUTPUT.
2023-04-02 14:19:09 -04:00
Steven Elliott
fb2db61ff1
Merge pull request #924 from mc776/quitmsgfix
dehacked: fix quit messages.
2023-03-31 19:38:49 -04:00
mc776
5983f26c38
dehacked: delete stray backslash. 2023-03-30 09:23:12 -07:00
mc776
944b790c93
dehacked: fix quit messages.
The messages hadn't been checked for length. Fortunately caught relatively early because the only string that shows up in vanilla (and thus would cause a crash) is also one of the longest ones.

I've also amended two things in the text itself:

1. big burly violent guy who's all about freedom and blaming scientists for things is...... not something that's aged well. And when a corporation is involved you know it's the investors pushing for the bad thing and not the actual researchers on the ground.

2. that other quit message literally reads like you're goading someone into suicide IRL, in the current environment where everybody's depressed and a lot of us have lost important people to plague or war or medical neglect or workplace accidents or violent bigotry or any combination thereof. I've taken the liberty to rephrase it so the emphasis is on what I think was intended.

Threw in a replacement for "exit to DOS" as well.
2023-03-30 09:22:00 -07:00
Simon Howard
9621c2fbf7
Merge pull request #888 from mc776/goreflats
flats: add bloody skulls and bodies.
2023-03-29 09:47:28 -04:00
Simon Howard
b800920a82
Merge pull request #896 from mc776/ssgfix
dehacked: shorten SSG flash.

Fixes #678
2023-03-29 09:46:10 -04:00
Simon Howard
838aaefb11
Merge pull request #915 from mc776/dspopain
sounds: replace DSPOPAIN.
2023-03-29 09:45:08 -04:00
Simon Howard
ae70321322
Merge pull request #919 from shinobody/armorred
New basic armor and edited armor bonuses
2023-03-29 09:44:37 -04:00
Simon Howard
59a4c4b1d5
Merge pull request #878 from jadenquinn/master
Added old C2M3 music back into Freedoom as C1M3!
2023-03-29 09:42:16 -04:00
Simon Howard
5196301c9f
Merge pull request #917 from mc776/moremapfixes
levels: yet even more minor fixes.
2023-03-29 09:41:33 -04:00
Simon Howard
990445f0dc
Merge pull request #914 from mc776/newintertext
dehacked: rewrite intermission texts.
2023-03-29 09:40:35 -04:00
Simon Howard
038e4af3e5
Merge pull request #624 from ObsidianPlague/patch-1
Quit messages
2023-03-29 09:38:53 -04:00
Simon Howard
c1452eedc1
Merge pull request #913 from mc776/shtga0fix
sprites: reshade SHTGA0.
2023-03-29 09:36:45 -04:00
mc776
8f084e661c
levels: remove new map32 cage.
I was grossly overthinking the issue of needing to prevent the player from proactively maneuvering before the action begins. Someone who's played the start a couple times would be able to do that anyway.
2023-03-27 18:23:05 -07:00
mc776
d8bc8c69de
levels: misc. E3 minor fixes.
E3M1: Rearranged the two "spinal columns" inside the first entrance. The chamber is larger and the columns are not perfectly octagonal (both to align the textures and to get rid of the fake contrast) and one of them is significantly larger than the other.

E3M6: replacing the (not even working right, you could see the floor moving) flat bleed rising painlord with one that warps into that spot. Changed the textures inside the hatchling fireplace so you're seeing fire everywhere from the inside.

E3M7: Slapped some textures onto the otherwise flat bleeding temporary monster blocker. The difference is barely noticeable even if you're deliberately looking for it.
2023-03-27 17:44:38 -07:00
mc776
abcc1d2eb4
levels: remove Map02 exit sign flat bleed.
This is the same solution I've proposed to address #920 and was planning on posting this only after some resolution was reached about that, but others have confirmed this does look way cooler than the original exit sign so here we go.
2023-03-27 10:19:24 -07:00
mc776
1b14bb26bb
levels: remove flat bleed tricks in Map20+29.
Map20: Just added textures to the lava jump and made the sectors thinner. No one's going to see them outside of deathmatch without noclipping anyway.

Will just leave the hole in the red arena ceiling where it is - players don't look up anyway.

The little red button in the closed-off brown metal area also uses flat bleeding (which frankly I'd taken as precedent to let me do this with the other stuff at all).  Turns out it's perfectly visible with the light reduced to the surrounding area so I have done that (and also added some downwards movement of said button).

Map29: Moved the spectres out of LOS.
2023-03-27 10:13:04 -07:00
mc776
e6a17952cb
levels: remove all map26 flat bleeds. 2023-03-27 08:56:39 -07:00
mc776
cb2312400f
levels: remove flat bleed effect from map26 start. 2023-03-27 02:58:35 -07:00