diff --git a/acs/swwmcomp.o b/acs/swwmcomp.o index 53e7d433e..282deba6d 100644 Binary files a/acs/swwmcomp.o and b/acs/swwmcomp.o differ diff --git a/animdefs.equinoxcompat b/animdefs.equinoxcompat new file mode 100644 index 000000000..e05809448 --- /dev/null +++ b/animdefs.equinoxcompat @@ -0,0 +1,19 @@ +flat optional EQNXSL01 + pic 1 tics 8 + pic 2 tics 8 + pic 3 tics 8 + pic 4 tics 8 +flat optional EQNXSL09 + pic 9 tics 8 + pic 10 tics 8 + pic 11 tics 8 + pic 12 tics 8 +flat optional EQNXBLD1 + pic 1 tics 8 + pic 2 tics 8 + pic 3 tics 8 +flat optional EQNXRR05 + pic 5 tics 8 + pic 6 tics 8 + pic 7 tics 8 + pic 8 tics 8 diff --git a/filter/game-doomchex/TERRAIN.txt b/filter/game-doomchex/TERRAIN.txt index db485001a..689d82e99 100644 --- a/filter/game-doomchex/TERRAIN.txt +++ b/filter/game-doomchex/TERRAIN.txt @@ -775,3 +775,9 @@ floor optional ZFLWATR1 DoomWater floor optional ZFLWATR2 DoomWater floor optional ZFLWATR3 DoomWater floor optional ZFLWATR4 DoomWater + +// [MK] Equinox slime +floor optional EQNXSL01 DoomMud +floor optional EQNXSL02 DoomMud +floor optional EQNXSL03 DoomMud +floor optional EQNXSL04 DoomMud diff --git a/language.version b/language.version index b5c52300b..fffeb3861 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r260 \cu(Wed 10 Feb 10:40:54 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r260 \cu(2021-02-10 10:40:54)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r261 \cu(Wed 10 Feb 11:37:30 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r261 \cu(2021-02-10 11:37:30)\c-"; diff --git a/swwmcomp.acs b/swwmcomp.acs index bfae089ff..dc13272fa 100644 --- a/swwmcomp.acs +++ b/swwmcomp.acs @@ -40,6 +40,12 @@ SCRIPT "NERVE_EXITOPEN" ( void ) Ceiling_RaiseByValue(24,8,80); } +SCRIPT "EQUINOX_BRAINCRUSH" ( int tag ) +{ + SpawnSpotFacing("BossBrain",666); + Ceiling_CrushAndRaiseDist(tag,8,8,10); +} + // this one is for forcing episodes to continue seamlessly // will be used eventually SCRIPT "EPISODIC_CONTD" ( void ) diff --git a/textures.equinoxcompat b/textures.equinoxcompat new file mode 100644 index 000000000..ae7ef3c1d --- /dev/null +++ b/textures.equinoxcompat @@ -0,0 +1,60 @@ +flat optional EQNXSL01, 64, 64 +{ + Patch SLIME01, 0, 0 +} +flat optional EQNXSL02, 64, 64 +{ + Patch SLIME02, 0, 0 +} +flat optional EQNXSL03, 64, 64 +{ + Patch SLIME03, 0, 0 +} +flat optional EQNXSL04, 64, 64 +{ + Patch SLIME04, 0, 0 +} +flat optional EQNXSL09, 64, 64 +{ + Patch SLIME09, 0, 0 +} +flat optional EQNXSL10, 64, 64 +{ + Patch SLIME10, 0, 0 +} +flat optional EQNXSL11, 64, 64 +{ + Patch SLIME11, 0, 0 +} +flat optional EQNXSL12, 64, 64 +{ + Patch SLIME12, 0, 0 +} +flat optional EQNXBLD1, 64, 64 +{ + Patch BLOOD1, 0, 0 +} +flat optional EQNXBLD2, 64, 64 +{ + Patch BLOOD2, 0, 0 +} +flat optional EQNXBLD3, 64, 64 +{ + Patch BLOOD3, 0, 0 +} +flat optional EQNXRR05, 64, 64 +{ + Patch RROCK05, 0, 0 +} +flat optional EQNXRR06, 64, 64 +{ + Patch RROCK06, 0, 0 +} +flat optional EQNXRR07, 64, 64 +{ + Patch RROCK07, 0, 0 +} +flat optional EQNXRR08, 64, 64 +{ + Patch RROCK08, 0, 0 +} diff --git a/zscript/swwm_compat.zsc b/zscript/swwm_compat.zsc index bb65e856b..d7fb30f0a 100644 --- a/zscript/swwm_compat.zsc +++ b/zscript/swwm_compat.zsc @@ -5,6 +5,19 @@ Class SWWMLevelCompatibility : LevelPostProcessor { + private void EquinoxBossBrainHandle( uint lineno, int sectortag ) + { + // don't spawn boss brains until it's time to crush them + for ( int i=0; i