From d9fc7973f2ff070dd33e72994c3b7b771bb710f5 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Wed, 3 Jan 2024 19:48:41 +0100 Subject: [PATCH] maint: improve logic --- _jump.gsc | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/_jump.gsc b/_jump.gsc index 289dc01..7bf1af5 100644 --- a/_jump.gsc +++ b/_jump.gsc @@ -22,6 +22,22 @@ onPlayerConnect() } } +canInteract( player ) +{ + return maps\mp\_utility::isReallyAlive( player ); +} + +canSave( player ) +{ + if ( !player isOnGround() ) + { + player iPrintLn( "Cannot save while in the air\n" ); + return false; + } + + return true; +} + jumper() { self endon ( "disconnect" ); @@ -38,19 +54,19 @@ jumper() continue; } - if ( msg == "save_pos" && maps\mp\_utility::isReallyAlive( self ) ) + if ( msg == "save_pos" && canInteract( self ) && canSave( self ) ) { self.jumper_pos = self.origin; self.jumper_angles = self getPlayerAngles(); self.jumper_pos_num += 1; - self iPrintLn( "saved pos " + self.jumper_pos_num + "\n" ); + self iPrintLn( "saved pos ", self.jumper_pos_num, "\n" ); } - else if ( msg == "load_saved_pos" && maps\mp\_utility::isReallyAlive( self ) ) + else if ( msg == "load_saved_pos" && canInteract( self ) ) { self setOrigin( self.jumper_pos ); self setVelocity( (0, 0, 0) ); self setPlayerAngles( self.jumper_angles ); - self iPrintLn( "loaded pos " + self.jumper_pos_num + "\n" ); + self iPrintLn( "loaded pos ", self.jumper_pos_num, "\n" ); } } }