Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Command: Fixed phases output in .pinfo command

Browse Source 
Closes #19144
This commit is contained in:
joschiwald
2017-02-17 21:54:49 +01:00
parent 06c1db0a0e
commit 80c36f3d9c
5 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/master/2017_02_17_00_world.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `trinity_string` SET `content_default`='│ Phases: %s' WHERE `entry`=846;

16
src/common/Utilities/Util.h
View File

@@ -325,6 +325,22 @@ TC_COMMON_API void HexStrToByteArray(std::string const& str, uint8* out, bool re
TC_COMMON_API bool StringToBool(std::string const& str);
template<class Container>
TC_COMMON_API std::string StringJoin(Container const& c, std::string delinimiter)
{
if (c.empty())
return "";
std::ostringstream os;
auto itr = c.begin();
os << *itr++;
for (; itr != c.end(); ++itr)
os << delinimiter << *itr;
return os.str();
}
// simple class for not-modifyable list
template <typename T>
class HookList final

2
src/server/game/Miscellaneous/Language.h
View File

@@ -826,7 +826,7 @@ enum TrinityStrings
LANG_PINFO_CHR_LEVEL_LOW = 843,
LANG_PINFO_CHR_RACE = 844,
LANG_PINFO_CHR_ALIVE = 845,
LANG_PINFO_CHR_PHASE = 846,
LANG_PINFO_CHR_PHASES = 846,
LANG_PINFO_CHR_MONEY = 847,
LANG_PINFO_CHR_MAP = 848,
LANG_PINFO_CHR_GUILD = 849,

14
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -1567,7 +1567,7 @@ public:
* * Level: %u (%u/%u XP (%u XP left) - X. LANG_PINFO_CHR_LEVEL
* * Race: %s %s, Class %s - XI. LANG_PINFO_CHR_RACE
* * Alive ?: %s - XII. LANG_PINFO_CHR_ALIVE
* * Phase: %s - XIII. LANG_PINFO_CHR_PHASE (if not GM)
* * Phases: %s - XIII. LANG_PINFO_CHR_PHASE (if not GM)
* * Money: %ug%us%uc - XIV. LANG_PINFO_CHR_MONEY
* * Map: %s, Area: %s - XV. LANG_PINFO_CHR_MAP
* * Guild: %s (Id: %u) - XVI. LANG_PINFO_CHR_GUILD (if in guild)
@@ -1623,7 +1623,7 @@ public:
// Position data print
uint32 mapId;
uint32 areaId;
uint32 phase = 0;
std::set<uint32> phases;
std::string areaName = handler->GetTrinityString(LANG_UNKNOWN);
std::string zoneName = handler->GetTrinityString(LANG_UNKNOWN);
@@ -1655,7 +1655,7 @@ public:
areaId = target->GetAreaId();
alive = target->IsAlive() ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO);
gender = target->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER);
phase = target->GetPhaseMask();
phases = target->GetPhases();
}
// get additional information from DB
else
@@ -1840,10 +1840,10 @@ public:
// Output XII. LANG_PINFO_CHR_ALIVE
handler->PSendSysMessage(LANG_PINFO_CHR_ALIVE, alive.c_str());
// Output XIII. LANG_PINFO_CHR_PHASE if player is not in GM mode (GM is in every phase)
if (target && !target->IsGameMaster()) // IsInWorld() returns false on loadingscreen, so it's more
handler->PSendSysMessage(LANG_PINFO_CHR_PHASE, phase); // precise than just target (safer ?).
// However, as we usually just require a target here, we use target instead.
// Output XIII. LANG_PINFO_CHR_PHASES if player is not in GM mode (GM is in every phase)
if (target && !target->IsGameMaster() && !phases.empty())
handler->PSendSysMessage(LANG_PINFO_CHR_PHASES, StringJoin(phases, "|").c_str());
// Output XIV. LANG_PINFO_CHR_MONEY
uint32 gold = money / GOLD;
uint32 silv = (money % GOLD) / SILVER;

11
src/server/scripts/Commands/cs_modify.cpp
View File

@@ -1047,13 +1047,20 @@ public:
if (!*args)
return false;
uint32 phase = (uint32)atoi((char*)args);
uint32 phaseId = uint32(atoul(args));
if (!sPhaseStore.LookupEntry(phaseId))
{
handler->SendSysMessage(LANG_PHASE_NOTFOUND);
handler->SetSentErrorMessage(true);
return false;
}
Unit* target = handler->getSelectedUnit();
if (!target)
target = handler->GetSession()->GetPlayer();
target->SetInPhase(phase, true, !target->IsInPhase(phase));
target->SetInPhase(phaseId, true, !target->IsInPhase(phaseId));
if (target->GetTypeId() == TYPEID_PLAYER)
target->ToPlayer()->SendUpdatePhasing();