Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bfa'

Browse Source
This commit is contained in:
Shauren
2018-12-09 14:45:03 +01:00
parent 8725eec9c1 a70030ff25
commit f94deace76
368 changed files with 180765 additions and 58686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Commands/cs_character.cpp
View File

@@ -235,7 +235,7 @@ public:
{
player->GiveLevel(newLevel);
player->InitTalentForLevel();
player->SetUInt32Value(PLAYER_XP, 0);
player->SetUInt32Value(ACTIVE_PLAYER_FIELD_XP, 0);
if (handler->needReportToTarget(player))
{

4
src/server/scripts/Commands/cs_cheat.cpp
View File

@@ -276,9 +276,9 @@ public:
for (uint16 i = 0; i < PLAYER_EXPLORED_ZONES_SIZE; ++i)
{
if (flag != 0)
handler->GetSession()->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i, 0xFFFFFFFF);
handler->GetSession()->GetPlayer()->SetFlag(ACTIVE_PLAYER_FIELD_EXPLORED_ZONES + i, 0xFFFFFFFF);
else
handler->GetSession()->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i, 0);
handler->GetSession()->GetPlayer()->SetFlag(ACTIVE_PLAYER_FIELD_EXPLORED_ZONES + i, 0);
}
return true;

2
src/server/scripts/Commands/cs_debug.cpp
View File

@@ -985,7 +985,7 @@ public:
if (m)
if (uint32 um = (uint32)atoi(m))
phaseShift.AddUiWorldMapAreaIdSwap(um);
phaseShift.AddUiMapPhaseId(um);
PhasingHandler::SendToPlayer(handler->GetSession()->GetPlayer(), phaseShift);
return true;

12
src/server/scripts/Commands/cs_lookup.cpp
View File

@@ -658,7 +658,11 @@ public:
}
if (handler->GetSession())
handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, qInfo->GetQuestId(), qInfo->GetQuestId(), qInfo->GetQuestLevel(), title.c_str(), statusStr);
handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, qInfo->GetQuestId(), qInfo->GetQuestId(),
handler->GetSession()->GetPlayer()->GetQuestLevel(qInfo),
handler->GetSession()->GetPlayer()->GetQuestMinLevel(qInfo),
qInfo->GetQuestMaxScalingLevel(), qInfo->GetQuestScalingFactionGroup(),
title.c_str(), statusStr);
else
handler->PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qInfo->GetQuestId(), title.c_str(), statusStr);
@@ -706,7 +710,11 @@ public:
}
if (handler->GetSession())
handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, qInfo->GetQuestId(), qInfo->GetQuestId(), qInfo->GetQuestLevel(), title.c_str(), statusStr);
handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, qInfo->GetQuestId(), qInfo->GetQuestId(),
handler->GetSession()->GetPlayer()->GetQuestLevel(qInfo),
handler->GetSession()->GetPlayer()->GetQuestMinLevel(qInfo),
qInfo->GetQuestMaxScalingLevel(), qInfo->GetQuestScalingFactionGroup(),
title.c_str(), statusStr);
else
handler->PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qInfo->GetQuestId(), title.c_str(), statusStr);

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

@@ -1203,8 +1203,8 @@ public:
}
uint32 val = uint32((1 << (area->AreaBit % 32)));
uint32 currFields = playerTarget->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset);
playerTarget->SetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset, uint32((currFields | val)));
uint32 currFields = playerTarget->GetUInt32Value(ACTIVE_PLAYER_FIELD_EXPLORED_ZONES + offset);
playerTarget->SetUInt32Value(ACTIVE_PLAYER_FIELD_EXPLORED_ZONES + offset, uint32((currFields | val)));
handler->SendSysMessage(LANG_EXPLORE_AREA);
return true;
@@ -1247,8 +1247,8 @@ public:
}
uint32 val = uint32((1 << (area->AreaBit % 32)));
uint32 currFields = playerTarget->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset);
playerTarget->SetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset, uint32((currFields ^ val)));
uint32 currFields = playerTarget->GetUInt32Value(ACTIVE_PLAYER_FIELD_EXPLORED_ZONES + offset);
playerTarget->SetUInt32Value(ACTIVE_PLAYER_FIELD_EXPLORED_ZONES + offset, uint32((currFields ^ val)));
handler->SendSysMessage(LANG_UNEXPLORE_AREA);
return true;

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

@@ -493,7 +493,10 @@ public:
if (CheckModifySpeed(handler, args, target, Scale, 0.1f, 10.0f, false))
{
NotifyModification(handler, target, LANG_YOU_CHANGE_SIZE, LANG_YOURS_SIZE_CHANGED, Scale);
target->SetObjectScale(Scale);
if (Creature* creatureTarget = target->ToCreature())
creatureTarget->SetFloatValue(UNIT_FIELD_DISPLAY_SCALE, Scale);
else
target->SetObjectScale(Scale);
return true;
}
return false;

8
src/server/scripts/Commands/cs_quest.cpp
View File

@@ -64,7 +64,7 @@ public:
}
// .addquest #entry'
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
char* cId = handler->extractKeyFromLink((char*)args, "Hquest");
if (!cId)
return false;
@@ -112,7 +112,7 @@ public:
}
// .removequest #entry'
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
char* cId = handler->extractKeyFromLink((char*)args, "Hquest");
if (!cId)
return false;
@@ -170,7 +170,7 @@ public:
}
// .quest complete #entry
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
char* cId = handler->extractKeyFromLink((char*)args, "Hquest");
if (!cId)
return false;
@@ -268,7 +268,7 @@ public:
}
// .quest reward #entry
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
char* cId = handler->extractKeyFromLink((char*)args, "Hquest");
if (!cId)
return false;

8
src/server/scripts/Commands/cs_reset.cpp
View File

@@ -83,8 +83,8 @@ public:
if (!handler->extractPlayerTarget((char*)args, &target))
return false;
target->SetUInt32Value(PLAYER_FIELD_KILLS, 0);
target->SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 0);
target->SetUInt32Value(ACTIVE_PLAYER_FIELD_KILLS, 0);
target->SetUInt32Value(ACTIVE_PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 0);
target->UpdateCriteria(CRITERIA_TYPE_EARN_HONORABLE_KILL);
return true;
@@ -117,7 +117,7 @@ public:
player->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
//-1 is default value
player->SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, uint32(-1));
player->SetUInt32Value(ACTIVE_PLAYER_FIELD_WATCHED_FACTION_INDEX, uint32(-1));
return true;
}
@@ -143,7 +143,7 @@ public:
target->InitStatsForLevel(true);
target->InitTaxiNodesForLevel();
target->InitTalentForLevel();
target->SetUInt32Value(PLAYER_XP, 0);
target->SetUInt32Value(ACTIVE_PLAYER_FIELD_XP, 0);
target->_ApplyAllLevelScaleItemMods(true);

2
src/server/scripts/Commands/cs_titles.cpp
View File

@@ -234,7 +234,7 @@ public:
titles &= ~titles2; // remove non-existing titles
target->SetUInt64Value(PLAYER__FIELD_KNOWN_TITLES, titles);
target->SetUInt64Value(ACTIVE_PLAYER_FIELD_KNOWN_TITLES, titles);
handler->SendSysMessage(LANG_DONE);
if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE)))