OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Setup for Saya Bean to call you a horny.

Browse source 
Small fixup to camera detection.
This commit is contained in:
Mari the Deer 2020-12-22 21:03:17 +01:00
commit b516ebe863
7 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default] [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)";

1
sndinfo.txt
View file

@ -23,6 +23,7 @@ saya/giggle12 sounds/saya/saya_giggle12.ogg
saya/giggle13 sounds/saya/saya_giggle13.ogg saya/giggle13 sounds/saya/saya_giggle13.ogg
saya/giggle14 sounds/saya/saya_giggle14.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 } $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/giggle1 sounds/kirin/kirin_giggle1.ogg
kirin/giggle2 sounds/kirin/kirin_giggle2.ogg kirin/giggle2 sounds/kirin/kirin_giggle2.ogg

BIN
sounds/saya/saya_pervert.ogg Normal file
View file

Binary file not shown.

2
zscript/swwm_cbt.zsc
View file

@ -942,7 +942,7 @@ Class Wallbuster : SWWMWeapon
override void RenderUnderlay( RenderEvent e ) override void RenderUnderlay( RenderEvent e )
{ {
// draw custom crosshair // 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 ( !phair || !phair.GetBool() ) return;
if ( !ch_on ) ch_on = CVar.GetCVar('crosshairon',players[consoleplayer]); if ( !ch_on ) ch_on = CVar.GetCVar('crosshairon',players[consoleplayer]);
if ( !ch_on.GetBool() ) return; if ( !ch_on.GetBool() ) return;

2
zscript/swwm_funstuff.zsc
View file

@ -317,6 +317,8 @@ Class DemoPlush : SWWMCollectible
} }
Class SayaBean : SWWMCollectible Class SayaBean : SWWMCollectible
{ {
bool callout; // already called the player a perv for loading h-doom
Default Default
{ {
Tag "$T_SAYABEAN"; Tag "$T_SAYABEAN";

2
zscript/swwm_hud.zsc
View file

@ -1400,7 +1400,7 @@ Class SWWMStatusBar : BaseStatusBar
if ( !iscale ) iscale = CVar.GetCVar('swwm_poiscale',players[consoleplayer]); if ( !iscale ) iscale = CVar.GetCVar('swwm_poiscale',players[consoleplayer]);
if ( !dscale ) dscale = CVar.GetCVar('swwm_detscale',players[consoleplayer]); if ( !dscale ) dscale = CVar.GetCVar('swwm_detscale',players[consoleplayer]);
if ( !camhud ) camhud = CVar.GetCVar('swwm_camhud',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; camhidden = true;
else camhidden = false; else camhidden = false;
BeginHUD(); BeginHUD();

2
zscript/swwm_inventory.zsc
View file

@ -1167,7 +1167,7 @@ Class SWWMWeapon : Weapon abstract
virtual ui void RenderUnderlay( RenderEvent e ) virtual ui void RenderUnderlay( RenderEvent e )
{ {
// draw custom crosshair // 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 ( !phair || !phair.GetBool() ) return;
if ( !ch_on ) ch_on = CVar.GetCVar('crosshairon',players[consoleplayer]); if ( !ch_on ) ch_on = CVar.GetCVar('crosshairon',players[consoleplayer]);
if ( !ch_on.GetBool() ) return; if ( !ch_on.GetBool() ) return;