Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Play jump replay at player's current position if map is wrong #232

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Play jump replay at player's current position if map is wrong #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/sourcemod/scripting/gokz-replays/api.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public int Native_RP_LoadJumpReplay(Handle plugin, int numParams)
GetNativeStringLength(2, len);
char[] path = new char[len + 1];
GetNativeString(2, path, len + 1);
int botClient = LoadReplayBot(GetNativeCell(1), path);
int botClient = LoadReplayBot(GetNativeCell(1), path, true);
return botClient;
}

Expand Down
43 changes: 39 additions & 4 deletions addons/sourcemod/scripting/gokz-replays/playback.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,16 @@ static bool hitBhop[RP_MAX_BOTS];
static bool hitPerf[RP_MAX_BOTS];
static bool botJumped[RP_MAX_BOTS];
static bool botIsTakeoff[RP_MAX_BOTS];
static bool isJumpReplay[RP_MAX_BOTS];
static float jumpReplayOffset[RP_MAX_BOTS][3];
static float botLandingSpeed[RP_MAX_BOTS];



// =====[ PUBLIC ]=====

// Returns the client index of the replay bot, or -1 otherwise
int LoadReplayBot(int client, char[] path)
int LoadReplayBot(int client, char[] path, bool jumpReplay = false)
{
int bot;
if (GetBotsInUse() < RP_MAX_BOTS)
Expand All @@ -73,7 +75,10 @@ int LoadReplayBot(int client, char[] path)
GOKZ_PlayErrorSound(client);
return -1;
}


isJumpReplay[bot] = jumpReplay;
jumpReplayOffset[bot] = NULL_VECTOR;

if (!LoadPlayback(client, bot, path))
{
GOKZ_PlayErrorSound(client);
Expand Down Expand Up @@ -448,10 +453,19 @@ static bool LoadFormatVersion2Replay(File file, int client, int bot)
char[] mapName = new char[length + 1];
file.ReadString(mapName, length, length);
mapName[length] = '\0';
bool wrongMap = false;
if (!StrEqual(mapName, gC_CurrentMap))
{
GOKZ_PrintToChat(client, true, "%t", "Replay Menu - Wrong Map", mapName);
return false;
if (!isJumpReplay[bot])
{
GOKZ_PrintToChat(client, true, "%t", "Replay Menu - Wrong Map", mapName);
return false;
}
else
{
GOKZ_PrintToChat(client, true, "%t", "Replay Menu - Jump Replay Wrong Map", mapName);
wrongMap = true;
}
}

// Map filesize
Expand Down Expand Up @@ -619,6 +633,14 @@ static bool LoadFormatVersion2Replay(File file, int client, int bot)

ReplayTickData tickData;
TickDataFromArray(tickDataArray, tickData);

if (i == 0 && wrongMap && isJumpReplay[bot])
{
float playerOrigin[3];
GetClientAbsOrigin(client, playerOrigin);
SubtractVectors(playerOrigin, tickData.origin, jumpReplayOffset[bot]);
}

// HACK: Jump replays don't record proper length sometimes. I don't know why.
// This leads to oversized replays full of 0s at the end.
// So, we do this horrible check to dodge that issue.
Expand Down Expand Up @@ -824,6 +846,13 @@ void PlaybackVersion2(int client, int bot, int &buttons)
// Move the bot and pause them at that tick
playbackTickData[bot].GetArray(playbackTick[bot], currentTickData);
playbackTickData[bot].GetArray(IntMax(playbackTick[bot] - 1, 0), prevTickData);

if (isJumpReplay[bot] && !IsNullVector(jumpReplayOffset[bot]))
{
AddVectors(currentTickData.origin, jumpReplayOffset[bot], currentTickData.origin);
AddVectors(prevTickData.origin, jumpReplayOffset[bot], prevTickData.origin);
}

TeleportEntity(client, currentTickData.origin, currentTickData.angles, view_as<float>( { 0.0, 0.0, 0.0 } ));

if (!inBreather[bot])
Expand Down Expand Up @@ -873,6 +902,12 @@ void PlaybackVersion2(int client, int bot, int &buttons)
playbackTickData[bot].GetArray(playbackTick[bot], currentTickData);
playbackTickData[bot].GetArray(IntMax(playbackTick[bot] - 1, 0), prevTickData);

if (isJumpReplay[bot] && !IsNullVector(jumpReplayOffset[bot]))
{
AddVectors(currentTickData.origin, jumpReplayOffset[bot], currentTickData.origin);
AddVectors(prevTickData.origin, jumpReplayOffset[bot], prevTickData.origin);
}

// Check if the replay is paused
if (botPlaybackPaused[bot])
{
Expand Down
5 changes: 5 additions & 0 deletions addons/sourcemod/translations/gokz-replays.phrases.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@
"#format" "{1:s}"
"en" "{darkred}This replay was not recorded on this map. Please switch to {1} and try again."
}
"Replay Menu - Jump Replay Wrong Map"
{
"#format" "{1:s}"
"en" "{darkred}Warning! This jump replay was not recorded on this map, it will play from your current location. Please switch to {1} if you want to see better playback."
}
"Replay Menu - No File"
{
"en" "{darkred}There is no file for this replay. Please contact an admin if you think this is an error."
Expand Down