Commit graph

307 commits

Author SHA1 Message Date
Mike Swanson
4ccdc785d0 colormap: use a crispier grayscale algorithm
Instead of averaging the RGB values, use a formula that better
approximates how the human eye sees color.

Formula was taken from this page:
http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/
2019-08-24 16:57:42 -07:00
Mike Swanson
6566845f05 patches: use a single patch for SKY4 instead of multiple
Some mods (eg, crusades.wad) try to use SKY4 to (re)define other
textures, which doesn’t work in vanilla Doom, and the normal E4 sky
ends up creating a medusa effect.

While it is sad to see our light source go, reducing the effectiveness
of Double Impact’s lighting effects built into some of the maps, we
should prefer mod compatibility with Ultimate Doom.

Resolves #589
2019-08-24 15:37:53 -07:00
Mike Swanson
8f4ab8401a dehacked: place commas inside quotation marks 2019-08-24 02:44:16 -07:00
Mike Swanson
85e00b3057 lumps: lowercase the not-proper-nouns of monsters and weapons
Except for SKAG which is an ancronym, the rest of these belong in
lowercase as they are not proper nouns.

Unlikely to actually have a visible impact in-game, but it is nice to
follow English convention in the source.
2019-08-23 22:30:07 -07:00
Mike Swanson
05d77c8958 Rename “Flame Bringer” to “Necromancer”
Resolves #578
2019-08-23 22:19:32 -07:00
Mike Swanson
cf3b8e7da3 lumps: swap Phase 1 DEMO1 and DEMO4, no more netgames in DEMO1
Vanilla Doom locks out the load game option while playing a netgame
demo, and we should not lock it out so soon after starting the game.

