edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

add x and y coords to /tp

Browse source
This commit is contained in:
Ewan Green 2023-12-30 14:50:48 -07:00
parent 88ee156646
commit 124bbc429a
2 changed files with 80 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/ddracechat.h
View file

@ -61,9 +61,9 @@ CHAT_COMMAND("time", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTime, this, "Privatel
CHAT_COMMAND("timer", "?s['gametimer'|'broadcast'|'both'|'none'|'cycle']", CFGFLAG_CHAT | CFGFLAG_SERVER, ConSetTimerType, this, "Personal Setting of showing time in either broadcast or game/round timer, timer s, where s = broadcast for broadcast, gametimer for game/round timer, cycle for cycle, both for both, none for no timer and nothing to show current status")
CHAT_COMMAND("r", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConRescue, this, "Teleport yourself out of freeze (use sv_rescue 1 to enable this feature)")
CHAT_COMMAND("rescue", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConRescue, this, "Teleport yourself out of freeze (use sv_rescue 1 to enable this feature)")
CHAT_COMMAND("tp", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTele, this, "Teleport yourself to player or to where you are spectating if no player name is given")
CHAT_COMMAND("tp", "?s[player name | x pos.] ?s[y pos.]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTele, this, "Depending on the number of supplied arguments, teleport yourself to; (0.) where you are spectating or aiming; (1.) the specified player name; (2.) the specified coordinates.")
CHAT_COMMAND("lasttp", "", CFGFLAG_CHAT | CFGFLAG_SERVER, ConLastTele, this, "Teleport yourself to the last location you teleported to.")
CHAT_COMMAND("teleport", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTele, this, "Teleport yourself to player or to where you are spectating if no player name is given")
CHAT_COMMAND("teleport", "?s[player name | x pos.] ?s[y pos.]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTele, this, "Depending on the number of supplied arguments, teleport yourself to; (0.) where you are spectating or aiming; (1.) the specified player name; (2.) the specified coordinates.")
CHAT_COMMAND("tc", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeleCursor, this, "Teleport yourself to player or to where you are spectating/or looking if no player name is given")
CHAT_COMMAND("telecursor", "?r[player name]", CFGFLAG_CHAT | CFGFLAG_SERVER, ConTeleCursor, this, "Teleport yourself to player or to where you are spectating/or looking if no player name is given")
CHAT_COMMAND("unsolo", "", CFGFLAG_CHAT, ConPracticeUnSolo, this, "Puts you out of solo part")

95
src/game/server/ddracechat.cpp
View file

@ -2,6 +2,7 @@
#include "gamecontext.h"
#include <engine/shared/config.h>
#include <engine/shared/protocol.h>
#include <game/mapitems.h>
#include <game/server/gamemodes/DDRace.h>
#include <game/server/teams.h>
#include <game/version.h>
@ -1541,24 +1542,34 @@ void CGameContext::ConTele(IConsole::IResult *pResult, void *pUserData)
CGameContext *pSelf = (CGameContext *)pUserData;
if(!CheckClientID(pResult->m_ClientID))
return;
CPlayer *pPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
if(!pPlayer)
CPlayer *pCallingPlayer = pSelf->m_apPlayers[pResult->m_ClientID];
if(!pCallingPlayer)
return;
CCharacter *pChr = pPlayer->GetCharacter();
if(!pChr)
CCharacter *pCallingCharacter = pCallingPlayer->GetCharacter();
if(!pCallingCharacter)
return;
CGameTeams &Teams = pSelf->m_pController->Teams();
int Team = pSelf->GetDDRaceTeam(pResult->m_ClientID);
if(!Teams.IsPractice(Team))
{
pSelf->SendChatTarget(pPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
pSelf->SendChatTarget(pCallingPlayer->GetCID(), "You're not in a team with /practice turned on. Note that you can't earn a rank with practice enabled.");
return;
}
vec2 Pos = pPlayer->m_ViewPos;
if(pResult->NumArguments() > 0)
vec2 Pos = {};
switch(pResult->NumArguments())
{
case 0:
{
// Set calling tee's position to the origin of its spectating viewport
Pos = pCallingPlayer->m_ViewPos;
break;
}
case 1:
{
// Search for player with this name
int ClientID;
for(ClientID = 0; ClientID < MAX_CLIENTS; ClientID++)
{
@ -1567,21 +1578,71 @@ void CGameContext::ConTele(IConsole::IResult *pResult, void *pUserData)
}
if(ClientID == MAX_CLIENTS)
{
pSelf->SendChatTarget(pPlayer->GetCID(), "No player with this name found.");
pSelf->SendChatTarget(pCallingPlayer->GetCID(), "No player with this name found.");
return;
}
CPlayer *pPlayerTo = pSelf->m_apPlayers[ClientID];
if(!pPlayerTo)
CPlayer *pDestPlayer = pSelf->m_apPlayers[ClientID];
if(!pDestPlayer)
return;
CCharacter *pChrTo = pPlayerTo->GetCharacter();
if(!pChrTo)
CCharacter *pDestCharacter = pDestPlayer->GetCharacter();
if(!pDestCharacter)
return;
Pos = pChrTo->m_Pos;
// Set calling tee's position to that of the destination tee
Pos = pDestCharacter->m_Pos;
break;
}
pSelf->Teleport(pChr, Pos);
pChr->UnFreeze();
pChr->Core()->m_Vel = vec2(0, 0);
pPlayer->m_LastTeleTee.Save(pChr);
case 2:
{
float BaseX = 0.f, BaseY = 0.f;
CMapItemLayerTilemap *pGameLayer = pSelf->m_Layers.GameLayer();
constexpr float OuterKillTileBoundaryDistance = 201 * 32.f;
float MapWidth = (pGameLayer->m_Width * 32) + (OuterKillTileBoundaryDistance * 2.f), MapHeight = (pGameLayer->m_Height * 32) + (OuterKillTileBoundaryDistance * 2.f);
const auto DetermineCoordinateRelativity = [](const char *pInString, const float AbsoluteDefaultValue, float &OutFloat) -> bool {
// mode 0 = abs, 1 = sub, 2 = add
// Relative?
const char *pStrDelta = str_startswith(pInString, "~");
// Is the number valid?
float d = str_tofloat(pStrDelta ? pStrDelta : pInString);
if(std::isnan(d) || std::isinf(d))
return false;
// Convert our gleaned 'display' coordinate to an actual map coordinate
d *= 32.f;
OutFloat = (pStrDelta ? AbsoluteDefaultValue : 0) + d;
return true;
};
if(!DetermineCoordinateRelativity(pResult->GetString(0), pCallingPlayer->m_ViewPos.x, BaseX))
{
pSelf->SendChatTarget(pCallingPlayer->GetCID(), "Invalid X coordinate.");
return;
}
if(!DetermineCoordinateRelativity(pResult->GetString(1), pCallingPlayer->m_ViewPos.y, BaseY))
{
pSelf->SendChatTarget(pCallingPlayer->GetCID(), "Invalid Y coordinate.");
return;
}
Pos = {std::clamp(BaseX, (-OuterKillTileBoundaryDistance) + 1.f, (-OuterKillTileBoundaryDistance) + MapWidth - 1.f), std::clamp(BaseY, (-OuterKillTileBoundaryDistance) + 1.f, (-OuterKillTileBoundaryDistance) + MapHeight - 1.f)};
break;
}
default:
pSelf->SendChatTarget(pCallingPlayer->GetCID(), "Too many arguments.");
return;
}
// Teleport tee
pSelf->Teleport(pCallingCharacter, Pos);
pCallingCharacter->UnFreeze();
pCallingCharacter->Core()->m_Vel = vec2(0, 0);
pCallingPlayer->m_LastTeleTee.Save(pCallingCharacter);
}
void CGameContext::ConTeleCursor(IConsole::IResult *pResult, void *pUserData)