sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-10 11:58:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make timer_countdown_timescale = fTimescale * style_timescale

Browse Source
This commit is contained in:
rtldg 2021-12-29 11:39:57 +00:00
parent 35391f36d1
commit cd91255c52
3 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/sourcemod/configs/shavit-styles.cfg
View File

@ -35,8 +35,8 @@
"airaccelerate" "1000.0" // sv_airaccelerate value for the style. "airaccelerate" "1000.0" // sv_airaccelerate value for the style.
"runspeed" "260.00" // Running speed. Requires DHooks, shavit-misc and shavit_misc_staticprestrafe set to 1. "runspeed" "260.00" // Running speed. Requires DHooks, shavit-misc and shavit_misc_staticprestrafe set to 1.
"gravity" "1.0" // Gravity setting, 1.0 for default. Standard for low gravity styles is 0.6. "gravity" "1.0" // Gravity setting, 1.0 for default. Standard for low gravity styles is 0.6.
"speed" "1.0" // Speed multiplier, 1.0 for default. Standard for slowmo styles is 0.5. "speed" "1.0" // Speed multiplier, 1.0 for default. Standard for slowmo styles is 0.5. This a multiplier for m_flLaggedMovementValue.
"timescale" "1.0" // Timing will scale with this setting. "timescale" "1.0" // Timing will scale with this setting. This is also a multiplier for m_flLaggedMovementValue.
"tas_timescale" "0" // 1 = enabled. 0 = disabled. Allows player to edit their timescale like a TAS plugin with sm_timescale, sm_timescaleplus, and sm_timescaleminus. Total timescale for the player = style_timescale * user_tas_timescale "tas_timescale" "0" // 1 = enabled. 0 = disabled. Allows player to edit their timescale like a TAS plugin with sm_timescale, sm_timescaleplus, and sm_timescaleminus. Total timescale for the player = style_timescale * user_tas_timescale

17
addons/sourcemod/scripting/include/shavit/core.inc
View File

