From 2ee570013094bd80a36b83199c705a7934fd3eba Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Tue, 17 Sep 2024 09:54:49 +0200 Subject: [PATCH] Weh... --- FuturePlans.md | 8 +++++++- language.def_base | 8 ++++++-- language.version | 4 ++-- zscript/compat/swwm_compat.zsc | 3 ++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/FuturePlans.md b/FuturePlans.md index 7dd04733c..3b444d439 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -119,12 +119,18 @@ Things that I'm unsure when will be added *(or if they can be added)*. * [ ] **Fix handling of conveyor physics *(if scrollers ever get exposed to ZScript)*** * [ ] **Per-weapon player models *(could be very time-consuming)*** -* [ ] **Model animations decoupled from actor states *(may be needed for the previous one)*** +* [ ] **Model animations decoupled from actor states *(may be needed for the previous one, and would allow even more flexibility in player animation)*** * [ ] **Fully custom cluster text screens, with special handling for many WADs *(if that ever gets scriptified)*** * [ ] **Official Sunder support *(when the WAD is complete)*** - [ ] Deaf to The Siren's Song *(Beat Sunder)* * [ ] **Official HELLION support *(when it comes out)*** - [ ] Romerotown Rampage *(Beat HELLION)* +* [ ] **Official Legacy of Rust support *(not sure how it'd fit in the storyline, but maybe)*** + - [ ] Two Birds With One Nuke *(Beat Legacy of Rust)* +* [ ] **VKDoom exclusivity *(heh)*** + - [ ] Rewrite all shaders for optimal compatibility + - [ ] Use soft particles where needed *(optionally, find other uses in material shaders for the depth data)* + - [ ] Figure out other things as the fork evolves ## Other Projects diff --git a/language.def_base b/language.def_base index ae4f288e4..a2f417d8a 100644 --- a/language.def_base +++ b/language.def_base @@ -195,9 +195,13 @@ QUITMSG18 = "World hard and cold,\ntiddy soft and warm."; // startup (don't localize) STARTUP1 = "\n" -" \ck★\cf~\c- \cvDemo-chan says\c- \cf~\ck★\c-\n" +"\cvThere is much that can be said against war.\c-\n" "\n" -" \ck★\cf~\c- \cvTERFs can fuck off\c- \cf~\ck★\c-\n" +"\cvBut without war, there can be no peace afterwards.\c-\n" +"\n" +"\cvAnd no war is complete without weapons.\c-\n" +"\n" +"\cvLots and lots of weapons...\c-\n" "\n"; STARTUP2 = ""; STARTUP3 = ""; diff --git a/language.version b/language.version index 2a5da80d4..5287de37b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1147 \cu(Sat Sep 7 13:07:27 CEST 2024)\c-"; -SWWM_SHORTVER="\cw1.3pre r1147 \cu(2024-09-07 13:07:27)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1149 \cu(Tue Sep 17 09:55:05 CEST 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1149 \cu(2024-09-17 09:55:05)\c-"; diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc index 1c2312739..9460ed377 100644 --- a/zscript/compat/swwm_compat.zsc +++ b/zscript/compat/swwm_compat.zsc @@ -497,8 +497,9 @@ Class SWWMLevelCompatibility : LevelPostProcessor // special trigger for a bunch of dialogues AddThing(4206931,(0,0,0)); break; - // Eviternity 2 MAP26 (RC6) + // Eviternity 2 MAP26 (RC6 & Hotfix) case 'BC766A8054C0650D57246007E671AA44': + case '31E561AB0B1E091E22822BD4C968099B': { // add a "sector actor hits floor" action for going down into the hole™ // and make it trigger a dialogue