diff --git a/data/sql/updates/db_world/2022_10_01_00.sql b/data/sql/updates/db_world/2022_10_01_00.sql new file mode 100644 index 000000000..96f3eef43 --- /dev/null +++ b/data/sql/updates/db_world/2022_10_01_00.sql @@ -0,0 +1,60 @@ +-- DB update 2022_09_28_08 -> 2022_10_01_00 +-- +-- Yougotta 00006 Ruins of Silvermoon Eversong Woods +-- ITEM Unstable Mana Crystal (20743) 1x from all OBJECT Unstable Mana Crystal Crate (180600) in static spawns on a randomized timer that can all be up at once +SET @OGUID :=10555; +DELETE FROM `gameobject` WHERE `id`=180600; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+45; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES +(@OGUID+0, 180600, 530, 3430, 3532, 1, 1, 9908.0849609375, -6620.54541015625, 14.14994335174560546, 3.52557229995727539, 0, 0, -0.98162651062011718, 0.190812408924102783, 181, 100, 1, '', 0), +(@OGUID+1, 180600, 530, 3430, 3532, 1, 1, 9874.8974609375, -6634.0517578125, 9.796689033508300781, 5.044002056121826171, 0, 0, -0.58070278167724609, 0.814115643501281738, 181, 100, 1, '', 0), +(@OGUID+2, 180600, 530, 3430, 3532, 1, 1, 9887.38671875, -6666.490234375, 12.57038784027099609, 3.90954136848449707, 0, 0, -0.92718315124511718, 0.37460830807685852, 181, 100, 1, '', 0), +(@OGUID+3, 180600, 530, 3430, 3534, 1, 1, 9796.3251953125, -6651.48974609375, -0.79703301191329956, 0, 0, 0, 0, 1, 181, 100, 1, '', 0), +(@OGUID+4, 180600, 530, 3430, 3534, 1, 1, 9811.1123046875, -6674.26220703125, 2.598326921463012695, 0.575957298278808593, 0, 0, 0.284014701843261718, 0.958819925785064697, 181, 100, 1, '', 0), +(@OGUID+5, 180600, 530, 3430, 3534, 1, 1, 9807.802734375, -6652.73095703125, -0.78208702802658081, 1.48352813720703125, 0, 0, 0.675589561462402343, 0.737277925014495849, 181, 100, 1, '', 0), +(@OGUID+6, 180600, 530, 3430, 3534, 1, 1, 9832.3994140625, -6686.92724609375, 2.993033885955810546, 3.036838293075561523, 0, 0, 0.998628616333007812, 0.052353221923112869, 181, 100, 1, '', 0), +(@OGUID+7, 180600, 530, 3430, 3534, 1, 1, 9779.103515625, -6662.1318359375, -0.02248799987137317, 1.553341388702392578, 0, 0, 0.700908660888671875, 0.713251054286956787, 181, 100, 1, '', 0), +(@OGUID+8, 180600, 530, 3430, 3534, 1, 1, 9836.892578125, -6704.61474609375, 2.993033885955810546, 1.954769015312194824, 0, 0, 0.829037666320800781, 0.559192776679992675, 181, 100, 1, '', 0), +(@OGUID+9, 180600, 530, 3430, 3534, 1, 1, 9908.2783203125, -6711.39404296875, 14.31186103820800781, 3.001946926116943359, 0, 0, 0.997563362121582031, 0.069766148924827575, 181, 100, 1, '', 0), +(@OGUID+10, 180600, 530, 3430, 3534, 1, 1, 9829.7236328125, -6722.2568359375, 19.17429351806640625, 4.398232460021972656, 0, 0, -0.80901622772216796, 0.587786316871643066, 181, 100, 1, '', 0), +(@OGUID+11, 180600, 530, 3430, 3534, 1, 1, 9803.517578125, -6717.1181640625, 19.06456947326660156, 5.009094715118408203, 0, 0, -0.59482288360595703, 0.80385679006576538, 181, 100, 1, '', 0), +(@OGUID+12, 180600, 530, 3430, 3533, 1, 1, 9786.06640625, -6739.98779296875, 0.04676700010895729, 5.340708732604980468, 0, 0, -0.45398998260498046, 0.891006767749786376, 181, 100, 1, '', 0), +(@OGUID+13, 180600, 530, 3430, 3533, 1, 1, 9903.64453125, -6780.6875, 11.99565982818603515, 5.445427894592285156, 0, 0, -0.40673637390136718, 0.913545548915863037, 181, 100, 1, '', 0), +(@OGUID+14, 180600, 530, 3430, 3534, 1, 1, 9905.921875, -6802.79541015625, 12.1339578628540039, 4.118979454040527343, 0, 0, -0.88294696807861328, 0.469472706317901611, 181, 100, 1, '', 0), +(@OGUID+15, 180600, 530, 3430, 3534, 1, 1, 9811.140625, -6848.2275390625, 17.95032119750976562, 5.95157480239868164, 0, 0, -0.16504669189453125, 0.986285746097564697, 181, 100, 1, '', 0), +(@OGUID+16, 180600, 530, 3430, 3534, 1, 1, 9733.1513671875, -6755.03662109375, 3.907028913497924804, 3.333590030670166015, 0, 0, -0.99539566040039062, 0.095851235091686248, 181, 100, 1, '', 0), +(@OGUID+17, 180600, 530, 3430, 3534, 1, 1, 9760.466796875, -6836.2041015625, 16.95026779174804687, 2.321286916732788085, 0, 0, 0.917059898376464843, 0.398749500513076782, 181, 100, 1, '', 0), +(@OGUID+18, 180600, 530, 3430, 3534, 1, 1, 9779.9873046875, -6862.99658203125, 20.91965293884277343, 2.129300594329833984, 0, 0, 0.874619483947753906, 0.484810054302215576, 181, 100, 1, '', 0), +(@OGUID+19, 180600, 530, 3430, 3534, 1, 1, 9669.3388671875, -6854.40625, 19.87859535217285156, 3.403396368026733398, 0, 0, -0.99144458770751953, 0.130528271198272705, 181, 100, 1, '', 0), +(@OGUID+20, 180600, 530, 3430, 3534, 1, 1, 9704.068359375, -6720.65966796875, 1.290516018867492675, 4.834563255310058593, 0, 0, -0.66261959075927734, 0.748956084251403808, 181, 100, 1, '', 0), +(@OGUID+21, 180600, 530, 3430, 3534, 1, 1, 9704.794921875, -6701.376953125, 0.154315993189811706, 1.308995485305786132, 0, 0, 0.608760833740234375, 0.793353796005249023, 181, 100, 1, '', 0), +(@OGUID+22, 180600, 530, 3430, 3534, 1, 1, 9606.2744140625, -6746.6943359375, -0.60393399000167846, 2.932138919830322265, 0, 0, 0.994521141052246093, 0.104535527527332305, 181, 100, 1, '', 0), +(@OGUID+23, 180600, 530, 3430, 3534, 1, 1, 9628.1513671875, -6682.048828125, -5.74163818359375, 5.166176319122314453, 0, 0, -0.52991867065429687, 0.84804844856262207, 181, 100, 1, '', 0), +(@OGUID+24, 180600, 530, 3430, 3534, 1, 1, 9578.5908203125, -6798.2099609375, 13.39751911163330078, 6.003933906555175781, 0, 0, -0.13917255401611328, 0.990268170833587646, 181, 100, 1, '', 0), +(@OGUID+25, 180600, 530, 3430, 3533, 1, 1, 9505.359375, -6648.59423828125, 15.01642894744873046, 5.724681377410888671, 0, 0, -0.27563667297363281, 0.961261868476867675, 181, 100, 1, '', 0), +(@OGUID+26, 180600, 530, 3430, 3533, 1, 1, 9604.4658203125, -6673.20849609375, -5.61003684997558593, 4.084071159362792968, 0, 0, -0.8910064697265625, 0.453990638256072998, 181, 100, 1, '', 0), +(@OGUID+27, 180600, 530, 3430, 3532, 1, 1, 9584.84375, -6649.486328125, 6.506567001342773437, 5.427974700927734375, 0, 0, -0.41469287872314453, 0.909961462020874023, 181, 100, 1, '', 0), +(@OGUID+28, 180600, 530, 3430, 3532, 1, 1, 9574.68359375, -6607.1220703125, 1.556740999221801757, 2.740161895751953125, 0, 0, 0.979924201965332031, 0.199370384216308593, 181, 100, 1, '', 0), +(@OGUID+29, 180600, 530, 3430, 3531, 1, 1, 9553.7353515625, -6584.361328125, 1.555158972740173339, 5.619962215423583984, 0, 0, -0.32556724548339843, 0.945518851280212402, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+30, 180600, 530, 3430, 3531, 1, 1, 9536.1240234375, -6575.591796875, 4.14954376220703125, 1.256635904312133789, 0, 0, 0.587784767150878906, 0.809017360210418701, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+31, 180600, 530, 3430, 3531, 1, 1, 9502.5126953125, -6539.890625, 21.6209716796875, 3.508116960525512695, 0, 0, -0.98325443267822265, 0.182238012552261352, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+32, 180600, 530, 3430, 3531, 1, 1, 9540.794921875, -6495.0625, 22.70195579528808593, 1.221729278564453125, 0, 0, 0.573575973510742187, 0.819152355194091796, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+33, 180600, 530, 3430, 3531, 1, 1, 9618.7412109375, -6477.03662109375, 12.91306400299072265, 2.984498262405395507, 0, 0, 0.996916770935058593, 0.078466430306434631, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+34, 180600, 530, 3430, 3533, 1, 1, 9653.935546875, -6601.36572265625, 3.792618036270141601, 5.427974700927734375, 0, 0, -0.41469287872314453, 0.909961462020874023, 181, 100, 1, '', 0), +(@OGUID+35, 180600, 530, 3430, 3533, 1, 1, 9548.16015625, -6678.078125, 8.09358978271484375, 5.462882041931152343, 0, 0, -0.39874839782714843, 0.917060375213623046, 181, 100, 1, '', 0), +(@OGUID+36, 180600, 530, 3430, 3531, 1, 1, 9762.1064453125, -6558.3037109375, 4.677159786224365234, 2.67034769058227539, 0, 0, 0.972369194030761718, 0.233448356389999389, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+37, 180600, 530, 3430, 3531, 1, 1, 9745.455078125, -6590.35400390625, 0.891484022140502929, 0.506144583225250244, 0, 0, 0.250379562377929687, 0.968147754669189453, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+38, 180600, 530, 3430, 3531, 1, 1, 9715.7314453125, -6605.2119140625, 1.514312028884887695, 4.572763919830322265, 0, 0, -0.75470924377441406, 0.656059443950653076, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+39, 180600, 530, 3430, 3531, 1, 1, 9736.640625, -6528.77783203125, 4.727762222290039062, 2.251473426818847656, 0, 0, 0.902585029602050781, 0.430511653423309326, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+40, 180600, 530, 3430, 3531, 1, 1, 9728.8662109375, -6488.001953125, 8.692757606506347656, 3.368495941162109375, 0, 0, -0.99357128143310546, 0.113208353519439697, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+41, 180600, 530, 3430, 3531, 1, 1, 9763.8505859375, -6506.63916015625, 4.634380817413330078, 4.014260292053222656, 0, 0, -0.90630722045898437, 0.422619491815567016, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+42, 180600, 530, 3430, 3531, 1, 1, 9756.865234375, -6523.9130859375, 5.882387161254882812, 5.166176319122314453, 0, 0, -0.52991867065429687, 0.84804844856262207, 181, 100, 1, '', 0), -- 180600 (Area: 3531 - Difficulty: 0) +(@OGUID+43, 180600, 530, 3430, 3662, 1, 1, 9798.2666015625, -6720.6318359375, 3.081281900405883789, 4.939284324645996093, 0, 0, -0.6225137710571289, 0.78260880708694458, 181, 100, 1, '', 0), +(@OGUID+44, 180600, 530, 3430, 3534, 1, 1, 9667.55078125, -6738.90625, -1.46373999118804931, 4.817109584808349609, 0, 0, -0.66913032531738281, 0.74314504861831665, 181, 100, 1, '', 0), +(@OGUID+45, 180600, 530, 3430, 3534, 1, 1, 9631.7080078125, -6767.35791015625, -0.01880300045013427, 1.274088263511657714, 0, 0, 0.594821929931640625, 0.80385744571685791, 181, 100, 1, '', 0); + +-- NPC Thaelis the Hungerer has a variant spawn above 2 mins, variant spawn not currently possible but current respawn timer is too high +UPDATE `creature` SET `spawntimesecs`='130' WHERE `guid`=56373; + +-- ITEM Arcane Core (21808) should be 100% drop rate off NPC Arcane Patroler (15638) +UPDATE `creature_loot_template` SET `Chance`='100' WHERE `Entry`=15638 AND `Item`=21808 AND `Reference`=0 AND `GroupId`=0; diff --git a/data/sql/updates/db_world/2022_10_01_01.sql b/data/sql/updates/db_world/2022_10_01_01.sql new file mode 100644 index 000000000..8dd219ffa --- /dev/null +++ b/data/sql/updates/db_world/2022_10_01_01.sql @@ -0,0 +1,4 @@ +-- DB update 2022_10_01_00 -> 2022_10_01_01 +-- + +DELETE FROM `npc_vendor` WHERE `entry` = 24495 AND `item` IN (37737, 37599) AND `ExtendedCost` = 2276; diff --git a/data/sql/updates/db_world/2022_10_01_02.sql b/data/sql/updates/db_world/2022_10_01_02.sql new file mode 100644 index 000000000..55c7ab3fd --- /dev/null +++ b/data/sql/updates/db_world/2022_10_01_02.sql @@ -0,0 +1,3 @@ +-- DB update 2022_10_01_01 -> 2022_10_01_02 +-- +UPDATE `creature_formations` SET `groupAI`=`groupAI`|0x008 WHERE `leaderguid` BETWEEN 88000 AND 88007; diff --git a/data/sql/updates/db_world/2022_10_01_03.sql b/data/sql/updates/db_world/2022_10_01_03.sql new file mode 100644 index 000000000..9e16a035d --- /dev/null +++ b/data/sql/updates/db_world/2022_10_01_03.sql @@ -0,0 +1,8 @@ +-- DB update 2022_10_01_02 -> 2022_10_01_03 +-- +DELETE FROM `creature_template_resistance` WHERE (`CreatureID` = 15339) AND (`School` IN (2, 3, 4, 5)); +INSERT INTO `creature_template_resistance` (`CreatureID`, `School`, `Resistance`, `VerifiedBuild`) VALUES +(15339, 2, 1000, 0), +(15339, 3, 1000, 0), +(15339, 4, 1000, 0), +(15339, 5, 1000, 0); diff --git a/data/sql/updates/db_world/2022_10_01_04.sql b/data/sql/updates/db_world/2022_10_01_04.sql new file mode 100644 index 000000000..322398fc7 --- /dev/null +++ b/data/sql/updates/db_world/2022_10_01_04.sql @@ -0,0 +1,16 @@ +-- DB update 2022_10_01_03 -> 2022_10_01_04 +-- +-- Yougotta 00001-00005 Sunstider Isle Part 1-5 +-- ITEM Tainted Arcane Silver (20483) should be 100% drop rate off NPC Tainted Arcane Wraith (15298) for QUEST Tainted Arcane Sliver (8338) (ALREADY CORRECT) + +-- ITEM Lynx Collar (20797) should be 100% drop rate off NPCs Springpaw Cub (15366), Springpaw Lynx (15372) for QUEST Unfortunate Measures (8326) + +UPDATE `creature_loot_template` SET `Chance`='100' WHERE `Entry`=15366 AND `Item`=20797 AND `Reference`=0 AND `GroupId`=0; +UPDATE `creature_loot_template` SET `Chance`='100' WHERE `Entry`=15372 AND `Item`=20797 AND `Reference`=0 AND `GroupId`=0; + +-- ITEM Arcane Silver (20482) "0.6777893639207508" over 959 repetitions rounded to 2/3rds (70% is also in likely margin of error, but 66.67% is closer to seen and given as second opinion so it will be the standard I go by) drop rate off NPCs Mana Wyrm (15274), Feral Tender (15294), Arcane Wraith (15273), Tainted Arcane Wraith (15298) for QUEST A Fistful of Silvers (8336) + +UPDATE `creature_loot_template` SET `Chance`='66.67' WHERE `Entry`=15274 AND `Item`=20482 AND `Reference`=0 AND `GroupId`=0; +UPDATE `creature_loot_template` SET `Chance`='66.67' WHERE `Entry`=15294 AND `Item`=20482 AND `Reference`=0 AND `GroupId`=0; +UPDATE `creature_loot_template` SET `Chance`='66.67' WHERE `Entry`=15273 AND `Item`=20482 AND `Reference`=0 AND `GroupId`=0; +UPDATE `creature_loot_template` SET `Chance`='66.67' WHERE `Entry`=15298 AND `Item`=20482 AND `Reference`=0 AND `GroupId`=0; diff --git a/data/sql/updates/db_world/2022_10_01_05.sql b/data/sql/updates/db_world/2022_10_01_05.sql new file mode 100644 index 000000000..b78a1fc49 --- /dev/null +++ b/data/sql/updates/db_world/2022_10_01_05.sql @@ -0,0 +1,3 @@ +-- DB update 2022_10_01_04 -> 2022_10_01_05 +-- +DELETE FROM `creature_loot_template` WHERE `Entry`=10647 AND `Item`=5461; diff --git a/data/sql/updates/db_world/2022_10_02_00.sql b/data/sql/updates/db_world/2022_10_02_00.sql new file mode 100644 index 000000000..d7f5db79a --- /dev/null +++ b/data/sql/updates/db_world/2022_10_02_00.sql @@ -0,0 +1,3 @@ +-- DB update 2022_10_01_05 -> 2022_10_02_00 +-- +UPDATE `quest_offer_reward` SET `RewardText` = '$C, you did it! Thanks to you we are another step closer to achieving our goal with silk bandages. I\'ll get them stored away, and then we can talk more if you like.' WHERE (`ID` = 8520); diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 13c9d1c3f..683dd0c1a 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -97,7 +97,7 @@ void LoadGameObjectModelList(std::string const& dataPath) fclose(model_list_file); - LOG_INFO("server.loading", ">> Loaded {} GameObject models in {} ms", uint32(model_list.size()), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} GameObject Models in {} ms", uint32(model_list.size()), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp index 058d93614..cfdf523ac 100644 --- a/src/common/Configuration/Config.cpp +++ b/src/common/Configuration/Config.cpp @@ -403,7 +403,7 @@ bool ConfigMgr::LoadModulesConfigs(bool isReload /*= false*/, bool isNeedPrintIn if (isNeedPrintInfo) { LOG_INFO("server.loading", " "); - LOG_INFO("server.loading", "Loading modules configuration..."); + LOG_INFO("server.loading", "Loading Modules Configuration..."); } // Start loading module configs diff --git a/src/server/apps/worldserver/Main.cpp b/src/server/apps/worldserver/Main.cpp index e4900ef19..ce1f8846c 100644 --- a/src/server/apps/worldserver/Main.cpp +++ b/src/server/apps/worldserver/Main.cpp @@ -427,7 +427,7 @@ bool StartDB() return false; } - LOG_INFO("server.loading", "Loading world information..."); + LOG_INFO("server.loading", "Loading World Information..."); LOG_INFO("server.loading", "> RealmID: {}", realm.Id.Realm); ///- Clean the database before starting diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index f470a132e..e3636fd29 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -2978,7 +2978,7 @@ void AchievementGlobalMgr::LoadRewardLocales() ObjectMgr::AddLocaleString(fields[3].Get(), locale, data.Text); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Achievement Reward Locale strings in {} ms", (unsigned long)m_achievementRewardLocales.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Achievement Reward Locale Strings in {} ms", (unsigned long)m_achievementRewardLocales.size(), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp index 83977275f..a46165c2d 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -86,7 +86,7 @@ void CharacterCache::LoadCharacterCacheStorage() } while (mailCountResult->NextRow()); } - LOG_INFO("server.loading", "Loaded character infos for {} characters in {} ms", _characterCacheStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded Character Infos For {} Characters in {} ms", _characterCacheStore.size(), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index e9fbe974a..cb2dbc159 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -266,7 +266,7 @@ namespace DisableMgr ++total_count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} disables in {} ms", total_count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Disables in {} ms", total_count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -297,7 +297,7 @@ namespace DisableMgr ++itr; } - LOG_INFO("server.loading", ">> Checked {} quest disables in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Checked {} Quest Disables in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 7a03bd85c..1b97c6156 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -656,7 +656,7 @@ void LoadDBCStores(const std::string& dataPath) exit(1); } - LOG_INFO("server.loading", ">> Initialized {} data stores in {} ms", DBCFileCount, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Initialized {} Data Stores in {} ms", DBCFileCount, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp index e2b81712a..8bdb795c6 100644 --- a/src/server/game/DataStores/M2Stores.cpp +++ b/src/server/game/DataStores/M2Stores.cpp @@ -250,7 +250,8 @@ void LoadM2Cameras(std::string const& dataPath) LOG_ERROR("server.loading", "Camera file %s is damaged. Camera references position beyond file end", filename.string().c_str()); } - LOG_INFO("server.loading", ">> Loaded {} cinematic waypoint sets in {} ms", (uint32)sFlyByCameraStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Cinematic Waypoint Sets in {} ms", (uint32)sFlyByCameraStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } std::vector const* GetFlyByCameras(uint32 cinematicCameraId) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 3dad1840d..eff82b442 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -163,7 +163,7 @@ namespace lfg ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} lfg dungeon rewards in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} LFG Dungeon Rewards in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -206,7 +206,7 @@ namespace lfg if (!result) { - LOG_ERROR("lfg", ">> Loaded 0 lfg entrance positions. DB table `lfg_dungeon_template` is empty!"); + LOG_ERROR("lfg", ">> Loaded 0 LFG Entrance Positions. DB Table `lfg_dungeon_template` Is Empty!"); LOG_INFO("server.loading", " "); return; } @@ -233,7 +233,7 @@ namespace lfg ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} lfg entrance positions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} LFG Entrance Positions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); // Fill all other teleport coords from areatriggers diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index f7fa675de..871101b2b 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -160,7 +160,7 @@ void FormationMgr::LoadCreatureFormations() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creatures in formations in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creatures In Formations in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 7e17d61aa..6696e66b9 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -68,7 +68,7 @@ void LoadRandomEnchantmentsTable() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Item Enchantment definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Item Enchantment Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } else diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 450a8a424..f2118ff10 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -301,7 +301,7 @@ void GameEventMgr::LoadFromDB() } } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -314,7 +314,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 game event saves in game events. DB table `game_event_save` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Game Event Saves In Game Events. DB Table `game_event_save` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -346,7 +346,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} game event saves in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Game Event Saves In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -359,7 +359,7 @@ void GameEventMgr::LoadFromDB() QueryResult result = WorldDatabase.Query("SELECT eventEntry, prerequisite_event FROM game_event_prerequisite"); if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 game event prerequisites in game events. DB table `game_event_prerequisite` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Game Rvent Prerequisites in Game Events. DB Table `game_event_prerequisite` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -396,7 +396,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} game event prerequisites in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} game event prerequisites in Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -444,7 +444,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creatures in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creatures In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -492,7 +492,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} gameobjects in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gameobjects In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -507,7 +507,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 model/equipment changes in game events. DB table `game_event_model_equip` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Model/Equipment Changes In Game Events. DB Table `game_event_model_equip` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -552,7 +552,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} model/equipment changes in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Model/Equipment Changes In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -566,7 +566,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 quests additions in game events. DB table `game_event_creature_quest` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Quests Additions In Game Events. DB Table `game_event_creature_quest` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -592,7 +592,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quests additions in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quests Additions In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -606,7 +606,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 go quests additions in game events. DB table `game_event_gameobject_quest` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 go Quests Additions In Game Events. DB Table `game_event_gameobject_quest` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -632,7 +632,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quests additions in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quests Additions In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -646,7 +646,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 quest event conditions in game events. DB table `game_event_quest_condition` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 quest event Conditions In Game Events. DB Table `game_event_quest_condition` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -674,7 +674,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quest event conditions in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} quest event conditions in Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -688,7 +688,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 conditions in game events. DB table `game_event_condition` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Conditions In Game Events. DB table `game_event_condition` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -715,7 +715,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} conditions in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} conditions in Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -729,7 +729,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 condition saves in game events. DB table `game_event_condition_save` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Condition Saves In Game Events. DB Table `game_event_condition_save` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -762,7 +762,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} condition saves in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Condition Saves In Game Events In {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -776,7 +776,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 npcflags in game events. DB table `game_event_npcflag` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Npcflags In Game Events. DB Table `game_event_npcflag` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -801,7 +801,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} npcflags in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Npcflags In Game Events In {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -815,7 +815,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 seasonal quests additions in game events. DB table `game_event_seasonal_questrelation` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Seasonal Quests Additions In Game Events. DB Table `game_event_seasonal_questrelation` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -847,7 +847,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quests additions in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quests Additions In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -861,7 +861,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 vendor additions in game events. DB table `game_event_npc_vendor` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Vendor Additions In Game Events. DB Table `game_event_npc_vendor` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -912,7 +912,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} vendor additions in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Vendor Additions In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -926,7 +926,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 battleground holidays in game events. DB table `game_event_battleground_holiday` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Battleground Holidays In Game Events. DB table `game_event_battleground_holiday` is empty."); LOG_INFO("server.loading", " "); } else @@ -949,7 +949,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} battleground holidays in game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Battleground Holidays In Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -964,7 +964,7 @@ void GameEventMgr::LoadFromDB() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 pools for game events. DB table `game_event_pool` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Pools For Game Events. DB Table `game_event_pool` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -997,7 +997,7 @@ void GameEventMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} pools for game events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Pools For Game Events in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -1049,7 +1049,7 @@ void GameEventMgr::LoadHolidayDates() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} holiday dates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Holiday Dates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); } uint32 GameEventMgr::GetNPCFlag(Creature* cr) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 3a30c8ba4..20fab220f 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -414,7 +414,7 @@ void ObjectMgr::LoadCreatureLocales() AddLocaleString(fields[3].Get(), locale, data.Title); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Creature Locale strings in {} ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Locale Strings in {} ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadGossipMenuItemsLocales() @@ -445,7 +445,7 @@ void ObjectMgr::LoadGossipMenuItemsLocales() AddLocaleString(fields[4].Get(), locale, data.BoxText); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Gossip Menu Option Locale strings in {} ms", (uint32)_gossipMenuItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gossip Menu Option Locale Strings in {} ms", (uint32)_gossipMenuItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadPointOfInterestLocales() @@ -474,7 +474,7 @@ void ObjectMgr::LoadPointOfInterestLocales() AddLocaleString(fields[2].Get(), locale, data.Name); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Points Of Interest Locale strings in {} ms", (uint32)_pointOfInterestLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Points Of Interest Locale Strings in {} ms", (uint32)_pointOfInterestLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadCreatureTemplates() @@ -538,7 +538,7 @@ void ObjectMgr::LoadCreatureTemplates() itr->second.InitializeQueryData(); } - LOG_INFO("server.loading", ">> Loaded {} creature definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -698,7 +698,7 @@ void ObjectMgr::LoadCreatureTemplateResistances() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature template resistances in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Template Resistances in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -744,7 +744,7 @@ void ObjectMgr::LoadCreatureTemplateSpells() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature template spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Template Spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -837,7 +837,7 @@ void ObjectMgr::LoadCreatureTemplateAddons() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature template addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Template Addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1331,7 +1331,7 @@ void ObjectMgr::LoadCreatureAddons() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1383,7 +1383,7 @@ void ObjectMgr::LoadGameObjectAddons() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} gameobject addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gameobject Addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1519,7 +1519,7 @@ void ObjectMgr::LoadEquipmentTemplates() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} equipment templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Equipment Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1596,7 +1596,8 @@ void ObjectMgr::LoadCreatureMovementOverrides() CheckCreatureMovement("creature_movement_override", spawnId, movement); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} movement overrides in {} ms", _creatureMovementOverrides.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Movement Overrides in {} ms", _creatureMovementOverrides.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId) const @@ -1712,7 +1713,7 @@ void ObjectMgr::LoadCreatureModelInfo() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature model based info in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Model Based Info in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1897,7 +1898,7 @@ void ObjectMgr::LoadLinkedRespawn() _linkedRespawnStore[guid] = linkedGuid; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} linked respawns in {} ms", uint64(_linkedRespawnStore.size()), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Linked Respawns In {} ms", uint64(_linkedRespawnStore.size()), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2030,7 +2031,7 @@ void ObjectMgr::LoadTempSummons() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} temp summons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Temporary Summons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2225,7 +2226,7 @@ void ObjectMgr::LoadCreatures() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creatures in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creatures in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2531,7 +2532,7 @@ void ObjectMgr::LoadGameobjects() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} gameobjects in {} ms", (unsigned long)_gameObjectDataStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gameobjects in {} ms", (unsigned long)_gameObjectDataStore.size(), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2588,7 +2589,7 @@ void ObjectMgr::LoadItemLocales() AddLocaleString(fields[3].Get(), locale, data.Description); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Item Locale strings in {} ms", (uint32)_itemLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Item Locale Strings in {} ms", (uint32)_itemLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadItemTemplates() @@ -3174,7 +3175,7 @@ void ObjectMgr::LoadItemTemplates() for (std::set::const_iterator itr = notFoundOutfit.begin(); itr != notFoundOutfit.end(); ++itr) LOG_ERROR("sql.sql", "Item (Entry: {}) does not exist in `item_template` but is referenced in `CharStartOutfit.dbc`", *itr); - LOG_INFO("server.loading", ">> Loaded {} item templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Item Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -3208,7 +3209,7 @@ void ObjectMgr::LoadItemSetNameLocales() AddLocaleString(fields[2].Get(), locale, data.Name); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Item Set Name Locale strings in {} ms", uint32(_itemSetNameLocaleStore.size()), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Item Set Name Locale Strings in {} ms", uint32(_itemSetNameLocaleStore.size()), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadItemSetNames() @@ -3291,7 +3292,7 @@ void ObjectMgr::LoadItemSetNames() } } - LOG_INFO("server.loading", ">> Loaded {} item set names in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Item Set Names in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -3484,7 +3485,7 @@ void ObjectMgr::LoadPetLevelInfo() } } - LOG_INFO("server.loading", ">> Loaded {} level pet stats definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Level Pet Stats Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -3617,7 +3618,7 @@ void ObjectMgr::LoadPlayerInfo() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} player create definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Player Create Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -3631,7 +3632,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 custom player create items. DB table `playercreateinfo_item` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Custom Player Create Items. DB Table `playercreateinfo_item` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -3688,7 +3689,7 @@ void ObjectMgr::LoadPlayerInfo() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} custom player create items in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Custom Player Create Items in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -3702,7 +3703,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 player create skills. DB table `playercreateinfo_skills` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Player Create Skills. DB Table `playercreateinfo_skills` Is Empty."); } else { @@ -3763,7 +3764,8 @@ void ObjectMgr::LoadPlayerInfo() } } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} player create skills in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Player Create Skills in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } } @@ -3820,7 +3822,7 @@ void ObjectMgr::LoadPlayerInfo() } } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} custom player create spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Custom Player Create Spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -3834,7 +3836,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 player create cast spells. DB table `playercreateinfo_cast_spell` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Player Create Cast Spells. DB Table `playercreateinfo_cast_spell` Is Empty."); } else { @@ -3878,7 +3880,8 @@ void ObjectMgr::LoadPlayerInfo() } } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} player create cast spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Player Create Cast Spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } } @@ -3892,7 +3895,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 player create actions. DB table `playercreateinfo_action` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Player Create Actions. DB Table `playercreateinfo_action` Is Empty."); LOG_INFO("server.loading", " "); } else @@ -3923,7 +3926,7 @@ void ObjectMgr::LoadPlayerInfo() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} player create actions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Player Create Actions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -4006,7 +4009,7 @@ void ObjectMgr::LoadPlayerInfo() } } - LOG_INFO("server.loading", ">> Loaded {} level health/mana definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Level Health/Mana Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -4115,7 +4118,7 @@ void ObjectMgr::LoadPlayerInfo() } } - LOG_INFO("server.loading", ">> Loaded {} level stats definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Level Stats Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -4173,7 +4176,7 @@ void ObjectMgr::LoadPlayerInfo() } } - LOG_INFO("server.loading", ">> Loaded {} xp for level definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Xp For Level Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -5027,7 +5030,7 @@ void ObjectMgr::LoadQuests() } } - LOG_INFO("server.loading", ">> Loaded {} quests definitions in {} ms", (unsigned long)_questTemplates.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quests Definitions in {} ms", (unsigned long)_questTemplates.size(), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -5064,7 +5067,7 @@ void ObjectMgr::LoadQuestLocales() AddLocaleString(fields[i + 7].Get(), locale, data.ObjectiveText[i]); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Quest Locale strings in {} ms", (uint32)_questLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quest Locale Strings in {} ms", (uint32)_questLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadScripts(ScriptsType type) @@ -5647,7 +5650,7 @@ void ObjectMgr::LoadPageTexts() } } - LOG_INFO("server.loading", ">> Loaded {} page texts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Page Texts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -5686,7 +5689,7 @@ void ObjectMgr::LoadPageTextLocales() AddLocaleString(fields[2].Get(), locale, data.Text); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Page Text Locale strings in {} ms", (uint32)_pageTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Page Text Locale Strings in {} ms", (uint32)_pageTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadInstanceTemplate() @@ -5727,7 +5730,7 @@ void ObjectMgr::LoadInstanceTemplate() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} instance templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Instance Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -5821,7 +5824,7 @@ void ObjectMgr::LoadInstanceEncounters() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} instance encounters in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Instance Encounters in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -5905,7 +5908,7 @@ void ObjectMgr::LoadGossipText() count++; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} npc texts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Npc Texts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -5941,7 +5944,7 @@ void ObjectMgr::LoadNpcTextLocales() } } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Npc Text Locale strings in {} ms", (uint32)_npcTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Npc Text Locale Strings in {} ms", (uint32)_npcTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) @@ -6121,7 +6124,7 @@ void ObjectMgr::LoadQuestAreaTriggers() _questAreaTriggerStore[trigger_ID] = quest_ID; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quest trigger points in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quest Trigger Points in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -6192,6 +6195,7 @@ void ObjectMgr::LoadQuestGreetings() while (result->NextRow()); LOG_INFO("server.loading", ">> Loaded {} quest_greeting in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadQuestGreetingsLocales() @@ -6248,7 +6252,8 @@ void ObjectMgr::LoadQuestGreetingsLocales() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quest greeting locale strings in {} ms", (uint32)_questGreetingLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} quest greeting Locale Strings in {} ms", (uint32)_questGreetingLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadQuestOfferRewardLocale() @@ -6277,7 +6282,7 @@ void ObjectMgr::LoadQuestOfferRewardLocale() AddLocaleString(fields[2].Get(), locale, data.RewardText); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Quest Offer Reward locale strings in {} ms", _questOfferRewardLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quest Offer Reward Locale Strings in {} ms", _questOfferRewardLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadQuestRequestItemsLocale() @@ -6306,7 +6311,7 @@ void ObjectMgr::LoadQuestRequestItemsLocale() AddLocaleString(fields[2].Get(), locale, data.CompletionText); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Quest Request Items locale strings in {} ms", _questRequestItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quest Request Items Locale Strings in {} ms", _questRequestItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadTavernAreaTriggers() @@ -6344,7 +6349,7 @@ void ObjectMgr::LoadTavernAreaTriggers() _tavernAreaTriggerStore.insert(Trigger_ID); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} tavern triggers in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Tavern Triggers in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -6357,7 +6362,7 @@ void ObjectMgr::LoadAreaTriggerScripts() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 areatrigger scripts. DB table `areatrigger_scripts` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Areatrigger Scripts. DB Table `areatrigger_scripts` Is Empty."); LOG_INFO("server.loading", " "); return; } @@ -6382,7 +6387,7 @@ void ObjectMgr::LoadAreaTriggerScripts() _areaTriggerScriptStore[Trigger_ID] = GetScriptId(scriptName); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} areatrigger scripts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Areatrigger Scripts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -6534,7 +6539,7 @@ void ObjectMgr::LoadAreaTriggers() _areaTriggerStore[at.entry] = at; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} area trigger definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Area Trigger Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -6595,7 +6600,7 @@ void ObjectMgr::LoadAreaTriggerTeleports() _areaTriggerTeleportStore[Trigger_ID] = at; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} area trigger teleport definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Area Trigger Teleport Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -6760,7 +6765,7 @@ void ObjectMgr::LoadAccessRequirements() _accessRequirementStore[mapid][difficulty] = ar; } while (access_template_result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} rows from dungeon_access_template and {} rows from dungeon_access_requirements in {} ms", count, countProgressionRequirements, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Rows From dungeon_access_template And {} Rows From dungeon_access_requirements in {} ms", count, countProgressionRequirements, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -6945,7 +6950,7 @@ void ObjectMgr::LoadGameObjectLocales() AddLocaleString(fields[3].Get(), locale, data.CastBarCaption); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Gameobject Locale strings in {} ms", (uint32)_gameObjectLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gameobject Locale Strings in {} ms", (uint32)_gameObjectLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } inline void CheckGOLockId(GameObjectTemplate const* goInfo, uint32 dataN, uint32 N) @@ -7192,7 +7197,7 @@ void ObjectMgr::LoadGameObjectTemplate() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} game object templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Game Object Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7271,7 +7276,7 @@ void ObjectMgr::LoadGameObjectTemplateAddons() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} game object template addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Game Object Template Addons in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7299,7 +7304,7 @@ void ObjectMgr::LoadExplorationBaseXP() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} BaseXP definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} BaseXP Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7343,7 +7348,7 @@ void ObjectMgr::LoadPetNames() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} pet name parts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Pet Name Parts in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7358,7 +7363,7 @@ void ObjectMgr::LoadPetNumber() _hiPetNumber = fields[0].Get() + 1; } - LOG_INFO("server.loading", ">> Loaded the max pet number: {} in {} ms", _hiPetNumber - 1, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded The Max Pet Number: {} in {} ms", _hiPetNumber - 1, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7470,7 +7475,7 @@ void ObjectMgr::LoadReputationRewardRate() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} reputation_reward_rate in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Reputation Reward Rate in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7544,7 +7549,7 @@ void ObjectMgr::LoadReputationOnKill() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature award reputation definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Award Reputation Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7655,7 +7660,7 @@ void ObjectMgr::LoadReputationSpilloverTemplate() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} reputation_spillover_template in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Reputation Spillover Template in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7703,7 +7708,7 @@ void ObjectMgr::LoadPointsOfInterest() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Points of Interest definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Points of Interest Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7779,7 +7784,7 @@ void ObjectMgr::LoadQuestPOI() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quest POI definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quest POI definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7846,7 +7851,7 @@ void ObjectMgr::LoadNPCSpellClickSpells() } } - LOG_INFO("server.loading", ">> Loaded {} spellclick definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spellclick Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -7911,7 +7916,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, std::string const& ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quest relations from {} in {} ms", count, table, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quest Relations From {} in {} ms", count, table, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -8296,7 +8301,7 @@ bool ObjectMgr::LoadAcoreStrings() AddLocaleString(fields[i + 1].Get(), LocaleConstant(i), data.Content); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} acore strings in {} ms", (uint32)_acoreStringStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Acore Strings in {} ms", (uint32)_acoreStringStore.size(), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); return true; @@ -8653,7 +8658,7 @@ void ObjectMgr::LoadMailLevelRewards() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} level dependent mail rewards in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Level Dependent Mail Rewards in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -9261,7 +9266,7 @@ void ObjectMgr::LoadBroadcastTexts() _broadcastTextStore[bct.Id] = bct; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Broadcast texts in {} ms", _broadcastTextStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Broadcast Texts in {} ms", _broadcastTextStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadBroadcastTextLocales() @@ -9410,7 +9415,7 @@ void ObjectMgr::LoadCreatureClassLevelStats() } } - LOG_INFO("server.loading", ">> Loaded {} creature base stats in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Base Stats in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -9713,7 +9718,7 @@ void ObjectMgr::LoadGameObjectQuestItems() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} gameobject quest items in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gameobject Quest Items in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -9743,7 +9748,7 @@ void ObjectMgr::LoadCreatureQuestItems() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature quest items in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Quest Items in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -9778,6 +9783,7 @@ void ObjectMgr::LoadQuestMoneyRewards() } while (result->NextRow()); LOG_INFO("server.loading", ">> Loaded {} Quest Money Rewards in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } uint32 ObjectMgr::GetQuestMoneyReward(uint8 level, uint32 questMoneyDifficulty) const diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp index de74e204f..58eabc93b 100644 --- a/src/server/game/Groups/GroupMgr.cpp +++ b/src/server/game/Groups/GroupMgr.cpp @@ -148,7 +148,7 @@ void GroupMgr::LoadGroups() } } - LOG_INFO("server.loading", "Loading Group members..."); + LOG_INFO("server.loading", "Loading Group Members..."); { uint32 oldMSTime = getMSTime(); diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index 69668c6a7..3df4968de 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -92,7 +92,7 @@ Guild* GuildMgr::GetGuildByLeader(ObjectGuid guid) const void GuildMgr::LoadGuilds() { // 1. Load all guilds - LOG_INFO("server.loading", "Loading guilds definitions..."); + LOG_INFO("server.loading", "Loading Guilds Definitions..."); { uint32 oldMSTime = getMSTime(); @@ -134,7 +134,7 @@ void GuildMgr::LoadGuilds() } // 2. Load all guild ranks - LOG_INFO("server.loading", "Loading guild ranks..."); + LOG_INFO("server.loading", "Loading Guild Ranks..."); { uint32 oldMSTime = getMSTime(); @@ -169,7 +169,7 @@ void GuildMgr::LoadGuilds() } // 3. Load all guild members - LOG_INFO("server.loading", "Loading guild members..."); + LOG_INFO("server.loading", "Loading Guild Members..."); { uint32 oldMSTime = getMSTime(); @@ -211,7 +211,7 @@ void GuildMgr::LoadGuilds() } // 4. Load all guild bank tab rights - LOG_INFO("server.loading", "Loading bank tab rights..."); + LOG_INFO("server.loading", "Loading Bank Tab Rights..."); { uint32 oldMSTime = getMSTime(); @@ -246,7 +246,7 @@ void GuildMgr::LoadGuilds() } // 5. Load all event logs - LOG_INFO("server.loading", "Loading guild event logs..."); + LOG_INFO("server.loading", "Loading Guild Event Logs..."); { uint32 oldMSTime = getMSTime(); @@ -280,7 +280,7 @@ void GuildMgr::LoadGuilds() } // 6. Load all bank event logs - LOG_INFO("server.loading", "Loading guild bank event logs..."); + LOG_INFO("server.loading", "Loading Guild Bank Event Logs..."); { uint32 oldMSTime = getMSTime(); @@ -315,7 +315,7 @@ void GuildMgr::LoadGuilds() } // 7. Load all guild bank tabs - LOG_INFO("server.loading", "Loading guild bank tabs..."); + LOG_INFO("server.loading", "Loading Guild Bank Tabs..."); { uint32 oldMSTime = getMSTime(); diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index f622976ec..a8f3bc15b 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -290,7 +290,7 @@ void InstanceSaveMgr::LoadInstances() // Sanitize pending rows on Instance_saved_data for data that wasn't deleted properly SanitizeInstanceSavedData(); - LOG_INFO("server.loading", ">> Loaded instances and binds in {} ms", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded Instances And Binds in {} ms", GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 062719942..d2736ad01 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -1891,7 +1891,7 @@ bool LootTemplate::isReference(uint32 id) const void LoadLootTemplates_Creature() { - LOG_INFO("server.loading", "Loading creature loot templates..."); + LOG_INFO("server.loading", "Loading Creature Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -1918,7 +1918,7 @@ void LoadLootTemplates_Creature() LootTemplates_Creature.ReportUnusedIds(lootIdSet); if (count) - LOG_INFO("server.loading", ">> Loaded {} creature loot templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Loot Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); else LOG_WARN("server.loading", ">> Loaded 0 creature loot templates. DB table `creature_loot_template` is empty"); @@ -1927,7 +1927,7 @@ void LoadLootTemplates_Creature() void LoadLootTemplates_Disenchant() { - LOG_INFO("server.loading", "Loading disenchanting loot templates..."); + LOG_INFO("server.loading", "Loading Disenchanting Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -1961,7 +1961,7 @@ void LoadLootTemplates_Disenchant() void LoadLootTemplates_Fishing() { - LOG_INFO("server.loading", "Loading fishing loot templates..."); + LOG_INFO("server.loading", "Loading Fishing Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -1978,7 +1978,7 @@ void LoadLootTemplates_Fishing() LootTemplates_Fishing.ReportUnusedIds(lootIdSet); if (count) - LOG_INFO("server.loading", ">> Loaded {} fishing loot templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Fishing Loot Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); else LOG_WARN("server.loading", ">> Loaded 0 fishing loot templates. DB table `fishing_loot_template` is empty"); @@ -1987,7 +1987,7 @@ void LoadLootTemplates_Fishing() void LoadLootTemplates_Gameobject() { - LOG_INFO("server.loading", "Loading gameobject loot templates..."); + LOG_INFO("server.loading", "Loading Gameobject Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2014,7 +2014,7 @@ void LoadLootTemplates_Gameobject() LootTemplates_Gameobject.ReportUnusedIds(lootIdSet); if (count) - LOG_INFO("server.loading", ">> Loaded {} gameobject loot templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gameobject Loot Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); else LOG_WARN("server.loading", ">> Loaded 0 gameobject loot templates. DB table `gameobject_loot_template` is empty"); @@ -2023,7 +2023,7 @@ void LoadLootTemplates_Gameobject() void LoadLootTemplates_Item() { - LOG_INFO("server.loading", "Loading item loot templates..."); + LOG_INFO("server.loading", "Loading Item Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2049,7 +2049,7 @@ void LoadLootTemplates_Item() void LoadLootTemplates_Milling() { - LOG_INFO("server.loading", "Loading milling loot templates..."); + LOG_INFO("server.loading", "Loading Milling Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2080,7 +2080,7 @@ void LoadLootTemplates_Milling() void LoadLootTemplates_Pickpocketing() { - LOG_INFO("server.loading", "Loading pickpocketing loot templates..."); + LOG_INFO("server.loading", "Loading Pickpocketing Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2116,7 +2116,7 @@ void LoadLootTemplates_Pickpocketing() void LoadLootTemplates_Prospecting() { - LOG_INFO("server.loading", "Loading prospecting loot templates..."); + LOG_INFO("server.loading", "Loading Prospecting Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2147,7 +2147,7 @@ void LoadLootTemplates_Prospecting() void LoadLootTemplates_Mail() { - LOG_INFO("server.loading", "Loading mail loot templates..."); + LOG_INFO("server.loading", "Loading Mail Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2173,7 +2173,7 @@ void LoadLootTemplates_Mail() void LoadLootTemplates_Skinning() { - LOG_INFO("server.loading", "Loading skinning loot templates..."); + LOG_INFO("server.loading", "Loading Skinning Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2209,7 +2209,7 @@ void LoadLootTemplates_Skinning() void LoadLootTemplates_Spell() { - LOG_INFO("server.loading", "Loading spell loot templates..."); + LOG_INFO("server.loading", "Loading Spell Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2252,7 +2252,7 @@ void LoadLootTemplates_Spell() void LoadLootTemplates_Player() { - LOG_INFO("server.loading", "Loading player loot templates..."); + LOG_INFO("server.loading", "Loading Player Loot Templates..."); uint32 oldMSTime = getMSTime(); @@ -2273,7 +2273,7 @@ void LoadLootTemplates_Player() void LoadLootTemplates_Reference() { - LOG_INFO("server.loading", "Loading reference loot templates..."); + LOG_INFO("server.loading", "Loading Reference Loot Templates..."); uint32 oldMSTime = getMSTime(); diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 7e895021e..e6ad171d3 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -90,7 +90,7 @@ void TransportMgr::LoadTransportTemplates() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} transport templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Transport Templates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Misc/GameGraveyard.cpp b/src/server/game/Misc/GameGraveyard.cpp index cfb7756a1..37a20bc7e 100644 --- a/src/server/game/Misc/GameGraveyard.cpp +++ b/src/server/game/Misc/GameGraveyard.cpp @@ -70,7 +70,7 @@ void Graveyard::LoadGraveyardFromDB() ++Count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} graveyard in {} ms", Count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Graveyard in {} ms", Count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -375,7 +375,7 @@ void Graveyard::LoadGraveyardZones() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 graveyard-zone links. DB table `graveyard_zone` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Graveyard-Zone Links. DB Table `graveyard_zone` Is Empty."); LOG_INFO("server.loading", " "); return; } @@ -417,7 +417,7 @@ void Graveyard::LoadGraveyardZones() LOG_ERROR("sql.sql", "Table `graveyard_zone` has a duplicate record for Graveyard (ID: {}) and Zone (ID: {}), skipped.", safeLocId, zoneId); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} graveyard-zone links in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Graveyard-Zone Links in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 37a9bc41f..4f55a247b 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -599,7 +599,7 @@ void PoolMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} objects pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Objects Pools In {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -656,14 +656,14 @@ void PoolMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creatures in pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creatures In Pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } // Gameobjects - LOG_INFO("server.loading", "Loading Gameobject Pooling Data..."); + LOG_INFO("server.loading", "Loading Gameobjects Pooling Data..."); { uint32 oldMSTime = getMSTime(); @@ -726,7 +726,7 @@ void PoolMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} gameobject in pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Gameobjects In Pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -818,7 +818,7 @@ void PoolMgr::LoadFromDB() } } - LOG_INFO("server.loading", ">> Loaded {} pools in mother pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Pools In Mother Pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } @@ -908,13 +908,13 @@ void PoolMgr::LoadFromDB() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} quests in pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Quests In Pools in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } } // The initialize method will spawn all pools not in an event and not in another pool, this is why there is 2 left joins with 2 null checks - LOG_INFO("server.loading", "Starting objects pooling system..."); + LOG_INFO("server.loading", "Starting Objects Pooling System..."); { uint32 oldMSTime = getMSTime(); diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 7ca83b623..d6aa37b35 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -41,7 +41,7 @@ void SystemMgr::LoadScriptWaypoints() if (result) uiCreatureCount = result->GetRowCount(); - LOG_INFO("server.loading", "Loading Script Waypoints for {} creature(s)...", uiCreatureCount); + LOG_INFO("server.loading", "Loading Script Waypoints For {} Creature(s)...", uiCreatureCount); // 0 1 2 3 4 5 result = WorldDatabase.Query("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid"); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index a2eaf13e7..558cd54fc 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1468,7 +1468,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici } tstZ = beforewaterz; srange = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX)); - //TC_LOG_ERROR("server", "(start was from land) step in water , number of cycle = %i , distance of step = %f, total path = %f, Z = %f", j, srange, totalpath, tstZ); + //LOG_ERROR("spells", "(start was from land) step in water , number of cycle = {} , distance of step = {}, total path = {}, Z = {}", j, srange, totalpath, tstZ); } } else if (map->IsInWater(phasemask, tstX, tstY, tstZ, collisionHeight)) @@ -1481,13 +1481,13 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici if (inwater && (fabs(tstZ - ground) < 2.0f)) { wcol = true; - //TC_LOG_ERROR("server", "step in water with collide and use standart check (for continue way after possible collide), number of cycle = %i ", j); + //LOG_ERROR("spells", "step in water with collide and use standart check (for continue way after possible collide), number of cycle = {} ", j); } // if (j < 2) - // TC_LOG_ERROR("server", "(start in water) step in water, number of cycle = %i , distance of step = %f, total path = %f", j, srange, totalpath); + // LOG_ERROR("spells", "(start in water) step in water, number of cycle = {} , distance of step = {}, total path = {}", j, srange, totalpath); // else - // TC_LOG_ERROR("server", "step in water, number of cycle = %i , distance of step = %f, total path = %f", j, srange, totalpath); + // LOG_ERROR("spells", "step in water, number of cycle = {} , distance of step = {}, total path = {}", j, srange, totalpath); } bool IsInWater = map->IsInWater(phasemask, tstX, tstY, tstZ, collisionHeight); @@ -1505,11 +1505,11 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici //distance of rays, will select the shortest in 3D srange1 = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX) + (tstZ1 - prevZ) * (tstZ1 - prevZ)); - //TC_LOG_ERROR("server", "step = %i, distance of ray1 = %f", j, srange1); + //LOG_ERROR("spells", "step = {}, distance of ray1 = {}", j, srange1); srange2 = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX) + (tstZ2 - prevZ) * (tstZ2 - prevZ)); - //TC_LOG_ERROR("server", "step = %i, distance of ray2 = %f", j, srange2); + //LOG_ERROR("spells", "step = {}, distance of ray2 = {}", j, srange2); srange3 = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX) + (tstZ3 - prevZ) * (tstZ3 - prevZ)); - //TC_LOG_ERROR("server", "step = %i, distance of ray3 = %f", j, srange3); + //LOG_ERROR("spells", "step = {}, distance of ray3 = {}", j, srange3); if (srange1 < srange2) { @@ -1527,7 +1527,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici srange = srange2; } - //TC_LOG_ERROR("server", "step on ground, number of cycle = %i , distance of step = %f, total path = %f", j, srange, totalpath); + //LOG_ERROR("spells", "step on ground, number of cycle = {} , distance of step = {}, total path = {}", j, srange, totalpath); } destx = tstX; @@ -1539,7 +1539,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici if (totalpath > distance) { overdistance = totalpath - distance; - //TC_LOG_ERROR("server", "total path > than distance in 3D , need to move back a bit for save distance, total path = %f, overdistance = %f", totalpath, overdistance); + //LOG_ERROR("spells", "total path > than distance in 3D , need to move back a bit for save distance, total path = {}, overdistance = {}", totalpath, overdistance); } bool col = VMAP::VMapFactory::createOrGetVMapMgr()->GetObjectHitPos(mapid, prevX, prevY, prevZ + 0.5f, tstX, tstY, tstZ + 0.5f, tstX, tstY, tstZ, -0.5f); @@ -1553,14 +1553,14 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici { destx = prevX + overdistance * cos(pos.GetOrientation()); desty = prevY + overdistance * sin(pos.GetOrientation()); - //TC_LOG_ERROR("server", "(collision) collision occured 1"); + //LOG_ERROR("spells", "(collision) collision occured 1"); } else { // move back a bit destx = tstX - (0.6 * cos(pos.GetOrientation())); desty = tstY - (0.6 * sin(pos.GetOrientation())); - //TC_LOG_ERROR("server", "(collision) collision occured 2"); + //LOG_ERROR("spells", "(collision) collision occured 2"); } // highest available point @@ -1584,13 +1584,12 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici if (inwater && destz < prevZ && !wcol) destz = prevZ; - //TC_LOG_ERROR("server", "(collision) destZ rewrited in prevZ"); + //LOG_ERROR("spells", "(collision) destZ rewrited in prevZ"); break; } // we have correct destz now } - //} lastpos.Relocate(destx, desty, destz, pos.GetOrientation()); dest = SpellDestination(lastpos); @@ -1613,7 +1612,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici lastpos.Relocate(destx, desty, z, pos.GetOrientation()); dest = SpellDestination(lastpos); //float range = sqrt((desty - pos.GetPositionY())*(desty - pos.GetPositionY()) + (destx - pos.GetPositionX())*(destx - pos.GetPositionX())); - //TC_LOG_ERROR("server", "Blink number 2, in falling but at a hight, distance of blink = %f", range); + //LOG_ERROR("spells", "Blink number 2, in falling but at a hight, distance of blink = {}", range); } break; } diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 6fa9b83a6..87dbb64a6 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -6015,6 +6015,43 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* case 13049: summonLevel = 55; break; + + // Cleansed Timberling Heart: Summon Timberling + case 5666: + summonLevel = 7; + break; + + // Glowing Cat Figurine: Summon Ghost Saber + case 6084: + // minLevel 19, maxLevel 20 + summonLevel = 20; + break; + + // Spiked Collar: Summon Felhunter + case 8176: + summonLevel = 30; + break; + + // Dog Whistle: Summon Tracking Hound + case 9515: + summonLevel = 30; + break; + + // Barov Peasant Caller: Death by Peasant + case 18307: + case 18308: + summonLevel = 60; + break; + + // Thornling Seed: Plant Thornling + case 22792: + summonLevel = 60; + break; + + // Cannonball Runner: Summon Crimson Cannon + case 6251: + summonLevel = 61; + break; } } @@ -6056,6 +6093,12 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* // xinef: set calculated level summon->SetLevel(summonLevel); + // if summonLevel changed, set stats for calculated level + if (summonLevel != caster->getLevel()) + { + ((Guardian*)summon)->InitStatsForLevel(summonLevel); + } + // xinef: if we have more than one guardian, change follow angle if (summon->HasUnitTypeMask(UNIT_MASK_MINION) && totalNumGuardians > 1) ((Minion*)summon)->SetFollowAngle(m_caster->GetAbsoluteAngle(pos.GetPositionX(), pos.GetPositionY())); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 579b5548d..8d9524bf5 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1460,7 +1460,7 @@ void SpellMgr::LoadSpellRequired() mTalentSpellAdditionalSet.insert(spellId); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} spell required records in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spell Required Records in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1513,7 +1513,7 @@ void SpellMgr::LoadSpellLearnSkills() } } - LOG_INFO("server.loading", ">> Loaded {} Spell Learn Skills from DBC in {} ms", dbc_count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spell Learn Skills From DBC in {} ms", dbc_count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1618,7 +1618,7 @@ void SpellMgr::LoadSpellTargetPositions() } }*/ - LOG_INFO("server.loading", ">> Loaded {} spell teleport coordinates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spell Teleport Coordinates in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1678,7 +1678,7 @@ void SpellMgr::LoadSpellGroups() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} spell group definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spell Group Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1729,7 +1729,7 @@ void SpellMgr::LoadSpellGroupStackRules() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} spell group stack rules in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spell Group Stack Rules in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1823,7 +1823,7 @@ void SpellMgr::LoadSpellProcEvents() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} extra spell proc event conditions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Extra Spell Proc Event Conditions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -1837,7 +1837,7 @@ void SpellMgr::LoadSpellProcs() QueryResult result = WorldDatabase.Query("SELECT spellId, schoolMask, spellFamilyName, spellFamilyMask0, spellFamilyMask1, spellFamilyMask2, typeMask, spellTypeMask, spellPhaseMask, hitMask, attributesMask, ratePerMinute, chance, cooldown, charges FROM spell_proc"); if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 spell proc conditions and data. DB table `spell_proc` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Spell Proc Conditions And Data. DB table `spell_proc` Is Empty."); LOG_INFO("server.loading", " "); return; } @@ -2002,7 +2002,7 @@ void SpellMgr::LoadSpellBonuses() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} extra spell bonus data in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Extra Spell Bonus Data in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2079,7 +2079,7 @@ void SpellMgr::LoadSpellMixology() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} Mixology bonuses in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Mixology Bonuses in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2163,7 +2163,7 @@ void SpellMgr::LoadSpellPetAuras() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} spell pet auras in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spell Pet Auras in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2205,7 +2205,7 @@ void SpellMgr::LoadEnchantCustomAttr() } } - LOG_INFO("server.loading", ">> Loaded {} custom enchant attributes in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Custom Enchant Attributes in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2249,7 +2249,7 @@ void SpellMgr::LoadSpellEnchantProcData() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} enchant proc data definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Enchant Proc Data Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2302,7 +2302,7 @@ void SpellMgr::LoadSpellLinked() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} linked spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Linked Spells in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2359,7 +2359,7 @@ void SpellMgr::LoadPetLevelupSpellMap() } } - LOG_INFO("server.loading", ">> Loaded {} pet levelup and default spells for {} families in {} ms", count, family_count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Pet Levelup And Default Spells For {} Families in {} ms", count, family_count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2443,10 +2443,10 @@ void SpellMgr::LoadPetDefaultSpells() } } - LOG_INFO("server.loading", ">> Loaded addition spells for {} pet spell data entries in {} ms", countData, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded Addition Spells For {} Pet Spell Data Entries in {} ms", countData, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); - LOG_INFO("server.loading", "Loading summonable creature templates..."); + LOG_INFO("server.loading", "Loading Summonable Creature Templates..."); oldMSTime = getMSTime(); // different summon spells @@ -2487,7 +2487,7 @@ void SpellMgr::LoadPetDefaultSpells() } } - LOG_INFO("server.loading", ">> Loaded {} summonable creature templates in {} ms", countCreature, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Summonable Creature emplates in {} ms", countCreature, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2678,27 +2678,27 @@ void SpellMgr::LoadSpellAreas() if (sWorld->getIntConfig(CONFIG_ICC_BUFF_HORDE) > 0) { - LOG_INFO("server.loading", ">> Using ICC buff Horde: {}", sWorld->getIntConfig(CONFIG_ICC_BUFF_HORDE)); + LOG_INFO("server.loading", ">> Using ICC Buff Horde: {}", sWorld->getIntConfig(CONFIG_ICC_BUFF_HORDE)); SpellArea spellAreaICCBuffHorde = { sWorld->getIntConfig(CONFIG_ICC_BUFF_HORDE), ICC_AREA, 0, 0, 0, ICC_RACEMASK_HORDE, Gender(2), 64, 11, 1 }; SpellArea const* saICCBuffHorde = &mSpellAreaMap.insert(SpellAreaMap::value_type(sWorld->getIntConfig(CONFIG_ICC_BUFF_HORDE), spellAreaICCBuffHorde))->second; mSpellAreaForAreaMap.insert(SpellAreaForAreaMap::value_type(ICC_AREA, saICCBuffHorde)); ++count; } else - LOG_INFO("server.loading", ">> ICC buff Horde: disabled"); + LOG_INFO("server.loading", ">> ICC Buff Horde: disabled"); if (sWorld->getIntConfig(CONFIG_ICC_BUFF_ALLIANCE) > 0) { - LOG_INFO("server.loading", ">> Using ICC buff Alliance: {}", sWorld->getIntConfig(CONFIG_ICC_BUFF_ALLIANCE)); + LOG_INFO("server.loading", ">> Using ICC Buff Alliance: {}", sWorld->getIntConfig(CONFIG_ICC_BUFF_ALLIANCE)); SpellArea spellAreaICCBuffAlliance = { sWorld->getIntConfig(CONFIG_ICC_BUFF_ALLIANCE), ICC_AREA, 0, 0, 0, ICC_RACEMASK_ALLIANCE, Gender(2), 64, 11, 1 }; SpellArea const* saICCBuffAlliance = &mSpellAreaMap.insert(SpellAreaMap::value_type(sWorld->getIntConfig(CONFIG_ICC_BUFF_ALLIANCE), spellAreaICCBuffAlliance))->second; mSpellAreaForAreaMap.insert(SpellAreaForAreaMap::value_type(ICC_AREA, saICCBuffAlliance)); ++count; } else - LOG_INFO("server.loading", ">> ICC buff Alliance: disabled"); + LOG_INFO("server.loading", ">> ICC Buff Alliance: disabled"); - LOG_INFO("server.loading", ">> Loaded {} spell area requirements in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Spell Area Requirements in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2727,7 +2727,7 @@ void SpellMgr::LoadSpellInfoStore() } } - LOG_INFO("server.loading", ">> Loaded spell custom attributes in {} ms", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded Spell Custom Attributes in {} ms", GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2762,7 +2762,7 @@ void SpellMgr::LoadSpellSpecificAndAuraState() spellInfo->_auraState = spellInfo->LoadAuraState(); } - LOG_INFO("server.loading", ">> Loaded spell specific and aura state in {} ms", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded Spell Specific And Aura State in {} ms", GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -2776,7 +2776,7 @@ void SpellMgr::LoadSpellInfoCustomAttributes() if (!result) { - LOG_WARN("server.loading", ">> Loaded 0 spell custom attributes from DB. DB table `spell_custom_attr` is empty."); + LOG_WARN("server.loading", ">> Loaded 0 Spell Custom Attributes From DB. DB table `spell_custom_attr` Is Empty."); } else { @@ -3458,6 +3458,6 @@ void SpellMgr::LoadSpellInfoCustomAttributes() spellInfo->AttributesCu &= ~SPELL_ATTR0_CU_BINARY_SPELL; } - LOG_INFO("server.loading", ">> Loaded SpellInfo custom attributes in {} ms", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded SpellInfo Custom Attributes in {} ms", GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 8e66af3ac..e477f4580 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -162,7 +162,7 @@ void CreatureTextMgr::LoadCreatureTexts() ++textCount; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} creature texts for {} creatures in {} ms", textCount, mTextMap.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Creature Texts For {} Creatures in {} ms", textCount, mTextMap.size(), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 45c9149e6..f1e4cb388 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -375,7 +375,8 @@ void PlayerDump::InitializeTables() ASSERT(CharacterTables.size() == DUMP_TABLE_COUNT); - LOG_INFO("server.loading", ">> Initialized tables for PlayerDump in {} ms.", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Initialized Tables For PlayerDump in {} ms.", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } // Low level functions diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index b1a22c2e5..af3035deb 100644 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -139,7 +139,7 @@ namespace WeatherMgr ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} weather definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Weather Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 618a5d4fa..2c82f3974 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1532,7 +1532,7 @@ void World::SetInitialWorldSettings() ///- Loading strings. Getting no records means core load has to be canceled because no error message can be output. LOG_INFO("server.loading", " "); - LOG_INFO("server.loading", "Loading acore strings..."); + LOG_INFO("server.loading", "Loading Acore Strings..."); if (!sObjectMgr->LoadAcoreStrings()) exit(1); // Error message displayed in function already @@ -1554,7 +1554,7 @@ void World::SetInitialWorldSettings() sScriptMgr->OnLoadCustomDatabaseTable(); ///- Load the DBC files - LOG_INFO("server.loading", "Initialize data stores..."); + LOG_INFO("server.loading", "Initialize Data Stores..."); LoadDBCStores(m_dataPath); DetectDBCLang(); @@ -1578,16 +1578,16 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Game Graveyard..."); sGraveyard->LoadGraveyardFromDB(); - LOG_INFO("server.loading", "Initializing PlayerDump tables..."); + LOG_INFO("server.loading", "Initializing PlayerDump Tables..."); PlayerDump::InitializeTables(); ///- Initilize static helper structures AIRegistry::Initialize(); - LOG_INFO("server.loading", "Loading SpellInfo store..."); + LOG_INFO("server.loading", "Loading SpellInfo Store..."); sSpellMgr->LoadSpellInfoStore(); - LOG_INFO("server.loading", "Loading SpellInfo data corrections..."); + LOG_INFO("server.loading", "Loading SpellInfo Data Corrections..."); sSpellMgr->LoadSpellInfoCorrections(); LOG_INFO("server.loading", "Loading Spell Rank Data..."); @@ -1599,10 +1599,10 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading SkillLineAbilityMultiMap Data..."); sSpellMgr->LoadSkillLineAbilityMap(); - LOG_INFO("server.loading", "Loading SpellInfo custom attributes..."); + LOG_INFO("server.loading", "Loading SpellInfo Custom Attributes..."); sSpellMgr->LoadSpellInfoCustomAttributes(); - LOG_INFO("server.loading", "Loading GameObject models..."); + LOG_INFO("server.loading", "Loading GameObject Models..."); LoadGameObjectModelList(m_dataPath); LOG_INFO("server.loading", "Loading Script Names..."); @@ -1614,18 +1614,18 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Instance Saved Gameobject State Data..."); sObjectMgr->LoadInstanceSavedGameobjectStateData(); - LOG_INFO("server.loading", "Load Character Cache..."); + LOG_INFO("server.loading", "Loading Character Cache..."); sCharacterCache->LoadCharacterCacheStorage(); // Must be called before `creature_respawn`/`gameobject_respawn` tables - LOG_INFO("server.loading", "Loading instances..."); + LOG_INFO("server.loading", "Loading Instances..."); sInstanceSaveMgr->LoadInstances(); - LOG_INFO("server.loading", "Loading Broadcast texts..."); + LOG_INFO("server.loading", "Loading Broadcast Texts..."); sObjectMgr->LoadBroadcastTexts(); sObjectMgr->LoadBroadcastTextLocales(); - LOG_INFO("server.loading", "Loading Localization strings..."); + LOG_INFO("server.loading", "Loading Localization Strings..."); uint32 oldMSTime = getMSTime(); sObjectMgr->LoadCreatureLocales(); sObjectMgr->LoadGameObjectLocales(); @@ -1640,7 +1640,7 @@ void World::SetInitialWorldSettings() sObjectMgr->LoadPointOfInterestLocales(); sObjectMgr->SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts) - LOG_INFO("server.loading", ">> Localization strings loaded in {} ms", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Localization Strings loaded in {} ms", GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); LOG_INFO("server.loading", "Loading Page Texts..."); @@ -1649,25 +1649,25 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Game Object Templates..."); // must be after LoadPageTexts sObjectMgr->LoadGameObjectTemplate(); - LOG_INFO("server.loading", "Loading Game Object template addons..."); + LOG_INFO("server.loading", "Loading Game Object Template Addons..."); sObjectMgr->LoadGameObjectTemplateAddons(); - LOG_INFO("server.loading", "Loading Transport templates..."); + LOG_INFO("server.loading", "Loading Transport Templates..."); sTransportMgr->LoadTransportTemplates(); LOG_INFO("server.loading", "Loading Spell Required Data..."); sSpellMgr->LoadSpellRequired(); - LOG_INFO("server.loading", "Loading Spell Group types..."); + LOG_INFO("server.loading", "Loading Spell Group Types..."); sSpellMgr->LoadSpellGroups(); LOG_INFO("server.loading", "Loading Spell Learn Skills..."); sSpellMgr->LoadSpellLearnSkills(); // must be after LoadSpellRanks - LOG_INFO("server.loading", "Loading Spell Proc Event conditions..."); + LOG_INFO("server.loading", "Loading Spell Proc Event Conditions..."); sSpellMgr->LoadSpellProcEvents(); - LOG_INFO("server.loading", "Loading Spell Proc conditions and data..."); + LOG_INFO("server.loading", "Loading Spell Proc Conditions and Data..."); sSpellMgr->LoadSpellProcs(); LOG_INFO("server.loading", "Loading Spell Bonus Data..."); @@ -1676,7 +1676,7 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Aggro Spells Definitions..."); sSpellMgr->LoadSpellThreats(); - LOG_INFO("server.loading", "Loading Mixology bonuses..."); + LOG_INFO("server.loading", "Loading Mixology Bonuses..."); sSpellMgr->LoadSpellMixology(); LOG_INFO("server.loading", "Loading Spell Group Stack Rules..."); @@ -1685,7 +1685,7 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading NPC Texts..."); sObjectMgr->LoadGossipText(); - LOG_INFO("server.loading", "Loading Enchant Spells Proc datas..."); + LOG_INFO("server.loading", "Loading Enchant Spells Proc Datas..."); sSpellMgr->LoadSpellEnchantProcData(); LOG_INFO("server.loading", "Loading Item Random Enchantments Table..."); @@ -1697,19 +1697,19 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Items..."); // must be after LoadRandomEnchantmentsTable and LoadPageTexts sObjectMgr->LoadItemTemplates(); - LOG_INFO("server.loading", "Loading Item set names..."); // must be after LoadItemPrototypes + LOG_INFO("server.loading", "Loading Item Set Names..."); // must be after LoadItemPrototypes sObjectMgr->LoadItemSetNames(); LOG_INFO("server.loading", "Loading Creature Model Based Info Data..."); sObjectMgr->LoadCreatureModelInfo(); - LOG_INFO("server.loading", "Loading Creature templates..."); + LOG_INFO("server.loading", "Loading Creature Templates..."); sObjectMgr->LoadCreatureTemplates(); - LOG_INFO("server.loading", "Loading Equipment templates..."); // must be after LoadCreatureTemplates + LOG_INFO("server.loading", "Loading Equipment Templates..."); // must be after LoadCreatureTemplates sObjectMgr->LoadEquipmentTemplates(); - LOG_INFO("server.loading", "Loading Creature template addons..."); + LOG_INFO("server.loading", "Loading Creature Template Addons..."); sObjectMgr->LoadCreatureTemplateAddons(); LOG_INFO("server.loading", "Loading Reputation Reward Rates..."); @@ -1733,10 +1733,10 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Temporary Summon Data..."); sObjectMgr->LoadTempSummons(); // must be after LoadCreatureTemplates() and LoadGameObjectTemplates() - LOG_INFO("server.loading", "Loading pet levelup spells..."); + LOG_INFO("server.loading", "Loading Pet Levelup Spells..."); sSpellMgr->LoadPetLevelupSpellMap(); - LOG_INFO("server.loading", "Loading pet default spells additional to levelup spells..."); + LOG_INFO("server.loading", "Loading Pet default Spells additional to Levelup Spells..."); sSpellMgr->LoadPetDefaultSpells(); LOG_INFO("server.loading", "Loading Creature Addon Data..."); @@ -1802,10 +1802,10 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading SpellArea Data..."); // must be after quest load sSpellMgr->LoadSpellAreas(); - LOG_INFO("server.loading", "Loading Area Trigger definitions"); + LOG_INFO("server.loading", "Loading Area Trigger Definitions"); sObjectMgr->LoadAreaTriggers(); - LOG_INFO("server.loading", "Loading Area Trigger Teleport definitions..."); + LOG_INFO("server.loading", "Loading Area Trigger Teleport Definitions..."); sObjectMgr->LoadAreaTriggerTeleports(); LOG_INFO("server.loading", "Loading Access Requirements..."); @@ -1817,31 +1817,31 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Tavern Area Triggers..."); sObjectMgr->LoadTavernAreaTriggers(); - LOG_INFO("server.loading", "Loading AreaTrigger script names..."); + LOG_INFO("server.loading", "Loading AreaTrigger Script Names..."); sObjectMgr->LoadAreaTriggerScripts(); - LOG_INFO("server.loading", "Loading LFG entrance positions..."); // Must be after areatriggers + LOG_INFO("server.loading", "Loading LFG Entrance Positions..."); // Must be after areatriggers sLFGMgr->LoadLFGDungeons(); - LOG_INFO("server.loading", "Loading Dungeon boss data..."); + LOG_INFO("server.loading", "Loading Dungeon Boss Data..."); sObjectMgr->LoadInstanceEncounters(); - LOG_INFO("server.loading", "Loading LFG rewards..."); + LOG_INFO("server.loading", "Loading LFG Rewards..."); sLFGMgr->LoadRewards(); - LOG_INFO("server.loading", "Loading Graveyard-zone links..."); + LOG_INFO("server.loading", "Loading Graveyard-Zone Links..."); sGraveyard->LoadGraveyardZones(); - LOG_INFO("server.loading", "Loading spell pet auras..."); + LOG_INFO("server.loading", "Loading Spell Pet Auras..."); sSpellMgr->LoadSpellPetAuras(); - LOG_INFO("server.loading", "Loading Spell target coordinates..."); + LOG_INFO("server.loading", "Loading Spell Target Coordinates..."); sSpellMgr->LoadSpellTargetPositions(); - LOG_INFO("server.loading", "Loading enchant custom attributes..."); + LOG_INFO("server.loading", "Loading Enchant Custom Attributes..."); sSpellMgr->LoadEnchantCustomAttr(); - LOG_INFO("server.loading", "Loading linked spells..."); + LOG_INFO("server.loading", "Loading linked Spells..."); sSpellMgr->LoadSpellLinked(); LOG_INFO("server.loading", "Loading Player Create Data..."); @@ -1855,13 +1855,13 @@ void World::SetInitialWorldSettings() CharacterDatabaseCleaner::CleanDatabase(); - LOG_INFO("server.loading", "Loading the max pet number..."); + LOG_INFO("server.loading", "Loading The Max Pet Number..."); sObjectMgr->LoadPetNumber(); - LOG_INFO("server.loading", "Loading pet level stats..."); + LOG_INFO("server.loading", "Loading Pet Level Stats..."); sObjectMgr->LoadPetLevelInfo(); - LOG_INFO("server.loading", "Loading Player level dependent mail rewards..."); + LOG_INFO("server.loading", "Loading Player Level Dependent Mail Rewards..."); sObjectMgr->LoadMailLevelRewards(); LOG_INFO("server.loading", "Load Mail Server Template..."); @@ -1879,7 +1879,7 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Skill Perfection Data Table..."); LoadSkillPerfectItemTable(); - LOG_INFO("server.loading", "Loading Skill Fishing base level requirements..."); + LOG_INFO("server.loading", "Loading Skill Fishing Base Level Requirements..."); sObjectMgr->LoadFishingBaseSkillLevel(); LOG_INFO("server.loading", "Loading Achievements..."); @@ -1912,7 +1912,7 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading ReservedNames..."); sObjectMgr->LoadReservedPlayersNames(); - LOG_INFO("server.loading", "Loading GameObjects for quests..."); + LOG_INFO("server.loading", "Loading GameObjects for Quests..."); sObjectMgr->LoadGameObjectForQuests(); LOG_INFO("server.loading", "Loading BattleMasters..."); @@ -1921,10 +1921,10 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading GameTeleports..."); sObjectMgr->LoadGameTele(); - LOG_INFO("server.loading", "Loading Gossip menu..."); + LOG_INFO("server.loading", "Loading Gossip Menu..."); sObjectMgr->LoadGossipMenu(); - LOG_INFO("server.loading", "Loading Gossip menu options..."); + LOG_INFO("server.loading", "Loading Gossip Menu Options..."); sObjectMgr->LoadGossipMenuItems(); LOG_INFO("server.loading", "Loading Vendors..."); @@ -1948,42 +1948,42 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Conditions..."); sConditionMgr->LoadConditions(); - LOG_INFO("server.loading", "Loading faction change achievement pairs..."); + LOG_INFO("server.loading", "Loading Faction Change Achievement Pairs..."); sObjectMgr->LoadFactionChangeAchievements(); - LOG_INFO("server.loading", "Loading faction change spell pairs..."); + LOG_INFO("server.loading", "Loading Faction Change Spell Pairs..."); sObjectMgr->LoadFactionChangeSpells(); - LOG_INFO("server.loading", "Loading faction change item pairs..."); + LOG_INFO("server.loading", "Loading Faction Change Item Pairs..."); sObjectMgr->LoadFactionChangeItems(); - LOG_INFO("server.loading", "Loading faction change reputation pairs..."); + LOG_INFO("server.loading", "Loading Faction Change Reputation Pairs..."); sObjectMgr->LoadFactionChangeReputations(); - LOG_INFO("server.loading", "Loading faction change title pairs..."); + LOG_INFO("server.loading", "Loading Faction Change Title Pairs..."); sObjectMgr->LoadFactionChangeTitles(); - LOG_INFO("server.loading", "Loading faction change quest pairs..."); + LOG_INFO("server.loading", "Loading Faction Change Quest Pairs..."); sObjectMgr->LoadFactionChangeQuests(); - LOG_INFO("server.loading", "Loading GM tickets..."); + LOG_INFO("server.loading", "Loading GM Tickets..."); sTicketMgr->LoadTickets(); - LOG_INFO("server.loading", "Loading GM surveys..."); + LOG_INFO("server.loading", "Loading GM Surveys..."); sTicketMgr->LoadSurveys(); - LOG_INFO("server.loading", "Loading client addons..."); + LOG_INFO("server.loading", "Loading Client Addons..."); AddonMgr::LoadFromDB(); // pussywizard: - LOG_INFO("server.loading", "Deleting invalid mail items..."); + LOG_INFO("server.loading", "Deleting Invalid Mail Items..."); LOG_INFO("server.loading", " "); CharacterDatabase.Execute("DELETE mi FROM mail_items mi LEFT JOIN item_instance ii ON mi.item_guid = ii.guid WHERE ii.guid IS NULL"); CharacterDatabase.Execute("DELETE mi FROM mail_items mi LEFT JOIN mail m ON mi.mail_id = m.id WHERE m.id IS NULL"); CharacterDatabase.Execute("UPDATE mail m LEFT JOIN mail_items mi ON m.id = mi.mail_id SET m.has_items=0 WHERE m.has_items<>0 AND mi.mail_id IS NULL"); ///- Handle outdated emails (delete/return) - LOG_INFO("server.loading", "Returning old mails..."); + LOG_INFO("server.loading", "Returning Old Mails..."); LOG_INFO("server.loading", " "); sObjectMgr->ReturnOrDeleteOldMails(false); @@ -1996,7 +1996,7 @@ void World::SetInitialWorldSettings() sObjectMgr->LoadEventScripts(); // must be after load Creature/Gameobject(Template/Data) sObjectMgr->LoadWaypointScripts(); - LOG_INFO("server.loading", "Loading spell script names..."); + LOG_INFO("server.loading", "Loading Spell Script Names..."); sObjectMgr->LoadSpellScriptNames(); LOG_INFO("server.loading", "Loading Creature Texts..."); @@ -2008,24 +2008,24 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Scripts..."); sScriptMgr->LoadDatabase(); - LOG_INFO("server.loading", "Validating spell scripts..."); + LOG_INFO("server.loading", "Validating Spell Scripts..."); sObjectMgr->ValidateSpellScripts(); - LOG_INFO("server.loading", "Loading SmartAI scripts..."); + LOG_INFO("server.loading", "Loading SmartAI Scripts..."); sSmartScriptMgr->LoadSmartAIFromDB(); - LOG_INFO("server.loading", "Loading Calendar data..."); + LOG_INFO("server.loading", "Loading Calendar Data..."); sCalendarMgr->LoadFromDB(); - LOG_INFO("server.loading", "Initializing SpellInfo precomputed data..."); // must be called after loading items, professions, spells and pretty much anything + LOG_INFO("server.loading", "Initializing SpellInfo Precomputed Data..."); // must be called after loading items, professions, spells and pretty much anything LOG_INFO("server.loading", " "); sObjectMgr->InitializeSpellInfoPrecomputedData(); - LOG_INFO("server.loading", "Initialize commands..."); + LOG_INFO("server.loading", "Initialize Commands..."); Acore::ChatCommands::LoadCommandMap(); ///- Initialize game time and timers - LOG_INFO("server.loading", "Initialize game time and timers"); + LOG_INFO("server.loading", "Initialize Game Time and Timers"); LOG_INFO("server.loading", " "); LoginDatabase.Execute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES ({}, {}, 0, '{}')", @@ -2100,25 +2100,25 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Loading Warden Action Overrides..." ); sWardenCheckMgr->LoadWardenOverrides(); - LOG_INFO("server.loading", "Deleting expired bans..."); + LOG_INFO("server.loading", "Deleting Expired Bans..."); LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate <= UNIX_TIMESTAMP() AND unbandate<>bandate"); // One-time query - LOG_INFO("server.loading", "Calculate next daily quest reset time..."); + LOG_INFO("server.loading", "Calculate Next Daily Quest Reset Time..."); InitDailyQuestResetTime(); - LOG_INFO("server.loading", "Calculate next weekly quest reset time..." ); + LOG_INFO("server.loading", "Calculate Next Weekly Quest Reset Time..." ); InitWeeklyQuestResetTime(); - LOG_INFO("server.loading", "Calculate next monthly quest reset time..."); + LOG_INFO("server.loading", "Calculate Next Monthly Quest Reset Time..."); InitMonthlyQuestResetTime(); - LOG_INFO("server.loading", "Calculate random battleground reset time..." ); + LOG_INFO("server.loading", "Calculate Random Battleground Reset Time..." ); InitRandomBGResetTime(); - LOG_INFO("server.loading", "Calculate deletion of old calendar events time..."); + LOG_INFO("server.loading", "Calculate Deletion Of Old Calendar Events Time..."); InitCalendarOldEventsDeletionTime(); - LOG_INFO("server.loading", "Calculate Guild cap reset time..."); + LOG_INFO("server.loading", "Calculate Guild Cap Reset Time..."); LOG_INFO("server.loading", " "); InitGuildResetTime(); @@ -2141,7 +2141,7 @@ void World::SetInitialWorldSettings() if (sWorld->getBoolConfig(CONFIG_PRELOAD_ALL_NON_INSTANCED_MAP_GRIDS)) { - LOG_INFO("server.loading", "Loading all grids for all non-instanced maps..."); + LOG_INFO("server.loading", "Loading All Grids For All Non-Instanced Maps..."); for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) { @@ -2153,7 +2153,7 @@ void World::SetInitialWorldSettings() if (map) { - LOG_INFO("server.loading", ">> Loading all grids for map {}", map->GetId()); + LOG_INFO("server.loading", ">> Loading All Grids For Map {}", map->GetId()); map->LoadAllCells(); } } @@ -2163,15 +2163,15 @@ void World::SetInitialWorldSettings() uint32 startupDuration = GetMSTimeDiffToNow(startupBegin); LOG_INFO("server.loading", " "); - LOG_INFO("server.loading", "WORLD: World initialized in {} minutes {} seconds", (startupDuration / 60000), ((startupDuration % 60000) / 1000)); // outError for red color in console + LOG_INFO("server.loading", "WORLD: World Initialized In {} Minutes {} Seconds", (startupDuration / 60000), ((startupDuration % 60000) / 1000)); // outError for red color in console LOG_INFO("server.loading", " "); - METRIC_EVENT("events", "World initialized", "World initialized in " + std::to_string(startupDuration / 60000) + " minutes " + std::to_string((startupDuration % 60000) / 1000) + " seconds"); + METRIC_EVENT("events", "World initialized", "World Initialized In " + std::to_string(startupDuration / 60000) + " Minutes " + std::to_string((startupDuration % 60000) / 1000) + " Seconds"); if (sConfigMgr->isDryRun()) { sMapMgr->UnloadAll(); - LOG_INFO("server.loading", "AzerothCore dry run completed, terminating."); + LOG_INFO("server.loading", "AzerothCore Dry Run Completed, Terminating."); exit(0); } } @@ -2215,7 +2215,7 @@ void World::DetectDBCLang() m_defaultDbcLocale = LocaleConstant(default_locale); - LOG_INFO("server.loading", "Using {} DBC Locale as default. All available DBC locales: {}", localeNames[GetDefaultDbcLocale()], availableLocalsStr.empty() ? "" : availableLocalsStr); + LOG_INFO("server.loading", "Using {} DBC Locale As Default. All Available DBC locales: {}", localeNames[GetDefaultDbcLocale()], availableLocalsStr.empty() ? "" : availableLocalsStr); LOG_INFO("server.loading", " "); } @@ -2234,6 +2234,7 @@ void World::LoadAutobroadcasts() if (!result) { LOG_WARN("server.loading", ">> Loaded 0 autobroadcasts definitions. DB table `autobroadcast` is empty for this realm!"); + LOG_INFO("server.loading", " "); return; } @@ -2250,7 +2251,7 @@ void World::LoadAutobroadcasts() ++count; } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} autobroadcast definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} Autobroadcast Definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } @@ -3332,7 +3333,7 @@ void World::LoadWorldStates() m_worldstates[fields[0].Get()] = fields[1].Get(); } while (result->NextRow()); - LOG_INFO("server.loading", ">> Loaded {} world states in {} ms", m_worldstates.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded {} World States in {} ms", m_worldstates.size(), GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server.loading", " "); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index d4fb57363..bf0a762ab 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -50,6 +50,7 @@ enum Spells enum Misc { ACTION_CONSUME = 0, + ACTION_EXPLODE = 1, EMOTE_DEVOURED = 0, @@ -78,20 +79,20 @@ public: void EnterCombatWithTrio(Unit* who) { - if (Creature* vem = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_VEM))) + if (Creature* vem = instance->GetCreature(DATA_VEM)) if (vem->GetGUID() != me->GetGUID()) vem->GetAI()->AttackStart(who); - if (Creature* kri = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KRI))) + if (Creature* kri = instance->GetCreature(DATA_KRI)) if (kri->GetGUID() != me->GetGUID()) kri->GetAI()->AttackStart(who); - if (Creature* yauj = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_YAUJ))) + if (Creature* yauj = instance->GetCreature(DATA_YAUJ)) if (yauj->GetGUID() != me->GetGUID()) yauj->GetAI()->AttackStart(who); } void EvadeAllBosses(EvadeReason why) { - if (Creature* vem = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_VEM))) + if (Creature* vem = instance->GetCreature(DATA_VEM)) { if (vem->GetGUID() != me->GetGUID()) { @@ -102,7 +103,7 @@ public: } } - if (Creature* kri = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KRI))) + if (Creature* kri = instance->GetCreature(DATA_KRI)) { if (kri->GetGUID() != me->GetGUID()) { @@ -113,7 +114,7 @@ public: } } - if (Creature* yauj = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_YAUJ))) + if (Creature* yauj = instance->GetCreature(DATA_YAUJ)) { if (yauj->GetGUID() != me->GetGUID()) { @@ -127,14 +128,19 @@ public: void DoAction(int32 action) override { - if (action != ACTION_CONSUME || dying) + if (action == ACTION_CONSUME && !_dying) { - return; + _isEating = true; + me->SetSpeed(MOVE_RUN, 45.f / 7.f); // From sniffs + me->SetReactState(REACT_PASSIVE); + _scheduler.DelayAll(6s); } - isEating = true; - me->SetSpeed(MOVE_RUN, 45.f/7.f); // From sniffs - me->SetReactState(REACT_PASSIVE); + if (action == ACTION_EXPLODE && _dying) + { + DoCastSelf(SPELL_BLOODY_DEATH); + _dying = false; + } } void MovementInform(uint32 type, uint32 id) override @@ -145,12 +151,18 @@ public: me->GetMotionMaster()->MoveIdle(); me->SetSpeed(MOVE_RUN, 15.f/7.f); // From sniffs DoCastSelf(SPELL_FULL_HEAL, true); - DoResetThreat(); - isEating = false; + if (me->GetThreatMgr().GetThreatListSize()) + DoResetThreat(); + if (Creature* dying = instance->GetCreature(_creatureDying)) + { + dying->AI()->DoAction(ACTION_EXPLODE); + me->SetTarget(dying->GetGUID()); + } - _scheduler.Schedule(4s, [this](TaskContext /*context*/) + _scheduler.Schedule(2s, [this](TaskContext /*context*/) { me->SetReactState(REACT_AGGRESSIVE); + _isEating = false; if (Unit* target = me->GetVictim()) { me->GetMotionMaster()->Clear(); @@ -170,12 +182,11 @@ public: { BossAI::Reset(); _scheduler.CancelAll(); - dying = false; - isEating = false; + _dying = false; + _isEating = false; + _creatureDying = 0; instance->SetData(DATA_BUG_TRIO_DEATH, 0); me->SetSpeed(MOVE_RUN, 15.f / 7.f); // From sniffs - me->SetStandState(UNIT_STAND_STATE_STAND); - me->SetControlled(false, UNIT_STATE_ROOT); if (me->GetEntry() == NPC_VEM) { @@ -185,66 +196,71 @@ public: void UpdateAI(uint32 diff) override { - if (!UpdateVictim() || isEating || !CheckInRoom()) + if (!UpdateVictim() || !CheckInRoom()) return; _scheduler.Update(diff, [this] { - DoMeleeAttackIfReady(); + if (!_dying && !_isEating) + DoMeleeAttackIfReady(); }); } void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if (me->HealthBelowPctDamaged(1, damage) && instance->GetData(DATA_BUG_TRIO_DEATH) < 2 && who->GetGUID() != me->GetGUID() && !dying) + if (_dying && who->GetGUID() != me->GetGUID()) + damage = 0; + + if (me->HealthBelowPctDamaged(0, damage) && instance->GetData(DATA_BUG_TRIO_DEATH) < 2 && !_dying) { damage = 0; - if (isEating) + if (_isEating) return; _scheduler.CancelAll(); - me->SetStandState(UNIT_STAND_STATE_DEAD); me->SetReactState(REACT_PASSIVE); - me->SetControlled(true, UNIT_STATE_ROOT); - dying = true; - - DoFinalSpell(); - + _dying = true; + float x, y, z; // Move the other bugs to this bug position - if (Creature* vem = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_VEM))) + if (Creature* vem = instance->GetCreature(DATA_VEM)) { if (vem->GetGUID() != me->GetGUID()) { - vem->AI()->DoAction(ACTION_CONSUME); - vem->GetMotionMaster()->MovePoint(POINT_CONSUME, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); + if (vem->IsAlive()) + { + vem->AI()->DoAction(ACTION_CONSUME); + me->GetRandomContactPoint(vem, x, y, z); + vem->GetMotionMaster()->MovePoint(POINT_CONSUME, x, y, z); + } } + else _creatureDying = DATA_VEM; } - if (Creature* kri = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KRI))) + if (Creature* kri = instance->GetCreature(DATA_KRI)) { if (kri->GetGUID() != me->GetGUID()) { - kri->AI()->DoAction(ACTION_CONSUME); - kri->GetMotionMaster()->MovePoint(POINT_CONSUME, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); + if (kri->IsAlive()) + { + kri->AI()->DoAction(ACTION_CONSUME); + me->GetRandomContactPoint(kri, x, y, z); + kri->GetMotionMaster()->MovePoint(POINT_CONSUME, x, y, z); + } } + else _creatureDying = DATA_KRI; } - if (Creature* yauj = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_YAUJ))) + if (Creature* yauj = instance->GetCreature(DATA_YAUJ)) { if (yauj->GetGUID() != me->GetGUID()) { - yauj->AI()->DoAction(ACTION_CONSUME); - yauj->GetMotionMaster()->MovePoint(POINT_CONSUME, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); + if (yauj->IsAlive()) + { + yauj->AI()->DoAction(ACTION_CONSUME); + me->GetRandomContactPoint(yauj, x, y, z); + yauj->GetMotionMaster()->MovePoint(POINT_CONSUME, x, y, z); + } } + else _creatureDying = DATA_YAUJ; } - - _scheduler.Schedule(4s, [this](TaskContext /*context*/) - { - if (!me->IsInEvadeMode() && instance->GetData(DATA_BUG_TRIO_DEATH) < 2) - { - DoCastSelf(SPELL_BLOODY_DEATH, true); - Talk(EMOTE_DEVOURED); - me->DespawnOrUnsummon(1000); - } - }); } } @@ -274,10 +290,13 @@ public: void JustDied(Unit* killer) override { - if (killer->GetGUID() == me->GetGUID()) + instance->SetData(DATA_BUG_TRIO_DEATH, 1); + if (instance->GetData(DATA_BUG_TRIO_DEATH) < 3) { - instance->SetData(DATA_BUG_TRIO_DEATH, 1); me->RemoveDynamicFlag(UNIT_DYNFLAG_LOOTABLE); + DoFinalSpell(); + Talk(EMOTE_DEVOURED); + me->DespawnOrUnsummon(3000); return; } @@ -285,10 +304,13 @@ public: } TaskScheduler _scheduler; - bool dying; - bool isEating; + bool _dying; + bool _isEating; + static uint32 _creatureDying; }; +uint32 boss_bug_trio::_creatureDying = 0; + struct boss_kri : public boss_bug_trio { boss_kri(Creature* creature) : boss_bug_trio(creature) @@ -299,20 +321,20 @@ struct boss_kri : public boss_bug_trio { EnterCombatWithTrio(who); - _scheduler.Schedule(4s, 8s, [this](TaskContext context) + _scheduler.Schedule(7s, 18s, [this](TaskContext context) { DoCastVictim(SPELL_CLEAVE); - context.Repeat(5s, 12s); + context.Repeat(); }) - .Schedule(6s, 30s, [this](TaskContext context) + .Schedule(8s, 17s, [this](TaskContext context) { DoCastVictim(SPELL_TOXIC_VOLLEY); - context.Repeat(10s, 25s); + context.Repeat(); }) - .Schedule(6s, [this](TaskContext context) + .Schedule(7s, 16s, [this](TaskContext context) { DoCastVictim(SPELL_THRASH); - context.Repeat(2s, 6s); + context.Repeat(); }); } }; @@ -343,25 +365,17 @@ struct boss_vem : public boss_bug_trio { DoCast(target, SPELL_CHARGE); } - context.Repeat(8s, 16s); + context.Repeat(); }) - .Schedule(10s, 20s, [this](TaskContext context) + .Schedule(10s, 24s, [this](TaskContext context) { DoCastVictim(SPELL_KNOCKBACK); - context.Repeat(10s, 20s); + context.Repeat(); }) - .Schedule(5s, 8s, [this](TaskContext context) + .Schedule(10s, 23s, [this](TaskContext context) { DoCastVictim(SPELL_KNOCKDOWN); - context.Repeat(15s, 20s); - }) - .Schedule(1s, [this](TaskContext context) - { - if (instance->GetData(DATA_BUG_TRIO_DEATH) == 2 && !me->HasAura(SPELL_VENGEANCE)) // Vem is the only one left. - { - DoCastSelf(SPELL_VENGEANCE, true); - } - context.Repeat(1s); + context.Repeat(); }); } }; @@ -376,7 +390,7 @@ struct boss_yauj : public boss_bug_trio { EnterCombatWithTrio(who); - _scheduler.Schedule(20s, 30s, [this](TaskContext context) + _scheduler.Schedule(12100ms, [this](TaskContext context) { if (me->GetHealthPct() <= 93.f) { @@ -386,18 +400,20 @@ struct boss_yauj : public boss_bug_trio { DoCast(friendly, SPELL_HEAL); } - context.Repeat(10s, 30s); - }) - .Schedule(12s, 24s, [this](TaskContext context) - { - DoCastAOE(SPELL_FEAR); - DoResetThreat(); - context.Repeat(20s); + context.Repeat(); }) .Schedule(12s, [this](TaskContext context) { - DoCastVictim(SPELL_RAVAGE); - context.Repeat(10s, 15s); + DoCastAOE(SPELL_FEAR); + DoResetThreat(); + context.Repeat(20600ms); + }) + .Schedule(11s, 14500ms, [this](TaskContext context) + { + if (DoCastVictim(SPELL_RAVAGE) == SPELL_CAST_OK) + context.Repeat(10s, 15s); + else + context.Repeat(1200ms); }) .Schedule(10s, 30s, [this](TaskContext context) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 2d9bc3cc1..281d5f53b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -24,6 +24,9 @@ ObjectData const creatureData[] = { + { NPC_VEM, DATA_VEM }, + { NPC_KRI, DATA_KRI }, + { NPC_YAUJ, DATA_YAUJ }, { NPC_SARTURA, DATA_SARTURA }, { NPC_CTHUN, DATA_CTHUN }, { NPC_EYE_OF_CTHUN, DATA_EYE_OF_CTHUN }, @@ -62,9 +65,6 @@ public: } ObjectGuid SkeramGUID; - ObjectGuid VemGUID; - ObjectGuid KriGUID; - ObjectGuid YaujGUID; ObjectGuid CThunGUID; GuidVector CThunGraspGUIDs; @@ -86,15 +86,6 @@ public: case NPC_SKERAM: SkeramGUID = creature->GetGUID(); break; - case NPC_VEM: - VemGUID = creature->GetGUID(); - break; - case NPC_KRI: - KriGUID = creature->GetGUID(); - break; - case NPC_YAUJ: - YaujGUID = creature->GetGUID(); - break; case NPC_OURO_SPAWNER: if (GetBossState(DATA_OURO) != DONE) creature->Respawn(); @@ -194,12 +185,6 @@ public: { case DATA_SKERAM: return SkeramGUID; - case DATA_VEM: - return VemGUID; - case DATA_KRI: - return KriGUID; - case DATA_YAUJ: - return YaujGUID; } return ObjectGuid::Empty; } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 14123fedd..483e2657c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -241,94 +241,61 @@ class boss_anub_arak : public CreatureScript } }; -class spell_azjol_nerub_carrion_beetels : public SpellScriptLoader +class spell_azjol_nerub_carrion_beetels : public AuraScript { - public: - spell_azjol_nerub_carrion_beetels() : SpellScriptLoader("spell_azjol_nerub_carrion_beetels") { } + PrepareAuraScript(spell_azjol_nerub_carrion_beetels) - class spell_azjol_nerub_carrion_beetelsAuraScript : public AuraScript - { - PrepareAuraScript(spell_azjol_nerub_carrion_beetelsAuraScript) + void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) + { + // Xinef: 2 each second + GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_SUMMON_CARRION_BEETLES, true); + GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_SUMMON_CARRION_BEETLES, true); + } - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) - { - // Xinef: 2 each second - GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_SUMMON_CARRION_BEETLES, true); - GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_SUMMON_CARRION_BEETLES, true); - } - - void Register() override - { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_azjol_nerub_carrion_beetelsAuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - } - }; - - AuraScript *GetAuraScript() const override - { - return new spell_azjol_nerub_carrion_beetelsAuraScript(); - } + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_azjol_nerub_carrion_beetels::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } }; -class spell_azjol_nerub_pound : public SpellScriptLoader +class spell_azjol_nerub_pound : public SpellScript { - public: - spell_azjol_nerub_pound() : SpellScriptLoader("spell_azjol_nerub_pound") { } + PrepareSpellScript(spell_azjol_nerub_pound); - class spell_azjol_nerub_pound_SpellScript : public SpellScript - { - PrepareSpellScript(spell_azjol_nerub_pound_SpellScript); + void HandleApplyAura(SpellEffIndex /*effIndex*/) + { + if (Unit* unitTarget = GetHitUnit()) + GetCaster()->CastSpell(unitTarget, SPELL_POUND_DAMAGE, true); + } - void HandleApplyAura(SpellEffIndex /*effIndex*/) - { - if (Unit* unitTarget = GetHitUnit()) - GetCaster()->CastSpell(unitTarget, SPELL_POUND_DAMAGE, true); - } - - void Register() override - { - OnEffectHitTarget += SpellEffectFn(spell_azjol_nerub_pound_SpellScript::HandleApplyAura, EFFECT_0, SPELL_EFFECT_APPLY_AURA); - } - }; - - SpellScript* GetSpellScript() const override - { - return new spell_azjol_nerub_pound_SpellScript(); - } + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_azjol_nerub_pound::HandleApplyAura, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + } }; -class spell_azjol_nerub_impale_summon : public SpellScriptLoader +class spell_azjol_nerub_impale_summon : public SpellScript { - public: - spell_azjol_nerub_impale_summon() : SpellScriptLoader("spell_azjol_nerub_impale_summon") { } + PrepareSpellScript(spell_azjol_nerub_impale_summon); - class spell_azjol_nerub_impale_summon_SpellScript : public SpellScript - { - PrepareSpellScript(spell_azjol_nerub_impale_summon_SpellScript); + void SetDest(SpellDestination& dest) + { + // Adjust effect summon position + float floorZ = GetCaster()->GetMapHeight(GetCaster()->GetPositionX(), GetCaster()->GetPositionY(), GetCaster()->GetPositionZ(), true); + if (floorZ > INVALID_HEIGHT) + dest._position.m_positionZ = floorZ; + } - void SetDest(SpellDestination& dest) - { - // Adjust effect summon position - float floorZ = GetCaster()->GetMapHeight(GetCaster()->GetPositionX(), GetCaster()->GetPositionY(), GetCaster()->GetPositionZ(), true); - if (floorZ > INVALID_HEIGHT) - dest._position.m_positionZ = floorZ; - } - - void Register() override - { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_azjol_nerub_impale_summon_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); - } - }; - - SpellScript* GetSpellScript() const override - { - return new spell_azjol_nerub_impale_summon_SpellScript(); - } + void Register() override + { + OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_azjol_nerub_impale_summon::SetDest, EFFECT_0, TARGET_DEST_CASTER); + } }; void AddSC_boss_anub_arak() { new boss_anub_arak(); - new spell_azjol_nerub_carrion_beetels(); - new spell_azjol_nerub_pound(); - new spell_azjol_nerub_impale_summon(); + RegisterSpellScript(spell_azjol_nerub_carrion_beetels); + RegisterSpellScript(spell_azjol_nerub_pound); + RegisterSpellScript(spell_azjol_nerub_impale_summon); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index d3957d00a..3476fb1e3 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -31,6 +31,11 @@ #include "SpellScript.h" #include "WorldSession.h" +enum MassiveSeaforiumCharge +{ + ITEM_MASSIVE_SEAFORIUM_CHARGE = 39213, +}; + class spell_item_massive_seaforium_charge : public SpellScript { PrepareSpellScript(spell_item_massive_seaforium_charge); @@ -41,7 +46,7 @@ class spell_item_massive_seaforium_charge : public SpellScript return; Player* target = GetHitUnit()->ToPlayer(); - target->DestroyItemCount(39213, 1, true); + target->DestroyItemCount(ITEM_MASSIVE_SEAFORIUM_CHARGE, 1, true); } void Register() override @@ -136,6 +141,11 @@ class spell_item_mind_amplify_dish : public SpellScript } }; +enum RunescrollOfFortitude +{ + SPELL_FORTITUDE = 72590, +}; + class spell_item_runescroll_of_fortitude : public SpellScript { PrepareSpellScript(spell_item_runescroll_of_fortitude) @@ -149,7 +159,7 @@ class spell_item_runescroll_of_fortitude : public SpellScript if (target->getLevel() < 70) return; - target->CastSpell(target, 72590, true); // Stamina spell (Fortitude) + target->CastSpell(target, SPELL_FORTITUDE, true); } } @@ -159,6 +169,12 @@ class spell_item_runescroll_of_fortitude : public SpellScript } }; +enum BrannsCommunicator +{ + NPC_BRANN_BRONZEBEARD = 29579, + SPELL_CONTACT_BRANN = 55038, +}; + class spell_item_branns_communicator : public SpellScript { PrepareSpellScript(spell_item_branns_communicator) @@ -169,8 +185,8 @@ class spell_item_branns_communicator : public SpellScript if (Player* target = GetHitPlayer()) { - target->KilledMonsterCredit(29579); // Brann's entry - target->CastSpell(target, 55038, true); // Brann summoning spell + target->KilledMonsterCredit(NPC_BRANN_BRONZEBEARD); // Brann's entry + target->CastSpell(target, SPELL_CONTACT_BRANN, true); // Brann summoning spell } } @@ -2301,6 +2317,7 @@ enum Shadowmourne SPELL_SHADOWMOURNE_VISUAL_LOW = 72521, SPELL_SHADOWMOURNE_VISUAL_HIGH = 72523, SPELL_SHADOWMOURNE_CHAOS_BANE_BUFF = 73422, + SPELL_BLOOD_PLAGUE = 55078, }; // 71903 - Item - Shadowmourne Legendary @@ -2336,7 +2353,7 @@ class spell_item_shadowmourne : public AuraScript } else if (procSpell->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT) { - if (procSpell->Id != 55078 /*Blood Plague*/) + if (procSpell->Id != SPELL_BLOOD_PLAGUE) return false; } } diff --git a/src/tools/vmap4_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp index d074fd3d2..f52d5b3a6 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq.cpp +++ b/src/tools/vmap4_extractor/mpq_libmpq.cpp @@ -18,6 +18,7 @@ #include "mpq_libmpq04.h" #include #include +#include ArchiveSet gOpenArchives; @@ -53,6 +54,11 @@ MPQArchive::MPQArchive(const char* filename) gOpenArchives.push_front(this); } +bool MPQArchive::isOpened() const +{ + return std::find(gOpenArchives.begin(), gOpenArchives.end(), this) != gOpenArchives.end(); +} + void MPQArchive::close() { //gOpenArchives.erase(erase(&mpq_a); diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h index 5e57d9a5a..0530a31f3 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq04.h +++ b/src/tools/vmap4_extractor/mpq_libmpq04.h @@ -34,7 +34,7 @@ public: mpq_archive_s* mpq_a; MPQArchive(const char* filename); - void close(); + ~MPQArchive() { if (isOpened()) close(); } void GetFileListTo(vector& filelist) { @@ -65,6 +65,10 @@ public: delete[] buffer; } + +private: + void close(); + bool isOpened() const; }; typedef std::deque ArchiveSet; @@ -95,13 +99,8 @@ public: inline void flipcc(char* fcc) { - char t; - t = fcc[0]; - fcc[0] = fcc[3]; - fcc[3] = t; - t = fcc[1]; - fcc[1] = fcc[2]; - fcc[2] = t; + std::swap(fcc[0], fcc[3]); + std::swap(fcc[1], fcc[2]); } #endif