Commit graph

348 commits

Author SHA1 Message Date
mc776
f5de62efdd
dehacked: imply nanoroll lore.
It's a roll of gauze, not a canister - something I almost forgot until I took a much closer look at the sprite.
2023-07-14 12:06:58 -07:00
mc776
bb10f0e034
dehacked: imply lore.
- 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.
2023-07-13 22:18:04 -07:00
mc776
5fcfb60374
levels: new e2m1. (#994)
* 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
2023-07-13 11:45:03 -03:00
Alexandre-Xavier Labonté-Lamoureux
53296099dd
Replace DM22 with another map and move old DM22 to DM32 (#777)
* Add credit for previous contributions

* Move DM22 to DM32 and replace DM22 with new map
2023-07-10 23:49:30 -07:00
mc776
8f8ed90acc
textures: make COMPUTE4 256 wide. (#1012)
Addresses #995.

PLANET1 is already OK.
2023-07-10 08:45:03 -07:00
Simon Howard
8c0a4bc4c5 genmidi: Import DMXOPL instruments.
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.
2023-06-24 01:09:42 -04:00
Simon Howard
bf01cc746f genmidi: Disable OPL2 waveform checks.
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).
2023-06-24 01:07:50 -04:00
Simon Howard
a94ae50ffb genmidi: Better dumpgenmidi output.
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.
2023-06-24 00:50:53 -04:00
Simon Howard
ffb7348b8e genmidi: Strip instrument name trailing whitespace.
Some of the DMXGUS instrument names seem to have long sections of
whitespace like this, and we can clean it up while dumping.
2023-06-24 00:49:26 -04:00
Simon Howard
276118107b genmidi: Add tune= for setting fine tune field.
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.
2023-06-24 00:46:52 -04:00
&Olga
e88e10208b
Fix name for E2M4 (#980)
Makes capitalization consistent with all the other maps.
2023-06-11 01:48:24 -03:00
mc776
0504a719b7
textures: add patches to M_xDOOR. (#962)
Addresses #961.
2023-05-03 19:59:20 -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
44c1d7e675
levels: revisit Map11. (#934) 2023-04-22 11:22:57 -03: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
b800920a82
Merge pull request #896 from mc776/ssgfix
dehacked: shorten SSG flash.

Fixes #678
2023-03-29 09:46:10 -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
mc776
e9a20ce815
dehacked: update C3, C5, C6 texts.
C3 restructured and C5 rewritten by @shinobody with edits by me, C6 loosely based on @shinobody's rewrite that had interpreted the map as a barracks instead.
2023-03-22 20:05:57 -07:00
mc776
629c6e0289
dehacked: tweak E2 endtext.
The previous was a poorly remembered "what's a bit of X between friends" meme. It doesn't work here.
2023-03-21 23:21:47 -07:00
mc776
c9f4cecc18
dehacked: tweak Phase 2 intermissions.
Yes I've now made that reference for both intertexts that had the word "wasteland" in it.
2023-03-21 19:30:39 -07:00
mc776
cfb0a3eee3
dehacked: rewrite E2, E3.
E2 is my rewrite based on discussions with @shinobody, and E3 is @shinobody's with some edits by me.

More revisions hopefully to follow soon.
2023-03-21 15:02:28 -07:00
mc776
59732956e8
dehacked: adjust C3 text.
"deep into its territory" deserves to be its own line, especially to help emphasize the line I'm making these changes to include.

I also keep wanting to say "armies", plural, for some reason. Which at least works to explain all the infighting...
2023-03-20 20:27:55 -07:00
mc776
505874640b
dehacked: rewrite C3 intertext.
Someone just quoted the "no human has ever survived here" unprompted on Discord. If it's that memorable let's keep it.

"Man" for this in the two thousand twenty third year of the common era was still a bit cringe though.
2023-03-20 20:20:45 -07:00
mc776
6ebe395d49
dehacked: rewrite intermission texts.
Reposting #868 because that was way too many commits.

The current ones have lots of sentence fragments that are somehow austere in tone while still having lots of unnecessary words - a combination that doesn't exactly flow too well. This is an attempt to rewrite a lot of them while trying to keep all the critical elements of each.

A lot of the "it doesn't matter, who cares" / "oh. a trap. AGAIN." talk also felt like it would pull the reader out of the game, however in-character it was clearly intended. (I understand it's inspired by "where's your fat reward and ticket home" from Doom E1 but if you look at all the other id intermission texts things are much more triumphant and hopeful in tone - D2's "There must be a way to close it on the other side. What do you care if you've got to go through Hell to get to it?" is more bravado than despair.)

Replaced some things that create expectations of specific things to be found in the very next map but aren't there - the Map06-7 lift (you start on a teleporter pad), the Map11-12 platform bolts (you start just inside the door), the "massive doors" of the Military Labs (you start on the end teleporter immediately after E1M8), etc..

"Dissipitates" isn't exactly release-quality standard diction.

Some lines were rearranged so that natural sentence and phrase breaks coincide with line breaks - everything has been tested on Chocolate, it seems we do have more room to work with than the previous writers seem to have thought. (If someone out there *specifically intended* to make sure the sentences spill over into the next line in the absence of a paragraph break I'm willing to listen to reasoned argument about it.)

I have, of course, left the iconic final three lines of Phase Two untouched.
2023-03-19 13:25:54 -07:00
mc776
1e2b88cff6
Merge branch 'freedoom:master' into ssgfix 2023-03-18 15:33:12 -07:00
mc776
d7befc62d8
dehacked: just say "invisibility".
You're not really infiltrating anything with this powerup (GZDoom weirdness notwithstanding); meanwhile, it's generally assumed in the story that the monsters will have some idea that you're around somewhere and they should be shooting in your general inferred direction. Most of them can probably locate you by sound or even smell or possibly even psychically, but they won't have the precision of being able to see you.

There's no real need to qualify the invisibility in this context, and given the options available under the letter I the need for this specfic word is practically a functional requirement.
2023-03-18 11:11:06 -07:00
mc776
c471171a44
dehacked: remove misleading "hundredfold". 2023-03-17 07:58:12 -07:00
mc776
2944743701
dehacked: make idbehold msg a question. 2023-03-16 23:25:39 -07:00
mc776
54e24ca926
dehacked: set better tone for blursphere. 2023-03-16 22:12:07 -07:00
mc776
79c5bbb10f
dehacked: improve pickup msg & nightmare warning.
Makes the verbs consistent, gets rid of all references to spheres, gives terms to all powerups that line up with their corresponding IDBEHOLD cheats*, and hopefully reduces the bathos of the health-adding spheres a bit.

Also makes the nightmare skill level warning a little more accurate and explicit, instead of sounding like it's just the standard advanced user mode.

*It turns out the options on the idbehold cheat message also need to be abbreviated as the current one is cut off, so we can't really do the "letter = " stuff.
2023-03-16 19:02:20 -07:00
mc776
2612b21dbf
Merge branch 'freedoom:master' into ssgfix 2023-03-15 12:00:18 -07:00
mc776
fd621ff7ad
textures: allow SUPPORT2 to tile. (#905)
Addresses #904. Defines the SUPPORT2 texture as though the SUPPORT2 patch were always 64 pixels tall.

A few pixels on the patch itself have been adjusted to get rid of a slightly visible seam, but the full patch height of 72 is unchanged.
2023-03-15 07:49:28 -03:00
mc776
2d51093722
sprites, sounds, manual, dehacked: add Octaminator 2023-03-11 17:01:54 -08:00
mc776
78c0868fff
dehacked: shorten SSG flash.
Addresses #678.
2023-03-10 19:06:13 -08:00
mc776
a00004ad9b
textures: fix MIDSPCSM. (#895)
* textures: fix MIDSPCSM.

TIL a completely new patch is needed and you can't just crop the existing one.

* patches: run rw47_2.png through pngcrush.
2023-03-10 20:17:56 -03:00
Steven Elliott
8f29444926
lumps: Fix phase 2 demos (#891)
This commit fixes the obviously broken demos which happened to be the
phase 2 demos.
2023-03-10 19:58:07 -03:00
mc776
6f5067e328
textures: add smaller MIDSPACE. (#885)
A lot of IRL chainlink fences aren't nearly as tall as the full-height 128-unit texture we have now. An extra fence texture can be useful when creating more realistic environments.
2023-03-02 07:32:52 -03:00
mc776
8d8da049f7
sprites: new armour pickups. (#860)
* sprites: new armour pickups.

At this point they're not really just "vests" anymore so I've changed the pickup message as well.

* sprites: darken armor pickup shadows.

The darkest bits were far too light, making the sprites look floaty and billboardy compared to typical (Free)Doom assets.
2023-02-14 11:13:57 -03:00
mc776
30283e08c9
dehacked: fix some map names, revise one more.
DM21 typo; DM12 use the most neutral version of that abbreviation.

Map11: it is neither infinite nor a plain. Inasmuch as it's a misleading name it's arguably a great name for a map that's basically a ceaseless parade of misleading gotchas (fake doors, switches requiring multiple backtracks to find out what you need to do to progress, secret areas that kill you, etc.) but it just feels like this name used to be for a different map (maybe a followup to the immediately preceding Outlands) and no one bothered to update it.

Someone who actually enjoys this map please feel free to suggest a different name.
2023-01-02 17:35:14 -08:00
Steven Elliott
9837e5620d lumps: Delete dysynched DM demo 4
DM demo 4 may be replaced before the release, but for now it will
simply be deleted. With this change freedm.wad will only have 3 demos
wheras freedoom[12].wad will still have 4 demos.
2022-12-29 08:37:52 -05:00
Steven Elliott
0471ae7a5d lumps: Fix phase 1 demos 2 and 3
For phase 1 demos 2 and 3 have become desynced. These replacement demos
are for the same levels.
2022-12-29 08:30:38 -05:00
Catoptromancy
ab769a835e lumps: Updated demos
New demos to fix desynced (broken) demos as well as to showcase new or
updated maps since the last release.
2022-12-29 08:26:15 -05:00
Xindage
8378c26954
Merge pull request #838 from mc776/map27name
dehacked: change Map27 name.
2022-12-11 10:28:27 -03:00
mc776
b1aa4ea777
dehacked: change Map27 name.
Addresses #798.
2022-12-07 08:09:36 -08:00
Steven Elliott
d4c50a2f4d levels: DM08 Restore the circular saw blades
Prior to the Eureka cleanup DM08 had circular saw blades on the left
side of the map via texture SLAD2. Unfortunately Eureka falsely flags
SLAD2 as a Medusa causing textures for middle textures since it
contains more than one patch. This fixes introduces texture SAW2 which
only contains the SAW2 patch, and which therefore does not cause the
Eureka warning. It should look exactly the same to the player.
2022-12-05 20:09:07 -05:00
Simon Howard
c079cb00ea
Merge pull request #804 from Xindage/texmerge
Revision one of freedoom textures.
2022-08-26 12:14:51 -04:00
Xindage
82aec99e71
Give map names.
Not much to say, just names...
2022-07-14 19:46:12 -03:00