From 370df76016608869654a1c4966697618e5b8ea0c Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sat, 28 Jul 2018 12:59:44 +0200 Subject: [PATCH 001/102] Scripts/Misc: Use InstanceMap* in InstanceScript instead of Map* --- src/server/game/Instances/InstanceScript.cpp | 2 +- src/server/game/Instances/InstanceScript.h | 6 +++--- .../BlackrockCaverns/instance_blackrock_caverns.cpp | 3 +-- .../BlackrockDepths/instance_blackrock_depths.cpp | 2 +- .../BlackwingLair/instance_blackwing_lair.cpp | 2 +- .../BlackrockMountain/MoltenCore/instance_molten_core.cpp | 2 +- .../EasternKingdoms/Deadmines/instance_deadmines.cpp | 2 +- .../EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp | 2 +- .../scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp | 2 +- .../MagistersTerrace/instance_magisters_terrace.cpp | 2 +- .../ScarletMonastery/instance_scarlet_monastery.cpp | 2 +- .../EasternKingdoms/Scholomance/instance_scholomance.cpp | 2 +- .../ShadowfangKeep/instance_shadowfang_keep.cpp | 2 +- .../EasternKingdoms/Stratholme/instance_stratholme.cpp | 2 +- .../EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp | 2 +- .../SunwellPlateau/instance_sunwell_plateau.cpp | 2 +- .../EasternKingdoms/TheStockade/instance_the_stockade.cpp | 3 +-- .../scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp | 2 +- .../scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp | 3 +-- .../BlackfathomDeeps/instance_blackfathom_deeps.cpp | 2 +- .../CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp | 2 +- .../CullingOfStratholme/instance_culling_of_stratholme.cpp | 2 +- .../EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp | 2 +- .../TheBlackMorass/instance_the_black_morass.cpp | 2 +- src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp | 3 +-- .../instance_lost_city_of_the_tolvir.cpp | 2 +- src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp | 3 +-- .../scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp | 2 +- .../Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp | 3 +-- .../Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp | 2 +- .../Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp | 2 +- .../Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp | 3 +-- .../TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp | 3 +-- .../Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp | 2 +- .../Kalimdor/WailingCaverns/instance_wailing_caverns.cpp | 2 +- .../scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp | 2 +- .../scripts/Maelstrom/Stonecore/instance_stonecore.cpp | 2 +- .../Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp | 2 +- .../AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp | 3 +-- .../ObsidianSanctum/instance_obsidian_sanctum.cpp | 3 +-- .../TrialOfTheChampion/instance_trial_of_the_champion.cpp | 2 +- .../TrialOfTheCrusader/instance_trial_of_the_crusader.cpp | 2 +- .../Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp | 2 +- .../FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp | 2 +- .../HallsOfReflection/instance_halls_of_reflection.cpp | 2 +- .../FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp | 2 +- src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp | 2 +- .../scripts/Northrend/Naxxramas/instance_naxxramas.cpp | 2 +- .../Nexus/EyeOfEternity/instance_eye_of_eternity.cpp | 2 +- src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp | 2 +- .../scripts/Northrend/Nexus/Oculus/instance_oculus.cpp | 2 +- .../Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp | 2 +- .../Ulduar/HallsOfStone/instance_halls_of_stone.cpp | 2 +- .../UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp | 3 +-- .../UtgardePinnacle/instance_utgarde_pinnacle.cpp | 3 +-- .../VaultOfArchavon/instance_vault_of_archavon.cpp | 3 +-- .../scripts/Northrend/VioletHold/instance_violet_hold.cpp | 2 +- .../Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp | 3 +-- .../Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp | 3 +-- .../Auchindoun/SethekkHalls/instance_sethekk_halls.cpp | 3 +-- .../ShadowLabyrinth/instance_shadow_labyrinth.cpp | 2 +- .../scripts/Outland/BlackTemple/instance_black_temple.cpp | 3 +-- .../SerpentShrine/instance_serpent_shrine.cpp | 2 +- .../CoilfangReservoir/SteamVault/instance_steam_vault.cpp | 3 +-- .../TheSlavePens/instance_the_slave_pens.cpp | 3 +-- .../CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp | 3 +-- .../scripts/Outland/GruulsLair/instance_gruuls_lair.cpp | 3 +-- .../HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp | 2 +- .../HellfireRamparts/instance_hellfire_ramparts.cpp | 2 +- .../MagtheridonsLair/instance_magtheridons_lair.cpp | 2 +- .../ShatteredHalls/instance_shattered_halls.cpp | 2 +- .../scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp | 3 +-- .../Outland/TempestKeep/Mechanar/instance_mechanar.cpp | 3 +-- .../Outland/TempestKeep/arcatraz/instance_arcatraz.cpp | 3 +-- .../Outland/TempestKeep/botanica/instance_the_botanica.cpp | 3 +-- 75 files changed, 77 insertions(+), 102 deletions(-) diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 19071c3350..a19c22b1df 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -47,7 +47,7 @@ BossBoundaryData::~BossBoundaryData() delete it->Boundary; } -InstanceScript::InstanceScript(Map* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetSpawnGroupsForInstance(map->GetId())) +InstanceScript::InstanceScript(InstanceMap* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetSpawnGroupsForInstance(map->GetId())) { #ifdef TRINITY_API_USE_DYNAMIC_LINKING uint32 scriptId = sObjectMgr->GetInstanceTemplate(map->GetId())->ScriptId; diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 25a104b954..c891e93a79 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -35,7 +35,7 @@ class AreaBoundary; class Creature; class GameObject; struct InstanceSpawnGroupInfo; -class Map; +class InstanceMap; class ModuleReference; class Player; class Unit; @@ -149,11 +149,11 @@ typedef std::map ObjectInfoMap; class TC_GAME_API InstanceScript : public ZoneScript { public: - explicit InstanceScript(Map* map); + explicit InstanceScript(InstanceMap* map); virtual ~InstanceScript() { } - Map* instance; + InstanceMap* instance; // On creation, NOT load. // PLEASE INITIALIZE FIELDS IN THE CONSTRUCTOR INSTEAD !!! diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp index daabf15b4e..dc779a50b7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "blackrock_caverns.h" #include "InstanceScript.h" -#include "Map.h" ObjectData const creatureData[] = { @@ -33,7 +32,7 @@ class instance_blackrock_caverns : public InstanceMapScript struct instance_blackrock_caverns_InstanceMapScript : public InstanceScript { - instance_blackrock_caverns_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackrock_caverns_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index 6ad7a86fe7..0665cbc804 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -82,7 +82,7 @@ public: struct instance_blackrock_depths_InstanceMapScript : public InstanceScript { - instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackrock_depths_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&encounter, 0, sizeof(encounter)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index 52d8ff2ec9..259d1cea0a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -72,7 +72,7 @@ public: struct instance_blackwing_lair_InstanceMapScript : public InstanceScript { - instance_blackwing_lair_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackwing_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp index 25bd449886..267975b138 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -48,7 +48,7 @@ class instance_molten_core : public InstanceMapScript struct instance_molten_core_InstanceMapScript : public InstanceScript { - instance_molten_core_InstanceMapScript(Map* map) : InstanceScript(map) + instance_molten_core_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTER); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index ef6455bbf0..de24f8f5cc 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -53,7 +53,7 @@ class instance_deadmines : public InstanceMapScript struct instance_deadmines_InstanceMapScript : public InstanceScript { - instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) + instance_deadmines_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 452621cef0..29a778714d 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -33,7 +33,7 @@ public: struct instance_gnomeregan_InstanceMapScript : public InstanceScript { - instance_gnomeregan_InstanceMapScript(Map* map) : InstanceScript(map) + instance_gnomeregan_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 2e071ae287..274d54c41f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -65,7 +65,7 @@ public: struct instance_karazhan_InstanceMapScript : public InstanceScript { - instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map) + instance_karazhan_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index aa844e8812..d4b5ea5a67 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -52,7 +52,7 @@ class instance_magisters_terrace : public InstanceMapScript struct instance_magisters_terrace_InstanceMapScript : public InstanceScript { - instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) + instance_magisters_terrace_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 111c37f5a8..b01e33734e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -35,7 +35,7 @@ class instance_scarlet_monastery : public InstanceMapScript struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript { - instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map) + instance_scarlet_monastery_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index c531ba43fa..586c263c9a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -31,7 +31,7 @@ class instance_scholomance : public InstanceMapScript struct instance_scholomance_InstanceMapScript : public InstanceScript { - instance_scholomance_InstanceMapScript(Map* map) : InstanceScript(map) + instance_scholomance_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index c1747adf61..6a0abe5dbf 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -76,7 +76,7 @@ public: struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript { - instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) + instance_shadowfang_keep_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 67d3de21fd..461209aaf6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -57,7 +57,7 @@ class instance_stratholme : public InstanceMapScript struct instance_stratholme_InstanceMapScript : public InstanceScript { - instance_stratholme_InstanceMapScript(Map* map) : InstanceScript(map) + instance_stratholme_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 73ad97c144..abd42e8bb2 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -65,7 +65,7 @@ public: struct instance_sunken_temple_InstanceMapScript : public InstanceScript { - instance_sunken_temple_InstanceMapScript(Map* map) : InstanceScript(map) + instance_sunken_temple_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); State = 0; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 4ff586020e..b5274949b7 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -51,7 +51,7 @@ class instance_sunwell_plateau : public InstanceMapScript struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript { - instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map) + instance_sunwell_plateau_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp index 7887341e18..44b94ab840 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" #include "the_stockade.h" class instance_the_stockade : public InstanceMapScript @@ -27,7 +26,7 @@ public: struct instance_the_stockade_InstanceMapScript : public InstanceScript { - instance_the_stockade_InstanceMapScript(Map* map) : InstanceScript(map) + instance_the_stockade_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 1226c8911e..640bd60fea 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -60,7 +60,7 @@ class instance_uldaman : public InstanceMapScript struct instance_uldaman_InstanceMapScript : public InstanceScript { - instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) + instance_uldaman_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 91ef8a5e7d..c3def29dba 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -20,7 +20,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "zulgurub.h" DoorData const doorData[] = @@ -40,7 +39,7 @@ class instance_zulgurub : public InstanceMapScript struct instance_zulgurub_InstanceMapScript : public InstanceScript { - instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map) + instance_zulgurub_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index ae9d2a3124..3d5a35e777 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -54,7 +54,7 @@ public: struct instance_blackfathom_deeps_InstanceMapScript : public InstanceScript { - instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackfathom_deeps_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 6a435318ee..39197ee1e4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -61,7 +61,7 @@ public: struct instance_mount_hyjal_InstanceMapScript : public InstanceScript { - instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) + instance_mount_hyjal_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); LoadObjectData(creatureData, nullptr); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index e442af3c59..4702c3c908 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -60,7 +60,7 @@ class instance_culling_of_stratholme : public InstanceMapScript struct instance_culling_of_stratholme_InstanceMapScript : public InstanceScript { - instance_culling_of_stratholme_InstanceMapScript(Map* map) : InstanceScript(map) + instance_culling_of_stratholme_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 5302e7d4a2..4a6294f823 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -49,7 +49,7 @@ public: struct instance_old_hillsbrad_InstanceMapScript : public InstanceScript { - instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map) + instance_old_hillsbrad_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 1df6ad1e35..0993dbfd98 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -77,7 +77,7 @@ public: struct instance_the_black_morass_InstanceMapScript : public InstanceScript { - instance_the_black_morass_InstanceMapScript(Map* map) : InstanceScript(map) + instance_the_black_morass_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); Clear(); diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 0da7953208..add1ed5f79 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -24,7 +24,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" // Bosses (East) // 0 - Pusillin @@ -58,7 +57,7 @@ public: struct instance_dire_maul_InstanceMapScript : public InstanceScript { - instance_dire_maul_InstanceMapScript(Map* map) : InstanceScript(map) + instance_dire_maul_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetBossNumber(EncounterCount); } diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp index fe59ecd53a..a33be3a179 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp @@ -71,7 +71,7 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript struct instance_lost_city_of_the_tolvir_InstanceMapScript : public InstanceScript { - instance_lost_city_of_the_tolvir_InstanceMapScript(Map* map) : InstanceScript(map) + instance_lost_city_of_the_tolvir_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index e796309cfc..6c8f3e0e23 100644 --- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -24,7 +24,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" class instance_maraudon : public InstanceMapScript { @@ -38,7 +37,7 @@ public: struct instance_maraudon_InstanceMapScript : public InstanceScript { - instance_maraudon_InstanceMapScript(Map* map) : InstanceScript(map) { } + instance_maraudon_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } }; }; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 38a72738af..0580aee6ff 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -47,7 +47,7 @@ public: struct instance_onyxias_lair_InstanceMapScript : public InstanceScript { - instance_onyxias_lair_InstanceMapScript(Map* map) : InstanceScript(map) + instance_onyxias_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp index bef26ca086..4d65402990 100644 --- a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp +++ b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp @@ -24,7 +24,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" class instance_ragefire_chasm : public InstanceMapScript { @@ -38,7 +37,7 @@ public: struct instance_ragefire_chasm_InstanceMapScript : public InstanceScript { - instance_ragefire_chasm_InstanceMapScript(Map* map) : InstanceScript(map) { } + instance_ragefire_chasm_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } }; }; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 1187075dee..eb9e4ecef7 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -52,7 +52,7 @@ public: struct instance_razorfen_downs_InstanceMapScript : public InstanceScript { - instance_razorfen_downs_InstanceMapScript(Map* map) : InstanceScript(map) + instance_razorfen_downs_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 9a141e95db..94e46df2a7 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -40,7 +40,7 @@ public: struct instance_razorfen_kraul_InstanceMapScript : public InstanceScript { - instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map) + instance_razorfen_kraul_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); WardKeeperDeath = 0; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index 0ee0bdc24d..85b9363bdc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "ruins_of_ahnqiraj.h" class instance_ruins_of_ahnqiraj : public InstanceMapScript @@ -28,7 +27,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript struct instance_ruins_of_ahnqiraj_InstanceMapScript : public InstanceScript { - instance_ruins_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) + instance_ruins_of_ahnqiraj_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(NUM_ENCOUNTER); 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 f507965d9e..3621e7047e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -26,7 +26,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "temple_of_ahnqiraj.h" class instance_temple_of_ahnqiraj : public InstanceMapScript @@ -36,7 +35,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript { - instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) + instance_temple_of_ahnqiraj_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); IsBossDied[0] = false; diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp index 74f6e47986..ea2e4f770c 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/instance_vortex_pinnacle.cpp @@ -97,7 +97,7 @@ class instance_vortex_pinnacle : public InstanceMapScript struct instance_vortex_pinnacle_InstanceScript : public InstanceScript { - instance_vortex_pinnacle_InstanceScript(Map* map) : InstanceScript(map) + instance_vortex_pinnacle_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTER); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index a74f1ad080..a5ef45698e 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -45,7 +45,7 @@ public: struct instance_wailing_caverns_InstanceMapScript : public InstanceScript { - instance_wailing_caverns_InstanceMapScript(Map* map) : InstanceScript(map) + instance_wailing_caverns_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 310cd5dac0..d72620b63f 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -105,7 +105,7 @@ public: struct instance_zulfarrak_InstanceMapScript : public InstanceScript { - instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map) + instance_zulfarrak_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); GahzRillaEncounter = NOT_STARTED; diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp index b5740ce118..d652eba6b0 100644 --- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp @@ -53,7 +53,7 @@ class instance_stonecore : public InstanceMapScript struct instance_stonecore_InstanceScript : public InstanceScript { - instance_stonecore_InstanceScript(Map* map) : InstanceScript(map) + instance_stonecore_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTER); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index fbafafa5d3..93855d0bf1 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -39,7 +39,7 @@ class instance_ahnkahet : public InstanceMapScript struct instance_ahnkahet_InstanceScript : public InstanceScript { - instance_ahnkahet_InstanceScript(Map* map) : InstanceScript(map) + instance_ahnkahet_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 077e818930..c09a03641a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -21,7 +21,6 @@ #include "Creature.h" #include "CreatureAI.h" #include "InstanceScript.h" -#include "Map.h" DoorData const doorData[] = { @@ -64,7 +63,7 @@ class instance_azjol_nerub : public InstanceMapScript struct instance_azjol_nerub_InstanceScript : public InstanceScript { - instance_azjol_nerub_InstanceScript(Map* map) : InstanceScript(map) + instance_azjol_nerub_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 2a844a5af9..69f78d1304 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -19,7 +19,6 @@ #include "AreaBoundary.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "obsidian_sanctum.h" /* Obsidian Sanctum encounters: @@ -38,7 +37,7 @@ public: struct instance_obsidian_sanctum_InstanceMapScript : public InstanceScript { - instance_obsidian_sanctum_InstanceMapScript(Map* map) : InstanceScript(map) + instance_obsidian_sanctum_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index ecdfa11e2f..e596840d40 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -41,7 +41,7 @@ public: struct instance_trial_of_the_champion_InstanceMapScript : public InstanceScript { - instance_trial_of_the_champion_InstanceMapScript(Map* map) : InstanceScript(map) + instance_trial_of_the_champion_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); uiMovementDone = 0; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index dcf586ec21..fba795e1d8 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -43,7 +43,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript struct instance_trial_of_the_crusader_InstanceMapScript : public InstanceScript { - instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map) + instance_trial_of_the_crusader_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTERS); diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 47e1a9875e..25feb64f63 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -29,7 +29,7 @@ class instance_drak_tharon_keep : public InstanceMapScript struct instance_drak_tharon_keep_InstanceScript : public InstanceScript { - instance_drak_tharon_keep_InstanceScript(Map* map) : InstanceScript(map) + instance_drak_tharon_keep_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 79c4d166e8..b797097c8d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -37,7 +37,7 @@ class instance_forge_of_souls : public InstanceMapScript struct instance_forge_of_souls_InstanceScript : public InstanceScript { - instance_forge_of_souls_InstanceScript(Map* map) : InstanceScript(map) + instance_forge_of_souls_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 4149e59584..d62e7703f0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -86,7 +86,7 @@ class instance_halls_of_reflection : public InstanceMapScript struct instance_halls_of_reflection_InstanceMapScript : public InstanceScript { - instance_halls_of_reflection_InstanceMapScript(Map* map) : InstanceScript(map) + instance_halls_of_reflection_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 1d95379168..915b490983 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -43,7 +43,7 @@ class instance_pit_of_saron : public InstanceMapScript struct instance_pit_of_saron_InstanceScript : public InstanceScript { - instance_pit_of_saron_InstanceScript(Map* map) : InstanceScript(map) + instance_pit_of_saron_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 55b955c953..6116091758 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -63,7 +63,7 @@ class instance_gundrak : public InstanceMapScript struct instance_gundrak_InstanceMapScript : public InstanceScript { - instance_gundrak_InstanceMapScript(Map* map) : InstanceScript(map) + instance_gundrak_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 4e91a9108a..e91f183e0a 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -114,7 +114,7 @@ class instance_naxxramas : public InstanceMapScript struct instance_naxxramas_InstanceMapScript : public InstanceScript { - instance_naxxramas_InstanceMapScript(Map* map) : InstanceScript(map) + instance_naxxramas_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index d12092d254..20ff3541c2 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -42,7 +42,7 @@ public: struct instance_eye_of_eternity_InstanceMapScript : public InstanceScript { - instance_eye_of_eternity_InstanceMapScript(Map* map) : InstanceScript(map) + instance_eye_of_eternity_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTER); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 43a0130e34..52868fa224 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -31,7 +31,7 @@ class instance_nexus : public InstanceMapScript struct instance_nexus_InstanceMapScript : public InstanceScript { - instance_nexus_InstanceMapScript(Map* map) : InstanceScript(map) + instance_nexus_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index f5db5ea7e2..81d1636821 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -43,7 +43,7 @@ class instance_oculus : public InstanceMapScript struct instance_oculus_InstanceMapScript : public InstanceScript { - instance_oculus_InstanceMapScript(Map* map) : InstanceScript(map) + instance_oculus_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 0e345ccb31..4a902f6c37 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -37,7 +37,7 @@ class instance_halls_of_lightning : public InstanceMapScript struct instance_halls_of_lightning_InstanceMapScript : public InstanceScript { - instance_halls_of_lightning_InstanceMapScript(Map* map) : InstanceScript(map) + instance_halls_of_lightning_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 6d36c35297..407a1f8b96 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -36,7 +36,7 @@ class instance_halls_of_stone : public InstanceMapScript struct instance_halls_of_stone_InstanceMapScript : public InstanceScript { - instance_halls_of_stone_InstanceMapScript(Map* map) : InstanceScript(map) + instance_halls_of_stone_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index ae4b11fdb4..63028f2190 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -19,7 +19,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "utgarde_keep.h" DoorData const doorData[] = @@ -42,7 +41,7 @@ class instance_utgarde_keep : public InstanceMapScript struct instance_utgarde_keep_InstanceMapScript : public InstanceScript { - instance_utgarde_keep_InstanceMapScript(Map* map) : InstanceScript(map) + instance_utgarde_keep_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 38917fda93..8c638031ac 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -19,7 +19,6 @@ #include "AreaBoundary.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "utgarde_pinnacle.h" BossBoundaryData const boundaries = @@ -64,7 +63,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript struct instance_utgarde_pinnacle_InstanceMapScript : public InstanceScript { - instance_utgarde_pinnacle_InstanceMapScript(Map* map) : InstanceScript(map) + instance_utgarde_pinnacle_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 309d9c6168..e5e0c0fe9f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "GameTime.h" #include "InstanceScript.h" -#include "Map.h" #include "vault_of_archavon.h" /* Vault of Archavon encounters: @@ -44,7 +43,7 @@ class instance_vault_of_archavon : public InstanceMapScript struct instance_vault_of_archavon_InstanceMapScript : public InstanceScript { - instance_vault_of_archavon_InstanceMapScript(Map* map) : InstanceScript(map) + instance_vault_of_archavon_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 0e75ac0800..8a9eedfa89 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -195,7 +195,7 @@ class instance_violet_hold : public InstanceMapScript struct instance_violet_hold_InstanceMapScript : public InstanceScript { - instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map) + instance_violet_hold_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp index 5989799b25..5b50347450 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "auchenai_crypts.h" #include "InstanceScript.h" -#include "Map.h" class instance_auchenai_crypts : public InstanceMapScript { @@ -27,7 +26,7 @@ class instance_auchenai_crypts : public InstanceMapScript struct instance_auchenai_crypts_InstanceMapScript : public InstanceScript { - instance_auchenai_crypts_InstanceMapScript(Map* map) : InstanceScript(map) + instance_auchenai_crypts_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp index bb54632b94..28bd230f92 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" #include "mana_tombs.h" -#include "Map.h" class instance_mana_tombs : public InstanceMapScript { @@ -27,7 +26,7 @@ class instance_mana_tombs : public InstanceMapScript struct instance_mana_tombs_InstanceMapScript : public InstanceScript { - instance_mana_tombs_InstanceMapScript(Map* map) : InstanceScript(map) + instance_mana_tombs_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 6506f33e61..f8c7770216 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -19,7 +19,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "sethekk_halls.h" DoorData const doorData[] = @@ -41,7 +40,7 @@ class instance_sethekk_halls : public InstanceMapScript struct instance_sethekk_halls_InstanceMapScript : public InstanceScript { - instance_sethekk_halls_InstanceMapScript(Map* map) : InstanceScript(map) + instance_sethekk_halls_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index e6b172418f..e90829492c 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -35,7 +35,7 @@ class instance_shadow_labyrinth : public InstanceMapScript struct instance_shadow_labyrinth_InstanceMapScript : public InstanceScript { - instance_shadow_labyrinth_InstanceMapScript(Map* map) : InstanceScript(map) + instance_shadow_labyrinth_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 08265ecc20..46fcce1fdb 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -22,7 +22,6 @@ #include "CreatureAI.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" DoorData const doorData[] = { @@ -94,7 +93,7 @@ class instance_black_temple : public InstanceMapScript struct instance_black_temple_InstanceMapScript : public InstanceScript { - instance_black_temple_InstanceMapScript(Map* map) : InstanceScript(map) + instance_black_temple_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index f59768ef65..05ef1d46cf 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -95,7 +95,7 @@ class instance_serpent_shrine : public InstanceMapScript struct instance_serpentshrine_cavern_InstanceMapScript : public InstanceScript { - instance_serpentshrine_cavern_InstanceMapScript(Map* map) : InstanceScript(map) + instance_serpentshrine_cavern_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 89aad19408..7c5462d27f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -21,7 +21,6 @@ #include "GameObjectAI.h" #include "InstanceScript.h" #include "Log.h" -#include "Map.h" #include "steam_vault.h" class go_main_chambers_access_panel : public GameObjectScript @@ -69,7 +68,7 @@ class instance_steam_vault : public InstanceMapScript struct instance_steam_vault_InstanceMapScript : public InstanceScript { - instance_steam_vault_InstanceMapScript(Map* map) : InstanceScript(map) + instance_steam_vault_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp index 23f09fdfd6..000f1d70a4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp @@ -25,7 +25,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "the_slave_pens.h" class instance_the_slave_pens : public InstanceMapScript @@ -35,7 +34,7 @@ public: struct instance_the_slave_pens_InstanceMapScript : public InstanceScript { - instance_the_slave_pens_InstanceMapScript(Map* map) : InstanceScript(map) + instance_the_slave_pens_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { counter = DATA_FLAMECALLER_000; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp index e7983372da..b3f7d0e39a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp @@ -24,7 +24,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" #include "the_underbog.h" class instance_the_underbog : public InstanceMapScript @@ -39,7 +38,7 @@ public: struct instance_the_underbog_InstanceMapScript : public InstanceScript { - instance_the_underbog_InstanceMapScript(Map* map) : InstanceScript(map) { } + instance_the_underbog_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } }; }; diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index b08c14f7f2..e86df3c0d9 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -19,7 +19,6 @@ #include "Creature.h" #include "gruuls_lair.h" #include "InstanceScript.h" -#include "Map.h" DoorData const doorData[] = { @@ -44,7 +43,7 @@ class instance_gruuls_lair : public InstanceMapScript struct instance_gruuls_lair_InstanceMapScript : public InstanceScript { - instance_gruuls_lair_InstanceMapScript(Map* map) : InstanceScript(map) + instance_gruuls_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index d12dadb1cd..62371cb2ec 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -40,7 +40,7 @@ class instance_blood_furnace : public InstanceMapScript struct instance_blood_furnace_InstanceMapScript : public InstanceScript { - instance_blood_furnace_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blood_furnace_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index 496da536c8..f59b58c326 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -36,7 +36,7 @@ class instance_ramparts : public InstanceMapScript struct instance_ramparts_InstanceMapScript : public InstanceScript { - instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) + instance_ramparts_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index c1741fd20c..fcf1a5cd95 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -71,7 +71,7 @@ class instance_magtheridons_lair : public InstanceMapScript struct instance_magtheridons_lair_InstanceMapScript : public InstanceScript { - instance_magtheridons_lair_InstanceMapScript(Map* map) : InstanceScript(map) + instance_magtheridons_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 0b57902066..feeeab0707 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -53,7 +53,7 @@ class instance_shattered_halls : public InstanceMapScript struct instance_shattered_halls_InstanceMapScript : public InstanceScript { - instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) + instance_shattered_halls_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 48f66f55fe..48fc952e77 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -26,7 +26,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "the_eye.h" /* The Eye encounters: @@ -58,7 +57,7 @@ class instance_the_eye : public InstanceMapScript struct instance_the_eye_InstanceMapScript : public InstanceScript { - instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) + instance_the_eye_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index f9c7bf72c0..b5ab72a586 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" #include "mechanar.h" static DoorData const doorData[] = @@ -36,7 +35,7 @@ class instance_mechanar : public InstanceMapScript struct instance_mechanar_InstanceMapScript : public InstanceScript { - instance_mechanar_InstanceMapScript(Map* map) : InstanceScript(map) + instance_mechanar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 9fb985f45a..9552de4e21 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -20,7 +20,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" DoorData const doorData[] = { @@ -36,7 +35,7 @@ class instance_arcatraz : public InstanceMapScript struct instance_arcatraz_InstanceMapScript : public InstanceScript { - instance_arcatraz_InstanceMapScript(Map* map) : InstanceScript(map) + instance_arcatraz_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index f1c8d6c3c0..42f465db79 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "the_botanica.h" class instance_the_botanica : public InstanceMapScript @@ -28,7 +27,7 @@ class instance_the_botanica : public InstanceMapScript struct instance_the_botanica_InstanceMapScript : public InstanceScript { - instance_the_botanica_InstanceMapScript(Map* map) : InstanceScript(map) + instance_the_botanica_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); } From 6cb585aa960c145845a77fbe871eba4f8f85c472 Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 24 Jul 2018 10:42:41 +0200 Subject: [PATCH 002/102] Core/Maps: Continue updating creatures that own auras applied to players. Closes #22110. --- src/server/game/Maps/Map.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 7a1869a10f..afbfe25899 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -853,6 +853,18 @@ void Map::Update(uint32 t_diff) for (Unit* unit : toVisit) VisitNearbyCellsOf(unit, grid_object_update, world_object_update); } + + { // Update any creatures that own auras the player has applications of + std::unordered_set toVisit; + for (std::pair pair : player->GetAppliedAuras()) + { + if (Unit* caster = pair.second->GetBase()->GetCaster()) + if (caster->GetTypeId() != TYPEID_PLAYER) + toVisit.insert(caster); + } + for (Unit* unit : toVisit) + VisitNearbyCellsOf(unit, grid_object_update, world_object_update); + } } // non-player active objects, increasing iterator in the loop in case of object removal From 64780d7b31e3183fc13b99efe43fa30bb38b4abf Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 24 Jul 2018 10:46:14 +0200 Subject: [PATCH 003/102] visibility range check, fac4700 follow-up --- src/server/game/Maps/Map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index afbfe25899..28e552b818 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -859,7 +859,7 @@ void Map::Update(uint32 t_diff) for (std::pair pair : player->GetAppliedAuras()) { if (Unit* caster = pair.second->GetBase()->GetCaster()) - if (caster->GetTypeId() != TYPEID_PLAYER) + if (caster->GetTypeId() != TYPEID_PLAYER && !caster->IsWithinDistInMap(player, GetVisibilityRange(), false)) toVisit.insert(caster); } for (Unit* unit : toVisit) From 7dc8eea3140492d49cec482b6ace93f86bd16870 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 29 Jul 2018 19:16:03 +0200 Subject: [PATCH 004/102] Core/Entities: Ethereal Soul-Trader --- .../world/3.3.5/2018_07_25_00_world.sql | 7 ++ src/server/scripts/Pet/pet_generic.cpp | 27 +++++ src/server/scripts/Spells/spell_generic.cpp | 112 ++++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_25_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_07_25_00_world.sql b/sql/updates/world/3.3.5/2018_07_25_00_world.sql new file mode 100644 index 0000000000..e520ca224b --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_25_00_world.sql @@ -0,0 +1,7 @@ +UPDATE `creature_template` SET `ScriptName`='npc_pet_gen_soul_trader' WHERE `entry`=27914; +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_ethereal_pet_aura','spell_ethereal_pet_onsummon','spell_ethereal_pet_aura_remove','spell_steal_essence_visual'); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(50051,'spell_ethereal_pet_aura'), +(50052,'spell_ethereal_pet_onsummon'), +(50055,'spell_ethereal_pet_aura_remove'), +(50101,'spell_steal_essence_visual'); diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index af5115b7b6..fbe7075c19 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -406,6 +406,32 @@ class npc_pet_gen_lil_ragnaros : public CreatureScript } }; +enum SoulTrader +{ + SAY_SOUL_TRADER_INTRO = 0, + + SPELL_ETHEREAL_ONSUMMON = 50052, + SPELL_ETHEREAL_PET_REMOVE_AURA = 50055 +}; + +struct npc_pet_gen_soul_trader : public ScriptedAI +{ + npc_pet_gen_soul_trader(Creature* creature) : ScriptedAI(creature) { } + + void LeavingWorld() override + { + if (Unit* owner = me->GetOwner()) + DoCast(owner, SPELL_ETHEREAL_PET_REMOVE_AURA); + } + + void JustAppeared() override + { + Talk(SAY_SOUL_TRADER_INTRO); + if (Unit* owner = me->GetOwner()) + DoCast(owner, SPELL_ETHEREAL_ONSUMMON); + } +}; + void AddSC_generic_pet_scripts() { new npc_pet_gen_baby_blizzard_bear(); @@ -413,4 +439,5 @@ void AddSC_generic_pet_scripts() new npc_pet_gen_pandaren_monk(); new npc_pet_gen_mojo(); new npc_pet_gen_lil_ragnaros(); + RegisterCreatureAI(npc_pet_gen_soul_trader); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 5c7b6976aa..50b182c93d 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1751,6 +1751,118 @@ class spell_gen_elune_candle : public SpellScriptLoader } }; +// 50051 - Ethereal Pet Aura +enum EtherealPet +{ + NPC_ETHEREAL_SOUL_TRADER = 27914, + + SAY_STEAL_ESSENCE = 1, + SAY_CREATE_TOKEN = 2, + + SPELL_PROC_TRIGGER_ON_KILL_AURA = 50051, + SPELL_ETHEREAL_PET_AURA = 50055, + SPELL_CREATE_TOKEN = 50063, + SPELL_STEAL_ESSENCE_VISUAL = 50101 +}; + +// 50051 - Ethereal Pet Aura +class spell_ethereal_pet_aura : public AuraScript +{ + PrepareAuraScript(spell_ethereal_pet_aura); + + bool CheckProc(ProcEventInfo& eventInfo) + { + uint32 levelDiff = std::abs(GetTarget()->getLevel() - eventInfo.GetProcTarget()->getLevel()); + return levelDiff <= 9; + } + + void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + { + PreventDefaultAction(); + + std::list minionList; + GetUnitOwner()->GetAllMinionsByEntry(minionList, NPC_ETHEREAL_SOUL_TRADER); + for (Creature* minion : minionList) + { + if (minion->IsAIEnabled) + { + minion->AI()->Talk(SAY_STEAL_ESSENCE); + minion->CastSpell(eventInfo.GetProcTarget(), SPELL_STEAL_ESSENCE_VISUAL); + } + } + } + + void Register() override + { + DoCheckProc += AuraCheckProcFn(spell_ethereal_pet_aura::CheckProc); + OnEffectProc += AuraEffectProcFn(spell_ethereal_pet_aura::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + } +}; + +// 50052 - Ethereal Pet onSummon +class spell_ethereal_pet_onsummon : public SpellScript +{ + PrepareSpellScript(spell_ethereal_pet_onsummon); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_PROC_TRIGGER_ON_KILL_AURA }); + } + + void HandleScriptEffect(SpellEffIndex /*effIndex*/) + { + Unit* target = GetHitUnit(); + target->CastSpell(target, SPELL_PROC_TRIGGER_ON_KILL_AURA, true); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_ethereal_pet_onsummon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + +// 50055 - Ethereal Pet Aura Remove +class spell_ethereal_pet_aura_remove : public SpellScript +{ + PrepareSpellScript(spell_ethereal_pet_aura_remove); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_ETHEREAL_PET_AURA }); + } + + void HandleScriptEffect(SpellEffIndex /*effIndex*/) + { + GetHitUnit()->RemoveAurasDueToSpell(SPELL_ETHEREAL_PET_AURA); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_ethereal_pet_aura_remove::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + +// 50101 - Steal Essence Visual +class spell_steal_essence_visual : public AuraScript +{ + PrepareAuraScript(spell_steal_essence_visual); + + void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + { + caster->CastSpell(caster, SPELL_CREATE_TOKEN, true); + if (Creature* soulTrader = caster->ToCreature()) + soulTrader->AI()->Talk(SAY_CREATE_TOKEN); + } + } + + void Register() override + { + AfterEffectRemove += AuraEffectRemoveFn(spell_steal_essence_visual::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } +}; + enum TransporterBackfires { SPELL_TRANSPORTER_MALFUNCTION_POLYMORPH = 23444, From 1a930a7c246bb4c53c2dc094553c99c948965152 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 27 Jul 2018 15:15:11 +0200 Subject: [PATCH 005/102] DB/Text: Arikara Updates #20946 --- sql/updates/world/3.3.5/2018_07_27_00_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_27_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_27_00_world_335.sql b/sql/updates/world/3.3.5/2018_07_27_00_world_335.sql new file mode 100644 index 0000000000..02e866d89e --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_27_00_world_335.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_text` SET `Text`="%s goes into a frenzy!", `BroadcastTextId`=1191 WHERE `CreatureID`=10882 AND `GroupID`=0; From ba012d48651414c0be331dd15eb3dd126ff3485e Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 27 Jul 2018 15:15:39 +0200 Subject: [PATCH 006/102] DB/Quest: Replacement Phial Closes #22189 --- sql/updates/world/3.3.5/2018_07_27_01_world_335.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_27_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_27_01_world_335.sql b/sql/updates/world/3.3.5/2018_07_27_01_world_335.sql new file mode 100644 index 0000000000..8e728305f2 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_27_01_world_335.sql @@ -0,0 +1,12 @@ +-- +-- Quest "Replacement Phial" +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=3375; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19,0,3375,0,0,14,0,2200,0,0,1,0,0,"","Quest 'Replacement Phial' can only be taken if quest 'Back to Uldaman' is taken"), +(19,0,3375,0,0,28,0,2204,0,0,1,0,0,"","Quest 'Replacement Phial' can only be taken if quest 'Restoring the Necklace' is not completed"), +(19,0,3375,0,0,8,0,2204,0,0,1,0,0,"","Quest 'Replacement Phial' can only be taken if quest 'Restoring the Necklace' is not rewarded"), +(19,0,3375,0,0,2,0,7667,1,1,1,0,0,"","Quest 'Replacement Phial' can only be taken if player does not have item 'Talvash's Phial of Scrying'"); + +DELETE FROM `quest_template_addon` WHERE `ID`=3375; +INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES +(3375,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1); From bc6f4a1277c86a064023139537ca848d77f1eda0 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 27 Jul 2018 15:16:11 +0200 Subject: [PATCH 007/102] DB/Quest: Restoring the Necklace Closes #22190 --- .../world/3.3.5/2018_07_27_02_world_335.sql | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_27_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_27_02_world_335.sql b/sql/updates/world/3.3.5/2018_07_27_02_world_335.sql new file mode 100644 index 0000000000..1102baa8cc --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_27_02_world_335.sql @@ -0,0 +1,41 @@ +-- Talvash del Kissel +DELETE FROM `creature_text` WHERE `CreatureID`=6826 AND `GroupID` IN (1,2,3,4,5); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(6826,1,0,"Let me grab a spell focus from inside my home here, and then we'll get started!",12,7,100,0,0,0,3121,0,"Talvash del Kissel"), +(6826,2,0,"Bah, it isn't here. Where did I have that blasted thing at last?",12,7,100,6,0,0,3122,0,"Talvash del Kissel"), +(6826,3,0,"That's right, it's over by the bed. Heh, sorry about that!",12,7,100,0,0,0,3123,0,"Talvash del Kissel"), +(6826,4,0,"Fantastic then! Let's get this thing fixed for you.",12,7,100,0,0,0,3124,0,"Talvash del Kissel"), +(6826,5,0,"Success! Huzzah! The power source restored the necklace!",12,7,100,4,0,0,3125,0,"Talvash del Kissel"); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=6826 AND `source_type`=0 AND `id` IN (2,3,4,5,6,7); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (682600,682601,682602) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(6826,0,2,0,20,0,100,0,2204,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Quest 'Restoring the Necklace' Finished - Remove Npc Flag Questgiver+Gossip"), +(6826,0,3,0,20,0,100,0,2204,0,0,0,53,0,6826,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Quest 'Restoring the Necklace' Finished - Start Waypoint"), +(6826,0,4,0,20,0,100,0,2204,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Quest 'Restoring the Necklace' Finished - Say Line 1"), +(6826,0,5,0,40,0,100,0,3,6826,0,0,80,682600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Waypoint 3 Reached - Run Script"), +(6826,0,6,0,40,0,100,0,5,6826,0,0,80,682601,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Waypoint 5 Reached - Run Script"), +(6826,0,7,0,40,0,100,0,10,6826,0,0,80,682602,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Waypoint 10 Reached - Run Script"), +(682600,9,0,0,0,0,100,0,0,0,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Pause Waypoint"), +(682600,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.02135,"Talvash del Kissel - On Script - Set Orientation"), +(682600,9,2,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Say Line 2"), +(682600,9,3,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Say Line 3"), +(682601,9,0,0,0,0,100,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Pause Waypoint"), +(682601,9,2,0,0,0,100,0,4000,4000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Say Line 4"), +(682602,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.31613,"Talvash del Kissel - On Script - Set Orientation"), +(682602,9,1,0,0,0,100,0,1000,1000,0,0,11,9795,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Cast 'Talvash's Necklace Repair'"), +(682602,9,2,0,0,0,100,0,6000,6000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Say Line 5"), +(682602,9,3,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talvash del Kissel - On Script - Add Npc Flag Questgiver+Gossip"); + +DELETE FROM `waypoints` WHERE `entry`=6826; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(6826,1,-4586.89,-997.797,503.658,""), +(6826,2,-4582.68,-996.563,503.658,""), +(6826,3,-4575.23,-998.552,503.658,""), +(6826,4,-4575.04,-995.529,503.657,""), +(6826,5,-4576.11,-992.451,503.657,""), +(6826,6,-4575.04,-995.529,503.657,""), +(6826,7,-4575.64,-997.129,503.657,""), +(6826,8,-4578.79,-998.015,503.657,""), +(6826,9,-4586.89,-997.797,503.658,""), +(6826,10,-4588.3,-1001.21,503.657,""); From 6c59a262dcb684e85fcd173ab83e1998c549ef9a Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 27 Jul 2018 15:16:50 +0200 Subject: [PATCH 008/102] DB/SAI: Alcaz Island Closes #22191 --- .../world/3.3.5/2018_07_27_03_world_335.sql | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_27_03_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_27_03_world_335.sql b/sql/updates/world/3.3.5/2018_07_27_03_world_335.sql new file mode 100644 index 0000000000..43055e2933 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_27_03_world_335.sql @@ -0,0 +1,66 @@ +-- +-- Tidelord Rrurgaz +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=16072; +DELETE FROM `smart_scripts` WHERE `entryorguid`=16072 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(16072,0,0,0,0,0,100,0,2000,4000,14000,21000,0,11,16244,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tidelord Rrurgaz - In Combat - Cast 'Demoralizing Shout'"), +(16072,0,1,0,0,0,100,0,5000,7000,19000,22000,0,11,16509,0,0,0,0,0,5,0,0,0,0,0,0,0,"Tidelord Rrurgaz - In Combat - Cast 'Rend'"), +(16072,0,2,0,0,0,100,0,7000,9000,8000,12000,0,11,17207,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tidelord Rrurgaz - In Combat - Cast 'Whirlwind'"), +(16072,0,3,0,0,0,100,0,9000,12000,14000,17000,0,11,15588,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tidelord Rrurgaz - In Combat - Cast 'Thunderclap'"); + +-- Strashaz Warrior +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4364; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4364 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4364,0,0,0,0,0,100,0,5000,7000,12000,15000,0,11,9080,0,0,0,0,0,2,0,0,0,0,0,0,0,"Strashaz Warrior - In Combat - Cast 'Hamstring'"), +(4364,0,1,0,0,0,100,0,4000,9000,8000,12000,0,11,16856,0,0,0,0,0,2,0,0,0,0,0,0,0,"Strashaz Warrior - In Combat - Cast 'Mortal Strike'"), +(4364,0,2,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Strashaz Warrior - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Strashaz Sorceress +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4370; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4370 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4370,0,0,0,0,0,100,0,0,0,3000,5000,0,11,12737,64,0,0,0,0,2,0,0,0,0,0,0,0,"Strashaz Sorceress - In Combat - Cast 'Frostbolt'"), +(4370,0,1,0,0,0,100,0,12000,16000,16000,21000,0,11,15499,0,0,0,0,0,5,0,0,0,0,0,0,0,"Strashaz Sorceress - In Combat - Cast 'Frost Shock'"), +(4370,0,2,0,9,0,100,0,0,8,12000,15000,0,11,15532,0,0,0,0,0,1,0,0,0,0,0,0,0,"Strashaz Sorceress - Within 0-8 Range - Cast 'Frost Nova'"), +(4370,0,3,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Strashaz Sorceress - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Strashaz Siren +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4371; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4371 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4371,0,0,0,0,0,100,0,0,0,3000,5000,0,11,15587,64,0,0,0,0,2,0,0,0,0,0,0,0,"Strashaz Siren - In Combat - Cast 'Mind Blast'"), +(4371,0,1,0,0,0,100,0,11000,15000,21000,26000,0,11,15654,0,0,0,0,0,5,0,0,0,0,0,0,0,"Strashaz Siren - In Combat - Cast 'Shadow Word: Pain'"), +(4371,0,2,0,0,0,100,0,8000,12000,16000,22000,0,11,7645,0,0,0,0,0,6,0,0,0,0,0,0,0,"Strashaz Siren - In Combat - Cast 'Dominate Mind'"), +(4371,0,3,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Strashaz Siren - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Strashaz Myrmidon +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4368; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4368 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4368,0,0,0,0,0,100,0,5000,7000,11000,14000,0,11,15284,0,0,0,0,0,2,0,0,0,0,0,0,0,"Strashaz Myrmidon - In Combat - Cast 'Cleave'"), +(4368,0,1,0,0,0,100,0,7000,11000,9000,13000,0,11,18812,0,0,0,0,0,5,0,0,0,0,0,0,0,"Strashaz Myrmidon - In Combat - Cast 'Knockdown'"), +(4368,0,2,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Strashaz Myrmidon - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Strashaz Serpent Guard +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4366; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4366 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4366,0,0,0,0,0,100,0,5000,7000,7000,11000,0,11,12057,0,0,0,0,0,2,0,0,0,0,0,0,0,"Strashaz Serpent Guard - In Combat - Cast 'Strike'"), +(4366,0,1,0,0,0,100,0,4000,9000,18000,24000,0,11,6713,0,0,0,0,0,2,0,0,0,0,0,0,0,"Strashaz Serpent Guard - In Combat - Cast 'Disarm'"), +(4366,0,2,0,0,0,100,0,7000,12000,21000,25000,0,11,16509,0,0,0,0,0,5,0,0,0,0,0,0,0,"Strashaz Serpent Guard - In Combat - Cast 'Rend'"), +(4366,0,3,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Strashaz Serpent Guard - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Strashaz Hydra +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4374; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4374 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4374,0,0,0,25,0,100,0,0,0,0,0,0,11,8876,0,0,0,0,0,1,0,0,0,0,0,0,0,"Strashaz Hydra - On Reset - Cast 'Thrash'"), +(4374,0,1,0,0,0,100,0,5000,9000,12000,21000,0,11,16128,0,0,0,0,0,5,0,0,0,0,0,0,0,"Strashaz Hydra - In Combat - Cast 'Infected Bite'"); + +-- Doctor Weavil +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=15552; +DELETE FROM `smart_scripts` WHERE `entryorguid`=15552 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(15552,0,0,0,0,0,100,0,8000,14000,8000,14000,0,11,25774,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doctor Weavil - In Combat - Cast 'Mind Shatter'"), +(15552,0,1,0,0,0,100,0,15000,15000,120000,120000,0,11,25772,0,0,0,0,0,2,0,0,0,0,0,0,0,"Doctor Weavil - In Combat - Cast 'Mental Domination'"); From 648f981c42733154ad790af4cf836885c6d4ce28 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 27 Jul 2018 15:17:20 +0200 Subject: [PATCH 009/102] DB/Quest: Quest Emotes (Dun Morogh) Closes #22192 --- .../world/3.3.5/2018_07_27_04_world_335.sql | 1063 +++++++++++++++++ 1 file changed, 1063 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_27_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_27_04_world_335.sql b/sql/updates/world/3.3.5/2018_07_27_04_world_335.sql new file mode 100644 index 0000000000..4fa086bc99 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_27_04_world_335.sql @@ -0,0 +1,1063 @@ +-- +-- Quest "A New Threat" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=170; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=170; + +-- Quest "A Refugee's Quandary" +DELETE FROM `quest_details` WHERE `ID`=3361; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3361,5,0,0,0,0,0,0,0,0); + +-- Quest "The Boar Hunter" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=183; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=183; + +-- Quest "The Troll Cave" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=182; +UPDATE `quest_offer_reward` SET `Emote1`=5, `RewardText`="Argh! Those Light-blasted trolls!$B$B$B$BA group of them came in the night and stole my journal! I knew better than to trust that good-for-nothing appr..." WHERE `ID`=182; + +-- Quest "The Stolen Journal" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=218; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=218; + +-- Quest "Scalding Mornbrew Delivery" +DELETE FROM `quest_details` WHERE `ID`=3364; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3364,5,0,0,0,0,0,0,0,0); + +-- Quest "Senir's Observations" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=66, `EmoteOnComplete`=66 WHERE `ID`=282; + +-- Quest "Supplies to Tannok" +UPDATE `quest_request_items` SET `EmoteOnComplete`=3 WHERE `ID`=2160; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=2160; + +UPDATE `creature_template` SET `ScriptName`="" WHERE `entry`=6806; -- Tannok Frosthammer is not an innkeeper + +-- Quest "Speak with Bink" +DELETE FROM `quest_details` WHERE `ID`=1879; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1879,5,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=1879; + +-- Quest "Mage-tastic Gizmonitor" +DELETE FROM `quest_details` WHERE `ID`=1880; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1880,1,1,20,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1880; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=2 WHERE `ID`=1880; + +-- Quest "In Favor of the Light" +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=5626; + +-- Quest "Garments of the Light" +DELETE FROM `quest_details` WHERE `ID`=5625; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(5625,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1, `RewardText`="Well done, $n. You got the Light inside you, that's for sure.$B$BHere, take this robe. It'll denote your role in the church and help people recognize you as a $c--wear it if you want.$B$BLater, there will be more tests that you'll have to go through. Do what you can to learn about your abilities and what you're capable of. Try your hand at a fight or two alone, and then again with other travelers.$B$BBut don't fret none... you're as powerful as they come." WHERE `ID`=5625; + +-- Quest "Tools for Steelgrill" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=400; + +-- Quest "Beer Basted Boar Ribs" +DELETE FROM `quest_details` WHERE `ID`=384; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(384,1,6,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=384; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=384; + +-- Quest "Stocking Jetsteam" +DELETE FROM `quest_details` WHERE `ID`=317; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(317,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=317; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=317; + +-- Quest "The Grizzled Den" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=313; + +-- Quest "Evershine" +DELETE FROM `quest_details` WHERE `ID`=318; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(318,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=318; + +-- Quest "A Favor for Evershine" +DELETE FROM `quest_details` WHERE `ID`=319; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(319,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=319; + +-- Quest "Ammo for Rumbleshot" +DELETE FROM `quest_details` WHERE `ID`=5541; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(5541,1,5,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=5541; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=2 WHERE `ID`=5541; + +-- Quest "Operation Recombobulation" +DELETE FROM `quest_details` WHERE `ID`=412; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(412,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=412; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=412; + +-- Quest "Tundra MacGrann's Stolen Stash" +DELETE FROM `quest_details` WHERE `ID`=312; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(312,1,6,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=312; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=312; + +-- Quest "The Perfect Stout" +DELETE FROM `quest_details` WHERE `ID`=315; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(315,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=315; + +-- Quest "Rejold's New Brew" +UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=415; + +-- Quest "Distracting Jarven" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=308; + +-- Quest "Return to Bellowfiz" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=320; + +-- Quest "Return to Marleth" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=311; + +-- Quest "Protecting the Herd" +DELETE FROM `quest_details` WHERE `ID`=314; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(314,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=314; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=314; + +-- Quest "Those Blasted Troggs!" +DELETE FROM `quest_details` WHERE `ID`=432; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(432,5,15,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=15 WHERE `ID`=432; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=5 WHERE `ID`=432; + +-- Quest "A Pilot's Revenge" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=417; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=417; + +-- Quest "Shimmer Stout" +UPDATE `quest_request_items` SET `EmoteOnComplete`=3 WHERE `ID`=413; +UPDATE `quest_offer_reward` SET `Emote1`=7, `Emote2`=4 WHERE `ID`=413; + +-- Quest "Stout to Kadrell" +DELETE FROM `quest_details` WHERE `ID`=414; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(414,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=2 WHERE `ID`=414; +UPDATE `quest_offer_reward` SET `Emote1`=7, `Emote2`=5 WHERE `ID`=414; + +-- Quest "The Reports" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=291; + +-- Quest "Deeprun Rat Roundup" +DELETE FROM `quest_details` WHERE `ID`=6661; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6661,25,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=6661; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6661; + +-- Quest "Me Brother, Nipsy" +DELETE FROM `quest_details` WHERE `ID`=6662; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6662,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=6662; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6662; + +-- Quest "The New Frontier" +DELETE FROM `quest_details` WHERE `ID` IN (1000,1004,1015,1018,1019,1047); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1000,15,5,1,0,0,0,0,0,0), +(1004,15,5,1,0,0,0,0,0,0), +(1015,15,5,1,0,0,0,0,0,0), +(1018,15,5,1,0,0,0,0,0,0), +(1019,15,5,1,0,0,0,0,0,0), +(1047,15,5,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID` IN (1015,1019,1047); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID` IN (1000,1004,1018); + +UPDATE `quest_template_addon` SET `NextQuestID`=6761 WHERE `ID` IN (1015,1019,1047); +UPDATE `quest_template_addon` SET `NextQuestID`=1123 WHERE `ID` IN (1000,1004,1018); + +-- Quest "The New Frontier (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=6761; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6761,1,1,5,25,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1 WHERE `ID`=6761; + +-- Quest "Rabine Saturna" +DELETE FROM `quest_details` WHERE `ID` IN (6762,1123); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6762,1,1,1,0,0,0,0,0,0), +(1123,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1 WHERE `ID` IN (6762,1123); + +-- Quest "Wasteland" +DELETE FROM `quest_details` WHERE `ID`=1124; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1124,1,6,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=1 WHERE `ID`=1124; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1 WHERE `ID`=1124; + +-- Quest "The Spirits of Southwind" +DELETE FROM `quest_details` WHERE `ID`=1125; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1125,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=2 WHERE `ID`=1125; + +-- Quest "Hive in the Tower" +DELETE FROM `quest_details` WHERE `ID`=1126; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1126,1,1,25,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1126; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1 WHERE `ID`=1126; + +-- Quest "Umber, Archivist" +DELETE FROM `quest_details` WHERE `ID`=6844; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6844,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=1 WHERE `ID`=6844; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=6, `Emote3`=1 WHERE `ID`=6844; + +-- Quest "Uncovering Past Secrets" +DELETE FROM `quest_details` WHERE `ID`=6845; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6845,1,1,6,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=2 WHERE `ID`=6845; + +-- Quest "Under the Chitin Was..." +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1, `Emote3`=1 WHERE `ID`=1185; + +-- Quest "The Brassbolts Brothers" +DELETE FROM `quest_details` WHERE `ID`=1179; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1179,6,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=5 WHERE `ID`=1179; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1179; + +-- Quest "Arrows Are For Sissies" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=7342; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=7342; + +-- Quest "The Smoldering Ruins of Thaurissan" +DELETE FROM `quest_details` WHERE `ID`=3702; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3702,6,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=3702; + +-- Quest "The Smoldering Ruins of Thaurissan (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=3701; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3701,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=3701; +UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=3701; + +-- Quest "Kharan Mighthammer" +DELETE FROM `quest_details` WHERE `ID`=4341; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4341,6,5,18,5,0,0,0,3000,0); +UPDATE `quest_offer_reward` SET `Emote1`=20 WHERE `ID`=4341; + +-- Quest "Kharan Mighthammer" +DELETE FROM `quest_details` WHERE `ID`=4341; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4341,6,5,18,5,0,0,0,3000,0); +UPDATE `quest_offer_reward` SET `Emote1`=16 WHERE `ID`=4341; + +-- Quest "Kharan's Tale" +DELETE FROM `quest_details` WHERE `ID`=4342; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4342,20,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=4342; + +-- Quest "The Bearer of Bad News" +DELETE FROM `quest_details` WHERE `ID`=4361; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4361,5,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=36 WHERE `ID`=4361; + +-- Quest "The Fate of the Kingdom" +DELETE FROM `quest_details` WHERE `ID`=4362; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4362,1,1,5,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=18 WHERE `ID`=4362; + +-- Quest "The Princess's Surprise" +DELETE FROM `quest_details` WHERE `ID`=4363; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4363,5,25,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=4363; + +-- Quest "A Little Slime Goes a Long Way" +DELETE FROM `quest_details` WHERE `ID`=4512; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4512,5,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=4512; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1, `Emote3`=1 WHERE `ID`=4512; + +-- Quest "A Little Slime Goes a Long Way (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=4513; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(4513,5,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=4513; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=4, `Emote3`=1 WHERE `ID`=4513; + +-- Quest "Mythology of the Titans" +DELETE FROM `quest_details` WHERE `ID`=1050; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1050,1,1,1,1,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=1050; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=2 WHERE `ID`=1050; + +-- Quest "Powder to Ironband" +UPDATE `quest_details` SET `Emote1`=5 WHERE `ID`=302; + +-- Quest "The Lost Dwarves" +DELETE FROM `quest_details` WHERE `ID`=2398; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2398,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=2398; + +-- Quest "The Hidden Chamber" +DELETE FROM `quest_details` WHERE `ID`=2240; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2240,1,5,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=5, `Emote3`=1 WHERE `ID`=2240; + +-- Quest "Reclaimed Treasures" +DELETE FROM `quest_details` WHERE `ID`=1360; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1360,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1360; +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1360; + +-- Quest "Knowledge in the Deeps" +DELETE FROM `quest_details` WHERE `ID`=971; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(971,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=971; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1 WHERE `ID`=971; + +-- Quest "Passing the Burden" +DELETE FROM `quest_details` WHERE `ID`=3448; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3448,6,1,0,0,0,0,0,0,0); + +-- Quest "Arcane Runes" +DELETE FROM `quest_details` WHERE `ID`=3449; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3449,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=4 WHERE `ID`=3449; + +-- Quest "An Easy Pickup" +DELETE FROM `quest_details` WHERE `ID`=3450; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3450,1,1,0,0,0,0,0,0,0); + +-- Quest "Signal for Pickup" +DELETE FROM `quest_details` WHERE `ID`=3451; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3451,6,1,1,0,0,0,0,0,0); + +-- Quest "Signal for Pickup" +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=3483; + +-- Quest "Return to Tymor" +DELETE FROM `quest_details` WHERE `ID`=3461; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3461,1,1,6,0,0,0,0,0,0); + +-- Quest "Klockmort's Essentials" +DELETE FROM `quest_details` WHERE `ID`=2925; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2925,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=273 WHERE `ID`=2925; + +-- Quest "Essential Artificials" +DELETE FROM `quest_details` WHERE `ID`=2924; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2924,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=2924; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=2 WHERE `ID`=2924; + +-- Quest "The Grand Betrayal" +DELETE FROM `quest_details` WHERE `ID`=2929; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2929,5,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=2929; + +-- Quest "The Day After" +DELETE FROM `quest_details` WHERE `ID`=2927; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2927,6,1,5,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=2927; + +-- Quest "Gnogaine" +DELETE FROM `quest_details` WHERE `ID`=2926; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2926,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=5, `EmoteOnIncomplete`=5 WHERE `ID`=2926; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2926; + +-- Quest "The Only Cure is More Green Glow" +DELETE FROM `quest_details` WHERE `ID`=2962; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2962,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=1, `EmoteOnIncomplete`=1 WHERE `ID`=2962; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2962; + +-- Quest "Speak with Shoni" +DELETE FROM `quest_details` WHERE `ID`=2041; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2041,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=2041; + +-- Quest "Sully Balloo's Letter" +UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=637; + +-- Quest "Sara Balloo's Plea" +DELETE FROM `quest_details` WHERE `ID`=683; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(683,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=683; + +-- Quest "A King's Tribute" +DELETE FROM `quest_details` WHERE `ID`=686; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(686,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=5 WHERE `ID`=686; + +-- Quest "A King's Tribute (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=689; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(689,6,6,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=689; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=689; + +-- Quest "A King's Tribute (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=700; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(700,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=700; + +-- Quest "Supplying the Front" +DELETE FROM `quest_details` WHERE `ID`=1578; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1578,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1578; +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1578; + +-- Quest "Gearing Redridge" +DELETE FROM `quest_details` WHERE `ID`=1618; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1618,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1618; +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=1618; + +-- Quest "Imperial Plate Armor" +DELETE FROM `quest_details` WHERE `ID` IN (10891,10892); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(10891,1,0,0,0,0,0,0,0,0), +(10892,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID` IN (10891,10892); + +-- Quest "A Blue Light Bargain" +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=7652; + +-- Quest "Imperial Plate Belt" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=7653; +UPDATE `quest_offer_reward` SET `Emote1`=1, `RewardText`="A pleasure doin' business with ya.$B$BAnd $N, wipe that look of disgust off yer face." WHERE `ID`=7653; + +-- Quest "Imperial Plate Boots" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=11, `EmoteOnComplete`=11 WHERE `ID`=7654; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=7654; + +-- Quest "Imperial Plate Bracer" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=7655; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=7655; + +-- Quest "Imperial Plate Chest" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `CompletionText`="For the chest piece plans, I'll be needin' 30 thorium bars.$B$BOh boy, there you go again. Are you gonna be runnin' to yer blue Gods, askin' why they have forsaken you?!? Toughen up, Nancy! Nobody ever said life's fair." WHERE `ID`=7656; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=7656; + +-- Quest "Imperial Plate Helm" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=7657; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=7657; + +-- Quest "Imperial Plate Leggings" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=7658; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=7658; + +-- Quest "Imperial Plate Shoulders" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=7659; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=7659; + +-- Quest "The Pledge of Secrecy" +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID` IN (3640,3642,3638); + +-- Quest "Membership Card Renewal" +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID` IN (3646,3647,3644,3645); + +-- Quest "I Know A Guy..." +DELETE FROM `quest_details` WHERE `ID` IN (6612,6611); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6612,1,1,273,0,0,0,0,0,0), +(6611,6,274,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=33, `Emote2`=5, `EmoteDelay2`=1000 WHERE `ID` IN (6612,6611); + +-- Quest "Clamlette Surprise" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=6610; +UPDATE `quest_offer_reward` SET `Emote1`=25 WHERE `ID`=6610; + +-- Quest "Alliance Trauma" +DELETE FROM `quest_details` WHERE `ID`=6625; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6625,1,1,5,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6625; + +-- Quest "Triage" +DELETE FROM `quest_details` WHERE `ID`=6624; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6624,1,1,1,1,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=6624; + +-- Quest "The Platinum Discs" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=2279; +UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=2279; + +-- Quest "The Platinum Discs (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=2439; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2439,4,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=2439; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2439; + +-- Quest "Portents of Uldum" +DELETE FROM `quest_details` WHERE `ID`=2963; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2963,2,1,5,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=2963; + +-- Quest "Seeing What Happens" +DELETE FROM `quest_details` WHERE `ID`=2946; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2946,1,1,1,0,0,0,0,0,0); + +-- Quest "Return to Ironforge" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=2977; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1 WHERE `ID`=2977; + +-- Quest "A Future Task" +DELETE FROM `quest_details` WHERE `ID`=2964; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2964,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=1 WHERE `ID`=2964; + +-- Quest "Road to Salvation" +DELETE FROM `quest_details` WHERE `ID`=2218; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2218,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=2 WHERE `ID`=2218; + +-- Quest "Simple Subterfugin'" +DELETE FROM `quest_details` WHERE `ID`=2238; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2238,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=2 WHERE `ID`=2238; + +-- Quest "Onin's Report" +DELETE FROM `quest_details` WHERE `ID`=2239; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2239,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=2239; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=2239; + +-- Quest "To Hulfdan!" +DELETE FROM `quest_details` WHERE `ID`=2299; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2299,6,5,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=25 WHERE `ID`=2299; + +-- Quest "Kingly Shakedown" +DELETE FROM `quest_details` WHERE `ID`=2298; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2298,1,5,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2298; + +-- Quest "Tome of Divinity" +DELETE FROM `quest_details` WHERE `ID`=2997; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2997,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=2997; + +-- Quest "Tome of Divinity" +DELETE FROM `quest_details` WHERE `ID`=3000; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3000,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=3000; + +-- Quest "Tome of Divinity" +DELETE FROM `quest_details` WHERE `ID`=2999; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2999,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=2999; + +-- Quest "Tome of Divinity" +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1 WHERE `ID`=1645; + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=1645; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19,0,1645,0,0,14,0,2997,0,0,0,0,0,"","Quest 'Tome of Divinity (1645)' can only be taken if quest 'Tome of Divinity (2997)' is not taken"), +(19,0,1645,0,0,14,0,3000,0,0,0,0,0,"","Quest 'Tome of Divinity (1645)' can only be taken if quest 'Tome of Divinity (3000)' is not taken"), +(19,0,1645,0,0,14,0,2999,0,0,0,0,0,"","Quest 'Tome of Divinity (1645)' can only be taken if quest 'Tome of Divinity (2999)' is not taken"); + +-- Quest "Tome of Divinity" +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=6, `Emote3`=1, `Emote4`=1 WHERE `ID`=1645; + +-- Quest "Tome of Divinity (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=1647; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1647,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=2, `Emote3`=1 WHERE `ID`=1647; + +-- Quest "Tome of Divinity (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=1648; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1648,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1648; +UPDATE `quest_offer_reward` SET `Emote1`=21, `Emote2`=1, `Emote3`=1, `Emote4`=2 WHERE `ID`=1648; + +-- Quest "Tome of Divinity (Part 4)" +DELETE FROM `quest_details` WHERE `ID`=1778; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1778,1,3,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1 WHERE `ID`=1778; + +-- Quest "Tome of Divinity (Part 5)" +DELETE FROM `quest_details` WHERE `ID`=1779; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1779,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=33, `Emote2`=2, `Emote3`=1, `Emote4`=1 WHERE `ID`=1779; + +-- Quest "Tome of Divinity (Part 6)" +DELETE FROM `quest_details` WHERE `ID`=1783; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1783,1,1,1,6,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1, `Emote4`=1 WHERE `ID`=1783; + +-- Quest "Tome of Divinity (Part 7)" +DELETE FROM `quest_details` WHERE `ID`=1784; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1784,1,1,1,1,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=1784; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1 WHERE `ID`=1784; + +-- Quest "Tome of Divinity (Part 8)" +DELETE FROM `quest_details` WHERE `ID`=1785; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1785,1,1,2,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=1, `Emote4`=2 WHERE `ID`=1785; + +-- Quest "Taming the Beast" +DELETE FROM `quest_details` WHERE `ID` IN (6064,6084,6085,6086); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6064,1,0,0,0,0,0,0,0,0), +(6084,1,0,0,0,0,0,0,0,0), +(6085,1,0,0,0,0,0,0,0,0), +(6086,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID` IN (6064); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID` IN (6084,6085); +UPDATE `quest_offer_reward` SET `Emote1`=273 WHERE `ID`=6064; +UPDATE `quest_offer_reward` SET `Emote1`=25 WHERE `ID`=6084; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6085; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1 WHERE `ID`=6086; + +-- Quest "I Got Nothin' Left!" +DELETE FROM `quest_details` WHERE `ID`=6609; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6609,5,25,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6609; + +-- Quest "Nat Pagle, Angler Extreme" +DELETE FROM `quest_details` WHERE `ID`=6607; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6607,1,1,5,1,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=6607; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=6607; + +-- Quest "The Shattered Necklace" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=2198; +UPDATE `quest_offer_reward` SET `Emote1`=25 WHERE `ID`=2198; + +-- Quest "Lore for a Price" +DELETE FROM `quest_details` WHERE `ID`=2199; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2199,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=2199; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=2199; + +-- Quest "Back to Uldaman" +DELETE FROM `quest_details` WHERE `ID`=2200; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2200,1,0,0,0,0,0,0,0,0); + +-- Quest "Replacement Phial" +DELETE FROM `quest_details` WHERE `ID`=3375; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(3375,6,5,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=3375; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=3375; + +-- Quest "Find the Gems" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=2201; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2201; + +-- Quest "Restoring the Necklace" +DELETE FROM `quest_details` WHERE `ID`=2204; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(2204,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=2204; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=2204; + +-- Quest "Restoring the Necklace" +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=2361; + +-- Quest "An Earnest Proposition" +DELETE FROM `quest_details` WHERE `ID` IN (8905,8906,8907,8908,8909,8910,8911,8912,10492,8913,8914,8915,8916,8917,8918,8919,8920,10493); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8905,2,1,1,0,0,0,0,0,0), +(8906,2,1,1,0,0,0,0,0,0), +(8907,2,1,1,0,0,0,0,0,0), +(8908,2,1,1,0,0,0,0,0,0), +(8909,2,1,1,0,0,0,0,0,0), +(8910,2,1,1,0,0,0,0,0,0), +(8911,2,1,1,0,0,0,0,0,0), +(8912,2,1,1,0,0,0,0,0,0), +(10492,2,1,1,0,0,0,0,0,0), +(8913,2,1,1,0,0,0,0,0,0), +(8914,2,1,1,0,0,0,0,0,0), +(8915,2,1,1,0,0,0,0,0,0), +(8916,2,1,1,0,0,0,0,0,0), +(8917,2,1,1,0,0,0,0,0,0), +(8918,2,1,1,0,0,0,0,0,0), +(8919,2,1,1,0,0,0,0,0,0), +(8920,2,1,1,0,0,0,0,0,0), +(10493,2,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8905,8906,8907,8908,8909,8910,8911,8912,10492,8913,8914,8915,8916,8917,8918,8919,8920,10493); +UPDATE `quest_offer_reward` SET `Emote1`=273, `Emote2`=1 WHERE `ID` IN (8905,8906,8907,8908,8909,8910,8911,8912,10492,8913,8914,8915,8916,8917,8918,8919,8920,10493); + +-- Quest "A Supernatural Device" +DELETE FROM `quest_details` WHERE `ID` IN (8922,8923); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8922,1,1,0,0,0,0,0,0,0), +(8923,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID` IN (8922,8923); +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=6 WHERE `ID` IN (8922,8923); + +-- Quest "The Ectoplasmic Distiller" +DELETE FROM `quest_details` WHERE `ID`=8921; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8921,5,6,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=8921; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=8921; + +-- Quest "Hunting for Ectoplasm" +DELETE FROM `quest_details` WHERE `ID`=8924; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8924,5,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=8924; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8924; + +-- Quest "A Portable Power Source" +DELETE FROM `quest_details` WHERE `ID`=8925; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8925,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=8925; +UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=8925; + +-- Quest "A Shifty Merchant" +DELETE FROM `quest_details` WHERE `ID`=8928; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8928,1,1,25,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=8928; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=8928; + +-- Quest "Return to Deliana" +DELETE FROM `quest_details` WHERE `ID`=8977; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8977,2,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=8977; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8977; + +-- Quest "Return to Mokvar" +DELETE FROM `quest_details` WHERE `ID`=8978; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8978,2,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=8978; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8978; + +-- Quest "Just Compensation" +DELETE FROM `quest_details` WHERE `ID` IN (8926,8931,8932,8933,8934,8935,8936,8937,10494,8927,8938,8939,8940,8941,8942,8943,8944,10495); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8926,1,1,0,0,0,0,0,0,0), +(8931,1,1,0,0,0,0,0,0,0), +(8932,1,1,0,0,0,0,0,0,0), +(8933,1,1,0,0,0,0,0,0,0), +(8934,1,1,0,0,0,0,0,0,0), +(8935,1,1,0,0,0,0,0,0,0), +(8936,1,1,0,0,0,0,0,0,0), +(8937,1,1,0,0,0,0,0,0,0), +(10494,1,1,0,0,0,0,0,0,0), +(8927,1,1,0,0,0,0,0,0,0), +(8938,1,1,0,0,0,0,0,0,0), +(8939,1,1,0,0,0,0,0,0,0), +(8940,1,1,0,0,0,0,0,0,0), +(8941,1,1,0,0,0,0,0,0,0), +(8942,1,1,0,0,0,0,0,0,0), +(8943,1,1,0,0,0,0,0,0,0), +(8944,1,1,0,0,0,0,0,0,0), +(10495,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8926,8931,8932,8933,8934,8935,8936,8937,10494,8927,8938,8939,8940,8941,8942,8943,8944,10495); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID` IN (8926,8931,8932,8933,8934,8935,8936,8937,10494,8927,8938,8939,8940,8941,8942,8943,8944,10495); + +-- Quest "A Supernatural Device" +DELETE FROM `quest_details` WHERE `ID` IN (8929,8930); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8929,1,1,0,0,0,0,0,0,0), +(8930,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID` IN (8929,8930); + +-- Quest "Dead Man's Plea" +DELETE FROM `quest_details` WHERE `ID`=8945; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8945,1,5,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=6 WHERE `ID`=8945; + +-- Quest "Proof of Life" +DELETE FROM `quest_details` WHERE `ID`=8946; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8946,1,1,2,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=8946; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=8946; + +-- Quest "Anthion's Strange Request" +DELETE FROM `quest_details` WHERE `ID`=8947; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8947,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=8947; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8947; + +-- Quest "Anthion's Old Friend" +DELETE FROM `quest_details` WHERE `ID`=8948; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8948,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=8948; + +-- Quest "Falrin's Vendetta" +DELETE FROM `quest_details` WHERE `ID`=8949; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8949,1,1,5,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=8949; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=8949; + +-- Quest "The Instigator's Enchantment" +DELETE FROM `quest_details` WHERE `ID`=8950; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8950,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=8950; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8950; + +-- Quest "The Challenge" +DELETE FROM `quest_details` WHERE `ID`=9015; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(9015,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=9015; +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=9015; + +-- Quest "Anthion's Parting Words" +DELETE FROM `quest_details` WHERE `ID` IN (8951,8952,8953,8954,8955,8956,8957,8958,8959,9016,9017,9018,9019,9020,9021,9022,10496,10497); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8951,1,1,1,2,0,0,0,0,0), +(8952,1,1,1,2,0,0,0,0,0), +(8953,1,1,1,2,0,0,0,0,0), +(8954,1,1,1,2,0,0,0,0,0), +(8955,1,1,1,2,0,0,0,0,0), +(8956,1,1,1,2,0,0,0,0,0), +(8957,1,1,1,2,0,0,0,0,0), +(8958,1,1,1,2,0,0,0,0,0), +(8959,1,1,1,2,0,0,0,0,0), +(9016,1,1,1,2,0,0,0,0,0), +(9017,1,1,1,2,0,0,0,0,0), +(9018,1,1,1,2,0,0,0,0,0), +(9019,1,1,1,2,0,0,0,0,0), +(9020,1,1,1,2,0,0,0,0,0), +(9021,1,1,1,2,0,0,0,0,0), +(9022,1,1,1,2,0,0,0,0,0), +(10496,1,1,1,2,0,0,0,0,0), +(10497,1,1,1,2,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID` IN (8951,8952,8953,8954,8955,8956,8957,8958,8959,9016,9017,9018,9019,9020,9021,9022); +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID` IN (8951,8952,8953,8954,8955,8956,8958,8959); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID` IN (9016,9017,9018,9019,9020,9021,9022); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `RewardText`="This curse was bestowed upon us but for a mere medallion. Lord Valthalak certainly knows how to hold a grudge.$B$BWe'll endeavor to find the remaining pieces - hopefully before I meet an untimely demise. But before that, let us see about your reward." WHERE `ID`=8957; +DELETE FROM `quest_request_items` WHERE `ID` IN (10496,10497); +INSERT INTO `quest_request_items` (`ID`, `EmoteOnComplete`, `EmoteOnIncomplete`, `CompletionText`, `VerifiedBuild`) VALUES +(10496,1,1,"You're back, $N. You must tell me all about what you've found out. But first let us arrange for your reward.",0), +(10497,1,1,"You've returned and I see in your eyes that you've much to tell me, $N. Let us take care of your reward first.",0); +DELETE FROM `quest_offer_reward` WHERE `ID` IN (10496,10497); +INSERT INTO `quest_offer_reward` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `RewardText`, `VerifiedBuild`) VALUES +(10496,5,1,0,0,0,0,0,0,"I can't believe our lives are all but forfeit all because of a stupid medallion! And you're sure Anthion mentioned Bodley?$B$BWell, you've done your job so let's get your reward out of the way.",0), +(10497,6,1,0,0,0,0,0,0,"This curse was bestowed upon us but for a mere medallion. Lord Valthalak certainly knows how to hold a grudge.$B$BWe'll endeavor to find the remaining pieces - hopefully before I meet an untimely demise. But before that, let us see about your reward.",0); + +-- Quest "Bodley's Unfortunate Fate" +DELETE FROM `quest_details` WHERE `ID` IN (8960,9032); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8960,6,1,1,0,0,0,0,0,0), +(9032,5,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=6, `Emote3`=1, `Emote4`=2 WHERE `ID` IN (8960,9032); + +-- Quest "Three Kings of Flame" +DELETE FROM `quest_details` WHERE `ID`=8961; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8961,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=8961; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=8961; + +-- Quest "Components of Importance" +DELETE FROM `quest_details` WHERE `ID` IN (8962,8963,8964,8965); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8962,1,1,1,0,0,0,0,0,0), +(8963,1,1,1,0,0,0,0,0,0), +(8964,1,1,1,0,0,0,0,0,0), +(8965,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8962,8963,8964,8965); +UPDATE `quest_offer_reward` SET `Emote1`=21, `Emote2`=1, `Emote3`=1 WHERE `ID` IN (8962,8963,8964,8965); + +-- Quest "The Left Piece of Lord Valthalak's Amulet" +DELETE FROM `quest_details` WHERE `ID` IN (8966,8967,8968,8969); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8966,1,1,1,0,0,0,0,0,0), +(8967,1,1,1,0,0,0,0,0,0), +(8968,1,1,1,0,0,0,0,0,0), +(8969,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8966,8967,8968,8969); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1 WHERE `ID` IN (8966,8967,8968,8969); + +-- Quest "I See Alcaz Island In Your Future..." +DELETE FROM `quest_details` WHERE `ID`=8970; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8970,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=8970; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=8970; + +-- Quest "More Components of Importance" +DELETE FROM `quest_details` WHERE `ID` IN (8985,8986,8987,8988); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8985,1,1,1,0,0,0,0,0,0), +(8986,1,1,1,0,0,0,0,0,0), +(8987,1,1,1,0,0,0,0,0,0), +(8988,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8985,8986,8987,8988); +UPDATE `quest_offer_reward` SET `Emote1`=21, `Emote2`=1, `Emote3`=1 WHERE `ID` IN (8985,8986,8987,8988); + +-- Quest "The Right Piece of Lord Valthalak's Amulet" +DELETE FROM `quest_details` WHERE `ID` IN (8989,8990,8991,8992); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8989,1,1,1,0,0,0,0,0,0), +(8990,1,1,1,0,0,0,0,0,0), +(8991,1,1,1,0,0,0,0,0,0), +(8992,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8989,8990,8991,8992); +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1 WHERE `ID` IN (8989,8990,8991,8992); + +-- Quest "Final Preparations" +DELETE FROM `quest_details` WHERE `ID`=8994; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8994,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=2, `EmoteOnComplete`=2 WHERE `ID`=8994; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=5 WHERE `ID`=8994; + +-- Quest "Final Preparations" +DELETE FROM `quest_details` WHERE `ID`=8995; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8995,1,1,1,1,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=15, `EmoteOnComplete`=15 WHERE `ID`=8995; + +-- Quest "Final Preparations" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=8996; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1, `Emote4`=2 WHERE `ID`=8996; + +-- Quest "Back to the Beginning" +DELETE FROM `quest_details` WHERE `ID` IN (8997,8998); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8997,1,1,0,0,0,0,0,0,0), +(8998,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID` IN (8997,8998); + +-- Quest "Saving the Best for Last" +DELETE FROM `quest_details` WHERE `ID` IN (8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9011,9012,9013,9014,10498,10499); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8999,1,1,0,0,0,0,0,0,0), +(9000,1,1,0,0,0,0,0,0,0), +(9001,1,1,0,0,0,0,0,0,0), +(9002,1,1,0,0,0,0,0,0,0), +(9003,1,1,0,0,0,0,0,0,0), +(9004,1,1,0,0,0,0,0,0,0), +(9005,1,1,0,0,0,0,0,0,0), +(9006,1,1,0,0,0,0,0,0,0), +(9007,1,1,0,0,0,0,0,0,0), +(9008,1,1,0,0,0,0,0,0,0), +(9009,1,1,0,0,0,0,0,0,0), +(9010,1,1,0,0,0,0,0,0,0), +(9011,1,1,0,0,0,0,0,0,0), +(9012,1,1,0,0,0,0,0,0,0), +(9013,1,1,0,0,0,0,0,0,0), +(9014,1,1,0,0,0,0,0,0,0), +(10498,1,1,0,0,0,0,0,0,0), +(10499,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9011,9012,9013,9014); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID` IN (8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9011,9012,9013,9014); +DELETE FROM `quest_request_items` WHERE `ID` IN (10498,10499); +INSERT INTO `quest_request_items` (`ID`, `EmoteOnComplete`, `EmoteOnIncomplete`, `CompletionText`, `VerifiedBuild`) VALUES +(10498,6,6,"As per our deal, are you ready to hand over your Wildheart pieces in exchange for your new Feralheart Cowl and Vest?",0), +(10499,6,6,"As per our deal, are you ready to hand over your Magister's pieces in exchange for your new Sorcerer's Crown and Robes?",0); +DELETE FROM `quest_offer_reward` WHERE `ID` IN (10498,10499); +INSERT INTO `quest_offer_reward` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `RewardText`, `VerifiedBuild`) VALUES +(10498,1,2,0,0,0,0,0,0,"I'm going to miss you, $N. I owe you such a debt of gratitude; I think I'll never be able to repay it.$B$BI hope that you enjoy your new head and chest armor, and that it protects you for a long time to come.",0), +(10499,1,2,0,0,0,0,0,0,"I will truly miss you, $N. There is a debt that I owe you, which I may never be able to repay.$B$BEnjoy your new head and chest armor. May it protect you for a long time to come, and help you to achieve even greater honor!",0); + +-- Quest "The Art of the Armorsmith" +DELETE FROM `quest_details` WHERE `ID`=5283; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(5283,1,1,1,6,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=5283; +UPDATE `quest_offer_reward` SET `Emote1`=25, `Emote2`=1 WHERE `ID`=5283; + +-- Quest "The Art of the Armorsmith" +DELETE FROM `quest_details` WHERE `ID`=5301; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(5301,1,1,1,6,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=5301; +UPDATE `quest_offer_reward` SET `Emote1`=25, `Emote2`=1 WHERE `ID`=5301; + +-- Quest "The Way of the Weaponsmith" +DELETE FROM `quest_details` WHERE `ID`=5284; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(5284,1,1,1,25,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=5284; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=5284; + +-- Quest "The Way of the Weaponsmith" +DELETE FROM `quest_details` WHERE `ID`=5302; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(5302,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=4, `EmoteOnComplete`=4 WHERE `ID`=5302; +UPDATE `quest_offer_reward` SET `Emote1`=25, `Emote2`=1 WHERE `ID`=5302; From 8bc95c2b1c6cb82c1ae55a34a3e13a3bfff4853b Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 27 Jul 2018 15:17:54 +0200 Subject: [PATCH 010/102] DB/SAI: Wetlands Closes #22195 --- .../world/3.3.5/2018_07_27_05_world_335.sql | 357 ++++++++++++++++++ 1 file changed, 357 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_27_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_27_05_world_335.sql b/sql/updates/world/3.3.5/2018_07_27_05_world_335.sql new file mode 100644 index 0000000000..73eecef245 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_27_05_world_335.sql @@ -0,0 +1,357 @@ +-- +-- Ma'ruk Wyrmscale +DELETE FROM `smart_scripts` WHERE `entryorguid`=2090 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2090,0,0,0,4,0,100,0,0,0,0,0,0,11,9128,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ma'ruk Wyrmscale - On Aggro - Cast 'Battle Shout'"); + +-- Black Slime +DELETE FROM `smart_scripts` WHERE `entryorguid`=1030 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1030,0,0,0,0,0,100,1,5000,9000,0,0,0,11,3335,0,0,0,0,0,1,0,0,0,0,0,0,0,"Black Slime - In Combat - Cast 'Dark Sludge' (No Repeat)"); + +-- Sludginn +DELETE FROM `smart_scripts` WHERE `entryorguid`=14433 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(14433,0,0,0,0,0,100,1,9000,11000,0,0,0,11,3335,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sludginn - In Combat - Cast 'Dark Sludge' (No Repeat)"), +(14433,0,1,0,0,0,100,0,5000,8000,21000,23000,0,11,3358,32,0,0,0,0,2,0,0,0,0,0,0,0,"Sludginn - In Combat - Cast 'Leech Poison'"); + +-- Mosshide Gnoll +DELETE FROM `smart_scripts` WHERE `entryorguid`=1007 AND `source_type`=0 AND `id` IN (1,2,3); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1007,0,1,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Gnoll - On Reset - Cast 'Moss Hide'"), +(1007,0,2,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mosshide Gnoll - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Mosshide Mongrel +DELETE FROM `smart_scripts` WHERE `entryorguid`=1008 AND `source_type`=0 AND `id` IN (1,2,3,4); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1008,0,1,0,0,0,100,0,6000,13000,17000,24000,0,11,8016,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mosshide Mongrel - In Combat - Cast 'Spirit Decay'"), +(1008,0,2,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Mongrel - On Reset - Cast 'Moss Hide'"), +(1008,0,3,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mosshide Mongrel - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Mosshide Fenrunner +DELETE FROM `smart_scripts` WHERE `entryorguid`=1010 AND `source_type`=0 AND `id` IN (1,2,3); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1010,0,1,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Fenrunner - On Reset - Cast 'Moss Hide'"), +(1010,0,2,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mosshide Fenrunner - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Mosshide Mistweaver +UPDATE `smart_scripts` SET `event_param3`=3000, `event_param4`=5000 WHERE `entryorguid`=1009 AND `source_type`=0 AND `id`=2; +DELETE FROM `smart_scripts` WHERE `entryorguid`=1009 AND `source_type`=0 AND `id` IN (0,3,4,5); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1009,0,0,0,1,0,100,0,1000,1000,1800000,1800000,0,11,12544,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Mistweaver - Out of Combat - Cast 'Frost Armor'"), +(1009,0,3,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Mistweaver - On Reset - Cast 'Moss Hide'"), +(1009,0,4,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mosshide Mistweaver - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Mosshide Trapper +DELETE FROM `smart_scripts` WHERE `entryorguid`=1011 AND `source_type`=0 AND `id` IN (1,2,3,4); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1011,0,1,0,0,0,100,0,4000,11000,15000,22000,0,11,6533,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mosshide Trapper - In Combat - Cast 'Net'"), +(1011,0,2,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Trapper - On Reset - Cast 'Moss Hide'"), +(1011,0,3,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mosshide Trapper - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Mosshide Brute +DELETE FROM `smart_scripts` WHERE `entryorguid`=1012 AND `source_type`=0 AND `id`=2; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1012,0,2,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Brute - On Reset - Cast 'Moss Hide'"); + +-- Mosshide Alpha +DELETE FROM `smart_scripts` WHERE `entryorguid`=1014 AND `source_type`=0 AND `id` IN (1,2,3,4); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1014,0,1,0,4,0,100,0,0,0,0,0,0,11,9128,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Alpha - On Aggro - Cast 'Battle Shout'"), +(1014,0,2,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Alpha - On Reset - Cast 'Moss Hide'"), +(1014,0,3,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mosshide Alpha - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Mosshide Mystic +DELETE FROM `smart_scripts` WHERE `entryorguid`=1013 AND `source_type`=0 AND `id` IN (2,3,4,5,6); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1013,0,2,0,0,0,100,0,8000,14000,18000,24000,0,11,11436,0,0,0,0,0,5,0,0,0,0,0,0,0,"Mosshide Mystic - In Combat - Cast 'Slow'"), +(1013,0,3,0,14,0,100,0,320,40,25000,30000,0,11,11986,0,0,0,0,0,7,0,0,0,0,0,0,0,"Mosshide Mystic - Friendly At 320 Health - Cast 'Healing Wave'"), +(1013,0,4,0,25,0,100,0,0,0,0,0,0,11,8852,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mosshide Mystic - On Reset - Cast 'Moss Hide'"), +(1013,0,5,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mosshide Mystic - Between 0-15% Health - Flee For Assist (No Repeat)"); + +-- Leech Stalker +DELETE FROM `smart_scripts` WHERE `entryorguid`=1111 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1111,0,0,0,0,0,100,0,5000,13000,21000,23000,0,11,3358,32,0,0,0,0,2,0,0,0,0,0,0,0,"Leech Stalker - In Combat - Cast 'Leech Poison'"); + +-- Cave Stalker +DELETE FROM `smart_scripts` WHERE `entryorguid`=4040 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(4040,0,0,0,0,0,100,0,5000,13000,21000,23000,0,11,3358,32,0,0,0,0,2,0,0,0,0,0,0,0,"Cave Stalker - In Combat - Cast 'Leech Poison'"); + +-- Leech Widow +DELETE FROM `smart_scripts` WHERE `entryorguid`=1112 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1112,0,0,0,0,0,100,0,7000,11000,21000,22000,0,11,3388,32,0,0,0,0,2,0,0,0,0,0,0,0,"Leech Widow - In Combat - Cast 'Deadly Leech Poison'"); + +-- Red Whelp +DELETE FROM `smart_scripts` WHERE `entryorguid`=1042 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1042,0,0,0,0,0,100,0,3000,11000,13000,21000,0,11,3356,0,0,0,0,0,2,0,0,0,0,0,0,0,"Red Whelp - In Combat - Cast 'Flame Lash'"); + +-- Black Ooze +DELETE FROM `smart_scripts` WHERE `entryorguid`=1032 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1032,0,0,0,25,0,100,0,0,0,0,0,0,11,3235,0,0,0,0,0,1,0,0,0,0,0,0,0,"Black Ooze - On Reset - Cast 'Rancid Blood'"); + +-- Crimson Ooze +DELETE FROM `smart_scripts` WHERE `entryorguid`=1031 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1031,0,0,0,25,0,100,0,0,0,0,0,0,11,3235,0,0,0,0,0,1,0,0,0,0,0,0,0,"Crimson Ooze - On Reset - Cast 'Rancid Blood'"); + +-- Monstrous Ooze +DELETE FROM `smart_scripts` WHERE `entryorguid`=1033 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1033,0,0,0,25,0,100,0,0,0,0,0,0,11,3235,0,0,0,0,0,1,0,0,0,0,0,0,0,"Monstrous Ooze - On Reset - Cast 'Rancid Blood'"); + +-- Rotting Ancestor +DELETE FROM `smart_scripts` WHERE `entryorguid`=1530 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1530,0,0,0,25,0,100,0,0,0,0,0,0,11,3235,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rotting Ancestor - On Reset - Cast 'Rancid Blood'"); + +-- Bleeding Horror +DELETE FROM `smart_scripts` WHERE `entryorguid`=1529 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1529,0,0,0,25,0,100,0,0,0,0,0,0,11,3235,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bleeding Horror - On Reset - Cast 'Rancid Blood'"); + +-- Highland Lashtail +DELETE FROM `smart_scripts` WHERE `entryorguid`=1016 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1016,0,0,0,0,0,100,0,5000,11000,13000,19000,0,11,6607,2,0,0,0,0,2,0,0,0,0,0,0,0,"Highland Lashtail - In Combat - Cast 'Lash'"); +UPDATE `smart_scripts` SET `action_param2`=2 WHERE `action_type`=11 AND `action_param1`=6607; + +-- Highland Scytheclaw +DELETE FROM `smart_scripts` WHERE `entryorguid`=1017 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1017,0,0,0,0,0,100,0,4000,9000,12000,17000,0,11,3147,0,0,0,0,0,2,0,0,0,0,0,0,0,"Highland Scytheclaw - In Combat - Cast 'Rend Flesh'"); + +-- Highland Razormaw +DELETE FROM `smart_scripts` WHERE `entryorguid`=1018 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1018,0,0,0,0,0,100,0,5000,12000,15000,19000,0,11,3427,0,0,0,0,0,2,0,0,0,0,0,0,0,"Highland Razormaw - In Combat - Cast 'Infected Wound'"); + +-- Elder Razormaw +DELETE FROM `smart_scripts` WHERE `entryorguid`=1019 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1019,0,0,0,0,0,100,0,4000,9000,11000,16000,0,11,3604,0,0,0,0,0,2,0,0,0,0,0,0,0,"Elder Razormaw - In Combat - Cast 'Tendon Rip'"); + +-- Razormaw Matriarch +DELETE FROM `smart_scripts` WHERE `entryorguid`=1140 AND `source_type`=0 AND `id` IN (2,3); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1140,0,2,0,12,0,100,1,0,20,0,0,0,11,7938,0,0,0,0,0,2,0,0,0,0,0,0,0,"Razormaw Matriarch - In Combat - Target Between 0-20% Health - Cast 'Fatal Bite' (No Repeat)"), +(1140,0,3,0,0,0,100,0,5000,8000,11000,16000,0,11,3147,0,0,0,0,0,2,0,0,0,0,0,0,0,"Razormaw Matriarch - In Combat - Cast 'Rend Flesh'"); + +-- Dark Iron Dwarf +DELETE FROM `smart_scripts` WHERE `entryorguid`=1051 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1051,0,1,0,0,0,100,0,1000,8000,11000,20000,0,11,7891,2,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Iron Dwarf - In Combat - Cast 'Gift of Ragnaros'"); + +-- Dark Iron Rifleman +DELETE FROM `smart_scripts` WHERE `entryorguid`=6523 AND `source_type`=0 AND `id`=2; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(6523,0,2,0,0,0,100,0,1000,8000,11000,20000,0,11,7891,2,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Iron Rifleman - In Combat - Cast 'Gift of Ragnaros'"); + +-- Dark Iron Demolitionist +DELETE FROM `smart_scripts` WHERE `entryorguid`=1054 AND `source_type`=0 AND `id`=2; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1054,0,2,0,0,0,100,0,1000,8000,11000,20000,0,11,7891,2,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Iron Demolitionist - In Combat - Cast 'Gift of Ragnaros'"); + +-- Dark Iron Saboteur +DELETE FROM `smart_scripts` WHERE `entryorguid`=1052 AND `source_type`=0 AND `id` IN (0,4); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1052,0,0,0,0,0,100,0,1000,8000,11000,20000,0,11,7891,2,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Iron Saboteur - In Combat - Cast 'Gift of Ragnaros'"), +(1052,0,4,0,4,0,15,0,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Iron Saboteur - On Aggro - Say Line 2"); + +DELETE FROM `creature_text` WHERE `CreatureID`=1052 AND `GroupID`=2; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1052,2,0,"Never cross a Dark Iron, $C.",12,0,100,0,0,0,1934,0,"Dark Iron Saboteur"), +(1052,2,1,"Time to die, $C.",12,0,100,0,0,0,1935,0,"Dark Iron Saboteur"), +(1052,2,2,"Feel the power of the Dark Iron Dwarves!",12,0,100,0,0,0,1936,0,"Dark Iron Saboteur"); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=3204; +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +(3204,8329,0,"Sapper Explode"); + +-- Dark Iron Tunneler +DELETE FROM `smart_scripts` WHERE `entryorguid`=1053 AND `source_type`=0 AND `id` IN (1,2,3); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1053,0,1,0,4,0,100,0,0,0,0,0,0,11,7164,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Iron Tunneler - In Combat - Cast 'Defensive Stance'"), +(1053,0,2,0,0,0,100,0,1000,8000,11000,20000,0,11,7891,2,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Iron Tunneler - In Combat - Cast 'Gift of Ragnaros'"), +(1053,0,3,0,0,0,100,0,5000,9000,11000,15000,0,11,11971,2,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Iron Tunneler - In Combat - Cast 'Sunder Armor'"); + +-- Balgaras the Foul +DELETE FROM `smart_scripts` WHERE `entryorguid`=1364 AND `source_type`=0 AND `id` IN (2,3,4); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1364,0,2,0,0,0,100,0,3000,5000,11000,13000,0,11,9081,0,0,0,0,0,1,0,0,0,0,0,0,0,"Balgaras the Foul - In Combat - Cast 'Shadow Bolt Volley'"), +(1364,0,3,0,0,0,100,0,8000,12000,13000,16000,0,11,11831,0,0,0,0,0,1,0,0,0,0,0,0,0,"Balgaras the Foul - In Combat - Cast 'Frost Nova'"), +(1364,0,4,0,0,0,100,0,11000,13000,181000,182000,0,11,3586,0,0,0,0,0,2,0,0,0,0,0,0,0,"Balgaras the Foul - In Combat - Cast 'Volatile Infection'"); + +-- Fen Creeper +DELETE FROM `smart_scripts` WHERE `entryorguid`=1040 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1040,0,0,0,25,0,100,0,0,0,0,0,0,11,22766,0,0,0,0,0,1,0,0,0,0,0,0,0,"Fen Creeper - On Reset - Cast 'Sneak'"); + +-- Chimaera Matriarch +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6167; +DELETE FROM `smart_scripts` WHERE `entryorguid`=6167 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(6167,0,0,0,0,0,100,0,3000,5000,7000,12000,0,11,3396,0,0,0,0,0,5,0,0,0,0,0,0,0,"Chimaera Matriarch - In Combat - Cast 'Corrosive Poison'"); + +-- Condemned Cleric +DELETE FROM `smart_scripts` WHERE `entryorguid`=7070 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7070,0,1,0,14,0,100,0,3000,40,18000,21000,0,11,15586,0,0,0,0,0,7,0,0,0,0,0,0,0,"Condemned Cleric - Friendly At 3000 Health - Cast 'Heal'"); + +-- Condemned Acolyte +DELETE FROM `smart_scripts` WHERE `entryorguid`=7068 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7068,0,1,0,14,0,100,0,3000,40,18000,25000,0,11,25058,0,0,0,0,0,7,0,0,0,0,0,0,0,"Condemned Acolyte - Friendly At 3000 Health - Cast 'Renew'"); + +-- Dragonmaw Raider +DELETE FROM `smart_scripts` WHERE `entryorguid`=1034 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1034,0,1,0,0,0,100,0,2000,13000,15000,26000,0,11,6533,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonmaw Raider - In Combat - Cast 'Net'"); + +-- Dragonmaw Swamprunner +DELETE FROM `smart_scripts` WHERE `entryorguid`=1035 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1035,0,1,0,25,0,100,0,0,0,0,0,0,11,3616,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Swamprunner - On Reset - Cast 'Poison Proc'"); + +-- Garneg Charskull +DELETE FROM `smart_scripts` WHERE `entryorguid`=2108 AND `source_type`=0 AND `id` IN (1,2,3); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2108,0,1,0,0,0,100,0,1000,2000,4000,6000,0,11,184,32,0,0,0,0,1,0,0,0,0,0,0,0,"Garneg Charskull - In Combat - Cast 'Fire Shield II'"), +(2108,0,2,0,0,0,100,0,4000,6000,8000,12000,0,11,15039,0,0,0,0,0,2,0,0,0,0,0,0,0,"Garneg Charskull - In Combat - Cast 'Flame Shock'"), +(2108,0,3,0,0,0,100,0,9000,12000,18000,21000,0,11,6725,0,0,0,0,0,2,0,0,0,0,0,0,0,"Garneg Charskull - In Combat - Cast 'Flame Spike'"); + +-- Dragonmaw Bonewarder +DELETE FROM `smart_scripts` WHERE `entryorguid`=1057 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1057,0,0,0,4,0,15,1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Bonewarder - On Aggro - Say Line 0"), +(1057,0,1,0,1,0,100,1,1000,3000,0,0,0,11,8853,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Bonewarder - Out of Combat - Cast 'Summon Skeleton'"), +(1057,0,2,0,0,0,100,0,3000,6000,14000,19000,0,11,707,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonmaw Bonewarder - In Combat - Cast 'Immolate'"), +(1057,0,3,0,0,0,100,0,8000,14000,8000,14000,0,11,6205,32,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonmaw Bonewarder - In Combat - Cast 'Curse of Weakness'"), +(1057,0,4,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dragonmaw Bonewarder - Between 0-15% Health - Flee For Assist (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=1057; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1057,0,0,"Your bones will break under my boot, $r!",12,1,100,0,0,0,1938,0,"Dragonmaw Bonewarder"), +(1057,0,1,"Long live the Dragonmaw! Die you worthless $r!",12,1,100,0,0,0,1939,0,"Dragonmaw Bonewarder"), +(1057,0,2,"For the Dragonmaw!",12,1,100,0,0,0,1937,0,"Dragonmaw Bonewarder"); + +-- Dragonmaw Shadowwarder +DELETE FROM `smart_scripts` WHERE `entryorguid`=1038 AND `source_type`=0 AND `id`=3; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1038,0,3,0,4,0,15,1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Shadowwarder - On Aggro - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=1038; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1038,0,0,"Your bones will break under my boot, $r!",12,1,100,0,0,0,1938,0,"Dragonmaw Shadowwarder"), +(1038,0,1,"Long live the Dragonmaw! Die you worthless $r!",12,1,100,0,0,0,1939,0,"Dragonmaw Shadowwarder"), +(1038,0,2,"For the Dragonmaw!",12,1,100,0,0,0,1937,0,"Dragonmaw Shadowwarder"); + +-- Dragonmaw Centurion +DELETE FROM `smart_scripts` WHERE `entryorguid`=1036 AND `source_type`=0 AND `id` IN (1,2,3,4); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1036,0,1,0,4,0,100,0,0,0,0,0,0,11,643,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Centurion - On Aggro - Cast 'Devotion Aura'"), +(1036,0,2,0,25,0,100,0,0,0,0,0,0,11,7164,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Centurion - On Reset - Cast 'Defensive Stance'"), +(1036,0,3,0,0,0,100,0,5000,7000,11000,13000,0,11,1672,2,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonmaw Centurion - In Combat - Cast 'Shield Bash'"), +(1036,0,4,0,0,0,100,0,5000,13000,21000,29000,0,11,3419,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Centurion - In Combat - Cast 'Improved Blocking'"); + +-- Dragonmaw Battlemaster +DELETE FROM `smart_scripts` WHERE `entryorguid`=1037 AND `source_type`=0 AND `id` IN (0,2,3); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1037,0,0,0,4,0,100,1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Battlemaster - On Aggro - Say Line 0"), +(1037,0,2,3,0,0,100,0,9000,14000,19000,28000,0,11,3019,2,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Battlemaster - In Combat - Cast 'Frenzy'"), +(1037,0,3,0,61,0,100,1,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonmaw Battlemaster - In Combat - Say Line 1"); + +DELETE FROM `creature_text` WHERE `CreatureID`=1037; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1037,0,0,"Your bones will break under my boot, $r!",12,1,100,0,0,0,1938,0,"Dragonmaw Shadowwarder"), +(1037,0,1,"Long live the Dragonmaw! Die you worthless $r!",12,1,100,0,0,0,1939,0,"Dragonmaw Shadowwarder"), +(1037,0,2,"For the Dragonmaw!",12,1,100,0,0,0,1937,0,"Dragonmaw Shadowwarder"), +(1037,1,0,"%s goes into a frenzy!",16,0,100,0,0,0,2384,0,"Dragonmaw Shadowwarder"); + +-- Chieftain Nek'rosh +UPDATE `smart_scripts` SET `action_param2`=2 WHERE `entryorguid`=2091 AND `source_type`=0 AND `id`=1; + +-- Mottled Scytheclaw +DELETE FROM `smart_scripts` WHERE `entryorguid`=1022 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1022,0,0,0,0,0,100,0,4000,12000,15000,23000,0,11,3147,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mottled Scytheclaw - In Combat - Cast 'Rend Flesh'"); + +-- Mottled Razormaw +DELETE FROM `smart_scripts` WHERE `entryorguid`=1023 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1023,0,0,0,0,0,100,0,5000,12000,15000,19000,0,11,3427,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mottled Razormaw - In Combat - Cast 'Infected Wound'"); + +-- Sarltooth +DELETE FROM `smart_scripts` WHERE `entryorguid`=1353 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(1353,0,0,0,25,0,100,0,0,0,0,0,0,11,8876,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sarltooth - On Reset - Cast 'Thrash'"), +(1353,0,1,0,0,0,100,0,5000,9000,12000,16000,0,11,3427,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sarltooth - In Combat - Cast 'Infected Wound'"); + +-- Bluegill Forager +DELETE FROM `smart_scripts` WHERE `entryorguid`=1026 AND `source_type`=0 AND `id` IN (0,1); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(1026,0,0,0,25,0,100,0,0,0,0,0,0,11,3616,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bluegill Forager - On Reset - Cast 'Poison Proc'"), +(1026,0,1,0,0,0,100,0,5000,11000,13000,19000,0,11,14873,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bluegill Forager - In Combat - Cast 'Sinister Strike'"); + +-- Bluegill Warrior +DELETE FROM `smart_scripts` WHERE `entryorguid`=1027 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1027,0,0,0,4,0,100,0,0,0,0,0,0,11,7165,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bluegill Warrior - On Aggro - Cast 'Battle Stance'"); + +-- Bluegill Muckdweller +DELETE FROM `smart_scripts` WHERE `entryorguid`=1028 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(1028,0,0,0,0,0,100,0,5000,7000,11000,14000,0,11,1777,2,0,0,0,0,2,0,0,0,0,0,0,0,"Bluegill Muckdweller - In Combat - Cast 'Gouge'"); + +-- Bluegill Oracle +DELETE FROM `smart_scripts` WHERE `entryorguid`=1029 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1029,0,1,0,14,0,100,0,350,40,12000,24000,0,11,939,0,0,0,0,0,7,0,0,0,0,0,0,0,"Bluegill Oracle - Friendly At 350 Health - Cast 'Healing Wave'"); + +-- Giant Wetlands Crocolisk +DELETE FROM `smart_scripts` WHERE `entryorguid`=2089 AND `source_type`=0 AND `id`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(2089,0,0,0,0,0,100,0,6000,9000,12000,18000,0,11,3604,2,0,0,0,0,2,0,0,0,0,0,0,0,"Giant Wetlands Crocolisk - In Combat - Cast 'Tendon Rip'"); + +-- Cursed Sailor +DELETE FROM `smart_scripts` WHERE `entryorguid`=1157 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(1157,0,1,0,0,0,100,0,4000,15000,25000,32000,0,11,10651,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cursed Sailor - In Combat - Cast 'Curse of the Eye'"); + +-- Cursed Marine +UPDATE `smart_scripts` SET `event_param1`=4000, `event_param2`=15000, `event_param3`=25000, `event_param4`=32000, `action_param2`=0 WHERE `entryorguid`=1158 AND `source_type`=0 AND `id`=1; + +-- First Mate Snellig +UPDATE `smart_scripts` SET `event_param1`=6000, `event_param2`=9000, `event_param3`=11000, `event_param4`=14000 WHERE `entryorguid`=1159 AND `source_type`=0 AND `id`=0; +UPDATE `smart_scripts` SET `event_param1`=5000, `event_param2`=11000, `event_param3`=9000, `event_param4`=15000 WHERE `entryorguid`=1159 AND `source_type`=0 AND `id`=2; +DELETE FROM `smart_scripts` WHERE `entryorguid`=1159 AND `source_type`=0 AND `id`=3; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1159,0,3,0,4,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"First Mate Snellig - On Aggro - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=1159; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1159,0,0,"Time to join us, $c.",12,0,100,0,0,0,1942,0,"First Mate Snellig"), +(1159,0,1,"Brains...",12,0,100,0,0,0,1940,0,"First Mate Snellig"), +(1159,0,2,"A living $r... soon to be a dead like me.",12,0,100,0,0,0,1941,0,"First Mate Snellig"); + +-- Mirelow +UPDATE `smart_scripts` SET `event_param1`=6000, `event_param2`=9000, `event_param3`=11000, `event_param4`=17000 WHERE `entryorguid`=14424 AND `source_type`=0 AND `id`=0; + +-- Red Wyrmkin +DELETE FROM `smart_scripts` WHERE `entryorguid`=1046 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1046,0,0,0,0,0,100,0,1000,2000,4000,6000,0,11,15242,64,0,0,0,0,2,0,0,0,0,0,0,0,"Red Wyrmkin - In Combat - Cast 'Fireball'"), +(1046,0,1,0,0,0,100,0,8000,16000,21000,26000,0,11,18399,0,0,0,0,0,5,0,0,0,0,0,0,0,"Red Wyrmkin - In Combat - Cast 'Flamestrike'"), +(1046,0,2,0,0,0,100,0,4000,7000,16000,24000,0,11,14145,0,0,0,0,0,5,0,0,0,0,0,0,0,"Red Wyrmkin - In Combat - Cast 'Fire Blast'"), +(1046,0,3,0,0,0,100,0,7000,12000,8000,20000,0,11,15230,0,0,0,0,0,5,0,0,0,0,0,0,0,"Red Wyrmkin - In Combat - Cast 'Arcane Bolt'"); + +-- Fix bytes2 for some range-attacking creatures +UPDATE `creature_addon` SET `bytes2`=2 WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN (2103,6523)); +UPDATE `creature_template_addon` SET `bytes2`=2 WHERE `entry` IN (2103,6523); + +-- Fix spawn position for one creature +UPDATE `creature` SET `position_z`=40.336 WHERE `guid`=10886; From f30049fd5d0d15bcc7754983d2bbc3096f92a4f0 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 29 Jul 2018 01:00:33 +0200 Subject: [PATCH 011/102] DB/Conditions: Klaven Mortwake Closes #21973 --- sql/updates/world/3.3.5/2018_07_29_00_world_335.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_29_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_29_00_world_335.sql b/sql/updates/world/3.3.5/2018_07_29_00_world_335.sql new file mode 100644 index 0000000000..9d67d403e6 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_29_00_world_335.sql @@ -0,0 +1,7 @@ +-- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN(7053) AND `SourceGroup`=4; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 4, 7053, 0, 0, 1, 0, 1784, 0, 0, 0, 0, 0, '', 'Klaven Mortwake - run SAI event 4 only if the player is stealthed'), +(22, 4, 7053, 0, 1, 1, 0, 1785, 0, 0, 0, 0, 0, '', 'Klaven Mortwake - run SAI event 4 only if the player is stealthed'), +(22, 4, 7053, 0, 2, 1, 0, 1786, 0, 0, 0, 0, 0, '', 'Klaven Mortwake - run SAI event 4 only if the player is stealthed'), +(22, 4, 7053, 0, 3, 1, 0, 1787, 0, 0, 0, 0, 0, '', 'Klaven Mortwake - run SAI event 4 only if the player is stealthed'); From 9df082d1114f119dffb46c7bf798598f178d3ccf Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 29 Jul 2018 01:01:15 +0200 Subject: [PATCH 012/102] DB/Quest: Lightforge Ingots Closes #22196 --- sql/updates/world/3.3.5/2018_07_29_01_world_335.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_07_29_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_07_29_01_world_335.sql b/sql/updates/world/3.3.5/2018_07_29_01_world_335.sql new file mode 100644 index 0000000000..a751a6202b --- /dev/null +++ b/sql/updates/world/3.3.5/2018_07_29_01_world_335.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=526; +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES +(1,526,0,"","","Deprecated quest"); From ae52cb5c121f971c585978c5c91272d54adf1ca3 Mon Sep 17 00:00:00 2001 From: Ovah Date: Sun, 29 Jul 2018 18:49:13 +0200 Subject: [PATCH 013/102] Core/Spells: added a helper to reset proc cooldowns (#22137) --- src/server/game/Spells/Auras/SpellAuras.cpp | 5 +++++ src/server/game/Spells/Auras/SpellAuras.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 1377eafa4f..6f6649495f 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1716,6 +1716,11 @@ void Aura::AddProcCooldown(std::chrono::steady_clock::time_point cooldownEnd) m_procCooldown = cooldownEnd; } +void Aura::ResetProcCooldown() +{ + m_procCooldown = std::chrono::steady_clock::now(); +} + void Aura::PrepareProcToTrigger(AuraApplication* aurApp, ProcEventInfo& eventInfo, std::chrono::steady_clock::time_point now) { bool prepare = CallScriptPrepareProcHandlers(aurApp, eventInfo); diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index caf05545ca..6e52f30cc8 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -199,6 +199,7 @@ class TC_GAME_API Aura bool IsProcOnCooldown(std::chrono::steady_clock::time_point now) const; void AddProcCooldown(std::chrono::steady_clock::time_point cooldownEnd); + void ResetProcCooldown(); bool IsUsingCharges() const { return m_isUsingCharges; } void SetUsingCharges(bool val) { m_isUsingCharges = val; } void PrepareProcToTrigger(AuraApplication* aurApp, ProcEventInfo& eventInfo, std::chrono::steady_clock::time_point now); From 68b4424cc0b0f1147d0f6ea68ce9e0309173db98 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 29 Jul 2018 19:25:50 +0200 Subject: [PATCH 014/102] rename files --- sql/updates/world/3.3.5/2018_07_27_00_world_335.sql | 2 -- .../2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql} | 0 ...2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql | 2 ++ ...018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql} | 2 ++ ...018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql} | 2 ++ ...018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql} | 2 ++ ...018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql} | 2 ++ ...018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql} | 2 ++ ...018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql} | 2 ++ ...018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql} | 0 10 files changed, 14 insertions(+), 2 deletions(-) delete mode 100644 sql/updates/world/3.3.5/2018_07_27_00_world_335.sql rename sql/updates/world/{3.3.5/2018_07_25_00_world.sql => 4.3.4/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql} (100%) create mode 100644 sql/updates/world/4.3.4/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql rename sql/updates/world/{3.3.5/2018_07_27_01_world_335.sql => 4.3.4/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_07_27_02_world_335.sql => 4.3.4/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_07_27_03_world_335.sql => 4.3.4/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_07_27_04_world_335.sql => 4.3.4/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_07_27_05_world_335.sql => 4.3.4/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_07_29_00_world_335.sql => 4.3.4/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_07_29_01_world_335.sql => 4.3.4/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql} (100%) diff --git a/sql/updates/world/3.3.5/2018_07_27_00_world_335.sql b/sql/updates/world/3.3.5/2018_07_27_00_world_335.sql deleted file mode 100644 index 02e866d89e..0000000000 --- a/sql/updates/world/3.3.5/2018_07_27_00_world_335.sql +++ /dev/null @@ -1,2 +0,0 @@ --- -UPDATE `creature_text` SET `Text`="%s goes into a frenzy!", `BroadcastTextId`=1191 WHERE `CreatureID`=10882 AND `GroupID`=0; diff --git a/sql/updates/world/3.3.5/2018_07_25_00_world.sql b/sql/updates/world/4.3.4/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_07_25_00_world.sql rename to sql/updates/world/4.3.4/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql new file mode 100644 index 0000000000..847cc682c2 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql @@ -0,0 +1,2 @@ +-- +-- UPDATE `creature_text` SET `Text`="%s goes into a frenzy!", `BroadcastTextId`=1191 WHERE `CreatureID`=10882 AND `GroupID`=0; diff --git a/sql/updates/world/3.3.5/2018_07_27_01_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_07_27_01_world_335.sql rename to sql/updates/world/4.3.4/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql index 8e728305f2..c1832ff791 100644 --- a/sql/updates/world/3.3.5/2018_07_27_01_world_335.sql +++ b/sql/updates/world/4.3.4/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Quest "Replacement Phial" DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=3375; @@ -10,3 +11,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry DELETE FROM `quest_template_addon` WHERE `ID`=3375; INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES (3375,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1); +*/ diff --git a/sql/updates/world/3.3.5/2018_07_27_02_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_07_27_02_world_335.sql rename to sql/updates/world/4.3.4/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql index 1102baa8cc..e0fb834762 100644 --- a/sql/updates/world/3.3.5/2018_07_27_02_world_335.sql +++ b/sql/updates/world/4.3.4/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql @@ -1,3 +1,4 @@ +/* -- Talvash del Kissel DELETE FROM `creature_text` WHERE `CreatureID`=6826 AND `GroupID` IN (1,2,3,4,5); INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -39,3 +40,4 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (6826,8,-4578.79,-998.015,503.657,""), (6826,9,-4586.89,-997.797,503.658,""), (6826,10,-4588.3,-1001.21,503.657,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_07_27_03_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_07_27_03_world_335.sql rename to sql/updates/world/4.3.4/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql index 43055e2933..1e55ceeacd 100644 --- a/sql/updates/world/3.3.5/2018_07_27_03_world_335.sql +++ b/sql/updates/world/4.3.4/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Tidelord Rrurgaz UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=16072; @@ -64,3 +65,4 @@ DELETE FROM `smart_scripts` WHERE `entryorguid`=15552 AND `source_type`=0; INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES (15552,0,0,0,0,0,100,0,8000,14000,8000,14000,0,11,25774,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doctor Weavil - In Combat - Cast 'Mind Shatter'"), (15552,0,1,0,0,0,100,0,15000,15000,120000,120000,0,11,25772,0,0,0,0,0,2,0,0,0,0,0,0,0,"Doctor Weavil - In Combat - Cast 'Mental Domination'"); +*/ diff --git a/sql/updates/world/3.3.5/2018_07_27_04_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_07_27_04_world_335.sql rename to sql/updates/world/4.3.4/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql index 4fa086bc99..88190b5f23 100644 --- a/sql/updates/world/3.3.5/2018_07_27_04_world_335.sql +++ b/sql/updates/world/4.3.4/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Quest "A New Threat" UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=170; @@ -1061,3 +1062,4 @@ INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `Emot (5302,1,1,1,0,0,0,0,0,0); UPDATE `quest_request_items` SET `EmoteOnIncomplete`=4, `EmoteOnComplete`=4 WHERE `ID`=5302; UPDATE `quest_offer_reward` SET `Emote1`=25, `Emote2`=1 WHERE `ID`=5302; +*/ diff --git a/sql/updates/world/3.3.5/2018_07_27_05_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_07_27_05_world_335.sql rename to sql/updates/world/4.3.4/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql index 73eecef245..65798d4e15 100644 --- a/sql/updates/world/3.3.5/2018_07_27_05_world_335.sql +++ b/sql/updates/world/4.3.4/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Ma'ruk Wyrmscale DELETE FROM `smart_scripts` WHERE `entryorguid`=2090 AND `source_type`=0 AND `id`=0; @@ -355,3 +356,4 @@ UPDATE `creature_template_addon` SET `bytes2`=2 WHERE `entry` IN (2103,6523); -- Fix spawn position for one creature UPDATE `creature` SET `position_z`=40.336 WHERE `guid`=10886; +*/ diff --git a/sql/updates/world/3.3.5/2018_07_29_00_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_07_29_00_world_335.sql rename to sql/updates/world/4.3.4/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql index 9d67d403e6..fbde511e29 100644 --- a/sql/updates/world/3.3.5/2018_07_29_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql @@ -1,3 +1,4 @@ +/* -- DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN(7053) AND `SourceGroup`=4; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES @@ -5,3 +6,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (22, 4, 7053, 0, 1, 1, 0, 1785, 0, 0, 0, 0, 0, '', 'Klaven Mortwake - run SAI event 4 only if the player is stealthed'), (22, 4, 7053, 0, 2, 1, 0, 1786, 0, 0, 0, 0, 0, '', 'Klaven Mortwake - run SAI event 4 only if the player is stealthed'), (22, 4, 7053, 0, 3, 1, 0, 1787, 0, 0, 0, 0, 0, '', 'Klaven Mortwake - run SAI event 4 only if the player is stealthed'); +*/ diff --git a/sql/updates/world/3.3.5/2018_07_29_01_world_335.sql b/sql/updates/world/4.3.4/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_07_29_01_world_335.sql rename to sql/updates/world/4.3.4/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql From c25cdcaed43bb08585bb2f24bfc4139e94ca73ce Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Thu, 2 Aug 2018 18:53:15 +0200 Subject: [PATCH 015/102] DB/Gossip: Captain Stoutfist Closes #22202 --- sql/updates/world/3.3.5/2018_08_02_00_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_02_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_02_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_02_00_world_335.sql new file mode 100644 index 0000000000..d91b02be97 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_02_00_world_335.sql @@ -0,0 +1,2 @@ +-- Captain Stoutfist +UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=2104; From d5fb7c863238cdb6588bd0aeb530895572aad4cb Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Thu, 2 Aug 2018 18:54:26 +0200 Subject: [PATCH 016/102] DB/Quest: The Lost Fragments Closes #22208 --- .../world/3.3.5/2018_08_02_01_world_335.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_02_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_02_01_world_335.sql b/sql/updates/world/3.3.5/2018_08_02_01_world_335.sql new file mode 100644 index 0000000000..127e2b563f --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_02_01_world_335.sql @@ -0,0 +1,20 @@ +-- Theldurin the Lost +DELETE FROM `creature_text` WHERE `CreatureID`=2785; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(2785,0,0,"%s begins searching through his pack...",16,0,100,0,0,0,870,0,"Theldurin the Lost"), +(2785,1,0,"Ah! There is my ratchet! Now let's re-attach these scroll fragments.",12,0,100,0,0,0,871,0,"Theldurin the Lost"), +(2785,2,0,"There we are, $n. The Scroll is fixed! Hooray!",12,0,100,4,0,0,872,0,"Theldurin the Lost"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=2785; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2785 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=278500 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2785,0,0,0,20,0,100,0,692,0,0,0,80,278500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Quest 'The Lost Fragments' Finished - Run Script"), +(278500,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Remove Npc Flag Questgiver+Gossip"), +(278500,9,1,0,0,0,100,0,0,0,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Set Emote State 69"), +(278500,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Say Line 0"), +(278500,9,3,0,0,0,100,0,6000,6000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Set Emote State 0"), +(278500,9,4,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Say Line 1"), +(278500,9,5,0,0,0,100,0,4000,4000,0,0,11,5017,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Cast 'Divining Trance'"), +(278500,9,6,0,0,0,100,0,7000,7000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Say Line 2"), +(278500,9,7,0,0,0,100,0,3000,3000,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Add Npc Flag Questgiver+Gossip"); From 8ebae79ad5d7623cf1be92296b20a9d7054a06a8 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Thu, 2 Aug 2018 18:55:01 +0200 Subject: [PATCH 017/102] DB/Gossip: Brumn Winterhoof Closes #22206 --- sql/updates/world/3.3.5/2018_08_02_02_world_335.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_02_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_02_02_world_335.sql b/sql/updates/world/3.3.5/2018_08_02_02_world_335.sql new file mode 100644 index 0000000000..5678c5ab46 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_02_02_world_335.sql @@ -0,0 +1,10 @@ +-- Brumn Winterhoof +UPDATE `creature_template` SET `gossip_menu_id`=3069 WHERE `entry`=7869; + +DELETE FROM `gossip_menu` WHERE `MenuID`=3069; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(3069,3803,0); + +DELETE FROM `gossip_menu_option` WHERE `MenuID`=3069; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES +(3069,0,3,"I would like to train.",5597,5,16,0,0,0,0,"",0,0); From f0412781ad148b83971d924a5eb44ab0461b0984 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Thu, 2 Aug 2018 18:55:35 +0200 Subject: [PATCH 018/102] DB/Quest: Quest Emotes (Wetlands) Closes #22207 --- .../world/3.3.5/2018_08_02_03_world_335.sql | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_02_03_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_02_03_world_335.sql b/sql/updates/world/3.3.5/2018_08_02_03_world_335.sql new file mode 100644 index 0000000000..064768c6a2 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_02_03_world_335.sql @@ -0,0 +1,159 @@ +-- Quest "The Greenwarden" +DELETE FROM `quest_details` WHERE `ID`=463; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(463,1,0,0,0,0,0,0,0,0); + +-- Quest "Daily Delivery" +DELETE FROM `quest_details` WHERE `ID`=469; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(469,3,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=469; + +-- Quest "In Search of The Excavation Team" +DELETE FROM `quest_details` WHERE `ID`=305; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(305,5,1,5,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=305; + +-- Quest "In Search of The Excavation Team" +DELETE FROM `quest_details` WHERE `ID`=306; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(306,5,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=306; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=6, `Emote3`=1 WHERE `ID`=306; + +-- Quest "Uncovering the Past" +DELETE FROM `quest_details` WHERE `ID`=299; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(299,1,1,5,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=299; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=299; + +-- Quest "Ormer's Revenge" +DELETE FROM `quest_details` WHERE `ID`=294; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(294,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=294; + +-- Quest "Ormer's Revenge (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=295; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(295,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=295; + +-- Quest "Ormer's Revenge (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=296; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(296,1,5,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=296; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=296; + +-- Quest "Digging Through the Ooze" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=470; + +-- Quest "The Third Fleet" +DELETE FROM `quest_details` WHERE `ID`=288; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(288,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=288; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=288; + +-- Quest "The Cursed Crew" +DELETE FROM `quest_details` WHERE `ID`=289; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(289,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=20, `EmoteOnComplete`=20 WHERE `ID`=296; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=289; + +-- Quest "Lifting the Curse" +DELETE FROM `quest_details` WHERE `ID`=290; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(290,1,1,0,0,0,0,0,0,0); + +-- Quest "The Eye of Paleth" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=292; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=292; + +-- Quest "Cleansing the Eye" +DELETE FROM `quest_details` WHERE `ID`=293; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(293,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=293; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=293; + +-- Quest "Young Crocolisk Skins" +DELETE FROM `quest_details` WHERE `ID`=484; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(484,2,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=484; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=484; + +-- Quest "Apprentice's Duties" +DELETE FROM `quest_details` WHERE `ID`=471; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(471,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=18, `EmoteOnComplete`=18 WHERE `ID`=471; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=11 WHERE `ID`=471; + +-- Quest "Apprentice's Duties" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=279; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=279; + +-- Quest "Return the Statuette" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=286; + +-- Quest "Report to Captain Stoutfist" +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=473; + +-- Quest "War Banners" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=464; + +-- Quest "Defeat Nek'rosh" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=474; +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=474; + +-- Quest "Fall of Dun Modr" +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=472; + +-- Quest "A Grim Task" +DELETE FROM `quest_details` WHERE `ID`=304; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(304,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=304; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=2 WHERE `ID`=304; + +-- Quest "The Dark Iron War" +DELETE FROM `quest_details` WHERE `ID`=303; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(303,1,1,5,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=303; +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=303; + +-- Quest "The Fury Runs Deep" +DELETE FROM `quest_details` WHERE `ID`=378; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(378,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=378; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=378; + +-- Quest "The Thandol Span" +DELETE FROM `quest_details` WHERE `ID`=631; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(631,5,1,6,0,0,0,0,0,0); + +-- Quest "The Thandol Span (Part 2)" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=632; +UPDATE `quest_offer_reward` SET `Emote1`=18 WHERE `ID`=632; + +-- Quest "The Thandol Span (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=633; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(633,5,1,5,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=633; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=633; + +-- Quest "Plea To The Alliance" +DELETE FROM `quest_details` WHERE `ID`=634; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(634,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=634; From 3ac1e2eb28df26bf00917a7baa76c5049e5eb87a Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Thu, 2 Aug 2018 18:56:10 +0200 Subject: [PATCH 019/102] DB/Text: Inspector Tarem Closes #22220 --- .../world/3.3.5/2018_08_02_04_world_335.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_02_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_02_04_world_335.sql b/sql/updates/world/3.3.5/2018_08_02_04_world_335.sql new file mode 100644 index 0000000000..61f458e941 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_02_04_world_335.sql @@ -0,0 +1,15 @@ +-- Inspector Tarem +DELETE FROM `gossip_menu` WHERE `MenuID`=8761 AND `TextID`=11127; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(8761,11127,0); + +DELETE FROM `npc_text` WHERE `ID`=11127; +INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `Probability0`) VALUES +(11127,"What are you doing here? Do you wish to defile the ashes of this slain family further? Leave this place. You are not welcome.","",22040,0,1); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8761; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,8761,11127,0,0,6,0,67,0,0,0,0,0,"","Show text 11127 if Player is Horde"), +(14,8761,11126,0,0,6,0,469,0,0,0,0,0,"","Show text 11126 if Player is Alliance"); + +UPDATE `smart_scripts` SET `target_type`=1, `target_param1`=0, `target_param2`=0 WHERE `entryorguid`=23567 AND `source_type`=0 AND `id`=2; From 292af096bb6f599b3c0b57a955ebcf3784e67f73 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Thu, 2 Aug 2018 19:09:40 +0200 Subject: [PATCH 020/102] DB/Gossip: Captain Nials, Skuerto & Navigator Mehran Closes #22219 --- .../world/3.3.5/2018_08_02_05_world_335.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_02_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_02_05_world_335.sql b/sql/updates/world/3.3.5/2018_08_02_05_world_335.sql new file mode 100644 index 0000000000..4ef4656b60 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_02_05_world_335.sql @@ -0,0 +1,16 @@ +-- Captain Nials +UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=2700; + +UPDATE `smart_scripts` SET `action_param1`=2 WHERE `entryorguid`=270000 AND `source_type`=9 AND `id` IN (0,9); + +-- Skuerto +UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=2789; + +-- Apprentice Kryten +-- DELETE FROM `gossip_menu` WHERE `MenuID`=2601 AND `TextID`=3294; + +-- Navigator Mehran +UPDATE `npc_text` SET `em0_0`=0, `em0_1`=274 WHERE `ID`=12209; + +-- Restless Apparition +UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=23861; From 41f2b0f02610741a92e1571b40cf39fc781e5149 Mon Sep 17 00:00:00 2001 From: Treeston Date: Mon, 6 Aug 2018 12:04:18 +0200 Subject: [PATCH 021/102] AI/SmartScripts: Warn on startup for ACTION_INVOKER_CAST without invoker (same as invoker targets) --- src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index b8c9c4c789..4d5a4d3630 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -526,7 +526,7 @@ bool SmartAIMgr::IsTargetValid(SmartScriptHolder const& e) case SMART_TARGET_INVOKER_PARTY: if (e.GetScriptType() != SMART_SCRIPT_TYPE_TIMED_ACTIONLIST && e.GetEventType() != SMART_EVENT_LINK && !EventHasInvoker(e.event.type)) { - TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u has invoker target, but action does not provide any invoker!", e.entryOrGuid, e.GetScriptType(), e.GetEventType(), e.GetActionType()); + TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u has invoker target, but event does not provide any invoker!", e.entryOrGuid, e.GetScriptType(), e.GetEventType(), e.GetActionType()); // allow this to load for now // return false; } @@ -1196,8 +1196,15 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) return false; break; } - case SMART_ACTION_ADD_AURA: case SMART_ACTION_INVOKER_CAST: + if (e.GetScriptType() != SMART_SCRIPT_TYPE_TIMED_ACTIONLIST && e.GetEventType() != SMART_EVENT_LINK && !EventHasInvoker(e.event.type)) + { + TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u has invoker cast action, but event does not provide any invoker!", e.entryOrGuid, e.GetScriptType(), e.GetEventType(), e.GetActionType()); + // allow this to load for now + // return false; + } + // no break + case SMART_ACTION_ADD_AURA: if (!IsSpellValid(e, e.action.cast.spell)) return false; break; From 0ef3e6054fd5bce5082cc8495f471921e274aedf Mon Sep 17 00:00:00 2001 From: Dr-J Date: Mon, 6 Aug 2018 14:11:43 +0100 Subject: [PATCH 022/102] DB/SAI: Uniting the Shattered Amulet (3.3.5) Fix effects of http://www.wowhead.com/spell=12938/fel-curse when used for http://www.wowhead.com/quest=3627/uniting-the-shattered-amulet conditions for target of Razelikh the Defiler and Servent of Razelikh already exist in db but should also be usable on the other 3 above units --- .../world/3.3.5/2018_08_06_00_world_335.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_06_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_06_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_06_00_world_335.sql new file mode 100644 index 0000000000..4d4fa32dae --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_06_00_world_335.sql @@ -0,0 +1,16 @@ +DELETE FROM `smart_scripts` WHERE `entryorguid`=7665 AND `source_type`=0 AND `id`=2; +DELETE FROM `smart_scripts` WHERE `entryorguid`=7666 AND `source_type`=0 AND `id`=6; +DELETE FROM `smart_scripts` WHERE `entryorguid`=7667 AND `source_type`=0 AND `id`=5; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7665, 0, 2, 0, 8, 0, 100, 0, 12938, 0, 0, 0, 0, 11, 12941, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Grol the Destroyer - On Spellhit Fel Curse - Cast Fel Curse Effect'), +(7666, 0, 6, 0, 8, 0, 100, 0, 12938, 0, 0, 0, 0, 11, 12942, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Archmage Allistarj - On Spellhit Fel Curse - Cast Fel Curse Effect'), +(7667, 0, 5, 0, 8, 0, 100, 0, 12938, 0, 0, 0, 0, 11, 12943, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lady Sevine - On Spellhit Fel Curse - Cast Fel Curse Effect'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=12938; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 12938, 0, 0, 31, 0, 3, 7665, 0, 0, 0, 0, '', 'Fel Curse Targets Grol the Destroyer'), +(13, 1, 12938, 0, 1, 31, 0, 3, 7666, 0, 0, 0, 0, '', 'Fel Curse Targets Archmage Allistarj'), +(13, 1, 12938, 0, 2, 31, 0, 3, 7667, 0, 0, 0, 0, '', 'Fel Curse Targets Lady Sevine'), +(13, 1, 12938, 0, 3, 31, 0, 3, 7664, 0, 0, 0, 0, '', 'Fel Curse Targets Razelikh the Defiler'), +(13, 1, 12938, 0, 4, 31, 0, 3, 7668, 0, 0, 0, 0, '', 'Fel Curse Targets Servent of Razelikh'); From cfbe5b9b89e9818dd002789a5a415ca9e2e18719 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Tue, 7 Aug 2018 13:23:02 +0200 Subject: [PATCH 023/102] rename files --- sql/updates/world/3.3.5/2018_08_02_00_world_335.sql | 2 -- ...2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql | 2 ++ ...018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql} | 2 ++ ...018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql} | 2 ++ ...018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql} | 2 ++ ...018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql} | 2 ++ ...018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql} | 2 ++ ...018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql} | 2 ++ 8 files changed, 14 insertions(+), 2 deletions(-) delete mode 100644 sql/updates/world/3.3.5/2018_08_02_00_world_335.sql create mode 100644 sql/updates/world/4.3.4/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql rename sql/updates/world/{3.3.5/2018_08_02_01_world_335.sql => 4.3.4/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_02_02_world_335.sql => 4.3.4/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_02_03_world_335.sql => 4.3.4/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_02_04_world_335.sql => 4.3.4/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_02_05_world_335.sql => 4.3.4/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql} (98%) rename sql/updates/world/{3.3.5/2018_08_06_00_world_335.sql => 4.3.4/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql} (99%) diff --git a/sql/updates/world/3.3.5/2018_08_02_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_02_00_world_335.sql deleted file mode 100644 index d91b02be97..0000000000 --- a/sql/updates/world/3.3.5/2018_08_02_00_world_335.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Captain Stoutfist -UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=2104; diff --git a/sql/updates/world/4.3.4/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql new file mode 100644 index 0000000000..6338912ae4 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql @@ -0,0 +1,2 @@ +-- Captain Stoutfist +-- UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=2104; diff --git a/sql/updates/world/3.3.5/2018_08_02_01_world_335.sql b/sql/updates/world/4.3.4/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_02_01_world_335.sql rename to sql/updates/world/4.3.4/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql index 127e2b563f..e7f443ad36 100644 --- a/sql/updates/world/3.3.5/2018_08_02_01_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- Theldurin the Lost DELETE FROM `creature_text` WHERE `CreatureID`=2785; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -18,3 +19,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (278500,9,5,0,0,0,100,0,4000,4000,0,0,11,5017,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Cast 'Divining Trance'"), (278500,9,6,0,0,0,100,0,7000,7000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Say Line 2"), (278500,9,7,0,0,0,100,0,3000,3000,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theldurin the Lost - On Script - Add Npc Flag Questgiver+Gossip"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_02_02_world_335.sql b/sql/updates/world/4.3.4/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_02_02_world_335.sql rename to sql/updates/world/4.3.4/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql index 5678c5ab46..02fe174106 100644 --- a/sql/updates/world/3.3.5/2018_08_02_02_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql @@ -1,3 +1,4 @@ +/* -- Brumn Winterhoof UPDATE `creature_template` SET `gossip_menu_id`=3069 WHERE `entry`=7869; @@ -8,3 +9,4 @@ INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES DELETE FROM `gossip_menu_option` WHERE `MenuID`=3069; INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES (3069,0,3,"I would like to train.",5597,5,16,0,0,0,0,"",0,0); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_02_03_world_335.sql b/sql/updates/world/4.3.4/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_02_03_world_335.sql rename to sql/updates/world/4.3.4/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql index 064768c6a2..7a23d85efa 100644 --- a/sql/updates/world/3.3.5/2018_08_02_03_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql @@ -1,3 +1,4 @@ +/* -- Quest "The Greenwarden" DELETE FROM `quest_details` WHERE `ID`=463; INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES @@ -157,3 +158,4 @@ DELETE FROM `quest_details` WHERE `ID`=634; INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES (634,1,0,0,0,0,0,0,0,0); UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=634; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_02_04_world_335.sql b/sql/updates/world/4.3.4/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_02_04_world_335.sql rename to sql/updates/world/4.3.4/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql index 61f458e941..d4de25fd2b 100644 --- a/sql/updates/world/3.3.5/2018_08_02_04_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- Inspector Tarem DELETE FROM `gossip_menu` WHERE `MenuID`=8761 AND `TextID`=11127; INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES @@ -13,3 +14,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (14,8761,11126,0,0,6,0,469,0,0,0,0,0,"","Show text 11126 if Player is Alliance"); UPDATE `smart_scripts` SET `target_type`=1, `target_param1`=0, `target_param2`=0 WHERE `entryorguid`=23567 AND `source_type`=0 AND `id`=2; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_02_05_world_335.sql b/sql/updates/world/4.3.4/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql similarity index 98% rename from sql/updates/world/3.3.5/2018_08_02_05_world_335.sql rename to sql/updates/world/4.3.4/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql index 4ef4656b60..83cd262fdb 100644 --- a/sql/updates/world/3.3.5/2018_08_02_05_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql @@ -1,3 +1,4 @@ +/* -- Captain Nials UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=2700; @@ -14,3 +15,4 @@ UPDATE `npc_text` SET `em0_0`=0, `em0_1`=274 WHERE `ID`=12209; -- Restless Apparition UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=23861; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_06_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_06_00_world_335.sql rename to sql/updates/world/4.3.4/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql index 4d4fa32dae..897827004c 100644 --- a/sql/updates/world/3.3.5/2018_08_06_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql @@ -1,3 +1,4 @@ +/* DELETE FROM `smart_scripts` WHERE `entryorguid`=7665 AND `source_type`=0 AND `id`=2; DELETE FROM `smart_scripts` WHERE `entryorguid`=7666 AND `source_type`=0 AND `id`=6; DELETE FROM `smart_scripts` WHERE `entryorguid`=7667 AND `source_type`=0 AND `id`=5; @@ -14,3 +15,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (13, 1, 12938, 0, 2, 31, 0, 3, 7667, 0, 0, 0, 0, '', 'Fel Curse Targets Lady Sevine'), (13, 1, 12938, 0, 3, 31, 0, 3, 7664, 0, 0, 0, 0, '', 'Fel Curse Targets Razelikh the Defiler'), (13, 1, 12938, 0, 4, 31, 0, 3, 7668, 0, 0, 0, 0, '', 'Fel Curse Targets Servent of Razelikh'); +*/ From af82810be91a200cb375a6932190c5bdadba4ada Mon Sep 17 00:00:00 2001 From: Treeston Date: Fri, 10 Aug 2018 23:18:04 +0200 Subject: [PATCH 024/102] AI/SmartScripts: Replace SMART_ACTION_INVOKER_CAST with SMART_ACTION_SELF_CAST in action 85. SMART_ACTION_INVOKER_CAST moves to 134. --- .../game/AI/SmartScripts/SmartScript.cpp | 35 ++++++++++++++++++- .../game/AI/SmartScripts/SmartScriptMgr.cpp | 1 + .../game/AI/SmartScripts/SmartScriptMgr.h | 6 ++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index f4e2b0c5b4..8c6e0a3c3b 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -593,6 +593,39 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } break; } + case SMART_ACTION_SELF_CAST: + { + if (targets.empty()) + break; + + if (e.action.cast.targetsLimit) + Trinity::Containers::RandomResize(targets, e.action.cast.targetsLimit); + + TriggerCastFlags triggerFlags = TRIGGERED_NONE; + if (e.action.cast.castFlags & SMARTCAST_TRIGGERED) + { + if (e.action.cast.triggerFlags) + triggerFlags = TriggerCastFlags(e.action.cast.triggerFlags); + else + triggerFlags = TRIGGERED_FULL_MASK; + } + + for (WorldObject* target : targets) + { + Unit* uTarget = target->ToUnit(); + if (!uTarget) + continue; + + if (!(e.action.cast.castFlags & SMARTCAST_AURA_NOT_PRESENT) || !uTarget->HasAura(e.action.cast.spell)) + { + if (e.action.cast.castFlags & SMARTCAST_INTERRUPT_PREVIOUS) + uTarget->InterruptNonMeleeSpells(false); + + uTarget->CastSpell(uTarget, e.action.cast.spell, triggerFlags); + } + } + break; + } case SMART_ACTION_INVOKER_CAST: { Unit* tempLastInvoker = GetLastInvoker(unit); @@ -602,7 +635,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (targets.empty()) break; - if (e.action.cast.targetsLimit > 0 && targets.size() > e.action.cast.targetsLimit) + if (e.action.cast.targetsLimit) Trinity::Containers::RandomResize(targets, e.action.cast.targetsLimit); for (WorldObject* target : targets) diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 4d5a4d3630..842718f61f 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -1204,6 +1204,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) // return false; } // no break + case SMART_ACTION_SELF_CAST: case SMART_ACTION_ADD_AURA: if (!IsSpellValid(e, e.action.cast.spell)) return false; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index e12baebd1a..534f69ee38 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -547,7 +547,7 @@ enum SMART_ACTION SMART_ACTION_ADD_NPC_FLAG = 82, // Flags SMART_ACTION_REMOVE_NPC_FLAG = 83, // Flags SMART_ACTION_SIMPLE_TALK = 84, // groupID, can be used to make players say groupID, Text_over event is not triggered, whisper can not be used (Target units will say the text) - SMART_ACTION_INVOKER_CAST = 85, // spellID, castFlags, if avaliable, last used invoker will cast spellId with castFlags on targets + SMART_ACTION_SELF_CAST = 85, // spellID, castFlags SMART_ACTION_CROSS_CAST = 86, // spellID, castFlags, CasterTargetType, CasterTarget param1, CasterTarget param2, CasterTarget param3, ( + the origonal target fields as Destination target), CasterTargets will cast spellID on all Targets (use with caution if targeting multiple * multiple units) SMART_ACTION_CALL_RANDOM_TIMED_ACTIONLIST = 87, // script9 ids 1-9 SMART_ACTION_CALL_RANDOM_RANGE_TIMED_ACTIONLIST = 88, // script9 id min, max @@ -596,9 +596,9 @@ enum SMART_ACTION SMART_ACTION_SPAWN_SPAWNGROUP = 131, // Group ID, min secs, max secs, spawnflags SMART_ACTION_DESPAWN_SPAWNGROUP = 132, // Group ID, min secs, max secs, spawnflags SMART_ACTION_RESPAWN_BY_SPAWNID = 133, // spawnType, spawnId + SMART_ACTION_INVOKER_CAST = 134, // spellID, castFlags - - SMART_ACTION_END = 134 + SMART_ACTION_END = 135 }; struct SmartAction From 3e6a55534a8ad5f25756d1f3fa76d5b0063a890d Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sat, 11 Aug 2018 01:42:14 +0200 Subject: [PATCH 025/102] DB/SAI: Update Invoker cast action to 134 --- sql/updates/world/4.3.4/2018_08_11_00_world.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/4.3.4/2018_08_11_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_08_11_00_world.sql b/sql/updates/world/4.3.4/2018_08_11_00_world.sql new file mode 100644 index 0000000000..20ebe13a5e --- /dev/null +++ b/sql/updates/world/4.3.4/2018_08_11_00_world.sql @@ -0,0 +1,4 @@ +-- +UPDATE `smart_scripts` SET `action_type`=134 WHERE `action_type` IN (85) AND `target_type` =1; +UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (27202) AND `source_type`=0 AND `id` IN (4,10); +UPDATE `smart_scripts` SET `action_param2`=2 WHERE `entryorguid` IN (27202) AND `source_type`=0 AND `id` IN (7); From 42daf41da3cc901e17d5fc02ea62260af5aa88a1 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sat, 11 Aug 2018 14:29:09 +0200 Subject: [PATCH 026/102] DB/SAI: Update some SAI targets Closes #22250 --- sql/updates/world/3.3.5/2018_08_11_01_world.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_01_world.sql b/sql/updates/world/3.3.5/2018_08_11_01_world.sql new file mode 100644 index 0000000000..6271ce59a9 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_01_world.sql @@ -0,0 +1,5 @@ +-- +UPDATE `smart_scripts` SET `target_type`=7 WHERE `entryorguid` IN (25416, 25418) AND `source_type`=0 AND `id` IN (4); +UPDATE `smart_scripts` SET `target_type`=7 WHERE `entryorguid` IN (20749) AND `source_type`=0 AND `id` IN (1); +UPDATE `smart_scripts` SET `target_type`=7 WHERE `entryorguid` IN (27229) AND `source_type`=0 AND `id` IN (0); +UPDATE `smart_scripts` SET `target_type`=7 WHERE `entryorguid` IN (18955) AND `source_type`=0 AND `id` IN (1); From 7a0b110d67dd0d3493495c9496737002c9adfd7f Mon Sep 17 00:00:00 2001 From: Killyana Date: Sat, 11 Aug 2018 15:16:59 +0200 Subject: [PATCH 027/102] DB/SAI: Update target for whisper text Target self for whisper text type cannot be used anymore Closes #22249 --- sql/updates/world/3.3.5/2018_08_11_02_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_02_world.sql b/sql/updates/world/3.3.5/2018_08_11_02_world.sql new file mode 100644 index 0000000000..300cdb862b --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_02_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `target_type`=23, target_param1=0 WHERE `entryorguid` IN (27899, 32331, 28665, 27959) AND `source_type`=0 AND `action_type` IN (1); From ff3f049fe79a8e27b5849336a1599e2e3e4fb72b Mon Sep 17 00:00:00 2001 From: Killyana Date: Sat, 11 Aug 2018 15:43:38 +0200 Subject: [PATCH 028/102] DB/SAI: Fix 2 DB errors related to invoker --- sql/updates/world/3.3.5/2018_08_11_03_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_03_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_03_world.sql b/sql/updates/world/3.3.5/2018_08_11_03_world.sql new file mode 100644 index 0000000000..b088f35657 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_03_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `target_type`=24 WHERE `entryorguid` IN (25416,25418) AND `source_type`=0 AND `id` IN (4); From 834b6dc8ab072e812aa22eaaabf4516adab99459 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:21:42 +0200 Subject: [PATCH 029/102] DB/Gossip: Apprentice Kryten Closes #22219 --- sql/updates/world/3.3.5/2018_08_11_04_world_335.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_04_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_04_world_335.sql new file mode 100644 index 0000000000..2113c094a1 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_04_world_335.sql @@ -0,0 +1,5 @@ +-- Apprentice Kryten +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=2601; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,2601,3294,0,0,8,0,690,0,0,0,0,0,"","Show gossip text 3294 if quest 'Malin's Request' is rewarded"), +(14,2601,3294,0,0,14,0,691,0,0,0,0,0,"","Show gossip text 3294 if quest 'Worth Its Weight in Gold' is not taken"); From 34cc4bf1d7a57f03b86f9401532deab1715b24ce Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:22:21 +0200 Subject: [PATCH 030/102] DB/Quest: "Shady Rest Inn" Quest Chain (Horde) Closes #22222 --- sql/updates/world/3.3.5/2018_08_11_05_world_335.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_05_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_05_world_335.sql new file mode 100644 index 0000000000..2288df87ca --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_05_world_335.sql @@ -0,0 +1,10 @@ +-- +DELETE FROM `quest_template_addon` WHERE `ID`=1268; +INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES +(1268,0,0,0,0,1276,-1323,0,0,0,0,0,0,0,0,0,0); -- Quest "Suspicious Hoofprints" + +UPDATE `quest_template_addon` SET `ExclusiveGroup`=-1323, `NextQuestID`=1276 WHERE `ID` IN (1323,1273); -- Quests "The Black Shield (Part 4)" / "Questioning Reethe" +UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=1276; -- Quest "The Black Shield (Part 5)" +UPDATE `quest_template_addon` SET `PrevQuestID`=1276 WHERE `ID`=11204; -- Quest "Return to Krog" +UPDATE `quest_template_addon` SET `ExclusiveGroup`=-11201, `NextQuestID`=11203 WHERE `ID` IN (11201,11200); -- Quests "The Grimtotem Plot" / "More than Coincidence" +UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=11203; -- Quest "Seek Out Tabetha" From ee6ba70683e8f4313432f3eeb0657fdafe8cd331 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:22:54 +0200 Subject: [PATCH 031/102] DB/Texts: Smiling Jim Closes #22230 --- .../world/3.3.5/2018_08_11_06_world_335.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_06_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_06_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_06_world_335.sql new file mode 100644 index 0000000000..e5ed0001ec --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_06_world_335.sql @@ -0,0 +1,17 @@ +-- Smiling Jim +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4895; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4895 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=489500 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(4895,0,0,0,1,0,100,0,45000,60000,150000,180000,80,489500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - Out of Combat - Run Script"), +(489500,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 0"), +(489500,9,1,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 1"), +(489500,9,2,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 2"), +(489500,9,3,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 3"); + +DELETE FROM `creature_text` WHERE `CreatureID`=4895; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(4895,0,0,"He'll bring you mead, he'll bring you beer...",12,7,100,0,0,0,1632,0,"Smiling Jim"), +(4895,1,0,"A grinning face from ear to ear...",12,7,100,0,0,0,1633,0,"Smiling Jim"), +(4895,2,0,"He's served us all from year to year...",12,7,100,0,0,0,1634,0,"Smiling Jim"), +(4895,3,0,"We call him Smiling Jim...",12,7,100,11,0,0,1635,0,"Smiling Jim"); From afbc62d104a8f74dc2f49349f9bf55df24fdaeee Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:23:32 +0200 Subject: [PATCH 032/102] DB/Quest: Propaganda War Closes #22231 --- .../world/3.3.5/2018_08_11_07_world_335.sql | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_07_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_07_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_07_world_335.sql new file mode 100644 index 0000000000..76ba4277b2 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_07_world_335.sql @@ -0,0 +1,35 @@ +-- Calia Hastings +UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=23566; -- She didn't have a gossip text in WotLK. Current text was added in Cata when she became a rogue trainer. + +DELETE FROM `creature_text` WHERE `CreatureID`=23566; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(23566,0,0,"It would be a shame to let these leaflets go to waste, wouldn't it?",12,7,100,0,0,0,22105,0,"Calia Hastings"), +(23566,1,0,"With just a little creative editing, these are much more useful...",12,7,100,0,0,0,22107,0,"Calia Hastings"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23566; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23566 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2356600,2356601,2356602) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23566,0,0,0,20,0,100,0,11128,0,0,0,80,2356600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Quest 'Propaganda War' Finished - Run Script"), +(23566,0,1,0,40,0,100,0,3,23566,0,0,80,2356601,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Waypoint 3 Reached - Run Script"), +(23566,0,2,0,40,0,100,0,7,23566,0,0,80,2356602,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Waypoint 7 Reached - Run Script"), +(2356600,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Remove Npc Flag Questgiver"), +(2356600,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Say Line 0"), +(2356600,9,2,0,0,0,100,0,5000,5000,0,0,53,0,23566,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Start Waypoint"), +(2356601,9,0,0,0,0,100,0,0,0,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Pause Waypoint"), +(2356601,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.27885,"Calia Hastings - On Script - Set Orientation"), +(2356601,9,2,0,0,0,100,0,1000,1000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Set Emote State 69"), +(2356601,9,3,0,0,0,100,0,6000,6000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Set Emote State 0"), +(2356602,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.40855,"Calia Hastings - On Script - Set Orientation"), +(2356602,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Say Line 1"), +(2356602,9,2,0,0,0,100,0,3000,3000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Add Npc Flag Questgiver"); + +DELETE FROM `waypoints` WHERE `entry`=23566; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(23566,1,-3818.89,-4564.21,8.92453,""), +(23566,2,-3817,-4566.21,8.84672,""), +(23566,3,-3816.71,-4564.26,8.97426,""), +(23566,4,-3817,-4566.21,8.84672,""), +(23566,5,-3818.89,-4564.21,8.92453,""), +(23566,6,-3817.87,-4561.44,9.11807,""), +(23566,7,-3819.74,-4562.35,9.14216,""); From 99716610f1e06b4c0343b41d16a33aaee70c8917 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:24:05 +0200 Subject: [PATCH 033/102] DB/Creature: Guard Lasiter Closes #22232 --- .../world/3.3.5/2018_08_11_08_world_335.sql | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_08_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_08_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_08_world_335.sql new file mode 100644 index 0000000000..6ac66852bd --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_08_world_335.sql @@ -0,0 +1,56 @@ +-- World Invisible Trigger +SET @GUID1 := 3828; +SET @GUID2 := 37624; +SET @GUID3 := 38824; +DELETE FROM `creature` WHERE `guid` IN (@GUID1,@GUID2,@GUID3); +INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(@GUID1,12999,1,0,0,1,1,0,0,-3759.97,-4557.44,9.0761,5.34286,300,0,0,7212,0,0,0,0,0,"",0), +(@GUID2,12999,1,0,0,1,1,0,0,-3758.24,-4556.73,11.3539,2.10228,300,0,0,7212,0,0,0,0,0,"",0), +(@GUID3,12999,1,0,0,1,1,0,0,-3758.42,-4551.63,10.8395,2.1337,300,0,0,7212,0,0,0,0,0,"",0); + +-- Guard Lasiter +UPDATE `creature` SET `MovementType`=0 WHERE `guid`=30458; +UPDATE `creature_addon` SET `path_id`=0, `bytes2`=2 WHERE `guid`=30458; + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4973; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4973 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (497300,497301,497302,497303) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(4973,0,0,0,25,0,100,0,0,0,0,0,0,53,0,4973,1,0,0,2,1,0,0,0,0,0,0,0,"Guard Lasiter - On Reset - Start Waypoint"), +(4973,0,1,0,40,0,100,0,1,4973,0,0,0,80,497300,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 1 Reached - Run Script"), +(4973,0,2,0,40,0,100,0,2,4973,0,0,0,80,497301,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 2 Reached - Run Script"), +(4973,0,3,0,40,0,100,0,3,4973,0,0,0,80,497302,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 3 Reached - Run Script"), +(4973,0,4,0,40,0,100,0,4,4973,0,0,0,80,497303,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 4 Reached - Run Script"), +(4973,0,5,0,0,0,100,0,0,0,2000,4000,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Guard Lasiter - In Combat - Cast Shoot"), +(4973,0,6,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Guard Lasiter - Between 0-15% Health - Flee For Assist (No Repeat)"), +(497300,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"), +(497300,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"), +(497300,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,@GUID1,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"), +(497300,9,3,0,0,0,100,0,6000,6000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 0"), +(497301,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"), +(497301,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"), +(497301,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,@GUID2,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"), +(497301,9,3,0,0,0,100,0,6000,6000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 1"), +(497302,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"), +(497302,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"), +(497302,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,@GUID3,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"), +(497302,9,3,0,0,0,100,0,6000,6000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 2"), +(497303,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"), +(497303,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"), +(497303,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,30524,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"), +(497303,9,3,0,0,0,100,0,6000,6000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 3"); + +DELETE FROM `creature_text` WHERE `CreatureID`=4973; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(4973,0,0,"Oops! That was a bit off. I didn't even hit the target!",12,7,100,0,0,0,1792,0,"Guard Lasiter"), +(4973,1,0,"That was a nice shot... but not perfect. Maybe a bit more to the left.",12,7,100,0,0,0,1789,0,"Guard Lasiter"), +(4973,2,0,"Barely hit the target that time. Hmmm,... maybe I need to adjust back to the right.",12,7,100,0,0,0,1790,0,"Guard Lasiter"), +(4973,3,0,"Whoa! Look at that bullseye!",12,7,100,0,0,0,1791,0,"Guard Lasiter"); + +DELETE FROM `waypoint_data` WHERE `id`=304580; +DELETE FROM `waypoints` WHERE `entry`=4973; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(4973,1,-3775.88,-4535.66,11.7979,""), +(4973,2,-3772.62,-4533.36,11.5873,""), +(4973,3,-3770.08,-4531.74,11.5426,""), +(4973,4,-3772.62,-4533.36,11.5873,""); From 3df95032901c4eb3abd4642570b045ce898f3ab4 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:24:41 +0200 Subject: [PATCH 034/102] DB/Misc: Shady Rest Inn Closes #22233 --- .../world/3.3.5/2018_08_11_09_world_335.sql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_09_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_09_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_09_world_335.sql new file mode 100644 index 0000000000..93b8fa5dbe --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_09_world_335.sql @@ -0,0 +1,26 @@ +-- Evidence Marker --> Add missing spawns +SET @GUID1 := 38851; +SET @GUID2 := 42847; +SET @GUID3 := 42850; +DELETE FROM `creature` WHERE `guid` IN (@GUID1,@GUID2,@GUID3); +INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(@GUID1,23583,1,0,0,1,1,0,0,-3700.58,-2534.09,68.7248,3.05433,300,0,0,41,0,0,0,0,0,"",0), +(@GUID2,23583,1,0,0,1,1,0,0,-3721.85,-2541.17,69.7589,3.05433,300,0,0,41,0,0,0,0,0,"",0), +(@GUID3,23583,1,0,0,1,1,0,0,-3734.45,-2530.79,73.2862,3.30957,300,0,0,41,0,0,0,0,0,"",0); + +DELETE FROM `creature_template_movement` WHERE `CreatureId`=23567; +INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`) VALUES +(23567,1,1,2,0); + +-- Fix "Reflective Dust" +UPDATE `creature_template_addon` SET `auras`="42171 42175" WHERE `entry`=23583; + +-- Fix rotation for some objects +UPDATE `gameobject` SET `rotation0`=0.556657, `rotation1`=-0.434788, `rotation2`=0.43101, `rotation3`=0.561536 WHERE `guid`=6376; -- Theramore Guard Badge +UPDATE `gameobject` SET `rotation0`=-0.105384, `rotation1`=0.677422, `rotation2`=0.042204, `rotation3`=0.726783 WHERE `guid`=6821; -- Black Shield + +-- Add condition for Inspector Tarem's gossip option +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8761; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15,8761,0,0,0,8,0,11123,0,0,0,0,0,"","Show gossip option if quest 'Inspecting the Ruins' is rewarded"), +(15,8761,0,0,1,8,0,11124,0,0,0,0,0,"","Show gossip option if quest 'Inspecting the Ruins' is rewarded"); From cef9ae9840e2e2f5c2287eedcd117e7b42b1dba8 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:25:10 +0200 Subject: [PATCH 035/102] DB/Object: The Park Closes #22237 --- sql/updates/world/3.3.5/2018_08_11_10_world_335.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_10_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_10_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_10_world_335.sql new file mode 100644 index 0000000000..6d6d7e2ead --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_10_world_335.sql @@ -0,0 +1,5 @@ +-- +UPDATE `gameobject` SET `rotation2`=0.944089, `rotation3`=-0.329691 WHERE `guid`=42874; + +DELETE FROM `gameobject` WHERE `guid`=42873; +DELETE FROM `gameobject_addon` WHERE `guid`=42873; From cc95f7e78b0ed1f33b9fd26089063d811ea84dd4 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:25:36 +0200 Subject: [PATCH 036/102] DB/Texts: Acolyte Dellis Closes #22238 --- sql/updates/world/3.3.5/2018_08_11_11_world_335.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_11_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_11_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_11_world_335.sql new file mode 100644 index 0000000000..1328c8d40e --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_11_world_335.sql @@ -0,0 +1,12 @@ +-- Acolyte Dellis +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5386; +DELETE FROM `smart_scripts` WHERE `entryorguid`=5386 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(5386,0,0,0,1,0,100,0,1000,15000,100000,150000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acolyte Dellis - Out of Combat - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=5386; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(5386,0,0,"It wasn't my fault, Master Mazen!",12,7,100,0,0,0,1828,0,"Acolyte Dellis"), +(5386,0,1,"It was a simple mistake. A wrong turn I tell you!",12,7,100,0,0,0,1829,0,"Acolyte Dellis"), +(5386,0,2,"The swamp was horrible! I was so... so... scared!",12,7,100,0,0,0,1830,0,"Acolyte Dellis"), +(5386,0,3,"I'm lucky to be alive!",12,7,100,0,0,0,1831,0,"Acolyte Dellis"); From 71eb57204346e8028bf730005527a4c576dad625 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:26:05 +0200 Subject: [PATCH 037/102] DB/Quest: The Missing Diplomat (Part 11) Closes #22240 --- .../world/3.3.5/2018_08_11_12_world_335.sql | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_12_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_12_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_12_world_335.sql new file mode 100644 index 0000000000..bd544aa0bf --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_12_world_335.sql @@ -0,0 +1,73 @@ +-- Texts +DELETE FROM `creature_text` WHERE `CreatureID` IN (4962,4971,4963); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(4962,0,0,"Oh, it's on now! Bet you thought I'd be alone too, huh?!",12,7,100,0,0,0,5827,0,"Tapoke \"Slim\" Jahn"), +(4962,1,0,"Okay, okay! No need to get all violent. I'll talk. I'll talk!",12,7,100,0,0,0,1743,0,"Tapoke \"Slim\" Jahn"), +(4962,2,0,"I have a few notes from the job back at my place. I'll get them and then meet you back in the inn.",12,7,100,0,0,0,1744,0,"Tapoke \"Slim\" Jahn"), +(4971,0,0,"Whoa! This is way more than what I bargained for, you're on your own, Slim!",12,7,100,0,0,0,5828,0,"Slim's Friend"), +(4963,0,0,"I'm glad the commotions died down some around here. The last thing this place needs is another brawl.",12,7,100,0,0,0,4169,0,"Mikhail"); + +-- Waypoint +DELETE FROM `script_waypoint` WHERE `entry`=4962; +DELETE FROM `waypoints` WHERE `entry`=4962; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(4962,1,-3804.44,-828.048,10.0931,""), +(4962,2,-3803.93,-835.772,10.0777,""), +(4962,3,-3792.63,-835.671,9.65566,""), +(4962,4,-3772.43,-835.346,10.869,""), +(4962,5,-3765.94,-840.129,10.8856,""), +(4962,6,-3738.63,-830.997,11.0574,""), +(4962,7,-3690.22,-862.262,9.96045,""); + +-- Mikhail +UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=4963; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4963 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=496300 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4963,0,0,0,11,0,100,0,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mikhail - On Respawn - Set Npc Flag Questgiver"), +(4963,0,1,0,19,0,100,0,1249,0,0,0,0,81,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mikhail - On Quest 'The Missing Diplomat (Part 11)' Taken - Set Npc Flag Gossip"), +(4963,0,2,0,19,0,100,0,1249,0,0,0,0,45,1,1,0,0,0,0,10,10873,0,0,0,0,0,0,"Mikhail - On Quest 'The Missing Diplomat (Part 11)' Taken - Set Data to Tapoke \"Slim\" Jahn"), +(4963,0,3,0,19,0,100,0,1249,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Mikhail - On Quest 'The Missing Diplomat (Part 11)' Taken - Store Target"), +(4963,0,4,0,19,0,100,0,1249,0,0,0,0,100,1,0,0,0,0,0,10,10873,0,0,0,0,0,0,"Mikhail - On Quest 'The Missing Diplomat (Part 11)' Taken - Send Target to Tapoke \"Slim\" Jahn"), +(4963,0,5,0,38,0,100,0,1,1,0,0,0,80,496300,2,0,0,0,0,1,0,0,0,0,0,0,0,"Mikhail - On Data Set - Run Script"), +(496300,9,0,0,0,0,100,0,10000,10000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mikhail - On Script - Say Line 0"), +(496300,9,1,0,0,0,100,0,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mikhail - On Script - Set Npc Flag Questgiver"); + +-- Tapoke "Slim" Jahn +UPDATE `creature` SET `spawntimesecs`=10 WHERE `guid`=10873; +UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=4962; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4962 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=496200 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4962,0,0,0,38,0,100,1,1,1,0,0,0,11,1785,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Data Set - Cast 'Stealth'"), +(4962,0,1,0,38,0,100,1,1,1,0,0,0,53,0,4962,0,0,0,2,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Data Set - Start Waypoint"), +(4962,0,2,0,38,0,100,1,1,1,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Data Set - Set Invincibility at 1 HP"), +(4962,0,3,0,40,0,100,0,3,4962,0,0,0,28,1785,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Waypoint 3 Reached - Remove Aura 'Stealth'"), +(4962,0,4,0,40,0,100,0,3,4962,0,0,0,2,168,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Waypoint 3 Reached - Set Faction 168"), +(4962,0,5,0,40,0,100,0,7,4962,0,0,0,6,1249,0,0,0,0,0,12,1,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Waypoint 7 Reached - Fail Quest 'The Missing Diplomat (Part 11)'"), +(4962,0,6,0,40,0,100,0,7,4962,0,0,0,45,1,1,0,0,0,0,10,9432,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Waypoint 7 Reached - Set Data to Mikhail"), +(4962,0,7,0,40,0,100,0,7,4962,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Waypoint 7 Reached - Despawn"), +(4962,0,8,0,4,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Aggro - Say Line 0"), +(4962,0,9,0,4,0,100,0,0,0,0,0,0,11,16457,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Aggro - Cast 'Call Friends'"), +(4962,0,10,0,2,0,100,1,0,20,0,0,0,80,496200,2,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - Between 0-20% Health - Run Script"), +(496200,9,0,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,19,4971,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Set Data to Slim's Friend"), +(496200,9,1,0,0,0,100,0,0,0,0,0,0,2,123,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Set Faction 123"), +(496200,9,2,0,0,0,100,0,0,0,0,0,0,27,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Stop Combat"), +(496200,9,3,0,0,0,100,0,5000,5000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Say Line 1"), +(496200,9,4,0,0,0,100,0,5000,5000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Say Line 2"), +(496200,9,5,0,0,0,100,0,6000,6000,0,0,0,15,1249,0,0,0,0,0,12,1,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Complete Quest 'The Missing Diplomat (Part 11)'"), +(496200,9,6,0,0,0,100,0,1000,1000,0,0,0,45,1,1,0,0,0,0,10,9432,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Set Data to Mikhail"), +(496200,9,7,0,0,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tapoke \"Slim\" Jahn - On Script - Despawn"); + +-- Slim's Friend +DELETE FROM `smart_scripts` WHERE `entryorguid`=4971 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=497100 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(4971,0,0,0,25,0,100,0,0,0,0,0,0,11,3616,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Reset - Cast 'Poison Proc'"), +(4971,0,1,0,25,0,100,0,0,0,0,0,0,11,8601,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Reset - Cast 'Slowing Poison'"), +(4971,0,2,0,67,0,100,0,3000,6000,0,0,0,11,2589,0,0,0,0,0,2,0,0,0,0,0,0,0,"Slim's Friend - On Behind Target - Cast Backstab"), +(4971,0,3,0,38,0,100,1,1,1,0,0,0,80,497100,2,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Data Set - Run Script"), +(497100,9,0,0,0,0,100,0,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Script - Evade"), +(497100,9,1,0,0,0,100,0,0,0,0,0,0,2,123,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Script - Set Faction 123"), +(497100,9,2,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Script - Say Line 0"), +(497100,9,3,0,0,0,100,0,6000,6000,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Script - Despawn"); From ca86381c88d2d10716f9517611ee3be4ce6dfffa Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:26:36 +0200 Subject: [PATCH 038/102] DB/Quest: The Missing Diplomat (Part 12) Closes #22241 --- sql/updates/world/3.3.5/2018_08_11_13_world_335.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_13_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_13_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_13_world_335.sql new file mode 100644 index 0000000000..3e9d0af920 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_13_world_335.sql @@ -0,0 +1,3 @@ +-- +UPDATE `quest_template_addon` SET `NextQuestID`=1250 WHERE `ID`=1249; +UPDATE `quest_template_addon` SET `PrevQuestID`=1250 WHERE `ID`=1264; From a85f2c091e226d8939e77b4a33dc80a53c8b3c3c Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:27:10 +0200 Subject: [PATCH 039/102] DB/Creature: Renn McGill Closes #22242 --- .../world/3.3.5/2018_08_11_14_world_335.sql | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_14_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_14_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_14_world_335.sql new file mode 100644 index 0000000000..717992aad9 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_14_world_335.sql @@ -0,0 +1,30 @@ +-- Renn McGill +UPDATE `creature_template` SET `unit_flags`=33536 WHERE `entry`=23569; + +DELETE FROM `gossip_menu_option` WHERE `MenuID`=8837; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES +(8837,0,0,"I don't have the Repaired Diving Gear anymore. Do you have a spare?",22482,1,1,0,0,0,0,"",0,0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8837; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15,8837,0,0,0,9,0,11140,0,0,0,0,0,"","Show gossip option if quest 'Recover the Cargo!' is taken"), +(15,8837,0,0,0,2,0,33040,1,1,1,0,0,"","Show gossip option if player does not have item 'Repaired Diving Gear'"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23569; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23569 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2356900 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23569,0,0,1,62,0,100,0,8837,0,0,0,85,42670,0,0,0,0,0,7,0,0,0,0,0,0,0,"Renn McGill - On Gossip Option 0 Selected - Invoker Cast 'Replace Repaired Diving Gear'"), +(23569,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Renn McGill - On Gossip Option 0 Selected - Close Gossip"), +(23569,0,2,0,20,0,100,0,11140,0,0,0,80,2356900,0,0,0,0,0,1,0,0,0,0,0,0,0,"Renn McGill - On Quest 'Recover the Cargo!' Finished - Run Script"), +(2356900,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Renn McGill - On Script - Remove Npc Flag Questgiver+Gossip"), +(2356900,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Renn McGill - On Script - Say Line 0"), +(2356900,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Renn McGill - On Script - Say Line 1"), +(2356900,9,3,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Renn McGill - On Script - Say Line 2"), +(2356900,9,4,0,0,0,100,0,6000,6000,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Renn McGill - On Script - Add Npc Flag Questgiver+Gossip"); + +DELETE FROM `creature_text` WHERE `CreatureID`=23569; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(23569,0,0,"Hmm... old coins... ugly jewelry...",12,7,100,0,0,0,22160,0,"Renn McGill"), +(23569,1,0,"More ugly jewelry... letters home... I'm beginning to give up hope!",12,7,100,0,0,0,22161,0,"Renn McGill"), +(23569,2,0,"Hey... what's this? A pair of manacles and not just any. These are enchanted. This cargo, it wasn't a thing... it was a person!",12,7,100,0,0,0,22162,0,"Renn McGill"); From 1bccd4c6d2c709a9ef06cb70df93987dc4c87a23 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:27:39 +0200 Subject: [PATCH 040/102] DB/Quest: Recover the Cargo! Closes #22245 --- .../world/3.3.5/2018_08_11_15_world_335.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_15_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_15_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_15_world_335.sql new file mode 100644 index 0000000000..20e88090c1 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_15_world_335.sql @@ -0,0 +1,18 @@ +-- Shipwreck Debris +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=186283; +DELETE FROM `smart_scripts` WHERE `entryorguid`=186283 AND `source_type`=1; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (18628300,18628301) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(186283,1,0,0,8,0,100,0,42287,0,0,0,0,41,0,120,0,0,0,0,1,0,0,0,0,0,0,0,"Shipwreck Debris - On Spellhit 'Salvage Wreckage' - Despawn"), +(186283,1,1,0,8,0,100,0,42287,0,0,0,0,41,0,120,0,0,0,0,20,186278,0,0,0,0,0,0,"Shipwreck Debris - On Spellhit 'Salvage Wreckage' - Despawn Closest Gameobject 'Burning Wreckage'"), +(186283,1,2,0,8,0,100,0,42287,0,0,0,0,87,18628300,18628301,0,0,0,0,1,0,0,0,0,0,0,0,"Shipwreck Debris - On Spellhit 'Salvage Wreckage' - Run Random Script"), +(18628300,9,0,0,0,0,100,0,0,0,0,0,0,85,42289,0,0,0,0,0,7,0,0,0,0,0,0,0,"Shipwreck Debris - On Script - Invoker Cast 'Summon Mirefin Burrower'"), +(18628301,9,0,0,0,0,100,0,0,0,0,0,0,85,42288,0,0,0,0,0,7,0,0,0,0,0,0,0,"Shipwreck Debris - On Script - Invoker Cast 'Summon Salvaged Lockbox'"); + +DELETE FROM `spell_scripts` WHERE `id`=42287; + +-- Mirefin Ambusher +UPDATE `creature_template` SET `unit_flags`=32768, `AIName`="SmartAI" WHERE `entry`=23701; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23701 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(23701,0,0,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mirefin Ambusher - Between 0-15% Health - Flee For Assist (No Repeat)"); From 08b99818a472ddae6fb9f4adf5b6473f81ebad84 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sat, 11 Aug 2018 16:28:06 +0200 Subject: [PATCH 041/102] DB/Quest: Trelane's Defenses Closes #22246 --- sql/updates/world/3.3.5/2018_08_11_16_world_335.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_11_16_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_16_world_335.sql b/sql/updates/world/3.3.5/2018_08_11_16_world_335.sql new file mode 100644 index 0000000000..d291b675bc --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_11_16_world_335.sql @@ -0,0 +1,5 @@ +-- Apprentice Kryten +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=2788; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2788 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2788,0,0,0,20,0,100,0,694,0,0,0,11,4319,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Kryten - On Quest 'Trelane's Defenses' Finished - Cast 'Enchant Azure Agate'"); From 2046fa513c98a19fad14208653c8439e891cf817 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 13 Aug 2018 00:49:28 +0200 Subject: [PATCH 042/102] rename files --- ...=> 2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql} | 0 .../2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql} | 0 .../2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql} | 0 .../2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql} | 0 ...018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql} | 2 ++ ...018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql} | 2 ++ ...018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql} | 2 ++ ...018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql} | 2 ++ ...018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql} | 2 ++ ...018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql} | 2 ++ ...018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql} | 2 ++ ...018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql} | 2 ++ ...018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql} | 2 ++ ...018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql} | 2 ++ ...018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql} | 2 ++ ...018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql} | 2 ++ ...018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql} | 2 ++ 17 files changed, 26 insertions(+) rename sql/updates/world/4.3.4/{2018_08_11_00_world.sql => 2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_11_01_world.sql => 4.3.4/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_11_02_world.sql => 4.3.4/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_11_03_world.sql => 4.3.4/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_11_04_world_335.sql => 4.3.4/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_05_world_335.sql => 4.3.4/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_06_world_335.sql => 4.3.4/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_07_world_335.sql => 4.3.4/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_08_world_335.sql => 4.3.4/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_09_world_335.sql => 4.3.4/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_10_world_335.sql => 4.3.4/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql} (96%) rename sql/updates/world/{3.3.5/2018_08_11_11_world_335.sql => 4.3.4/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_12_world_335.sql => 4.3.4/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_13_world_335.sql => 4.3.4/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql} (96%) rename sql/updates/world/{3.3.5/2018_08_11_14_world_335.sql => 4.3.4/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_15_world_335.sql => 4.3.4/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_11_16_world_335.sql => 4.3.4/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql} (99%) diff --git a/sql/updates/world/4.3.4/2018_08_11_00_world.sql b/sql/updates/world/4.3.4/2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_11_00_world.sql rename to sql/updates/world/4.3.4/2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_01_world.sql b/sql/updates/world/4.3.4/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_11_01_world.sql rename to sql/updates/world/4.3.4/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_02_world.sql b/sql/updates/world/4.3.4/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_11_02_world.sql rename to sql/updates/world/4.3.4/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_03_world.sql b/sql/updates/world/4.3.4/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_11_03_world.sql rename to sql/updates/world/4.3.4/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_11_04_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_04_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql index 2113c094a1..81b44e7013 100644 --- a/sql/updates/world/3.3.5/2018_08_11_04_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql @@ -1,5 +1,7 @@ +/* -- Apprentice Kryten DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=2601; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (14,2601,3294,0,0,8,0,690,0,0,0,0,0,"","Show gossip text 3294 if quest 'Malin's Request' is rewarded"), (14,2601,3294,0,0,14,0,691,0,0,0,0,0,"","Show gossip text 3294 if quest 'Worth Its Weight in Gold' is not taken"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_05_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_05_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql index 2288df87ca..54f65e38ff 100644 --- a/sql/updates/world/3.3.5/2018_08_11_05_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql @@ -1,3 +1,4 @@ +/* -- DELETE FROM `quest_template_addon` WHERE `ID`=1268; INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES @@ -8,3 +9,4 @@ UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=1276; -- Quest "The UPDATE `quest_template_addon` SET `PrevQuestID`=1276 WHERE `ID`=11204; -- Quest "Return to Krog" UPDATE `quest_template_addon` SET `ExclusiveGroup`=-11201, `NextQuestID`=11203 WHERE `ID` IN (11201,11200); -- Quests "The Grimtotem Plot" / "More than Coincidence" UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=11203; -- Quest "Seek Out Tabetha" +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_06_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_06_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql index e5ed0001ec..87c4e887c9 100644 --- a/sql/updates/world/3.3.5/2018_08_11_06_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql @@ -1,3 +1,4 @@ +/* -- Smiling Jim UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4895; DELETE FROM `smart_scripts` WHERE `entryorguid`=4895 AND `source_type`=0; @@ -15,3 +16,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (4895,1,0,"A grinning face from ear to ear...",12,7,100,0,0,0,1633,0,"Smiling Jim"), (4895,2,0,"He's served us all from year to year...",12,7,100,0,0,0,1634,0,"Smiling Jim"), (4895,3,0,"We call him Smiling Jim...",12,7,100,11,0,0,1635,0,"Smiling Jim"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_07_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_07_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql index 76ba4277b2..670bdd43ad 100644 --- a/sql/updates/world/3.3.5/2018_08_11_07_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql @@ -1,3 +1,4 @@ +/* -- Calia Hastings UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=23566; -- She didn't have a gossip text in WotLK. Current text was added in Cata when she became a rogue trainer. @@ -33,3 +34,4 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (23566,5,-3818.89,-4564.21,8.92453,""), (23566,6,-3817.87,-4561.44,9.11807,""), (23566,7,-3819.74,-4562.35,9.14216,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_08_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_08_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql index 6ac66852bd..bddfeb6c6d 100644 --- a/sql/updates/world/3.3.5/2018_08_11_08_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql @@ -1,3 +1,4 @@ +/* -- World Invisible Trigger SET @GUID1 := 3828; SET @GUID2 := 37624; @@ -54,3 +55,4 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (4973,2,-3772.62,-4533.36,11.5873,""), (4973,3,-3770.08,-4531.74,11.5426,""), (4973,4,-3772.62,-4533.36,11.5873,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_09_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_09_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql index 93b8fa5dbe..0196f760d0 100644 --- a/sql/updates/world/3.3.5/2018_08_11_09_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql @@ -1,3 +1,4 @@ +/* -- Evidence Marker --> Add missing spawns SET @GUID1 := 38851; SET @GUID2 := 42847; @@ -24,3 +25,4 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=87 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (15,8761,0,0,0,8,0,11123,0,0,0,0,0,"","Show gossip option if quest 'Inspecting the Ruins' is rewarded"), (15,8761,0,0,1,8,0,11124,0,0,0,0,0,"","Show gossip option if quest 'Inspecting the Ruins' is rewarded"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_10_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql similarity index 96% rename from sql/updates/world/3.3.5/2018_08_11_10_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql index 6d6d7e2ead..b27792846f 100644 --- a/sql/updates/world/3.3.5/2018_08_11_10_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql @@ -1,5 +1,7 @@ +/* -- UPDATE `gameobject` SET `rotation2`=0.944089, `rotation3`=-0.329691 WHERE `guid`=42874; DELETE FROM `gameobject` WHERE `guid`=42873; DELETE FROM `gameobject_addon` WHERE `guid`=42873; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_11_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_11_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql index 1328c8d40e..e83d749f57 100644 --- a/sql/updates/world/3.3.5/2018_08_11_11_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql @@ -1,3 +1,4 @@ +/* -- Acolyte Dellis UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5386; DELETE FROM `smart_scripts` WHERE `entryorguid`=5386 AND `source_type`=0; @@ -10,3 +11,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (5386,0,1,"It was a simple mistake. A wrong turn I tell you!",12,7,100,0,0,0,1829,0,"Acolyte Dellis"), (5386,0,2,"The swamp was horrible! I was so... so... scared!",12,7,100,0,0,0,1830,0,"Acolyte Dellis"), (5386,0,3,"I'm lucky to be alive!",12,7,100,0,0,0,1831,0,"Acolyte Dellis"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_12_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_12_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql index bd544aa0bf..720d200ae4 100644 --- a/sql/updates/world/3.3.5/2018_08_11_12_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql @@ -1,3 +1,4 @@ +/* -- Texts DELETE FROM `creature_text` WHERE `CreatureID` IN (4962,4971,4963); INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -71,3 +72,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (497100,9,1,0,0,0,100,0,0,0,0,0,0,2,123,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Script - Set Faction 123"), (497100,9,2,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Script - Say Line 0"), (497100,9,3,0,0,0,100,0,6000,6000,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Slim's Friend - On Script - Despawn"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_13_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql similarity index 96% rename from sql/updates/world/3.3.5/2018_08_11_13_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql index 3e9d0af920..68d0b16687 100644 --- a/sql/updates/world/3.3.5/2018_08_11_13_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql @@ -1,3 +1,5 @@ +/* -- UPDATE `quest_template_addon` SET `NextQuestID`=1250 WHERE `ID`=1249; UPDATE `quest_template_addon` SET `PrevQuestID`=1250 WHERE `ID`=1264; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_14_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_14_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql index 717992aad9..681358e994 100644 --- a/sql/updates/world/3.3.5/2018_08_11_14_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql @@ -1,3 +1,4 @@ +/* -- Renn McGill UPDATE `creature_template` SET `unit_flags`=33536 WHERE `entry`=23569; @@ -28,3 +29,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (23569,0,0,"Hmm... old coins... ugly jewelry...",12,7,100,0,0,0,22160,0,"Renn McGill"), (23569,1,0,"More ugly jewelry... letters home... I'm beginning to give up hope!",12,7,100,0,0,0,22161,0,"Renn McGill"), (23569,2,0,"Hey... what's this? A pair of manacles and not just any. These are enchanted. This cargo, it wasn't a thing... it was a person!",12,7,100,0,0,0,22162,0,"Renn McGill"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_15_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_15_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql index 20e88090c1..b0f5481f3e 100644 --- a/sql/updates/world/3.3.5/2018_08_11_15_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql @@ -1,3 +1,4 @@ +/* -- Shipwreck Debris UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=186283; DELETE FROM `smart_scripts` WHERE `entryorguid`=186283 AND `source_type`=1; @@ -16,3 +17,4 @@ UPDATE `creature_template` SET `unit_flags`=32768, `AIName`="SmartAI" WHERE `ent DELETE FROM `smart_scripts` WHERE `entryorguid`=23701 AND `source_type`=0; INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES (23701,0,0,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mirefin Ambusher - Between 0-15% Health - Flee For Assist (No Repeat)"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_11_16_world_335.sql b/sql/updates/world/4.3.4/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_11_16_world_335.sql rename to sql/updates/world/4.3.4/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql index d291b675bc..e4721ff35a 100644 --- a/sql/updates/world/3.3.5/2018_08_11_16_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql @@ -1,5 +1,7 @@ +/* -- Apprentice Kryten UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=2788; DELETE FROM `smart_scripts` WHERE `entryorguid`=2788 AND `source_type`=0; INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES (2788,0,0,0,20,0,100,0,694,0,0,0,11,4319,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Kryten - On Quest 'Trelane's Defenses' Finished - Cast 'Enchant Azure Agate'"); +*/ From b355c679946054cf0c0ca8298d81cbc32283260c Mon Sep 17 00:00:00 2001 From: Killyana Date: Tue, 14 Aug 2018 01:58:24 +0200 Subject: [PATCH 043/102] DB/SAI: Update target relate to old template Closes #22263 --- sql/updates/world/3.3.5/2018_08_14_00_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_14_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_14_00_world.sql b/sql/updates/world/3.3.5/2018_08_14_00_world.sql new file mode 100644 index 0000000000..49a5dca5e0 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_14_00_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `target_param1`=191124 WHERE `entryorguid`=2902800 AND `source_type`=9 AND `id`=3; From 8bb732b951d6457dfe4f89d3c078f6aefac3029a Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 14 Aug 2018 16:09:51 +0200 Subject: [PATCH 044/102] Scripts/Commands: Fix .quest complete to properly work with PvP kill quests. Closes #16321. --- src/server/game/Entities/Player/Player.cpp | 47 +++++++++++++--------- src/server/game/Entities/Player/Player.h | 3 +- src/server/scripts/Commands/cs_quest.cpp | 5 +++ 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c12b354bb3..16c7b48032 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16379,10 +16379,8 @@ void Player::KilledMonsterCredit(uint32 entry, ObjectGuid guid /*= ObjectGuid::E } } -void Player::KilledPlayerCredit() +void Player::KilledPlayerCredit(uint16 count) { - uint16 addkillcount = 1; - for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i) { uint32 questid = GetQuestSlotQuestId(i); @@ -16398,27 +16396,38 @@ void Player::KilledPlayerCredit() { if (qInfo->HasSpecialFlag(QUEST_SPECIAL_FLAGS_PLAYER_KILL)) { - uint32 reqkill = qInfo->GetPlayersSlain(); - uint16 curkill = q_status.PlayerCount; - - if (curkill < reqkill) - { - q_status.PlayerCount = curkill + addkillcount; - - m_QuestStatusSave[questid] = QUEST_DEFAULT_SAVE_TYPE; - - SendQuestUpdateAddPlayer(qInfo, curkill, addkillcount); - } - - if (CanCompleteQuest(questid)) - CompleteQuest(questid); - - break; + KilledPlayerCreditForQuest(count, qInfo); + break; // there is only one quest per zone } } } } +void Player::KilledPlayerCreditForQuest(uint16 count, Quest const* quest) +{ + uint32 const questId = quest->GetQuestId(); + auto it = m_QuestStatus.find(questId); + if (it == m_QuestStatus.end()) + return; + QuestStatusData& questStatus = it->second; + + uint16 curKill = questStatus.PlayerCount; + uint32 reqKill = quest->GetPlayersSlain(); + + if (curKill < reqKill) + { + count = std::min(reqKill - curKill, count); + questStatus.PlayerCount = curKill + count; + + m_QuestStatusSave[quest->GetQuestId()] = QUEST_DEFAULT_SAVE_TYPE; + + SendQuestUpdateAddPlayer(quest, curKill, count); + } + + if (CanCompleteQuest(questId)) + CompleteQuest(questId); +} + void Player::KillCreditGO(uint32 entry, ObjectGuid guid) { uint16 addCastCount = 1; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 0555305571..20099619bf 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1384,7 +1384,8 @@ class TC_GAME_API Player : public Unit, public GridObject void ItemRemovedQuestCheck(uint32 entry, uint32 count); void KilledMonster(CreatureTemplate const* cInfo, ObjectGuid guid); void KilledMonsterCredit(uint32 entry, ObjectGuid guid = ObjectGuid::Empty); - void KilledPlayerCredit(); + void KilledPlayerCredit(uint16 count = 1); + void KilledPlayerCreditForQuest(uint16 count, Quest const* quest); void KillCreditGO(uint32 entry, ObjectGuid guid = ObjectGuid::Empty); void TalkedToCreature(uint32 entry, ObjectGuid guid); void MoneyChanged(uint32 value); diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 5f896b1a5c..ca9f8eeeb1 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -230,6 +230,11 @@ public: player->KillCreditGO(creature); } + // player kills + if (quest->HasSpecialFlag(QUEST_SPECIAL_FLAGS_PLAYER_KILL)) + if (uint32 reqPlayers = quest->GetPlayersSlain()) + player->KilledPlayerCreditForQuest(reqPlayers, quest); + // If the quest requires reputation to complete if (uint32 repFaction = quest->GetRepObjectiveFaction()) { From d89074dc40157f3c87f25b3ba3722b63a4765962 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 15 Aug 2018 14:00:12 +0200 Subject: [PATCH 045/102] rename file --- .../2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/{3.3.5/2018_08_14_00_world.sql => 4.3.4/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql} (100%) diff --git a/sql/updates/world/3.3.5/2018_08_14_00_world.sql b/sql/updates/world/4.3.4/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_14_00_world.sql rename to sql/updates/world/4.3.4/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql From b90ea7a1efaf8b59cfe74dedce327fdaab6231df Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 15 Aug 2018 14:31:12 +0200 Subject: [PATCH 046/102] TDB 4.3.4.33 2018/08/15 missing part --- revision_data.h.in.cmake | 2 +- .../4.3.4/auth/32_2018_07_15}/2018_07_15_00_auth.sql | 0 .../4.3.4/auth/32_2018_07_15}/2018_07_21_00_auth.sql | 0 .../characters/32_2018_07_15}/2018_07_15_00_characters.sql | 0 .../4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_15_00.sql | 0 ...018_07_16_00_world_from_335_was_2018_07_15_00_world_335.sql | 0 ...018_07_16_01_world_from_335_was_2018_07_15_01_world_335.sql | 0 ...018_07_16_02_world_from_335_was_2018_07_15_02_world_335.sql | 0 ...018_07_16_03_world_from_335_was_2018_07_15_03_world_335.sql | 0 .../4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_16_04.sql | 0 .../4.3.4/world/32_2018_07_15}/2018_07_18_00_world.sql | 0 .../4.3.4/world/32_2018_07_15}/2018_07_21_00_world.sql | 0 .../4.3.4/world/32_2018_07_15}/2018_07_21_01_world.sql | 0 .../4.3.4/world/32_2018_07_15}/2018_07_21_02_world.sql | 0 .../2018_07_23_00_world_from_335_was_2018_07_18_01_world.sql | 0 ...018_07_23_01_world_from_335_was_2018_07_18_02_world_335.sql | 0 ...018_07_23_02_world_from_335_was_2018_07_18_03_world_335.sql | 0 ...018_07_23_03_world_from_335_was_2018_07_18_04_world_335.sql | 0 ...018_07_23_04_world_from_335_was_2018_07_22_00_world_335.sql | 0 ...018_07_23_05_world_from_335_was_2018_07_22_01_world_335.sql | 0 ...018_07_23_06_world_from_335_was_2018_07_22_02_world_335.sql | 0 ...018_07_23_07_world_from_335_was_2018_07_22_03_world_335.sql | 0 .../2018_07_23_08_world_from_335_was_2018_07_22_04_world.sql | 0 ...018_07_23_09_world_from_335_was_2018_07_22_05_world_335.sql | 0 .../2018_07_23_10_world_from_335_was_2018_07_22_06_world.sql | 0 ...018_07_23_11_world_from_335_was_2018_07_22_07_world_335.sql | 0 .../4.3.4/world/32_2018_07_15}/2018_07_25_00_world.sql | 0 .../2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql | 0 ...018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql | 0 ...018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql | 0 ...018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql | 0 ...018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql | 0 ...018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql | 0 ...018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql | 0 ...018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql | 0 ...018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql | 0 ...018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql | 0 ...018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql | 0 ...018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql | 0 ...018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql | 0 ...018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql | 0 ...018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql | 0 ...018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql | 0 .../2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql | 0 .../2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql | 0 .../2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql | 0 .../2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql | 0 ...018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql | 0 ...018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql | 0 ...018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql | 0 ...018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql | 0 ...018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql | 0 ...018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql | 0 ...018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql | 0 ...018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql | 0 ...018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql | 0 ...018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql | 0 ...018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql | 0 ...018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql | 0 ...018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql | 0 .../2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql | 0 sql/updates/auth/4.3.4/2018_08_15_00_auth.sql | 2 ++ sql/updates/characters/4.3.4/2018_08_15_00_characters.sql | 2 ++ sql/updates/world/4.3.4/2018_08_15_00.sql | 3 +++ 64 files changed, 8 insertions(+), 1 deletion(-) rename sql/{updates/auth/4.3.4 => old/4.3.4/auth/32_2018_07_15}/2018_07_15_00_auth.sql (100%) rename sql/{updates/auth/4.3.4 => old/4.3.4/auth/32_2018_07_15}/2018_07_21_00_auth.sql (100%) rename sql/{updates/characters/4.3.4 => old/4.3.4/characters/32_2018_07_15}/2018_07_15_00_characters.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_15_00.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_16_00_world_from_335_was_2018_07_15_00_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_16_01_world_from_335_was_2018_07_15_01_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_16_02_world_from_335_was_2018_07_15_02_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_16_03_world_from_335_was_2018_07_15_03_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_16_04.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_18_00_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_21_00_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_21_01_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_21_02_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_00_world_from_335_was_2018_07_18_01_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_01_world_from_335_was_2018_07_18_02_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_02_world_from_335_was_2018_07_18_03_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_03_world_from_335_was_2018_07_18_04_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_04_world_from_335_was_2018_07_22_00_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_05_world_from_335_was_2018_07_22_01_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_06_world_from_335_was_2018_07_22_02_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_07_world_from_335_was_2018_07_22_03_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_08_world_from_335_was_2018_07_22_04_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_09_world_from_335_was_2018_07_22_05_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_10_world_from_335_was_2018_07_22_06_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_23_11_world_from_335_was_2018_07_22_07_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_25_00_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql (100%) rename sql/{updates/world/4.3.4 => old/4.3.4/world/32_2018_07_15}/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql (100%) create mode 100644 sql/updates/auth/4.3.4/2018_08_15_00_auth.sql create mode 100644 sql/updates/characters/4.3.4/2018_08_15_00_characters.sql create mode 100644 sql/updates/world/4.3.4/2018_08_15_00.sql diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake index 724ea3c7e0..92ef6b3d55 100644 --- a/revision_data.h.in.cmake +++ b/revision_data.h.in.cmake @@ -9,7 +9,7 @@ #define _SOURCE_DIRECTORY R"(@CMAKE_SOURCE_DIR@)" #define _BUILD_DIRECTORY R"(@BUILDDIR@)" #define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)" - #define _FULL_DATABASE "TDB_full_world_434.32_2018_07_15.sql" + #define _FULL_DATABASE "TDB_full_world_434.33_2018_08_15.sql" #define VER_COMPANYNAME_STR "TrinityCore Developers" #define VER_LEGALCOPYRIGHT_STR "(c)2008-2018 TrinityCore" #define VER_FILEVERSION 0,0,0 diff --git a/sql/updates/auth/4.3.4/2018_07_15_00_auth.sql b/sql/old/4.3.4/auth/32_2018_07_15/2018_07_15_00_auth.sql similarity index 100% rename from sql/updates/auth/4.3.4/2018_07_15_00_auth.sql rename to sql/old/4.3.4/auth/32_2018_07_15/2018_07_15_00_auth.sql diff --git a/sql/updates/auth/4.3.4/2018_07_21_00_auth.sql b/sql/old/4.3.4/auth/32_2018_07_15/2018_07_21_00_auth.sql similarity index 100% rename from sql/updates/auth/4.3.4/2018_07_21_00_auth.sql rename to sql/old/4.3.4/auth/32_2018_07_15/2018_07_21_00_auth.sql diff --git a/sql/updates/characters/4.3.4/2018_07_15_00_characters.sql b/sql/old/4.3.4/characters/32_2018_07_15/2018_07_15_00_characters.sql similarity index 100% rename from sql/updates/characters/4.3.4/2018_07_15_00_characters.sql rename to sql/old/4.3.4/characters/32_2018_07_15/2018_07_15_00_characters.sql diff --git a/sql/updates/world/4.3.4/2018_07_15_00.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_15_00.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_15_00.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_15_00.sql diff --git a/sql/updates/world/4.3.4/2018_07_16_00_world_from_335_was_2018_07_15_00_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_16_00_world_from_335_was_2018_07_15_00_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_16_00_world_from_335_was_2018_07_15_00_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_16_00_world_from_335_was_2018_07_15_00_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_16_01_world_from_335_was_2018_07_15_01_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_16_01_world_from_335_was_2018_07_15_01_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_16_01_world_from_335_was_2018_07_15_01_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_16_01_world_from_335_was_2018_07_15_01_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_16_02_world_from_335_was_2018_07_15_02_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_16_02_world_from_335_was_2018_07_15_02_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_16_02_world_from_335_was_2018_07_15_02_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_16_02_world_from_335_was_2018_07_15_02_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_16_03_world_from_335_was_2018_07_15_03_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_16_03_world_from_335_was_2018_07_15_03_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_16_03_world_from_335_was_2018_07_15_03_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_16_03_world_from_335_was_2018_07_15_03_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_16_04.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_16_04.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_16_04.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_16_04.sql diff --git a/sql/updates/world/4.3.4/2018_07_18_00_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_18_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_18_00_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_18_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_21_00_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_21_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_21_00_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_21_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_21_01_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_21_01_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_21_01_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_21_01_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_21_02_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_21_02_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_21_02_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_21_02_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_00_world_from_335_was_2018_07_18_01_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_00_world_from_335_was_2018_07_18_01_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_00_world_from_335_was_2018_07_18_01_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_00_world_from_335_was_2018_07_18_01_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_01_world_from_335_was_2018_07_18_02_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_01_world_from_335_was_2018_07_18_02_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_01_world_from_335_was_2018_07_18_02_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_01_world_from_335_was_2018_07_18_02_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_02_world_from_335_was_2018_07_18_03_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_02_world_from_335_was_2018_07_18_03_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_02_world_from_335_was_2018_07_18_03_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_02_world_from_335_was_2018_07_18_03_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_03_world_from_335_was_2018_07_18_04_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_03_world_from_335_was_2018_07_18_04_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_03_world_from_335_was_2018_07_18_04_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_03_world_from_335_was_2018_07_18_04_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_04_world_from_335_was_2018_07_22_00_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_04_world_from_335_was_2018_07_22_00_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_04_world_from_335_was_2018_07_22_00_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_04_world_from_335_was_2018_07_22_00_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_05_world_from_335_was_2018_07_22_01_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_05_world_from_335_was_2018_07_22_01_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_05_world_from_335_was_2018_07_22_01_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_05_world_from_335_was_2018_07_22_01_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_06_world_from_335_was_2018_07_22_02_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_06_world_from_335_was_2018_07_22_02_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_06_world_from_335_was_2018_07_22_02_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_06_world_from_335_was_2018_07_22_02_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_07_world_from_335_was_2018_07_22_03_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_07_world_from_335_was_2018_07_22_03_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_07_world_from_335_was_2018_07_22_03_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_07_world_from_335_was_2018_07_22_03_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_08_world_from_335_was_2018_07_22_04_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_08_world_from_335_was_2018_07_22_04_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_08_world_from_335_was_2018_07_22_04_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_08_world_from_335_was_2018_07_22_04_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_09_world_from_335_was_2018_07_22_05_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_09_world_from_335_was_2018_07_22_05_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_09_world_from_335_was_2018_07_22_05_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_09_world_from_335_was_2018_07_22_05_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_10_world_from_335_was_2018_07_22_06_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_10_world_from_335_was_2018_07_22_06_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_10_world_from_335_was_2018_07_22_06_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_10_world_from_335_was_2018_07_22_06_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_23_11_world_from_335_was_2018_07_22_07_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_23_11_world_from_335_was_2018_07_22_07_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_23_11_world_from_335_was_2018_07_22_07_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_23_11_world_from_335_was_2018_07_22_07_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_25_00_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_25_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_25_00_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_25_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_00_world_from_335_was_2018_07_25_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_01_world_from_335_was_2018_07_27_00_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_02_world_from_335_was_2018_07_27_01_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_03_world_from_335_was_2018_07_27_02_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_04_world_from_335_was_2018_07_27_03_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_05_world_from_335_was_2018_07_27_04_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_06_world_from_335_was_2018_07_27_05_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_07_world_from_335_was_2018_07_29_00_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_07_29_08_world_from_335_was_2018_07_29_01_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_07_00_world_from_335_was_2018_08_02_00_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_07_01_world_from_335_was_2018_08_02_01_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_07_02_world_from_335_was_2018_08_02_02_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_07_03_world_from_335_was_2018_08_02_03_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_07_04_world_from_335_was_2018_08_02_04_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_07_05_world_from_335_was_2018_08_02_05_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_07_06_world_from_335_was_2018_08_06_00_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_00_world_from_335_was_2018_08_11_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_01_world_from_335_was_2018_08_11_01_world.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_02_world_from_335_was_2018_08_11_02_world.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_03_world_from_335_was_2018_08_11_03_world.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_04_world_from_335_was_2018_08_11_04_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_05_world_from_335_was_2018_08_11_05_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_06_world_from_335_was_2018_08_11_06_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_07_world_from_335_was_2018_08_11_07_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_08_world_from_335_was_2018_08_11_08_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_09_world_from_335_was_2018_08_11_09_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_10_world_from_335_was_2018_08_11_10_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_11_world_from_335_was_2018_08_11_11_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_12_world_from_335_was_2018_08_11_12_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_13_world_from_335_was_2018_08_11_13_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_14_world_from_335_was_2018_08_11_14_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_15_world_from_335_was_2018_08_11_15_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_13_16_world_from_335_was_2018_08_11_16_world_335.sql diff --git a/sql/updates/world/4.3.4/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql b/sql/old/4.3.4/world/32_2018_07_15/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql rename to sql/old/4.3.4/world/32_2018_07_15/2018_08_14_00_world_from_335_was_2018_08_14_00_world.sql diff --git a/sql/updates/auth/4.3.4/2018_08_15_00_auth.sql b/sql/updates/auth/4.3.4/2018_08_15_00_auth.sql new file mode 100644 index 0000000000..82b1067c1d --- /dev/null +++ b/sql/updates/auth/4.3.4/2018_08_15_00_auth.sql @@ -0,0 +1,2 @@ +-- TDB 4.3.4-33 auth database +UPDATE `updates` SET `state`='ARCHIVED'; diff --git a/sql/updates/characters/4.3.4/2018_08_15_00_characters.sql b/sql/updates/characters/4.3.4/2018_08_15_00_characters.sql new file mode 100644 index 0000000000..96e20bf778 --- /dev/null +++ b/sql/updates/characters/4.3.4/2018_08_15_00_characters.sql @@ -0,0 +1,2 @@ +-- TDB 4.3.4-33 characters database +UPDATE `updates` SET `state`='ARCHIVED'; diff --git a/sql/updates/world/4.3.4/2018_08_15_00.sql b/sql/updates/world/4.3.4/2018_08_15_00.sql new file mode 100644 index 0000000000..812d33ba07 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_08_15_00.sql @@ -0,0 +1,3 @@ +UPDATE `version` SET `db_version`='TDB 434.33', `cache_id`=33 LIMIT 1; + +UPDATE `updates` SET `state`='ARCHIVED'; From e40d9337937e47ab097dcdb89c5baa6d69adc56e Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 15 Aug 2018 15:39:34 +0200 Subject: [PATCH 047/102] missing part --- sql/base/auth_database.sql | 3 ++- sql/base/characters_database.sql | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 4ed53d49dc..6af68c6e25 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1963,7 +1963,8 @@ INSERT INTO `updates` VALUES ('2018_06_15_00_auth.sql','28E2E814F529190BC9423E2A220970F60307DD22','ARCHIVED','2018-06-15 01:40:04',0), ('2018_06_23_00_auth.sql','BE35312C386A127D047E5A7CE0D14DB41D905F8E','ARCHIVED','2018-06-23 01:40:04',0), ('2018_07_15_00_auth.sql','47DA80411544E574DD26BA2990165AC579BE72AB','ARCHIVED','2018-07-15 01:40:04',0), -('2018_07_21_00_auth.sql','93185DC1BCA6A0225EA4CC4ACB1BA26F089E8131','ARCHIVED','2018-07-21 01:40:04',0); +('2018_07_21_00_auth.sql','93185DC1BCA6A0225EA4CC4ACB1BA26F089E8131','ARCHIVED','2018-07-21 01:40:04',0), +('2018_08_15_00_auth.sql','22DC7AA7A1D2B04C62B2EEBFF4562DDDC412B456','ARCHIVED','2018-08-15 01:40:04',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index fe36deb8fc..0ef10c67dd 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -2961,7 +2961,8 @@ INSERT INTO `updates` VALUES ('2018_05_15_00_characters.sql','1FC906E4C7E86DCA67243F0768A94825A2C9E323','ARCHIVED','2018-05-15 00:00:00',0), ('2018_06_15_00_characters.sql','084C438D587E555D1FBCFC86A2A19570BD0B470A','ARCHIVED','2018-06-15 00:00:00',0), ('2018_07_09_00_characters.sql','6F3EA22DD5E4CD9F9C60C4332B147E3DBF2E8A44','ARCHIVED','2018-07-09 18:19:18',0), -('2018_07_15_00_characters.sql','1EB34168BC396A8264C7467AACD1F0A3B036B22D','ARCHIVED','2018-07-15 00:00:00',0); +('2018_07_15_00_characters.sql','1EB34168BC396A8264C7467AACD1F0A3B036B22D','ARCHIVED','2018-07-15 00:00:00',0), +('2018_08_15_00_characters.sql','592D9F32E96E1A14C8F340E8D085F8F5105B063F','ARCHIVED','2018-08-15 00:00:00',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; From 5eb2511e850f1e9363d096ef36a471b18561202e Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 16 Aug 2018 20:24:09 +0200 Subject: [PATCH 048/102] Core/BattleNet: fixed a crash when logging in via battle net and fixed login in general. Also added german locale module to allow german computers to log in via battlenet. --- sql/updates/auth/4.3.4/2018_08_16_00_auth.sql | 4 ++++ src/server/bnetserver/Server/Session.cpp | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 sql/updates/auth/4.3.4/2018_08_16_00_auth.sql diff --git a/sql/updates/auth/4.3.4/2018_08_16_00_auth.sql b/sql/updates/auth/4.3.4/2018_08_16_00_auth.sql new file mode 100644 index 0000000000..a62acbfe28 --- /dev/null +++ b/sql/updates/auth/4.3.4/2018_08_16_00_auth.sql @@ -0,0 +1,4 @@ +UPDATE `battlenet_components` SET `Build`= 0 WHERE `Program`= 'Tool'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'deDE'; +INSERT INTO `battlenet_components` (`Program`, `Platform`, `Build`) VALUES +('WoW', 'deDE', 15595); diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp index 6f16d5a5e5..c8c092e127 100644 --- a/src/server/bnetserver/Server/Session.cpp +++ b/src/server/bnetserver/Server/Session.cpp @@ -175,7 +175,7 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest const& } else { - if (component.Program != "WoW" || AuthHelper::IsBuildSupportingBattlenet(component.Build)) + if (component.Program != "WoW" || !AuthHelper::IsBuildSupportingBattlenet(component.Build)) logonResponse->SetAuthResult(AUTH_REGION_BAD_VERSION); else logonResponse->SetAuthResult(AUTH_USE_GRUNT_LOGON); @@ -603,7 +603,6 @@ void Battlenet::Session::Start() PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_IP_INFO); stmt->setString(0, ip_address); - stmt->setUInt32(1, inet_addr(ip_address.c_str())); _queryProcessor.AddQuery(LoginDatabase.AsyncQuery(stmt).WithPreparedCallback(std::bind(&Battlenet::Session::CheckIpCallback, this, std::placeholders::_1))); } From 22e2754aa550c147f50965acbbf903ecd0da8be1 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 17 Aug 2018 01:33:22 +0200 Subject: [PATCH 049/102] add more locales modules --- sql/base/auth_database.sql | 4 +++- sql/updates/auth/4.3.4/2018_08_17_00_auth.sql | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 sql/updates/auth/4.3.4/2018_08_17_00_auth.sql diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 6af68c6e25..16ecf73e8f 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1964,7 +1964,9 @@ INSERT INTO `updates` VALUES ('2018_06_23_00_auth.sql','BE35312C386A127D047E5A7CE0D14DB41D905F8E','ARCHIVED','2018-06-23 01:40:04',0), ('2018_07_15_00_auth.sql','47DA80411544E574DD26BA2990165AC579BE72AB','ARCHIVED','2018-07-15 01:40:04',0), ('2018_07_21_00_auth.sql','93185DC1BCA6A0225EA4CC4ACB1BA26F089E8131','ARCHIVED','2018-07-21 01:40:04',0), -('2018_08_15_00_auth.sql','22DC7AA7A1D2B04C62B2EEBFF4562DDDC412B456','ARCHIVED','2018-08-15 01:40:04',0); +('2018_08_15_00_auth.sql','22DC7AA7A1D2B04C62B2EEBFF4562DDDC412B456','ARCHIVED','2018-08-15 01:40:04',0), +('2018_08_16_00_auth.sql','FF00C2A63E8F1E43442C083F2682E100FB39AA5C','ARCHIVED','2018-08-16 01:40:04',0), +('2018_08_17_00_auth.sql','0C9921DCEF92D0C66524299A2F0B86EBB1B7020E','ARCHIVED','2018-08-17 01:40:04',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/auth/4.3.4/2018_08_17_00_auth.sql b/sql/updates/auth/4.3.4/2018_08_17_00_auth.sql new file mode 100644 index 0000000000..1c610d3547 --- /dev/null +++ b/sql/updates/auth/4.3.4/2018_08_17_00_auth.sql @@ -0,0 +1,18 @@ +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'frFR'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'esES'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'esMX'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'ptBR'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'ptPT'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'ruRU'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'zhCN'; +DELETE FROM `battlenet_components` WHERE `Program`= 'WoW' AND `Platform`= 'zhTW'; +INSERT INTO `battlenet_components` (`Program`, `Platform`, `Build`) VALUES +('WoW', 'frFR', 15595), +('WoW', 'esES', 15595), +('WoW', 'esMX', 15595), +('WoW', 'ptPT', 15595), +('WoW', 'ptBR', 15595), +('WoW', 'ruRU', 15595), +('WoW', 'zhCN', 15595), +('WoW', 'zhTW', 15595); + From 20ce775fe61cac3246338c47095b3e229ddcad3c Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 17 Aug 2018 01:42:08 +0200 Subject: [PATCH 050/102] revert unneeded change --- src/server/bnetserver/Server/Session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp index c8c092e127..348b4b6acc 100644 --- a/src/server/bnetserver/Server/Session.cpp +++ b/src/server/bnetserver/Server/Session.cpp @@ -175,7 +175,7 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest const& } else { - if (component.Program != "WoW" || !AuthHelper::IsBuildSupportingBattlenet(component.Build)) + if (component.Program != "WoW" || AuthHelper::IsBuildSupportingBattlenet(component.Build)) logonResponse->SetAuthResult(AUTH_REGION_BAD_VERSION); else logonResponse->SetAuthResult(AUTH_USE_GRUNT_LOGON); From 239086c06fb2dc276c8a1324e369a38a657647cc Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 17 Aug 2018 19:24:46 +0200 Subject: [PATCH 051/102] missing changes --- sql/base/auth_database.sql | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 16ecf73e8f..0b6235f820 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -244,12 +244,22 @@ INSERT INTO `battlenet_components` VALUES ('Bnet','Cmp1',3), ('Bnet','Win',26487), ('Bnet','Wn64',26487), -('Tool','Win',2736), +('Tool','Win',0), ('WoW','base',15595), ('WoW','enGB',15595), ('WoW','enUS',15595), ('WoW','Win',15595), -('WoW','Wn64',15595); +('WoW','Wn64',15595), +('WoW','deDE',15595), +('WoW','frFR',15595), +('WoW','esES',15595), +('WoW','esMX',15595), +('WoW','ptPT',15595), +('WoW','ptBR',15595), +('WoW','ruRU',15595), +('WoW','zhCN',15595), +('WoW','zhTW',15595); + /*!40000 ALTER TABLE `battlenet_components` ENABLE KEYS */; UNLOCK TABLES; From 9b75d09a7a65230d06a74f44a81c3c758a6332e7 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 19 Aug 2018 03:43:45 +0200 Subject: [PATCH 052/102] Core/Spells: reworked and fixed Combat Resurrection system * use SPELL_FAILED_IN_COMBAT_RES_LIMIT_REACHED to notify resurrecting player if no resurrection charges are left * removed mechanics that are not used for Cataclysm --- src/server/game/Handlers/MiscHandler.cpp | 25 +++--- src/server/game/Instances/InstanceScript.cpp | 90 +++++--------------- src/server/game/Instances/InstanceScript.h | 8 +- src/server/game/Maps/Map.cpp | 3 - src/server/game/Spells/Spell.cpp | 6 ++ 5 files changed, 41 insertions(+), 91 deletions(-) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 7e1f96b1f8..d987d8f3e9 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -609,29 +609,30 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData) recvData >> guid; recvData >> status; - if (GetPlayer()->IsAlive()) + Player* player = GetPlayer(); + if (!player) + return; + + if (player->IsAlive()) return; if (status == 0) { - GetPlayer()->ClearResurrectRequestData(); // reject + player->ClearResurrectRequestData(); // reject return; } - if (!GetPlayer()->IsResurrectRequestedBy(guid)) + if (!player->IsResurrectRequestedBy(guid)) return; - if (Player* ressPlayer = ObjectAccessor::GetPlayer(*GetPlayer(), guid)) + if (InstanceScript* instance = player->GetInstanceScript()) { - if (InstanceScript* instance = ressPlayer->GetInstanceScript()) + if (instance->IsEncounterInProgress() && player->GetMap()->IsRaid()) { - if ((instance->IsEncounterInProgress() && ressPlayer->GetMap()->IsRaid())) - { - if (!instance->GetCombatResurrectionCharges()) - return; - else - instance->UseCombatResurrection(); - } + if (!instance->GetCombatResurrectionCharges()) + return; + else + instance->UseCombatResurrection(); } } diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index a19c22b1df..c8cc877745 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -365,29 +365,22 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state) if (minion->isWorldBoss() && minion->IsAlive()) return false; - switch (state) - { - case IN_PROGRESS: - { - uint32 resInterval = GetCombatResurrectionChargeInterval(); - if (instance->Is25ManRaid() || (instance->Is25ManRaid() && instance->IsHeroic())) - { - InitializeCombatResurrections(3, resInterval); - } - else if (instance->IsRaid()) - { - InitializeCombatResurrections(1, resInterval); - } - break; - } - - case FAIL: - case DONE: - ResetCombatResurrections(); - break; - default: - break; - } + if (instance->IsRaid()) + { + switch (state) + { + case IN_PROGRESS: + InitializeCombatResurrections(); + SendEncounterUnit(ENCOUNTER_FRAME_SET_COMBAT_RES_LIMIT); + break; + case FAIL: + case DONE: + SendEncounterUnit(ENCOUNTER_FRAME_RESET_COMBAT_RES_LIMIT); + break; + default: + break; + } + } bossInfo->state = state; SaveToDB(); @@ -806,55 +799,14 @@ void InstanceScript::UpdatePhasing() PhasingHandler::SendToPlayer(player); } -void InstanceScript::UpdateCombatResurrection(uint32 diff) +void InstanceScript::InitializeCombatResurrections() { - if (!_combatResurrectionTimerStarted) - return; - - _combatResurrectionTimer -= diff; - if (_combatResurrectionTimer <= 0) - { - AddCombatResurrectionCharge(); - _combatResurrectionTimerStarted = false; - } -} - -void InstanceScript::InitializeCombatResurrections(uint8 charges /*= 1*/, uint32 interval /*= 0*/) -{ - _combatResurrectionCharges = charges; - if (!interval) - return; - - _combatResurrectionTimer = interval; - _combatResurrectionTimerStarted = true; // true; -} - -void InstanceScript::AddCombatResurrectionCharge() -{ - // ++_combatResurrectionCharges; - _combatResurrectionTimer = GetCombatResurrectionChargeInterval(); - _combatResurrectionTimerStarted = true; + if (instance->IsRaid()) + _combatResurrectionCharges = instance->Is25ManRaid() ? 3 : 1; } void InstanceScript::UseCombatResurrection() { - --_combatResurrectionCharges; -} - -void InstanceScript::ResetCombatResurrections() -{ - _combatResurrectionCharges = 0; - _combatResurrectionTimer = 0; - _combatResurrectionTimerStarted = 0; -} - -uint32 InstanceScript::GetCombatResurrectionChargeInterval() const -{ - // This System here is from MoP and not Cataclysm. - // In Cataclysm have 10 Man Raids 1 Resurrection and 25 Man Raids 3 Resurrection free. - uint32 interval = 0; - if (uint32 playerCount = instance->GetPlayers().getSize()) - interval = 90 * MINUTE * IN_MILLISECONDS / playerCount; - - return interval; + _combatResurrectionCharges--; + SendEncounterUnit(ENCOUNTER_FRAME_ADD_COMBAT_RES_LIMIT); } diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index c891e93a79..9604b9c70f 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -172,7 +172,6 @@ class TC_GAME_API InstanceScript : public ZoneScript void SaveToDB(); virtual void Update(uint32 /*diff*/) { } - void UpdateCombatResurrection(uint32 /*diff*/); // Used by the map's CannotEnter function. // This is to prevent players from entering during boss encounters. @@ -265,12 +264,9 @@ class TC_GAME_API InstanceScript : public ZoneScript void ResetAreaTriggerDone(uint32 id) { _activatedAreaTriggers.erase(id); } bool IsAreaTriggerDone(uint32 id) const { return _activatedAreaTriggers.find(id) != _activatedAreaTriggers.end(); } - void InitializeCombatResurrections(uint8 charges = 1, uint32 interval = 0); - void AddCombatResurrectionCharge(); + void InitializeCombatResurrections(); void UseCombatResurrection(); - void ResetCombatResurrections(); uint8 GetCombatResurrectionCharges() const { return _combatResurrectionCharges; } - uint32 GetCombatResurrectionChargeInterval() const; protected: void SetHeaders(std::string const& dataHeaders); @@ -318,9 +314,7 @@ class TC_GAME_API InstanceScript : public ZoneScript ObjectInfoMap _gameObjectInfo; ObjectGuidMap _objectGuids; uint32 completedEncounters; // completed encounter mask, bit indexes are DungeonEncounter.dbc boss numbers, used for packets - uint32 _combatResurrectionTimer; uint8 _combatResurrectionCharges; // the counter for available battle resurrections - bool _combatResurrectionTimerStarted; std::unordered_set _activatedAreaTriggers; std::vector const* const _instanceSpawnGroups; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 28e552b818..14e1cf3c7d 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3897,10 +3897,7 @@ void InstanceMap::Update(uint32 t_diff) Map::Update(t_diff); if (i_data) - { i_data->Update(t_diff); - i_data->UpdateCombatResurrection(t_diff); - } } void InstanceMap::RemovePlayerFromMap(Player* player, bool remove) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 7900c5856a..2d56a5ce20 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5086,6 +5086,12 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint return SPELL_FAILED_ONLY_INDOORS; } + if (m_spellInfo->HasAttribute(SPELL_ATTR8_BATTLE_RESURRECTION) && m_caster->GetMap()->IsRaid()) + if (InstanceScript* instance = m_caster->GetInstanceScript()) + if (instance->IsEncounterInProgress()) + if (!instance->GetCombatResurrectionCharges()) + return SPELL_FAILED_IN_COMBAT_RES_LIMIT_REACHED; + // only check at first call, Stealth auras are already removed at second call // for now, ignore triggered spells if (strict && !(_triggeredCastFlags & TRIGGERED_IGNORE_SHAPESHIFT)) From 0a16dd8b7f21516f170b901888c2f1602cad089e Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 19 Aug 2018 13:44:33 +0200 Subject: [PATCH 053/102] Core/Spells: fixed some tabbing of old code remains from old battle resurrection implementation and use the resurrecting player as map reference target instead of the player --- src/server/game/Handlers/MiscHandler.cpp | 17 ++++++++++------- src/server/game/Instances/InstanceScript.cpp | 4 ++-- src/server/game/Instances/InstanceScript.h | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index d987d8f3e9..2bb7215257 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -625,18 +625,21 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData) if (!player->IsResurrectRequestedBy(guid)) return; - if (InstanceScript* instance = player->GetInstanceScript()) + if (Player* resurrectingPlayer = ObjectAccessor::GetPlayer(*player, guid)) { - if (instance->IsEncounterInProgress() && player->GetMap()->IsRaid()) + if (InstanceScript* instance = resurrectingPlayer->GetInstanceScript()) { - if (!instance->GetCombatResurrectionCharges()) - return; - else - instance->UseCombatResurrection(); + if (instance->IsEncounterInProgress() && resurrectingPlayer->GetMap()->IsRaid()) + { + if (!instance->GetCombatResurrectionCharges()) + return; + else + instance->UseCombatResurrection(); + } } } - GetPlayer()->ResurrectUsingRequestData(); + player->ResurrectUsingRequestData(); } void WorldSession::SendAreaTriggerMessage(char const* Text, ...) diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index c8cc877745..f314750510 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -802,11 +802,11 @@ void InstanceScript::UpdatePhasing() void InstanceScript::InitializeCombatResurrections() { if (instance->IsRaid()) - _combatResurrectionCharges = instance->Is25ManRaid() ? 3 : 1; + _combatResurrectionCharges = instance->Is25ManRaid() ? 3 : 1; } void InstanceScript::UseCombatResurrection() { - _combatResurrectionCharges--; + _combatResurrectionCharges--; SendEncounterUnit(ENCOUNTER_FRAME_ADD_COMBAT_RES_LIMIT); } diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 9604b9c70f..bf51a5f259 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -314,7 +314,7 @@ class TC_GAME_API InstanceScript : public ZoneScript ObjectInfoMap _gameObjectInfo; ObjectGuidMap _objectGuids; uint32 completedEncounters; // completed encounter mask, bit indexes are DungeonEncounter.dbc boss numbers, used for packets - uint8 _combatResurrectionCharges; // the counter for available battle resurrections + uint8 _combatResurrectionCharges; // the counter for available combat resurrections std::unordered_set _activatedAreaTriggers; std::vector const* const _instanceSpawnGroups; From 00a1d1bfde13f851791a0a56ebe647145f3d1d7a Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 15 Aug 2018 19:28:54 +0200 Subject: [PATCH 054/102] DB/Item: Lunar Festival Invitation Closes #11518 --- .../world/3.3.5/2018_08_15_00_world_335.sql | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_15_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_15_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_15_00_world_335.sql new file mode 100644 index 0000000000..754192f01c --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_15_00_world_335.sql @@ -0,0 +1,60 @@ +-- +DELETE FROM `gameobject` WHERE `guid` IN (5111,5117,5122,5126,5131,5140,5144,5155); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(5111, 180867, 1, 7603.94, -2211.17, 471.606, 3.78647, 0, 0, 0.948466, -0.316878, 25, 100, 1), +(5117, 180867, 1, 7575.26, -2238.68, 469.858, 1.03679, 0, 0, 0.495486, 0.868616, 25, 100, 1), +(5122, 180867, 1, 7595.67, -2246.32, 466.965, 1.30382, 0, 0, 0.606707, 0.794925, 25, 100, 1), +(5126, 180867, 1, 7610.97, -2228.92, 468.71, 2.96651, 0, 0, 0.996171, 0.0874282, 25, 100, 1), +(5131, 180867, 1, 7570.31, -2220.8, 473.445, 0.357419, 0, 0, 0.17776, 0.984074, 25, 100, 1), +(5140, 180867, 1, 7585.47, -2205.31, 475.281, 4.91744, 0, 0, 0.631024, -0.775763, 25, 100, 1), +(5144, 180867, 530, -1804.2651, 5492.6840, -12.4278, 5.101903, 0, 0, 0.631024, -0.775763, 25, 100, 1), +(5155, 180867, 530, -1778.0809, 5439.7109, -12.4276, 1.531083, 0, 0, 0.631024, -0.775763, 25, 100, 1); + +-- Added target position to each teleport spell in Lunar Festival +DELETE FROM `spell_target_position` WHERE `id` IN (26454, 26452, 26450, 26453, 26456, 26455); +INSERT INTO `spell_target_position` (`ID`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES +(26454, 0, -8748.48, 1073.61, 90.4898, 5.03789, 0), -- To Stormwind +(26452, 0, -4663, -955.663, 500.377, 0.722862, 0), -- To Ironforge +(26450, 1, 10150.1, 2602, 1330.83, 4.80894, 0), -- To Darnassus +(26453, 1, 1982.9, -4255.62, 31.6692, 3.31984, 0), -- To Orgrimmar +(26456, 0, 1642.01, 239.002, 62.5918, 3.02316, 0), -- To Undercity +(26455, 1, -1031.45, -230.867, 160.14, 3.28358, 0); -- To Thunderbluff + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=26373 AND `spell_effect`=26448; +DELETE FROM `conditions` WHERE `SourceEntry`=26373 AND `SourceTypeOrReferenceId`=13; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 2, 26373, 0, 0, 31, 0, 4, 0, 0, 0, 0, '', 'Lunar Invitation visual on player'); + +-- Lunar Festival spell focus for teleportaion +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=180867; +DELETE FROM `smart_scripts` WHERE `entryorguid` = 180867 AND source_type=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(180867,1,0,0,8,0,100,0,26373,0,1000,1000,85,26448,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lunar Festival - On spell hit - Cast self teleportation Moonglade"), +(180867,1,1,0,8,0,100,0,26373,0,1000,1000,85,26454,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lunar Festival - On spell hit - Cast self teleportation Stormwind"), +(180867,1,2,0,8,0,100,0,26373,0,1000,1000,85,26452,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lunar Festival - On spell hit - Cast self teleportation Ironforge"), +(180867,1,3,0,8,0,100,0,26373,0,1000,1000,85,26450,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lunar Festival - On spell hit - Cast self teleportation Darnassus"), +(180867,1,4,0,8,0,100,0,26373,0,1000,1000,85,26453,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lunar Festival - On spell hit - Cast self teleportation Orgrimmar"), +(180867,1,5,0,8,0,100,0,26373,0,1000,1000,85,26456,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lunar Festival - On spell hit - Cast self teleportation Undercity"), +(180867,1,6,0,8,0,100,0,26373,0,1000,1000,85,26455,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lunar Festival - On spell hit - Cast self teleportation Thunderbluff"); + +-- Lunar Festival spell focus for teleportaion +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=180867; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(22,1,180867,1,0,29,0,15892,5,0,0,0,'','Lunar Festival Execute sai if near npc 15892'), +(22,1,180867,1,0,6,0,469,0,0,0,0,'','Lunar Festival sai the player Must Be Alliance'), +(22,1,180867,1,1,29,0,15891,5,0,0,0,'','Lunar Festival Execute sai if near npc 15891'), +(22,1,180867,1,1,6,0,67,0,0,0,0,'','Lunar Festival sai the player Must Must Be Horde'), +(22,1,180867,1,2,29,0,15892,5,0,0,0,'','Lunar Festival Execute sai if near npc 15892'), +(22,1,180867,1,2,22,0,571,0,0,0,0,'','Lunar Festival Execute sai if on map 571'), +(22,2,180867,1,0,29,0,15694,5,0,0,0,'','Lunar Festival Execute sai if near npc 15694'), +(22,2,180867,1,0,6,0,469,0,0,0,0,'','Lunar Festival SAI the player Must Be Alliance'), +(22,3,180867,1,0,29,0,15906,5,0,0,0,'','Lunar FestivalExecute sai if near npc 15906'), +(22,3,180867,1,0,6,0,469,0,0,0,0,'','Lunar Festival SAI the player Must Be Alliance'), +(22,4,180867,1,0,29,0,15905,5,0,0,0,'','Lunar Festival Execute sai if near npc 15905'), +(22,4,180867,1,0,6,0,469,0,0,0,0,'','Lunar Festival SAI the player Must Be Alliance'), +(22,5,180867,1,0,29,0,15908,5,0,0,0,'','Lunar Festival Execute sai if near npc 15908'), +(22,5,180867,1,0,6,0,67,0,0,0,0,'','Lunar Festival SAI the player Must Must Be Horde'), +(22,6,180867,1,0,29,0,15907,5,0,0,0,'','Lunar Festival Execute sai if near npc 15907'), +(22,6,180867,1,0,6,0,67,0,0,0,0,'','Lunar Festival SAI the player Must Must Be Horde'), +(22,7,180867,1,0,29,0,15719,5,0,0,0,'','Lunar Festival Execute sai if near npc 15719'), +(22,7,180867,1,0,6,0,67,0,0,0,0,'','Lunar Festival SAI the player Must Must Be Horde'); From 28384369cab9cf79f2ce6fd49f7c9b048a2b2da1 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 20 Aug 2018 04:24:54 +0200 Subject: [PATCH 055/102] DB/Quest: Cleansing Witch Hill --- .../world/3.3.5/2018_08_15_01_world_335.sql | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_15_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_15_01_world_335.sql b/sql/updates/world/3.3.5/2018_08_15_01_world_335.sql new file mode 100644 index 0000000000..dcaa9039f0 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_15_01_world_335.sql @@ -0,0 +1,48 @@ +-- Witchbane Torch +SET @GUID := 5160; +DELETE FROM `gameobject` WHERE `guid`=@GUID; +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 +(@GUID,186425,1,0,0,1,1,-2967.03,-3872.18,33.0928,2.24779,-0,-0,-0.90179,-0.432175,-20,255,1,"",0); + +DELETE FROM `event_scripts` WHERE `id`=15452; +INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES +(15452,0,9,@GUID,20,0,0,0,0,0); + +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=186425; +DELETE FROM `smart_scripts` WHERE `entryorguid`=186425 AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(186425,1,0,0,70,0,100,0,1,0,0,0,0,45,1,1,0,0,0,0,19,4792,0,0,0,0,0,0,"Witchbane Torch - On State Changed - Set Data to \"Swamp Eye\" Jarl"); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (42517,42515); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,1,42517,0,0,31,0,3,23869,0,0,0,0,"","Spell 'Beam to Zelfrax' can only target 'Invis Zelfrax Origin'"), +(13,1,42515,0,0,31,0,3,23868,0,0,0,0,"","Spell 'Jarl Beam' can only target 'Invis Zelfrax Target'"); + +-- "Swamp Eye" Jarl +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4792; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4792 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=479200 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4792,0,0,0,38,0,100,0,1,1,0,0,0,80,479200,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Swamp Eye\" Jarl - On Data Set - Run Script"), +(479200,9,0,0,0,0,100,0,0,0,0,0,0,11,42515,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Swamp Eye\" Jarl - On Script - Cast 'Jarl Beam'"), +(479200,9,1,0,0,0,100,0,8000,8000,0,0,0,86,42517,0,19,23868,0,0,1,0,0,0,0,0,0,0,"\"Swamp Eye\" Jarl - On Script - Cross Cast 'Beam to Zelfrax'"), +(479200,9,2,0,0,0,100,0,7000,7000,0,0,0,12,23864,3,300000,0,0,0,8,23869,0,0,-2984.98,-3853.72,45.7142,5.44525,"\"Swamp Eye\" Jarl - On Script - Summon Creature 'Zelfrax'"); + +-- Zelfrax +UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=23864; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23864 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2386400,2386401) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(23864,0,0,0,54,0,100,0,0,0,0,0,0,18,768,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zelfrax - Just Summoned - Add Unit Flags 'Immune to NPC'+'Immune to PC'"), +(23864,0,1,0,54,0,100,0,0,0,0,0,0,80,2386400,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zelfrax - Just Summoned - Run Script"), +(23864,0,2,0,40,0,100,0,1,23864,0,0,0,80,2386401,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zelfrax - On Waypoint 1 Reached - Run Script"), +(2386400,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zelfrax - On Script - Say Line 0"), +(2386400,9,1,0,0,0,100,0,5000,5000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zelfrax - On Script - Say Line 1"), +(2386400,9,2,0,0,0,100,0,0,0,0,0,0,53,1,23864,0,0,0,2,1,0,0,0,0,0,0,0,"Zelfrax - On Script - Start Waypoint"), +(2386401,9,0,0,0,0,100,0,0,0,0,0,0,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zelfrax - On Script - Set Home Position"), +(2386401,9,1,0,0,0,100,0,0,0,0,0,0,19,768,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zelfrax - On Script - Remove 'Immune to NPC'+'Immune to PC'"), +(2386401,9,2,0,0,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,"Zelfrax - On Script - Start Attacking"); + +DELETE FROM `waypoints` WHERE `entry`=23864; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(23864,1,-2965.74,-3873.83,33.3183,""); From dec3526fdac133221a293e59db2cdd1d313a19d7 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 20 Aug 2018 04:25:45 +0200 Subject: [PATCH 056/102] DB/Quest: The Missing Diplomat (Part 16) --- .../world/3.3.5/2018_08_15_02_world_335.sql | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_15_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_15_02_world_335.sql b/sql/updates/world/3.3.5/2018_08_15_02_world_335.sql new file mode 100644 index 0000000000..4ebfb5ceaa --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_15_02_world_335.sql @@ -0,0 +1,102 @@ +-- Quest "The Missing Diplomat (Part 16)" +UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=1324; -- Prevents quest from auto completing + +-- Texts +DELETE FROM `creature_text` WHERE `CreatureID` IN (4966,5184); +DELETE FROM `creature_text` WHERE `CreatureID`=4967 AND `GroupID` IN (1,2,3,4); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(4966,0,0,"%s obviously beaten, tries to run.",16,0,100,0,0,0,8225,0,"Private Hendel"), +(4966,1,0,"%s, too injured, gives up the chase.",16,0,100,0,0,0,8224,0,"Private Hendel"), +(4966,2,0,"Please... please... Miss Proudmore. I didn't mean to...",12,7,100,0,0,0,1759,0,"Private Hendel"), +(4967,1,0,"Ah, Private Hendel. A pleasure to meet one of the men who would betray his kingdom for pride.",12,7,100,0,0,0,1657,0,"Archmage Tervosh"), +(4967,2,0,"Why don't we deal with you now, Hendel? Lady Proudmoore will speak to you back in the tower.",12,7,100,0,0,0,1663,0,"Archmage Tervosh"), +(4967,3,0,"I apologize for taking so long to get here. I wanted Lady Proudmoore to be present also.",12,7,100,0,0,0,1761,0,"Archmage Tervosh"), +(4967,4,0,"We can only stay a few moments before returning to the tower. If you wish to speak to us more you may find us there.",12,7,100,0,0,0,1808,0,"Archmage Tervosh"), +(5184,0,0,"It's Proudmoore! Get out of here!",12,7,100,0,0,0,7325,0,"Theramore Sentry"), +(5184,1,0,"Run!",12,7,100,0,0,0,7324,0,"Theramore Sentry"), +(5184,1,1,"Get out of here!",12,7,100,0,0,0,7340,0,"Theramore Sentry"), +(5184,1,2,"Don't let them catch you!",12,7,100,0,0,0,7341,0,"Theramore Sentry"), +(5184,1,3,"She'll have our heads if we're caught!",12,7,100,0,0,0,7342,0,"Theramore Sentry"); + +-- Private Hendel +UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=4966; +DELETE FROM `smart_scripts` WHERE `entryorguid`=4966 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (496600,496601) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(4966,0,0,1,19,0,100,0,1324,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Quest 'The Missing Diplomat (Part 16)' Taken - Remove Npc Flag Questgiver"), +(4966,0,1,2,61,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Quest 'The Missing Diplomat (Part 16)' Taken - Set Invincibility at 1 HP"), +(4966,0,2,3,61,0,100,0,0,0,0,0,0,2,168,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Quest 'The Missing Diplomat (Part 16)' Taken - Set Faction 168"), +(4966,0,3,4,61,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,11,5184,50,0,0,0,0,0,"Private Hendel - On Quest 'The Missing Diplomat (Part 16)' Taken - Set Data 1 to Theramore Sentry"), +(4966,0,4,5,61,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Private Hendel - On Quest 'The Missing Diplomat (Part 16)' Taken - Start Attacking"), +(4966,0,5,6,61,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Private Hendel - On Quest 'The Missing Diplomat (Part 16)' Taken - Store Target"), +(4966,0,6,0,61,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Quest 'The Missing Diplomat (Part 16)' Taken - Set Event Phase 1"), +(4966,0,7,0,2,1,100,1,0,20,0,0,0,80,496600,2,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - Between 0-20% Health - Run Script 1 (Phase 1)"), +(4966,0,8,0,21,2,100,1,0,0,0,0,0,80,496601,2,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Reached Home - Run Script 2 (Phase 2)"), +(496600,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Script - Say Line 0"), +(496600,9,1,0,0,0,100,0,0,0,0,0,0,2,1077,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Script - Set Faction 1077"), +(496600,9,2,0,0,0,100,0,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Script - Stop Combat"), +(496600,9,3,0,0,0,100,0,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Script - Set Event Phase 2"), +(496601,9,0,0,0,0,100,0,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-2897.06,-3349.2,31.3004,0,"Private Hendel - On Script - Move to Position"), +(496601,9,1,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.277231,"Private Hendel - On Script - Set Orientation"), +(496601,9,2,0,0,0,100,0,1000,1000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Script - Say Line 1"), +(496601,9,3,0,0,0,100,0,0,0,0,0,0,17,64,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Script - Set Emote State 64"), +(496601,9,4,0,0,0,100,0,0,0,0,0,0,45,2,2,0,0,0,0,11,5184,50,0,0,0,0,0,"Private Hendel - On Script - Set Data 2 to Theramore Sentry"), +(496601,9,5,0,0,0,100,0,0,0,0,0,0,107,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Private Hendel - On Script - Summon Group"), +(496601,9,6,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,19,4967,0,0,0,0,0,0,"Private Hendel - On Script - Set Data to Archmage Tervosh"), +(496601,9,7,0,0,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,4967,0,0,0,0,0,0,"Private Hendel - On Script - Send Target to Archmage Tervosh"); + +DELETE FROM `creature_summon_groups` WHERE `summonerId`=4966; +INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES +(4966,0,1,4967,-2882.55,-3345.43,33.7722,3.39919,3,90000), +(4966,0,1,4968,-2880.52,-3346.80,34.5063,3.36777,3,90000), +(4966,0,1,4965,-2881.22,-3343.22,34.1732,3.52487,3,90000); + +-- Theramore Sentry +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5184; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-31271,-31268) AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (518400,518401) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-31271,0,0,0,38,0,100,1,1,1,0,0,0,2,168,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Data 1 Set - Set Faction 168"), +(-31271,0,1,0,38,0,100,1,1,1,0,0,0,49,0,0,0,0,0,0,21,50,0,0,0,0,0,0,"Theramore Sentry - On Data 1 Set - Start Attacking"), +(-31271,0,2,0,38,0,100,1,2,2,0,0,0,80,518400,2,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Data 2 Set - Run Script"), +(-31271,0,3,0,40,0,100,0,2,518400,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Waypoint 2 Reahed - Despawn"), +(-31268,0,0,0,38,0,100,1,1,1,0,0,0,2,168,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Data Set - Set Faction 168"), +(-31268,0,1,0,38,0,100,1,1,1,0,0,0,49,0,0,0,0,0,0,21,50,0,0,0,0,0,0,"Theramore Sentry - On Data Set - Start Attacking"), +(-31268,0,2,0,38,0,100,1,2,2,0,0,0,80,518401,2,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Data 2 Set - Run Script"), +(-31268,0,3,0,40,0,100,0,3,518401,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Waypoint 3 Reahed - Despawn"), +(518400,9,0,0,0,0,100,0,1000,1000,0,0,0,2,150,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Set Faction 150"), +(518400,9,1,0,0,0,100,0,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Evade"), +(518400,9,2,0,0,0,100,0,0,0,0,0,0,53,1,518400,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Start Waypoint"), +(518400,9,3,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Say Line 0"), +(518401,9,0,0,0,0,100,0,1000,1000,0,0,0,2,150,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Set Faction 150"), +(518401,9,1,0,0,0,100,0,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Evade"), +(518401,9,2,0,0,0,100,0,0,0,0,0,0,53,1,518401,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Start Waypoint"), +(518401,9,3,0,0,0,100,0,1000,1000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Theramore Sentry - On Script - Say Line 1"); + +DELETE FROM `waypoints` WHERE `entry` IN (518400,518401); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(518400,1,-2906.15,-3345.12,31.3324,""), +(518400,2,-2910.64,-3353.77,30.4347,""), +(518401,1,-2897.26,-3330.35,33.442,""), +(518401,2,-2908.55,-3336.71,32.0493,""), +(518401,3,-2914.51,-3346.08,30.843,""); + +-- Archmage Tervosh +DELETE FROM `smart_scripts` WHERE `entryorguid`=4967 AND `source_type`=0 AND `id` IN (0,4,5,6); +DELETE FROM `smart_scripts` WHERE `entryorguid`=496700 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(4967,0,0,0,0,0,100,0,0,0,3000,5000,0,11,20822,64,0,0,0,0,2,0,0,0,0,0,0,0,"Archmage Tervosh - In Combat - Cast 'Frostbolt'"), +(4967,0,4,0,0,0,100,0,6000,8000,12000,14000,0,11,20823,0,0,0,0,0,2,0,0,0,0,0,0,0,"Archmage Tervosh - In Combat - Cast 'Fireball'"), +(4967,0,5,0,38,0,100,1,1,1,0,0,0,80,496700,2,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Data Set - Run Script"), +(496700,9,0,0,0,0,100,0,0,0,0,0,0,11,51347,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Cast 'Teleport Visual Only'"), +(496700,9,1,0,0,0,100,0,0,0,0,0,0,86,51347,0,19,4965,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Cross Cast 'Teleport Visual Only'"), +(496700,9,2,0,0,0,100,0,0,0,0,0,0,86,51347,0,19,4968,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Cross Cast 'Teleport Visual Only'"), +(496700,9,3,0,0,0,100,0,4000,4000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 1"), +(496700,9,4,0,0,0,100,0,3000,3000,0,0,0,11,7081,0,0,0,0,0,19,4966,0,0,0,0,0,0,"Archmage Tervosh - On Script - Cast 'Encage'"), +(496700,9,5,0,0,0,100,0,4000,4000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 2"), +(496700,9,6,0,0,0,100,0,5000,5000,0,0,0,1,2,0,0,0,0,0,19,4966,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 2 (Private Hendel)"), +(496700,9,7,0,0,0,100,0,3000,3000,0,0,0,11,7079,0,0,0,0,0,19,4966,0,0,0,0,0,0,"Archmage Tervosh - On Script - Cast 'Simple Teleport Other'"), +(496700,9,8,0,0,0,100,0,2000,2000,0,0,0,41,0,0,0,0,0,0,19,4966,0,0,0,0,0,0,"Archmage Tervosh - On Script - Despawn (Private Hendel)"), +(496700,9,9,0,0,0,100,0,2000,2000,0,0,0,15,1324,0,0,0,0,0,12,1,0,0,0,0,0,0,"Archmage Tervosh - On Script - Complete Quest 'The Missing Diplomat (Part 16)'"), +(496700,9,10,0,0,0,100,0,1000,1000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 2"), +(496700,9,11,0,0,0,100,0,6000,6000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 3"); From c27030e9654ce0fcdf6a01f2a0683a17082e4153 Mon Sep 17 00:00:00 2001 From: Killyana Date: Thu, 16 Aug 2018 11:00:34 +0200 Subject: [PATCH 057/102] DB/Text: Maxima Blastenheimer Closes #18338 --- sql/updates/world/3.3.5/2018_08_16_00_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_16_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql new file mode 100644 index 0000000000..9cae0da259 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql @@ -0,0 +1,2 @@ +`-- +UPDATE `npc_text` SET `BroadcastTextID0`=0 WHERE `ID`=7790; From 62f259e2c965652b7a435acecd42af92e3311fba Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 16 Aug 2018 11:33:41 +0200 Subject: [PATCH 058/102] Startup/DB: Print errors on npc_text vs broadcast_text mismatches. --- src/server/game/Globals/ObjectMgr.cpp | 36 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 2584e4b554..3354a61adf 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5904,28 +5904,36 @@ void ObjectMgr::LoadGossipText() for (uint8 i = 0; i < MAX_GOSSIP_TEXT_OPTIONS; ++i) { - gText.Options[i].Text_0 = fields[cic++].GetString(); - gText.Options[i].Text_1 = fields[cic++].GetString(); - gText.Options[i].BroadcastTextID = fields[cic++].GetUInt32(); - gText.Options[i].Language = fields[cic++].GetUInt8(); - gText.Options[i].Probability = fields[cic++].GetFloat(); + GossipTextOption& gOption = gText.Options[i]; + gOption.Text_0 = fields[cic++].GetString(); + gOption.Text_1 = fields[cic++].GetString(); + gOption.BroadcastTextID = fields[cic++].GetUInt32(); + gOption.Language = fields[cic++].GetUInt8(); + gOption.Probability = fields[cic++].GetFloat(); for (uint8 j = 0; j < MAX_GOSSIP_TEXT_EMOTES; ++j) { - gText.Options[i].Emotes[j]._Delay = fields[cic++].GetUInt16(); - gText.Options[i].Emotes[j]._Emote = fields[cic++].GetUInt16(); + gOption.Emotes[j]._Delay = fields[cic++].GetUInt16(); + gOption.Emotes[j]._Emote = fields[cic++].GetUInt16(); } - } - for (uint8 i = 0; i < MAX_GOSSIP_TEXT_OPTIONS; i++) - { - if (gText.Options[i].BroadcastTextID) + // check broadcast_text correctness + if (gOption.BroadcastTextID) { - if (!sObjectMgr->GetBroadcastText(gText.Options[i].BroadcastTextID)) + if (BroadcastText const* bcText = sObjectMgr->GetBroadcastText(gOption.BroadcastTextID)) { - TC_LOG_ERROR("sql.sql", "GossipText (Id: %u) in table `npc_text` has non-existing or incompatible BroadcastTextID%u %u.", id, i, gText.Options[i].BroadcastTextID); - gText.Options[i].BroadcastTextID = 0; + if (bcText->MaleText[DEFAULT_LOCALE] != gOption.Text_0) + TC_LOG_ERROR("sql.sql", "Row %u in table `npc_text` has mismatch between text%u_0 and the corresponding MaleText in `broadcast_text` row %u", id, i, gOption.BroadcastTextID); + if (bcText->FemaleText[DEFAULT_LOCALE] != gOption.Text_1) + TC_LOG_ERROR("sql.sql", "Row %u in table `npc_text` has mismatch between text%u_1 and the corresponding FemaleText in `broadcast_text` row %u", id, i, gOption.BroadcastTextID); } + else + { + TC_LOG_ERROR("sql.sql", "GossipText (Id: %u) in table `npc_text` has non-existing or incompatible BroadcastTextID%u %u.", id, i, gOption.BroadcastTextID); + gOption.BroadcastTextID = 0; + } + + } } From adfff87f91ad8c3720f94221b95ca51e4fe2720e Mon Sep 17 00:00:00 2001 From: Killyana Date: Thu, 16 Aug 2018 12:16:14 +0200 Subject: [PATCH 059/102] DB: Typo --- sql/updates/world/3.3.5/2018_08_16_00_world_335.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql index 9cae0da259..8ff55fa6cf 100644 --- a/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql +++ b/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql @@ -1,2 +1,2 @@ -`-- +-- UPDATE `npc_text` SET `BroadcastTextID0`=0 WHERE `ID`=7790; From 6bd0ddbe2cc8ffff0d66ecabbc7499c74e421429 Mon Sep 17 00:00:00 2001 From: Killyana Date: Thu, 16 Aug 2018 12:21:07 +0200 Subject: [PATCH 060/102] DB/Gossip: Selina Dourman Closes #9961 --- .../world/3.3.5/2018_08_16_01_world_335.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_16_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_16_01_world_335.sql b/sql/updates/world/3.3.5/2018_08_16_01_world_335.sql new file mode 100644 index 0000000000..7b736664d8 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_16_01_world_335.sql @@ -0,0 +1,19 @@ +-- +UPDATE `gossip_menu_option` SET `OptionText`='How do I use the cannon?', `OptionBroadcastTextID`= 10769 WHERE `MenuID`= 6575; +UPDATE `gossip_menu_option` SET `OptionText`='Tonks?', `OptionBroadcastTextID`= 11934 WHERE `MenuID`= 6581 AND `OptionID`= 0; +UPDATE `gossip_menu_option` SET `OptionText`='Cannon?', `OptionBroadcastTextID`= 11936 WHERE `MenuID`= 6581 AND `OptionID`= 1; +UPDATE `gossip_menu_option` SET `OptionText`='Attractions?',`OptionBroadcastTextID`= 10779 WHERE `MenuID`= 6582 AND `OptionID`= 3; + +DELETE FROM `gossip_menu` WHERE `MenuID`=7095 AND `TextID` IN (11743,8348); +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(7095,11743,0),(7095,8348,0); + +DELETE FROM `npc_text` WHERE `ID`=8348; +INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `Probability0`) VALUES +(8348,"","The Blastenheimer 5000 Ultra Cannon is a state-of-the-art single person projectile device. Delivering its payload at near the speed of a dragon, the cannon is the pride and joy of the Blastenheimer family, world renown for their aeronautical and combustible feats!$B$BIf you'd like to be launched through the skies to fly free as a bird, seek out Maxima Blastenheimer on the east end of the faire. I hear that she's placed a target ring way over on Crystal Lake for you to aim for as you sail through the air!",11937,0,1); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7095; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,7095,8348,0,0,22,0,0,0,0,0,0,0,"","Show text 8348 on map 0"), +(14,7095,8349,0,0,22,0,1,0,0,0,0,0,"","Show text 8349 on map 1"), +(14,7095,11743,0,0,22,0,530,0,0,0,0,0,"","Show text 11743 on map 530"); From 24d69a1db54c27d0706b91b0441ad9e7b07a058c Mon Sep 17 00:00:00 2001 From: Killyana Date: Thu, 16 Aug 2018 15:02:13 +0200 Subject: [PATCH 061/102] DB/Gossip: Vlagga Freyfeather and Amish Wildhammer Ref #19398 --- sql/updates/world/3.3.5/2018_08_16_02_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_16_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_16_02_world.sql b/sql/updates/world/3.3.5/2018_08_16_02_world.sql new file mode 100644 index 0000000000..5048e2c712 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_16_02_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `gossip_menu_option` SET `OptionIcon`=0, `OptionType`=1, `OptionNpcFlag`=1 WHERE `MenuID` IN (7938,7939) AND `OptionID`=1; From 5a7a83f5207d9314a32688a189dd975fc91148ec Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 17 Aug 2018 11:17:12 +0200 Subject: [PATCH 062/102] Core/Commands: Fixed .damage command to work with spell schools caused by bad strtok usage Closes #22280 --- src/server/scripts/Commands/cs_misc.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index cc19fefed6..8e588f172f 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -2310,11 +2310,7 @@ public: if (!target->IsAlive()) return true; - char* damageStr = strtok((char*)args, " "); - if (!damageStr) - return false; - - int32 damage_int = atoi((char*)damageStr); + int32 damage_int = atoi((char*)str); if (damage_int <= 0) return true; From 6385de07b5ccec6a787b8736692b9a30c7fc1011 Mon Sep 17 00:00:00 2001 From: Killyana Date: Fri, 17 Aug 2018 19:16:54 +0200 Subject: [PATCH 063/102] DB/Creature: Fix some Npcs expansion on Skybreaker --- sql/updates/world/3.3.5/2018_08_17_00_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_17_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_17_00_world.sql b/sql/updates/world/3.3.5/2018_08_17_00_world.sql new file mode 100644 index 0000000000..e969775747 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_17_00_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `exp`=2 WHERE `entry` IN (30346,30345,30344,30347,30351,30352,30380,30392,30394,30833,30350); From fde1a67dec5ca8942278efc63da9793cf79f700b Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 19 Aug 2018 14:44:09 +0200 Subject: [PATCH 064/102] DB/Quest: "Shady Rest Inn" Quest Chain (Alliance) Closes #22273 --- sql/updates/world/3.3.5/2018_08_19_00_world_335.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_19_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_00_world_335.sql new file mode 100644 index 0000000000..9e9730a0d1 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_19_00_world_335.sql @@ -0,0 +1,3 @@ +-- +UPDATE `quest_template_addon` SET `ExclusiveGroup`=-11144, `NextQuestID`=11149 WHERE `ID` IN (11144,11148); -- Quests "Confirming the Suspicion" / "Arms of the Grimtotems" +UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=11149; -- Quest "Tabetha's Assistance" From 9543d456f6c9ee7fdf2362a3a92968447988bd4f Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 19 Aug 2018 14:45:01 +0200 Subject: [PATCH 065/102] DB/Quest: Disable some deprecated quests Closes #22274 --- .../world/3.3.5/2018_08_19_01_world_335.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_19_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_01_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_01_world_335.sql new file mode 100644 index 0000000000..0fe973b52b --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_19_01_world_335.sql @@ -0,0 +1,18 @@ +-- +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (8123,8160,8161,8162,8299,8300,8298,8124,8081,8163,8157,8164,8159,8165,8158); +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES +(1,8123,0,"","","Deprecated quest"), +(1,8160,0,"","","Deprecated quest"), +(1,8161,0,"","","Deprecated quest"), +(1,8162,0,"","","Deprecated quest"), +(1,8299,0,"","","Deprecated quest"), +(1,8300,0,"","","Deprecated quest"), +(1,8298,0,"","","Deprecated quest"), +(1,8124,0,"","","Deprecated quest"), +(1,8081,0,"","","Deprecated quest"), +(1,8163,0,"","","Deprecated quest"), +(1,8157,0,"","","Deprecated quest"), +(1,8164,0,"","","Deprecated quest"), +(1,8159,0,"","","Deprecated quest"), +(1,8165,0,"","","Deprecated quest"), +(1,8158,0,"","","Deprecated quest"); From 19da0938b7a6d938bf06ac7155d1ef9e0046a900 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 19 Aug 2018 14:45:43 +0200 Subject: [PATCH 066/102] DB/Quest: Quest Emotes (Arathi Highlands) Closes #22275 --- .../world/3.3.5/2018_08_19_02_world_335.sql | 273 ++++++++++++++++++ 1 file changed, 273 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_19_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_02_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_02_world_335.sql new file mode 100644 index 0000000000..02d8a6b207 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_19_02_world_335.sql @@ -0,0 +1,273 @@ +-- +-- Quest "To Steal From Thieves" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=1164; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=1164; + +-- Quest "The Hammer May Fall" +DELETE FROM `quest_details` WHERE `ID`=676; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(676,5,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=676; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=676; + +-- Quest "Call to Arms" +DELETE FROM `quest_details` WHERE `ID`=677; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(677,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=25 WHERE `ID`=677; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=677; + +-- Quest "Call to Arms (Part 2)" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=678; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=678; + +-- Quest "Call to Arms (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=679; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(679,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=679; + +-- Quest "Trollbane" +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=638; + +-- Quest "Sigil of Strom" +DELETE FROM `quest_details` WHERE `ID`=639; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(639,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=639; + +-- Quest "The Broken Sigil" +DELETE FROM `quest_details` WHERE `ID`=640; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(640,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=66, `EmoteOnComplete`=66 WHERE `ID`=640; + +-- Quest "Sigil of Thoradin" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=641; + +-- Quest "Sigil of Arathor" +DELETE FROM `quest_details` WHERE `ID`=643; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(643,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=643; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=643; + +-- Quest "Sigil of Trollbane" +DELETE FROM `quest_details` WHERE `ID`=644; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(644,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=644; + +-- Quest "Trol'kalar" +DELETE FROM `quest_details` WHERE `ID`=645; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(645,6,1,0,0,0,0,0,0,0); + +-- Quest "Trol'kalar (Part 2)" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=646; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=2 WHERE `ID`=646; + +-- Quest "Hammerfall" +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=655; + +-- Quest "Raising Spirits" +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=672; + +-- Quest "Raising Spirits (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=675; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(675,61,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=675; + +-- Quest "Guile of the Raptor (Part 1)" +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=701; + +-- Quest "Guile of the Raptor (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=847; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(847,23,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=847; + +-- Quests "Foul Magics" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID` IN (671, 672, 673, 674, 701, 702); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=673; + +-- Quest "Horde Trauma" +DELETE FROM `quest_details` WHERE `ID`=6623; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6623,1,1,5,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=6623; + +-- Quest "Triage" +DELETE FROM `quest_details` WHERE `ID`=6622; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(6622,1,1,1,1,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=6622; + +-- Quest "The Real Threat" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=680; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=680; + +-- Quest "Myzrael's Allies" +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID` IN (688,653); + +-- Quest "Theldurin the Lost" +DELETE FROM `quest_details` WHERE `ID`=687; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(687,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=3, `Emote2`=5, `Emote3`=1 WHERE `ID`=687; + +-- Quest "The Lost Fragments" +DELETE FROM `quest_details` WHERE `ID`=692; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(692,6,5,1,5,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=692; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=692; + +-- Quest "Summoning the Princess" +DELETE FROM `quest_details` WHERE `ID`=656; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(656,1,5,6,1,0,0,0,0,0); + +-- Quest "Elemental Leatherworking" +DELETE FROM `quest_details` WHERE `ID`=5146; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(5146,1,25,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=5146; +UPDATE `quest_offer_reward` SET `Emote1`=25, `Emote2`=1 WHERE `ID`=5146; + +-- Quest "The Battle for Arathi Basin!" +DELETE FROM `quest_details` WHERE `ID` IN (8120,8169,8170,8171,8105,8166,8167,8168); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8120,1,0,0,0,0,0,0,0,0), +(8169,1,0,0,0,0,0,0,0,0), +(8170,1,0,0,0,0,0,0,0,0), +(8171,1,0,0,0,0,0,0,0,0), +(8105,1,0,0,0,0,0,0,0,0), +(8166,1,0,0,0,0,0,0,0,0), +(8167,1,0,0,0,0,0,0,0,0), +(8168,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID` IN (8120,8169,8170,8171,8105,8166,8167,8168); + +-- Quest "Take Four Bases" / "Take Five Bases" +DELETE FROM `quest_details` WHERE `ID` IN (8121,8122); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8121,1,0,0,0,0,0,0,0,0), +(8122,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID` IN (8121,8122); + +-- Quest "Control Four Bases" / "Control Five Bases" +DELETE FROM `quest_details` WHERE `ID` IN (8114,8115); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8114,1,0,0,0,0,0,0,0,0), +(8115,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID` IN (8114,8115); + +-- Quest "Arathor Basic Care Package" +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID` IN (8260,8261,8262,8263,8264,8265); + +-- Quest "Arathi Basin Resources!" +DELETE FROM `quest_details` WHERE `ID` IN (8080,8154,8155,8156,8297); +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(8080,1,0,0,0,0,0,0,0,0), +(8154,1,0,0,0,0,0,0,0,0), +(8155,1,0,0,0,0,0,0,0,0), +(8156,1,0,0,0,0,0,0,0,0), +(8297,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID` IN (8080,8154,8155,8156,8297); +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID` IN (8080,8154,8155,8156,8297); + +-- Quest "Wanted! Marez Cowl" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=684; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=684; + +-- Quest "Wanted! Otto and Falconcrest" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=685; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=685; + +-- Quest "Northfold Manor" +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=681; + +-- Quest "Stromgarde Badges" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=682; +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=682; + +-- Quest "Worth Its Weight in Gold" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=691; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1, `Emote3`=1 WHERE `ID`=691; + +-- Quest "Wand over Fist" +DELETE FROM `quest_details` WHERE `ID`=693; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(693,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=693; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=693; + +-- Quest "Trelane's Defenses" +DELETE FROM `quest_details` WHERE `ID`=694; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(694,6,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=694; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=694; + +-- Quest "Attack on the Tower" +DELETE FROM `quest_details` WHERE `ID`=696; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(696,1,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=696; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=696; + +-- Quest "Malin's Request" +DELETE FROM `quest_details` WHERE `ID`=697; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(697,1,2,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=697; +UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=1, `Emote3`=1, `Emote4`=2, `EmoteDelay1`=1000 WHERE `ID`=697; + +-- Quest "Land Ho!" +UPDATE `quest_offer_reward` SET `Emote1`=3, `Emote2`=1, `Emote3`=1 WHERE `ID`=663; + +-- Quest "Sunken Treasure" +DELETE FROM `quest_details` WHERE `ID`=665; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(665,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=665; + +-- Quest "Sunken Treasure (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=666; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(666,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=666; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=666; + +-- Quest "Sunken Treasure (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=668; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(668,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=668; +UPDATE `quest_offer_reward` SET `Emote1`=11 WHERE `ID`=668; + +-- Quest "Sunken Treasure (Part 4)" +DELETE FROM `quest_details` WHERE `ID`=669; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(669,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=669; +UPDATE `quest_offer_reward` SET `Emote1`=273 WHERE `ID`=669; + +-- Quest "Sunken Treasure (Part 5)" +DELETE FROM `quest_details` WHERE `ID`=670; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(670,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=670; + +-- Quest "Drowned Sorrows" +DELETE FROM `quest_details` WHERE `ID`=664; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(664,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=664; + +-- Quest "Death From Below" +DELETE FROM `quest_details` WHERE `ID`=667; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(667,5,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=667; From 80cdbe4b3e87dc826dc4dfd28f81aab8dcc53fd4 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 19 Aug 2018 14:46:56 +0200 Subject: [PATCH 067/102] DB/Creature: Apprentice Morlann Closes #22276 --- .../world/3.3.5/2018_08_19_03_world_335.sql | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_19_03_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_03_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_03_world_335.sql new file mode 100644 index 0000000000..600693083d --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_19_03_world_335.sql @@ -0,0 +1,38 @@ +-- +-- Apprentice Morlann +DELETE FROM `creature_text` WHERE `CreatureID` IN (23600,23601); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(23600,0,0,"Hmm... I wonder...",12,0,100,0,0,0,22042,0,"Apprentice Morlann"), +(23600,1,0,"Now, where is it?",12,0,100,6,0,0,22045,0,"Apprentice Morlann"), +(23600,2,0,"Stupid mages... always using the last of a reagent and never replacing it.",12,0,100,1,0,0,22043,0,"Apprentice Morlann"), +(23601,0,0,"Is he complaining about the reagents again? Does he even remember how he left the summoning tomes last time?",12,0,100,6,0,0,22044,0,"Apprentice Garion"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23600; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23600 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2360000,2360001) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(23600,0,0,0,25,0,100,0,0,0,0,0,0,53,0,23600,1,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Reset - Start Waypoint"), +(23600,0,1,0,40,0,100,0,1,23600,0,0,0,80,2360000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Waypoint 1 Reached - Run Script"), +(23600,0,2,0,40,0,100,0,4,23600,0,0,0,80,2360001,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Waypoint 4 Reached - Run Script"), +(23600,0,3,0,40,0,100,0,6,23600,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Waypoint 6 Reached - Pause Waypoint"), +(2360000,9,0,0,0,0,100,0,0,0,0,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Script - Pause Waypoint"), +(2360000,9,1,0,0,0,100,0,1000,1000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Script - Say Line 0"), +(2360000,9,2,0,0,0,100,0,5000,5000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Script - Say Line 1"), +(2360001,9,0,0,0,0,100,0,0,0,0,0,0,54,14000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Script - Pause Waypoint"), +(2360001,9,1,0,0,0,100,0,2000,2000,0,0,0,5,16,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Script - Play Emote 'Kneel'"), +(2360001,9,2,0,0,0,100,0,6000,6000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Garion - On Script - Say Line 2"), +(2360001,9,3,0,0,0,100,0,6000,6000,0,0,0,1,0,0,0,0,0,0,19,23601,0,0,0,0,0,0,"Apprentice Garion - On Script - Say Line 0 (Apprentice Garion)"); + +DELETE FROM `waypoints` WHERE `entry`=23600; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(23600,1,-4044.27,-3393.28,38.1284,""), +(23600,2,-4045.51,-3394.92,38.1749,""), +(23600,3,-4042.77,-3396.91,38.1887,""), +(23600,4,-4040.72,-3397.23,38.1476,""), +(23600,5,-4043.21,-3395.28,38.1581,""), +(23600,6,-4043.43,-3395.4,38.2663,""); + +UPDATE `creature` SET `MovementType`=0 WHERE `guid`=18604; +UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=18604; +DELETE FROM `waypoint_data` WHERE `id`=186040; +DELETE FROM `waypoint_scripts` WHERE `id` IN (1006,1007,1008); From 53cb4e66b6b105b63d25977ea691c4b395b0456a Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 19 Aug 2018 14:47:45 +0200 Subject: [PATCH 068/102] DB/Creature: Stonemaul Spirit Closes #22286 --- .../world/3.3.5/2018_08_19_04_world_335.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_19_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_04_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_04_world_335.sql new file mode 100644 index 0000000000..84ef50cb52 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_19_04_world_335.sql @@ -0,0 +1,18 @@ +-- +-- Stonemaul Spirit +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23786; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23786 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2378600 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23786,0,0,0,11,0,100,0,0,0,0,0,80,2378600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stonemaul Spirit - On Spawn - Run Script"), +(2378600,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,23,0,0,0,0,0,0,0,"Stonemaul Spirit - On Script - Say Line 0"), +(2378600,9,1,0,0,0,100,0,2000,2000,0,0,49,0,0,0,0,0,0,23,0,0,0,0,0,0,0,"Stonemaul Spirit - On Script - Start Attacking"); + +DELETE FROM `creature_text` WHERE `CreatureID`=23786; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(23786,0,0,"Me crush puny friend of dragons!",12,0,100,15,0,0,22416,0,"Stonemaul Spirit"), +(23786,0,1,"You leave Stonemaul lands now!",12,0,100,15,0,0,22417,0,"Stonemaul Spirit"), +(23786,0,2,"Why you wake ghost? Where other Stonemauls?!",12,0,100,15,0,0,22418,0,"Stonemaul Spirit"), +(23786,0,3,"Raaar!!! Me smash $r!",12,0,100,15,0,0,1925,0,"Stonemaul Spirit"), +(23786,0,4,"Me smash! You die!",12,0,100,15,0,0,1926,0,"Stonemaul Spirit"), +(23786,0,5,"I'll crush you!",12,0,100,15,0,0,1927,0,"Stonemaul Spirit"); From e58f684c0e58d0aff39f1490778c66dbb8dc6ce1 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 19 Aug 2018 14:49:37 +0200 Subject: [PATCH 069/102] DB/Text: Spark Nilminer --- sql/updates/world/3.3.5/2018_08_19_05_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_19_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql new file mode 100644 index 0000000000..7c445aecbc --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql @@ -0,0 +1,2 @@ +-- +UPDATE `npc_text` SET `em0_0`=20, `em0_1`=0 WHERE `id`=3094; From 2cd6ea483832c61bc300d6ea6931c79302ebc90d Mon Sep 17 00:00:00 2001 From: illfated Date: Sun, 19 Aug 2018 14:50:28 +0200 Subject: [PATCH 070/102] DB/Quest: Typos in RewardText; The Essence of Aku'Mai & King of the Foulweald Closes #22289 --- sql/updates/world/3.3.5/2018_08_19_06_world.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_19_06_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_06_world.sql b/sql/updates/world/3.3.5/2018_08_19_06_world.sql new file mode 100644 index 0000000000..824ce98cc5 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_19_06_world.sql @@ -0,0 +1,5 @@ +-- +-- The Essence of Aku'Mai (6563) +UPDATE `quest_offer_reward` SET `RewardText`="Well done, $N. These are the crystals I spoke of. Intriguing...$B$BI can feel the power within them. The spirits of water cling to them. Whatever the naga were going to use these for... well, let us be glad they are no longer in their hands." WHERE `ID`= 6563; +-- King of the Foulweald (6621) +UPDATE `quest_offer_reward` SET `RewardText`="Good work, $N. Issuing that challenge to the Foulwealds and defeating their leader sends them a strong message:$B$BThe Horde is not to be trifled with.$B$BI don't believe that tribe will be giving us much trouble for a long time." WHERE `ID`= 6621; From b7aa4494631ec927c33a578ff92c84a7d20a01d6 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 19 Aug 2018 19:38:05 +0200 Subject: [PATCH 071/102] DBError follow-ups: * broadcast_text mismatch (6eb7f06) is now a _INFO since Aok isn't nearly as fast as fixing as he claimed. * SmartAI invoker misuse (482328b and a3c85c8) are now blocking errors --- src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 6 ++---- src/server/game/Globals/ObjectMgr.cpp | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 842718f61f..6c1ab85f20 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -527,8 +527,7 @@ bool SmartAIMgr::IsTargetValid(SmartScriptHolder const& e) if (e.GetScriptType() != SMART_SCRIPT_TYPE_TIMED_ACTIONLIST && e.GetEventType() != SMART_EVENT_LINK && !EventHasInvoker(e.event.type)) { TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u has invoker target, but event does not provide any invoker!", e.entryOrGuid, e.GetScriptType(), e.GetEventType(), e.GetActionType()); - // allow this to load for now - // return false; + return false; } break; case SMART_TARGET_PLAYER_RANGE: @@ -1200,8 +1199,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) if (e.GetScriptType() != SMART_SCRIPT_TYPE_TIMED_ACTIONLIST && e.GetEventType() != SMART_EVENT_LINK && !EventHasInvoker(e.event.type)) { TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u has invoker cast action, but event does not provide any invoker!", e.entryOrGuid, e.GetScriptType(), e.GetEventType(), e.GetActionType()); - // allow this to load for now - // return false; + return false; } // no break case SMART_ACTION_SELF_CAST: diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 3354a61adf..247edd2868 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5923,9 +5923,9 @@ void ObjectMgr::LoadGossipText() if (BroadcastText const* bcText = sObjectMgr->GetBroadcastText(gOption.BroadcastTextID)) { if (bcText->MaleText[DEFAULT_LOCALE] != gOption.Text_0) - TC_LOG_ERROR("sql.sql", "Row %u in table `npc_text` has mismatch between text%u_0 and the corresponding MaleText in `broadcast_text` row %u", id, i, gOption.BroadcastTextID); + TC_LOG_INFO("sql.sql", "Row %u in table `npc_text` has mismatch between text%u_0 and the corresponding MaleText in `broadcast_text` row %u", id, i, gOption.BroadcastTextID); if (bcText->FemaleText[DEFAULT_LOCALE] != gOption.Text_1) - TC_LOG_ERROR("sql.sql", "Row %u in table `npc_text` has mismatch between text%u_1 and the corresponding FemaleText in `broadcast_text` row %u", id, i, gOption.BroadcastTextID); + TC_LOG_INFO("sql.sql", "Row %u in table `npc_text` has mismatch between text%u_1 and the corresponding FemaleText in `broadcast_text` row %u", id, i, gOption.BroadcastTextID); } else { From 49d021df2192387edccab316ff2e1db7f06bac76 Mon Sep 17 00:00:00 2001 From: Killyana Date: Mon, 20 Aug 2018 00:57:00 +0200 Subject: [PATCH 072/102] DB/Quest: Suntara Stones Closes #3305 --- .../world/3.3.5/2018_08_20_00_world_335.sql | 144 ++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_20_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_20_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_20_00_world_335.sql new file mode 100644 index 0000000000..7c1a1d2802 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_20_00_world_335.sql @@ -0,0 +1,144 @@ +-- Suntara Stones +UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (8284,8338,8337); +UPDATE `creature_addon` SET `bytes1`= 0 WHERE `guid`= 6823; +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (147516,147517); +UPDATE `gameobject` SET `spawntimesecs`=100 WHERE `id` IN (147516, 147517); +DELETE FROM `gameobject_addon` WHERE `guid` IN (SELECT `guid` FROM `gameobject` WHERE `id`=175704); +DELETE FROM `gameobject` WHERE `id`=175704; + +DELETE FROM `smart_scripts` WHERE `entryorguid`IN (828400,828401,828402,828403,828404,828405, 833800, 14751700) AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (8337,8284,8338) AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (147516,147517) AND `source_type`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(8284, 0, 0,1, 11, 0,100,0, 0, 0,0,0, 18, 768, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On Spawn - Add Unit Flag'), +(8284, 0, 1,0, 61, 0,100,0, 0, 0,0,0, 90, 7, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On Spawn - Add Bytes1 death State'), +(8284, 0, 2,3, 19, 0,100,0, 3367, 0,0,0, 53, 0,82840,0,0,30000,1, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On Quest Accept - Start WP movement'), +(8284, 0, 3,4, 61, 0,100,0, 0, 0,0,0, 19, 768, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On Quest Accept - Remove Unit Flag'), +(8284, 0, 4,5, 61, 0,100,0, 0, 0,0,0, 91, 7, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On Quest Accept - Remove Bytes1 Death State'), +(8284, 0, 5,6, 61, 0,100,0, 0, 0,0,0, 64, 1, 0,0, 0, 0,0, 7, 0,0,0,0,0,0,0, 'Dorius Stonetender - On Quest Accept - Store target'), +(8284, 0, 6,0, 61, 0,100,0, 0, 0,0,0, 2, 250, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On Quest Accept - Set faction'), +(8284, 0, 7,0, 40, 0,100,0, 17, 82840,0,0, 80,828400, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On WP Reached - Start Action List'), +(8284, 0, 8,0, 40, 0,100,0, 25, 82840,0,0, 80,828401, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On WP Reached - Start Action List'), +(8284, 0, 9,0, 40, 0,100,0, 33, 82840,0,0, 80,828402, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On WP Reached - Start Action List'), +(8284, 0, 10,0, 40, 0,100,0, 37, 82840,0,0, 80,828403, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On WP Reached - Start Action List'), +(8284, 0, 11,0, 40, 0,100,0, 50, 82840,0,0, 80,828404, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On WP Reached - Start Action List'), +(8284, 0, 12,0, 38, 0,100,0, 1, 1,0,0, 80,828405, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On data set - Start Action List'), +(8284, 0, 13,0, 40, 0,100,0, 15, 82840,0,0, 45,2, 2,0, 0, 0,0, 15, 147516,50,0,0,0,0,0, 'Dorius Stonetender - On WP Reached - Set data'), +(8284, 0, 14,0, 4, 0,50,0, 0, 0,0,0, 1,8, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - On aggro - Say text'), +-- first stop +(828400,9, 0,0, 0, 0,100,0, 0, 0,0,0, 1, 0, 0,0, 0, 0,0,12, 1,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 0'), +(828400,9, 1,0, 0, 0,100,0, 0, 0,0,0, 54, 10000, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Pause WP (10 seconds)'), +(828400,9, 2,0, 0, 0,100,0, 500, 500,0,0, 90, 8, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Add Bytes1 Stand State (Kneel)'), +(828400,9, 3,0, 0, 0,100,0, 10000,10000,0,0, 91, 8, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Remove Bytes1 Stand State'), +-- second stop +(828401,9, 0,0, 0, 0,100,0, 0, 0,0,0, 54, 12000, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Pause WP (12 seconds)'), +(828401,9, 1,0, 0, 0,100,0, 500, 500,0,0, 90, 8, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Add Bytes1 Stand State (Kneel)'), +(828401,9, 2,0, 0, 0,100,0, 2000,2000,0,0, 91, 8, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Remove Bytes1 Stand State'), +(828401,9, 3,0, 0, 0,100,0, 0,0,0,0, 1, 1, 0,0, 0, 0,0,12, 1,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 1'), +(828401,9, 4,0, 0, 0,100,0, 9000,9000,0,0, 1, 9, 0,0, 0, 0,0,12, 1,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 9'), +-- third stop + spawns +(828402,9, 0,0, 0, 0,100,0, 0, 0,0,0, 1, 2, 0,0, 0, 0,0,12, 1,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 2'), +(828402,9, 1,0, 0, 0,100,0, 0, 0,0,0, 54, 10000, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Pause WP (10 seconds)'), +(828402,9, 2,0, 0, 0,100,0, 500, 500,0,0, 90, 8, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Add Bytes1 Stand State (Kneel)'), +(828402,9, 3,0, 0, 0,100,0, 9000,9000,0,0, 91, 8, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Remove Bytes1 Stand State'), +(828402,9, 4,0, 0, 0,100,0, 0, 0,0,0, 45, 2, 2,0, 0, 0,0, 15, 147517,50,0,0,0,0,0, 'Dorius Stonetender - Action List - Set data'), +-- start run +(828403,9, 0,0, 0, 0,100,0, 0, 0,0,0, 1, 3, 0,0, 0, 0,0,12, 1,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 3'), +(828403,9, 1,0, 0, 0,100,0, 0, 0,0,0, 54, 3000, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Pause WP (3 seconds)'), +(828403,9, 2,0, 0, 0,100,0, 0, 0,0,0, 59, 1, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Set Run On'), +-- start finale event +(828404,9, 0,0, 0, 0,100,0, 0, 0,0,0, 54, 30000, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Pause WP (30000 seconds)'), +(828404,9, 1,0, 0, 0,100,0, 0, 0,0,0, 1,4, 0,0, 0, 0,0, 12, 1,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say text'), +(828404,9, 2,0, 0, 0,100,0, 0, 0,0,0, 12, 8338, 8,0, 1, 0,0, 8, 0,0,0,-6370.26,-1974.93,256.79,3.55, 'Dorius Stonetender - Action List - Summon Dark Iron Marksman'), +-- end finale event +(828405,9, 0,0, 0, 0,100,0, 0, 0,0,0, 1, 5, 0,0, 0, 0,0,1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 5'), +(828405,9, 1,0, 0, 0,100,0, 0, 0,0,0, 11, 12218, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Cast Spell Man Down!'), +(828405,9, 2,0, 0, 0,100,0, 0, 0,0,0, 90, 7, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Add Bytes1 Death State'), +(828405,9, 3,0, 0, 0,100,0, 0, 0,0,0, 50, 175704, 60,1, 0, 0,0, 8, 0,0,0,-6386.8901, -1984.05, 246.7299,0, 'Dorius Stonetender - Action List - Summon '), +(828405,9, 4,0, 0, 0,100,0, 0, 0,0,0, 15, 3367, 0,0, 0, 0,0,12, 1,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Quest explored'), +(828405,9, 5,0, 0, 0,100,0, 2000, 2000,0,0, 1, 6, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 6'), +(828405,9, 6,0, 0, 0,100,0, 1000, 1000,0,0, 1, 7, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Say Line 7'), +(828405,9, 7,0, 0, 0,100,0, 0, 0,0,0, 37, 0, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dorius Stonetender - Action List - Die'), +-- Dark Iron Marksman +(8338, 0, 0,0, 54, 0,100,0, 0, 0,0,0, 80,833800, 2,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron Marksman - On just summoned - Call Action List'), +(833800,9, 0,0, 0, 0,100,0, 1500, 1500,0,0, 1, 0, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron Marksman - Action List - Say Line 0'), +(833800,9, 1,0, 0, 0,100,0, 0, 0,0,0, 11, 12198, 0,0, 0, 0,0,19,8284,50,0,0,0,0,0, 'Dark Iron Marksman - Action List - Cast Marksman Hit'), +(833800,9, 2,0, 0, 0,100,0, 2000, 2000,0,0, 45, 1, 1,0, 0, 0,0,19,8284,50,0,0,0,0,0, 'Dark Iron Marksman - Action List - set data Marksman Hit'), +(833800,9, 3,0, 0, 0,100,0, 1000, 1000,0,0, 41, 0, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron Marksman - Action List - Despawn'), +(8337, 0, 0,0, 63, 0,100,0, 0, 0,0,0, 49,0, 0,0, 0, 0,0, 19, 8284,70,0,0,0,0,0, 'Dark Iron Steelshifter - On just Created - Start attack'), +(8337, 0, 1,0, 4, 0,50,0, 0, 0,0,0, 1, 0, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron Steelshifter - On aggro - Say Line 0'), +(147516, 1, 0,0, 38, 0,100,0, 2, 2,0,0, 80,14751700, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron - On data set - action list'), +(147517, 1, 0,0, 38, 0,100,0, 2, 2,0,0, 80,14751700, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron - On data set - action list'), +(14751700,9, 0,0, 0, 0,100,0, 0, 0,0,0, 118, 2, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron - Action List - set gob state'), +(14751700,9, 1,0, 0, 0,100,0, 0, 0,0,0, 11, 12168, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron - Action List - cast'), +(14751700,9, 2,0, 0, 0,100,0, 1000, 1000,0,0, 41, 0, 0,0, 0, 0,0, 1, 0,0,0,0,0,0,0, 'Dark Iron - Action List - Despawn'); + +DELETE FROM `creature_text` WHERE `CreatureID` IN (8284,8337,8338); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(8284,0,0,"Stop... need to catch.... my breath.",12,0,100,0,0,0,4345,0,"Dorius Stonetender"), +(8284,1,0,"This is the place, $r: The Cauldron! Mark it on a map or do something so that you don''t forget. If anything ever happened to me, my team would be stuck in that mine forever.",12,0,100,25,0,0,4354,0,"Dorius Stonetender"), +(8284,2,0,"I''ve got to quit smoking! Give me a minute to catch my breath.",12,0,100,0,0,0,4356,0,"Dorius Stonetender"), +(8284,3,0,"We''re almost to safety. From here, we run. Try not to get too far behind! GO!",12,0,100,0,0,0,4357,0,"Dorius Stonetender"), +(8284,4,0,"The gate is in sight! We''re going to make it! But first, I need to take a breather.",12,0,100,0,0,0,4363,0,"Dorius Stonetender"), +(8284,5,0,"ARRRRRGH! He got me!",12,0,100,0,0,0,4359,0,"Dorius Stonetender"), +(8284,6,0,"%s points to the parchment on the ground.",16,0,100,0,0,0,5944,0,"Dorius Stonetender"), +(8284,7,0,"%s disappears in a cloud of dust.",16,0,100,0,0,0,4362,0,"Dorius Stonetender"), +(8284,8,0,"Are you going to let an injured dwarf do all the work for you?",12,0,100,0,0,0,4352,0,"Dorius Stonetender"), +(8284,8,1,"It's on! $n, meet my fists. Fists, say hello to $n.",12,0,100,0,0,0,4353,0,"Dorius Stonetender"), +(8284,9,0,"Onward! And be on guard this time! I'm not going to carry anymore fights.",12,0,100,0,0,0,4355,0,"Dorius Stonetender"), +(8337,0,0,"The secrets of Suntara will not leave these lands.", 14,0,100,0,0,0,4346,0,"Summon Dark Iron Steelshifter"), +(8338,0,0,"He''s mine...",14,0,100,0,0,0,4358,0,"Dark Iron Marksman"); + +DELETE FROM `waypoints` WHERE `entry`=82840; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`) VALUES +(82840, 1, -7005.02, -1742.09, 234.09), +(82840, 2, -7007.01, -1730.48, 234.09), +(82840, 3, -7004.89, -1726.50, 234.25), +(82840, 4, -7000.51, -1727.69, 235.47), +(82840, 5, -6989.39, -1737.25, 240.65), +(82840, 6, -6976.65, -1737.33, 241.83), +(82840, 7, -6954.92, -1742.04, 241.66), +(82840, 8, -6933.73, -1730.35, 241.70), +(82840, 9, -6931.64, -1719.75, 242.27), +(82840, 10, -6909.71, -1714.02, 241.26), +(82840, 11, -6898.56, -1723.56, 243.11), +(82840, 12, -6883.09, -1728.15, 241.00), +(82840, 13, -6879.24, -1737.66, 242.25), +(82840, 14, -6875.63, -1738.84, 244.00), +(82840, 15, -6868.03, -1745.78, 248.92), +(82840, 16, -6865.56, -1747.40, 250.42), +(82840, 17, -6857.70, -1748.29, 251.52), -- first stop +(82840, 18, -6853.29, -1745.18, 251.52), +(82840, 19, -6861.59, -1732.91, 251.66), +(82840, 20, -6860.00, -1723.85, 252.05), +(82840, 21, -6857.88, -1715.04, 251.52), +(82840, 22, -6850.99, -1698.89, 250.48), +(82840, 23, -6830.43, -1675.30, 251.52), +(82840, 24, -6818.79, -1674.68, 251.31), +(82840, 25, -6814.35, -1671.13, 250.31), -- second stop +(82840, 26, -6809.37, -1680.91, 250.10), +(82840, 27, -6801.58, -1695.83, 258.82), +(82840, 28, -6790.76, -1703.73, 259.55), +(82840, 29, -6781.22, -1715.15, 259.55), +(82840, 30, -6778.56, -1727.06, 259.55), +(82840, 31, -6777.09, -1744.06, 259.54), +(82840, 32, -6775.59, -1761.05, 257.50), +(82840, 33, -6777.40, -1780.64, 256.85), -- next break +(82840, 34, -6776.03, -1781.77, 256.85), +(82840, 35, -6728.56, -1814.42, 253.44), +(82840, 36, -6700.18, -1814.54, 250.46), +(82840, 37, -6677.81, -1821.25, 250.28), -- start run +(82840, 38, -6640.54, -1884.70, 244.27), +(82840, 39, -6612.79, -1916.98, 244.15), +(82840, 40, -6569.94, -1922.81, 244.16), +(82840, 41, -6540.13, -1938.87, 244.15), +(82840, 42, -6520.90, -1946.45, 244.15), +(82840, 43, -6504.90, -1955.36, 244.15), +(82840, 44, -6483.21, -1965.20, 244.24), +(82840, 45, -6471.10, -1968.55, 244.27), +(82840, 46, -6451.37, -1976.94, 244.45), +(82840, 47, -6405.94, -1974.30, 248.94), +(82840, 48, -6395.49, -1977.74, 247.89), +(82840, 49, -6389.20, -1978.71, 247.48), +(82840, 50, -6388.39, -1983.85, 246.72), +(82840, 51, -6388.39, -1983.85, 246.72); From 64ea35fbcbc17e728e13bfd491b8051f404ef828 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 20 Aug 2018 05:04:08 +0200 Subject: [PATCH 073/102] rename files --- sql/updates/world/3.3.5/2018_08_16_00_world_335.sql | 2 -- sql/updates/world/3.3.5/2018_08_19_05_world_335.sql | 2 -- .../world/4.3.4/{2018_08_15_00.sql => 2018_08_15_00_world.sql} | 0 ...018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql} | 2 ++ ...018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql} | 2 ++ ...018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql} | 2 ++ ...2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql | 2 ++ ...018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql} | 2 ++ .../2018_08_20_05_world_from_335_was_2018_08_16_02_world.sql} | 0 .../2018_08_20_06_world_from_335_was_2018_08_17_00_world.sql} | 0 ...018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql} | 2 ++ ...018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql} | 2 ++ ...018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql} | 2 ++ ...018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql} | 2 ++ ...018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql} | 2 ++ ...2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql | 2 ++ .../2018_08_20_13_world_from_335_was_2018_08_19_06_world.sql} | 0 ...018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql} | 2 ++ 18 files changed, 24 insertions(+), 4 deletions(-) delete mode 100644 sql/updates/world/3.3.5/2018_08_16_00_world_335.sql delete mode 100644 sql/updates/world/3.3.5/2018_08_19_05_world_335.sql rename sql/updates/world/4.3.4/{2018_08_15_00.sql => 2018_08_15_00_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_15_00_world_335.sql => 4.3.4/2018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_15_01_world_335.sql => 4.3.4/2018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_15_02_world_335.sql => 4.3.4/2018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql} (99%) create mode 100644 sql/updates/world/4.3.4/2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql rename sql/updates/world/{3.3.5/2018_08_16_01_world_335.sql => 4.3.4/2018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_16_02_world.sql => 4.3.4/2018_08_20_05_world_from_335_was_2018_08_16_02_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_17_00_world.sql => 4.3.4/2018_08_20_06_world_from_335_was_2018_08_17_00_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_19_00_world_335.sql => 4.3.4/2018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql} (97%) rename sql/updates/world/{3.3.5/2018_08_19_01_world_335.sql => 4.3.4/2018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_19_02_world_335.sql => 4.3.4/2018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_19_03_world_335.sql => 4.3.4/2018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_19_04_world_335.sql => 4.3.4/2018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql} (99%) create mode 100644 sql/updates/world/4.3.4/2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql rename sql/updates/world/{3.3.5/2018_08_19_06_world.sql => 4.3.4/2018_08_20_13_world_from_335_was_2018_08_19_06_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_20_00_world_335.sql => 4.3.4/2018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql} (99%) diff --git a/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql deleted file mode 100644 index 8ff55fa6cf..0000000000 --- a/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql +++ /dev/null @@ -1,2 +0,0 @@ --- -UPDATE `npc_text` SET `BroadcastTextID0`=0 WHERE `ID`=7790; diff --git a/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql deleted file mode 100644 index 7c445aecbc..0000000000 --- a/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql +++ /dev/null @@ -1,2 +0,0 @@ --- -UPDATE `npc_text` SET `em0_0`=20, `em0_1`=0 WHERE `id`=3094; diff --git a/sql/updates/world/4.3.4/2018_08_15_00.sql b/sql/updates/world/4.3.4/2018_08_15_00_world.sql similarity index 100% rename from sql/updates/world/4.3.4/2018_08_15_00.sql rename to sql/updates/world/4.3.4/2018_08_15_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_15_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_15_00_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql index 754192f01c..687f582190 100644 --- a/sql/updates/world/3.3.5/2018_08_15_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql @@ -1,3 +1,4 @@ +/* -- DELETE FROM `gameobject` WHERE `guid` IN (5111,5117,5122,5126,5131,5140,5144,5155); INSERT INTO `gameobject` (`guid`, `id`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES @@ -58,3 +59,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`, (22,6,180867,1,0,6,0,67,0,0,0,0,'','Lunar Festival SAI the player Must Must Be Horde'), (22,7,180867,1,0,29,0,15719,5,0,0,0,'','Lunar Festival Execute sai if near npc 15719'), (22,7,180867,1,0,6,0,67,0,0,0,0,'','Lunar Festival SAI the player Must Must Be Horde'); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_15_01_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_15_01_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql index dcaa9039f0..c50f34baba 100644 --- a/sql/updates/world/3.3.5/2018_08_15_01_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- Witchbane Torch SET @GUID := 5160; DELETE FROM `gameobject` WHERE `guid`=@GUID; @@ -46,3 +47,4 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type DELETE FROM `waypoints` WHERE `entry`=23864; INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES (23864,1,-2965.74,-3873.83,33.3183,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_15_02_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_15_02_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql index 4ebfb5ceaa..319d171762 100644 --- a/sql/updates/world/3.3.5/2018_08_15_02_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql @@ -1,3 +1,4 @@ +/* -- Quest "The Missing Diplomat (Part 16)" UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=1324; -- Prevents quest from auto completing @@ -100,3 +101,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (496700,9,9,0,0,0,100,0,2000,2000,0,0,0,15,1324,0,0,0,0,0,12,1,0,0,0,0,0,0,"Archmage Tervosh - On Script - Complete Quest 'The Missing Diplomat (Part 16)'"), (496700,9,10,0,0,0,100,0,1000,1000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 2"), (496700,9,11,0,0,0,100,0,6000,6000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 3"); +*/ diff --git a/sql/updates/world/4.3.4/2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql new file mode 100644 index 0000000000..a7cafb3a12 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql @@ -0,0 +1,2 @@ +-- +-- UPDATE `npc_text` SET `BroadcastTextID0`=0 WHERE `ID`=7790; diff --git a/sql/updates/world/3.3.5/2018_08_16_01_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_16_01_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql index 7b736664d8..1cd2c8fb79 100644 --- a/sql/updates/world/3.3.5/2018_08_16_01_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- UPDATE `gossip_menu_option` SET `OptionText`='How do I use the cannon?', `OptionBroadcastTextID`= 10769 WHERE `MenuID`= 6575; UPDATE `gossip_menu_option` SET `OptionText`='Tonks?', `OptionBroadcastTextID`= 11934 WHERE `MenuID`= 6581 AND `OptionID`= 0; @@ -17,3 +18,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (14,7095,8348,0,0,22,0,0,0,0,0,0,0,"","Show text 8348 on map 0"), (14,7095,8349,0,0,22,0,1,0,0,0,0,0,"","Show text 8349 on map 1"), (14,7095,11743,0,0,22,0,530,0,0,0,0,0,"","Show text 11743 on map 530"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_16_02_world.sql b/sql/updates/world/4.3.4/2018_08_20_05_world_from_335_was_2018_08_16_02_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_16_02_world.sql rename to sql/updates/world/4.3.4/2018_08_20_05_world_from_335_was_2018_08_16_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_17_00_world.sql b/sql/updates/world/4.3.4/2018_08_20_06_world_from_335_was_2018_08_17_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_17_00_world.sql rename to sql/updates/world/4.3.4/2018_08_20_06_world_from_335_was_2018_08_17_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_19_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql similarity index 97% rename from sql/updates/world/3.3.5/2018_08_19_00_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql index 9e9730a0d1..a5c0fe75e6 100644 --- a/sql/updates/world/3.3.5/2018_08_19_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql @@ -1,3 +1,5 @@ +/* -- UPDATE `quest_template_addon` SET `ExclusiveGroup`=-11144, `NextQuestID`=11149 WHERE `ID` IN (11144,11148); -- Quests "Confirming the Suspicion" / "Arms of the Grimtotems" UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=11149; -- Quest "Tabetha's Assistance" +*/ diff --git a/sql/updates/world/3.3.5/2018_08_19_01_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_19_01_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql index 0fe973b52b..bc29be6d6f 100644 --- a/sql/updates/world/3.3.5/2018_08_19_01_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (8123,8160,8161,8162,8299,8300,8298,8124,8081,8163,8157,8164,8159,8165,8158); INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES @@ -16,3 +17,4 @@ INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, (1,8159,0,"","","Deprecated quest"), (1,8165,0,"","","Deprecated quest"), (1,8158,0,"","","Deprecated quest"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_19_02_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_19_02_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql index 02d8a6b207..b5ef13f42e 100644 --- a/sql/updates/world/3.3.5/2018_08_19_02_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Quest "To Steal From Thieves" UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=1164; @@ -271,3 +272,4 @@ DELETE FROM `quest_details` WHERE `ID`=667; INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES (667,5,0,0,0,0,0,0,0,0); UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=667; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_19_03_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_19_03_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql index 600693083d..a757ba3638 100644 --- a/sql/updates/world/3.3.5/2018_08_19_03_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Apprentice Morlann DELETE FROM `creature_text` WHERE `CreatureID` IN (23600,23601); @@ -36,3 +37,4 @@ UPDATE `creature` SET `MovementType`=0 WHERE `guid`=18604; UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=18604; DELETE FROM `waypoint_data` WHERE `id`=186040; DELETE FROM `waypoint_scripts` WHERE `id` IN (1006,1007,1008); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_19_04_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_19_04_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql index 84ef50cb52..e564218f2d 100644 --- a/sql/updates/world/3.3.5/2018_08_19_04_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Stonemaul Spirit UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23786; @@ -16,3 +17,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (23786,0,3,"Raaar!!! Me smash $r!",12,0,100,15,0,0,1925,0,"Stonemaul Spirit"), (23786,0,4,"Me smash! You die!",12,0,100,15,0,0,1926,0,"Stonemaul Spirit"), (23786,0,5,"I'll crush you!",12,0,100,15,0,0,1927,0,"Stonemaul Spirit"); +*/ diff --git a/sql/updates/world/4.3.4/2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql new file mode 100644 index 0000000000..8fe8883650 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql @@ -0,0 +1,2 @@ +-- +-- UPDATE `npc_text` SET `em0_0`=20, `em0_1`=0 WHERE `id`=3094; diff --git a/sql/updates/world/3.3.5/2018_08_19_06_world.sql b/sql/updates/world/4.3.4/2018_08_20_13_world_from_335_was_2018_08_19_06_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_19_06_world.sql rename to sql/updates/world/4.3.4/2018_08_20_13_world_from_335_was_2018_08_19_06_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_20_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_20_00_world_335.sql rename to sql/updates/world/4.3.4/2018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql index 7c1a1d2802..71deab4a21 100644 --- a/sql/updates/world/3.3.5/2018_08_20_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql @@ -1,3 +1,4 @@ +/* -- Suntara Stones UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (8284,8338,8337); UPDATE `creature_addon` SET `bytes1`= 0 WHERE `guid`= 6823; @@ -142,3 +143,4 @@ INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z (82840, 49, -6389.20, -1978.71, 247.48), (82840, 50, -6388.39, -1983.85, 246.72), (82840, 51, -6388.39, -1983.85, 246.72); +*/ From 4e52c77e534377fe96528419dc7b796d15668265 Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 15:48:54 +0200 Subject: [PATCH 074/102] DB/Creature: Fix some npcs position in Eastern Plaguelands --- sql/updates/world/3.3.5/2018_08_22_00_world_335.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_22_00_world_335.sql new file mode 100644 index 0000000000..b1cea1374e --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_00_world_335.sql @@ -0,0 +1,5 @@ +-- +UPDATE `creature` SET `position_x`=3294.252, `position_y`=-3087.255, `position_z`=158.25 WHERE `guid`=84786; +UPDATE `creature` SET `position_x`=3275.445, `position_y`=-3128.624, `position_z`=156.78 WHERE `guid`=86295; +UPDATE `creature` SET `position_x`=3233.312, `position_y`=-3156.763, `position_z`=151.23 WHERE `guid`=69692; +UPDATE `creature` SET `position_x`=3285.249, `position_y`=-3139.968, `position_z`=153.65 WHERE `guid`=91830; From 7c8bd2296b1b63ff15df5f71b34e74666165ead4 Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 15:51:53 +0200 Subject: [PATCH 075/102] DB/Spell: Flaming Spears Ref #1596 --- sql/updates/world/3.3.5/2018_08_22_01_world.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_01_world.sql b/sql/updates/world/3.3.5/2018_08_22_01_world.sql new file mode 100644 index 0000000000..824f2e74ae --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_01_world.sql @@ -0,0 +1,5 @@ +-- +SET @SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET := 262144; +DELETE FROM `spell_custom_attr` WHERE `entry`=66717; +INSERT INTO `spell_custom_attr` (`entry`, `attributes`) VALUES +(66717, @SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET); From 53ea37610824307b0e0e67e15b56b7c97d0019bd Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 15:53:06 +0200 Subject: [PATCH 076/102] DB/Condition: Plague Vial spell used only when player is in Taxi --- sql/updates/world/3.3.5/2018_08_22_02_world.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_02_world.sql b/sql/updates/world/3.3.5/2018_08_22_02_world.sql new file mode 100644 index 0000000000..0e234300c0 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_02_world.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=43115; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 43115, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, "", "Plague Vial could be casted only if the player is in taxi"); From 62fd9f1863d65fdf00a815ddf0b1ea73e2803bea Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 16:23:36 +0200 Subject: [PATCH 077/102] DB/Creature: Steamrigger Mechanic spawns --- sql/updates/world/3.3.5/2018_08_22_03_world.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_03_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_03_world.sql b/sql/updates/world/3.3.5/2018_08_22_03_world.sql new file mode 100644 index 0000000000..b071ed7b35 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_03_world.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature` SET `position_x`=-327.646, `position_y`=-127.406, `position_z`=-8.013, `orientation`=1.941862 WHERE `guid`=12607; +DELETE FROM `creature` WHERE `guid` IN (12605,12606); +DELETE FROM `creature_addon` WHERE `guid` IN (12605,12606); From 79bbe02e0c0cead753f6e45bbd7c3dacfa5210ba Mon Sep 17 00:00:00 2001 From: PolarCookie Date: Wed, 22 Aug 2018 16:39:59 +0200 Subject: [PATCH 078/102] [3.3.5] Core/Loot/Gameobject: Tempspawned Gameobjects after looting (#22124) * spell spawned chest non-despawn fix * fix the consumed game objects --- src/server/game/Entities/GameObject/GameObject.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 1e5412fd71..e2e24d99fa 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -741,8 +741,17 @@ void GameObject::Update(uint32 diff) //! The GetOwnerGUID() check is mostly for compatibility with hacky scripts - 99% of the time summoning should be done trough spells. if (GetSpellId() || GetOwnerGUID()) { - SetRespawnTime(0); - Delete(); + //Don't delete spell spawned chests, which are not consumed on loot + if (m_respawnTime > 0 && GetGoType() == GAMEOBJECT_TYPE_CHEST && !GetGOInfo()->IsDespawnAtAction()) + { + UpdateObjectVisibility(); + SetLootState(GO_READY); + } + else + { + SetRespawnTime(0); + Delete(); + } return; } From 6283ce074e5580a8c68bc4c7240958ac0b01eaec Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 17:00:45 +0200 Subject: [PATCH 079/102] DB/Creature: Risen Wintergarde Miner Closes #16306 --- sql/updates/world/3.3.5/2018_08_22_04_world.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_04_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_04_world.sql b/sql/updates/world/3.3.5/2018_08_22_04_world.sql new file mode 100644 index 0000000000..8d8119aec6 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_04_world.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature` SET `MovementType`=0, `spawndist`=0 WHERE `id` IN (27401,27403); +DELETE FROM `creature_template_addon` WHERE `entry`=27401; +INSERT `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (27401,0,0,0,1,233 , ''); From 2d7cf7efe850a7744a984cf7a667a28b0587b761 Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 17:44:42 +0200 Subject: [PATCH 080/102] DB: Typo --- sql/updates/world/3.3.5/2018_08_22_04_world.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/updates/world/3.3.5/2018_08_22_04_world.sql b/sql/updates/world/3.3.5/2018_08_22_04_world.sql index 8d8119aec6..371df0cb0c 100644 --- a/sql/updates/world/3.3.5/2018_08_22_04_world.sql +++ b/sql/updates/world/3.3.5/2018_08_22_04_world.sql @@ -1,4 +1,4 @@ -- UPDATE `creature` SET `MovementType`=0, `spawndist`=0 WHERE `id` IN (27401,27403); DELETE FROM `creature_template_addon` WHERE `entry`=27401; -INSERT `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (27401,0,0,0,1,233 , ''); +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (27401,0,0,0,1,233 , ''); From 9c6008096cf52beebe58142c67ca4db684a20920 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 22 Aug 2018 18:03:24 +0200 Subject: [PATCH 081/102] DB/Creature: Stonemaul Spirit Closes #22286 --- .../world/3.3.5/2018_08_22_05_world_335.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_05_world_335.sql b/sql/updates/world/3.3.5/2018_08_22_05_world_335.sql new file mode 100644 index 0000000000..fce494572c --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_05_world_335.sql @@ -0,0 +1,18 @@ +-- Stonemaul Spirit +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23786; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23786 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2378600 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23786,0,0,0,11,0,100,0,0,0,0,0,80,2378600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stonemaul Spirit - On Spawn - Run Script"), +(23786,0,1,0,4,0,15,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stonemaul Spirit - On Aggro - Say Line 1"), +(2378600,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stonemaul Spirit - On Script - Say Line 0"), +(2378600,9,1,0,0,0,100,0,2000,2000,0,0,49,0,0,0,0,0,0,23,0,0,0,0,0,0,0,"Stonemaul Spirit - On Script - Start Attacking"); + +DELETE FROM `creature_text` WHERE `CreatureID`=23786; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(23786,0,0,"Me crush puny friend of dragons!",12,0,100,15,0,0,22416,0,"Stonemaul Spirit"), +(23786,0,1,"You leave Stonemaul lands now!",12,0,100,15,0,0,22417,0,"Stonemaul Spirit"), +(23786,0,2,"Why you wake ghost? Where other Stonemauls?!",12,0,100,15,0,0,22418,0,"Stonemaul Spirit"), +(23786,1,0,"Raaar!!! Me smash $r!",12,0,100,0,0,0,1925,0,"Stonemaul Spirit"), +(23786,1,1,"Me smash! You die!",12,0,100,0,0,0,1926,0,"Stonemaul Spirit"), +(23786,1,2,"I'll crush you!",12,0,100,0,0,0,1927,0,"Stonemaul Spirit"); From f9e07adb49366821e8e272bfa2d5252f63021587 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 22 Aug 2018 18:51:38 +0200 Subject: [PATCH 082/102] DB/Quest: Move the Sunken Treasure to SAI --- .../world/3.3.5/2018_08_22_06_world_335.sql | 60 +++++++ .../eastern_kingdoms_script_loader.cpp | 2 +- .../EasternKingdoms/zone_arathi_highlands.cpp | 161 ------------------ 3 files changed, 61 insertions(+), 162 deletions(-) create mode 100644 sql/updates/world/3.3.5/2018_08_22_06_world_335.sql delete mode 100644 src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp diff --git a/sql/updates/world/3.3.5/2018_08_22_06_world_335.sql b/sql/updates/world/3.3.5/2018_08_22_06_world_335.sql new file mode 100644 index 0000000000..7807201139 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_06_world_335.sql @@ -0,0 +1,60 @@ +-- Professor Phizzlethorpe +UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=2768; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2768 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (276800,276801,276802,276803) AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(2768,0,0,1,19,0,100,0,665,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Store Targetlist"), +(2768,0,1,2,61,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Remove Npc Flag Questgiver"), +(2768,0,2,3,61,0,100,0,0,0,0,0,0,80,276800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Run Script"), +(2768,0,3,0,61,0,100,0,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Set Faction 113"), +(2768,0,4,0,6,0,100,0,0,0,0,0,0,6,665,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Just Died - Fail Quest 'Sunken Treasure'"), +(2768,0,5,0,4,0,100,0,0,0,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Aggro - Say Line 4"), +(2768,0,6,0,40,0,100,0,5,276800,0,0,0,80,276801,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Waypoint 5 Reached - Run Script"), +(2768,0,7,0,40,0,100,0,8,276800,0,0,0,80,276802,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Waypoint 8 Reached - Run Script"), +(2768,0,8,0,40,0,100,0,8,276801,0,0,0,80,276803,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Waypoint 8 Reached - Run Script"), +(276800,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 0"), +(276800,9,1,0,0,0,100,0,4000,4000,0,0,0,53,0,276800,0,0,0,2,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Start Waypoint"), +(276801,9,0,0,0,0,100,0,0,0,0,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Pause Waypoint"), +(276801,9,1,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 1"), +(276801,9,2,0,0,0,100,0,7000,7000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 2"), +(276802,9,0,0,0,0,100,0,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 3"), +(276802,9,1,0,0,0,100,0,10000,10000,0,0,0,107,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Summon Group"), +(276802,9,2,0,0,0,100,0,15000,15000,0,0,0,1,5,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 5"), +(276802,9,3,0,0,0,100,0,10000,10000,0,0,0,1,6,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 6"), +(276802,9,4,0,0,0,100,0,3000,3000,0,0,0,53,0,276801,0,0,0,2,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Start Waypoint"), +(276803,9,0,0,0,0,100,0,0,0,0,0,0,1,7,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 7"), +(276803,9,1,0,0,0,100,0,5000,5000,0,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 8"), +(276803,9,2,0,0,0,100,0,0,0,0,0,0,1,9,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 9"), +(276803,9,3,0,0,0,100,0,0,0,0,0,0,15,665,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Complete Quest 'Sunken Treasure'"), +(276803,9,4,0,0,0,100,0,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Add Npc Flag Questgiver"), +(276803,9,5,0,0,0,100,0,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Set Faction 35"); + +DELETE FROM `creature_summon_groups` WHERE `summonerId`=2768; +INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES +(2768,0,1,2776,-2056.19,-2143.23,20.4528,5.61003,5,3000), +(2768,0,1,2776,-2052.2,-2139.68,19.6804,5.31158,5,3000); + +DELETE FROM `script_waypoint` WHERE `entry`=2768; +DELETE FROM `waypoints` WHERE `entry` IN (276800, 276801); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(276800,1,-2077.73,-2091.17,9.49,""), +(276800,2,-2077.99,-2105.33,13.24,""), +(276800,3,-2074.6,-2109.67,14.24,""), +(276800,4,-2076.6,-2117.46,16.67,""), +(276800,5,-2073.51,-2123.46,18.42,""), +(276800,6,-2066.6,-2131.85,21.56,""), +(276800,7,-2053.85,-2143.19,20.31,""), +(276800,8,-2043.49,-2153.73,20.2,""), +(276801,1,-2053.85,-2143.19,20.31,""), +(276801,2,-2063.52,-2131.57,21.22,""), +(276801,3,-2073.51,-2123.46,18.42,""), +(276801,4,-2076.6,-2117.46,16.67,""), +(276801,5,-2074.6,-2109.67,14.24,""), +(276801,6,-2077.99,-2105.33,13.24,""), +(276801,7,-2077.73,-2091.17,9.49,""), +(276801,8,-2066.41,-2086.21,8.97,""); + +-- Vengeful Surge +DELETE FROM `smart_scripts` WHERE `entryorguid`=2776 AND `source_type`=0 AND `id`=1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(2776,0,1,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,19,2768,0,0,0,0,0,0,"Vengeful Surge - Just Summoned - Start Attacking"); diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp index 1089dc7e5d..3f4bc43a85 100644 --- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp @@ -389,7 +389,7 @@ void AddEasternKingdomsScripts() AddSC_stormwind_city(); AddSC_swamp_of_sorrows(); AddSC_tirisfal_glades(); - AddSC_tol_barad(); + AddSC_tol_barad(); AddSC_undercity(); AddSC_western_plaguelands(); AddSC_wetlands(); diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp deleted file mode 100644 index a3501d4521..0000000000 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (C) 2008-2018 TrinityCore - * Copyright (C) 2006-2009 ScriptDev2 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/* ScriptData -SDName: Arathi Highlands -SD%Complete: 100 -SDComment: Quest support: 665 -SDCategory: Arathi Highlands -EndScriptData */ - -/* ContentData -npc_professor_phizzlethorpe -EndContentData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" -#include "Player.h" - -/*###### -## npc_professor_phizzlethorpe -######*/ - -enum ProfessorPhizzlethorpe -{ - // Yells - SAY_PROGRESS_1 = 0, - SAY_PROGRESS_2 = 1, - SAY_PROGRESS_3 = 2, - EMOTE_PROGRESS_4 = 3, - SAY_AGGRO = 4, - SAY_PROGRESS_5 = 5, - SAY_PROGRESS_6 = 6, - SAY_PROGRESS_7 = 7, - EMOTE_PROGRESS_8 = 8, - SAY_PROGRESS_9 = 9, - EVENT_SAY_3 = 1, - EVENT_SAY_6 = 2, - EVENT_SAY_8 = 3, - - // Quests - QUEST_SUNKEN_TREASURE = 665, - QUEST_GOGGLE_BOGGLE = 26050, - // Creatures - NPC_VENGEFUL_SURGE = 2776 -}; - -class npc_professor_phizzlethorpe : public CreatureScript -{ - public: - npc_professor_phizzlethorpe() : CreatureScript("npc_professor_phizzlethorpe") { } - - struct npc_professor_phizzlethorpeAI : public npc_escortAI - { - npc_professor_phizzlethorpeAI(Creature* creature) : npc_escortAI(creature) { } - - void WaypointReached(uint32 waypointId) override - { - Player* player = GetPlayerForEscort(); - if (!player) - return; - - switch (waypointId) - { - case 6: - Talk(SAY_PROGRESS_2, player); - events.ScheduleEvent(EVENT_SAY_3, 3000); - break; - case 8: - Talk(EMOTE_PROGRESS_4); - me->SummonCreature(NPC_VENGEFUL_SURGE, -2065.505f, -2136.88f, 22.20362f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); - me->SummonCreature(NPC_VENGEFUL_SURGE, -2059.249f, -2134.88f, 21.51582f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); - break; - case 11: - Talk(SAY_PROGRESS_5, player); - events.ScheduleEvent(EVENT_SAY_6, 11000); - break; - case 17: - Talk(SAY_PROGRESS_7, player); - events.ScheduleEvent(EVENT_SAY_8, 6000); - break; - } - } - - void JustSummoned(Creature* summoned) override - { - summoned->AI()->AttackStart(me); - } - - void JustEngagedWith(Unit* /*who*/) override - { - Talk(SAY_AGGRO); - } - - void QuestAccept(Player* player, Quest const* quest) override - { - if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE) - { - Talk(SAY_PROGRESS_1, player); - npc_escortAI::Start(false, false, player->GetGUID(), quest); - me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE); - } - } - - void UpdateAI(uint32 diff) override - { - Player* player = GetPlayerForEscort(); - if (!player) - return; - - events.Update(diff); - - while (uint32 event = events.ExecuteEvent()) - { - switch (event) - { - case EVENT_SAY_3: - Talk(SAY_PROGRESS_3, player); - break; - case EVENT_SAY_6: - Talk(SAY_PROGRESS_6, player); - SetRun(); - break; - case EVENT_SAY_8: - Talk(EMOTE_PROGRESS_8); - Talk(SAY_PROGRESS_9, player); - player->GroupEventHappens(QUEST_GOGGLE_BOGGLE, me); - break; - } - } - npc_escortAI::UpdateAI(diff); - } - - EventMap events; - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_professor_phizzlethorpeAI(creature); - } -}; - -void AddSC_arathi_highlands() -{ - new npc_professor_phizzlethorpe(); -} From cb780f97a702cbd8aa7b3b27e6aeaa03bf96c4b2 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 22 Aug 2018 18:52:28 +0200 Subject: [PATCH 083/102] missing part --- .../EasternKingdoms/eastern_kingdoms_script_loader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp index 3f4bc43a85..dc2e03e162 100644 --- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp @@ -183,7 +183,7 @@ void AddSC_boss_wushoolay(); void AddSC_boss_zanzil(); void AddSC_instance_zulgurub(); //void AddSC_alterac_mountains(); -void AddSC_arathi_highlands(); +//void AddSC_arathi_highlands(); void AddSC_blasted_lands(); void AddSC_dun_morogh(); void AddSC_dun_morogh_area_coldridge_valley(); @@ -374,7 +374,7 @@ void AddEasternKingdomsScripts() AddSC_boss_zanzil(); AddSC_instance_zulgurub(); //AddSC_alterac_mountains(); - AddSC_arathi_highlands(); + //AddSC_arathi_highlands(); AddSC_blasted_lands(); AddSC_dun_morogh(); AddSC_dun_morogh_area_coldridge_valley(); From ebe168a825f8bef13edc0678f57dadd9da5ee1e5 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 22 Aug 2018 18:08:21 +0200 Subject: [PATCH 084/102] DB/Quest: Feast at the Blue Recluse Closes #22291 --- .../world/3.3.5/2018_08_22_07_world_335.sql | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_07_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_07_world_335.sql b/sql/updates/world/3.3.5/2018_08_22_07_world_335.sql new file mode 100644 index 0000000000..803b422048 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_07_world_335.sql @@ -0,0 +1,83 @@ +-- Add some missing gameobjects +DELETE FROM `gameobject` WHERE `guid` IN (5111,5117,5122,5126,5131,5140,5144,5155,5160,5165,5171,5210,5217,5224,5230,5232,5234,5255,5315,5332,5334,5339,5341,5345,5349,5350,5357,5367,5373,5395,5397,5402); +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 +(5111,21148,0,0,0,1,1,-9072.17,837.258,109.424,0.299373,-0,-0,-0.149128,-0.988818,-120,255,1,"",0), +(5117,21148,0,0,0,1,1,-9072.82,829.589,109.478,5.99743,-0,-0,-0.14239,0.989811,-120,255,1,"",0), +(5122,21148,0,0,0,1,1,-9059.47,838.004,110.215,0.377914,-0,-0,-0.187835,-0.982201,-120,255,1,"",0), +(5126,21148,0,0,0,1,1,-9059.77,838.776,110.215,0.381841,-0,-0,-0.189763,-0.98183,-120,255,1,"",0), +(5131,21148,0,0,0,1,1,-9085.29,832.499,109.61,3.58633,-0,-0,-0.975378,0.220539,-120,255,1,"",0), +(5140,21148,0,0,0,1,1,-9085.65,833.289,109.61,3.53135,-0,-0,-0.981071,0.193647,-120,255,1,"",0), +(5144,21148,0,0,0,1,1,-9081.83,823.735,109.61,3.4803,-0,-0,-0.985694,0.168543,-120,255,1,"",0), +(5155,21148,0,0,0,1,1,-9081.1,828.544,109.432,1.763,-0,-0,-0.771693,-0.635995,-120,255,1,"",0), +(5160,21148,0,0,0,1,1,-9082.12,830.655,109.429,5.3287,-0,-0,-0.459332,0.888265,-120,255,1,"",0), +(5165,21148,0,0,0,1,1,-9069.05,828.82,109.428,1.8533,-0,-0,-0.799613,-0.600515,-120,255,1,"",0), +(5171,21148,0,0,0,1,1,-9075.97,820.033,109.55,4.11132,-0,-0,-0.884738,0.466088,-120,255,1,"",0), +(5210,21148,0,0,0,1,1,-9070.79,828.253,109.431,0.334503,-0,-0,-0.166473,-0.986046,-120,255,1,"",0), +(5217,21148,0,0,0,1,1,-9075.04,838.185,109.463,5.08008,-0,-0,-0.565921,0.824459,-120,255,1,"",0), +(5224,21148,0,0,0,1,1,-9076.71,818.742,109.55,0.407534,-0,-0,-0.20236,-0.979311,-120,255,1,"",0), +(5230,21148,0,0,0,1,1,-9079.45,828.87,109.436,3.40383,-0,-0,-0.991416,0.130743,-120,255,1,"",0), +(5232,21148,0,0,0,1,1,-9073.03,838.268,109.432,0.345678,-0,-0,-0.17198,-0.985101,-120,255,1,"",0), +(5234,21148,0,0,0,1,1,-9085.74,814.883,116.796,3.49512,-0,-0,-0.984418,0.175845,-120,255,1,"",0), +(5255,21148,0,0,0,1,1,-9087.04,830.81,116.825,5.06286,-0,-0,-0.57-1201,0.819555,-120,255,1,"",0), +(5315,21148,0,0,0,1,1,-9094.68,836.463,116.795,1.10446,-0,-0,-0.524585,-0.851358,-120,255,1,"",0), +(5332,21148,0,0,0,1,1,-9084.5,824.882,116.825,5.65584,-0,-0,-0.308554,0.951207,-120,255,1,"",0), +(5334,21147,0,0,0,1,1,-9081.3,822.651,109.61,3.55732,-0,-0,-0.978474,0.206371,-120,255,1,"",0), +(5339,21147,0,0,0,1,1,-9072.24,828.632,109.453,0.376773,-0,-0,-0.187274,-0.982308,-120,255,1,"",0), +(5341,21147,0,0,0,1,1,-9083.98,828.135,109.61,3.50271,-0,-0,-0.983743,0.17958,-120,255,1,"",0), +(5345,21146,0,0,0,1,1,-9075.14,836.495,109.436,1.95635,-0,-0,-0.82948,-0.558537,-120,255,1,"",0), +(5349,21146,0,0,0,1,1,-9069.89,830.264,109.432,0.954968,-0,-0,-0.459546,-0.888154,-120,255,1,"",0), +(5350,21146,0,0,0,1,1,-9079.88,818.003,109.61,5.10492,-0,-0,-0.555639,0.831424,-120,255,1,"",0), +(5357,21146,0,0,0,1,1,-9080.54,819.582,109.61,5.10492,-0,-0,-0.555639,0.831424,-120,255,1,"",0), +(5367,21146,0,0,0,1,1,-9058.49,837.482,110.219,1.94478,-0,-0,-0.826236,-0.563325,-120,255,1,"",0), +(5373,21146,0,0,0,1,1,-9081.2,821.143,109.61,5.1167,-0,-0,-0.550732,0.834682,-120,255,1,"",0), +(5395,21145,0,0,0,1,1,-9083.11,825.766,109.61,3.52235,-0,-0,-0.981933,0.189231,-120,255,1,"",0), +(5397,21145,0,0,0,1,1,-9084.98,830.42,109.61,0.354403,-0,-0,-0.176275,-0.984341,-120,255,1,"",0), +(5402,21145,0,0,0,1,1,-9059.28,840.347,110.239,5.05895,-0,-0,-0.574602,0.818433,-120,255,1,"",0); + +-- Texts +DELETE FROM `creature_text` WHERE `CreatureID` IN (1141,3628,1311); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1141,0,0,"All hail $n, a $c of worth!",12,7,100,22,0,0,1718,0,"Angus Stern"), +(1141,1,0,"Behold! The Blue Recluse holds a feast in $g his:her; honor!",12,7,100,25,0,0,1719,0,"Angus Stern"), +(3628,0,0,"Here here!",12,7,100,5,0,0,1735,0,"Steven Lohan"), +(1311,0,0,"Hooray, $n!",12,7,100,4,0,0,1733,0,"Joachim Brenlow"), +(1311,0,1,"Long live $n!",12,7,100,4,0,0,1736,0,"Joachim Brenlow"); + +-- Angus Stern +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=1141; +DELETE FROM `smart_scripts` WHERE `entryorguid`=1141 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=114100 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1141,0,0,0,20,0,100,0,1271,0,0,0,80,114100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus Stern - On Quest 'Feast at the Blue Recluse' Finished - Run Script"), +(1141,0,1,0,20,0,100,0,1271,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Angus Stern - On Quest 'Feast at the Blue Recluse' Finished - Store Target"), +(114100,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus Stern - On Script - Remove Npc Flag Questgiver"), +(114100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus Stern - On Script - Say Line 0"), +(114100,9,2,0,0,0,100,0,0,0,0,0,70,120,0,0,0,0,0,15,0,100,0,0,0,0,0,"Angus Stern - On Script - Respawn All Gameobjects"), +(114100,9,3,0,0,0,100,0,5000,5000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.02834,"Angus Stern - On Script - Set Orientation"), +(114100,9,4,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus Stern - On Script - Say Line 1"), +(114100,9,5,0,0,0,100,0,6000,6000,0,0,100,1,0,0,0,0,0,19,3628,0,0,0,0,0,0,"Angus Stern - On Script - Send Target to Steven Lohan"), +(114100,9,6,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,3628,0,0,0,0,0,0,"Angus Stern - On Script - Set Data to Steven Lohan"), +(114100,9,7,0,0,0,100,0,4000,4000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus Stern - On Script - Add Npc Flag Questgiver"), +(114100,9,8,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.558505,"Angus Stern - On Script - Set Orientation"); + +-- Steven Lohan +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=3628; +DELETE FROM `smart_scripts` WHERE `entryorguid`=3628 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=362800 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3628,0,0,0,38,0,100,0,1,1,0,0,80,362800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Steven Lohan - On Data Set - Run Script"), +(362800,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Steven Lohan - On Script - Say Line 0"), +(362800,9,1,0,0,0,100,0,2000,2000,0,0,100,1,0,0,0,0,0,19,1311,0,0,0,0,0,0,"Steven Lohan - On Script - Send Target to Steven Lohan"), +(362800,9,2,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,1311,0,0,0,0,0,0,"Steven Lohan - On Script - Set Data to Joachim Brenlow"); + +-- Joachim Brenlow +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=1311; +DELETE FROM `smart_scripts` WHERE `entryorguid`=1311 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1311,0,0,0,38,0,100,0,1,1,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Joachim Brenlow - On Data Set - Say Line 0"); + +-- Fix looting +UPDATE `gameobject_loot_template` SET `LootMode`=1 WHERE `Entry` IN (3458,3459,3460,3461); + +-- Add quest emotes +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=1271; From 6cc1548fcad16f216f07a08d99f072fa779a92e9 Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 18:09:00 +0200 Subject: [PATCH 085/102] DB/Creature: George Candarte Closes #22293 --- sql/updates/world/3.3.5/2018_08_22_08_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_08_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_08_world_335.sql b/sql/updates/world/3.3.5/2018_08_22_08_world_335.sql new file mode 100644 index 0000000000..45ea25593d --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_08_world_335.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID` IN (3680); From 863172cdebb22888173d34f442a0f0441e9abb54 Mon Sep 17 00:00:00 2001 From: offl Date: Wed, 22 Aug 2018 18:09:55 +0200 Subject: [PATCH 086/102] DB/Locale: Zul'jin Closes #22294 --- sql/updates/world/3.3.5/2018_08_22_09_world_335.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_09_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_09_world_335.sql b/sql/updates/world/3.3.5/2018_08_22_09_world_335.sql new file mode 100644 index 0000000000..503f750723 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_09_world_335.sql @@ -0,0 +1,7 @@ +-- +UPDATE `creature_template_locale` SET `Title`='' WHERE `entry`=23863; +UPDATE `creature_template_locale` SET `Name`='Zul\'jin' WHERE `entry`=23863 AND `locale` IN ('deDE','esES','esMX','frFR'); +UPDATE `creature_template_locale` SET `Name`='줄진' WHERE `entry`=23863 AND `locale` IN ('koKR'); +UPDATE `creature_template_locale` SET `Name`='Зул\'джин' WHERE `entry`=23863 AND `locale` IN ('ruRU'); +UPDATE `creature_template_locale` SET `Name`='祖尔金' WHERE `entry`=23863 AND `locale` IN ('zhCN'); +UPDATE `creature_template_locale` SET `Name`='祖爾金' WHERE `entry`=23863 AND `locale` IN ('zhTW'); From 829b8fcdc498ee47ad19fb0cd8a2ebe639fbf3c5 Mon Sep 17 00:00:00 2001 From: Killyana Date: Wed, 22 Aug 2018 18:40:17 +0200 Subject: [PATCH 087/102] DB/GameObject: Restore deleted objects --- .../world/3.3.5/2018_08_22_10_world_335.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_22_10_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_10_world_335.sql b/sql/updates/world/3.3.5/2018_08_22_10_world_335.sql new file mode 100644 index 0000000000..92586c49e7 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_22_10_world_335.sql @@ -0,0 +1,16 @@ +-- +DELETE FROM `gameobject` WHERE `guid` IN (5404,5419,5427,5429,5431,5433,5443,5446,5448); +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 +(5404, 180867, 1, 0, 0, 1, 1, 7603.94, -2211.17, 471.606, 3.78647, 0, 0, 0.948466, -0.316878, 25, 100, 1, "", 0), +(5419, 180867, 1, 0, 0, 1, 1, 7575.26, -2238.68, 469.858, 1.03679, 0, 0, 0.495486, 0.868616, 25, 100, 1, "", 0), +(5427, 180867, 1, 0, 0, 1, 1, 7595.67, -2246.32, 466.965, 1.30382, 0, 0, 0.606707, 0.794925, 25, 100, 1, "", 0), +(5429, 180867, 1, 0, 0, 1, 1, 7610.97, -2228.92, 468.71, 2.96651, 0, 0, 0.996171, 0.0874282, 25, 100, 1, "", 0), +(5431, 180867, 1, 0, 0, 1, 1, 7570.31, -2220.8, 473.445, 0.357419, 0, 0, 0.17776, 0.984074, 25, 100, 1, "", 0), +(5433, 180867, 1, 0, 0, 1, 1, 7585.47, -2205.31, 475.281, 4.91744, 0, 0, 0.631024, -0.775763, 25, 100, 1, "", 0), +(5443, 180867, 530, 0, 0, 1, 1, -1804.27, 5492.68, -12.4278, 5.1019, 0, 0, 0.631024, -0.775763, 25, 100, 1, "", 0), +(5446, 180867, 530, 0, 0, 1, 1, -1778.08, 5439.71, -12.4276, 1.53108, 0, 0, 0.631024, -0.775763, 25, 100, 1, "", 0), +(5448, 186425, 1, 0, 0, 1, 1, -2967.03, -3872.18, 33.0928, 2.24779, 0, 0, -0.90179, -0.432175, -20, 255, 1, "", 0); + +DELETE FROM `game_event_gameobject` WHERE `eventEntry`=7 AND `guid` IN (5404,5419,5427,5429,5431,5433,5443,5446); +INSERT INTO `game_event_gameobject` (`eventEntry`, `guid`) VALUES +(7,5404),(7,5419),(7,5427),(7,5429),(7,5431),(7,5433),(7,5443),(7,5446); From 5bb253a431c54da984f0867317bdf75e34aaeca9 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 22 Aug 2018 18:57:12 +0200 Subject: [PATCH 088/102] rename files --- ...018_08_22_00_world_from_335_was_2018_08_22_00_world_335.sql} | 2 ++ .../2018_08_22_01_world_from_335_was_2018_08_22_01_world.sql} | 0 .../2018_08_22_02_world_from_335_was_2018_08_22_02_world.sql} | 0 .../2018_08_22_03_world_from_335_was_2018_08_22_03_world.sql} | 0 .../2018_08_22_04_world_from_335_was_2018_08_22_04_world.sql} | 0 ...018_08_22_05_world_from_335_was_2018_08_22_05_world_335.sql} | 2 ++ ...018_08_22_06_world_from_335_was_2018_08_22_06_world_335.sql} | 2 ++ ...018_08_22_07_world_from_335_was_2018_08_22_07_world_335.sql} | 2 ++ ...018_08_22_08_world_from_335_was_2018_08_22_08_world_335.sql} | 2 ++ ...018_08_22_09_world_from_335_was_2018_08_22_09_world_335.sql} | 2 ++ ...018_08_22_10_world_from_335_was_2018_08_22_10_world_335.sql} | 2 ++ 11 files changed, 14 insertions(+) rename sql/updates/world/{3.3.5/2018_08_22_00_world_335.sql => 4.3.4/2018_08_22_00_world_from_335_was_2018_08_22_00_world_335.sql} (98%) rename sql/updates/world/{3.3.5/2018_08_22_01_world.sql => 4.3.4/2018_08_22_01_world_from_335_was_2018_08_22_01_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_22_02_world.sql => 4.3.4/2018_08_22_02_world_from_335_was_2018_08_22_02_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_22_03_world.sql => 4.3.4/2018_08_22_03_world_from_335_was_2018_08_22_03_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_22_04_world.sql => 4.3.4/2018_08_22_04_world_from_335_was_2018_08_22_04_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_22_05_world_335.sql => 4.3.4/2018_08_22_05_world_from_335_was_2018_08_22_05_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_22_06_world_335.sql => 4.3.4/2018_08_22_06_world_from_335_was_2018_08_22_06_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_22_07_world_335.sql => 4.3.4/2018_08_22_07_world_from_335_was_2018_08_22_07_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_22_08_world_335.sql => 4.3.4/2018_08_22_08_world_from_335_was_2018_08_22_08_world_335.sql} (93%) rename sql/updates/world/{3.3.5/2018_08_22_09_world_335.sql => 4.3.4/2018_08_22_09_world_from_335_was_2018_08_22_09_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_22_10_world_335.sql => 4.3.4/2018_08_22_10_world_from_335_was_2018_08_22_10_world_335.sql} (99%) diff --git a/sql/updates/world/3.3.5/2018_08_22_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_22_00_world_from_335_was_2018_08_22_00_world_335.sql similarity index 98% rename from sql/updates/world/3.3.5/2018_08_22_00_world_335.sql rename to sql/updates/world/4.3.4/2018_08_22_00_world_from_335_was_2018_08_22_00_world_335.sql index b1cea1374e..38813751ca 100644 --- a/sql/updates/world/3.3.5/2018_08_22_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_22_00_world_from_335_was_2018_08_22_00_world_335.sql @@ -1,5 +1,7 @@ +/* -- UPDATE `creature` SET `position_x`=3294.252, `position_y`=-3087.255, `position_z`=158.25 WHERE `guid`=84786; UPDATE `creature` SET `position_x`=3275.445, `position_y`=-3128.624, `position_z`=156.78 WHERE `guid`=86295; UPDATE `creature` SET `position_x`=3233.312, `position_y`=-3156.763, `position_z`=151.23 WHERE `guid`=69692; UPDATE `creature` SET `position_x`=3285.249, `position_y`=-3139.968, `position_z`=153.65 WHERE `guid`=91830; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_22_01_world.sql b/sql/updates/world/4.3.4/2018_08_22_01_world_from_335_was_2018_08_22_01_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_22_01_world.sql rename to sql/updates/world/4.3.4/2018_08_22_01_world_from_335_was_2018_08_22_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_02_world.sql b/sql/updates/world/4.3.4/2018_08_22_02_world_from_335_was_2018_08_22_02_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_22_02_world.sql rename to sql/updates/world/4.3.4/2018_08_22_02_world_from_335_was_2018_08_22_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_03_world.sql b/sql/updates/world/4.3.4/2018_08_22_03_world_from_335_was_2018_08_22_03_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_22_03_world.sql rename to sql/updates/world/4.3.4/2018_08_22_03_world_from_335_was_2018_08_22_03_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_04_world.sql b/sql/updates/world/4.3.4/2018_08_22_04_world_from_335_was_2018_08_22_04_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_22_04_world.sql rename to sql/updates/world/4.3.4/2018_08_22_04_world_from_335_was_2018_08_22_04_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_22_05_world_335.sql b/sql/updates/world/4.3.4/2018_08_22_05_world_from_335_was_2018_08_22_05_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_22_05_world_335.sql rename to sql/updates/world/4.3.4/2018_08_22_05_world_from_335_was_2018_08_22_05_world_335.sql index fce494572c..8775be1aed 100644 --- a/sql/updates/world/3.3.5/2018_08_22_05_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_22_05_world_from_335_was_2018_08_22_05_world_335.sql @@ -1,3 +1,4 @@ +/* -- Stonemaul Spirit UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23786; DELETE FROM `smart_scripts` WHERE `entryorguid`=23786 AND `source_type`=0; @@ -16,3 +17,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (23786,1,0,"Raaar!!! Me smash $r!",12,0,100,0,0,0,1925,0,"Stonemaul Spirit"), (23786,1,1,"Me smash! You die!",12,0,100,0,0,0,1926,0,"Stonemaul Spirit"), (23786,1,2,"I'll crush you!",12,0,100,0,0,0,1927,0,"Stonemaul Spirit"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_22_06_world_335.sql b/sql/updates/world/4.3.4/2018_08_22_06_world_from_335_was_2018_08_22_06_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_22_06_world_335.sql rename to sql/updates/world/4.3.4/2018_08_22_06_world_from_335_was_2018_08_22_06_world_335.sql index 7807201139..88eaf1d8f2 100644 --- a/sql/updates/world/3.3.5/2018_08_22_06_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_22_06_world_from_335_was_2018_08_22_06_world_335.sql @@ -1,3 +1,4 @@ +/* -- Professor Phizzlethorpe UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=2768; DELETE FROM `smart_scripts` WHERE `entryorguid`=2768 AND `source_type`=0; @@ -58,3 +59,4 @@ INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z DELETE FROM `smart_scripts` WHERE `entryorguid`=2776 AND `source_type`=0 AND `id`=1; INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES (2776,0,1,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,19,2768,0,0,0,0,0,0,"Vengeful Surge - Just Summoned - Start Attacking"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_22_07_world_335.sql b/sql/updates/world/4.3.4/2018_08_22_07_world_from_335_was_2018_08_22_07_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_22_07_world_335.sql rename to sql/updates/world/4.3.4/2018_08_22_07_world_from_335_was_2018_08_22_07_world_335.sql index 803b422048..39c05ce266 100644 --- a/sql/updates/world/3.3.5/2018_08_22_07_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_22_07_world_from_335_was_2018_08_22_07_world_335.sql @@ -1,3 +1,4 @@ +/* -- Add some missing gameobjects DELETE FROM `gameobject` WHERE `guid` IN (5111,5117,5122,5126,5131,5140,5144,5155,5160,5165,5171,5210,5217,5224,5230,5232,5234,5255,5315,5332,5334,5339,5341,5345,5349,5350,5357,5367,5373,5395,5397,5402); 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 @@ -81,3 +82,4 @@ UPDATE `gameobject_loot_template` SET `LootMode`=1 WHERE `Entry` IN (3458,3459,3 -- Add quest emotes UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=1271; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_22_08_world_335.sql b/sql/updates/world/4.3.4/2018_08_22_08_world_from_335_was_2018_08_22_08_world_335.sql similarity index 93% rename from sql/updates/world/3.3.5/2018_08_22_08_world_335.sql rename to sql/updates/world/4.3.4/2018_08_22_08_world_from_335_was_2018_08_22_08_world_335.sql index 45ea25593d..e2051a036c 100644 --- a/sql/updates/world/3.3.5/2018_08_22_08_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_22_08_world_from_335_was_2018_08_22_08_world_335.sql @@ -1,2 +1,4 @@ +/* -- UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID` IN (3680); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_22_09_world_335.sql b/sql/updates/world/4.3.4/2018_08_22_09_world_from_335_was_2018_08_22_09_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_22_09_world_335.sql rename to sql/updates/world/4.3.4/2018_08_22_09_world_from_335_was_2018_08_22_09_world_335.sql index 503f750723..5bd32cecb7 100644 --- a/sql/updates/world/3.3.5/2018_08_22_09_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_22_09_world_from_335_was_2018_08_22_09_world_335.sql @@ -1,3 +1,4 @@ +/* -- UPDATE `creature_template_locale` SET `Title`='' WHERE `entry`=23863; UPDATE `creature_template_locale` SET `Name`='Zul\'jin' WHERE `entry`=23863 AND `locale` IN ('deDE','esES','esMX','frFR'); @@ -5,3 +6,4 @@ UPDATE `creature_template_locale` SET `Name`='줄진' WHERE `entry`=23863 AND `l UPDATE `creature_template_locale` SET `Name`='Зул\'джин' WHERE `entry`=23863 AND `locale` IN ('ruRU'); UPDATE `creature_template_locale` SET `Name`='祖尔金' WHERE `entry`=23863 AND `locale` IN ('zhCN'); UPDATE `creature_template_locale` SET `Name`='祖爾金' WHERE `entry`=23863 AND `locale` IN ('zhTW'); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_22_10_world_335.sql b/sql/updates/world/4.3.4/2018_08_22_10_world_from_335_was_2018_08_22_10_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_22_10_world_335.sql rename to sql/updates/world/4.3.4/2018_08_22_10_world_from_335_was_2018_08_22_10_world_335.sql index 92586c49e7..ff98dd12ce 100644 --- a/sql/updates/world/3.3.5/2018_08_22_10_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_22_10_world_from_335_was_2018_08_22_10_world_335.sql @@ -1,3 +1,4 @@ +/* -- DELETE FROM `gameobject` WHERE `guid` IN (5404,5419,5427,5429,5431,5433,5443,5446,5448); 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 @@ -14,3 +15,4 @@ INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, DELETE FROM `game_event_gameobject` WHERE `eventEntry`=7 AND `guid` IN (5404,5419,5427,5429,5431,5433,5443,5446); INSERT INTO `game_event_gameobject` (`eventEntry`, `guid`) VALUES (7,5404),(7,5419),(7,5427),(7,5429),(7,5431),(7,5433),(7,5443),(7,5446); +*/ From 4d0031bbd3511bdbbc01e4166811c892f4584d54 Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 22 Aug 2018 21:31:13 +0200 Subject: [PATCH 089/102] Core/LFG: Order group members before creating LFG group (leader > tank > healer > dps). Closes #16244. --- src/server/game/DungeonFinding/LFGMgr.cpp | 24 +++++++- src/server/game/DungeonFinding/LFGMgr.h | 72 +++++++++++------------ 2 files changed, 57 insertions(+), 39 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 1c8ac09ab2..39d23d8680 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -895,21 +895,39 @@ bool LFGMgr::CheckGroupRoles(LfgRolesMap& groles) */ void LFGMgr::MakeNewGroup(LfgProposal const& proposal) { - GuidList players; + GuidList players, tankPlayers, healPlayers, dpsPlayers; GuidList playersToTeleport; for (LfgProposalPlayerContainer::const_iterator it = proposal.players.begin(); it != proposal.players.end(); ++it) { ObjectGuid guid = it->first; if (guid == proposal.leader) - players.push_front(guid); - else players.push_back(guid); + else + switch (it->second.role & ~PLAYER_ROLE_LEADER) + { + case PLAYER_ROLE_TANK: + tankPlayers.push_back(guid); + break; + case PLAYER_ROLE_HEALER: + healPlayers.push_back(guid); + break; + case PLAYER_ROLE_DAMAGE: + dpsPlayers.push_back(guid); + break; + default: + ASSERT(false, "Invalid LFG role %u", it->second.role); + break; + } if (proposal.isNew || GetGroup(guid) != proposal.group) playersToTeleport.push_back(guid); } + players.splice(players.end(), tankPlayers); + players.splice(players.end(), healPlayers); + players.splice(players.end(), dpsPlayers); + // Set the dungeon difficulty LFGDungeonData const* dungeon = GetLFGDungeon(proposal.dungeonId); ASSERT(dungeon); diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index e7ab2b86a5..91b1711c34 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -223,9 +223,9 @@ struct LfgReward struct LfgProposalPlayer { LfgProposalPlayer(): role(0), accept(LFG_ANSWER_PENDING), group() { } - uint8 role; ///< Proposed role - LfgAnswer accept; ///< Accept status (-1 not answer | 0 Not agree | 1 agree) - ObjectGuid group; ///< Original group guid. 0 if no original group + uint8 role; /// Proposed role + LfgAnswer accept; /// Accept status (-1 not answer | 0 Not agree | 1 agree) + ObjectGuid group; /// Original group guid. 0 if no original group }; /// Stores group data related to proposal to join @@ -235,38 +235,38 @@ struct LfgProposal group(), leader(), cancelTime(0), encounters(0), isNew(true) { } - uint32 id; ///< Proposal Id - uint32 dungeonId; ///< Dungeon to join - LfgProposalState state; ///< State of the proposal - ObjectGuid group; ///< Proposal group (0 if new) - ObjectGuid leader; ///< Leader guid. - time_t cancelTime; ///< Time when we will cancel this proposal - uint32 encounters; ///< Dungeon Encounters - bool isNew; ///< Determines if it's new group or not - GuidList queues; ///< Queue Ids to remove/readd - GuidList showorder; ///< Show order in update window - LfgProposalPlayerContainer players; ///< Players data + uint32 id; /// Proposal Id + uint32 dungeonId; /// Dungeon to join + LfgProposalState state; /// State of the proposal + ObjectGuid group; /// Proposal group (0 if new) + ObjectGuid leader; /// Leader guid. + time_t cancelTime; /// Time when we will cancel this proposal + uint32 encounters; /// Dungeon Encounters + bool isNew; /// Determines if it's new group or not + GuidList queues; /// Queue Ids to remove/readd + GuidList showorder; /// Show order in update window + LfgProposalPlayerContainer players; /// Players data }; /// Stores all rolecheck info of a group that wants to join struct LfgRoleCheck { - time_t cancelTime; ///< Time when the rolecheck will fail - LfgRolesMap roles; ///< Player selected roles - LfgRoleCheckState state; ///< State of the rolecheck - LfgDungeonSet dungeons; ///< Dungeons group is applying for (expanded random dungeons) - uint32 rDungeonId; ///< Random Dungeon Id. - ObjectGuid leader; ///< Leader of the group + time_t cancelTime; /// Time when the rolecheck will fail + LfgRolesMap roles; /// Player selected roles + LfgRoleCheckState state; /// State of the rolecheck + LfgDungeonSet dungeons; /// Dungeons group is applying for (expanded random dungeons) + uint32 rDungeonId; /// Random Dungeon Id. + ObjectGuid leader; /// Leader of the group }; /// Stores information of a current vote to kick someone from a group struct LfgPlayerBoot { - time_t cancelTime; ///< Time left to vote - bool inProgress; ///< Vote in progress - LfgAnswerContainer votes; ///< Player votes (-1 not answer | 0 Not agree | 1 agree) - ObjectGuid victim; ///< Player guid to be kicked (can't vote) - std::string reason; ///< kick reason + time_t cancelTime; /// Time left to vote + bool inProgress; /// Vote in progress + LfgAnswerContainer votes; /// Player votes (-1 not answer | 0 Not agree | 1 agree) + ObjectGuid victim; /// Player guid to be kicked (can't vote) + std::string reason; /// kick reason }; struct LFGDungeonData @@ -455,21 +455,21 @@ class TC_GAME_API LFGMgr GuidSet const& GetPlayers(ObjectGuid guid); // General variables - uint32 m_QueueTimer; ///< used to check interval of update - uint32 m_lfgProposalId; ///< used as internal counter for proposals - uint32 m_options; ///< Stores config options + uint32 m_QueueTimer; /// used to check interval of update + uint32 m_lfgProposalId; /// used as internal counter for proposals + uint32 m_options; /// Stores config options - LfgQueueContainer QueuesStore; ///< Queues - LfgCachedDungeonContainer CachedDungeonMapStore; ///< Stores all dungeons by groupType + LfgQueueContainer QueuesStore; /// Queues + LfgCachedDungeonContainer CachedDungeonMapStore; /// Stores all dungeons by groupType // Reward System - LfgRewardContainer RewardMapStore; ///< Stores rewards for random dungeons + LfgRewardContainer RewardMapStore; /// Stores rewards for random dungeons LFGDungeonContainer LfgDungeonStore; // Rolecheck - Proposal - Vote Kicks - LfgRoleCheckContainer RoleChecksStore; ///< Current Role checks - LfgProposalContainer ProposalsStore; ///< Current Proposals - LfgPlayerBootContainer BootsStore; ///< Current player kicks - LfgPlayerDataContainer PlayersStore; ///< Player data - LfgGroupDataContainer GroupsStore; ///< Group data + LfgRoleCheckContainer RoleChecksStore; /// Current Role checks + LfgProposalContainer ProposalsStore; /// Current Proposals + LfgPlayerBootContainer BootsStore; /// Current player kicks + LfgPlayerDataContainer PlayersStore; /// Player data + LfgGroupDataContainer GroupsStore; /// Group data }; } // namespace lfg From d1d174a9961dd9755d8765854095818aeab10b17 Mon Sep 17 00:00:00 2001 From: Keader Date: Sun, 26 Aug 2018 01:02:58 -0300 Subject: [PATCH 090/102] Utilities/EventProcessor: Added a overload to AddEventAtOffset accept rand time --- src/common/Utilities/EventProcessor.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h index a90fa4c3d0..2ab8d0c46d 100644 --- a/src/common/Utilities/EventProcessor.h +++ b/src/common/Utilities/EventProcessor.h @@ -22,6 +22,7 @@ #include "Define.h" #include "Duration.h" #include +#include "Random.h" class EventProcessor; @@ -81,6 +82,7 @@ class TC_COMMON_API EventProcessor void KillAllEvents(bool force); void AddEvent(BasicEvent* event, uint64 e_time, bool set_addtime = true); void AddEventAtOffset(BasicEvent* event, Milliseconds offset) { AddEvent(event, CalculateTime(offset.count())); } + void AddEventAtOffset(BasicEvent* event, Milliseconds offset, Milliseconds offset2) { AddEvent(event, CalculateTime(urand(offset.count(), offset2.count()))); } void ModifyEventTime(BasicEvent* event, uint64 newTime); uint64 CalculateTime(uint64 t_offset) const { return m_time + t_offset; } From 1091b559077e5c7c9e786ed3f6c6949be1448728 Mon Sep 17 00:00:00 2001 From: Ovah Date: Sun, 26 Aug 2018 10:35:51 +0200 Subject: [PATCH 091/102] Core/Maps: initialize PositionFullTerrainStatus to avoid having issues with those variables (#22315) --- src/server/game/Maps/Map.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index bb05167e65..9f06998661 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -175,6 +175,7 @@ struct PositionFullTerrainStatus uint32 const mogpFlags; }; + PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true) { } uint32 areaId; float floorZ; ZLiquidStatus liquidStatus; From 1c967487d9bfce3d4ad8b31c6f86fe8d6d4cac5b Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 26 Aug 2018 13:38:22 +0200 Subject: [PATCH 092/102] DB/Script: Update guid object related to "Cleansing Witch Hill" Ref #22262 --- sql/updates/world/3.3.5/2018_08_26_02_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_26_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql new file mode 100644 index 0000000000..0031fd8de4 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql @@ -0,0 +1,2 @@ +-- +UPDATE FROM `event_scripts` SET `datalong`=5448 WHERE `id`=15452; From 30dc605eb066e65a70261b2a662d8a6a2ddf0e9a Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 26 Aug 2018 13:48:16 +0200 Subject: [PATCH 093/102] DB: Typo --- sql/updates/world/3.3.5/2018_08_26_02_world_335.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql index 0031fd8de4..b72239540d 100644 --- a/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql +++ b/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql @@ -1,2 +1,2 @@ -- -UPDATE FROM `event_scripts` SET `datalong`=5448 WHERE `id`=15452; +UPDATE `event_scripts` SET `datalong`=5448 WHERE `id`=15452; From f17b7b140c0663dceca28522b62e3b53611c31fb Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 26 Aug 2018 14:26:42 +0200 Subject: [PATCH 094/102] DB: Fix some DB errors --- sql/updates/world/3.3.5/2018_08_26_03_world.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_26_03_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_03_world.sql b/sql/updates/world/3.3.5/2018_08_26_03_world.sql new file mode 100644 index 0000000000..a110f9b57f --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_26_03_world.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|617299839 WHERE `entry`=33995; +UPDATE `gameobject` SET `rotation2`=-0.571201 WHERE `guid`= 5255 AND `id`= 21148; +DELETE FROM `linked_respawn` WHERE `guid` IN (12605,12606) AND `linkedGuid`=12597; From ad15d9f6028b72e6a9285a5bd580ff9fded122e3 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 26 Aug 2018 15:40:46 +0200 Subject: [PATCH 095/102] DB/Creature: Theramore Practicing Guard Closes #22310 --- sql/updates/world/3.3.5/2018_08_26_04_world_335.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_26_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_04_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_04_world_335.sql new file mode 100644 index 0000000000..cb962127d1 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_26_04_world_335.sql @@ -0,0 +1,8 @@ +-- +-- Theramore Practicing Guard +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4951; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (4951) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(4951,0,0,0,25,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,19,4952,0,0,0,0,0,0,"Theramore Practicing Guard - On Reset - Start Attacking"); +-- Theramore Combat Dummy +UPDATE `creature_template` SET `ScriptName`="npc_training_dummy" WHERE `entry`=4952; From 13e424193b9a7149195486f79e9e7a5cdbe4f714 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 26 Aug 2018 15:41:27 +0200 Subject: [PATCH 096/102] DB/Quest: Quest Emotes (Dustwallow Marsh) Closes #22312 --- .../world/3.3.5/2018_08_26_05_world_335.sql | 292 ++++++++++++++++++ 1 file changed, 292 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_26_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_05_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_05_world_335.sql new file mode 100644 index 0000000000..59a29c1485 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_26_05_world_335.sql @@ -0,0 +1,292 @@ +-- +-- Quest "Deadmire" +DELETE FROM `quest_details` WHERE `ID`=1205; +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1205; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1205; + +-- Quest "The Brood of Onyxia" +DELETE FROM `quest_details` WHERE `ID`=1171; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1171,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote2`=0, `Emote3`=0 WHERE `ID`=1170; + +-- Quest "The Theramore Docks" +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=1202; + +-- Quest "This Old Lighthouse" +DELETE FROM `quest_details` WHERE `ID`=11191; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11191,1,1,0,0,0,0,0,0,0); + +-- Quest "Challenge Overlord Mok'Morokk" +DELETE FROM `quest_details` WHERE `ID`=1173; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1173,11,15,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=1173; + +-- Quest "The Witch's Bane" +DELETE FROM `quest_details` WHERE `ID`=11181; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11181,1,1,0,0,0,0,0,0,0); + +-- Quest "Cleansing Witch Hill" +DELETE FROM `quest_details` WHERE `ID`=11183; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11183,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=5, `Emote3`=1 WHERE `ID`=11183; + +-- Quest "The Lost Report" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1238; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1238; + +-- Quest "The Severed Head" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1239; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1239; + +-- Quest "The Troll Witchdoctor" +DELETE FROM `quest_details` WHERE `ID`=1240; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1240,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=1240; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1240; + +-- Quest "Marg Speaks" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1261; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=66 WHERE `ID`=1261; + +-- Quest "Report to Zor" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1262; + +-- Quest "Service to the Horde" +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=7541; + +-- Quest "Marsh Frog Legs" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=1218; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=1218; + +-- Quest "Jarl Needs Eyes" +DELETE FROM `quest_details` WHERE `ID`=1206; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1206,1,6,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1206; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=3 WHERE `ID`=1206; + +-- Quest "Jarl Needs a Blade" +DELETE FROM `quest_details` WHERE `ID`=1203; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1203,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1203; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=36, `Emote3`=4 WHERE `ID`=1203; + +-- Quest "Secure the Cargo!" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11207; + +-- Quest "Delivery for Drazzit" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11208; + +-- Quest "Catch a Dragon by the Tail" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11217; +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=0 WHERE `ID`=11217; + +-- Banner of the Stonemaul +UPDATE `quest_details` SET `Emote3`=1 WHERE `ID` IN (11158,11160,11159,11162,11201,11203); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=15, `EmoteOnComplete`=15 WHERE `ID`=11162; +UPDATE `quest_offer_reward` SET `Emote2`=0 WHERE `ID`=11160; + +-- Quest "Return to Krog" +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=11204; + +-- Quest "The Grimtotem Plot" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11201; +UPDATE `quest_offer_reward` SET `EmoteDelay1`=1500 WHERE `ID`=11201; + +-- Quest "More than Coincidence" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11200; +UPDATE `quest_offer_reward` SET `Emote2`=0, `EmoteDelay1`=2000 WHERE `ID`=11200; + +-- Quest "Seek Out Tabetha" +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=11203; + +-- Quest "Raze Direhorn Post!" +UPDATE `quest_details` SET `Emote2`=5 WHERE `ID`=11205; +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11205; + +-- Quest "Justice Dispensed" +UPDATE `quest_offer_reward` SET `Emote3`=66, `EmoteDelay1`=2000 WHERE `ID`=11206; + +-- Quest "Thresher Oil" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11192; + +-- Quest "They Call Him Smiling Jim" +DELETE FROM `quest_details` WHERE `ID`=1282; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1282,1,1,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=1 WHERE `ID`=1282; + +-- Quest "Inspecting the Ruins" +DELETE FROM `quest_details` WHERE `ID`=11123; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11123,1,1,1,0,0,0,0,0,0); + +-- Quest "Traitors Among Us" +UPDATE `quest_details` SET `Emote2`=1 WHERE `ID` IN (11126,11128,11194,11133,11134,11177,11214,11136,11209,11210,11137,11146,11147,11145,11212,11138,11139,11140,11142,11149,11150,11151,11152); + +-- Quest "Discrediting the Deserters" +UPDATE `quest_offer_reward` SET `EmoteDelay1`=2000 WHERE `ID`=11133; + +-- Quest "The End of the Deserters" +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1, `Emote3`=1 WHERE `ID`=11134; + +-- Quest "Lieutenant Paval Reethe" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1252; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1252; + +-- Quest "Lieutenant Paval Reethe" +DELETE FROM `quest_details` WHERE `ID`=1259; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1259,1,0,0,0,0,0,0,0,0); + +-- Quest "Daelin's Men" +DELETE FROM `quest_details` WHERE `ID`=1285; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1285,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1285; + +-- Quest "The Deserters" +DELETE FROM `quest_details` WHERE `ID`=1286; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1286,1,0,0,0,0,0,0,0,0); + +-- Quest "Suspicious Hoofprints" +UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=1284; + +-- Quest "The Black Shield" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1253; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1253; + +-- Quest "The Black Shield (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=1319; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1319,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1319; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1319; + +-- Quest "The Black Shield (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=1320; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1320,1,3,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1320; + +-- Quest "Oh, It's Real" +UPDATE `quest_offer_reward` SET `EmoteDelay1`=2000 WHERE `ID`=11210; + +-- Quest "Raptor Captor" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11146; + +-- Quest "What's Haunting Witch Hill?" +UPDATE `quest_offer_reward` SET `EmoteDelay1`=2000, `Emote2`=1 WHERE `ID`=11180; + +-- Quest "The Orc Report" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1219; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1219; + +-- Quest "Captain Vimes" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=1220; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1220; + +-- Quest "Stinky's Escape" +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=1222; + +-- Quest "Prisoners of the Grimtotems" +UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=11145; + +-- Quest "Defias in Dustwallow?" +UPDATE `quest_offer_reward` SET `EmoteDelay1`=1000, `Emote2`=1 WHERE `ID`=11137; + +-- Quest "Renn McGill" +UPDATE `quest_offer_reward` SET `EmoteDelay1`=1000 WHERE `ID`=11138; + +-- Quest "Mudrock Soup and Bugs" +DELETE FROM `quest_details` WHERE `ID`=1204; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1204,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1204; +UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1 WHERE `ID`=1204; + +-- Quest "... and Bugs" +DELETE FROM `quest_details` WHERE `ID`=1258; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1258,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=1258; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1258; + +-- Quest "Secondhand Diving Gear" +UPDATE `quest_offer_reward` SET `Emote2`=1 WHERE `ID`=11139; + +-- Quest "Jaina Must Know" +UPDATE `quest_details` SET `Emote1`=5, `Emote2`=1 WHERE `ID`=11141; + +-- Quest "The Deserters" +DELETE FROM `quest_details` WHERE `ID`=1287; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(1287,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=1287; + +-- Quest "A Grim Connection" +DELETE FROM `quest_details` WHERE `ID`=11143; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11143,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=11143; + +-- Quest "Confirming the Suspicion" +DELETE FROM `quest_details` WHERE `ID`=11144; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11144,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11144; +UPDATE `quest_offer_reward` SET `Emote1`=1, `EmoteDelay1`=1000 WHERE `ID`=11144; + +-- Quest "Arms of the Grimtotems" +DELETE FROM `quest_details` WHERE `ID`=11148; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11148,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11148; +UPDATE `quest_offer_reward` SET `Emote1`=1, `EmoteDelay1`=2000 WHERE `ID`=11148; + +-- Quest "Direhorn Raiders" +UPDATE `quest_offer_reward` SET `Emote1`=273 WHERE `ID`=11156; + +-- Quest "The Reagent Thief" +UPDATE `quest_offer_reward` SET `Emote2`=0, `EmoteDelay1`=1000 WHERE `ID`=11173; + +-- Quest "The Grimtotem Weapon" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11169; +UPDATE `quest_offer_reward` SET `EmoteDelay1`=1500 WHERE `ID`=11169; + +-- Quest "The Zeppelin Crash" +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=11172; + +-- Quest "Corrosion Prevention" +DELETE FROM `quest_details` WHERE `ID`=11174; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(11174,5,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11174; + +-- Quest "Secure the Cargo!" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11207; + +-- Quest "The Apothecary's Letter" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=11185; +UPDATE `quest_offer_reward` SET `EmoteDelay1`=1500, `Emote2`=1 WHERE `ID`=11185; + +-- Quest "Justice for the Hyals" +UPDATE `quest_offer_reward` SET `EmoteDelay1`=1000 WHERE `ID`=11151; + +-- Quest "Peace at Last" +UPDATE `quest_offer_reward` SET `EmoteDelay1`=1000, `Emote2`=1 WHERE `ID`=11152; + +-- Quest "Shadowshard Fragments" +DELETE FROM `quest_details` WHERE `ID`=7070; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(7070,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=7070; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=7070; From 2c2828bae3cc115e1996a8eed6c0bcb6d9986616 Mon Sep 17 00:00:00 2001 From: illfated Date: Sun, 26 Aug 2018 15:42:43 +0200 Subject: [PATCH 097/102] DB/Quest: actual RewardText for The New Horde Closes #22313 --- sql/updates/world/3.3.5/2018_08_26_06_world_335.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_26_06_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql new file mode 100644 index 0000000000..963ad95ea6 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql @@ -0,0 +1,2 @@ +-- quest 787 "The New Horde" completion text +UPDATE `quest_offer_reward` SET `RewardText`= "Another one of Eitrigg's recruits, hm?$B$BA sorry state of affairs we find ourselves in if this is the best the Horde can produce. No matter. By the time we think you're ready to leave the Valley, you'll be a proud warrior of the Horde." WHERE `ID`=787; From 1be79ced0022992feb800deb8c4d51e22c77dfc6 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 26 Aug 2018 15:43:47 +0200 Subject: [PATCH 098/102] DB/Quest: Torek's Assault Closes #22302 --- .../world/3.3.5/2018_08_26_07_world_335.sql | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_26_07_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_07_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_07_world_335.sql new file mode 100644 index 0000000000..bf22043e17 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_26_07_world_335.sql @@ -0,0 +1,70 @@ +-- Duriel Moonfire +DELETE FROM `smart_scripts` WHERE `entryorguid`=12860 AND `source_type`=0 AND `id`=2; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(12860,0,2,0,54,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Duriel Moonfire - Just Summoned - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=12860; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(12860,0,0,"Who dares attack the Silverwing Outpost?!?",14,0,100,15,0,0,8279,0,"Duriel Moonfire"); + +-- Torek +DELETE FROM `smart_scripts` WHERE `entryorguid`=12858 AND `source_type`=0 AND `id`>16; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(12858,0,17,0,4,0,50,0,0,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torek - On Aggro - Say Line 5"), +(12858,0,18,0,40,0,100,1,1,12858,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torek - On Waypoint 1 Reached - Pause Waypoint"), +(12858,0,19,0,40,0,100,1,1,12858,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torek - On Waypoint 1 Reached - Set Run On"), +(12858,0,20,0,40,0,100,1,20,12858,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torek - On Waypoint 20 Reached - Set Run Off"), +(12858,0,21,0,1,1,100,0,5000,10000,20000,30000,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torek - Out of Combat - Say Line 6 (Phase 1)"), +(12858,0,22,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torek - On Respawn - Set Event Phase 1"), +(12858,0,23,0,19,0,100,0,6544,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torek - On Quest 'Torek's Assault' Taken - Set Event Phase 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=12858 AND `GroupID` IN (5,6); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(12858,5,0,"For the Horde!",12,0,100,0,0,0,8283,0,"Torek"), +(12858,6,0,"Steady, people. We'll raid soon enough.",12,0,100,0,0,0,8420,0,"Torek"), +(12858,6,1,"With luck, we'll gain some good scars today.",12,0,100,0,0,0,8421,0,"Torek"), +(12858,6,2,"These woods make my tusks itch...",12,0,100,0,0,0,8422,0,"Torek"), +(12858,6,3,"They say Duriel is a fierce night elf. It'll be a good fight!",12,0,100,0,0,0,8423,0,"Torek"), +(12858,6,4,"We'll be notching our axes after this.",12,0,100,0,0,0,8424,0,"Torek"), +(12858,6,5,"Stay calm, people. We don't want to give away our position.",12,0,100,0,0,0,8425,0,"Torek"); + +-- Splintertree Raider 1 +UPDATE `creature_template_addon` SET `bytes1`=0 WHERE `entry`=12859; +DELETE FROM `smart_scripts` WHERE `entryorguid`=-32380 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=12859 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-32380,0,0,0,11,0,100,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Faction 113"), +(-32380,0,1,2,38,0,100,0,1,1,0,0,2,83,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Set Faction 83"), +(-32380,0,2,3,61,0,100,0,0,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Remove Standstate Kneel"), +(-32380,0,3,4,61,0,100,0,0,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Set React State 'Aggresive'"), +(-32380,0,4,0,61,0,100,0,0,0,0,0,29,2,45,0,0,0,0,19,12858,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Follow Torek"), +(-32380,0,5,0,7,0,100,0,0,0,0,0,29,2,45,0,0,0,0,19,12858,0,0,0,0,0,0,"Splintertree Raider - On Evade - Follow Torek"), +(-32380,0,6,0,38,0,100,0,2,2,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 2 2 - Despawn in 1000 ms"), +(-32380,0,7,0,1,0,100,0,1000,1000,1000,1000,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - Out of Combat - Set Home Position"), +(-32380,0,8,0,11,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Flag Standstate 'Kneel'"); + +-- Splintertree Raider 2 +DELETE FROM `smart_scripts` WHERE `entryorguid`=-32379 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-32379,0,0,0,11,0,100,512,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Faction 113"), +(-32379,0,1,2,38,0,100,512,1,1,0,0,2,83,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Set Faction 83"), +(-32379,0,2,3,61,0,100,512,0,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Remove Standstate Kneel"), +(-32379,0,3,4,61,0,100,512,0,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Set React State 'Aggresive'"), +(-32379,0,4,0,61,0,100,512,0,0,0,0,29,2,315,0,0,0,0,19,12858,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Follow Torek"), +(-32379,0,5,0,7,0,100,512,0,0,0,0,29,2,315,0,0,0,0,19,12858,0,0,0,0,0,0,"Splintertree Raider - On Evade - Follow Torek"), +(-32379,0,6,0,38,0,100,512,2,2,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 2 2 - Despawn in 1000 ms"), +(-32379,0,7,0,1,0,100,512,1000,1000,1000,1000,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - Out of Combat - Set Home Position"), +(-32379,0,8,0,11,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Flag Standstate 'Kneel'"); + +-- Splintertree Raider 3 +DELETE FROM `smart_scripts` WHERE `entryorguid`=-32378 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-32378,0,0,0,11,0,100,512,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Faction 113"), +(-32378,0,1,2,38,0,100,512,1,1,0,0,2,83,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Set Faction 83"), +(-32378,0,2,3,61,0,100,512,0,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Remove Standstate Kneel"), +(-32378,0,3,4,61,0,100,512,0,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Set React State 'Aggresive'"), +(-32378,0,4,0,61,0,100,512,0,0,0,0,29,2,360,0,0,0,0,19,12858,0,0,0,0,0,0,"Splintertree Raider - On Data Set 1 1 - Follow Torek"), +(-32378,0,5,0,7,0,100,512,0,0,0,0,29,2,360,0,0,0,0,19,12858,0,0,0,0,0,0,"Splintertree Raider - On Evade - Follow Torek"), +(-32378,0,6,0,38,0,100,512,2,2,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 2 2 - Despawn in 1000 ms"), +(-32378,0,7,0,1,0,100,512,1000,1000,1000,1000,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - Out of Combat - Set Home Position"), +(-32378,0,8,0,11,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Flag Standstate 'Kneel'"); From 43f28555c47ee3ef5d643de6a860337d20421889 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Sun, 26 Aug 2018 15:44:23 +0200 Subject: [PATCH 099/102] DB/Quest: Quest Emotes (Hillsbrad Foothills & Alterac Mountains) (Alliance) Closes #22301 --- .../world/3.3.5/2018_08_26_08_world_335.sql | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_08_26_08_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_08_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_08_world_335.sql new file mode 100644 index 0000000000..584254d9de --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_26_08_world_335.sql @@ -0,0 +1,181 @@ +-- Quest "Missing Crystals" +DELETE FROM `quest_details` WHERE `ID`=9435; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(9435,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9435; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=9435; + +-- Quest "Down the Coast" +DELETE FROM `quest_details` WHERE `ID`=536; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(536,7,0,0,0,0,0,0,0,0); + +-- Quest "Farren's Proof" +DELETE FROM `quest_details` WHERE `ID`=559; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(559,6,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=559; + +-- Quest "Farren's Proof (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=560; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(560,6,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=560; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=560; + +-- Quest "Stormwind Ho!" +DELETE FROM `quest_details` WHERE `ID`=562; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(562,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=562; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=562; + +-- Quest "Reassignment" +DELETE FROM `quest_details` WHERE `ID`=563; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(563,1,0,0,0,0,0,0,0,0); + +-- Quest "Costly Menace" +DELETE FROM `quest_details` WHERE `ID`=564; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(564,1,1,5,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=564; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=564; + +-- Quest "Soothing Turtle Bisque" +DELETE FROM `quest_details` WHERE `ID`=555; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(555,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=555; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=555; + +-- Quest "Foreboding Plans" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=510; + +-- Quest "Crushridge Bounty" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=500; + +-- Quest "In the Name of the Light" +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=66 WHERE `ID`=1053; + +-- Quest "Encrypted Letter" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=511; + +-- Quest "Letter to Stormpike" +DELETE FROM `quest_details` WHERE `ID`=514; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(514,1,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=514; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=514; + +-- Quest "Further Mysteries" +DELETE FROM `quest_details` WHERE `ID`=525; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(525,1,6,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=525; + +-- Quest "Dark Council" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=537; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=537; + +-- Quest "MacKreel's Moonshine" +DELETE FROM `quest_details` WHERE `ID`=647; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(647,5,1,5,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=647; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=647; + +-- Quest "Hints of a New Plague?" +DELETE FROM `quest_details` WHERE `ID`=659; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(659,1,1,6,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=659; + +-- Quest "Hints of a New Plague? (Part 2)" +DELETE FROM `quest_details` WHERE `ID`=658; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(658,6,1,1,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=658; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=658; + +-- Quest "Hints of a New Plague? (Part 3)" +DELETE FROM `quest_details` WHERE `ID`=657; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(657,1,1,1,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=657; + +-- Quest "Hints of a New Plague? (Part 4)" +DELETE FROM `quest_details` WHERE `ID`=660; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(660,1,0,0,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=660; + +-- Quest "Hints of a New Plague? (Part 5)" +DELETE FROM `quest_details` WHERE `ID`=661; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(661,11,1,6,0,0,0,0,0,0); +UPDATE `quest_offer_reward` SET `Emote1`=11, `Emote2`=1, `Emote3`=2 WHERE `ID`=661; + +-- Quest "Bartolo's Yeti Fur Cloak" +DELETE FROM `quest_details` WHERE `ID`=565; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(565,94,0,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=94, `EmoteOnComplete`=94 WHERE `ID`=565; +UPDATE `quest_offer_reward` SET `Emote1`=94 WHERE `ID`=565; + +-- Quest "Noble Deaths" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=512; + +-- Quest "Assassin's Contract" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=522; + +-- Quest "Baron's Demise" +UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=523; +UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=523; + +-- Quest "The Ensorcelled Parchment" +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=551; +UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=551; + +-- Quest "Stormpike's Deciphering" +DELETE FROM `quest_details` WHERE `ID`=554; +INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES +(554,1,1,0,0,0,0,0,0,0); +UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=554; +UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=554; + +-- Quest "Proving Grounds" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=7162; +UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=7162; + +-- Quest "Rise and Be Recognized" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1, `CompletionText`="Most do not live long enough to rise above their own mediocrity. You have proven yourself to be an exemplary soldier, $c. The time has come.$B$BPresent your insignia." WHERE `ID`=7168; +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=7168; + +-- Quest "Honored Amongst the Guard" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5, `CompletionText`="The base buzzes with news of your exploits in the Field of Strife! You have struck mighty blows against our enemy - crushing their morale! For this, you have earned a rank of honor among the Stormpike.$B$BPresent your insignia." WHERE `ID`=7169; +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=7169; + +-- Quest "Earned Reverence" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6, `CompletionText`="I must know, $n. When you look directly into the eyes of the enemy, do you see fear? Do they now cower in your presence? They must realize that they are defeated!$B$BYou have earned reverence among the Guard. Present your insignia!" WHERE `ID`=7170; +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=7170; + +-- Quest "Legendary Heroes" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=66, `EmoteOnComplete`=66, `CompletionText`="Before me stands an exalted hero of the Alliance.$B$B$B$BFew have earned such a rank among the Stormpike. I have watched the enemy fall before you. I have seen their resolve crumble in your presence. When you enter the fray, you become the beacon of hope for our forces!$B$BPresent your insignia." WHERE `ID`=7171; +UPDATE `quest_offer_reward` SET `Emote1`=25 WHERE `ID`=7171; + +-- Quest "The Eye of Command" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5, `CompletionText`="Let them hear your voice, commander $n! Let them know fear. Show them what power the Stormpike holds in their rank!$B$BPresent your insignia." WHERE `ID`=7172; +UPDATE `quest_offer_reward` SET `Emote1`=66, `RewardText`="It is you who must lead our troops to victory, Commander! The soldiers are under your command. They will follow your direct orders. Lead them... Crush the Frostwolf." WHERE `ID`=7172; + +-- Quest "Alterac Valley Graveyards" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=7081; +UPDATE `quest_offer_reward` SET `Emote1`=66 WHERE `ID`=7081; + +-- Quest "Towers and Bunkers" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=7102; +UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=7102; + +-- Quest "Capture a Mine" +UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=7122; +UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=7122; From bb19827cfdcc37c22beaefa50aa37bf96c558181 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 26 Aug 2018 15:52:22 +0200 Subject: [PATCH 100/102] rename files --- sql/updates/world/3.3.5/2018_08_26_02_world_335.sql | 2 -- sql/updates/world/3.3.5/2018_08_26_06_world_335.sql | 2 -- ...2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql | 2 ++ .../2018_08_26_01_world_from_335_was_2018_08_26_03_world.sql} | 0 ...018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql} | 2 ++ ...018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql} | 2 ++ ...2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql | 2 ++ ...018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql} | 2 ++ ...018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql} | 2 ++ src/server/game/Maps/Map.h | 2 +- 10 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 sql/updates/world/3.3.5/2018_08_26_02_world_335.sql delete mode 100644 sql/updates/world/3.3.5/2018_08_26_06_world_335.sql create mode 100644 sql/updates/world/4.3.4/2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql rename sql/updates/world/{3.3.5/2018_08_26_03_world.sql => 4.3.4/2018_08_26_01_world_from_335_was_2018_08_26_03_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_08_26_04_world_335.sql => 4.3.4/2018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_26_05_world_335.sql => 4.3.4/2018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql} (99%) create mode 100644 sql/updates/world/4.3.4/2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql rename sql/updates/world/{3.3.5/2018_08_26_07_world_335.sql => 4.3.4/2018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_08_26_08_world_335.sql => 4.3.4/2018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql} (99%) diff --git a/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql deleted file mode 100644 index b72239540d..0000000000 --- a/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql +++ /dev/null @@ -1,2 +0,0 @@ --- -UPDATE `event_scripts` SET `datalong`=5448 WHERE `id`=15452; diff --git a/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql deleted file mode 100644 index 963ad95ea6..0000000000 --- a/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql +++ /dev/null @@ -1,2 +0,0 @@ --- quest 787 "The New Horde" completion text -UPDATE `quest_offer_reward` SET `RewardText`= "Another one of Eitrigg's recruits, hm?$B$BA sorry state of affairs we find ourselves in if this is the best the Horde can produce. No matter. By the time we think you're ready to leave the Valley, you'll be a proud warrior of the Horde." WHERE `ID`=787; diff --git a/sql/updates/world/4.3.4/2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql new file mode 100644 index 0000000000..d6ed1ee2ca --- /dev/null +++ b/sql/updates/world/4.3.4/2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql @@ -0,0 +1,2 @@ +-- +-- UPDATE `event_scripts` SET `datalong`=5448 WHERE `id`=15452; diff --git a/sql/updates/world/3.3.5/2018_08_26_03_world.sql b/sql/updates/world/4.3.4/2018_08_26_01_world_from_335_was_2018_08_26_03_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_08_26_03_world.sql rename to sql/updates/world/4.3.4/2018_08_26_01_world_from_335_was_2018_08_26_03_world.sql diff --git a/sql/updates/world/3.3.5/2018_08_26_04_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_26_04_world_335.sql rename to sql/updates/world/4.3.4/2018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql index cb962127d1..c37d508890 100644 --- a/sql/updates/world/3.3.5/2018_08_26_04_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Theramore Practicing Guard UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4951; @@ -6,3 +7,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (4951,0,0,0,25,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,19,4952,0,0,0,0,0,0,"Theramore Practicing Guard - On Reset - Start Attacking"); -- Theramore Combat Dummy UPDATE `creature_template` SET `ScriptName`="npc_training_dummy" WHERE `entry`=4952; +*/ diff --git a/sql/updates/world/3.3.5/2018_08_26_05_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_26_05_world_335.sql rename to sql/updates/world/4.3.4/2018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql index 59a29c1485..0f087f6d61 100644 --- a/sql/updates/world/3.3.5/2018_08_26_05_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Quest "Deadmire" DELETE FROM `quest_details` WHERE `ID`=1205; @@ -290,3 +291,4 @@ INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `Emot (7070,1,1,0,0,0,0,0,0,0); UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=7070; UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=7070; +*/ diff --git a/sql/updates/world/4.3.4/2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql new file mode 100644 index 0000000000..c45ae568d1 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql @@ -0,0 +1,2 @@ +-- quest 787 "The New Horde" completion text +-- UPDATE `quest_offer_reward` SET `RewardText`= "Another one of Eitrigg's recruits, hm?$B$BA sorry state of affairs we find ourselves in if this is the best the Horde can produce. No matter. By the time we think you're ready to leave the Valley, you'll be a proud warrior of the Horde." WHERE `ID`=787; diff --git a/sql/updates/world/3.3.5/2018_08_26_07_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_26_07_world_335.sql rename to sql/updates/world/4.3.4/2018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql index bf22043e17..b2ebce6cca 100644 --- a/sql/updates/world/3.3.5/2018_08_26_07_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql @@ -1,3 +1,4 @@ +/* -- Duriel Moonfire DELETE FROM `smart_scripts` WHERE `entryorguid`=12860 AND `source_type`=0 AND `id`=2; INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES @@ -68,3 +69,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (-32378,0,6,0,38,0,100,512,2,2,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 2 2 - Despawn in 1000 ms"), (-32378,0,7,0,1,0,100,512,1000,1000,1000,1000,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - Out of Combat - Set Home Position"), (-32378,0,8,0,11,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Flag Standstate 'Kneel'"); +*/ diff --git a/sql/updates/world/3.3.5/2018_08_26_08_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_08_26_08_world_335.sql rename to sql/updates/world/4.3.4/2018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql index 584254d9de..8516167d65 100644 --- a/sql/updates/world/3.3.5/2018_08_26_08_world_335.sql +++ b/sql/updates/world/4.3.4/2018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql @@ -1,3 +1,4 @@ +/* -- Quest "Missing Crystals" DELETE FROM `quest_details` WHERE `ID`=9435; INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES @@ -179,3 +180,4 @@ UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=7102; -- Quest "Capture a Mine" UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=7122; UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=7122; +*/ diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 9f06998661..b871299271 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -175,7 +175,7 @@ struct PositionFullTerrainStatus uint32 const mogpFlags; }; - PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true) { } + // PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true) { } uint32 areaId; float floorZ; ZLiquidStatus liquidStatus; From d27baf2e36e51516f310268e72ac1d6ade48126d Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 25 Jul 2018 18:17:01 +0200 Subject: [PATCH 101/102] Scripts/Commands: fixed a crash in .gobject near command --- src/server/scripts/Commands/cs_gobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 7b68264316..f4354e6b74 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -563,7 +563,7 @@ public: if (!gameObjectInfo) continue; - handler->PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gameObjectInfo->name.c_str(), x, y, z, mapId); + handler->PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gameObjectInfo->name.c_str(), x, y, z, mapId, "", ""); ++count; } while (result->NextRow()); From 10e866aae9864c10d524165d4b0c8450807df75a Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 23 Jul 2018 16:52:46 +0200 Subject: [PATCH 102/102] Scripts/Commands: fixed layout of returned values when using .npc info --- src/server/scripts/Commands/cs_npc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 640e83ec44..27bbe0f8f2 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -794,7 +794,7 @@ public: std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay), true); std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), true); - handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetSpawnId(), target->GetGUID().GetCounter(), entry, faction, npcflags, displayid, nativeid); + handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetSpawnId(), target->GetGUID().GetCounter(), faction, npcflags, entry, displayid, nativeid); if (target->GetCreatureData() && target->GetCreatureData()->spawnGroupData->groupId) { SpawnGroupTemplateData const* const groupData = target->GetCreatureData()->spawnGroupData;