From b516ebe8636e7a91d758947d8b96199f473a8a11 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 22 Dec 2020 21:03:17 +0100 Subject: [PATCH] Setup for Saya Bean to call you a horny. Small fixup to camera detection. --- language.version | 2 +- sndinfo.txt | 1 + sounds/saya/saya_pervert.ogg | Bin 0 -> 10322 bytes zscript/swwm_cbt.zsc | 2 +- zscript/swwm_funstuff.zsc | 2 ++ zscript/swwm_hud.zsc | 2 +- zscript/swwm_inventory.zsc | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 sounds/saya/saya_pervert.ogg diff --git a/language.version b/language.version index 5db500c13..cddb7e45a 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r701 \cu(Tue 22 Dec 20:42:59 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r702 \cu(Tue 22 Dec 21:03:17 CET 2020)"; diff --git a/sndinfo.txt b/sndinfo.txt index 5701ab97d..287cdda0c 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -23,6 +23,7 @@ saya/giggle12 sounds/saya/saya_giggle12.ogg saya/giggle13 sounds/saya/saya_giggle13.ogg saya/giggle14 sounds/saya/saya_giggle14.ogg $random saya/giggle { saya/giggle1 saya/giggle2 saya/giggle3 saya/giggle4 saya/giggle5 saya/giggle6 saya/giggle7 saya/giggle8 saya/giggle9 saya/giggle10 saya/giggle11 saya/giggle12 saya/giggle13 saya/giggle14 } +saya/pervert sounds/saya/saya_pervert.ogg kirin/giggle1 sounds/kirin/kirin_giggle1.ogg kirin/giggle2 sounds/kirin/kirin_giggle2.ogg diff --git a/sounds/saya/saya_pervert.ogg b/sounds/saya/saya_pervert.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cc713d286cd24680c500bd63ee385e57d1ff581a GIT binary patch literal 10322 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 bw+tHdjXK#Y6V|_(-1t!S-PHYJ2Ll)YZdpX1 literal 0 HcmV?d00001 diff --git a/zscript/swwm_cbt.zsc b/zscript/swwm_cbt.zsc index 2d22cf52c..a184f421e 100644 --- a/zscript/swwm_cbt.zsc +++ b/zscript/swwm_cbt.zsc @@ -942,7 +942,7 @@ Class Wallbuster : SWWMWeapon override void RenderUnderlay( RenderEvent e ) { // draw custom crosshair - if ( automapactive || (players[consoleplayer].Camera is 'SecurityCamera') ) return; + if ( automapactive || !(players[consoleplayer].Camera is 'PlayerPawn') ) return; if ( !phair || !phair.GetBool() ) return; if ( !ch_on ) ch_on = CVar.GetCVar('crosshairon',players[consoleplayer]); if ( !ch_on.GetBool() ) return; diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index a44135127..8b3234484 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -317,6 +317,8 @@ Class DemoPlush : SWWMCollectible } Class SayaBean : SWWMCollectible { + bool callout; // already called the player a perv for loading h-doom + Default { Tag "$T_SAYABEAN"; diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc index 7fcab4e16..d690b940c 100644 --- a/zscript/swwm_hud.zsc +++ b/zscript/swwm_hud.zsc @@ -1400,7 +1400,7 @@ Class SWWMStatusBar : BaseStatusBar if ( !iscale ) iscale = CVar.GetCVar('swwm_poiscale',players[consoleplayer]); if ( !dscale ) dscale = CVar.GetCVar('swwm_detscale',players[consoleplayer]); if ( !camhud ) camhud = CVar.GetCVar('swwm_camhud',players[consoleplayer]); - if ( !camhud.GetBool() && (players[consoleplayer].Camera is 'SecurityCamera') ) + if ( !camhud.GetBool() && !(players[consoleplayer].Camera is 'PlayerPawn') ) camhidden = true; else camhidden = false; BeginHUD(); diff --git a/zscript/swwm_inventory.zsc b/zscript/swwm_inventory.zsc index 4de62ddf8..fd514a0c2 100644 --- a/zscript/swwm_inventory.zsc +++ b/zscript/swwm_inventory.zsc @@ -1167,7 +1167,7 @@ Class SWWMWeapon : Weapon abstract virtual ui void RenderUnderlay( RenderEvent e ) { // draw custom crosshair - if ( automapactive || (players[consoleplayer].Camera is 'SecurityCamera') ) return; + if ( automapactive || !(players[consoleplayer].Camera is 'PlayerPawn') ) return; if ( !phair || !phair.GetBool() ) return; if ( !ch_on ) ch_on = CVar.GetCVar('crosshairon',players[consoleplayer]); if ( !ch_on.GetBool() ) return;