Resolves #579
2019-08-19 13:22:27 -07:00
MatthewTheGlutton
da318e3134 More intermission text adjustments (#572)
* More intermission text adjustments

I still hate that "...", but I'm starting to think the aggravation is not really that itself but the use of a direct quote for "you" the player for something they never actually said.

So looking at the E4 text again to see how it could be avoided, I noticed a bunch of other little weird things... the past tense on the first sentence clashing with the rest of the present tense; the "despite" doesn't really fit with the logical progression; and while I know exactly what "plump down" was intended to convey it seems a bit nonstandard. It's also missing punctuation at the end, in contrast with the other intermission texts.

Here's a somewhat significant rewrite to get around those issues.

I've also made smaller changes to C5 and C6 for similar reasons.

* Got rid of that column of "you"s.

* Spacing.
2019-07-09 05:30:51 -04:00
Colton G. Rushton
a6d59821c1 dehacked: Use three periods instead of a comma
Use three periods instead of a comma for the inner monologue, as this
helps make the text flow a bit better.
2019-07-08 11:54:32 -07:00
Mike Swanson
68b96b51c3 dehacked: close inner-monologue with comma instead of period
Thanks @MatthewTheGlutton for the suggestion
2019-06-28 14:12:38 -07:00
Colton G. Rushton
2e9e520916 dehacked: fix grammatical errors
Update the dehacked lump info to fix various punctuation,
capitalization, and grammar errors, as well as made the text flow a
little better throughout the game, making it seem more professional.
2019-06-27 11:36:50 -07:00
igdegoo
98ff01e26f capitalize strings (#563) 2019-05-24 22:01:09 -07:00
Simon Howard
bd2d59e14f
dehacked: Add tweak for minigun zombie.
The minigun zombie is also missing a full-brightness frame.
2018-09-13 23:48:34 -04:00
Simon Howard
98f9aaee63
dehacked: Turn on full brightness for a few frames
The firing frames for the zombie and assault tripod look weird if they're not 
shown in full brightness, so add a dehacked tweak to set them to full
brightness. Doom has the same bug but it isn't quite as noticeable.

This could theoretically cause a mod compatibility issue since unexpected
frames might be fully lit. However, (1) the worst that can happen is a minor
cosmetic issue, and (2) I don't know of any actual mods this affects (maybe
there aren't any). I think the benefit outweighs the potential downside.
2018-09-13 23:46:15 -04:00
Mike Swanson
beebbed1f2 Complete Doom 3 BFG Support, and avoid crashing PrBoom-Plus
DOOM2.WAD contains a MAP33, which is being represented here as only
the dummy map, and also M_EPI1 and M_EPI2 lumps for the “Hell on Earth”
and “No Rest for the Living” texts, both of which are now replicated
here as well (using “Phase 2” and “The Missing Levels” as names instead).

No, we still don’t plan on having a real MAP33, the inclusion here is
only to avoid engine crashes.

Fixes: #533
Ref: #529
2018-05-30 14:50:56 -07:00
Simon Howard
bf93839ed5 dmxgus: Improvements to similarity groups.
Split the piano and bass guitar groups into separate groups to give more
variation. Move several instruments around which don't fit, and move
several random percussion instruments into an enlargened "blank" group
since these percussion effects are not really similar to each other and
it's better to leave them out than play something that sounds wrong.
2018-05-05 22:41:14 -04:00
Kevin Caccamo
a66ba0bba5 levels: replace all {S,W,B}FALL textures
Replace all {S,W,B}FALL textures in the levels with their animated
equivalents, and remove {S,W,B}FALL from textures.cfg.

The {S,W,B}FALL were leftovers from when Freedoom had the goal of
being Boom-compatible instead of vanilla-compatible.

Also, rebuild these levels' nodes and reject tables with ZenNode.
2017-12-31 12:28:53 -08:00
Kevin Caccamo
3ad60ff9c8 textures: add AQSUPP13
I cut this out from AQSUPP01
2017-12-14 03:56:35 +00:00
Kevin Caccamo
4bb84b07cc textures: add 8-row freetonia textures
These are 8-row versions of the Freedoom/Plutonia brick textures.
2017-12-14 03:56:35 +00:00
Kevin Caccamo
1ed5898ec7 textures: add some custom textures
flats: add FCGRATE1 and FCGRATE2
patches: add CEILVINE and CGRATE1
buildcfg: add new flats to build config
textures.cfg: add new textures to build config

FCGRATE1, FCGRATE2, and CGRATE1 are my own work.
t.v. gave permission to use CEILVINE in Freedoom:
https://www.doomworld.com/forum/topic/45052-tnt-support/?do=findComment&comment=765129
2017-12-14 03:56:35 +00:00
Kevin Caccamo
eddabd36df textures.cfg: fix AQTRIM05
AQTRIM05 was missing one row.
2017-12-13 23:10:57 +00:00
Mike Swanson
1b79661bd9 Merge branch 'patch-1' of gh:drbugbait/freedoom 2017-09-26 15:43:23 -07:00
drbugbait
21aa11ad3d Added ZDoom weapon tags
ZDoom weapon tags in hud options will now display the correct weapon names.
2017-09-16 16:51:21 -03:00
Kevin Caccamo
e905009e1e textures.cfg: Add/reorganize definitions
Add missing TNT texture definitions
Re-organize existing TNT/Plutonia definitions

Rename MC1 to P-DBRAN1
Rename MC20 to P-DBRAN4

Fix SLAD11
Add T-SLDRP3 (TNT SLADRIP3)
Add SW{1,2}TSTON (TNT SW{1,2}GSTON)
2017-09-15 23:32:06 -04:00
Simon Howard
54cab94257 textures: Don't include sprites in pnames list.
A useful vanilla-compatible trick is that it's possible to include
sprites as patches inside texture definitions. It turns out that
both Final Doom IWADs added textures which do this, and Freedoom
inherits this as a result. We shouldn't include these sprites in the
pnames.txt that gets generated for inclusion in wadinfo.txt, since
they're already defined in wadinfo.txt under [sprites] and won't
be found under patches/ anyway.

This should help as a step towards resolving #485.
2017-09-04 13:35:45 -04:00
Kevin Caccamo
f05fd8963d textures.cfg: Add MC1 and MC20
These patches are needed for Plutonia compatibility
2017-07-14 07:41:54 -04:00
Kevin Caccamo
79e597ea8f textures.cfg: fix DBRAIN animation.
Set DBRAIN1's size to 64x32, and remove MC patches from it.
2017-07-14 07:41:54 -04:00
Ayub Ahmed
7f10eb9ff3 dehacked: add Phase 1 par times
Along with par times, replace my level names with better ones 
and change the ones that are used in the commercial IWADs.
2017-03-10 02:19:00 +00:00
Ayub Ahmed
3831d8422c dehacked: change map18's name
Because "Abandoned Monastery" doesn't fit with the theme of the map
anymore. New name by Voltcom9.
2017-02-26 23:42:35 -08:00
Ayub Ahmed
e65e377a18 lumps: adding BGFLATs
Defines which flat to use as the background during specific intermission texts.
Also cleaned up leftovers.
2017-02-24 17:32:34 +00:00
Mike Swanson
379f3aad50 lumps: New demo2_p2 and demo4_p1.
Map changes since v0.11 have desynced these.  I recorded demo2_p2
keyboard-only, so the gameplay is extra bad.  On demo4_p1, I used
a mouse, so it is a little more skillful.
2017-02-21 18:04:28 -08:00
Mike Swanson
2992e49262 lumps/genmidi: Rename README to *.adoc 2017-02-20 11:42:37 -08:00
Mike Swanson
4f67ca583f lumps: Remove c_end and c_start
These were special marker lumps for Boom colormaps, which were
removed in 2017-02-19T21:14:28Z!mikeonthecomputer@gmail.com
2017-02-19 18:34:47 -08:00
Mike Swanson
c6235d6ffc Makefile: Make sure all built files are removed in make clean. 2017-02-19 12:22:57 -08:00
Mike Swanson
a0e65f7fed Remove Boom special colormaps.
We’re not a Boom IWAD anymore, we can get rid of these.
2017-02-19 12:04:58 -08:00
Ayub Ahmed
2cc7a36fa8 dehacked: Story revisions, level name changes, serpentipede name consistency.
Fixes #377
2017-02-19 10:53:20 -08:00
Ayub Ahmed
1d2c3aa28c dehacked: Add DM31 and DM32 names. 2017-02-19 10:48:23 -08:00
Mike Swanson
1adfc2d576 RIP widescreen status bar support.
Causes conflicts with ZDoom mods that try to define their own HUDs,
at least three on IRC were reported as being basically totally broken
with Freedoom 0.11.  While it was a good attempt at adding an
enhancement to Freedoom under ZDoom, we cannot afford to break mod
compatibility.
2017-02-17 14:54:19 -08:00
Ayub Ahmed
f6727eeb8a dehacked: Remove spurious \n\n\, repairing the end of C6TEXT. 2017-02-16 10:45:47 -08:00
Mike Swanson
8835afef5f Copyright date bump and apply SPDX tags.
The tags are shorthand for the license of each file and avoid
copying the full license text into each one (and avoids having
to manually update the dates in each one...).
2017-02-15 16:41:53 -08:00
Ayub Ahmed
6e305548f2 dehacked: Update par times for levels. 2017-02-15 02:07:09 -08:00
Mike Swanson
3b72a61d1a dehacked: Slightly clean up transition texts. 2017-02-15 02:04:35 -08:00
Catoptromancy
ea03d3af74 lumps: New demos.
Phase 1:
DEMO1 - C1M6 Co-op with Cato, Chungy, Xindage, RestlessRodent
DEMO2 - C3M6 Single-player by Hypnotoad
DEMO3 - C4M3 Deathmatch with Chungy, Cato, Blastfrog
DEMO4 - C2M2 Single-player by Voros

Phase 2:
DEMO1 - MAP10 Single-player by Voros
DEMO2 - MAP06 Co-op with Chungy, Cato, Blastfrog, Hypnotoad
DEMO3 - MAP22 Deathmatch with Cato, Chungy, Blastfrog, Hypnotoad
DEMO4 - MAP09 Single-player by Hypnotoad
2017-02-14 20:25:35 -08:00
Mike Swanson
8352afe310 Change Protox's name to Xindage 2017-02-12 10:08:06 -08:00
Mike Swanson
9d1754c32e textures.cfg: Fix offset of BOSFA0 in A-BROWN4.
Fixes #367
2017-02-11 18:38:25 -08:00
Catoptromancy
b5bcdf0c62 dehacked: You found a backpack!
In levels with multiple backpacks, all of them said they were a
"second backpack" and that's kinda lame.
2017-02-02 07:59:51 -08:00
Mike Swanson
a1bf734a5f lumps: Revert a couple changes made by Voros.
"Got a 1%..." was correct, and why censor the word ass?
2017-01-31 08:31:01 -08:00
Ayub Ahmed
bb29fed8f1 Update dehacked 2017-01-31 08:25:19 -08:00
Mike Swanson
0a116b487e lumps/sbarinfo: Fix the file formatting to Unix newlines
The .gitattributes file tries to enforce Unix newlines, for
Windows users, but somehow this still got forced through...

It messed up the display of `git status`
2016-12-14 01:18:23 -08:00
Ayub Ahmed
347e2d408f Widescreen statusbar (#341)
This adds an SBARINFO lump which is recognized by ZDoom and
other compatible ports to show a larger widescreen status bar
on modern monitors.
2016-12-12 17:17:10 -08:00
Ayub Ahmed
9cbbbefab6 Aquatex fix (#324)
Redefine all of the new aquatex textures to be 128px tall.

This avoid tutti-frutti in vanilla Doom, where textures do not tile
property unless their heights are a multiple of 128.
2016-10-23 02:31:53 -04:00