diff --git a/cvarinfo.base b/cvarinfo.base index e66a598b3..7affcd44a 100644 --- a/cvarinfo.base +++ b/cvarinfo.base @@ -66,7 +66,6 @@ nosave noarchive bool swwm_debugview = false; // debug visual aid for various th server bool swwm_usetopickup = false; // allow item pickup only by pressing use server bool swwm_meleepickup = true; // allow picking up items through melee nosave bool swwm_buttsfx = true; // buttslam homerun SFX -nosave int swwm_sewercount = 0; // I'm sorry Civvie user float swwm_bumpstrength = 1.0; // intensity of fov bumping server bool swwm_nomagdrop = true; // does not drop spent magazines (the "environmentally conscious" option) nosave bool swwm_nomapmsg = false; // disables special map dialogue messages diff --git a/language.version b/language.version index 7efbbf8da..983ab60a8 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r302 \cu(Thu 11 Aug 21:49:47 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r302 \cu(2022-08-11 21:49:47)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r303 \cu(Thu 11 Aug 23:39:58 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r303 \cu(2022-08-11 23:39:58)\c-"; diff --git a/sndinfo.base b/sndinfo.base index b07a909f6..f259161f1 100644 --- a/sndinfo.base +++ b/sndinfo.base @@ -60,7 +60,6 @@ misc/achievement2 sounds/YAY.ogg misc/orbexplode sounds/ORBEXPLODE.ogg misc/omgfart sounds/omgfart.ogg misc/voice sounds/dlgvoice.ogg -misc/sewercount sounds/sewercount.ogg misc/frag sounds/GFRAG.ogg misc/gibber1 sounds/general/Gib1.ogg misc/gibber2 sounds/general/Gib2.ogg diff --git a/sounds/sewercount.ogg b/sounds/sewercount.ogg deleted file mode 100644 index 4440f2e3e..000000000 Binary files a/sounds/sewercount.ogg and /dev/null differ diff --git a/zscript/handler/swwm_handler_cheats.zsc b/zscript/handler/swwm_handler_cheats.zsc index b52e179f0..05b1a0f46 100644 --- a/zscript/handler/swwm_handler_cheats.zsc +++ b/zscript/handler/swwm_handler_cheats.zsc @@ -8,14 +8,6 @@ extend Class SWWMHandler transient ui int rss; ui bool nostalgic; ui Font CheatFont; - transient int sewercnt; - - private ui void CheatUITick() - { - if ( !sewercnt || (sewercnt < gametic) ) return; - let m = new("SWWMSewerCount").Init(); - StatusBar.AttachMessage(m,-1111); - } private void CheatEvent( ConsoleEvent e ) { @@ -350,51 +342,6 @@ extend Class SWWMHandler } else cc.Init(players[e.Args[0]].mo); } - else if ( e.Name ~== "swwmsewercountcheat" ) - { - if ( consoleplayer == e.Args[0] ) - { - let cv = CVar.FindCVar('swwm_sewercount'); - int cur = max(0,cv.GetInt()); - if ( cur == 0 ) Console.Printf("\cyIt begins.\c-"); - else switch ( Random[HudStuff](0,9) ) - { - case 0: - Console.Printf("\cyAnother one?\c-"); - break; - case 1: - Console.Printf("\cyOh hi Civvie.\c-"); - break; - case 2: - Console.Printf("\cyIt does stink.\c-"); - break; - case 3: - Console.Printf("\cyGod, imagine the smell...\c-"); - break; - case 4: - Console.Printf("\cyObligatory sewer level?\c-"); - break; - case 5: - Console.Printf("\cyYup! It's another sewer.\c-"); - break; - case 6: - Console.Printf("\cyOh boy here we go...\c-"); - break; - case 7: - Console.Printf("\cyIt smells, boy does it smell.\c-"); - break; - case 8: - Console.Printf("\cyPlease don't sue me, Civvie.\c-"); - break; - case 9: - Console.Printf("\cyOnce more, from the top!\c-"); - break; - } - S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI); - cv.SetInt(cur+1); - sewercnt = gametic; - } - } else if ( e.Name ~== "swwmonfirecheat" ) { let ti = ThinkerIterator.Create("Actor"); @@ -426,7 +373,7 @@ extend Class SWWMHandler static const String cht[] = { "swwmlodsofemone", "swwmdeeplore", "swwmfroggygang", "swwmforgetaboutit", - "swwmmisterproper", "swwmstinky", "swwmpantsonfire", + "swwmmisterproper", "swwmpantsonfire", // SWWM Platinum cheats "swwmimstuck", "swwmarmojumbo", "swwmdangimhealthy", "swwmwarriorofzaemonath", "swwmpowerparp", "swwmcannotseemyhands", @@ -439,7 +386,7 @@ extend Class SWWMHandler static const String cmd[] = { "swwmmoneycheat", "swwmlorecheat", "swwmfroggycheat", "swwmamnesiacheat", - "swwmjanitorcheat", "swwmsewercountcheat", "swwmonfirecheat", + "swwmjanitorcheat", "swwmonfirecheat", // SWWM Platinum cheats "swwmsafecheat", "swwmweaponcheat", "swwmhealcheat", "swwmynykroncheat", "swwmgravcheat", "swwminvischeat", @@ -461,7 +408,7 @@ extend Class SWWMHandler matchany = true; if ( kstr != cht[i] ) continue; let s = SWWMStats.Find(players[consoleplayer]); - if ( (i > 6) && !swwm_nomapmsg && (!s || !s.oldcheat) ) + 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"; diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index 66123f8a5..af4c83c1f 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -208,36 +208,6 @@ Class SWWMAchievementNotification : HUDMessageBase } } -Class SWWMSewerCount : HUDMessageBase -{ - int tics; - String str; - - SWWMSewerCount Init() - { - tics = 200; - str = String.Format("Sewer Count: %d",swwm_sewercount); - return self; - } - - override bool Tick() - { - if ( tics == 100 ) S_StartSound("misc/sewercount",CHAN_VOICE,CHANF_UI,1.,0.); - return (tics--<=0); - } - - override void Draw( int bottom, int visibility ) - { - if ( tics > 100 ) return; - double fractic = System.GetTimeFrac(); - double ftics = tics-fractic; - double alph = clamp(ftics/20.,0.,1.); - double x = (Screen.GetWidth()-(newsmallfont.StringWidth(str)*CleanXFac*2))/2; - double y = int(Screen.GetHeight()*.75)-(newsmallfont.GetHeight()*CleanYFac*2)/2; - Screen.DrawText(newsmallfont,Font.CR_GREEN,x,y,str,DTA_ScaleX,CleanXFac*2,DTA_ScaleY,CleanYFac*2,DTA_Alpha,alph); - } -} - // weapon tooltips Class SWWMWeaponTooltip : HUDMessageBase { diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc index 8c59d467d..0387c9df0 100644 --- a/zscript/swwm_handler.zsc +++ b/zscript/swwm_handler.zsc @@ -199,7 +199,6 @@ Class SWWMHandler : EventHandler OnelinerUITick(); FlashUITick(); VanillaBossUITick(); - CheatUITick(); MapstartUITick(); }