* levels: more minor fixes.
E3M7
The columns blocking the painlords from wandering too far away from the teleport line were spread far enough apart that one of the monsters could pass through and not be able to come back. Two more columns have been added.
E4M7
Around the hall of nukage and six pillars:
- The stairs to the east needed more clearance in the ceiling.
- The nukage now lowers to -24 instead of -40 or -48.
- The BRNPOIS is corrected to BROWNGRN.
E4M9
The eastern backpack secret exited to a ledge far above some monsters right below it, a big vanilla-compat no-no. Everything's been redone so it's all on ground level. The gargoyle wallpaper has also been replaced with something that might align a bit better there; the remaining gargoyle heads now mark the secret.
* levels: adjust Map11 skull room.
- The monitors needed de-aligning after COMPUTE4 was expanded.
- The sloppy switch skull has now been replaced with another skull, and a poison sign has been added to the collection.
* levels: unstick map11 minigunner.
The one right next to where the red skull is now had been an unfortunately overlooked casualty of moving that ledge around.
E1M2
- Fixed the heights of the little yellow pillars to match the rectangles.
- Fixed up some textures in the secret near the exit.
Map29
- Added Catoptromancy's big stash of ammo on the yellow key pillar.
- Added some radsuits in the home base.
- Fixed some texture alignment issues in the home base.
The area behind the line was too short to be recognized by GZDoom though it was working fine in vanilla - I think GZDoom checks the line crossing from the center or something.
* music: restore korp's dm07; move rost's new tracks
Addresses #965 with an edit of the original music rather than an entirely new track.
Moves rost's recent submissions to two other maps that need new music.
* Update CREDITS
Quick fix pending further action re: #1007.
- make weird twitchy alien pod thing implied to be consumed by guy stranded on alien world.
- expected: players infer this is some alien critter that has no direct terrestrial taxonomic parallel.
- actual: incessant complaints that the plant has no roots.
Maybe it was a mistake to shy away from more explicit language in the pickup messages.
Did a bunch of other pickup messages to match.
I'm open to suggestions or corrections. I will consider editing the sprite if someone really can't get over "polyp" with no tentacles.
* levels: new e2m1.
Starting area by Xindage, cave area and monsters/items by me.
* levels: add secret minigun to new E1M2.
* levels: fix e2m1 fan texture.
Just noticed that mixup in nful2's screenshot.
Not sure how that got changed.
* levels: split E2M1 air/water screens.
Ideally we'd have two more TSCRN1 graphics to fill out COMPUTE4 (and maybe PLANETS?) but let's get it looking right with what we have now.
* Update CREDITS
* 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.
The base of the barrel remained consistent in its last two frames, causing it to seem very static and unaffected before suddenly disappearing. This adds a bit more of a gradual disintegration.
The octaminator has a few fixes:
- the tentacle suddenly appearing behind it in the final frame didn't look right. It's been reduced and a hint of it is given in the preceding frame.
- the antepenultimate frame show the right shoulder falling much further to the side than the frame after it shows. That arm is moved closer to the centre.
- got rid of some of the pillow shading on the right front tentacle-leg in the last two frames.
* Add Double Impact MIDIs with a placeholder for E4M2.
* update credit for e4m3 (author now goes by Matzu)
* New E4M2 by R0rque
* Update credits and add reverb to E4M9 track.
---------
Co-authored-by: mc776 <24984517+mc776@users.noreply.github.com>
* Delete d_dm07.mid
* Add files via upload
* Update CREDITS
Added "
S: rostuhan
E: rostuhan123@gmail.com
D: D_DM07 music
"
* Update CREDITS
Moved it to the end.
* level: more fixes.
E1M3
- Minor item floating in one of the staircases.
E1M7
- Widened the item trenches in the northwest switch room to minimize the chance of a floating item.
- Narrowed the water trench in the southeast switch area to prevent someone from squeeze-gliding in.
E1M9
- Funny-shaped nukage bridge no longer has visible switches. Instead, that railing can be used from the outside anywhere along any of the long sides to lower it.
- Door on the north of that bridge was missing a doortrak.
E3M5
- Northeast giant blood pit had floating items in the new ledges. (Those bits are now also 100% pure meat instead of the rocky crust on top.)
E4M4
- Secret in the southwest is now the room instead of the doorway. Lighting adjusted accordingly.
E4M5
- There's an obscured lamp in the northwest that's supposed to look (in id) like a small lamp placed on top of the box. Freedoom's yellow lamp doesn't work for this, but Freedoom's candle sprite is perfect for the intended effect, so now it is that instead.
E4M6
- Various thin secrets.
E4M7
- Thing no. 580 was the wrong type and bled into the ceiling (see #941). The blocking version is now used instead.
E4M8
- The secrets by the starting area are now the rooms themselves instead of the doorways.
Map11
- Untagged the lizardbaby-triggered doorway as secret.
- All lizard baby sectors are now 72 units tall.
- Realigned the vines in the trilobite corridors overlooking the western atrium.
- Berserk red key secret room lengthened to guarantee having to step inside it.
- Red key is now at a different location, the platform now being a teleporter to it, allowing the location of the red key to be a single sector that can be flagged as a secret.
- Replaced the light source in the yellow skull room with something less likely to have already fallen over.
- Replaced the evil eyes with tech lamps since those aren't shootable.
- The trigger for releasing the pain bringers in the nukage fountain is once again a walk line.
Map16
- Every sector in the backpack secret was tagged as secret, leaving a total of 3 secrets one of which was skippably thin. The skippable is now untagged.
Map18
- It was possible to squeeze into the blue key pillar to trigger the ambush prematurely. The pillar is now the entire 64x64 platform.
* levels: more fixes.
E3M7
- Ambush-flagged and moved the pinkies in the lower small intestine so they stop trying to block the player from below either drop.
- Got rid of some orthogonal lines in the intestine to get rid of the fake contrast.
Map11
- Jump-proofed the decorative canal areas near the final arena.
- Some attempts to address #996.
Map14
- Removed the close-30-seconds door for the descending serpentipede monster closet because if they all bunch up like that while you have an SSG it's a boring wait afterwards. Have fun being hunted by them in the corridors!
- Addressed #996 in the south.
Map15
- Made the two lifts to the red armour secret visually consistent with each other.
- Some feeble attempts to address #996.
Map17
- Jump-proofed by Catoptromancy: numerous platforms raised above what should be jumpable in most sourceports that enable it by default.
- Added a backpack by the corpse near the start, as playing the map "right" and refraining from shooting until you get the tripod puts you in significant danger of running into a shellbox while at near full.
- The stairs inside the living room are flush up against the wall, so you don't waste time falling off and getting back on.
- The window texture now better matches the light falling on the floor.
- Moved Tree #73 and #37 as they were being invisible jump-blockers from below.
- Restored there being three chunks of rock for the blue key.
- Changed up a lot of textures in hopes of creating visually distinct areas.
- Added an extra secret in the start tunnel.
- Made the switch in the water go to 8+LAF fast instead of lowest because those weird sudden flat changes didn't look good.
- Shrank the pillars near the yellow key so you could move around all of them.
- Changed the torches inside the southern switch corridor to techlamps, and added new torches around the entrance to the eastern building.
- Changed the hanging corpse in the living room to another hanging corpse. (see #941)
- Made the couch look more like a couch. And one that's been in a war zone.
Map23
- Replaced the haphazard texture on the northern teleporter room and added some light sources.
- Improved the trim around sector 236 so the door doesn't go right into the curve.
- Used the correct CONS1 flat for sector 246 and shrank it accordingly.
- Addressed #996 in the south.
- Moved the (non-hanged) corpse in the starting secret out of the doorway. The way it hinted at the true nature of that wall was really neat but sadly doesn't play well with software renderer.
Map25
- Southern curved tunnel had a single orthogonal line that led to a misleading fake contrast.
- Some feeble attempts to address #996.
* Delete map17m.wad
* levels: restore old e2m1.
* levels: address E3M6 softlock.
see #998
* levels: various fixes.
E1M2
Fixed some missing and misaligned textures around the secret lowering computer block.
E2M5
The red key bars could both be squeezed through and jumped around on a jump-enabling sourceport. The red key now raises the stairs instead, and the final door before the exit also requires a red key.
E2M7
Added one more bar in front of the exit to prevent squeeze glides.
E3M2
Expanded yellow key pillar so it would match the flat.
E3M6
Untagged the skylight inside the secret as being itself a secret.
E4M1
That line of health and armour bonuses just inside the big building would have a few floaters. They've all been moved forward and should be fully clear of that ledge.
Map05
The pit with the central column of water and the spectres was being blocked off by said spectres before the player could jump into it. There is now a monster blocking line right in front of the ledge, barely far enough to guarantee space for you to drop but close enough to let the pinkies bite.
You can now freely move through the gaps between any of the objects in the blue key room.
The exit from the blue key building now has a lift instead of stairs, and the wall prevents the nearest pinkies from seeing you until you've actually dropped inside. Hopefully this at least mitigates the problem of being stuck on the stairs with a pinkie right below your ability to target.
Miscellaneous aesthetic tweaks.
Map07
The lift overlooking the big arena was still suffering from monsters blocking from below. It has been moved to the side with an intervening ceiling.
The central grey aquatex nukage trim hub was a cross shape and the exits all had very strong lines turning right, making it look like a swastika. The southern section has been tweaked to throw off the symmetry and avoid that impression.
Made it possible to move all the way around the stack of crates in the eastern area with the switch.
Miscellaneous texture improvements.
Map08
The exit bars are now impossible to squeeze glide through. They are also styled in the same manner as the moving pistons by the big switches, giving the suggestion that they would be moved in a similar manner.
Map09
Fixed some floating pickups at the collapsed roof, the red key room, and the stairs to the warehouse admin area.
Shotgun guys in the admin area switch room are now situated between the deep cracks that were preventing their movement.
Map12
Turned the two wall-facing enemies around near (2016,96).
Added a second trigger line for the minigunner ambush store room so it happens even when you approach it from the other side.
Added a second switch for the bars normally opened before reaching the storage room ambush.
Replaced the BFG secret with a megasphere since you already get a BFG in Map11.
Map18
There were some lamps on the lower floor of the southwest room that were invisible from the higher floor but would block your movement. All major blockers have been deleted or moved to the edge of the room.
The tree near the red armour to the right of the start has been moved for similar reasons.
Map20
Moved some pickups (and the dead body) away from the bottom sides of the steps to reduce the chances of someone bypassing them while moving downwards.
Made the armour/health bonus placement more unambiguous around the cross and star.
Simplified the bridge around the red key so that the rising portion is only one sector.
Map22
Because this map has been disproportionately harder to pistol start than anything near it...
Moved all 4 player starts into the starting elevator to avoid a hot start.
Flagged some ammo pickups as appearing on all skill levels, as well as the southern super shotgun and the starting area armour. The easy-only SSG in the starting area is now a chaingun and appears on all skill levels.
The starting shotgun is now only available on easy, with two shotgunners (one of them guarding the armour) in its place on medium and hard.
Differentiated the walls of the starting elevator so you know which way to face, and made the switch resemble the normal (but broken) SW1TEK.
The switch system itself is simplified and given a simpler implied story: the big switch is broken, so you locate and use the backup system. The switch shooting is gone.
Made the fringe around the lava elevator go all the way around and populated it with health bonuses to make it clear you're actually expected to go down there, because frankly the original is so thoroughly obscured it looks like you're breaking sequence by exploiting an oversight in the map.
Extended the staircase down from the brown platform to mitigate the "pinkie right in front of you below your aim" effect.
Added a medikit near that brown platform.
The armour in the crate hall is now a medikit.
Map24
The hanging bodies in the red key room are now the non-blocking versions.
The trilobite stuck on the teleport pad in the square maze is now an octaminator so it doesn't get stuck.
The lines around the door leading to the serpentipedes with their backs to you no longer block sounds.
Removed the sound block flags on the octaminator ambush doors, so the pinkies can join in if you start shooting at them instead of powering through into the new room.
Map26
Health bonuses under crusher were floating.
Map27
Lizardbaby platform now has a full 72 unit clearance.
Spectres in the red rock area to the northeast are now in the tunnels and only come out when you land in the red water.
* levels: fix one screwy texture.
Monitor in the room west of the westmost shiny lowering shelf thing.
* levels: more minor fixes.
E2M1
Life surge secret was marked on the thin doorway, making it possible to fail to register even after you've taken the surge. The secret is now the room itself, at the cost of that random light effect.
E2M6
Life surge secret was marked on the thin central bit of the sigil, leaving *lots* of room to step around it while grabbing the powerup. (The fact that the red makes it kinda look like a hurtfloor really doesn't help.) The secret is now the larger room itself.
Map12
New eastern storage room trigger wasn't covering the entire hallway. It should also be diagonal to minimize the chance of it being skipped entirely.
Map28
The serps on the ledge by the bloodfalls and fleshy sigil were facing the wall and marked as ambush. They now face the actual play area.
Map29
Moved all the secret pit pickups a little bit further inside the square so they look like they're resting on the surface of the solid floor.
Map30
The multiplayer-only spawn pickups are now flagged as multi-only.
* levels: tiny map04 aesthetic tweak.
The fake contrast exaggerates the shadow on some "AGM" silver columns while eliminating the shadow on others. These are often right next to each other on the screen, producing absurd results. This moves 1 vertex from each affected line 2 pixels so they are no longer orthogonal.
commit 89f918f517 last year changed the manual to build as an A5
booklet. However, some of the tables now look very compressed with the
smaller page width. We can make things look a lot nicer by reducing the
number of columns:
* Weapons table: sprite column is eliminated (sprite is kept, but moved
to the name column), and ammo column (moved to description column).
This is a reduction from five columns to three in total.
* Special items table: name and description columns are merged. This is
a reduction from three columns to two.
* Monsters table: name and description columns are merged. This is a
reduction from three columns to two.
This is ConSiGno's OPL instrument patch table, found here:
<https://github.com/sneakernets/DMXOPL>
This is the result of many years' development and probably the
highest quality Doom OPL instrument set that's ever been developed. I've
obtained permission from ConSiGno to submit it to Freedoom, with the
following small omissions from the upstream version:
* Instrument 107 (Shamisen)
* Percussion 36 (Bass Drum 1)
* Percussion 69 (Cabasa)
* Percussion 76 (Hi Wood Block)
* Percussion 77 (Low Wood Block)
In doing due diligence I found that the patch data for these instruments
matched the patch data from Doom's GENMIDI table. Just to be
meticulously safe we'll keep the old versions of these (nothing, in the
case of the Cabasa). Other than these, every other instrument has been
replaced with a new patch.
Pretty much every Sound Blaster-compatible card used an OPL3 chip
(everything since the Sound Blaster 2 in October 1991) so it seems
reasonable to add this as a requirement. Because of the way that the new
waveforms are arranged in OPL3, it's a pretty graceful degradation if
they're used on an OPL2 anyway (see datasheet, page 14).
This adds dumping for the tune= field that was just added in commit
276118107, but also:
* Instrument name gets put in a comment at the end of line - like the
current configuration in config.py.
* Instrument calls get split across two lines when there are many
parameters, to try to keep to 80 columns.
* off1= and off2= parameters now get outputted as +x or -x rather than
just x or -x.
The fine tuning field was previously being hard-coded to the value of
128 with no option to change it. DMXGUS in particular makes use of this
field to tune individual instruments, so let's add proper support for
it.
* levels: minor fixes.
E1M3
- Nukage level in the bridge before the blue key was too log, resulting in not only a texture misalignment on the safety lift but also making a secret inaccessible.
- Fixed the tutti-frutti and misaligned terminals near sector 255.
E1M4
- Potential soft-lock if jumping out the window in the starting area. That outside area now has a one-way route back to the map start. (It is still totally inaccessible in vanilla and thus there are no new pickups or monsters there, and the door is "secret" on the map even though it doesn't actually award any secret to open it.)
Map09
- Moved the rocket launcher secret in the southeast to connect with the path leading up to it, preventing the need for an extremely precise jump to get in even when you know where it is.
* levels: change map01 secret sector tag.
The secret tag was on the door sector itself, which made it easy to accidentally jump over it via the raised platform in front of the door so it wouldn't be triggered properly until you were on your way out. The secret tag is now on the little corridor instead.
* levels: fix Map10 issues.
Map10
- Changed the line special in the western super shotgun secret to keep the door sector itself from also becoming a secret sector, while fixing the texture alignment inside the secret itself.
- Moved some shotgun shells to stop them from floating above the sectors directly below where they appear to be.
GojiBerry should be credited for "sound" not "levels". Also, the
"=======" at the end is almost certainly left over from a previous git
merge conflict - it has exactly the seven characters expected. I kept
it until now thinking it had some meaning to something, but that's
unlikely.
* levels: improve e1m7 signposting.
Nearly all remote doors with switches more than a room away are now either the big brown door, the big AGM door, or the small tan door with the tan stripe going down the middle.
The first lift into the maze now has something eye-catching on the side.
Fenced-in area around blue key no longer has any invisible blocklines. You can jump down into the nukage if you want - the sequence break won't trap you, even if you fail to pick up the blue key here, and there's no reason in principle it shouldn't be considered a legit way to get through this 3-key, only-yellow-obligatory-for-exit map.
The bars around the armour near the blue key are now the correct silver bars.
The switch to lower the yellow key is now much, much more visible.
The red carpet switch that opens up the exit room is now turned around so you are facing the general direction of the door that it opens.
The windows around (1240,2320) now use a glass texture instead of being invisible and impassable.
That vent shaft bit is now dark, and its doors are no longer the "this is not a real door" texture.
The lift at the northern centre now has its down button right by the platform instead of some ways down the hall from it.
* levels: make first major door in e1m7 obvious.
That big silver pillar was just enough to make that door unrecognizable to me from a distance. It's poorly lit and surrounded by much more eye-catching details - half the time I manage to find the minigun secret, then run around the room half a dozen times wondering what to do next.
The corpse just behind the very first door has also been moved to draw the player's eye towards that door as well, which also helps move it away from the player corpse in the starting room.
Also fixed the HOM in the first lift into the underground maze, as well as changing the eye-catching thing into something a little bit less of an eyesore compared to its surroundings.
* levels: fully jump-proof e1m7 secret.
The jumpable parts no longer count as secret. Removed a bad secret tag on the new bars.
The platform the minigun is on had to be expanded to ensure the player would be on it before grabbing the gun.
* levels: rebuild nodes
Ran "make rebuild-nodes"
* levels: Cleanup Eureka errors in two levels
freedoom1.wad
E2M2 Fix missing texture linedef #311 back of teleporter
freedoom2.wad
MAP09 Fix missing texture linedef #1937 back of teleporter
The fix-gfx-offsets script incorrectly used unsigned integers (I) when
interpreting grAb chunks, which resulted strange large values that are
close to 2^32 in buildcfg.txt. The fix is to use signed integers (i).
Add scripts:
fix-deutex-pngs - Apply the output of deutex to the build
map-color-index - Map from one color index to another
Script fix-deutex-pngs is to standardize PNGs by applying the result of
the expanding IWADs produced with deutex to the build. It is invoked by
build target fix-deutex-pngs
Script map-color-index can map from one color index to another. Most
likely it will be used to map form legacy transparency 255 to similar
color 133, which can be done by build target
fix-legacy-transparency-pngs.
