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

Fix build and SQL import after cherry-picks

Browse Source
This commit is contained in:
DDuarte
2015-07-03 02:10:54 +01:00
parent df15f87a9a
commit ccfaf663aa
6 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/updates/world/2015_07_03_01_world_2015_05_23_02.sql
View File

@@ -1,7 +1,8 @@
--
UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=694 WHERE `entry`=1343;
DELETE FROM `gossip_menu` WHERE `entry`=694;
INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (694, 1244);
DELETE FROM `npc_text` WHERE `ID`=1244;
INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
(1244, 'Well, if it isn''t a young, bristling $c, no doubt drawn here by talk of my exploits in fields of battle!$B$BNo time for stories now, for there are great, important deeds that need doing! So if you''re looking for glory, then luck shines on you today...', 'Well, if it isn''t a young, bristling $c, no doubt drawn here by talk of my exploits in fields of battle!$B$BNo time for stories now, for there are great, important deeds that need doing! So if you''re looking for glory, then luck shines on you today...', 0, 0, 1, 0, 0);
-- FIXME: text not found in 6.x
-- UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=694 WHERE `entry`=1343;
-- DELETE FROM `gossip_menu` WHERE `entry`=694;
-- INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (694, 1244);
-- DELETE FROM `npc_text` WHERE `ID`=1244;
-- INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
-- (1244, 'Well, if it isn''t a young, bristling $c, no doubt drawn here by talk of my exploits in fields of battle!$B$BNo time for stories now, for there are great, important deeds that need doing! So if you''re looking for glory, then luck shines on you today...', 'Well, if it isn''t a young, bristling $c, no doubt drawn here by talk of my exploits in fields of battle!$B$BNo time for stories now, for there are great, important deeds that need doing! So if you''re looking for glory, then luck shines on you today...', 0, 0, 1, 0, 0);

4
sql/updates/world/2015_07_03_02_world_2015_05_23_03.sql
View File

@@ -3,5 +3,5 @@ UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=6159 WHERE `entry`=
DELETE FROM `gossip_menu` WHERE `entry`=6159;
INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6159, 6157);
DELETE FROM `npc_text` WHERE `ID`=6157;
INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
(6157, 'Ach, it''s hard enough keeping order around here without all these new troubles popping up! I hope you have good news, $n...', 'Ach, it''s hard enough keeping order around here without all these new troubles popping up! I hope you have good news, $n...', 42172, 0, 1, 5, 5);
INSERT INTO `npc_text` (`ID`, `BroadcastTextID0`, `Probability0`) VALUES
(6157, 42172, 1);

28
sql/updates/world/2015_07_03_03_world_2015_05_24_01.sql
View File

@@ -18,20 +18,20 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
(10610, 3, -6009.25,-202.649994,406.982605, 'Angus'),
(10610, 4, -6031.16,-230.264,414.361, 'Angus');
DELETE FROM `spell_target_position` WHERE id IN (18634,16572,16767,16768,16772,16775,16776,16777,16778,16779,16780,16786,18634);
INSERT INTO `spell_target_position` (id, target_map, target_position_x, target_position_y, target_position_z, target_orientation) VALUES
(16572,0,-6046.85,-207.329,418.304,0),
(16767,0,-6046.73,-207.159,417.267,0),
(16768,0,-6051.39,-206.749,418.159,0),
(16772,0,-6046.84,-204.535,416.897,0),
(16775,0,-6044.47,-205.783,417.267,0),
(16776,0,-6044.54,-205.562,417.663,0),
(16777,0,-6044.53,-202.912,416.756,0),
(16778,0,-6042.18,-204.949,416.336,0),
(16779,0,-6042.02,-204.134,416.894,0),
(16780,0,-6044.79,-196.959,419.19,0),
(16786,0,-6078.3,-211.89,424.197,0),
(18634,0,-6076,-215,424,0);
DELETE FROM `spell_target_position` WHERE `ID` IN (18634,16572,16767,16768,16772,16775,16776,16777,16778,16779,16780,16786,18634);
INSERT INTO `spell_target_position` (`ID`, `MapID`, `PositionX`, `PositionY`, `PositionZ`) VALUES
(16572,0,-6046.85,-207.329,418.304),
(16767,0,-6046.73,-207.159,417.267),
(16768,0,-6051.39,-206.749,418.159),
(16772,0,-6046.84,-204.535,416.897),
(16775,0,-6044.47,-205.783,417.267),
(16776,0,-6044.54,-205.562,417.663),
(16777,0,-6044.53,-202.912,416.756),
(16778,0,-6042.18,-204.949,416.336),
(16779,0,-6042.02,-204.134,416.894),
(16780,0,-6044.79,-196.959,419.19),
(16786,0,-6078.3,-211.89,424.197),
(18634,0,-6076,-215,424);
-- Hegnar Rumbleshot SAI
SET @ENTRY := 1243;

