From e9c71c8ebefc067e3119a2a1a63b74c3239cc55c Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 15 Oct 2021 08:26:57 +0000 Subject: [PATCH] chore(DB): import pending files Referenced commit(s): bc82f36f1ff46bb21d32e1cfdaec8271dde08af1 --- acore.json | 2 +- data/sql/updates/db_world/2021_10_15_00.sql | 36 ++++++++++++ .../rev_1634136291669439800.sql | 10 ---- doc/changelog/master.md | 58 +++++++++++++++++++ .../pendings/changes_1626351320866318500.md | 53 ----------------- 5 files changed, 95 insertions(+), 64 deletions(-) create mode 100644 data/sql/updates/db_world/2021_10_15_00.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1634136291669439800.sql delete mode 100644 doc/changelog/pendings/changes_1626351320866318500.md diff --git a/acore.json b/acore.json index c7caeadfe..e3e437ac3 100644 --- a/acore.json +++ b/acore.json @@ -1,5 +1,5 @@ { "name": "azerothcore-wotlk", - "version": "4.0.0-dev.12", + "version": "4.0.0-dev.13", "license": "AGPL3" } diff --git a/data/sql/updates/db_world/2021_10_15_00.sql b/data/sql/updates/db_world/2021_10_15_00.sql new file mode 100644 index 000000000..2616e1424 --- /dev/null +++ b/data/sql/updates/db_world/2021_10_15_00.sql @@ -0,0 +1,36 @@ +-- DB update 2021_10_14_12 -> 2021_10_15_00 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +SELECT COUNT(*) INTO @COLEXISTS +FROM information_schema.COLUMNS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_10_14_12'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2021_10_14_12 2021_10_15_00 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1634136291669439800'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- + +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1634136291669439800'); + +-- Flee && Call for Help +DELETE FROM `acore_string` WHERE `entry` IN (5030, 5035); + +-- Vaelastrasz boss fight +-- Nefarian texts +DELETE FROM `creature_text` WHERE `CreatureID`=10162 AND `GroupID`=14 AND `ID`=0; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10162, 14, 0, 'Ah...the heroes. You are persistent, aren''t you? Your ally here attempted to match his power against mine - and paid the price. Now he shall serve me...by slaughtering you. Get up, little red wyrm...and destroy them!', 14, 0, 100, 23, 0, 8279, 100003, 0, 'Lord Victor Nefarius SAY_NEFARIAN_VAEL_INTRO (BWL)'); + +-- +-- END UPDATING QUERIES +-- +UPDATE version_db_world SET date = '2021_10_15_00' WHERE sql_rev = '1634136291669439800'; +COMMIT; +END // +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1634136291669439800.sql b/data/sql/updates/pending_db_world/rev_1634136291669439800.sql deleted file mode 100644 index 1eae92491..000000000 --- a/data/sql/updates/pending_db_world/rev_1634136291669439800.sql +++ /dev/null @@ -1,10 +0,0 @@ -INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1634136291669439800'); - --- Flee && Call for Help -DELETE FROM `acore_string` WHERE `entry` IN (5030, 5035); - --- Vaelastrasz boss fight --- Nefarian texts -DELETE FROM `creature_text` WHERE `CreatureID`=10162 AND `GroupID`=14 AND `ID`=0; -INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES -(10162, 14, 0, 'Ah...the heroes. You are persistent, aren''t you? Your ally here attempted to match his power against mine - and paid the price. Now he shall serve me...by slaughtering you. Get up, little red wyrm...and destroy them!', 14, 0, 100, 23, 0, 8279, 100003, 0, 'Lord Victor Nefarius SAY_NEFARIAN_VAEL_INTRO (BWL)'); diff --git a/doc/changelog/master.md b/doc/changelog/master.md index 0b205051e..bdb9bff07 100644 --- a/doc/changelog/master.md +++ b/doc/changelog/master.md @@ -1,3 +1,61 @@ +## 4.0.0-dev.13 | Commit: [bc82f36f1ff46bb21d32e1cfdaec8271dde08af1 +](https://github.com/azerothcore/azerothcore-wotlk/commit/bc82f36f1ff46bb21d32e1cfdaec8271dde08af1 + + +### Added + +```cpp +// Unit.cpp + virtual void Talk(std::string_view text, ChatMsg msgType, Language language, float textRange, WorldObject const* target); + virtual void Say(std::string_view text, Language language, WorldObject const* target = nullptr); + virtual void Yell(std::string_view text, Language language, WorldObject const* target = nullptr); + virtual void TextEmote(std::string_view text, WorldObject const* target = nullptr, bool isBossEmote = false); + virtual void Whisper(std::string_view text, Language language, Player* target, bool isBossWhisper = false); + virtual void Talk(uint32 textId, ChatMsg msgType, float textRange, WorldObject const* target); + virtual void Say(uint32 textId, WorldObject const* target = nullptr); + virtual void Yell(uint32 textId, WorldObject const* target = nullptr); + virtual void TextEmote(uint32 textId, WorldObject const* target = nullptr, bool isBossEmote = false); + virtual void Whisper(uint32 textId, Player* target, bool isBossWhisper = false); +``` + +### Removed + +```cpp +// Object.cpp + void MonsterSay(const char* text, uint32 language, WorldObject const* target); + void MonsterYell(const char* text, uint32 language, WorldObject const* target); + void MonsterTextEmote(const char* text, WorldObject const* target, bool IsBossEmote = false); + void MonsterWhisper(const char* text, Player const* target, bool IsBossWhisper = false); + void MonsterSay(int32 textId, uint32 language, WorldObject const* target); + void MonsterYell(int32 textId, uint32 language, WorldObject const* target); + void MonsterTextEmote(int32 textId, WorldObject const* target, bool IsBossEmote = false); + void MonsterWhisper(int32 textId, Player const* target, bool IsBossWhisper = false); + + void SendPlaySound(uint32 Sound, bool OnlySelf); +``` + +### How to upgrade + +```diff +- creature->MonsterSay(text, LANG_XXX, nullptr); ++ creature->Say(text, LANG_XXX); + +- creature->MonsterTextEmote(text, 0); ++ creature->TextEmote(text); + +- creature->MonsterWhisper(text, receiver); ++ creature->Whisper(text, LANG_XXX, receiver); + +- creature->MonsterYell(text, LANG_XXX, NULL); ++ creature->Yell(text, LANG_XXX); + +- creature->MonsterWhisper(text, target, isBossWhisper); ++ creature->Whisper(text, LANG_XXX, target, isBossWhisper); + +- SendPlaySound(uint32 Sound, bool OnlySelf); + PlayDirectSound(uint32 sound_id, Player* target = nullptr); +``` + ## 4.0.0-dev.12 | Commit: [bcec4191e43de8a7b57a4219d6baaa7c5e3dfaf1 ](https://github.com/azerothcore/azerothcore-wotlk/commit/bcec4191e43de8a7b57a4219d6baaa7c5e3dfaf1 diff --git a/doc/changelog/pendings/changes_1626351320866318500.md b/doc/changelog/pendings/changes_1626351320866318500.md deleted file mode 100644 index 667fac3dd..000000000 --- a/doc/changelog/pendings/changes_1626351320866318500.md +++ /dev/null @@ -1,53 +0,0 @@ -### Added - -```cpp -// Unit.cpp - virtual void Talk(std::string_view text, ChatMsg msgType, Language language, float textRange, WorldObject const* target); - virtual void Say(std::string_view text, Language language, WorldObject const* target = nullptr); - virtual void Yell(std::string_view text, Language language, WorldObject const* target = nullptr); - virtual void TextEmote(std::string_view text, WorldObject const* target = nullptr, bool isBossEmote = false); - virtual void Whisper(std::string_view text, Language language, Player* target, bool isBossWhisper = false); - virtual void Talk(uint32 textId, ChatMsg msgType, float textRange, WorldObject const* target); - virtual void Say(uint32 textId, WorldObject const* target = nullptr); - virtual void Yell(uint32 textId, WorldObject const* target = nullptr); - virtual void TextEmote(uint32 textId, WorldObject const* target = nullptr, bool isBossEmote = false); - virtual void Whisper(uint32 textId, Player* target, bool isBossWhisper = false); -``` - -### Removed - -```cpp -// Object.cpp - void MonsterSay(const char* text, uint32 language, WorldObject const* target); - void MonsterYell(const char* text, uint32 language, WorldObject const* target); - void MonsterTextEmote(const char* text, WorldObject const* target, bool IsBossEmote = false); - void MonsterWhisper(const char* text, Player const* target, bool IsBossWhisper = false); - void MonsterSay(int32 textId, uint32 language, WorldObject const* target); - void MonsterYell(int32 textId, uint32 language, WorldObject const* target); - void MonsterTextEmote(int32 textId, WorldObject const* target, bool IsBossEmote = false); - void MonsterWhisper(int32 textId, Player const* target, bool IsBossWhisper = false); - - void SendPlaySound(uint32 Sound, bool OnlySelf); -``` - -### How to upgrade - -```diff -- creature->MonsterSay(text, LANG_XXX, nullptr); -+ creature->Say(text, LANG_XXX); - -- creature->MonsterTextEmote(text, 0); -+ creature->TextEmote(text); - -- creature->MonsterWhisper(text, receiver); -+ creature->Whisper(text, LANG_XXX, receiver); - -- creature->MonsterYell(text, LANG_XXX, NULL); -+ creature->Yell(text, LANG_XXX); - -- creature->MonsterWhisper(text, target, isBossWhisper); -+ creature->Whisper(text, LANG_XXX, target, isBossWhisper); - -- SendPlaySound(uint32 Sound, bool OnlySelf); - PlayDirectSound(uint32 sound_id, Player* target = nullptr); -```