From 7555d52818f21d7b10ca6cff03f6f85391a6e95d Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 10 Jan 2024 20:40:17 +0100 Subject: [PATCH] Misc. comment changes, additional planned stuff. --- FuturePlans.md | 18 +++++++++++++++++- cvarinfo.base | 2 +- language.version | 4 ++-- zscript/compat/swwm_shame.zsc | 27 +++++++++++++++++---------- zscript/player/swwm_player_move.zsc | 1 + 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/FuturePlans.md b/FuturePlans.md index 95ef2219b..23ab792e0 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -82,6 +82,17 @@ Re-animation of old FK models. Plus extra score incentives and achievements. - [ ] Say The Line Vinny *(Spin attack with the Itamex Hammer for 60 seconds)* - [ ] Burnination *(Kill 100 enemies with a single Hellblazer drum)* *[replaces I Am Become Death]* - [ ] Engineer's Best Friend *(Score 1000 kills using sentries)* + - [ ] Demo-chan's Dubious Detour *(Beat all original episodes of Ultimate Doom)* + - [ ] Baphomet's Chosen *(Beat SIGIL)* + - [ ] Satanic Surprise *(Beat SIGIL 2)* + - [ ] Explosive Headache *(Beat Doom 2)* + - [ ] Rude Awakening *(Beat No Rest For The Living)* + - [ ] Doom Eviternal *(Beat all episodes of Eviternity)* + - [ ] Doom Sempiternal *(Beat all episodes of Eviternity 2)* + - [ ] Ding Dong The Wizard's Dead *(Beat the first three episodes of Heretic)* + - [ ] Additional Heresy *(Beat episodes four and five of Heretic)* + - [ ] Puzzle Extravaganza *(Beat Hexen)* + - [ ] The Plutonia of Hexen *(Beat Deathkings of the Dark Citadel)* * [ ] **Additional Collectibles:** - [ ] Blåhaj *("Dr. Shorky")* * [ ] **Combo Collectible Animations:** @@ -120,8 +131,13 @@ All the hard stuff *(some of these aren't guaranteed)*. Things that I'm unsure when will be added *(or if they can be added)*. -* [ ] **Customized cluster text stuff if that ever gets scriptified** +* [ ] **Switch various actor-based sprite effects to use more lightweight visual thinkers *(not yet in stable GZDoom)*** +* [ ] **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)*** +* [ ] **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)* ## Other Projects diff --git a/cvarinfo.base b/cvarinfo.base index f8a3dd9a8..1fd2d67bb 100644 --- a/cvarinfo.base +++ b/cvarinfo.base @@ -85,7 +85,7 @@ nosave int swwm_hudscale2 = 0; // force the "two minus" scale of the HUD (used server bool swwm_altclear = false; // use an alternate, less graphically demanding "All Clear" effect // minimap settings -nosave bool swwm_mm_enable = true; // show a minimap below the score counter +nosave bool swwm_mm_enable = true; // show a minimap on the top right corner of the hud nosave bool swwm_mm_missiles = true; // show projectiles (how revolutionary) nosave bool swwm_mm_usecanvas = false; // use a canvas to draw the minimap, so its pixel density is consistent with the rest of the HUD nosave noarchive bool swwm_mm_steptrace = false;// traces the player path in the minimap diff --git a/language.version b/language.version index cef673702..56c3a1778 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1084 \cu(Wed 10 Jan 20:39:12 CET 2024)\c-"; -SWWM_SHORTVER="\cw1.3pre r1084 \cu(2024-01-10 20:39:12)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1085 \cu(Wed 10 Jan 20:40:17 CET 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1085 \cu(2024-01-10 20:40:17)\c-"; diff --git a/zscript/compat/swwm_shame.zsc b/zscript/compat/swwm_shame.zsc index e8f2e696b..3edf6f10f 100644 --- a/zscript/compat/swwm_shame.zsc +++ b/zscript/compat/swwm_shame.zsc @@ -12,6 +12,10 @@ // so you know what I think of your attempt at being funny // // So, yeah, thanks for giving me an excuse to make this silly script +// +// PS: I actually like Project Brutality, no joke +// Brutal Doom is still poopy junk tho, every single fork of it is better +// (except Black Edition, that one is just embarrassing) Class SWWMBrutalHandler : StaticEventHandler { ui int timer; @@ -28,17 +32,20 @@ Class SWWMBrutalHandler : StaticEventHandler // check for brutal doom foreach ( cls:AllActorClasses ) { - if ( cls.GetClassName() == 'BDoomer' ) + if ( cls is 'PlayerPawn' ) { - detected = true; - which = "Brutal Doom"; - whichshort = "BD"; - } - else if ( (cls.GetClassName() == 'BrutalDoomer') || (cls.GetClassName() == 'PB_PlayerPawn') ) - { - detected = true; - which = "Project Brutality"; - whichshort = "PB"; + if ( (cls.GetClassName() == 'Doomer') || (cls.GetClassName() == 'BDoomer') || (cls.GetClassName() == 'BEDoomer') ) + { + detected = true; + which = "Brutal Doom"; + whichshort = "BD"; + } + else if ( (cls.GetClassName() == 'BrutalDoomer') || (cls.GetClassName() == 'PB_PlayerPawn') ) + { + detected = true; + which = "Project Brutality"; + whichshort = "PB"; + } } if ( !detected ) continue; let shnd = SWWMStaticHandler(StaticEventHandler.Find("SWWMStaticHandler")); diff --git a/zscript/player/swwm_player_move.zsc b/zscript/player/swwm_player_move.zsc index 9c8a3062a..c1d57bb9c 100644 --- a/zscript/player/swwm_player_move.zsc +++ b/zscript/player/swwm_player_move.zsc @@ -177,6 +177,7 @@ extend Class Demolitionist return false; // wind if ( (s.special == 84) || (s.special == 118) || ((s.special >= 201) && (s.special <= 244)) ) return false; // current + // TODO check for scroller thinkers if that ever gets exposed to ZScript return true; }