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

add a_or_d_only style setting

Browse Source
This commit is contained in:
rtldg 2022-07-01 13:17:38 +00:00
parent 760d84e420
commit 64bd95a73b
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ enum struct timer_snapshot_t
int iTotalMeasures; int iTotalMeasures;
int iGoodGains; int iGoodGains;
float fServerTime; float fServerTime;
int iSHSWCombination; int iKeyCombo;
int iTimerTrack; int iTimerTrack;
int iMeasuredJumps; int iMeasuredJumps;
int iPerfectJumps; int iPerfectJumps;

1
addons/sourcemod/scripting/include/shavit/style-settings.sp
View File

@ -187,6 +187,7 @@ public SMCResult OnStyleEnterSection(SMCParser smc, const char[] name, bool opt_
SetStyleSettingInt (gI_CurrentParserIndex, "block_s", 0); SetStyleSettingInt (gI_CurrentParserIndex, "block_s", 0);
SetStyleSettingInt (gI_CurrentParserIndex, "block_d", 0); SetStyleSettingInt (gI_CurrentParserIndex, "block_d", 0);
SetStyleSettingInt (gI_CurrentParserIndex, "block_use", 0); SetStyleSettingInt (gI_CurrentParserIndex, "block_use", 0);
SetStyleSettingBool (gI_CurrentParserIndex, "a_or_d_only", false);
SetStyleSettingInt (gI_CurrentParserIndex, "force_hsw", 0); SetStyleSettingInt (gI_CurrentParserIndex, "force_hsw", 0);
SetStyleSettingInt (gI_CurrentParserIndex, "block_pleft", 0); SetStyleSettingInt (gI_CurrentParserIndex, "block_pleft", 0);
SetStyleSettingInt (gI_CurrentParserIndex, "block_pright", 0); SetStyleSettingInt (gI_CurrentParserIndex, "block_pright", 0);

2
addons/sourcemod/scripting/shavit-checkpoints.sp
View File

@ -1653,7 +1653,7 @@ void SaveCheckpointCache(int saver, int target, cp_cache_t cpcache, int index, H
snapshot.iTotalMeasures = 0; snapshot.iTotalMeasures = 0;
snapshot.iGoodGains = 0; snapshot.iGoodGains = 0;
snapshot.fServerTime = GetEngineTime(); snapshot.fServerTime = GetEngineTime();
snapshot.iSHSWCombination = -1; snapshot.iKeyCombo = -1;
snapshot.iTimerTrack = Shavit_GetReplayBotTrack(target); snapshot.iTimerTrack = Shavit_GetReplayBotTrack(target);
snapshot.fTimescale = 1.0; snapshot.fTimescale = 1.0;
snapshot.fplayer_speedmod = 1.0; snapshot.fplayer_speedmod = 1.0;

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

@ -2492,7 +2492,7 @@ void StartTimer(int client, int track)
gA_Timers[client].iTimerTrack = track; gA_Timers[client].iTimerTrack = track;
gA_Timers[client].bTimerEnabled = true; gA_Timers[client].bTimerEnabled = true;
gA_Timers[client].iSHSWCombination = -1; gA_Timers[client].iKeyCombo = -1;
gA_Timers[client].fCurrentTime = 0.0; gA_Timers[client].fCurrentTime = 0.0;
gA_Timers[client].bPracticeMode = false; gA_Timers[client].bPracticeMode = false;
gA_Timers[client].iMeasuredJumps = 0; gA_Timers[client].iMeasuredJumps = 0;
@ -2634,7 +2634,7 @@ public void OnClientPutInServer(int client)
gB_Auto[client] = true; gB_Auto[client] = true;
gA_Timers[client].fStrafeWarning = 0.0; gA_Timers[client].fStrafeWarning = 0.0;
gA_Timers[client].bPracticeMode = false; gA_Timers[client].bPracticeMode = false;
gA_Timers[client].iSHSWCombination = -1; gA_Timers[client].iKeyCombo = -1;
gA_Timers[client].iTimerTrack = 0; gA_Timers[client].iTimerTrack = 0;
gA_Timers[client].bsStyle = 0; gA_Timers[client].bsStyle = 0;
gA_Timers[client].fTimescale = 1.0; gA_Timers[client].fTimescale = 1.0;
@ -3335,6 +3335,36 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
buttons &= ~IN_MOVERIGHT; buttons &= ~IN_MOVERIGHT;
} }
if (GetStyleSettingBool(gA_Timers[client].bsStyle, "a_or_d_only"))
{
int iCombination = -1;
bool bMoveLeft = ((buttons & IN_MOVELEFT) > 0 && vel[1] < 0.0);
bool bMoveRight = ((buttons & IN_MOVERIGHT) > 0 && vel[1] > 0.0);
if (bMoveLeft)
{
iCombination = 0;
}
else if (bMoveRight)
{
iCombination = 1;
}
if (iCombination != -1)
{
if (gA_Timers[client].iKeyCombo == -1)
{
gA_Timers[client].iKeyCombo = iCombination;
}
if (iCombination != gA_Timers[client].iKeyCombo)
{
vel[1] = 0.0;
buttons &= ~(IN_MOVELEFT|IN_MOVERIGHT);
}
}
}
// HSW // HSW
// Theory about blocking non-HSW strafes while playing HSW: // Theory about blocking non-HSW strafes while playing HSW:
// Block S and W without A or D. // Block S and W without A or D.
@ -3361,18 +3391,18 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
} }
// int gI_SHSW_FirstCombination[MAXPLAYERS+1]; // 0 - W/A S/D | 1 - W/D S/A // int gI_SHSW_FirstCombination[MAXPLAYERS+1]; // 0 - W/A S/D | 1 - W/D S/A
if(gA_Timers[client].iSHSWCombination == -1 && iCombination != -1) if(gA_Timers[client].iKeyCombo == -1 && iCombination != -1)
{ {
Shavit_PrintToChat(client, "%T", (iCombination == 0)? "SHSWCombination0":"SHSWCombination1", client, gS_ChatStrings.sVariable, gS_ChatStrings.sText); Shavit_PrintToChat(client, "%T", (iCombination == 0)? "SHSWCombination0":"SHSWCombination1", client, gS_ChatStrings.sVariable, gS_ChatStrings.sText);
gA_Timers[client].iSHSWCombination = iCombination; gA_Timers[client].iKeyCombo = iCombination;
} }
// W/A S/D // W/A S/D
if((gA_Timers[client].iSHSWCombination == 0 && iCombination != 0) || if((gA_Timers[client].iKeyCombo == 0 && iCombination != 0) ||
// W/D S/A // W/D S/A
(gA_Timers[client].iSHSWCombination == 1 && iCombination != 1) || (gA_Timers[client].iKeyCombo == 1 && iCombination != 1) ||
// no valid combination & no valid input // no valid combination & no valid input
(gA_Timers[client].iSHSWCombination == -1 && iCombination == -1)) (gA_Timers[client].iKeyCombo == -1 && iCombination == -1))
{ {
vel[0] = 0.0; vel[0] = 0.0;
vel[1] = 0.0; vel[1] = 0.0;