13
sql/updates/world/2015_07_03_04_world_2015_05_26_00.sql
View File

@@ -1,7 +1,8 @@
--
UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=5032 WHERE `entry`=241;
DELETE FROM `gossip_menu` WHERE `entry`=5032;
INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (5032, 6158);
DELETE FROM `npc_text` WHERE `ID`=6158;
INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
(6158, 'Hey there, friend. My name''s Remy. I''m from Redridge to the east, and came here looking for business, looking for business. You got any...got any??', 'Hey there, friend. My name''s Remy. I''m from Redridge to the east, and came here looking for business, looking for business. You got any...got any??', 0, 0, 1, 0, 0);
-- FIXME: text not found in 6.x
-- UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=5032 WHERE `entry`=241;
-- DELETE FROM `gossip_menu` WHERE `entry`=5032;
-- INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (5032, 6158);
-- DELETE FROM `npc_text` WHERE `ID`=6158;
-- INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
-- (6158, 'Hey there, friend. My name''s Remy. I''m from Redridge to the east, and came here looking for business, looking for business. You got any...got any??', 'Hey there, friend. My name''s Remy. I''m from Redridge to the east, and came here looking for business, looking for business. You got any...got any??', 0, 0, 1, 0, 0);

6
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
View File

@@ -525,7 +525,7 @@ void BattlegroundSA::TeleportToEntrancePosition(Player* player)
{
if (!ShipsStarted)
{
player->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
// player->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
if (urand(0, 1))
player->TeleportTo(607, 2682.936f, -830.368f, 15.0f, 2.895f, 0);
@@ -700,7 +700,7 @@ WorldSafeLocsEntry const* BattlegroundSA::GetClosestGraveYard(Player* player)
safeloc = BG_SA_GYEntries[BG_SA_DEFENDER_LAST_GY];
closest = sWorldSafeLocsStore.LookupEntry(safeloc);
nearest = player->GetExactDistSq(closest->x, closest->y, closest->z);
nearest = player->GetExactDistSq(closest->Loc.X, closest->Loc.Y, closest->Loc.Z);
for (uint8 i = BG_SA_RIGHT_CAPTURABLE_GY; i < BG_SA_MAX_GY; i++)
{
@@ -708,7 +708,7 @@ WorldSafeLocsEntry const* BattlegroundSA::GetClosestGraveYard(Player* player)
continue;
ret = sWorldSafeLocsStore.LookupEntry(BG_SA_GYEntries[i]);
dist = player->GetExactDistSq(ret->x, ret->y, ret->z);
dist = player->GetExactDistSq(ret->Loc.X, ret->Loc.Y, ret->Loc.Z);
if (dist < nearest)
{
closest = ret;

2
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -2582,7 +2582,7 @@ void Creature::SetTextRepeatId(uint8 textGroup, uint8 id)
if (std::find(repeats.begin(), repeats.end(), id) == repeats.end())
repeats.push_back(id);
else
TC_LOG_ERROR("sql.sql", "CreatureTextMgr: TextGroup %u for Creature(%s) GuidLow %u Entry %u, id %u already added", uint32(textGroup), GetName().c_str(), GetGUIDLow(), GetEntry(), uint32(id));
TC_LOG_ERROR("sql.sql", "CreatureTextMgr: TextGroup %u for Creature (%s) %s, id %u already added", uint32(textGroup), GetName().c_str(), GetGUID().ToString().c_str(), uint32(id));
}
CreatureTextRepeatIds Creature::GetTextRepeatGroup(uint8 textGroup)