@ -787,7 +787,8 @@ forward void Shavit_OnClanTagChangePost(int client, char[] customtag, int custom
forward void Shavit_OnTimeOffsetCalculated(int client, int zonetype, float offset, float distance); forward void Shavit_OnTimeOffsetCalculated(int client, int zonetype, float offset, float distance);
/** /**
* Called when a clients dynamic timescale has been changed. * Called when a client's dynamic timescale has been changed.
* For the client's total timescale value, see the comments next to `Shavit_GetClientTimescale()`.
* *
* @param client Client index. * @param client Client index.
* @param oldtimescale The old timescale value * @param oldtimescale The old timescale value
@ -1299,10 +1300,15 @@ native void Shavit_SetAvgVelocity(int client, float vel);
native void Shavit_SetMaxVelocity(int client, float vel); native void Shavit_SetMaxVelocity(int client, float vel);
/** /**
* Sets the clients dynamic timescale. -1.0 to use the timescale of the client's style. * Sets the client's dynamic timescale (timer_snapshot_t.fTimescale)
* Note: Values above 1.0 won't scale into the replay bot. * Note: Values above 1.0 won't scale into the replay bot.
* Timescale is limited to four decimal places. timescale >= 0.0001 * Timescale is limited to four decimal places. timescale >= 0.0001
* *
* timer_countdown_timescale = fTimescale * style_timescale;
* m_flLaggedMovementValue = fTimescale * style_timescale * style_speed * current_player_speedmod;
* Eventqueuefix_timescale = fTimescale * style_timescale * style_speed;
* See `UpdateLaggedMovement()` in shavit-core.sp for more info.
*
* @param client Client index * @param client Client index
* @param scale New timescale * @param scale New timescale
* *
@ -1311,7 +1317,12 @@ native void Shavit_SetMaxVelocity(int client, float vel);
native void Shavit_SetClientTimescale(int client, float scale); native void Shavit_SetClientTimescale(int client, float scale);
/** /**
* Gets the clients dynamic timescale, or -1.0 if unset. * Gets the clients dynamic timescale (timer_snapshot_t.fTimescale).
*
* timer_countdown_timescale = fTimescale * style_timescale;
* m_flLaggedMovementValue = fTimescale * style_timescale * style_speed * current_player_speedmod;
* Eventqueuefix_timescale = fTimescale * style_timescale * style_speed;
* See `UpdateLaggedMovement()` in shavit-core.sp for more info.
* *
* @param client Client index * @param client Client index
* *

73
addons/sourcemod/scripting/shavit-core.sp
View File

@ -847,12 +847,7 @@ public Action Command_Timescale(int client, int args)
GetCmdArg(1, sArg, 16); GetCmdArg(1, sArg, 16);
float ts = StringToFloat(sArg); float ts = StringToFloat(sArg);
if (ts == -1.0) if (ts >= 0.01 && ts <= 1.0)
{
ts = GetStyleSettingFloat(gA_Timers[client].bsStyle, "timescale");
}
if (ts >= 0.0001 && ts <= 1.0)
{ {
Shavit_SetClientTimescale(client, ts); Shavit_SetClientTimescale(client, ts);
Shavit_PrintToChat(client, "%f", ts); Shavit_PrintToChat(client, "%f", ts);
@ -883,7 +878,7 @@ public Action Command_TimescalePlus(int client, int args)
ts = StringToFloat(sArg); ts = StringToFloat(sArg);
} }
if (ts >= 0.0001) if (ts >= 0.01)
{ {
ts += gA_Timers[client].fTimescale; ts += gA_Timers[client].fTimescale;
@ -921,7 +916,7 @@ public Action Command_TimescaleMinus(int client, int args)
ts = StringToFloat(sArg); ts = StringToFloat(sArg);
} }
if (ts >= 0.0001) if (ts >= 0.01)
{ {
float newts = gA_Timers[client].fTimescale - ts; float newts = gA_Timers[client].fTimescale - ts;
@ -930,9 +925,9 @@ public Action Command_TimescaleMinus(int client, int args)
newts = ts; newts = ts;
} }
if (newts < 0.0001) if (newts < 0.01)
{ {
newts = 0.0001; newts = 0.01;
} }
Shavit_SetClientTimescale(client, newts); Shavit_SetClientTimescale(client, newts);
@ -1349,10 +1344,14 @@ void CallOnTrackChanged(int client, int oldtrack, int newtrack)
} }
} }
void UpdateLaggedMovement(int client, bool eventqueuefix) void UpdateLaggedMovement(int client, bool eventqueuefix, bool user_timescale)
{ {
float speed = gA_Timers[client].fTimescale * GetStyleSettingFloat(gA_Timers[client].bsStyle, "speed") * gA_Timers[client].fplayer_speedmod; float speed =
SetEntPropFloat(client, Prop_Data, "m_flLaggedMovementValue", speed); // might be problematic with the shavit-kz stuff TODO (user_timescale ? gA_Timers[client].fTimescale : 1.0)
* GetStyleSettingFloat(gA_Timers[client].bsStyle, "timescale")
* GetStyleSettingFloat(gA_Timers[client].bsStyle, "speed");
SetEntPropFloat(client, Prop_Data, "m_flLaggedMovementValue", speed * gA_Timers[client].fplayer_speedmod);
if (eventqueuefix && gB_Eventqueuefix) if (eventqueuefix && gB_Eventqueuefix)
{ {
@ -1360,7 +1359,7 @@ void UpdateLaggedMovement(int client, bool eventqueuefix)
} }
} }
void CallOnStyleChanged(int client, int oldstyle, int newstyle, bool manual, bool nofoward=false) void CallOnStyleChanged(int client, int oldstyle, int newstyle, bool manual, bool nofoward=false, bool skiptsforward=false)
{ {
if (!nofoward) if (!nofoward)
{ {
@ -1375,18 +1374,19 @@ void CallOnStyleChanged(int client, int oldstyle, int newstyle, bool manual, boo
gA_Timers[client].bsStyle = newstyle; gA_Timers[client].bsStyle = newstyle;
float fNewTimescale = GetStyleSettingFloat(newstyle, "timescale"); if (!skiptsforward)
if (gA_Timers[client].fTimescale != fNewTimescale && fNewTimescale > 0.0)
{ {
CallOnTimescaleChanged(client, gA_Timers[client].fTimescale, fNewTimescale); if (gA_Timers[client].fTimescale != 1.0)
gA_Timers[client].fTimescale = fNewTimescale; {
CallOnTimescaleChanged(client, gA_Timers[client].fTimescale, 1.0);
gA_Timers[client].fTimescale = 1.0;
}
UpdateLaggedMovement(client, true, true);
} }
UpdateStyleSettings(client); UpdateStyleSettings(client);
UpdateLaggedMovement(client, true);
SetEntityGravity(client, GetStyleSettingFloat(newstyle, "gravity")); SetEntityGravity(client, GetStyleSettingFloat(newstyle, "gravity"));
} }
@ -1520,7 +1520,7 @@ void VelocityChanges(int data)
if(GetStyleSettingBool(style, "force_timescale")) if(GetStyleSettingBool(style, "force_timescale"))
{ {
UpdateLaggedMovement(client, true); UpdateLaggedMovement(client, true, true);
} }
float fAbsVelocity[3]; float fAbsVelocity[3];
@ -2132,13 +2132,10 @@ public int Native_LoadSnapshot(Handle handler, int numParams)
if (gA_Timers[client].bsStyle != snapshot.bsStyle && Shavit_HasStyleAccess(client, snapshot.bsStyle)) if (gA_Timers[client].bsStyle != snapshot.bsStyle && Shavit_HasStyleAccess(client, snapshot.bsStyle))
{ {
CallOnStyleChanged(client, gA_Timers[client].bsStyle, snapshot.bsStyle, false); CallOnStyleChanged(client, gA_Timers[client].bsStyle, snapshot.bsStyle, false, true);
} }
if (gA_Timers[client].fTimescale != snapshot.fTimescale) Shavit_SetClientTimescale(client, snapshot.fTimescale); // will call ts-changed forward & UpdateLaggedMovement
{
CallOnTimescaleChanged(client, gA_Timers[client].fTimescale, snapshot.fTimescale);
}
gA_Timers[client] = snapshot; gA_Timers[client] = snapshot;
gA_Timers[client].bClientPaused = snapshot.bClientPaused && snapshot.bTimerEnabled; gA_Timers[client].bClientPaused = snapshot.bClientPaused && snapshot.bTimerEnabled;
@ -2177,12 +2174,6 @@ public int Native_MarkKZMap(Handle handler, int numParams)
public int Native_GetClientTimescale(Handle handler, int numParams) public int Native_GetClientTimescale(Handle handler, int numParams)
{ {
int client = GetNativeCell(1); int client = GetNativeCell(1);
if (gA_Timers[client].fTimescale == GetStyleSettingFloat(gA_Timers[client].bsStyle, "timescale"))
{
return view_as<int>(-1.0);
}
return view_as<int>(gA_Timers[client].fTimescale); return view_as<int>(gA_Timers[client].fTimescale);
} }
@ -2197,7 +2188,7 @@ public int Native_SetClientTimescale(Handle handler, int numParams)
{ {
CallOnTimescaleChanged(client, gA_Timers[client].fTimescale, timescale); CallOnTimescaleChanged(client, gA_Timers[client].fTimescale, timescale);
gA_Timers[client].fTimescale = timescale; gA_Timers[client].fTimescale = timescale;
UpdateLaggedMovement(client, true); UpdateLaggedMovement(client, true, true);
} }
} }
@ -2331,7 +2322,7 @@ void StartTimer(int client, int track)
//gA_Timers[client].fNextFrameTime = 0.0; //gA_Timers[client].fNextFrameTime = 0.0;
//gA_Timers[client].fplayer_speedmod = 1.0; //gA_Timers[client].fplayer_speedmod = 1.0;
UpdateLaggedMovement(client, true); UpdateLaggedMovement(client, true, true);
SetEntityGravity(client, GetStyleSettingFloat(gA_Timers[client].bsStyle, "gravity")); SetEntityGravity(client, GetStyleSettingFloat(gA_Timers[client].bsStyle, "gravity"));
} }
@ -2759,7 +2750,7 @@ public MRESReturn DHook_AcceptInput_player_speedmod_Post(int pThis, DHookReturn
float speed = StringToFloat(buf); float speed = StringToFloat(buf);
gA_Timers[activator].fplayer_speedmod = speed; gA_Timers[activator].fplayer_speedmod = speed;
UpdateLaggedMovement(activator, false); UpdateLaggedMovement(activator, false, true);
#if DEBUG #if DEBUG
int caller = hParams.Get(3); int caller = hParams.Get(3);
@ -2791,8 +2782,7 @@ public MRESReturn DHook_ProcessMovement(Handle hParams)
{ {
gA_Timers[client].fNextFrameTime += (1.0 - gA_Timers[client].fTimescale); gA_Timers[client].fNextFrameTime += (1.0 - gA_Timers[client].fTimescale);
gA_Timers[client].iLastMoveTypeTAS = GetEntityMoveType(client); gA_Timers[client].iLastMoveTypeTAS = GetEntityMoveType(client);
SetEntPropFloat(client, Prop_Data, "m_flLaggedMovementValue", UpdateLaggedMovement(client, false, false);
gA_Timers[client].fplayer_speedmod * GetStyleSettingFloat(gA_Timers[client].bsStyle, "speed"));
} }
else else
{ {
@ -2814,7 +2804,7 @@ public MRESReturn DHook_ProcessMovementPost(Handle hParams)
if (GetStyleSettingBool(gA_Timers[client].bsStyle, "tas_timescale") && gA_Timers[client].fTimescale != 1.0) if (GetStyleSettingBool(gA_Timers[client].bsStyle, "tas_timescale") && gA_Timers[client].fTimescale != 1.0)
{ {
SetEntityMoveType(client, gA_Timers[client].iLastMoveTypeTAS); SetEntityMoveType(client, gA_Timers[client].iLastMoveTypeTAS);
UpdateLaggedMovement(client, true); UpdateLaggedMovement(client, true, true);
} }
if (gA_Timers[client].bClientPaused || !gA_Timers[client].bTimerEnabled) if (gA_Timers[client].bClientPaused || !gA_Timers[client].bTimerEnabled)
@ -2823,7 +2813,8 @@ public MRESReturn DHook_ProcessMovementPost(Handle hParams)
} }
float interval = GetTickInterval(); float interval = GetTickInterval();
float time = interval * gA_Timers[client].fTimescale; float ts = GetStyleSettingFloat(gA_Timers[client].bsStyle, "timescale") * gA_Timers[client].fTimescale;
float time = interval * ts;
gA_Timers[client].iZoneIncrement++; gA_Timers[client].iZoneIncrement++;
@ -2836,7 +2827,7 @@ public MRESReturn DHook_ProcessMovementPost(Handle hParams)
Call_PushCellRef(time); Call_PushCellRef(time);
Call_Finish(); Call_Finish();
gA_Timers[client].iFractionalTicks += RoundFloat(gA_Timers[client].fTimescale * 10000.0); gA_Timers[client].iFractionalTicks += RoundFloat(ts * 10000.0);
int whole_tick = gA_Timers[client].iFractionalTicks / 10000; int whole_tick = gA_Timers[client].iFractionalTicks / 10000;
gA_Timers[client].iFractionalTicks -= whole_tick * 10000; gA_Timers[client].iFractionalTicks -= whole_tick * 10000;
gA_Timers[client].iFullTicks += whole_tick; gA_Timers[client].iFullTicks += whole_tick;