From ddd198974d77d350e5e09202e740819446464f78 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 16 Feb 2021 21:05:27 +0100 Subject: [PATCH] Detect when all clear levels get "uncleared" by newly spawning stuff. Try to fix blood pools on skies (hopefully). --- language.def_base | 3 +++ language.es_base | 3 +++ language.version | 4 +-- sndinfo.txt | 1 + sounds/RECSCRAP.ogg | Bin 0 -> 15907 bytes zscript/swwm_blod.zsc | 4 +-- zscript/swwm_handler.zsc | 53 +++++++++++++++++++++++++++++++-------- 7 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 sounds/RECSCRAP.ogg diff --git a/language.def_base b/language.def_base index 479304a6b..9458819e5 100644 --- a/language.def_base +++ b/language.def_base @@ -658,6 +658,9 @@ SWWM_LASTMONSTER = "\cf%s\cf killed the last monster. +%d\c-"; SWWM_NEWLORE = "New entries have been added to the Library."; SWWM_SELLEXTRA = "\cf%s\cf sold an extra %s\cf. +%d\c-"; SWWM_ALLCLEAR = "\cxLevel all clear! \cf+%d\c-"; +SWWM_NOTCLEAR = "\cxLevel not clear?\c-"; +SWWM_ALLCLEARAGAIN = "\cxLevel all clear... again!? \cf+%d\c-"; +SWWM_NOTCLEARAGAIN = "\cxLevel not clear... again??\c-"; SWWM_NEWMISSION = "Mission briefing has been updated."; // intermission tips SWWM_NINTERTIP = "120"; diff --git a/language.es_base b/language.es_base index 8a8a8faf7..2a4249f6f 100644 --- a/language.es_base +++ b/language.es_base @@ -585,6 +585,9 @@ SWWM_NEWLORE = "Hay nuevas entradas disponibles en la Biblioteca."; SWWM_SELLEXTRA = "\cf%s\cf vendió un %s\cf extra. +%d\c-"; SWWM_SELLEXTRA_FEM = "\cf%s\cf vendió una %s\cf extra. +%d\c-"; SWWM_ALLCLEAR = "\cx¡Nivel despejado! \cf+%d\c-"; +SWWM_NOTCLEAR = "\cx¿Nivel no despejado?\c-"; +SWWM_ALLCLEARAGAIN = "\cx¿¡Nivel despejado... otra vez!? \cf+%d\c-"; +SWWM_NOTCLEARAGAIN = "\cx¿¿Nivel no despejado... otra vez??\c-"; SWWM_NEWMISSION = "El informe de misión ha sido actualizado."; // intermission tips SWWM_INTERTIP = "Consejo #%d:"; diff --git a/language.version b/language.version index 55dc895d8..cfdf56613 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r278 \cu(Tue 16 Feb 00:51:55 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r278 \cu(2021-02-16 00:51:55)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r279 \cu(Tue 16 Feb 21:05:27 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r279 \cu(2021-02-16 21:05:27)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index 78a7656b9..e673290ac 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -8,6 +8,7 @@ bestsound sounds/CORK.ogg haha/dab sounds/DAB.ogg bruh sounds/BRUH.ogg squeak sounds/SQUEAK.ogg +recordscratch sounds/RECSCRAP.ogg saya/giggle1 sounds/saya/saya_giggle1.ogg saya/giggle2 sounds/saya/saya_giggle2.ogg diff --git a/sounds/RECSCRAP.ogg b/sounds/RECSCRAP.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8992addf9a55f70a5c52f886128812fc60b0522a GIT binary patch literal 15907 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 literal 0 HcmV?d00001 diff --git a/zscript/swwm_blod.zsc b/zscript/swwm_blod.zsc index fb3a0c6bb..00ef1572c 100644 --- a/zscript/swwm_blod.zsc +++ b/zscript/swwm_blod.zsc @@ -223,7 +223,7 @@ Class mkBloodDrop : Actor if ( !d.HitSector ) { d.HitSector = floorsector; - d.HitTexture = floorpic; + d.HitTexture = floorsector.GetTexture(0); } if ( d.HitTexture == skyflatnum ) { @@ -265,7 +265,7 @@ Class mkBloodDrop : Actor if ( !d.HitSector ) { d.HitSector = ceilingsector; - d.HitTexture = ceilingpic; + d.HitTexture = ceilingsector.GetTexture(1); } if ( (d.HitTexture == skyflatnum) || master ) { diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc index 8012e6252..b663f1a2b 100644 --- a/zscript/swwm_handler.zsc +++ b/zscript/swwm_handler.zsc @@ -232,9 +232,10 @@ Class SWWMHandler : EventHandler int lastkill[MAXPLAYERS]; int multilevel[MAXPLAYERS]; int lastitemcount[MAXPLAYERS]; + bool mnotify; bool allkills, allitems, allsecrets; bool mapclear; - bool mnotify; + int mapclearagain, restartmus; // for custom cheats transient ui int kcode; transient ui String kstr; @@ -1240,16 +1241,37 @@ Class SWWMHandler : EventHandler private void OneHundredPercentCheck() { + if ( !mapclear && (restartmus > 0) ) + { + restartmus--; + if ( restartmus == 0 ) S_ChangeMusic("*",force:true); + return; + } // ignore levels that have NOTHING - if ( (level.total_secrets <= 0) - && (level.total_items <= 0) - && (level.total_monsters <= 0) ) return; - if ( mapclear ) return; - if ( (level.found_secrets < level.total_secrets) - || (level.found_items < level.total_items) - || (level.killed_monsters < level.total_monsters) ) return; + if ( (level.total_secrets <= 0) && (level.total_items <= 0) && (level.total_monsters <= 0) ) return; + if ( mapclear ) + { + if ( (swwm_silencemap > 1) && (musplaying.name != "music/olg.ogg") ) + S_ChangeMusic("music/olg.ogg",force:true); + if ( (level.found_secrets < level.total_secrets) || (level.found_items < level.total_items) || (level.killed_monsters < level.total_monsters) ) + { + if ( swwm_silencemap > 0 ) + { + restartmus = 25; + S_ChangeMusic("",force:true); + S_StartSound("recordscratch",CHAN_VOICE,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); + } + mapclear = false; + if ( mapclearagain > 1 ) Console.Printf(StringTable.Localize("$SWWM_NOTCLEARAGAIN")); + else Console.Printf(StringTable.Localize("$SWWM_NOTCLEAR")); + } + return; + } + if ( (level.found_secrets < level.total_secrets) || (level.found_items < level.total_items) || (level.killed_monsters < level.total_monsters) ) return; + restartmus = 0; mapclear = true; - Console.Printf(StringTable.Localize("$SWWM_ALLCLEAR"),5000); + if ( mapclearagain ) Console.Printf(StringTable.Localize("$SWWM_ALLCLEARAGAIN"),500); + else Console.Printf(StringTable.Localize("$SWWM_ALLCLEAR"),5000); S_StartSound("misc/wow",CHAN_VOICE,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); if ( swwm_silencemap == 1 ) S_ChangeMusic("",force:true); else if ( swwm_silencemap > 1 ) S_ChangeMusic("music/olg.ogg",force:true); @@ -1258,9 +1280,18 @@ Class SWWMHandler : EventHandler if ( !playeringame[i] || !players[i].mo ) continue; let f = Actor.Spawn("PartyTime",players[i].mo.pos); f.bAMBUSH = true; - SWWMCredits.Give(players[i],5000); - SWWMScoreObj.Spawn(5000,players[i].mo.Vec3Offset(0,0,players[i].mo.Height/2)); + if ( mapclearagain ) + { + SWWMCredits.Give(players[i],500); + SWWMScoreObj.Spawn(500,players[i].mo.Vec3Offset(0,0,players[i].mo.Height/2)); + } + else + { + SWWMCredits.Give(players[i],5000); + SWWMScoreObj.Spawn(5000,players[i].mo.Vec3Offset(0,0,players[i].mo.Height/2)); + } } + mapclearagain++; } override void WorldTick()