From a2509e76e1abb9c80e1e750e3507a176845e11b6 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 6 Nov 2022 19:21:52 +0100 Subject: [PATCH] Make some dialogues appear once per IWAD. --- cvarinfo.base | 2 ++ language.version | 4 +-- zscript/handler/swwm_handler_cheats.zsc | 20 ++++++++----- zscript/handler/swwm_handler_uitick.zsc | 40 ++++++++++++++----------- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/cvarinfo.base b/cvarinfo.base index 59951cf6a..bb526ee95 100644 --- a/cvarinfo.base +++ b/cvarinfo.base @@ -80,6 +80,8 @@ server int swwm_friendlyfire = 0; // 0: allow all friendly fire, 1: block incom nosave bool swwm_showmaptitle = false; // shows the name of the map when entering, just like in dark souls! server bool swwm_lobdoubled = false; // [LOB] Enable Double Death monster spawns nosave int swwm_bardist = 2000; // distance at which healthbars will be visible (does not affect player bars) +nosave bool swwm_oldcheats = false; // has received the "old cheats" dialogue from Zanaveth +nosave bool swwm_ccmessage = false; // has received the "corruption cards" dialogue from Cytho // minimap settings nosave bool swwm_mm_enable = true; // show a minimap below the score counter diff --git a/language.version b/language.version index 29c6c4c75..2c3103660 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r601 \cu(Sun 6 Nov 17:06:54 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r601 \cu(2022-11-06 17:06:54)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r602 \cu(Sun 6 Nov 19:21:52 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r602 \cu(2022-11-06 19:21:52)\c-"; diff --git a/zscript/handler/swwm_handler_cheats.zsc b/zscript/handler/swwm_handler_cheats.zsc index fa631347d..2b8e71098 100644 --- a/zscript/handler/swwm_handler_cheats.zsc +++ b/zscript/handler/swwm_handler_cheats.zsc @@ -411,14 +411,18 @@ extend Class SWWMHandler let s = SWWMStats.Find(players[consoleplayer]); if ( (i > 5) && !swwm_nomapmsg && (!s || !s.oldcheat) ) { - let m = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_ZNVSNAME"),StringTable.Localize("$SWWM_ZNVNAME"),"Znv"); - m.seqname = "ZNVTXT"; - m.seqcnt = 5; - m.znvspecial = true; - m.delay = 80; - m.enddelay = 90; - m.pausedelay = 40; - StatusBar.AttachMessage(m,-1232); + if ( !swwm_oldcheats ) + { + let m = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_ZNVSNAME"),StringTable.Localize("$SWWM_ZNVNAME"),"Znv"); + m.seqname = "ZNVTXT"; + m.seqcnt = 5; + m.znvspecial = true; + m.delay = 80; + m.enddelay = 90; + m.pausedelay = 40; + StatusBar.AttachMessage(m,-1232); + } + CVar.GetCVar('swwm_oldcheats').SetBool(true); SendNetworkEvent("swwmsetoldcheat",consoleplayer); } if ( SWWMUtility.CheatsDisabled(consoleplayer) ) diff --git a/zscript/handler/swwm_handler_uitick.zsc b/zscript/handler/swwm_handler_uitick.zsc index 4671d121e..89e6556f0 100644 --- a/zscript/handler/swwm_handler_uitick.zsc +++ b/zscript/handler/swwm_handler_uitick.zsc @@ -114,24 +114,28 @@ extend Class SWWMHandler if ( m && (m.GetClassName() == 'CorruptionCardsSelector') ) incardmenu = true; else if ( incardmenu ) { - let msg = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_CYTHOSNAME"),StringTable.Localize("$SWWM_CYTHONAME"),"Cytho"); - msg.seqname = "CYTHOCCA"; - msg.seqcnt = 4; - msg.delay = 120; - StatusBar.AttachMessage(msg,-1232); - let msg2 = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_SAYASNAME"),StringTable.Localize("$SWWM_SAYANAME"),"Saya"); - msg2.seqname = "CYTHOCCB"; - msg2.seqcnt = 1; - msg2.delay = 30; - msg.nextmsg = msg2; - msg.nextdirect = true; - msg = msg2; - msg2 = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_CYTHOSNAME"),StringTable.Localize("$SWWM_CYTHONAME"),"Cytho"); - msg2.seqname = "CYTHOCCC"; - msg2.seqcnt = 1; - msg2.delay = 45; - msg.nextmsg = msg2; - msg.nextdirect = true; + if ( !swwm_ccmessage ) + { + let msg = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_CYTHOSNAME"),StringTable.Localize("$SWWM_CYTHONAME"),"Cytho"); + msg.seqname = "CYTHOCCA"; + msg.seqcnt = 4; + msg.delay = 120; + StatusBar.AttachMessage(msg,-1232); + let msg2 = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_SAYASNAME"),StringTable.Localize("$SWWM_SAYANAME"),"Saya"); + msg2.seqname = "CYTHOCCB"; + msg2.seqcnt = 1; + msg2.delay = 30; + msg.nextmsg = msg2; + msg.nextdirect = true; + msg = msg2; + msg2 = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_CYTHOSNAME"),StringTable.Localize("$SWWM_CYTHONAME"),"Cytho"); + msg2.seqname = "CYTHOCCC"; + msg2.seqcnt = 1; + msg2.delay = 45; + msg.nextmsg = msg2; + msg.nextdirect = true; + } + CVar.GetCVar('swwm_ccmessage').SetBool(true); cardmessaged = true; SendNetworkEvent("swwmccstart"); }