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 000000000..cc713d286 Binary files /dev/null and b/sounds/saya/saya_pervert.ogg differ 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;