.float stat_sv_maxspeed;
.float stat_movement_highspeed;
+.float stat_sv_friction_on_land;
+.float stat_sv_friction_slick;
+
.float stat_doublejump;
.float stat_jumpspeedcap_min;
addstat(STAT_MOVEVARS_JUMPSPEEDCAP_MIN, AS_FLOAT, stat_jumpspeedcap_min);
addstat(STAT_MOVEVARS_JUMPSPEEDCAP_MIN, AS_FLOAT, stat_jumpspeedcap_min);
addstat(STAT_MOVEVARS_JUMPSPEEDCAP_DISABLE_ONRAMPS, AS_INT, stat_jumpspeedcap_disable_onramps);
+
+ // hacks
+ addstat(STAT_MOVEVARS_FRICTION_ONLAND, AS_FLOAT, stat_sv_friction_on_land);
+ addstat(STAT_MOVEVARS_FRICTION_SLICK, AS_FLOAT, stat_sv_friction_slick);
}
void Physics_UpdateStats(float maxspd_mod)
self.stat_jumpspeedcap_min = PHYS_JUMPSPEEDCAP_MIN;
self.stat_jumpspeedcap_max = PHYS_JUMPSPEEDCAP_MAX;
self.stat_jumpspeedcap_disable_onramps = PHYS_JUMPSPEEDCAP_DISABLE_ONRAMPS;
+
+ self.stat_sv_friction_on_land = PHYS_FRICTION_ONLAND;
+ self.stat_sv_friction_slick = PHYS_FRICTION_SLICK;
}
#endif
PlayerJump
When you press the jump key
+returns TRUE if handled
=============
*/
-void PlayerJump (void)
+float PlayerJump (void)
{
if (PHYS_FROZEN(self))
- return; // no jumping in freezetag when frozen
+ return TRUE; // no jumping in freezetag when frozen
#ifdef SVQC
if (self.player_blocked)
- return; // no jumping while blocked
+ return TRUE; // no jumping while blocked
#endif
float doublejump = FALSE;
player_jumpheight = mjumpheight;
#ifdef SVQC
if (MUTATOR_CALLHOOK(PlayerJump))
- return;
#elif defined(CSQC)
if(PM_multijump_checkjump())
- return;
#endif
+ return TRUE;
doublejump = player_multijump;
mjumpheight = player_jumpheight;
if (self.waterlevel >= WATERLEVEL_SWIMMING)
{
self.velocity_z = PHYS_MAXSPEED(self) * 0.7;
- return;
+ return TRUE;
}
if (!doublejump)
if (!IS_ONGROUND(self))
- return;
+ return IS_JUMP_HELD(self);
if (PHYS_TRACK_CANJUMP(self))
if (IS_JUMP_HELD(self))
- return;
+ return TRUE;
// sv_jumpspeedcap_min/sv_jumpspeedcap_max act as baseline
// velocity bounds. Final velocity is bound between (jumpheight *
}
}
-#ifdef SVQC
- if (!(self.lastflags & FL_ONGROUND))
+ if (!WAS_ONGROUND(self))
{
- if (autocvar_speedmeter)
+ if(autocvar_speedmeter)
dprint(strcat("landing velocity: ", vtos(self.velocity), " (abs: ", ftos(vlen(self.velocity)), ")\n"));
- if (self.lastground < time - 0.3)
+ if(self.lastground < time - 0.3)
{
- self.velocity_x *= (1 - autocvar_sv_friction_on_land);
- self.velocity_y *= (1 - autocvar_sv_friction_on_land);
+ self.velocity_x *= (1 - PHYS_FRICTION_ONLAND);
+ self.velocity_y *= (1 - PHYS_FRICTION_ONLAND);
}
- if (self.jumppadcount > 1)
+ if(self.jumppadcount > 1)
dprint(strcat(ftos(self.jumppadcount), "x jumppad combo\n"));
self.jumppadcount = 0;
}
-#endif
self.velocity_z += mjumpheight;
if (autocvar_g_jump_grunt)
PlayerSound(playersound_jump, CH_PLAYER, VOICETYPE_PLAYERSOUND);
#endif
+ return TRUE;
}
void CheckWaterJump()
}
}
+
+#ifdef SVQC
+ #define JETPACK_JUMP(s) s.cvar_cl_jetpack_jump
+#elif defined(CSQC)
+ float autocvar_cl_jetpack_jump;
+ #define JETPACK_JUMP(s) autocvar_cl_jetpack_jump
+#endif
+.float jetpack_stopped;
+// Hack: shouldn't need to know about this
+.float multijump_count;
void CheckPlayerJump()
{
- if(PHYS_INPUT_BUTTON_JUMP(self))
- PlayerJump();
+#ifdef SVQC
+ float was_flying = ITEMS(self) & IT_USING_JETPACK;
+#endif
+ if (JETPACK_JUMP(self) < 2)
+#ifdef SVQC
+ ITEMS(self) &= ~IT_USING_JETPACK;
+#endif
+
+ if(PHYS_INPUT_BUTTON_JUMP(self) || PHYS_INPUT_BUTTON_JETPACK(self))
+ {
+#ifdef SVQC
+ float air_jump = !PlayerJump() || self.multijump_count > 0; // PlayerJump() has important side effects
+ float activate = JETPACK_JUMP(self) && air_jump && PHYS_INPUT_BUTTON_JUMP(self) || PHYS_INPUT_BUTTON_JETPACK(self);
+ float has_fuel = !autocvar_g_jetpack_fuel || self.ammo_fuel || ITEMS(self) & IT_UNLIMITED_WEAPON_AMMO;
+#else
+ PlayerJump(); // Client only
+ float has_fuel = TRUE; // TODO
+#endif
+ if (!(ITEMS(self) & IT_JETPACK)) { }
+ else if (self.jetpack_stopped) { }
+ else if (!has_fuel)
+ {
+#ifdef SVQC
+ if (was_flying) // TODO: ran out of fuel message
+ Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL);
+ else if (activate)
+ Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL);
+#endif
+ self.jetpack_stopped = TRUE;
+#ifdef SVQC
+ ITEMS(self) &= ~IT_USING_JETPACK;
+#endif
+ }
+#ifdef SVQC
+ else if (activate && !PHYS_FROZEN(self))
+ ITEMS(self) |= IT_USING_JETPACK;
+#endif
+ }
else
+ {
+ self.jetpack_stopped = FALSE;
+#ifdef SVQC
+ ITEMS(self) &= ~IT_USING_JETPACK;
+#endif
+ }
+ if (!PHYS_INPUT_BUTTON_JUMP(self))
UNSET_JUMP_HELD(self);
if (self.waterlevel == WATERLEVEL_SWIMMING)
PM_Accelerate(wishdir, wishspeed, wishspeed, PHYS_ACCELERATE*maxspd_mod, 1, 0, 0, 0);
}
-void PM_check_jumppad()
-{
-#ifdef CSQC
- entity oldself = self;
-
- for(self = world; (self = find(self, classname, "jumppad")); )
- trigger_push_draw();
-
- self = oldself;
-#endif
-}
-
void PM_jetpack(float maxspd_mod)
{
//makevectors(PHYS_INPUT_ANGLES(self).y * '0 1 0');
if (!(ITEMS(self) & IT_UNLIMITED_WEAPON_AMMO))
self.ammo_fuel -= PHYS_JETPACK_FUEL * PHYS_INPUT_TIMELENGTH * fvel * f;
- self.items |= IT_USING_JETPACK;
+ ITEMS(self) |= IT_USING_JETPACK;
// jetpack also inhibits health regeneration, but only for 1 second
self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_fuel_regen);
#endif
void PM_walk(float buttons_prev, float maxspd_mod)
{
-#ifdef SVQC
- // we get here if we ran out of ammo
- if ((ITEMS(self) & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32) && self.ammo_fuel < 0.01)
- sprint(self, "You don't have any fuel for the ^2Jetpack\n");
- if (!(self.lastflags & FL_ONGROUND))
+ if (!WAS_ONGROUND(self))
{
if (autocvar_speedmeter)
dprint(strcat("landing velocity: ", vtos(self.velocity), " (abs: ", ftos(vlen(self.velocity)), ")\n"));
if (self.lastground < time - 0.3)
- self.velocity *= (1 - autocvar_sv_friction_on_land);
+ self.velocity *= (1 - PHYS_FRICTION_ONLAND);
if (self.jumppadcount > 1)
dprint(strcat(ftos(self.jumppadcount), "x jumppad combo\n"));
self.jumppadcount = 0;
}
-#endif
// walking
makevectors(PHYS_INPUT_ANGLES(self).y * '0 1 0');
vector wishvel = v_forward * PHYS_INPUT_MOVEVALUES(self).x
float f = vlen(vec2(self.velocity));
if (f > 0)
{
+ float realfriction;
+ trace_dphitq3surfaceflags = 0;
+ tracebox(self.origin, self.mins, self.maxs, self.origin - '0 0 1', MOVE_NOMONSTERS, self);
// TODO: apply edge friction
// apply ground friction
- f = 1 - PHYS_INPUT_TIMELENGTH * PHYS_FRICTION * ((f < PHYS_STOPSPEED) ? (PHYS_STOPSPEED / f) : 1);
+ if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK)
+ realfriction = PHYS_FRICTION_SLICK;
+ else
+ realfriction = PHYS_FRICTION;
+
+ f = 1 - PHYS_INPUT_TIMELENGTH * realfriction * ((f < PHYS_STOPSPEED) ? (PHYS_STOPSPEED / f) : 1);
f = max(0, f);
self.velocity *= f;
/*
void PM_air(float buttons_prev, float maxspd_mod)
{
-#ifdef SVQC
- // we get here if we ran out of ammo
- if ((ITEMS(self) & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32) && PHYS_AMMO_FUEL(self) < 0.01)
- sprint(self, "You don't have any fuel for the ^2Jetpack\n");
-#endif
makevectors(PHYS_INPUT_ANGLES(self).y * '0 1 0');
vector wishvel = v_forward * PHYS_INPUT_MOVEVALUES(self).x
+ v_right * PHYS_INPUT_MOVEVALUES(self).y;
bot_think();
}
- self.items &= ~IT_USING_JETPACK;
-
if (IS_PLAYER(self))
#endif
{
not_allowed_to_move = 1;
#endif
#ifdef SVQC
- if (!autocvar_sv_ready_restart_after_countdown)
- if (time < game_starttime)
- not_allowed_to_move = 1;
+ if (time < game_starttime)
+ not_allowed_to_move = 1;
#endif
if (not_allowed_to_move)
maxspeed_mod = 1;
-#ifdef SVQC
- if (self.in_swamp) {
+ if (self.in_swamp)
maxspeed_mod *= self.swamp_slowdown; //cvar("g_balance_swamp_moverate");
- }
-#endif
-#ifdef SVQC
// conveyors: first fix velocity
if (self.conveyor.state)
self.velocity -= self.conveyor.movedir;
-#endif
#ifdef SVQC
MUTATOR_CALLHOOK(PlayerPhysics);
#endif
CheckPlayerJump();
- PM_check_jumppad();
-
if (self.flags & /* FL_WATERJUMP */ 2048)
{
self.velocity_x = self.movedir_x;
else if (time < self.ladder_time)
PM_ladder(maxspeed_mod);
- else if ((ITEMS(self) & IT_JETPACK) && PHYS_INPUT_BUTTON_HOOK(self) && (!PHYS_JETPACK_FUEL || PHYS_AMMO_FUEL(self) > 0 || (ITEMS(self) & IT_UNLIMITED_WEAPON_AMMO)) && !PHYS_FROZEN(self))
+ else if (ITEMS(self) & IT_USING_JETPACK)
PM_jetpack(maxspeed_mod);
else
if (IS_ONGROUND(self))
self.lastground = time;
-#ifdef SVQC
// conveyors: then break velocity again
if (self.conveyor.state)
self.velocity += self.conveyor.movedir;
-#endif
+
+#ifdef SVQC
self.lastflags = self.flags;
+#elif defined(CSQC)
+ self.lastflags = self.pmove_flags;
+#endif
+
self.lastclassname = self.classname;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff