AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-08-03 20:57:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some improvements to Chex support. (#2190)

Browse Source 
* Some improvements to Chex support.

* Remove chex3v-all autoloads.
This commit is contained in:
MelodicSpaceship 2025-02-09 05:15:03 -08:00 committed by GitHub
parent 823a4235fe
commit 6240a6eb0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 121 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base/CMakeLists.txt
View File

@ -206,6 +206,9 @@ set(BASE_SOURCES
chex.wad/umapinfo.lmp
chex2.wad/brghtmps.lmp
chex2.wad/dehacked.lmp
chex-all/brghtmps.lmp
doom-all/brghtmps.lmp

65
base/chex-all/brghtmps.lmp Normal file
View File

@ -0,0 +1,65 @@
BRIGHTMAP NOTGRAY 4,9-79,112-255
BRIGHTMAP GREENONLY1 112-127
BRIGHTMAP GREENONLY2 112-125
BRIGHTMAP GREENONLY3 112-123
BRIGHTMAP REDANDGREEN 16-47,112-127,173-191
BRIGHTMAP CHEXRED 176-177
BRIGHTMAP CHEXGREEN 112-115
BRIGHTMAP CHEXREDGREEN 45,112-118,174-177
TEXTURE BIGDOOR1 GREENONLY3
// TEXTURE BIGDOOR4 GREENONLY3 // C1: some stray green pixels, C2: many stray green pixels
// TEXTURE BRNBIGL GREENONLY3
// TEXTURE BRNBIGR GREENONLY3 // C1, C2: one stray green pixel
// TEXTURE BRNSMAL2 GREENONLY3 // C1, C2: many stray green pixels
TEXTURE COMP2 NOTGRAY
// TEXTURE COMPTALL NOTGRAY
TEXTURE COMPUTE2 NOTGRAY
TEXTURE LITE5 GREENONLY2
TEXTURE STARTAN3 GREENONLY2
TEXTURE SW1BRCOM CHEXRED
TEXTURE SW1BRN2 CHEXRED
TEXTURE SW1BRNGN CHEXRED
TEXTURE SW1BROWN CHEXRED
TEXTURE SW1COMM CHEXRED
TEXTURE SW1COMP CHEXRED
TEXTURE SW1METAL CHEXREDGREEN
TEXTURE SW1STARG CHEXRED
TEXTURE SW1STON1 CHEXRED
TEXTURE SW2BRCOM CHEXGREEN
TEXTURE SW2BRN2 CHEXGREEN
TEXTURE SW2BRNGN CHEXGREEN
TEXTURE SW2BROWN CHEXGREEN
TEXTURE SW2COMM CHEXGREEN
TEXTURE SW2COMP CHEXGREEN
TEXTURE SW2METAL CHEXREDGREEN
TEXTURE SW2STARG CHEXGREEN
TEXTURE SW2STON1 CHEXGREEN
// TEXTURE BIGDOOR5 GREENONLY1 // C1, C2: some stray green pixels
// TEXTURE BIGDOOR6 GREENONLY1 // C1, C2: some stray green pixels
TEXTURE CEMENT3 GREENONLY3
TEXTURE SKINFACE GREENONLY1
TEXTURE SKINTEK1 GREENONLY1
TEXTURE SKSPINE2 GREENONLY3
TEXTURE SW1BLUE CHEXGREEN
TEXTURE SW1HOT CHEXGREEN
TEXTURE SW1SKIN CHEXGREEN
TEXTURE SW1WOOD CHEXGREEN
TEXTURE SW2BLUE CHEXRED
TEXTURE SW2GSTON CHEXRED
TEXTURE SW2HOT CHEXRED
TEXTURE SW2SKIN CHEXRED
TEXTURE SW2WOOD CHEXRED
// Chainsaw
SPRITE CSAW REDANDGREEN
// Shotgun
SPRITE SHOT REDANDGREEN
// Chaingun
SPRITE MGUN REDANDGREEN
// Rocket launcher
SPRITE LAUN REDANDGREEN
// Plasmagun
SPRITE PLAS REDANDGREEN
// BFG9000
SPRITE BFUG REDANDGREEN

65
base/chex.wad/brghtmps.lmp
View File

@ -1,80 +1,15 @@
BRIGHTMAP NOTGRAY 4,9-79,112-255
BRIGHTMAP GREENONLY1 112-127
BRIGHTMAP GREENONLY2 112-125
BRIGHTMAP GREENONLY3 112-123
BRIGHTMAP REDANDGREEN 16-47,112-127,173-191
BRIGHTMAP CHEXRED 176-177
BRIGHTMAP CHEXGREEN 112-115
BRIGHTMAP CHEXREDGREEN 45,112-118,174-177
TEXTURE BIGDOOR1 GREENONLY3
// TEXTURE BIGDOOR4 GREENONLY3 // C1: some stray green pixels, C2: many stray green pixels
// TEXTURE BRNBIGL GREENONLY3
// TEXTURE BRNBIGR GREENONLY3 // C1, C2: one stray green pixel
// TEXTURE BRNSMAL2 GREENONLY3 // C1, C2: many stray green pixels
TEXTURE COMP2 NOTGRAY
// TEXTURE COMPTALL NOTGRAY
TEXTURE COMPUTE2 NOTGRAY
TEXTURE LITE5 GREENONLY2
TEXTURE STARTAN3 GREENONLY2
TEXTURE SW1BRCOM CHEXRED
TEXTURE SW1BRN1 CHEXGREEN
TEXTURE SW1BRN2 CHEXRED
TEXTURE SW1BRNGN CHEXRED
TEXTURE SW1BROWN CHEXRED
TEXTURE SW1COMM CHEXRED
TEXTURE SW1COMP CHEXRED
TEXTURE SW1DIRT CHEXGREEN
TEXTURE SW1METAL CHEXREDGREEN
TEXTURE SW1PIPE CHEXGREEN
TEXTURE SW1STARG CHEXRED
TEXTURE SW1STON1 CHEXRED
TEXTURE SW1STRTN CHEXRED
TEXTURE SW2BRCOM CHEXGREEN
TEXTURE SW2BRN1 CHEXRED
TEXTURE SW2BRN2 CHEXGREEN
TEXTURE SW2BRNGN CHEXGREEN
TEXTURE SW2BROWN CHEXGREEN
TEXTURE SW2COMM CHEXGREEN
TEXTURE SW2COMP CHEXGREEN
TEXTURE SW2DIRT CHEXRED
TEXTURE SW2METAL CHEXREDGREEN
TEXTURE SW2PIPE CHEXRED
TEXTURE SW2STARG CHEXGREEN
TEXTURE SW2STON1 CHEXGREEN
TEXTURE SW2STONE CHEXGREEN
TEXTURE SW2STRTN CHEXGREEN
// TEXTURE BIGDOOR5 GREENONLY1 // C1, C2: some stray green pixels
// TEXTURE BIGDOOR6 GREENONLY1 // C1, C2: some stray green pixels
TEXTURE CEMENT3 GREENONLY3
TEXTURE SKINFACE GREENONLY1
TEXTURE SKINTEK1 GREENONLY1
TEXTURE SKSPINE2 GREENONLY3
TEXTURE SW1BLUE CHEXGREEN
TEXTURE SW1HOT CHEXGREEN
TEXTURE SW1SKIN CHEXGREEN
TEXTURE SW1VINE CHEXGREEN // C1: some stray green pixels in the vines
TEXTURE SW1WOOD CHEXGREEN
TEXTURE SW2BLUE CHEXRED
TEXTURE SW2CMT CHEXGREEN
TEXTURE SW2GSTON CHEXRED
TEXTURE SW2HOT CHEXRED
TEXTURE SW2SKIN CHEXRED
TEXTURE SW2VINE CHEXRED
TEXTURE SW2WOOD CHEXRED
TEXTURE WOOD4 CHEXREDGREEN
TEXTURE WOODGARG CHEXRED
TEXTURE WOODSKUL CHEXREDGREEN
// Chainsaw
SPRITE CSAW REDANDGREEN
// Shotgun
SPRITE SHOT REDANDGREEN
// Chaingun
SPRITE MGUN REDANDGREEN
// Rocket launcher
SPRITE LAUN REDANDGREEN
// Plasmagun
SPRITE PLAS REDANDGREEN
// BFG9000
SPRITE BFUG REDANDGREEN

25
base/chex.wad/dehacked.lmp
View File

@ -857,6 +857,31 @@ HUSTR_E4M6 = E1M5: Caverns of Bazoik
HUSTR_E4M7 = E1M5: Caverns of Bazoik
HUSTR_E4M8 = E1M5: Caverns of Bazoik
HUSTR_E4M9 = E1M5: Caverns of Bazoik
OB_DEFAULT = %o was slimed.
OB_SLIME = %o sinks into some slime.
OB_LAVA = %o got stuck in quick-slime.
OB_ZOMBIE = %o was slimed by a flemoid.
OB_SHOTGUY = %o was slimed by a bipedicus.
OB_IMPHIT = %o was slimed by an armored bipedicus.
OB_IMP = %o was slimed by an armored bipedicus.
OB_DEMONHIT = %o was slimed by a cycloptis.
OB_SPECTREHIT = %o was slimed by a cycloptis.
OB_BARON = %o was defeated by the Flembrane.
OB_BARONHIT = %o was defeated by the Flembrane.
OB_SUICIDE = %o prefers the flemoid dimension.
OB_KILLEDSELF = %o zorched %hself.
OB_MPDEFAULT = %o was zorched by %k.
OB_MPFIST = %o was spoon fed by %k.
OB_MPCHAINSAW = %o was thouroughly mixed with %k's bootspork.
OB_MPPISTOL = %o was hit by %k's mini-zorcher.
OB_MPSHOTGUN = %o was hit by %k's large-zorcher.
OB_MPSSHOTGUN = %o was hit by %k's mega-zorcher.
OB_MPCHAINGUN = %o was rapid zorched by %k.
OB_MPROCKET = %o was zorched by %k's propulsor.
OB_MPR_SPLASH = %o was hit by %k's propulsor.
OB_MPPLASMARIFLE = %o was phase zorched by %k.
OB_MPBFG_BOOM = %o fell prey to %k's LAZ device.
OB_MPBFG_SPLASH = %o was lazzed by %k.
[PARS]
par 1 1 120

18
base/chex2.wad/dehacked.lmp Normal file
View File

@ -0,0 +1,18 @@
Patch File for DeHackEd v3.0
Doom version = 21
Patch format = 6
[STRINGS]
HUSTR_E1M1 = E1M1: Spaceport
HUSTR_E1M2 = E1M2: Cinema
HUSTR_E1M3 = E1M3: Chex Museum
HUSTR_E1M4 = E1M4: City Streets
HUSTR_E1M5 = E1M5: Sewer System
OB_IMPHIT = %o was slimed by a Quadrumpus.
OB_IMP = %o was slimed by a Quadrumpus.
OB_DEMONHIT = %o was gooed by a larva.
OB_SPECTREHIT = %o was gooed by a larva.
OB_BARON = %o was defeated by a Maximus.
OB_BARONHIT = %o was defeated by a Maximus.

10
src/d_main.c
View File

@ -1352,6 +1352,10 @@ static void LoadIWadBase(void)
{
W_AddBaseDir("doom-all");
}
else if (local_gamemission == pack_chex || local_gamemission == pack_chex3v)
{
W_AddBaseDir("chex-all");
}
if (local_gamemission == doom)
{
W_AddBaseDir("doom1-all");
@ -1397,6 +1401,12 @@ static void AutoloadIWadDir(void (*AutoLoadFunc)(const char *path))
AutoLoadFunc(dir);
free(dir);
}
else if (local_gamemission == pack_chex || local_gamemission == pack_chex3v)
{
dir = GetAutoloadDir(autoload_paths[i], "chex-all", true);
AutoLoadFunc(dir);
free(dir);
}
if (local_gamemission == doom)
{