From a75fe0b2bfe76f82e771254b640d8509eff66468 Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Sat, 16 Feb 2013 02:34:08 +0200 Subject: DB/Creature: The Ocular Now Eyesore Blaster hits this npc for 12600 damage as it should. --- sql/updates/world/2013_02_16_00_world_creature_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2013_02_16_00_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_16_00_world_creature_template.sql b/sql/updates/world/2013_02_16_00_world_creature_template.sql new file mode 100644 index 00000000000..7fa6e727ab0 --- /dev/null +++ b/sql/updates/world/2013_02_16_00_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `Armor_mod`=0 WHERE `entry`=29747; -- cgit v1.2.3 From 49e196e6b00fd10895d7bb47442266305fa7e0fa Mon Sep 17 00:00:00 2001 From: Vincent_Michael Date: Sat, 16 Feb 2013 03:26:26 +0100 Subject: Misc/Spells: - Add some ulduar teleport pos for spells - Add target hack for ulduar teleport spells --- .../world/2013_02_16_01_world_spell_target_position.sql | 11 +++++++++++ src/server/game/Spells/SpellMgr.cpp | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 sql/updates/world/2013_02_16_01_world_spell_target_position.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_16_01_world_spell_target_position.sql b/sql/updates/world/2013_02_16_01_world_spell_target_position.sql new file mode 100644 index 00000000000..c262ecf450f --- /dev/null +++ b/sql/updates/world/2013_02_16_01_world_spell_target_position.sql @@ -0,0 +1,11 @@ +DELETE FROM `spell_target_position` WHERE `id` IN (64014,64024,64025,64028,64029,64030,64031,64032,65042); +INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES +(64014, 603, -705.9705, -92.55729, 430.8192, 0), +(64024, 603, 2086.224, -24.05382, 422.2889, 0), +(64025, 603, 2518.131, 2569.342, 412.6822, 0), +(64028, 603, 553.243, -12.30903, 410.5428, 0), +(64029, 603, 1859.563, -24.83773, 449.1945, 6.230825), +(64030, 603, 1497.989, -24.16162, 421.6254, 0.03490658), +(64031, 603, 926.2917, -11.44444, 418.9779, 0.01745329), +(64032, 603, 131.1389, -35.36806, 410.187, 0), +(65042, 603, 1855.073, -11.48785, 334.559, 5.532694); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index dbd4e3904ea..b40943ff266 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3371,6 +3371,17 @@ void SpellMgr::LoadDbcDataCorrections() case 64596: // Cosmic Smash (Algalon the Observer) spellInfo->rangeIndex = 6; // 100yd break; + case 64014: // Expedition Base Camp Teleport + case 64024: // Conservatory Teleport + case 64025: // Halls of Invention Teleport + case 64028: // Colossal Forge Teleport + case 64029: // Shattered Walkway Teleport + case 64030: // Antechamber Teleport + case 64031: // Scrapyard Teleport + case 64032: // Formation Grounds Teleport + case 65042: // Prison of Yogg-Saron Teleport + spellInfo->EffectImplicitTargetA[0] = TARGET_DEST_DB; + break; // ENDOF ULDUAR SPELLS // // TRIAL OF THE CRUSADER SPELLS -- cgit v1.2.3 From e8b7f8f61b792851ca52c3011c3b858c8485d3a4 Mon Sep 17 00:00:00 2001 From: ZxBiohazardZx Date: Sat, 16 Feb 2013 10:36:54 +0100 Subject: DB/Creature: Add texts for Lurgglbr Closes #1608 --- sql/updates/world/2013_02_16_02_world_creature_text.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/2013_02_16_02_world_creature_text.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_16_02_world_creature_text.sql b/sql/updates/world/2013_02_16_02_world_creature_text.sql new file mode 100644 index 00000000000..d7250b0b49c --- /dev/null +++ b/sql/updates/world/2013_02_16_02_world_creature_text.sql @@ -0,0 +1,8 @@ +-- Lurgglbr +DELETE FROM `creature_text` WHERE `entry`=25208; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(25208,0,0, 'You can''t hold me against my will! You''ve all been brainwashed!', 12,0,100,0,0,0, 'Lurgglbr'), +(25208,1,0, 'Together we will fight our way out of here. Are you ready?', 12,0,100,0,0,0, 'Lurgglbr'), +(25208,2,0, 'This is far enough. I can make it on my own from here.', 12,0,100,0,0,0, 'Lurgglbr'), +(25208,3,0, 'Thank you for rescuing me, $r. Please tell the king that I am back.', 12,0,100,0,0,0, 'Lurgglbr'); + -- cgit v1.2.3 From 4e1aae82b21d53e8b75a467f1bfb83b1627a5b87 Mon Sep 17 00:00:00 2001 From: Ricko92 Date: Sat, 16 Feb 2013 10:56:23 +0100 Subject: DB/SAI: Add script for Quergo's Gold Closes #1677 --- sql/updates/world/2013_02_16_03_world_sai.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 sql/updates/world/2013_02_16_03_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_16_03_world_sai.sql b/sql/updates/world/2013_02_16_03_world_sai.sql new file mode 100644 index 00000000000..fb89bf4ced0 --- /dev/null +++ b/sql/updates/world/2013_02_16_03_world_sai.sql @@ -0,0 +1,14 @@ +-- quest fix cuergo's gold (q2882) +SET @ENTRY :=7898; +UPDATE `creature_template` SET `AIName`= 'SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND`entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND`entryorguid`=@ENTRY*100; +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 +(@ENTRY,0,0,0,63,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Trigger - on respawn - run script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,300000,300000,11,11463,0,0,0,0,0,1,0,0,0,0,0,0,0,'Timed Actionscript - spawn pirate1'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,300000,300000,11,11463,0,0,0,0,0,1,0,0,0,0,0,0,0,'Timed Actionscript - spawn pirate2'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,300000,300000,11,11485,0,0,0,0,0,1,0,0,0,0,0,0,0,'Timed Actionscript - spawn buccaneer1'), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,300000,300000,11,11485,0,0,0,0,0,1,0,0,0,0,0,0,0,'Timed Actionscript - spawn buccaneer2'), +(@ENTRY*100,9,4,0,0,0,100,0,0,0,300000,300000,11,11487,0,0,0,0,0,1,0,0,0,0,0,0,0,'Timed Actionscript - spawn swashbuckler'), +(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Timed Actionscript - despawn trigger'); -- cgit v1.2.3 From 6141d38269d19b280def8203d5b35e65f1208b93 Mon Sep 17 00:00:00 2001 From: Exodius Date: Sat, 16 Feb 2013 11:10:08 +0100 Subject: DB/Loot: + Remove Zulian Mudskunk from Zulian Crocolisk loot template Closes #9169 + Add Vicious Oil to Vicous Oil Closes #9147 --- sql/updates/world/2013_02_16_04_world_creature_loot_template.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2013_02_16_04_world_creature_loot_template.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_16_04_world_creature_loot_template.sql b/sql/updates/world/2013_02_16_04_world_creature_loot_template.sql new file mode 100644 index 00000000000..6819b7aeb45 --- /dev/null +++ b/sql/updates/world/2013_02_16_04_world_creature_loot_template.sql @@ -0,0 +1,6 @@ +-- Remove Zulian Mudskunk from Zulian Crocolisk's loot template +DELETE FROM `creature_loot_template` WHERE `entry`=15043 and `item`=19975; +-- Add Vicious Oil (Item) into loot template of Vicious Oil (NPC) +DELETE FROM `creature_loot_template` WHERE `entry`=30325 and `item`=42640; +INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) values +(30325,42640,-100,1,0,1,1); -- cgit v1.2.3 From b7b7f964a390a76bd1577ccf1bd79f601df5ef7a Mon Sep 17 00:00:00 2001 From: dr-j Date: Sat, 16 Feb 2013 11:20:11 +0100 Subject: DB/Quests: Update Quest Requirements for To Bor'gorok Outpost, Quickly! Closes #9113 Fix Quest Grouping Add Quest Conditions for Hellscream's Champion Closes #9092 Fix SAI for Hugh Glass Closes #9097 --- .../world/2013_02_16_05_world_quest_template.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2013_02_16_05_world_quest_template.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_16_05_world_quest_template.sql b/sql/updates/world/2013_02_16_05_world_quest_template.sql new file mode 100644 index 00000000000..81a8e38f25d --- /dev/null +++ b/sql/updates/world/2013_02_16_05_world_quest_template.sql @@ -0,0 +1,17 @@ +-- Previous quest should be The Defense of Warsong Hold not To Conquest Hold, But Be Careful! +UPDATE `quest_template` SET `PrevQuestId`=11596 WHERE `Id`=12486; +-- Change grouping so Alliance and Horde quests are no longer in 1 group +UPDATE `quest_template` SET `ExclusiveGroup`=-12222 WHERE `Id` IN(12222,12223); +-- Hellscreams Champion requires some conditions to start the quest +UPDATE `quest_template` SET `ExclusiveGroup`=0,`NextQuestId`=0 WHERE `Id` IN(11652,11705,11722); +UPDATE `quest_template` SET `NextQuestId`=11709 WHERE `Id`=11705; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) AND `SourceEntry`=11916; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(20,0,11916,0,0,8,0,11652,0,0,0,0, '', 'Player must have completed The Plains of Nasam before been able to accept Hellscream''s Champion'), +(19,0,11916,0,0,8,0,11652,0,0,0,0, '', 'Player must have completed The Plains of Nasam before been able to accept Hellscream''s Champion'), +(20,0,11916,0,0,8,0,11705,0,0,0,0, '', 'Player must have completed The Foolish Endeavors before been able to accept Hellscream''s Champion'), +(19,0,11916,0,0,8,0,11705,0,0,0,0, '', 'Player must have completed The Foolish Endeavors before been able to accept Hellscream''s Champion'), +(20,0,11916,0,0,8,0,11722,0,0,0,0, '', 'Player must have completed The Trophies of Gammoth before been able to accept Hellscream''s Champion'), +(19,0,11916,0,0,8,0,11722,0,0,0,0, '', 'Player must have completed The Trophies of Gammoth before been able to accept Hellscream''s Champion'); +-- Fix SAI issue for Hugh Glass (wrong npcflag was set) +UPDATE `smart_scripts` SET `action_param1`=643 WHERE `entryorguid`=2648400 AND `source_type`=9 AND `id`=6; -- cgit v1.2.3 From e49aaab6f624d5d824e195c11ef3bd0e809d8460 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 17 Feb 2013 02:10:08 +0100 Subject: Scripts/Icecrown Citadel: Improvements to Shadowmourne quest line --- .../2013_02_17_00_world_spell_script_names.sql | 14 ++++ src/server/game/Entities/Unit/Unit.cpp | 42 ---------- src/server/game/Spells/SpellMgr.cpp | 2 +- .../IcecrownCitadel/boss_blood_queen_lana_thel.cpp | 53 +++++++------ .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 92 ++++++++++++---------- .../Northrend/IcecrownCitadel/icecrown_citadel.h | 1 + .../IcecrownCitadel/instance_icecrown_citadel.cpp | 2 +- src/server/scripts/Spells/spell_item.cpp | 61 ++++++++------ 8 files changed, 132 insertions(+), 135 deletions(-) create mode 100644 sql/updates/world/2013_02_17_00_world_spell_script_names.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_17_00_world_spell_script_names.sql b/sql/updates/world/2013_02_17_00_world_spell_script_names.sql new file mode 100644 index 00000000000..e47b22b1c6b --- /dev/null +++ b/sql/updates/world/2013_02_17_00_world_spell_script_names.sql @@ -0,0 +1,14 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sindragosa_frost_breath'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_unsated_craving'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(69649,'spell_sindragosa_frost_breath'), +(71056,'spell_sindragosa_frost_breath'), +(71057,'spell_sindragosa_frost_breath'), +(71058,'spell_sindragosa_frost_breath'), +(73061,'spell_sindragosa_frost_breath'), +(73062,'spell_sindragosa_frost_breath'), +(73063,'spell_sindragosa_frost_breath'), +(73064,'spell_sindragosa_frost_breath'), +(71168,'spell_item_unsated_craving'); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=71952; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0c51e0d15a9..9223dfad533 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8464,48 +8464,6 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg return false; break; } - // Shadow's Fate (Shadowmourne questline) - case 71169: - { - // Victim needs more checks so bugs, rats or summons can not be affected by the proc. - if (GetTypeId() != TYPEID_PLAYER || !victim || victim->GetTypeId() != TYPEID_UNIT || victim->GetCreatureType() == CREATURE_TYPE_CRITTER) - return false; - - Player* player = ToPlayer(); - if (player->GetQuestStatus(24547) == QUEST_STATUS_INCOMPLETE) - { - break; - } - else if (player->GetDifficulty(true) == RAID_DIFFICULTY_25MAN_NORMAL || player->GetDifficulty(true) == RAID_DIFFICULTY_25MAN_HEROIC) - { - uint32 spellId = 0; - uint32 questId = 0; - switch (victim->GetEntry()) - { - case 36678: // NPC: Professor Putricide - questId = 24749; // Quest: Unholy Infusion - spellId = 71516; // Spell: Shadow Infusion - break; - case 37955: // NPC: Blood-Queen Lana'thel - questId = 24756; // Quest: Blood Infusion - spellId = 72154; // Spell: Thirst Quenched - break; - case 36853: // NPC: Sindragosa - questId = 24757; // Quest: Frost Infusion - spellId = 72290; // Spell: Frost-Imbued Blade - break; - default: - return false; - } - - if (player->GetQuestStatus(questId) != QUEST_STATUS_INCOMPLETE || !player->HasAura(spellId)) - return false; - - break; - } - else - return false; - } } if (cooldown && GetTypeId() == TYPEID_PLAYER && ToPlayer()->HasSpellCooldown(trigger_spell_id)) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index b40943ff266..312189ffad8 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3475,7 +3475,7 @@ void SpellMgr::LoadDbcDataCorrections() case 71518: // Unholy Infusion Quest Credit (Professor Putricide) case 72934: // Blood Infusion Quest Credit (Blood-Queen Lana'thel) case 72289: // Frost Infusion Quest Credit (Sindragosa) - spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS; // another missing radius + spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS; // another missing radius break; case 71708: // Empowered Flare (Blood Prince Council) case 72785: // Empowered Flare (Blood Prince Council) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index ab0c44aa6d0..4b1ccabe682 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -45,11 +45,13 @@ enum Spells SPELL_SHROUD_OF_SORROW = 70986, SPELL_FRENZIED_BLOODTHIRST_VISUAL = 71949, SPELL_VAMPIRIC_BITE = 71726, + SPELL_VAMPIRIC_BITE_DUMMY = 71837, SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR = 70879, SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL = 70872, SPELL_FRENZIED_BLOODTHIRST = 70877, SPELL_UNCONTROLLABLE_FRENZY = 70923, - SPELL_PRESENCE_OF_THE_DARKFALLEN = 71952, + SPELL_PRESENCE_OF_THE_DARKFALLEN = 70994, + SPELL_PRESENCE_OF_THE_DARKFALLEN_2 = 71952, SPELL_BLOOD_MIRROR_DAMAGE = 70821, SPELL_BLOOD_MIRROR_VISUAL = 71510, SPELL_BLOOD_MIRROR_DUMMY = 70838, @@ -88,6 +90,7 @@ uint32 const vampireAuras[3][MAX_DIFFICULTY] = #define ESSENCE_OF_BLOOD_QUEEN_PLR RAID_MODE(70879, 71525, 71530, 71531) #define FRENZIED_BLOODTHIRST RAID_MODE(70877, 71474, 70877, 71474) #define DELIRIOUS_SLASH RAID_MODE(71623, 71624, 71625, 71626) +#define PRESENCE_OF_THE_DARKFALLEN RAID_MODE(70994, 71962, 71963, 71964) enum Events { @@ -220,6 +223,7 @@ class boss_blood_queen_lana_thel : public CreatureScript instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_BLOOD_MIRROR_DUMMY); instance->DoRemoveAurasDueToSpellOnPlayers(DELIRIOUS_SLASH); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_PACT_OF_THE_DARKFALLEN); + instance->DoRemoveAurasDueToSpellOnPlayers(PRESENCE_OF_THE_DARKFALLEN); } void DoAction(int32 const action) @@ -357,8 +361,11 @@ class boss_blood_queen_lana_thel : public CreatureScript { Unit* target = targets.front(); DoCast(target, SPELL_VAMPIRIC_BITE); + DoCastAOE(SPELL_VAMPIRIC_BITE_DUMMY, true); Talk(SAY_VAMPIRIC_BITE); _vampires.insert(target->GetGUID()); + target->CastSpell(target, SPELL_PRESENCE_OF_THE_DARKFALLEN, TRIGGERED_FULL_MASK); + target->CastSpell(target, SPELL_PRESENCE_OF_THE_DARKFALLEN_2, TRIGGERED_FULL_MASK); } break; } @@ -377,9 +384,10 @@ class boss_blood_queen_lana_thel : public CreatureScript _offtank->CastSpell(me->getVictim(), SPELL_BLOOD_MIRROR_DAMAGE, true); me->getVictim()->CastSpell(_offtank, SPELL_BLOOD_MIRROR_DUMMY, true); DoCastVictim(SPELL_BLOOD_MIRROR_VISUAL); - if (Item* shadowsEdge = _offtank->GetWeaponForAttack(BASE_ATTACK, true)) - if (!_offtank->HasAura(SPELL_THIRST_QUENCHED) && shadowsEdge->GetEntry() == ITEM_SHADOW_S_EDGE && !_offtank->HasAura(SPELL_GUSHING_WOUND)) - _offtank->CastSpell(_offtank, SPELL_GUSHING_WOUND, true); + if (Is25ManRaid() && _offtank->GetQuestStatus(QUEST_BLOOD_INFUSION) == QUEST_STATUS_INCOMPLETE && + _offtank->HasAura(SPELL_UNSATED_CRAVING) && !_offtank->HasAura(SPELL_THIRST_QUENCHED) && + !_offtank->HasAura(SPELL_GUSHING_WOUND)) + _offtank->CastSpell(_offtank, SPELL_GUSHING_WOUND, TRIGGERED_FULL_MASK); } } @@ -396,13 +404,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { std::list targets; SelectRandomTarget(false, &targets); - uint32 targetCount = 2; - // do not combine these checks! we want it incremented TWICE when both conditions are met - if (IsHeroic()) - ++targetCount; - if (Is25ManRaid()) - ++targetCount; - Trinity::Containers::RandomResizeList(targets, targetCount); + Trinity::Containers::RandomResizeList(targets, Is25ManRaid() ? 3 : 2); if (targets.size() > 1) { Talk(SAY_PACT_OF_THE_DARKFALLEN); @@ -554,33 +556,36 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_FRENZIED_BLOODTHIRST, GetCaster()); GetCaster()->RemoveAura(spellId, 0, 0, AURA_REMOVE_BY_ENEMY_SPELL); - GetCaster()->CastSpell(GetCaster(), SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, true); - // Presence of the Darkfallen buff on Blood-Queen - if (GetCaster()->GetMap()->IsHeroic()) - GetCaster()->CastSpell(GetCaster(), SPELL_PRESENCE_OF_THE_DARKFALLEN, true); + GetCaster()->CastSpell(GetCaster(), SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, TRIGGERED_FULL_MASK); + // Shadowmourne questline - if (GetCaster()->ToPlayer()->GetQuestStatus(QUEST_BLOOD_INFUSION) == QUEST_STATUS_INCOMPLETE) + if (Aura* aura = GetCaster()->GetAura(SPELL_GUSHING_WOUND)) { - if (Aura* aura = GetCaster()->GetAura(SPELL_GUSHING_WOUND)) + if (aura->GetStackAmount() == 3) { - if (aura->GetStackAmount() == 3) - { - GetCaster()->CastSpell(GetCaster(), SPELL_THIRST_QUENCHED, true); - GetCaster()->RemoveAura(aura); - } - else - GetCaster()->CastSpell(GetCaster(), SPELL_GUSHING_WOUND, true); + GetCaster()->CastSpell(GetCaster(), SPELL_THIRST_QUENCHED, TRIGGERED_FULL_MASK); + GetCaster()->RemoveAura(aura); } + else + GetCaster()->CastSpell(GetCaster(), SPELL_GUSHING_WOUND, TRIGGERED_FULL_MASK); } + if (InstanceScript* instance = GetCaster()->GetInstanceScript()) if (Creature* bloodQueen = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(DATA_BLOOD_QUEEN_LANA_THEL))) bloodQueen->AI()->SetGUID(GetHitUnit()->GetGUID(), GUID_VAMPIRE); } + void HandlePresence(SpellEffIndex /*effIndex*/) + { + GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PRESENCE_OF_THE_DARKFALLEN, TRIGGERED_FULL_MASK); + GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PRESENCE_OF_THE_DARKFALLEN_2, TRIGGERED_FULL_MASK); + } + void Register() { OnCheckCast += SpellCheckCastFn(spell_blood_queen_vampiric_bite_SpellScript::CheckTarget); BeforeHit += SpellHitFn(spell_blood_queen_vampiric_bite_SpellScript::OnCast); + OnEffectHitTarget += SpellEffectFn(spell_blood_queen_vampiric_bite_SpellScript::HandlePresence, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 1c6ed848158..5c7f575413a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -84,7 +84,9 @@ enum Spells SPELL_CONCUSSIVE_SHOCK = 71337, // Frost Infusion - SPELL_FROST_INFUSION_CREDIT = 72289 + SPELL_FROST_INFUSION_CREDIT = 72289, + SPELL_FROST_IMBUED_BLADE = 72290, + SPELL_FROST_INFUSION = 72292, }; enum Events @@ -147,11 +149,7 @@ enum MovementPoints enum Shadowmourne { - QUEST_FROST_INFUSION = 24757, - ITEM_SHADOW_S_EDGE = 49888, - - SPELL_FROST_INFUSION = 72292, - SPELL_FROST_IMBUED_BLADE = 72290, + QUEST_FROST_INFUSION = 24757 }; Position const RimefangFlyPos = {4413.309f, 2456.421f, 233.3795f, 2.890186f}; @@ -390,47 +388,10 @@ class boss_sindragosa : public CreatureScript void SpellHitTarget(Unit* target, SpellInfo const* spell) { if (uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(70127, me)) - { if (spellId == spell->Id) - { if (Aura const* mysticBuffet = target->GetAura(spell->Id)) _mysticBuffetStack = std::max(_mysticBuffetStack, mysticBuffet->GetStackAmount()); - return; - } - } - - // Frost Infusion - if (Player* player = target->ToPlayer()) - { - if (uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(_isThirdPhase ? SPELL_FROST_BREATH_P2 : SPELL_FROST_BREATH_P1, me)) - { - if (spellId == spell->Id) - { - Item* shadowsEdge = player->GetWeaponForAttack(BASE_ATTACK, true); - if (player->GetQuestStatus(QUEST_FROST_INFUSION) == QUEST_STATUS_INCOMPLETE && shadowsEdge) - { - if (!player->HasAura(SPELL_FROST_IMBUED_BLADE) && shadowsEdge->GetEntry() == ITEM_SHADOW_S_EDGE) - { - if (Aura* infusion = player->GetAura(SPELL_FROST_INFUSION)) - { - if (infusion->GetStackAmount() == 3) - { - player->CastSpell(player, SPELL_FROST_IMBUED_BLADE, true); - player->RemoveAura(infusion); - } - else - player->CastSpell(player, SPELL_FROST_INFUSION, true); - } - else - player->CastSpell(player, SPELL_FROST_INFUSION, true); - } - } - - return; - } - } - } } void UpdateAI(uint32 const diff) @@ -1155,6 +1116,50 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader } }; +class spell_sindragosa_frost_breath : public SpellScriptLoader +{ + public: + spell_sindragosa_frost_breath() : SpellScriptLoader("spell_sindragosa_frost_breath") { } + + class spell_sindragosa_frost_breath_SpellScript : public SpellScript + { + PrepareSpellScript(spell_sindragosa_frost_breath_SpellScript); + + void HandleInfusion() + { + Player* target = GetHitPlayer(); + if (!target) + return; + + if (target->GetQuestStatus(QUEST_FROST_INFUSION) != QUEST_STATUS_INCOMPLETE) + return; + + // Check if player has Shadow's Edge equipped and not ready for infusion + if (!target->HasAura(SPELL_UNSATED_CRAVING) || target->HasAura(SPELL_FROST_IMBUED_BLADE)) + return; + + Aura* infusion = target->GetAura(SPELL_FROST_INFUSION, target->GetGUID()); + if (infusion && infusion->GetStackAmount() >= 3) + { + target->RemoveAura(infusion); + target->CastSpell(target, SPELL_FROST_IMBUED_BLADE, TRIGGERED_FULL_MASK); + } + else + target->CastSpell(target, SPELL_FROST_INFUSION, TRIGGERED_FULL_MASK); + } + + void Register() + { + AfterHit += SpellHitFn(spell_sindragosa_frost_breath_SpellScript::HandleInfusion); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_sindragosa_frost_breath_SpellScript(); + } +}; + class spell_sindragosa_instability : public SpellScriptLoader { public: @@ -1577,6 +1582,7 @@ void AddSC_boss_sindragosa() new npc_sindragosa_trash(); new spell_sindragosa_s_fury(); new spell_sindragosa_unchained_magic(); + new spell_sindragosa_frost_breath(); new spell_sindragosa_instability(); new spell_sindragosa_frost_beacon(); new spell_sindragosa_ice_tomb(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 1407568686f..887a31baf9a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -56,6 +56,7 @@ enum SharedSpells SPELL_FROSTMOURNE_TELEPORT_VISUAL = 73078, // Shadowmourne questline + SPELL_UNSATED_CRAVING = 71168, SPELL_SHADOWS_FATE = 71169 }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 462708360e3..593d9586156 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -435,7 +435,7 @@ class instance_icecrown_citadel : public InstanceMapScript // these 2 gates are functional only on 25man modes case GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_01: case GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_04: - if (instance->GetSpawnMode() & 1) + if (instance->Is25ManRaid()) AddDoor(go, true); break; case GO_LADY_DEATHWHISPER_ELEVATOR: diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index d57ed6e126b..c9c75cdb134 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -813,53 +813,65 @@ class spell_item_scroll_of_recall : public SpellScriptLoader enum ShadowsFate { SPELL_SOUL_FEAST = 71203, - QUEST_A_FEAST_OF_SOULS = 24547 }; -class spell_item_shadows_fate : public SpellScriptLoader +class spell_item_unsated_craving : public SpellScriptLoader { public: - spell_item_shadows_fate() : SpellScriptLoader("spell_item_shadows_fate") { } + spell_item_unsated_craving() : SpellScriptLoader("spell_item_unsated_craving") { } - class spell_item_shadows_fate_AuraScript : public AuraScript + class spell_item_unsated_craving_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_shadows_fate_AuraScript); + PrepareAuraScript(spell_item_unsated_craving_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool CheckProc(ProcEventInfo& procInfo) { - if (!sSpellMgr->GetSpellInfo(SPELL_SOUL_FEAST)) + Unit* caster = procInfo.GetActor(); + if (!caster || caster->GetTypeId() != TYPEID_PLAYER) return false; - if (!sObjectMgr->GetQuestTemplate(QUEST_A_FEAST_OF_SOULS)) + + Unit* target = procInfo.GetActionTarget(); + if (!target || target->GetTypeId() != TYPEID_UNIT || target->GetCreatureType() == CREATURE_TYPE_CRITTER || target->isSummon()) return false; - return true; - } - bool Load() - { - _procTarget = NULL; return true; } - bool CheckProc(ProcEventInfo& /*eventInfo*/) + void Register() { - _procTarget = GetCaster(); - return _procTarget && _procTarget->GetTypeId() == TYPEID_PLAYER && _procTarget->ToPlayer()->GetQuestStatus(QUEST_A_FEAST_OF_SOULS) == QUEST_STATUS_INCOMPLETE; + DoCheckProc += AuraCheckProcFn(spell_item_unsated_craving_AuraScript::CheckProc); } + }; - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + AuraScript* GetAuraScript() const + { + return new spell_item_unsated_craving_AuraScript(); + } +}; + +class spell_item_shadows_fate : public SpellScriptLoader +{ + public: + spell_item_shadows_fate() : SpellScriptLoader("spell_item_shadows_fate") { } + + class spell_item_shadows_fate_AuraScript : public AuraScript + { + PrepareAuraScript(spell_item_shadows_fate_AuraScript); + + void HandleProc(ProcEventInfo& procInfo) { - PreventDefaultAction(); - GetTarget()->CastSpell(_procTarget, SPELL_SOUL_FEAST, true); + Unit* caster = procInfo.GetActor(); + Unit* target = GetCaster(); + if (!caster || !target) + return; + + caster->CastSpell(target, SPELL_SOUL_FEAST, TRIGGERED_FULL_MASK); } void Register() { - DoCheckProc += AuraCheckProcFn(spell_item_shadows_fate_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_shadows_fate_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnProc += AuraProcFn(spell_item_shadows_fate_AuraScript::HandleProc); } - - private: - Unit* _procTarget; }; AuraScript* GetAuraScript() const @@ -2481,6 +2493,7 @@ void AddSC_item_spell_scripts() new spell_item_piccolo_of_the_flaming_fire(); new spell_item_savory_deviate_delight(); new spell_item_scroll_of_recall(); + new spell_item_unsated_craving(); new spell_item_shadows_fate(); new spell_item_shadowmourne(); new spell_item_shadowmourne_soul_fragment(); -- cgit v1.2.3 From 37292a30385b51f45aba3a1c29ca9841cca6e14c Mon Sep 17 00:00:00 2001 From: Shocker Date: Sun, 17 Feb 2013 06:03:15 +0200 Subject: Remove BOM from 2 SQL files Closes #9233 --- sql/updates/world/2013_02_15_00_world_waypoint_data.sql | 2 +- sql/updates/world/2013_02_16_00_world_creature_template.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sql') diff --git a/sql/updates/world/2013_02_15_00_world_waypoint_data.sql b/sql/updates/world/2013_02_15_00_world_waypoint_data.sql index 555cbd506e8..8af0531b2f3 100644 --- a/sql/updates/world/2013_02_15_00_world_waypoint_data.sql +++ b/sql/updates/world/2013_02_15_00_world_waypoint_data.sql @@ -1,4 +1,4 @@ -SET @NPC_DRAKE := 29709; +SET @NPC_DRAKE := 29709; DELETE FROM `waypoint_data` WHERE `id`=@NPC_DRAKE; INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES diff --git a/sql/updates/world/2013_02_16_00_world_creature_template.sql b/sql/updates/world/2013_02_16_00_world_creature_template.sql index 7fa6e727ab0..d8efe46b573 100644 --- a/sql/updates/world/2013_02_16_00_world_creature_template.sql +++ b/sql/updates/world/2013_02_16_00_world_creature_template.sql @@ -1 +1 @@ -UPDATE `creature_template` SET `Armor_mod`=0 WHERE `entry`=29747; +UPDATE `creature_template` SET `Armor_mod`=0 WHERE `entry`=29747; -- cgit v1.2.3 From fab33f077436a958234f3f11f0cffc92a968660a Mon Sep 17 00:00:00 2001 From: Nay Date: Sun, 17 Feb 2013 21:11:45 +0000 Subject: SQLs: Rename some old SQL files to match standards --- sql/old/3.3.5a/09521_character_achievement.sql | 2 - .../09521_characters_character_achievement.sql | 2 + sql/old/3.3.5a/2011_04_14_00_characters.sql | 29 - sql/old/3.3.5a/2011_04_14_00_characters_misc.sql | 29 + sql/old/3.3.5a/2011_04_19_00_characters.sql | 41 -- sql/old/3.3.5a/2011_04_19_00_characters_misc.sql | 41 ++ .../3.3.5a/2012_04_20_05_gameobject_template.sql | 8 - .../2012_04_20_05_world_gameobject_template.sql | 8 + .../2012_07_01_01_achievement_criteria_data.sql | 6 - ...12_07_01_01_world_achievement_criteria_data.sql | 6 + sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql | 1 - sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql | 1 + .../3.3.5a/2012_10_17_00_character_gm_tickets.sql | 3 - .../3.3.5a/2012_10_17_00_characters_gm_tickets.sql | 3 + sql/old/3.3.5a/2012_11_02_00_character_misc.sql | 29 - sql/old/3.3.5a/2012_11_02_00_characters_misc.sql | 29 + .../3.3.5a/2012_11_18_00_character_calendar.sql | 26 - .../3.3.5a/2012_11_18_00_characters_calendar.sql | 26 + ..._00_character_character_queststatus_monthly.sql | 8 - ...00_characters_character_queststatus_monthly.sql | 8 + sql/old/3.3.5a/2012_12_13_00_world.sql | 4 - sql/old/3.3.5a/2012_12_13_00_world_misc.sql | 4 + .../3.3.5a/2012_12_18_00_character_worldstates.sql | 4 - .../2012_12_18_00_characters_worldstates.sql | 4 + .../3.3.5a/2013_01_01_00_item_template_restore.sql | 646 --------------------- .../2013_01_01_00_world_item_template_restore.sql | 646 +++++++++++++++++++++ sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql | 27 - .../3.3.5a/2013_01_02_05_world_eye_of_eternity.sql | 27 + 28 files changed, 834 insertions(+), 834 deletions(-) delete mode 100644 sql/old/3.3.5a/09521_character_achievement.sql create mode 100644 sql/old/3.3.5a/09521_characters_character_achievement.sql delete mode 100644 sql/old/3.3.5a/2011_04_14_00_characters.sql create mode 100644 sql/old/3.3.5a/2011_04_14_00_characters_misc.sql delete mode 100644 sql/old/3.3.5a/2011_04_19_00_characters.sql create mode 100644 sql/old/3.3.5a/2011_04_19_00_characters_misc.sql delete mode 100644 sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql create mode 100644 sql/old/3.3.5a/2012_04_20_05_world_gameobject_template.sql delete mode 100644 sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql create mode 100644 sql/old/3.3.5a/2012_07_01_01_world_achievement_criteria_data.sql delete mode 100644 sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql create mode 100644 sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql delete mode 100644 sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql create mode 100644 sql/old/3.3.5a/2012_10_17_00_characters_gm_tickets.sql delete mode 100644 sql/old/3.3.5a/2012_11_02_00_character_misc.sql create mode 100644 sql/old/3.3.5a/2012_11_02_00_characters_misc.sql delete mode 100644 sql/old/3.3.5a/2012_11_18_00_character_calendar.sql create mode 100644 sql/old/3.3.5a/2012_11_18_00_characters_calendar.sql delete mode 100644 sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql create mode 100644 sql/old/3.3.5a/2012_12_03_00_characters_character_queststatus_monthly.sql delete mode 100644 sql/old/3.3.5a/2012_12_13_00_world.sql create mode 100644 sql/old/3.3.5a/2012_12_13_00_world_misc.sql delete mode 100644 sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql create mode 100644 sql/old/3.3.5a/2012_12_18_00_characters_worldstates.sql delete mode 100644 sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql create mode 100644 sql/old/3.3.5a/2013_01_01_00_world_item_template_restore.sql delete mode 100644 sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql create mode 100644 sql/old/3.3.5a/2013_01_02_05_world_eye_of_eternity.sql (limited to 'sql') diff --git a/sql/old/3.3.5a/09521_character_achievement.sql b/sql/old/3.3.5a/09521_character_achievement.sql deleted file mode 100644 index e8262aed4ad..00000000000 --- a/sql/old/3.3.5a/09521_character_achievement.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM character_achievement WHERE `achievement` IN (3812,3916,3917,3918,3799,3797,3813,3814,3798,3815,3996,3997,3800,3816,3937,3936,3817,3818,3819,3808,3809,3810,4078,4079,4156,4080); -DELETE FROM character_achievement_progress WHERE `criteria` IN (11542,11546,11547,11549,11678,11679,11680,11681,11682,11683,11684,11685,11686,11687,11688,11689,11690,11691,11692,11693,11778,11779,11780,11799,11800,11801,11802,11803,11804,11818,11838,11839,11860,11861,11862,12116,12198,12258,12278,12279,12280,12281,12338,12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12358,12359,12360); diff --git a/sql/old/3.3.5a/09521_characters_character_achievement.sql b/sql/old/3.3.5a/09521_characters_character_achievement.sql new file mode 100644 index 00000000000..e8262aed4ad --- /dev/null +++ b/sql/old/3.3.5a/09521_characters_character_achievement.sql @@ -0,0 +1,2 @@ +DELETE FROM character_achievement WHERE `achievement` IN (3812,3916,3917,3918,3799,3797,3813,3814,3798,3815,3996,3997,3800,3816,3937,3936,3817,3818,3819,3808,3809,3810,4078,4079,4156,4080); +DELETE FROM character_achievement_progress WHERE `criteria` IN (11542,11546,11547,11549,11678,11679,11680,11681,11682,11683,11684,11685,11686,11687,11688,11689,11690,11691,11692,11693,11778,11779,11780,11799,11800,11801,11802,11803,11804,11818,11838,11839,11860,11861,11862,12116,12198,12258,12278,12279,12280,12281,12338,12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12358,12359,12360); diff --git a/sql/old/3.3.5a/2011_04_14_00_characters.sql b/sql/old/3.3.5a/2011_04_14_00_characters.sql deleted file mode 100644 index ab9bd93419d..00000000000 --- a/sql/old/3.3.5a/2011_04_14_00_characters.sql +++ /dev/null @@ -1,29 +0,0 @@ -ALTER TABLE corpse - DROP PRIMARY KEY, - DROP KEY `idx_type`, - DROP KEY `instance`, - DROP KEY `Idx_player`, - DROP KEY `Idx_time`; - -ALTER TABLE corpse - ADD PRIMARY KEY (`corpseGuid`), - ADD KEY `idx_type`(`corpseType`), - ADD KEY `idx_instance`(`instanceId`), - ADD KEY `idx_player`(`guid`), - ADD KEY `idx_time`(`time`); - -ALTER TABLE creature_respawn - DROP PRIMARY KEY, - DROP KEY `instance`; - -ALTER TABLE creature_respawn - ADD PRIMARY KEY (`guid`, `instanceId`), - ADD KEY `idx_instance`(`instanceId`); - -ALTER TABLE gameobject_respawn - DROP PRIMARY KEY, - DROP KEY `instance`; - -ALTER TABLE gameobject_respawn - ADD PRIMARY KEY (`guid`, `instanceId`), - ADD KEY `idx_instance`(`instanceId`); diff --git a/sql/old/3.3.5a/2011_04_14_00_characters_misc.sql b/sql/old/3.3.5a/2011_04_14_00_characters_misc.sql new file mode 100644 index 00000000000..ab9bd93419d --- /dev/null +++ b/sql/old/3.3.5a/2011_04_14_00_characters_misc.sql @@ -0,0 +1,29 @@ +ALTER TABLE corpse + DROP PRIMARY KEY, + DROP KEY `idx_type`, + DROP KEY `instance`, + DROP KEY `Idx_player`, + DROP KEY `Idx_time`; + +ALTER TABLE corpse + ADD PRIMARY KEY (`corpseGuid`), + ADD KEY `idx_type`(`corpseType`), + ADD KEY `idx_instance`(`instanceId`), + ADD KEY `idx_player`(`guid`), + ADD KEY `idx_time`(`time`); + +ALTER TABLE creature_respawn + DROP PRIMARY KEY, + DROP KEY `instance`; + +ALTER TABLE creature_respawn + ADD PRIMARY KEY (`guid`, `instanceId`), + ADD KEY `idx_instance`(`instanceId`); + +ALTER TABLE gameobject_respawn + DROP PRIMARY KEY, + DROP KEY `instance`; + +ALTER TABLE gameobject_respawn + ADD PRIMARY KEY (`guid`, `instanceId`), + ADD KEY `idx_instance`(`instanceId`); diff --git a/sql/old/3.3.5a/2011_04_19_00_characters.sql b/sql/old/3.3.5a/2011_04_19_00_characters.sql deleted file mode 100644 index 96536d67a03..00000000000 --- a/sql/old/3.3.5a/2011_04_19_00_characters.sql +++ /dev/null @@ -1,41 +0,0 @@ -ALTER TABLE gm_subsurveys - CHANGE `surveyid` `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT, - CHANGE `subsurveyid` `subsurveyId` int(10) unsigned NOT NULL DEFAULT '0'; - -ALTER TABLE gm_subsurveys - DROP PRIMARY KEY, - ADD PRIMARY KEY(`surveyId`,`subsurveyId`); - -ALTER TABLE gm_surveys - CHANGE `surveyid` `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT, - CHANGE `player` `guid` int(10) unsigned NOT NULL DEFAULT '0', - CHANGE `overall_comment` `overallComment` longtext NOT NULL, - CHANGE `timestamp` `createTime` int(10) unsigned NOT NULL DEFAULT '0'; - -ALTER TABLE gm_surveys - DROP PRIMARY KEY, - ADD PRIMARY KEY (`surveyId`); - -ALTER TABLE gm_tickets - CHANGE `guid` `ticketId` int(10) unsigned NOT NULL AUTO_INCREMENT, - CHANGE `playerGuid` `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator', - CHANGE `name` `name` varchar(12) NOT NULL COMMENT 'Name of ticket creator', - CHANGE `createtime` `createTime` int(10) unsigned NOT NULL DEFAULT '0', - CHANGE `map` `mapId` smallint(5) unsigned NOT NULL DEFAULT '0', - CHANGE `timestamp` `lastModifiedTime` int(10) unsigned NOT NULL DEFAULT '0', - CHANGE `closed` `closedBy` int(10) NOT NULL DEFAULT '0', - CHANGE `assignedto` `assignedTo` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned'; - -ALTER TABLE gm_tickets - DROP PRIMARY KEY, - ADD PRIMARY KEY (`ticketId`); - -ALTER TABLE lag_reports - CHANGE `report_id` `reportId` int(10) unsigned NOT NULL AUTO_INCREMENT, - CHANGE `player` `guid` int(10) unsigned NOT NULL DEFAULT '0', - CHANGE `lag_type` `lagType` tinyint(3) unsigned NOT NULL DEFAULT '0', - CHANGE `map` `mapId` smallint(5) unsigned NOT NULL DEFAULT '0'; - -ALTER TABLE lag_reports - DROP PRIMARY KEY, - ADD PRIMARY KEY (`reportId`); diff --git a/sql/old/3.3.5a/2011_04_19_00_characters_misc.sql b/sql/old/3.3.5a/2011_04_19_00_characters_misc.sql new file mode 100644 index 00000000000..96536d67a03 --- /dev/null +++ b/sql/old/3.3.5a/2011_04_19_00_characters_misc.sql @@ -0,0 +1,41 @@ +ALTER TABLE gm_subsurveys + CHANGE `surveyid` `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT, + CHANGE `subsurveyid` `subsurveyId` int(10) unsigned NOT NULL DEFAULT '0'; + +ALTER TABLE gm_subsurveys + DROP PRIMARY KEY, + ADD PRIMARY KEY(`surveyId`,`subsurveyId`); + +ALTER TABLE gm_surveys + CHANGE `surveyid` `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT, + CHANGE `player` `guid` int(10) unsigned NOT NULL DEFAULT '0', + CHANGE `overall_comment` `overallComment` longtext NOT NULL, + CHANGE `timestamp` `createTime` int(10) unsigned NOT NULL DEFAULT '0'; + +ALTER TABLE gm_surveys + DROP PRIMARY KEY, + ADD PRIMARY KEY (`surveyId`); + +ALTER TABLE gm_tickets + CHANGE `guid` `ticketId` int(10) unsigned NOT NULL AUTO_INCREMENT, + CHANGE `playerGuid` `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator', + CHANGE `name` `name` varchar(12) NOT NULL COMMENT 'Name of ticket creator', + CHANGE `createtime` `createTime` int(10) unsigned NOT NULL DEFAULT '0', + CHANGE `map` `mapId` smallint(5) unsigned NOT NULL DEFAULT '0', + CHANGE `timestamp` `lastModifiedTime` int(10) unsigned NOT NULL DEFAULT '0', + CHANGE `closed` `closedBy` int(10) NOT NULL DEFAULT '0', + CHANGE `assignedto` `assignedTo` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned'; + +ALTER TABLE gm_tickets + DROP PRIMARY KEY, + ADD PRIMARY KEY (`ticketId`); + +ALTER TABLE lag_reports + CHANGE `report_id` `reportId` int(10) unsigned NOT NULL AUTO_INCREMENT, + CHANGE `player` `guid` int(10) unsigned NOT NULL DEFAULT '0', + CHANGE `lag_type` `lagType` tinyint(3) unsigned NOT NULL DEFAULT '0', + CHANGE `map` `mapId` smallint(5) unsigned NOT NULL DEFAULT '0'; + +ALTER TABLE lag_reports + DROP PRIMARY KEY, + ADD PRIMARY KEY (`reportId`); diff --git a/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql b/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql deleted file mode 100644 index 24400b16a5c..00000000000 --- a/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Restore horrible mistake in UP34 from myself -UPDATE `gameobject_template` SET `data1`=27512 WHERE `entry`=195669; -UPDATE `gameobject_template` SET `data1`=27517 WHERE `entry`=195670; -UPDATE `gameobject_template` SET `data1`=27518 WHERE `entry`=195671; --- Fix loottemplates along with it -UPDATE `gameobject_loot_template` SET `entry`=27512 WHERE `entry`=195669; -UPDATE `gameobject_loot_template` SET `entry`=27517 WHERE `entry`=195670; -UPDATE `gameobject_loot_template` SET `entry`=27518 WHERE `entry`=195671; diff --git a/sql/old/3.3.5a/2012_04_20_05_world_gameobject_template.sql b/sql/old/3.3.5a/2012_04_20_05_world_gameobject_template.sql new file mode 100644 index 00000000000..24400b16a5c --- /dev/null +++ b/sql/old/3.3.5a/2012_04_20_05_world_gameobject_template.sql @@ -0,0 +1,8 @@ +-- Restore horrible mistake in UP34 from myself +UPDATE `gameobject_template` SET `data1`=27512 WHERE `entry`=195669; +UPDATE `gameobject_template` SET `data1`=27517 WHERE `entry`=195670; +UPDATE `gameobject_template` SET `data1`=27518 WHERE `entry`=195671; +-- Fix loottemplates along with it +UPDATE `gameobject_loot_template` SET `entry`=27512 WHERE `entry`=195669; +UPDATE `gameobject_loot_template` SET `entry`=27517 WHERE `entry`=195670; +UPDATE `gameobject_loot_template` SET `entry`=27518 WHERE `entry`=195671; diff --git a/sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql deleted file mode 100644 index e1c0529fffe..00000000000 --- a/sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM `disables` WHERE `entry` IN (7626,7634) AND `sourceType`=4; - -DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (7626,7634); -INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES -(7626, 11, 0, 0, 'achievement_not_even_a_scratch'), -(7634, 11, 0, 0, 'achievement_not_even_a_scratch'); diff --git a/sql/old/3.3.5a/2012_07_01_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_07_01_01_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..e1c0529fffe --- /dev/null +++ b/sql/old/3.3.5a/2012_07_01_01_world_achievement_criteria_data.sql @@ -0,0 +1,6 @@ +DELETE FROM `disables` WHERE `entry` IN (7626,7634) AND `sourceType`=4; + +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (7626,7634); +INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES +(7626, 11, 0, 0, 'achievement_not_even_a_scratch'), +(7634, 11, 0, 0, 'achievement_not_even_a_scratch'); diff --git a/sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql b/sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql deleted file mode 100644 index b90fa7d7682..00000000000 --- a/sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE character_glyphs CHANGE glyph1 glyph1 smallint(5) unsigned DEFAULT '0'; diff --git a/sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql b/sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql new file mode 100644 index 00000000000..b90fa7d7682 --- /dev/null +++ b/sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql @@ -0,0 +1 @@ +ALTER TABLE character_glyphs CHANGE glyph1 glyph1 smallint(5) unsigned DEFAULT '0'; diff --git a/sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql b/sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql deleted file mode 100644 index affb23f836c..00000000000 --- a/sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE `gm_tickets` - ADD COLUMN `response` text NOT NULL AFTER `comment`, - ADD COLUMN `haveTicket` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `viewed`; diff --git a/sql/old/3.3.5a/2012_10_17_00_characters_gm_tickets.sql b/sql/old/3.3.5a/2012_10_17_00_characters_gm_tickets.sql new file mode 100644 index 00000000000..affb23f836c --- /dev/null +++ b/sql/old/3.3.5a/2012_10_17_00_characters_gm_tickets.sql @@ -0,0 +1,3 @@ +ALTER TABLE `gm_tickets` + ADD COLUMN `response` text NOT NULL AFTER `comment`, + ADD COLUMN `haveTicket` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `viewed`; diff --git a/sql/old/3.3.5a/2012_11_02_00_character_misc.sql b/sql/old/3.3.5a/2012_11_02_00_character_misc.sql deleted file mode 100644 index 9cbbd423bb8..00000000000 --- a/sql/old/3.3.5a/2012_11_02_00_character_misc.sql +++ /dev/null @@ -1,29 +0,0 @@ -CREATE TABLE IF NOT EXISTS `guild_member_withdraw` ( - `guid` int(10) unsigned NOT NULL, - `tab0` int(10) unsigned NOT NULL DEFAULT '0', - `tab1` int(10) unsigned NOT NULL DEFAULT '0', - `tab2` int(10) unsigned NOT NULL DEFAULT '0', - `tab3` int(10) unsigned NOT NULL DEFAULT '0', - `tab4` int(10) unsigned NOT NULL DEFAULT '0', - `tab5` int(10) unsigned NOT NULL DEFAULT '0', - `money` int(10) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`guid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild Member Daily Withdraws'; - -ALTER TABLE `guild_member` DROP COLUMN `BankRemMoney`; -ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab0`; -ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab1`; -ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab2`; -ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab3`; -ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab4`; -ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab5`; -ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeMoney`; -ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab0`; -ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab1`; -ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab2`; -ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab3`; -ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab4`; -ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab5`; - -DELETE FROM `worldstates` WHERE `entry`=20006; -INSERT INTO `worldstates` (`entry`,`value`,`comment`) VALUES (20006,0, 'Guild daily reset'); diff --git a/sql/old/3.3.5a/2012_11_02_00_characters_misc.sql b/sql/old/3.3.5a/2012_11_02_00_characters_misc.sql new file mode 100644 index 00000000000..9cbbd423bb8 --- /dev/null +++ b/sql/old/3.3.5a/2012_11_02_00_characters_misc.sql @@ -0,0 +1,29 @@ +CREATE TABLE IF NOT EXISTS `guild_member_withdraw` ( + `guid` int(10) unsigned NOT NULL, + `tab0` int(10) unsigned NOT NULL DEFAULT '0', + `tab1` int(10) unsigned NOT NULL DEFAULT '0', + `tab2` int(10) unsigned NOT NULL DEFAULT '0', + `tab3` int(10) unsigned NOT NULL DEFAULT '0', + `tab4` int(10) unsigned NOT NULL DEFAULT '0', + `tab5` int(10) unsigned NOT NULL DEFAULT '0', + `money` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`guid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild Member Daily Withdraws'; + +ALTER TABLE `guild_member` DROP COLUMN `BankRemMoney`; +ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab0`; +ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab1`; +ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab2`; +ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab3`; +ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab4`; +ALTER TABLE `guild_member` DROP COLUMN `BankRemSlotsTab5`; +ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeMoney`; +ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab0`; +ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab1`; +ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab2`; +ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab3`; +ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab4`; +ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab5`; + +DELETE FROM `worldstates` WHERE `entry`=20006; +INSERT INTO `worldstates` (`entry`,`value`,`comment`) VALUES (20006,0, 'Guild daily reset'); diff --git a/sql/old/3.3.5a/2012_11_18_00_character_calendar.sql b/sql/old/3.3.5a/2012_11_18_00_character_calendar.sql deleted file mode 100644 index a3e7c352788..00000000000 --- a/sql/old/3.3.5a/2012_11_18_00_character_calendar.sql +++ /dev/null @@ -1,26 +0,0 @@ -DROP TABLE IF EXISTS `calendar_events`; -CREATE TABLE IF NOT EXISTS `calendar_events` ( - `id` bigint(20) unsigned NOT NULL DEFAULT '0', - `creator` int(10) unsigned NOT NULL DEFAULT '0', - `title` varchar(255) NOT NULL DEFAULT '', - `description` varchar(255) NOT NULL DEFAULT '', - `type` tinyint(1) unsigned NOT NULL DEFAULT '4', - `dungeon` int(10) NOT NULL DEFAULT '-1', - `eventtime` int(10) unsigned NOT NULL DEFAULT '0', - `flags` int(10) unsigned NOT NULL DEFAULT '0', - `time2` int(10) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -DROP TABLE IF EXISTS `calendar_invites`; -CREATE TABLE IF NOT EXISTS `calendar_invites` ( - `id` bigint(20) unsigned NOT NULL DEFAULT '0', - `event` bigint(20) unsigned NOT NULL DEFAULT '0', - `invitee` int(10) unsigned NOT NULL DEFAULT '0', - `sender` int(10) unsigned NOT NULL DEFAULT '0', - `status` tinyint(1) unsigned NOT NULL DEFAULT '0', - `statustime` int(10) unsigned NOT NULL DEFAULT '0', - `rank` tinyint(1) unsigned NOT NULL DEFAULT '0', - `text` varchar(255) NOT NULL DEFAULT '', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/sql/old/3.3.5a/2012_11_18_00_characters_calendar.sql b/sql/old/3.3.5a/2012_11_18_00_characters_calendar.sql new file mode 100644 index 00000000000..a3e7c352788 --- /dev/null +++ b/sql/old/3.3.5a/2012_11_18_00_characters_calendar.sql @@ -0,0 +1,26 @@ +DROP TABLE IF EXISTS `calendar_events`; +CREATE TABLE IF NOT EXISTS `calendar_events` ( + `id` bigint(20) unsigned NOT NULL DEFAULT '0', + `creator` int(10) unsigned NOT NULL DEFAULT '0', + `title` varchar(255) NOT NULL DEFAULT '', + `description` varchar(255) NOT NULL DEFAULT '', + `type` tinyint(1) unsigned NOT NULL DEFAULT '4', + `dungeon` int(10) NOT NULL DEFAULT '-1', + `eventtime` int(10) unsigned NOT NULL DEFAULT '0', + `flags` int(10) unsigned NOT NULL DEFAULT '0', + `time2` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `calendar_invites`; +CREATE TABLE IF NOT EXISTS `calendar_invites` ( + `id` bigint(20) unsigned NOT NULL DEFAULT '0', + `event` bigint(20) unsigned NOT NULL DEFAULT '0', + `invitee` int(10) unsigned NOT NULL DEFAULT '0', + `sender` int(10) unsigned NOT NULL DEFAULT '0', + `status` tinyint(1) unsigned NOT NULL DEFAULT '0', + `statustime` int(10) unsigned NOT NULL DEFAULT '0', + `rank` tinyint(1) unsigned NOT NULL DEFAULT '0', + `text` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql b/sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql deleted file mode 100644 index 256bb1f7ad6..00000000000 --- a/sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql +++ /dev/null @@ -1,8 +0,0 @@ -DROP TABLE IF EXISTS `character_queststatus_monthly`; - -CREATE TABLE IF NOT EXISTS `character_queststatus_monthly` ( - `guid` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier', - `quest` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Quest Identifier', - PRIMARY KEY (`guid`,`quest`), - KEY `idx_guid` (`guid`) -) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Player System'; diff --git a/sql/old/3.3.5a/2012_12_03_00_characters_character_queststatus_monthly.sql b/sql/old/3.3.5a/2012_12_03_00_characters_character_queststatus_monthly.sql new file mode 100644 index 00000000000..256bb1f7ad6 --- /dev/null +++ b/sql/old/3.3.5a/2012_12_03_00_characters_character_queststatus_monthly.sql @@ -0,0 +1,8 @@ +DROP TABLE IF EXISTS `character_queststatus_monthly`; + +CREATE TABLE IF NOT EXISTS `character_queststatus_monthly` ( + `guid` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier', + `quest` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Quest Identifier', + PRIMARY KEY (`guid`,`quest`), + KEY `idx_guid` (`guid`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Player System'; diff --git a/sql/old/3.3.5a/2012_12_13_00_world.sql b/sql/old/3.3.5a/2012_12_13_00_world.sql deleted file mode 100644 index ab27796f933..00000000000 --- a/sql/old/3.3.5a/2012_12_13_00_world.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `creature_classlevelstats` ADD PRIMARY KEY (`level`, `class`); -ALTER TABLE `playercreateinfo_item` ADD PRIMARY KEY (`race`, `class`, `itemid`); -- already got (race, class) index -ALTER TABLE `spell_enchant_proc_data` ADD PRIMARY KEY (`entry`); -ALTER TABLE `version` ADD PRIMARY KEY (`core_version`); diff --git a/sql/old/3.3.5a/2012_12_13_00_world_misc.sql b/sql/old/3.3.5a/2012_12_13_00_world_misc.sql new file mode 100644 index 00000000000..ab27796f933 --- /dev/null +++ b/sql/old/3.3.5a/2012_12_13_00_world_misc.sql @@ -0,0 +1,4 @@ +ALTER TABLE `creature_classlevelstats` ADD PRIMARY KEY (`level`, `class`); +ALTER TABLE `playercreateinfo_item` ADD PRIMARY KEY (`race`, `class`, `itemid`); -- already got (race, class) index +ALTER TABLE `spell_enchant_proc_data` ADD PRIMARY KEY (`entry`); +ALTER TABLE `version` ADD PRIMARY KEY (`core_version`); diff --git a/sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql b/sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql deleted file mode 100644 index 98fabde6776..00000000000 --- a/sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql +++ /dev/null @@ -1,4 +0,0 @@ -DELETE FROM `worldstates` WHERE `entry` IN (20004,20007); -INSERT INTO `worldstates` (`entry`, `value`, `comment`) VALUES -(20004,0,'CleaningFlags'), -(20007,0,'NextMonthlyQuestResetTime'); diff --git a/sql/old/3.3.5a/2012_12_18_00_characters_worldstates.sql b/sql/old/3.3.5a/2012_12_18_00_characters_worldstates.sql new file mode 100644 index 00000000000..98fabde6776 --- /dev/null +++ b/sql/old/3.3.5a/2012_12_18_00_characters_worldstates.sql @@ -0,0 +1,4 @@ +DELETE FROM `worldstates` WHERE `entry` IN (20004,20007); +INSERT INTO `worldstates` (`entry`, `value`, `comment`) VALUES +(20004,0,'CleaningFlags'), +(20007,0,'NextMonthlyQuestResetTime'); diff --git a/sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql b/sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql deleted file mode 100644 index dc18ff71fe8..00000000000 --- a/sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql +++ /dev/null @@ -1,646 +0,0 @@ -UPDATE `item_template` SET `armor`=2163 WHERE `entry`=1169; -UPDATE `item_template` SET `armor`=278 WHERE `entry`=1717; -UPDATE `item_template` SET `armor`=131 WHERE `entry`=3835; -UPDATE `item_template` SET `armor`=358 WHERE `entry`=3844; -UPDATE `item_template` SET `armor`=1101 WHERE `entry`=4070; -UPDATE `item_template` SET `armor`=513 WHERE `entry`=6447; -UPDATE `item_template` SET `armor`=775 WHERE `entry`=6725; -UPDATE `item_template` SET `armor`=198 WHERE `entry`=6731; -UPDATE `item_template` SET `armor`=234 WHERE `entry`=6742; -UPDATE `item_template` SET `armor`=311 WHERE `entry`=6907; -UPDATE `item_template` SET `armor`=363 WHERE `entry`=7919; -UPDATE `item_template` SET `armor`=502 WHERE `entry`=7921; -UPDATE `item_template` SET `armor`=421 WHERE `entry`=7922; -UPDATE `item_template` SET `armor`=536 WHERE `entry`=7930; -UPDATE `item_template` SET `armor`=382 WHERE `entry`=7933; -UPDATE `item_template` SET `armor`=469 WHERE `entry`=7934; -UPDATE `item_template` SET `armor`=341 WHERE `entry`=7963; -UPDATE `item_template` SET `armor`=165 WHERE `entry`=9409; -UPDATE `item_template` SET `armor`=391 WHERE `entry`=9625; -UPDATE `item_template` SET `armor`=193 WHERE `entry`=10783; -UPDATE `item_template` SET `armor`=817 WHERE `entry`=11604; -UPDATE `item_template` SET `armor`=514 WHERE `entry`=11605; -UPDATE `item_template` SET `armor`=433 WHERE `entry`=11606; -UPDATE `item_template` SET `armor`=1903 WHERE `entry`=11631; -UPDATE `item_template` SET `armor`=50 WHERE `entry`=11669; -UPDATE `item_template` SET `armor`=484 WHERE `entry`=11703; -UPDATE `item_template` SET `armor`=742 WHERE `entry`=11927; -UPDATE `item_template` SET `armor`=150 WHERE `entry`=12544; -UPDATE `item_template` SET `armor`=190 WHERE `entry`=12551; -UPDATE `item_template` SET `armor`=553 WHERE `entry`=12557; -UPDATE `item_template` SET `armor`=527 WHERE `entry`=12610; -UPDATE `item_template` SET `armor`=492 WHERE `entry`=12611; -UPDATE `item_template` SET `armor`=621 WHERE `entry`=12612; -UPDATE `item_template` SET `armor`=738 WHERE `entry`=12613; -UPDATE `item_template` SET `armor`=665 WHERE `entry`=12614; -UPDATE `item_template` SET `armor`=629 WHERE `entry`=12633; -UPDATE `item_template` SET `armor`=611 WHERE `entry`=12641; -UPDATE `item_template` SET `armor`=711 WHERE `entry`=13079; -UPDATE `item_template` SET `armor`=185 WHERE `entry`=13252; -UPDATE `item_template` SET `armor`=207 WHERE `entry`=13258; -UPDATE `item_template` SET `armor`=519 WHERE `entry`=13502; -UPDATE `item_template` SET `armor`=688 WHERE `entry`=13955; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=35496; -UPDATE `item_template` SET `armor`=268 WHERE `entry`=15053; -UPDATE `item_template` SET `armor`=204 WHERE `entry`=15054; -UPDATE `item_template` SET `armor`=167 WHERE `entry`=15055; -UPDATE `item_template` SET `armor`=807 WHERE `entry`=15413; -UPDATE `item_template` SET `armor`=96 WHERE `entry`=16341; -UPDATE `item_template` SET `armor`=115 WHERE `entry`=16342; -UPDATE `item_template` SET `armor`=125 WHERE `entry`=16437; -UPDATE `item_template` SET `armor`=118 WHERE `entry`=16440; -UPDATE `item_template` SET `armor`=175 WHERE `entry`=16441; -UPDATE `item_template` SET `armor`=169 WHERE `entry`=16442; -UPDATE `item_template` SET `armor`=199 WHERE `entry`=16443; -UPDATE `item_template` SET `armor`=147 WHERE `entry`=16444; -UPDATE `item_template` SET `armor`=207 WHERE `entry`=16446; -UPDATE `item_template` SET `armor`=192 WHERE `entry`=16448; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=16449; -UPDATE `item_template` SET `armor`=242 WHERE `entry`=16450; -UPDATE `item_template` SET `armor`=234 WHERE `entry`=16451; -UPDATE `item_template` SET `armor`=291 WHERE `entry`=16452; -UPDATE `item_template` SET `armor`=291 WHERE `entry`=16453; -UPDATE `item_template` SET `armor`=212 WHERE `entry`=16454; -UPDATE `item_template` SET `armor`=254 WHERE `entry`=16455; -UPDATE `item_template` SET `armor`=262 WHERE `entry`=16456; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=16457; -UPDATE `item_template` SET `armor`=197 WHERE `entry`=16459; -UPDATE `item_template` SET `armor`=405 WHERE `entry`=16462; -UPDATE `item_template` SET `armor`=363 WHERE `entry`=16463; -UPDATE `item_template` SET `armor`=486 WHERE `entry`=16465; -UPDATE `item_template` SET `armor`=587 WHERE `entry`=16466; -UPDATE `item_template` SET `armor`=502 WHERE `entry`=16467; -UPDATE `item_template` SET `armor`=453 WHERE `entry`=16468; -UPDATE `item_template` SET `armor`=994 WHERE `entry`=16477; -UPDATE `item_template` SET `armor`=815 WHERE `entry`=16478; -UPDATE `item_template` SET `armor`=842 WHERE `entry`=16479; -UPDATE `item_template` SET `armor`=670 WHERE `entry`=16483; -UPDATE `item_template` SET `armor`=603 WHERE `entry`=16484; -UPDATE `item_template` SET `armor`=175 WHERE `entry`=16533; -UPDATE `item_template` SET `armor`=169 WHERE `entry`=16534; -UPDATE `item_template` SET `armor`=199 WHERE `entry`=16535; -UPDATE `item_template` SET `armor`=147 WHERE `entry`=16536; -UPDATE `item_template` SET `armor`=125 WHERE `entry`=16539; -UPDATE `item_template` SET `armor`=118 WHERE `entry`=16540; -UPDATE `item_template` SET `armor`=994 WHERE `entry`=16541; -UPDATE `item_template` SET `armor`=815 WHERE `entry`=16542; -UPDATE `item_template` SET `armor`=842 WHERE `entry`=16543; -UPDATE `item_template` SET `armor`=670 WHERE `entry`=16545; -UPDATE `item_template` SET `armor`=603 WHERE `entry`=16548; -UPDATE `item_template` SET `armor`=291 WHERE `entry`=16549; -UPDATE `item_template` SET `armor`=234 WHERE `entry`=16550; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=16551; -UPDATE `item_template` SET `armor`=242 WHERE `entry`=16552; -UPDATE `item_template` SET `armor`=197 WHERE `entry`=16554; -UPDATE `item_template` SET `armor`=192 WHERE `entry`=16555; -UPDATE `item_template` SET `armor`=212 WHERE `entry`=16560; -UPDATE `item_template` SET `armor`=254 WHERE `entry`=16561; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=16562; -UPDATE `item_template` SET `armor`=291 WHERE `entry`=16563; -UPDATE `item_template` SET `armor`=262 WHERE `entry`=16564; -UPDATE `item_template` SET `armor`=587 WHERE `entry`=16565; -UPDATE `item_template` SET `armor`=486 WHERE `entry`=16566; -UPDATE `item_template` SET `armor`=502 WHERE `entry`=16567; -UPDATE `item_template` SET `armor`=453 WHERE `entry`=16568; -UPDATE `item_template` SET `armor`=405 WHERE `entry`=16569; -UPDATE `item_template` SET `armor`=363 WHERE `entry`=16571; -UPDATE `item_template` SET `armor`=393 WHERE `entry`=16574; -UPDATE `item_template` SET `armor`=863 WHERE `entry`=17013; -UPDATE `item_template` SET `armor`=436 WHERE `entry`=17014; -UPDATE `item_template` SET `armor`=124 WHERE `entry`=17107; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=17578; -UPDATE `item_template` SET `armor`=149 WHERE `entry`=17579; -UPDATE `item_template` SET `armor`=127 WHERE `entry`=17580; -UPDATE `item_template` SET `armor`=169 WHERE `entry`=17581; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=17583; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=17586; -UPDATE `item_template` SET `armor`=127 WHERE `entry`=17590; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=17591; -UPDATE `item_template` SET `armor`=169 WHERE `entry`=17592; -UPDATE `item_template` SET `armor`=149 WHERE `entry`=17593; -UPDATE `item_template` SET `armor`=175 WHERE `entry`=17602; -UPDATE `item_template` SET `armor`=179 WHERE `entry`=17603; -UPDATE `item_template` SET `armor`=157 WHERE `entry`=17604; -UPDATE `item_template` SET `armor`=199 WHERE `entry`=17605; -UPDATE `item_template` SET `armor`=135 WHERE `entry`=17607; -UPDATE `item_template` SET `armor`=128 WHERE `entry`=17608; -UPDATE `item_template` SET `armor`=135 WHERE `entry`=17618; -UPDATE `item_template` SET `armor`=128 WHERE `entry`=17620; -UPDATE `item_template` SET `armor`=157 WHERE `entry`=17622; -UPDATE `item_template` SET `armor`=175 WHERE `entry`=17623; -UPDATE `item_template` SET `armor`=199 WHERE `entry`=17624; -UPDATE `item_template` SET `armor`=179 WHERE `entry`=17625; -UPDATE `item_template` SET `armor`=683 WHERE `entry`=17734; -UPDATE `item_template` SET `armor`=2916 WHERE `entry`=18168; -UPDATE `item_template` SET `armor`=383 WHERE `entry`=18351; -UPDATE `item_template` SET `armor`=538 WHERE `entry`=18383; -UPDATE `item_template` SET `armor`=214 WHERE `entry`=18413; -UPDATE `item_template` SET `armor`=66 WHERE `entry`=18427; -UPDATE `item_template` SET `armor`=66 WHERE `entry`=18440; -UPDATE `item_template` SET `armor`=96 WHERE `entry`=18441; -UPDATE `item_template` SET `armor`=115 WHERE `entry`=18461; -UPDATE `item_template` SET `armor`=777 WHERE `entry`=18503; -UPDATE `item_template` SET `armor`=552 WHERE `entry`=18521; -UPDATE `item_template` SET `armor`=2106 WHERE `entry`=18535; -UPDATE `item_template` SET `armor`=114 WHERE `entry`=18689; -UPDATE `item_template` SET `armor`=696 WHERE `entry`=18690; -UPDATE `item_template` SET `armor`=371 WHERE `entry`=18712; -UPDATE `item_template` SET `armor`=584 WHERE `entry`=18718; -UPDATE `item_template` SET `armor`=711 WHERE `entry`=18806; -UPDATE `item_template` SET `armor`=447 WHERE `entry`=18829; -UPDATE `item_template` SET `armor`=834 WHERE `entry`=18861; -UPDATE `item_template` SET `armor`=110 WHERE `entry`=18879; -UPDATE `item_template` SET `armor`=845 WHERE `entry`=19148; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=19149; -UPDATE `item_template` SET `armor`=310 WHERE `entry`=19381; -UPDATE `item_template` SET `armor`=177 WHERE `entry`=19386; -UPDATE `item_template` SET `armor`=424 WHERE `entry`=19405; -UPDATE `item_template` SET `armor`=237 WHERE `entry`=19509; -UPDATE `item_template` SET `armor`=736 WHERE `entry`=19693; -UPDATE `item_template` SET `armor`=722 WHERE `entry`=19694; -UPDATE `item_template` SET `armor`=932 WHERE `entry`=19822; -UPDATE `item_template` SET `armor`=315 WHERE `entry`=19838; -UPDATE `item_template` SET `armor`=180 WHERE `entry`=19839; -UPDATE `item_template` SET `armor`=133 WHERE `entry`=19840; -UPDATE `item_template` SET `armor`=240 WHERE `entry`=19877; -UPDATE `item_template` SET `armor`=140 WHERE `entry`=19888; -UPDATE `item_template` SET `armor`=184 WHERE `entry`=19892; -UPDATE `item_template` SET `armor`=201 WHERE `entry`=19928; -UPDATE `item_template` SET `armor`=741 WHERE `entry`=20039; -UPDATE `item_template` SET `armor`=159 WHERE `entry`=20045; -UPDATE `item_template` SET `armor`=159 WHERE `entry`=20046; -UPDATE `item_template` SET `armor`=150 WHERE `entry`=20047; -UPDATE `item_template` SET `armor`=181 WHERE `entry`=20052; -UPDATE `item_template` SET `armor`=181 WHERE `entry`=20053; -UPDATE `item_template` SET `armor`=161 WHERE `entry`=20054; -UPDATE `item_template` SET `armor`=279 WHERE `entry`=20059; -UPDATE `item_template` SET `armor`=279 WHERE `entry`=20060; -UPDATE `item_template` SET `armor`=196 WHERE `entry`=20061; -UPDATE `item_template` SET `armor`=100 WHERE `entry`=20069; -UPDATE `item_template` SET `armor`=40 WHERE `entry`=20070; -UPDATE `item_template` SET `armor`=132 WHERE `entry`=20094; -UPDATE `item_template` SET `armor`=103 WHERE `entry`=20095; -UPDATE `item_template` SET `armor`=84 WHERE `entry`=20096; -UPDATE `item_template` SET `armor`=113 WHERE `entry`=20097; -UPDATE `item_template` SET `armor`=105 WHERE `entry`=20098; -UPDATE `item_template` SET `armor`=88 WHERE `entry`=20099; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=20100; -UPDATE `item_template` SET `armor`=129 WHERE `entry`=20101; -UPDATE `item_template` SET `armor`=104 WHERE `entry`=20102; -UPDATE `item_template` SET `armor`=136 WHERE `entry`=20103; -UPDATE `item_template` SET `armor`=113 WHERE `entry`=20104; -UPDATE `item_template` SET `armor`=91 WHERE `entry`=20105; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=20112; -UPDATE `item_template` SET `armor`=129 WHERE `entry`=20113; -UPDATE `item_template` SET `armor`=104 WHERE `entry`=20114; -UPDATE `item_template` SET `armor`=136 WHERE `entry`=20115; -UPDATE `item_template` SET `armor`=113 WHERE `entry`=20116; -UPDATE `item_template` SET `armor`=91 WHERE `entry`=20117; -UPDATE `item_template` SET `armor`=161 WHERE `entry`=20159; -UPDATE `item_template` SET `armor`=132 WHERE `entry`=20160; -UPDATE `item_template` SET `armor`=103 WHERE `entry`=20161; -UPDATE `item_template` SET `armor`=84 WHERE `entry`=20162; -UPDATE `item_template` SET `armor`=150 WHERE `entry`=20163; -UPDATE `item_template` SET `armor`=88 WHERE `entry`=20164; -UPDATE `item_template` SET `armor`=113 WHERE `entry`=20165; -UPDATE `item_template` SET `armor`=105 WHERE `entry`=20166; -UPDATE `item_template` SET `armor`=181 WHERE `entry`=20167; -UPDATE `item_template` SET `armor`=129 WHERE `entry`=20168; -UPDATE `item_template` SET `armor`=104 WHERE `entry`=20169; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=20170; -UPDATE `item_template` SET `armor`=159 WHERE `entry`=20171; -UPDATE `item_template` SET `armor`=91 WHERE `entry`=20172; -UPDATE `item_template` SET `armor`=113 WHERE `entry`=20173; -UPDATE `item_template` SET `armor`=136 WHERE `entry`=20174; -UPDATE `item_template` SET `armor`=279 WHERE `entry`=20175; -UPDATE `item_template` SET `armor`=196 WHERE `entry`=20176; -UPDATE `item_template` SET `armor`=181 WHERE `entry`=20186; -UPDATE `item_template` SET `armor`=129 WHERE `entry`=20187; -UPDATE `item_template` SET `armor`=104 WHERE `entry`=20188; -UPDATE `item_template` SET `armor`=145 WHERE `entry`=20189; -UPDATE `item_template` SET `armor`=159 WHERE `entry`=20190; -UPDATE `item_template` SET `armor`=91 WHERE `entry`=20191; -UPDATE `item_template` SET `armor`=113 WHERE `entry`=20192; -UPDATE `item_template` SET `armor`=136 WHERE `entry`=20193; -UPDATE `item_template` SET `armor`=279 WHERE `entry`=20194; -UPDATE `item_template` SET `armor`=40 WHERE `entry`=20214; -UPDATE `item_template` SET `armor`=100 WHERE `entry`=20220; -UPDATE `item_template` SET `armor`=173 WHERE `entry`=20259; -UPDATE `item_template` SET `armor`=220 WHERE `entry`=20476; -UPDATE `item_template` SET `armor`=308 WHERE `entry`=20477; -UPDATE `item_template` SET `armor`=485 WHERE `entry`=20478; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=20627; -UPDATE `item_template` SET `armor`=99 WHERE `entry`=20693; -UPDATE `item_template` SET `armor`=512 WHERE `entry`=20710; -UPDATE `item_template` SET `armor`=30 WHERE `entry`=20907; -UPDATE `item_template` SET `armor`=164 WHERE `entry`=21348; -UPDATE `item_template` SET `armor`=123 WHERE `entry`=21349; -UPDATE `item_template` SET `armor`=132 WHERE `entry`=21350; -UPDATE `item_template` SET `armor`=201 WHERE `entry`=21351; -UPDATE `item_template` SET `armor`=173 WHERE `entry`=21352; -UPDATE `item_template` SET `armor`=143 WHERE `entry`=21456; -UPDATE `item_template` SET `armor`=287 WHERE `entry`=21467; -UPDATE `item_template` SET `armor`=182 WHERE `entry`=21501; -UPDATE `item_template` SET `armor`=494 WHERE `entry`=21503; -UPDATE `item_template` SET `armor`=100 WHERE `entry`=21601; -UPDATE `item_template` SET `armor`=269 WHERE `entry`=21605; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=21645; -UPDATE `item_template` SET `armor`=204 WHERE `entry`=21675; -UPDATE `item_template` SET `armor`=224 WHERE `entry`=21682; -UPDATE `item_template` SET `armor`=276 WHERE `entry`=21693; -UPDATE `item_template` SET `armor`=727 WHERE `entry`=21706; -UPDATE `item_template` SET `armor`=198 WHERE `entry`=21888; -UPDATE `item_template` SET `armor`=219 WHERE `entry`=22301; -UPDATE `item_template` SET `armor`=203 WHERE `entry`=22302; -UPDATE `item_template` SET `armor`=207 WHERE `entry`=22303; -UPDATE `item_template` SET `armor`=144 WHERE `entry`=22304; -UPDATE `item_template` SET `armor`=155 WHERE `entry`=22305; -UPDATE `item_template` SET `armor`=139 WHERE `entry`=22306; -UPDATE `item_template` SET `armor`=150 WHERE `entry`=22311; -UPDATE `item_template` SET `armor`=108 WHERE `entry`=22313; -UPDATE `item_template` SET `armor`=311 WHERE `entry`=22410; -UPDATE `item_template` SET `armor`=257 WHERE `entry`=22740; -UPDATE `item_template` SET `armor`=287 WHERE `entry`=22741; -UPDATE `item_template` SET `armor`=200 WHERE `entry`=22747; -UPDATE `item_template` SET `armor`=257 WHERE `entry`=22749; -UPDATE `item_template` SET `armor`=287 WHERE `entry`=22750; -UPDATE `item_template` SET `armor`=200 WHERE `entry`=22752; -UPDATE `item_template` SET `armor`=166 WHERE `entry`=22856; -UPDATE `item_template` SET `armor`=104 WHERE `entry`=22860; -UPDATE `item_template` SET `armor`=155 WHERE `entry`=22864; -UPDATE `item_template` SET `armor`=98 WHERE `entry`=22869; -UPDATE `item_template` SET `armor`=98 WHERE `entry`=22870; -UPDATE `item_template` SET `armor`=218 WHERE `entry`=22877; -UPDATE `item_template` SET `armor`=215 WHERE `entry`=22878; -UPDATE `item_template` SET `armor`=248 WHERE `entry`=22879; -UPDATE `item_template` SET `armor`=225 WHERE `entry`=22880; -UPDATE `item_template` SET `armor`=144 WHERE `entry`=22882; -UPDATE `item_template` SET `armor`=144 WHERE `entry`=22883; -UPDATE `item_template` SET `armor`=156 WHERE `entry`=22885; -UPDATE `item_template` SET `armor`=156 WHERE `entry`=22886; -UPDATE `item_template` SET `armor`=212 WHERE `entry`=22938; -UPDATE `item_template` SET `armor`=140 WHERE `entry`=23018; -UPDATE `item_template` SET `armor`=3994 WHERE `entry`=23043; -UPDATE `item_template` SET `armor`=467 WHERE `entry`=23069; -UPDATE `item_template` SET `armor`=446 WHERE `entry`=23226; -UPDATE `item_template` SET `armor`=198 WHERE `entry`=23253; -UPDATE `item_template` SET `armor`=206 WHERE `entry`=23254; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=23257; -UPDATE `item_template` SET `armor`=196 WHERE `entry`=23258; -UPDATE `item_template` SET `armor`=131 WHERE `entry`=23261; -UPDATE `item_template` SET `armor`=115 WHERE `entry`=23262; -UPDATE `item_template` SET `armor`=141 WHERE `entry`=23263; -UPDATE `item_template` SET `armor`=135 WHERE `entry`=23264; -UPDATE `item_template` SET `armor`=155 WHERE `entry`=23284; -UPDATE `item_template` SET `armor`=166 WHERE `entry`=23285; -UPDATE `item_template` SET `armor`=98 WHERE `entry`=23288; -UPDATE `item_template` SET `armor`=98 WHERE `entry`=23290; -UPDATE `item_template` SET `armor`=104 WHERE `entry`=23291; -UPDATE `item_template` SET `armor`=218 WHERE `entry`=23294; -UPDATE `item_template` SET `armor`=215 WHERE `entry`=23295; -UPDATE `item_template` SET `armor`=248 WHERE `entry`=23298; -UPDATE `item_template` SET `armor`=225 WHERE `entry`=23299; -UPDATE `item_template` SET `armor`=144 WHERE `entry`=23302; -UPDATE `item_template` SET `armor`=156 WHERE `entry`=23303; -UPDATE `item_template` SET `armor`=144 WHERE `entry`=23304; -UPDATE `item_template` SET `armor`=156 WHERE `entry`=23305; -UPDATE `item_template` SET `armor`=198 WHERE `entry`=23308; -UPDATE `item_template` SET `armor`=206 WHERE `entry`=23309; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=23312; -UPDATE `item_template` SET `armor`=196 WHERE `entry`=23313; -UPDATE `item_template` SET `armor`=131 WHERE `entry`=23316; -UPDATE `item_template` SET `armor`=115 WHERE `entry`=23317; -UPDATE `item_template` SET `armor`=141 WHERE `entry`=23318; -UPDATE `item_template` SET `armor`=135 WHERE `entry`=23319; -UPDATE `item_template` SET `armor`=943 WHERE `entry`=23517; -UPDATE `item_template` SET `armor`=1257 WHERE `entry`=23518; -UPDATE `item_template` SET `armor`=1284 WHERE `entry`=23519; -UPDATE `item_template` SET `armor`=1366 WHERE `entry`=23535; -UPDATE `item_template` SET `armor`=223 WHERE `entry`=23825; -UPDATE `item_template` SET `armor`=349 WHERE `entry`=24258; -UPDATE `item_template` SET `armor`=271 WHERE `entry`=24379; -UPDATE `item_template` SET `armor`=181 WHERE `entry`=26030; -UPDATE `item_template` SET `armor`=184 WHERE `entry`=27645; -UPDATE `item_template` SET `armor`=284 WHERE `entry`=27648; -UPDATE `item_template` SET `armor`=205 WHERE `entry`=27768; -UPDATE `item_template` SET `armor`=216 WHERE `entry`=27988; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=28126; -UPDATE `item_template` SET `armor`=356 WHERE `entry`=28127; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=28128; -UPDATE `item_template` SET `armor`=331 WHERE `entry`=28129; -UPDATE `item_template` SET `armor`=429 WHERE `entry`=28130; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=28136; -UPDATE `item_template` SET `armor`=356 WHERE `entry`=28137; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=28138; -UPDATE `item_template` SET `armor`=331 WHERE `entry`=28139; -UPDATE `item_template` SET `armor`=429 WHERE `entry`=28140; -UPDATE `item_template` SET `armor`=143 WHERE `entry`=28211; -UPDATE `item_template` SET `armor`=390 WHERE `entry`=28256; -UPDATE `item_template` SET `armor`=234 WHERE `entry`=28301; -UPDATE `item_template` SET `armor`=259 WHERE `entry`=28443; -UPDATE `item_template` SET `armor`=307 WHERE `entry`=28444; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=28445; -UPDATE `item_template` SET `armor`=259 WHERE `entry`=28446; -UPDATE `item_template` SET `armor`=307 WHERE `entry`=28447; -UPDATE `item_template` SET `armor`=187 WHERE `entry`=28448; -UPDATE `item_template` SET `armor`=248 WHERE `entry`=28574; -UPDATE `item_template` SET `armor`=248 WHERE `entry`=28575; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=28618; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=28619; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=28620; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=28622; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=28623; -UPDATE `item_template` SET `armor`=385 WHERE `entry`=28660; -UPDATE `item_template` SET `armor`=223 WHERE `entry`=28675; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=28719; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=28720; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=28721; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=28722; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=28723; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=28811; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=28812; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=28813; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=28814; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=28815; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=28871; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=28872; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=28873; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=28874; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=28875; -UPDATE `item_template` SET `armor`=259 WHERE `entry`=28976; -UPDATE `item_template` SET `armor`=307 WHERE `entry`=28977; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=28978; -UPDATE `item_template` SET `armor`=259 WHERE `entry`=29004; -UPDATE `item_template` SET `armor`=307 WHERE `entry`=29005; -UPDATE `item_template` SET `armor`=187 WHERE `entry`=29006; -UPDATE `item_template` SET `armor`=294 WHERE `entry`=29276; -UPDATE `item_template` SET `armor`=350 WHERE `entry`=29277; -UPDATE `item_template` SET `armor`=371 WHERE `entry`=29278; -UPDATE `item_template` SET `armor`=392 WHERE `entry`=29279; -UPDATE `item_template` SET `armor`=294 WHERE `entry`=29384; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=29385; -UPDATE `item_template` SET `armor`=393 WHERE `entry`=29607; -UPDATE `item_template` SET `armor`=262 WHERE `entry`=29777; -UPDATE `item_template` SET `armor`=489 WHERE `entry`=30069; -UPDATE `item_template` SET `armor`=257 WHERE `entry`=30931; -UPDATE `item_template` SET `armor`=195 WHERE `entry`=30932; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=31375; -UPDATE `item_template` SET `armor`=356 WHERE `entry`=31376; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=31377; -UPDATE `item_template` SET `armor`=331 WHERE `entry`=31378; -UPDATE `item_template` SET `armor`=429 WHERE `entry`=31379; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=31584; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=31585; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=31586; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=31587; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=31588; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=31589; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=31590; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=31591; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=31592; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=31593; -UPDATE `item_template` SET `armor`=259 WHERE `entry`=31594; -UPDATE `item_template` SET `armor`=307 WHERE `entry`=31595; -UPDATE `item_template` SET `armor`=259 WHERE `entry`=31596; -UPDATE `item_template` SET `armor`=307 WHERE `entry`=31597; -UPDATE `item_template` SET `armor`=187 WHERE `entry`=31598; -UPDATE `item_template` SET `armor`=187 WHERE `entry`=31599; -UPDATE `item_template` SET `armor`=324 WHERE `entry`=31967; -UPDATE `item_template` SET `armor`=404 WHERE `entry`=31968; -UPDATE `item_template` SET `armor`=417 WHERE `entry`=31969; -UPDATE `item_template` SET `armor`=377 WHERE `entry`=31971; -UPDATE `item_template` SET `armor`=498 WHERE `entry`=31972; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=31973; -UPDATE `item_template` SET `armor`=395 WHERE `entry`=31974; -UPDATE `item_template` SET `armor`=410 WHERE `entry`=31975; -UPDATE `item_template` SET `armor`=311 WHERE `entry`=31976; -UPDATE `item_template` SET `armor`=438 WHERE `entry`=31977; -UPDATE `item_template` SET `armor`=311 WHERE `entry`=31979; -UPDATE `item_template` SET `armor`=395 WHERE `entry`=31980; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=31981; -UPDATE `item_template` SET `armor`=438 WHERE `entry`=31982; -UPDATE `item_template` SET `armor`=410 WHERE `entry`=31983; -UPDATE `item_template` SET `armor`=310 WHERE `entry`=31987; -UPDATE `item_template` SET `armor`=390 WHERE `entry`=31988; -UPDATE `item_template` SET `armor`=417 WHERE `entry`=31989; -UPDATE `item_template` SET `armor`=377 WHERE `entry`=31990; -UPDATE `item_template` SET `armor`=470 WHERE `entry`=31991; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=32015; -UPDATE `item_template` SET `armor`=395 WHERE `entry`=32016; -UPDATE `item_template` SET `armor`=410 WHERE `entry`=32017; -UPDATE `item_template` SET `armor`=311 WHERE `entry`=32018; -UPDATE `item_template` SET `armor`=438 WHERE `entry`=32019; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=32034; -UPDATE `item_template` SET `armor`=395 WHERE `entry`=32035; -UPDATE `item_template` SET `armor`=410 WHERE `entry`=32036; -UPDATE `item_template` SET `armor`=311 WHERE `entry`=32037; -UPDATE `item_template` SET `armor`=438 WHERE `entry`=32038; -UPDATE `item_template` SET `armor`=310 WHERE `entry`=32056; -UPDATE `item_template` SET `armor`=390 WHERE `entry`=32057; -UPDATE `item_template` SET `armor`=431 WHERE `entry`=32058; -UPDATE `item_template` SET `armor`=363 WHERE `entry`=32059; -UPDATE `item_template` SET `armor`=470 WHERE `entry`=32060; -UPDATE `item_template` SET `armor`=336 WHERE `entry`=32786; -UPDATE `item_template` SET `armor`=336 WHERE `entry`=32788; -UPDATE `item_template` SET `armor`=336 WHERE `entry`=32796; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=32798; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=32800; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=32808; -UPDATE `item_template` SET `armor`=216 WHERE `entry`=32810; -UPDATE `item_template` SET `armor`=216 WHERE `entry`=32812; -UPDATE `item_template` SET `armor`=216 WHERE `entry`=32821; -UPDATE `item_template` SET `armor`=295 WHERE `entry`=33054; -UPDATE `item_template` SET `armor`=293 WHERE `entry`=33759; -UPDATE `item_template` SET `armor`=471 WHERE `entry`=33702; -UPDATE `item_template` SET `armor`=343 WHERE `entry`=33700; -UPDATE `item_template` SET `armor`=409 WHERE `entry`=33677; -UPDATE `item_template` SET `armor`=409 WHERE `entry`=33718; -UPDATE `item_template` SET `armor`=293 WHERE `entry`=33717; -UPDATE `item_template` SET `armor`=409 WHERE `entry`=33745; -UPDATE `item_template` SET `armor`=443 WHERE `entry`=33673; -UPDATE `item_template` SET `armor`=409 WHERE `entry`=33758; -UPDATE `item_template` SET `armor`=346 WHERE `entry`=33593; -UPDATE `item_template` SET `armor`=424 WHERE `entry`=33761; -UPDATE `item_template` SET `armor`=329 WHERE `entry`=33690; -UPDATE `item_template` SET `armor`=293 WHERE `entry`=33676; -UPDATE `item_template` SET `armor`=529 WHERE `entry`=33675; -UPDATE `item_template` SET `armor`=454 WHERE `entry`=33680; -UPDATE `item_template` SET `armor`=443 WHERE `entry`=33701; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=33914; -UPDATE `item_template` SET `armor`=173 WHERE `entry`=33913; -UPDATE `item_template` SET `armor`=454 WHERE `entry`=33721; -UPDATE `item_template` SET `armor`=208 WHERE `entry`=33900; -UPDATE `item_template` SET `armor`=454 WHERE `entry`=33760; -UPDATE `item_template` SET `armor`=529 WHERE `entry`=33704; -UPDATE `item_template` SET `armor`=409 WHERE `entry`=33683; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=33884; -UPDATE `item_template` SET `armor`=208 WHERE `entry`=33912; -UPDATE `item_template` SET `armor`=293 WHERE `entry`=33684; -UPDATE `item_template` SET `armor`=173 WHERE `entry`=33901; -UPDATE `item_template` SET `armor`=424 WHERE `entry`=33678; -UPDATE `item_template` SET `armor`=208 WHERE `entry`=33882; -UPDATE `item_template` SET `armor`=173 WHERE `entry`=33883; -UPDATE `item_template` SET `armor`=293 WHERE `entry`=33744; -UPDATE `item_template` SET `armor`=300 WHERE `entry`=33879; -UPDATE `item_template` SET `armor`=343 WHERE `entry`=33671; -UPDATE `item_template` SET `armor`=415 WHERE `entry`=33691; -UPDATE `item_template` SET `armor`=501 WHERE `entry`=33694; -UPDATE `item_template` SET `armor`=300 WHERE `entry`=33885; -UPDATE `item_template` SET `armor`=357 WHERE `entry`=33886; -UPDATE `item_template` SET `armor`=236 WHERE `entry`=33887; -UPDATE `item_template` SET `armor`=238 WHERE `entry`=33902; -UPDATE `item_template` SET `armor`=429 WHERE `entry`=33672; -UPDATE `item_template` SET `armor`=236 WHERE `entry`=33881; -UPDATE `item_template` SET `armor`=424 WHERE `entry`=33686; -UPDATE `item_template` SET `armor`=454 WHERE `entry`=33685; -UPDATE `item_template` SET `armor`=443 WHERE `entry`=33692; -UPDATE `item_template` SET `armor`=424 WHERE `entry`=33719; -UPDATE `item_template` SET `armor`=454 WHERE `entry`=33748; -UPDATE `item_template` SET `armor`=357 WHERE `entry`=33880; -UPDATE `item_template` SET `armor`=236 WHERE `entry`=33917; -UPDATE `item_template` SET `armor`=329 WHERE `entry`=33767; -UPDATE `item_template` SET `armor`=457 WHERE `entry`=33769; -UPDATE `item_template` SET `armor`=357 WHERE `entry`=33916; -UPDATE `item_template` SET `armor`=415 WHERE `entry`=33768; -UPDATE `item_template` SET `armor`=501 WHERE `entry`=33771; -UPDATE `item_template` SET `armor`=300 WHERE `entry`=33915; -UPDATE `item_template` SET `armor`=424 WHERE `entry`=33746; -UPDATE `item_template` SET `armor`=323 WHERE `entry`=33679; -UPDATE `item_template` SET `armor`=323 WHERE `entry`=33682; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=33693; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=33674; -UPDATE `item_template` SET `armor`=386 WHERE `entry`=33770; -UPDATE `item_template` SET `armor`=323 WHERE `entry`=33747; -UPDATE `item_template` SET `armor`=323 WHERE `entry`=33720; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=33703; -UPDATE `item_template` SET `armor`=323 WHERE `entry`=33757; -UPDATE `item_template` SET `armor`=252 WHERE `entry`=34706; -UPDATE `item_template` SET `armor`=387 WHERE `entry`=34810; -UPDATE `item_template` SET `armor`=392 WHERE `entry`=34888; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=35356; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=35357; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35358; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=35359; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=35360; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=35361; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=35362; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35363; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=35364; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=35365; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=35371; -UPDATE `item_template` SET `armor`=267 WHERE `entry`=35372; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35373; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=35374; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=35375; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=35469; -UPDATE `item_template` SET `armor`=249 WHERE `entry`=35470; -UPDATE `item_template` SET `armor`=213 WHERE `entry`=35471; -UPDATE `item_template` SET `armor`=308 WHERE `entry`=34213; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35003; -UPDATE `item_template` SET `armor`=354 WHERE `entry`=35022; -UPDATE `item_template` SET `armor`=478 WHERE `entry`=35024; -UPDATE `item_template` SET `armor`=430 WHERE `entry`=35025; -UPDATE `item_template` SET `armor`=541 WHERE `entry`=35026; -UPDATE `item_template` SET `armor`=447 WHERE `entry`=35023; -UPDATE `item_template` SET `armor`=430 WHERE `entry`=35001; -UPDATE `item_template` SET `armor`=569 WHERE `entry`=35002; -UPDATE `item_template` SET `armor`=461 WHERE `entry`=34999; -UPDATE `item_template` SET `armor`=368 WHERE `entry`=34998; -UPDATE `item_template` SET `armor`=478 WHERE `entry`=35000; -UPDATE `item_template` SET `armor`=416 WHERE `entry`=35114; -UPDATE `item_template` SET `armor`=541 WHERE `entry`=35115; -UPDATE `item_template` SET `armor`=447 WHERE `entry`=35112; -UPDATE `item_template` SET `armor`=354 WHERE `entry`=35111; -UPDATE `item_template` SET `armor`=492 WHERE `entry`=35113; -UPDATE `item_template` SET `armor`=476 WHERE `entry`=35099; -UPDATE `item_template` SET `armor`=442 WHERE `entry`=35100; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35098; -UPDATE `item_template` SET `armor`=339 WHERE `entry`=35096; -UPDATE `item_template` SET `armor`=426 WHERE `entry`=35097; -UPDATE `item_template` SET `armor`=368 WHERE `entry`=35032; -UPDATE `item_template` SET `armor`=569 WHERE `entry`=35036; -UPDATE `item_template` SET `armor`=475 WHERE `entry`=35033; -UPDATE `item_template` SET `armor`=430 WHERE `entry`=35035; -UPDATE `item_template` SET `armor`=506 WHERE `entry`=35034; -UPDATE `item_template` SET `armor`=442 WHERE `entry`=35005; -UPDATE `item_template` SET `armor`=476 WHERE `entry`=35007; -UPDATE `item_template` SET `armor`=339 WHERE `entry`=35006; -UPDATE `item_template` SET `armor`=426 WHERE `entry`=35004; -UPDATE `item_template` SET `armor`=339 WHERE `entry`=35009; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35011; -UPDATE `item_template` SET `armor`=476 WHERE `entry`=35012; -UPDATE `item_template` SET `armor`=426 WHERE `entry`=35010; -UPDATE `item_template` SET `armor`=442 WHERE `entry`=35013; -UPDATE `item_template` SET `armor`=219 WHERE `entry`=35153; -UPDATE `item_template` SET `armor`=219 WHERE `entry`=35159; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35053; -UPDATE `item_template` SET `armor`=219 WHERE `entry`=35164; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=35165; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=35152; -UPDATE `item_template` SET `armor`=253 WHERE `entry`=35167; -UPDATE `item_template` SET `armor`=322 WHERE `entry`=35154; -UPDATE `item_template` SET `armor`=183 WHERE `entry`=35168; -UPDATE `item_template` SET `armor`=183 WHERE `entry`=35174; -UPDATE `item_template` SET `armor`=442 WHERE `entry`=35055; -UPDATE `item_template` SET `armor`=183 WHERE `entry`=35179; -UPDATE `item_template` SET `armor`=385 WHERE `entry`=35139; -UPDATE `item_template` SET `armor`=253 WHERE `entry`=35169; -UPDATE `item_template` SET `armor`=476 WHERE `entry`=35057; -UPDATE `item_template` SET `armor`=426 WHERE `entry`=35054; -UPDATE `item_template` SET `armor`=442 WHERE `entry`=35085; -UPDATE `item_template` SET `armor`=476 WHERE `entry`=35087; -UPDATE `item_template` SET `armor`=339 WHERE `entry`=35086; -UPDATE `item_template` SET `armor`=426 WHERE `entry`=35084; -UPDATE `item_template` SET `armor`=306 WHERE `entry`=35083; -UPDATE `item_template` SET `armor`=339 WHERE `entry`=35056; -UPDATE `item_template` SET `armor`=253 WHERE `entry`=35149; -UPDATE `item_template` SET `armor`=253 WHERE `entry`=35180; -UPDATE `item_template` SET `armor`=385 WHERE `entry`=35150; -UPDATE `item_template` SET `armor`=385 WHERE `entry`=35137; -UPDATE `item_template` SET `armor`=253 WHERE `entry`=35138; -UPDATE `item_template` SET `armor`=253 WHERE `entry`=35144; -UPDATE `item_template` SET `armor`=170 WHERE `entry`=6733; -UPDATE `item_template` SET `armor`=605 WHERE `entry`=15141; -UPDATE `item_template` SET `armor`=504 WHERE `entry`=37084; -UPDATE `item_template` SET `armor`=486 WHERE `entry`=39225; -UPDATE `item_template` SET `armor`=490 WHERE `entry`=40252; -UPDATE `item_template` SET `armor`=1788 WHERE `entry`=41190; -UPDATE `item_template` SET `armor`=337 WHERE `entry`=41238; -UPDATE `item_template` SET `armor`=1438 WHERE `entry`=42826; -UPDATE `item_template` SET `armor`=2880 WHERE `entry`=45267; -UPDATE `item_template` SET `armor`=3500 WHERE `entry`=49904; -UPDATE `item_template` SET `armor`=737 WHERE `entry`=50466; -UPDATE `item_template` SET `armor`=1735 WHERE `entry`=50802; -UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50849; -UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50850; -UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50856; -UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50857; -UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50863; -UPDATE `item_template` SET `armor`=3817 WHERE `entry`=50968; -UPDATE `item_template` SET `armor`=2658 WHERE `entry`=50978; -UPDATE `item_template` SET `armor`=2143 WHERE `entry`=50991; -UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51172; -UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51174; -UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51217; -UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50864; -UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51132; -UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51219; -UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51220; -UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51222; -UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51134; -UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51265; -UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51267; -UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51305; -UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51307; -UPDATE `item_template` SET `armor`=1869 WHERE `entry`=51901; -UPDATE `item_template` SET `armor`=649 WHERE `entry`=54801; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=42680; -UPDATE `item_template` SET `armor`=356 WHERE `entry`=42681; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=42682; -UPDATE `item_template` SET `armor`=331 WHERE `entry`=42683; -UPDATE `item_template` SET `armor`=429 WHERE `entry`=42684; -UPDATE `item_template` SET `armor`=283 WHERE `entry`=42685; -UPDATE `item_template` SET `armor`=356 WHERE `entry`=42686; -UPDATE `item_template` SET `armor`=400 WHERE `entry`=42687; -UPDATE `item_template` SET `armor`=331 WHERE `entry`=42688; -UPDATE `item_template` SET `armor`=429 WHERE `entry`=42689; diff --git a/sql/old/3.3.5a/2013_01_01_00_world_item_template_restore.sql b/sql/old/3.3.5a/2013_01_01_00_world_item_template_restore.sql new file mode 100644 index 00000000000..dc18ff71fe8 --- /dev/null +++ b/sql/old/3.3.5a/2013_01_01_00_world_item_template_restore.sql @@ -0,0 +1,646 @@ +UPDATE `item_template` SET `armor`=2163 WHERE `entry`=1169; +UPDATE `item_template` SET `armor`=278 WHERE `entry`=1717; +UPDATE `item_template` SET `armor`=131 WHERE `entry`=3835; +UPDATE `item_template` SET `armor`=358 WHERE `entry`=3844; +UPDATE `item_template` SET `armor`=1101 WHERE `entry`=4070; +UPDATE `item_template` SET `armor`=513 WHERE `entry`=6447; +UPDATE `item_template` SET `armor`=775 WHERE `entry`=6725; +UPDATE `item_template` SET `armor`=198 WHERE `entry`=6731; +UPDATE `item_template` SET `armor`=234 WHERE `entry`=6742; +UPDATE `item_template` SET `armor`=311 WHERE `entry`=6907; +UPDATE `item_template` SET `armor`=363 WHERE `entry`=7919; +UPDATE `item_template` SET `armor`=502 WHERE `entry`=7921; +UPDATE `item_template` SET `armor`=421 WHERE `entry`=7922; +UPDATE `item_template` SET `armor`=536 WHERE `entry`=7930; +UPDATE `item_template` SET `armor`=382 WHERE `entry`=7933; +UPDATE `item_template` SET `armor`=469 WHERE `entry`=7934; +UPDATE `item_template` SET `armor`=341 WHERE `entry`=7963; +UPDATE `item_template` SET `armor`=165 WHERE `entry`=9409; +UPDATE `item_template` SET `armor`=391 WHERE `entry`=9625; +UPDATE `item_template` SET `armor`=193 WHERE `entry`=10783; +UPDATE `item_template` SET `armor`=817 WHERE `entry`=11604; +UPDATE `item_template` SET `armor`=514 WHERE `entry`=11605; +UPDATE `item_template` SET `armor`=433 WHERE `entry`=11606; +UPDATE `item_template` SET `armor`=1903 WHERE `entry`=11631; +UPDATE `item_template` SET `armor`=50 WHERE `entry`=11669; +UPDATE `item_template` SET `armor`=484 WHERE `entry`=11703; +UPDATE `item_template` SET `armor`=742 WHERE `entry`=11927; +UPDATE `item_template` SET `armor`=150 WHERE `entry`=12544; +UPDATE `item_template` SET `armor`=190 WHERE `entry`=12551; +UPDATE `item_template` SET `armor`=553 WHERE `entry`=12557; +UPDATE `item_template` SET `armor`=527 WHERE `entry`=12610; +UPDATE `item_template` SET `armor`=492 WHERE `entry`=12611; +UPDATE `item_template` SET `armor`=621 WHERE `entry`=12612; +UPDATE `item_template` SET `armor`=738 WHERE `entry`=12613; +UPDATE `item_template` SET `armor`=665 WHERE `entry`=12614; +UPDATE `item_template` SET `armor`=629 WHERE `entry`=12633; +UPDATE `item_template` SET `armor`=611 WHERE `entry`=12641; +UPDATE `item_template` SET `armor`=711 WHERE `entry`=13079; +UPDATE `item_template` SET `armor`=185 WHERE `entry`=13252; +UPDATE `item_template` SET `armor`=207 WHERE `entry`=13258; +UPDATE `item_template` SET `armor`=519 WHERE `entry`=13502; +UPDATE `item_template` SET `armor`=688 WHERE `entry`=13955; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=35496; +UPDATE `item_template` SET `armor`=268 WHERE `entry`=15053; +UPDATE `item_template` SET `armor`=204 WHERE `entry`=15054; +UPDATE `item_template` SET `armor`=167 WHERE `entry`=15055; +UPDATE `item_template` SET `armor`=807 WHERE `entry`=15413; +UPDATE `item_template` SET `armor`=96 WHERE `entry`=16341; +UPDATE `item_template` SET `armor`=115 WHERE `entry`=16342; +UPDATE `item_template` SET `armor`=125 WHERE `entry`=16437; +UPDATE `item_template` SET `armor`=118 WHERE `entry`=16440; +UPDATE `item_template` SET `armor`=175 WHERE `entry`=16441; +UPDATE `item_template` SET `armor`=169 WHERE `entry`=16442; +UPDATE `item_template` SET `armor`=199 WHERE `entry`=16443; +UPDATE `item_template` SET `armor`=147 WHERE `entry`=16444; +UPDATE `item_template` SET `armor`=207 WHERE `entry`=16446; +UPDATE `item_template` SET `armor`=192 WHERE `entry`=16448; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=16449; +UPDATE `item_template` SET `armor`=242 WHERE `entry`=16450; +UPDATE `item_template` SET `armor`=234 WHERE `entry`=16451; +UPDATE `item_template` SET `armor`=291 WHERE `entry`=16452; +UPDATE `item_template` SET `armor`=291 WHERE `entry`=16453; +UPDATE `item_template` SET `armor`=212 WHERE `entry`=16454; +UPDATE `item_template` SET `armor`=254 WHERE `entry`=16455; +UPDATE `item_template` SET `armor`=262 WHERE `entry`=16456; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=16457; +UPDATE `item_template` SET `armor`=197 WHERE `entry`=16459; +UPDATE `item_template` SET `armor`=405 WHERE `entry`=16462; +UPDATE `item_template` SET `armor`=363 WHERE `entry`=16463; +UPDATE `item_template` SET `armor`=486 WHERE `entry`=16465; +UPDATE `item_template` SET `armor`=587 WHERE `entry`=16466; +UPDATE `item_template` SET `armor`=502 WHERE `entry`=16467; +UPDATE `item_template` SET `armor`=453 WHERE `entry`=16468; +UPDATE `item_template` SET `armor`=994 WHERE `entry`=16477; +UPDATE `item_template` SET `armor`=815 WHERE `entry`=16478; +UPDATE `item_template` SET `armor`=842 WHERE `entry`=16479; +UPDATE `item_template` SET `armor`=670 WHERE `entry`=16483; +UPDATE `item_template` SET `armor`=603 WHERE `entry`=16484; +UPDATE `item_template` SET `armor`=175 WHERE `entry`=16533; +UPDATE `item_template` SET `armor`=169 WHERE `entry`=16534; +UPDATE `item_template` SET `armor`=199 WHERE `entry`=16535; +UPDATE `item_template` SET `armor`=147 WHERE `entry`=16536; +UPDATE `item_template` SET `armor`=125 WHERE `entry`=16539; +UPDATE `item_template` SET `armor`=118 WHERE `entry`=16540; +UPDATE `item_template` SET `armor`=994 WHERE `entry`=16541; +UPDATE `item_template` SET `armor`=815 WHERE `entry`=16542; +UPDATE `item_template` SET `armor`=842 WHERE `entry`=16543; +UPDATE `item_template` SET `armor`=670 WHERE `entry`=16545; +UPDATE `item_template` SET `armor`=603 WHERE `entry`=16548; +UPDATE `item_template` SET `armor`=291 WHERE `entry`=16549; +UPDATE `item_template` SET `armor`=234 WHERE `entry`=16550; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=16551; +UPDATE `item_template` SET `armor`=242 WHERE `entry`=16552; +UPDATE `item_template` SET `armor`=197 WHERE `entry`=16554; +UPDATE `item_template` SET `armor`=192 WHERE `entry`=16555; +UPDATE `item_template` SET `armor`=212 WHERE `entry`=16560; +UPDATE `item_template` SET `armor`=254 WHERE `entry`=16561; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=16562; +UPDATE `item_template` SET `armor`=291 WHERE `entry`=16563; +UPDATE `item_template` SET `armor`=262 WHERE `entry`=16564; +UPDATE `item_template` SET `armor`=587 WHERE `entry`=16565; +UPDATE `item_template` SET `armor`=486 WHERE `entry`=16566; +UPDATE `item_template` SET `armor`=502 WHERE `entry`=16567; +UPDATE `item_template` SET `armor`=453 WHERE `entry`=16568; +UPDATE `item_template` SET `armor`=405 WHERE `entry`=16569; +UPDATE `item_template` SET `armor`=363 WHERE `entry`=16571; +UPDATE `item_template` SET `armor`=393 WHERE `entry`=16574; +UPDATE `item_template` SET `armor`=863 WHERE `entry`=17013; +UPDATE `item_template` SET `armor`=436 WHERE `entry`=17014; +UPDATE `item_template` SET `armor`=124 WHERE `entry`=17107; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=17578; +UPDATE `item_template` SET `armor`=149 WHERE `entry`=17579; +UPDATE `item_template` SET `armor`=127 WHERE `entry`=17580; +UPDATE `item_template` SET `armor`=169 WHERE `entry`=17581; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=17583; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=17586; +UPDATE `item_template` SET `armor`=127 WHERE `entry`=17590; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=17591; +UPDATE `item_template` SET `armor`=169 WHERE `entry`=17592; +UPDATE `item_template` SET `armor`=149 WHERE `entry`=17593; +UPDATE `item_template` SET `armor`=175 WHERE `entry`=17602; +UPDATE `item_template` SET `armor`=179 WHERE `entry`=17603; +UPDATE `item_template` SET `armor`=157 WHERE `entry`=17604; +UPDATE `item_template` SET `armor`=199 WHERE `entry`=17605; +UPDATE `item_template` SET `armor`=135 WHERE `entry`=17607; +UPDATE `item_template` SET `armor`=128 WHERE `entry`=17608; +UPDATE `item_template` SET `armor`=135 WHERE `entry`=17618; +UPDATE `item_template` SET `armor`=128 WHERE `entry`=17620; +UPDATE `item_template` SET `armor`=157 WHERE `entry`=17622; +UPDATE `item_template` SET `armor`=175 WHERE `entry`=17623; +UPDATE `item_template` SET `armor`=199 WHERE `entry`=17624; +UPDATE `item_template` SET `armor`=179 WHERE `entry`=17625; +UPDATE `item_template` SET `armor`=683 WHERE `entry`=17734; +UPDATE `item_template` SET `armor`=2916 WHERE `entry`=18168; +UPDATE `item_template` SET `armor`=383 WHERE `entry`=18351; +UPDATE `item_template` SET `armor`=538 WHERE `entry`=18383; +UPDATE `item_template` SET `armor`=214 WHERE `entry`=18413; +UPDATE `item_template` SET `armor`=66 WHERE `entry`=18427; +UPDATE `item_template` SET `armor`=66 WHERE `entry`=18440; +UPDATE `item_template` SET `armor`=96 WHERE `entry`=18441; +UPDATE `item_template` SET `armor`=115 WHERE `entry`=18461; +UPDATE `item_template` SET `armor`=777 WHERE `entry`=18503; +UPDATE `item_template` SET `armor`=552 WHERE `entry`=18521; +UPDATE `item_template` SET `armor`=2106 WHERE `entry`=18535; +UPDATE `item_template` SET `armor`=114 WHERE `entry`=18689; +UPDATE `item_template` SET `armor`=696 WHERE `entry`=18690; +UPDATE `item_template` SET `armor`=371 WHERE `entry`=18712; +UPDATE `item_template` SET `armor`=584 WHERE `entry`=18718; +UPDATE `item_template` SET `armor`=711 WHERE `entry`=18806; +UPDATE `item_template` SET `armor`=447 WHERE `entry`=18829; +UPDATE `item_template` SET `armor`=834 WHERE `entry`=18861; +UPDATE `item_template` SET `armor`=110 WHERE `entry`=18879; +UPDATE `item_template` SET `armor`=845 WHERE `entry`=19148; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=19149; +UPDATE `item_template` SET `armor`=310 WHERE `entry`=19381; +UPDATE `item_template` SET `armor`=177 WHERE `entry`=19386; +UPDATE `item_template` SET `armor`=424 WHERE `entry`=19405; +UPDATE `item_template` SET `armor`=237 WHERE `entry`=19509; +UPDATE `item_template` SET `armor`=736 WHERE `entry`=19693; +UPDATE `item_template` SET `armor`=722 WHERE `entry`=19694; +UPDATE `item_template` SET `armor`=932 WHERE `entry`=19822; +UPDATE `item_template` SET `armor`=315 WHERE `entry`=19838; +UPDATE `item_template` SET `armor`=180 WHERE `entry`=19839; +UPDATE `item_template` SET `armor`=133 WHERE `entry`=19840; +UPDATE `item_template` SET `armor`=240 WHERE `entry`=19877; +UPDATE `item_template` SET `armor`=140 WHERE `entry`=19888; +UPDATE `item_template` SET `armor`=184 WHERE `entry`=19892; +UPDATE `item_template` SET `armor`=201 WHERE `entry`=19928; +UPDATE `item_template` SET `armor`=741 WHERE `entry`=20039; +UPDATE `item_template` SET `armor`=159 WHERE `entry`=20045; +UPDATE `item_template` SET `armor`=159 WHERE `entry`=20046; +UPDATE `item_template` SET `armor`=150 WHERE `entry`=20047; +UPDATE `item_template` SET `armor`=181 WHERE `entry`=20052; +UPDATE `item_template` SET `armor`=181 WHERE `entry`=20053; +UPDATE `item_template` SET `armor`=161 WHERE `entry`=20054; +UPDATE `item_template` SET `armor`=279 WHERE `entry`=20059; +UPDATE `item_template` SET `armor`=279 WHERE `entry`=20060; +UPDATE `item_template` SET `armor`=196 WHERE `entry`=20061; +UPDATE `item_template` SET `armor`=100 WHERE `entry`=20069; +UPDATE `item_template` SET `armor`=40 WHERE `entry`=20070; +UPDATE `item_template` SET `armor`=132 WHERE `entry`=20094; +UPDATE `item_template` SET `armor`=103 WHERE `entry`=20095; +UPDATE `item_template` SET `armor`=84 WHERE `entry`=20096; +UPDATE `item_template` SET `armor`=113 WHERE `entry`=20097; +UPDATE `item_template` SET `armor`=105 WHERE `entry`=20098; +UPDATE `item_template` SET `armor`=88 WHERE `entry`=20099; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=20100; +UPDATE `item_template` SET `armor`=129 WHERE `entry`=20101; +UPDATE `item_template` SET `armor`=104 WHERE `entry`=20102; +UPDATE `item_template` SET `armor`=136 WHERE `entry`=20103; +UPDATE `item_template` SET `armor`=113 WHERE `entry`=20104; +UPDATE `item_template` SET `armor`=91 WHERE `entry`=20105; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=20112; +UPDATE `item_template` SET `armor`=129 WHERE `entry`=20113; +UPDATE `item_template` SET `armor`=104 WHERE `entry`=20114; +UPDATE `item_template` SET `armor`=136 WHERE `entry`=20115; +UPDATE `item_template` SET `armor`=113 WHERE `entry`=20116; +UPDATE `item_template` SET `armor`=91 WHERE `entry`=20117; +UPDATE `item_template` SET `armor`=161 WHERE `entry`=20159; +UPDATE `item_template` SET `armor`=132 WHERE `entry`=20160; +UPDATE `item_template` SET `armor`=103 WHERE `entry`=20161; +UPDATE `item_template` SET `armor`=84 WHERE `entry`=20162; +UPDATE `item_template` SET `armor`=150 WHERE `entry`=20163; +UPDATE `item_template` SET `armor`=88 WHERE `entry`=20164; +UPDATE `item_template` SET `armor`=113 WHERE `entry`=20165; +UPDATE `item_template` SET `armor`=105 WHERE `entry`=20166; +UPDATE `item_template` SET `armor`=181 WHERE `entry`=20167; +UPDATE `item_template` SET `armor`=129 WHERE `entry`=20168; +UPDATE `item_template` SET `armor`=104 WHERE `entry`=20169; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=20170; +UPDATE `item_template` SET `armor`=159 WHERE `entry`=20171; +UPDATE `item_template` SET `armor`=91 WHERE `entry`=20172; +UPDATE `item_template` SET `armor`=113 WHERE `entry`=20173; +UPDATE `item_template` SET `armor`=136 WHERE `entry`=20174; +UPDATE `item_template` SET `armor`=279 WHERE `entry`=20175; +UPDATE `item_template` SET `armor`=196 WHERE `entry`=20176; +UPDATE `item_template` SET `armor`=181 WHERE `entry`=20186; +UPDATE `item_template` SET `armor`=129 WHERE `entry`=20187; +UPDATE `item_template` SET `armor`=104 WHERE `entry`=20188; +UPDATE `item_template` SET `armor`=145 WHERE `entry`=20189; +UPDATE `item_template` SET `armor`=159 WHERE `entry`=20190; +UPDATE `item_template` SET `armor`=91 WHERE `entry`=20191; +UPDATE `item_template` SET `armor`=113 WHERE `entry`=20192; +UPDATE `item_template` SET `armor`=136 WHERE `entry`=20193; +UPDATE `item_template` SET `armor`=279 WHERE `entry`=20194; +UPDATE `item_template` SET `armor`=40 WHERE `entry`=20214; +UPDATE `item_template` SET `armor`=100 WHERE `entry`=20220; +UPDATE `item_template` SET `armor`=173 WHERE `entry`=20259; +UPDATE `item_template` SET `armor`=220 WHERE `entry`=20476; +UPDATE `item_template` SET `armor`=308 WHERE `entry`=20477; +UPDATE `item_template` SET `armor`=485 WHERE `entry`=20478; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=20627; +UPDATE `item_template` SET `armor`=99 WHERE `entry`=20693; +UPDATE `item_template` SET `armor`=512 WHERE `entry`=20710; +UPDATE `item_template` SET `armor`=30 WHERE `entry`=20907; +UPDATE `item_template` SET `armor`=164 WHERE `entry`=21348; +UPDATE `item_template` SET `armor`=123 WHERE `entry`=21349; +UPDATE `item_template` SET `armor`=132 WHERE `entry`=21350; +UPDATE `item_template` SET `armor`=201 WHERE `entry`=21351; +UPDATE `item_template` SET `armor`=173 WHERE `entry`=21352; +UPDATE `item_template` SET `armor`=143 WHERE `entry`=21456; +UPDATE `item_template` SET `armor`=287 WHERE `entry`=21467; +UPDATE `item_template` SET `armor`=182 WHERE `entry`=21501; +UPDATE `item_template` SET `armor`=494 WHERE `entry`=21503; +UPDATE `item_template` SET `armor`=100 WHERE `entry`=21601; +UPDATE `item_template` SET `armor`=269 WHERE `entry`=21605; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=21645; +UPDATE `item_template` SET `armor`=204 WHERE `entry`=21675; +UPDATE `item_template` SET `armor`=224 WHERE `entry`=21682; +UPDATE `item_template` SET `armor`=276 WHERE `entry`=21693; +UPDATE `item_template` SET `armor`=727 WHERE `entry`=21706; +UPDATE `item_template` SET `armor`=198 WHERE `entry`=21888; +UPDATE `item_template` SET `armor`=219 WHERE `entry`=22301; +UPDATE `item_template` SET `armor`=203 WHERE `entry`=22302; +UPDATE `item_template` SET `armor`=207 WHERE `entry`=22303; +UPDATE `item_template` SET `armor`=144 WHERE `entry`=22304; +UPDATE `item_template` SET `armor`=155 WHERE `entry`=22305; +UPDATE `item_template` SET `armor`=139 WHERE `entry`=22306; +UPDATE `item_template` SET `armor`=150 WHERE `entry`=22311; +UPDATE `item_template` SET `armor`=108 WHERE `entry`=22313; +UPDATE `item_template` SET `armor`=311 WHERE `entry`=22410; +UPDATE `item_template` SET `armor`=257 WHERE `entry`=22740; +UPDATE `item_template` SET `armor`=287 WHERE `entry`=22741; +UPDATE `item_template` SET `armor`=200 WHERE `entry`=22747; +UPDATE `item_template` SET `armor`=257 WHERE `entry`=22749; +UPDATE `item_template` SET `armor`=287 WHERE `entry`=22750; +UPDATE `item_template` SET `armor`=200 WHERE `entry`=22752; +UPDATE `item_template` SET `armor`=166 WHERE `entry`=22856; +UPDATE `item_template` SET `armor`=104 WHERE `entry`=22860; +UPDATE `item_template` SET `armor`=155 WHERE `entry`=22864; +UPDATE `item_template` SET `armor`=98 WHERE `entry`=22869; +UPDATE `item_template` SET `armor`=98 WHERE `entry`=22870; +UPDATE `item_template` SET `armor`=218 WHERE `entry`=22877; +UPDATE `item_template` SET `armor`=215 WHERE `entry`=22878; +UPDATE `item_template` SET `armor`=248 WHERE `entry`=22879; +UPDATE `item_template` SET `armor`=225 WHERE `entry`=22880; +UPDATE `item_template` SET `armor`=144 WHERE `entry`=22882; +UPDATE `item_template` SET `armor`=144 WHERE `entry`=22883; +UPDATE `item_template` SET `armor`=156 WHERE `entry`=22885; +UPDATE `item_template` SET `armor`=156 WHERE `entry`=22886; +UPDATE `item_template` SET `armor`=212 WHERE `entry`=22938; +UPDATE `item_template` SET `armor`=140 WHERE `entry`=23018; +UPDATE `item_template` SET `armor`=3994 WHERE `entry`=23043; +UPDATE `item_template` SET `armor`=467 WHERE `entry`=23069; +UPDATE `item_template` SET `armor`=446 WHERE `entry`=23226; +UPDATE `item_template` SET `armor`=198 WHERE `entry`=23253; +UPDATE `item_template` SET `armor`=206 WHERE `entry`=23254; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=23257; +UPDATE `item_template` SET `armor`=196 WHERE `entry`=23258; +UPDATE `item_template` SET `armor`=131 WHERE `entry`=23261; +UPDATE `item_template` SET `armor`=115 WHERE `entry`=23262; +UPDATE `item_template` SET `armor`=141 WHERE `entry`=23263; +UPDATE `item_template` SET `armor`=135 WHERE `entry`=23264; +UPDATE `item_template` SET `armor`=155 WHERE `entry`=23284; +UPDATE `item_template` SET `armor`=166 WHERE `entry`=23285; +UPDATE `item_template` SET `armor`=98 WHERE `entry`=23288; +UPDATE `item_template` SET `armor`=98 WHERE `entry`=23290; +UPDATE `item_template` SET `armor`=104 WHERE `entry`=23291; +UPDATE `item_template` SET `armor`=218 WHERE `entry`=23294; +UPDATE `item_template` SET `armor`=215 WHERE `entry`=23295; +UPDATE `item_template` SET `armor`=248 WHERE `entry`=23298; +UPDATE `item_template` SET `armor`=225 WHERE `entry`=23299; +UPDATE `item_template` SET `armor`=144 WHERE `entry`=23302; +UPDATE `item_template` SET `armor`=156 WHERE `entry`=23303; +UPDATE `item_template` SET `armor`=144 WHERE `entry`=23304; +UPDATE `item_template` SET `armor`=156 WHERE `entry`=23305; +UPDATE `item_template` SET `armor`=198 WHERE `entry`=23308; +UPDATE `item_template` SET `armor`=206 WHERE `entry`=23309; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=23312; +UPDATE `item_template` SET `armor`=196 WHERE `entry`=23313; +UPDATE `item_template` SET `armor`=131 WHERE `entry`=23316; +UPDATE `item_template` SET `armor`=115 WHERE `entry`=23317; +UPDATE `item_template` SET `armor`=141 WHERE `entry`=23318; +UPDATE `item_template` SET `armor`=135 WHERE `entry`=23319; +UPDATE `item_template` SET `armor`=943 WHERE `entry`=23517; +UPDATE `item_template` SET `armor`=1257 WHERE `entry`=23518; +UPDATE `item_template` SET `armor`=1284 WHERE `entry`=23519; +UPDATE `item_template` SET `armor`=1366 WHERE `entry`=23535; +UPDATE `item_template` SET `armor`=223 WHERE `entry`=23825; +UPDATE `item_template` SET `armor`=349 WHERE `entry`=24258; +UPDATE `item_template` SET `armor`=271 WHERE `entry`=24379; +UPDATE `item_template` SET `armor`=181 WHERE `entry`=26030; +UPDATE `item_template` SET `armor`=184 WHERE `entry`=27645; +UPDATE `item_template` SET `armor`=284 WHERE `entry`=27648; +UPDATE `item_template` SET `armor`=205 WHERE `entry`=27768; +UPDATE `item_template` SET `armor`=216 WHERE `entry`=27988; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=28126; +UPDATE `item_template` SET `armor`=356 WHERE `entry`=28127; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=28128; +UPDATE `item_template` SET `armor`=331 WHERE `entry`=28129; +UPDATE `item_template` SET `armor`=429 WHERE `entry`=28130; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=28136; +UPDATE `item_template` SET `armor`=356 WHERE `entry`=28137; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=28138; +UPDATE `item_template` SET `armor`=331 WHERE `entry`=28139; +UPDATE `item_template` SET `armor`=429 WHERE `entry`=28140; +UPDATE `item_template` SET `armor`=143 WHERE `entry`=28211; +UPDATE `item_template` SET `armor`=390 WHERE `entry`=28256; +UPDATE `item_template` SET `armor`=234 WHERE `entry`=28301; +UPDATE `item_template` SET `armor`=259 WHERE `entry`=28443; +UPDATE `item_template` SET `armor`=307 WHERE `entry`=28444; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=28445; +UPDATE `item_template` SET `armor`=259 WHERE `entry`=28446; +UPDATE `item_template` SET `armor`=307 WHERE `entry`=28447; +UPDATE `item_template` SET `armor`=187 WHERE `entry`=28448; +UPDATE `item_template` SET `armor`=248 WHERE `entry`=28574; +UPDATE `item_template` SET `armor`=248 WHERE `entry`=28575; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=28618; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=28619; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=28620; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=28622; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=28623; +UPDATE `item_template` SET `armor`=385 WHERE `entry`=28660; +UPDATE `item_template` SET `armor`=223 WHERE `entry`=28675; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=28719; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=28720; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=28721; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=28722; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=28723; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=28811; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=28812; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=28813; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=28814; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=28815; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=28871; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=28872; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=28873; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=28874; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=28875; +UPDATE `item_template` SET `armor`=259 WHERE `entry`=28976; +UPDATE `item_template` SET `armor`=307 WHERE `entry`=28977; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=28978; +UPDATE `item_template` SET `armor`=259 WHERE `entry`=29004; +UPDATE `item_template` SET `armor`=307 WHERE `entry`=29005; +UPDATE `item_template` SET `armor`=187 WHERE `entry`=29006; +UPDATE `item_template` SET `armor`=294 WHERE `entry`=29276; +UPDATE `item_template` SET `armor`=350 WHERE `entry`=29277; +UPDATE `item_template` SET `armor`=371 WHERE `entry`=29278; +UPDATE `item_template` SET `armor`=392 WHERE `entry`=29279; +UPDATE `item_template` SET `armor`=294 WHERE `entry`=29384; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=29385; +UPDATE `item_template` SET `armor`=393 WHERE `entry`=29607; +UPDATE `item_template` SET `armor`=262 WHERE `entry`=29777; +UPDATE `item_template` SET `armor`=489 WHERE `entry`=30069; +UPDATE `item_template` SET `armor`=257 WHERE `entry`=30931; +UPDATE `item_template` SET `armor`=195 WHERE `entry`=30932; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=31375; +UPDATE `item_template` SET `armor`=356 WHERE `entry`=31376; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=31377; +UPDATE `item_template` SET `armor`=331 WHERE `entry`=31378; +UPDATE `item_template` SET `armor`=429 WHERE `entry`=31379; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=31584; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=31585; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=31586; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=31587; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=31588; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=31589; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=31590; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=31591; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=31592; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=31593; +UPDATE `item_template` SET `armor`=259 WHERE `entry`=31594; +UPDATE `item_template` SET `armor`=307 WHERE `entry`=31595; +UPDATE `item_template` SET `armor`=259 WHERE `entry`=31596; +UPDATE `item_template` SET `armor`=307 WHERE `entry`=31597; +UPDATE `item_template` SET `armor`=187 WHERE `entry`=31598; +UPDATE `item_template` SET `armor`=187 WHERE `entry`=31599; +UPDATE `item_template` SET `armor`=324 WHERE `entry`=31967; +UPDATE `item_template` SET `armor`=404 WHERE `entry`=31968; +UPDATE `item_template` SET `armor`=417 WHERE `entry`=31969; +UPDATE `item_template` SET `armor`=377 WHERE `entry`=31971; +UPDATE `item_template` SET `armor`=498 WHERE `entry`=31972; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=31973; +UPDATE `item_template` SET `armor`=395 WHERE `entry`=31974; +UPDATE `item_template` SET `armor`=410 WHERE `entry`=31975; +UPDATE `item_template` SET `armor`=311 WHERE `entry`=31976; +UPDATE `item_template` SET `armor`=438 WHERE `entry`=31977; +UPDATE `item_template` SET `armor`=311 WHERE `entry`=31979; +UPDATE `item_template` SET `armor`=395 WHERE `entry`=31980; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=31981; +UPDATE `item_template` SET `armor`=438 WHERE `entry`=31982; +UPDATE `item_template` SET `armor`=410 WHERE `entry`=31983; +UPDATE `item_template` SET `armor`=310 WHERE `entry`=31987; +UPDATE `item_template` SET `armor`=390 WHERE `entry`=31988; +UPDATE `item_template` SET `armor`=417 WHERE `entry`=31989; +UPDATE `item_template` SET `armor`=377 WHERE `entry`=31990; +UPDATE `item_template` SET `armor`=470 WHERE `entry`=31991; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=32015; +UPDATE `item_template` SET `armor`=395 WHERE `entry`=32016; +UPDATE `item_template` SET `armor`=410 WHERE `entry`=32017; +UPDATE `item_template` SET `armor`=311 WHERE `entry`=32018; +UPDATE `item_template` SET `armor`=438 WHERE `entry`=32019; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=32034; +UPDATE `item_template` SET `armor`=395 WHERE `entry`=32035; +UPDATE `item_template` SET `armor`=410 WHERE `entry`=32036; +UPDATE `item_template` SET `armor`=311 WHERE `entry`=32037; +UPDATE `item_template` SET `armor`=438 WHERE `entry`=32038; +UPDATE `item_template` SET `armor`=310 WHERE `entry`=32056; +UPDATE `item_template` SET `armor`=390 WHERE `entry`=32057; +UPDATE `item_template` SET `armor`=431 WHERE `entry`=32058; +UPDATE `item_template` SET `armor`=363 WHERE `entry`=32059; +UPDATE `item_template` SET `armor`=470 WHERE `entry`=32060; +UPDATE `item_template` SET `armor`=336 WHERE `entry`=32786; +UPDATE `item_template` SET `armor`=336 WHERE `entry`=32788; +UPDATE `item_template` SET `armor`=336 WHERE `entry`=32796; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=32798; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=32800; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=32808; +UPDATE `item_template` SET `armor`=216 WHERE `entry`=32810; +UPDATE `item_template` SET `armor`=216 WHERE `entry`=32812; +UPDATE `item_template` SET `armor`=216 WHERE `entry`=32821; +UPDATE `item_template` SET `armor`=295 WHERE `entry`=33054; +UPDATE `item_template` SET `armor`=293 WHERE `entry`=33759; +UPDATE `item_template` SET `armor`=471 WHERE `entry`=33702; +UPDATE `item_template` SET `armor`=343 WHERE `entry`=33700; +UPDATE `item_template` SET `armor`=409 WHERE `entry`=33677; +UPDATE `item_template` SET `armor`=409 WHERE `entry`=33718; +UPDATE `item_template` SET `armor`=293 WHERE `entry`=33717; +UPDATE `item_template` SET `armor`=409 WHERE `entry`=33745; +UPDATE `item_template` SET `armor`=443 WHERE `entry`=33673; +UPDATE `item_template` SET `armor`=409 WHERE `entry`=33758; +UPDATE `item_template` SET `armor`=346 WHERE `entry`=33593; +UPDATE `item_template` SET `armor`=424 WHERE `entry`=33761; +UPDATE `item_template` SET `armor`=329 WHERE `entry`=33690; +UPDATE `item_template` SET `armor`=293 WHERE `entry`=33676; +UPDATE `item_template` SET `armor`=529 WHERE `entry`=33675; +UPDATE `item_template` SET `armor`=454 WHERE `entry`=33680; +UPDATE `item_template` SET `armor`=443 WHERE `entry`=33701; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=33914; +UPDATE `item_template` SET `armor`=173 WHERE `entry`=33913; +UPDATE `item_template` SET `armor`=454 WHERE `entry`=33721; +UPDATE `item_template` SET `armor`=208 WHERE `entry`=33900; +UPDATE `item_template` SET `armor`=454 WHERE `entry`=33760; +UPDATE `item_template` SET `armor`=529 WHERE `entry`=33704; +UPDATE `item_template` SET `armor`=409 WHERE `entry`=33683; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=33884; +UPDATE `item_template` SET `armor`=208 WHERE `entry`=33912; +UPDATE `item_template` SET `armor`=293 WHERE `entry`=33684; +UPDATE `item_template` SET `armor`=173 WHERE `entry`=33901; +UPDATE `item_template` SET `armor`=424 WHERE `entry`=33678; +UPDATE `item_template` SET `armor`=208 WHERE `entry`=33882; +UPDATE `item_template` SET `armor`=173 WHERE `entry`=33883; +UPDATE `item_template` SET `armor`=293 WHERE `entry`=33744; +UPDATE `item_template` SET `armor`=300 WHERE `entry`=33879; +UPDATE `item_template` SET `armor`=343 WHERE `entry`=33671; +UPDATE `item_template` SET `armor`=415 WHERE `entry`=33691; +UPDATE `item_template` SET `armor`=501 WHERE `entry`=33694; +UPDATE `item_template` SET `armor`=300 WHERE `entry`=33885; +UPDATE `item_template` SET `armor`=357 WHERE `entry`=33886; +UPDATE `item_template` SET `armor`=236 WHERE `entry`=33887; +UPDATE `item_template` SET `armor`=238 WHERE `entry`=33902; +UPDATE `item_template` SET `armor`=429 WHERE `entry`=33672; +UPDATE `item_template` SET `armor`=236 WHERE `entry`=33881; +UPDATE `item_template` SET `armor`=424 WHERE `entry`=33686; +UPDATE `item_template` SET `armor`=454 WHERE `entry`=33685; +UPDATE `item_template` SET `armor`=443 WHERE `entry`=33692; +UPDATE `item_template` SET `armor`=424 WHERE `entry`=33719; +UPDATE `item_template` SET `armor`=454 WHERE `entry`=33748; +UPDATE `item_template` SET `armor`=357 WHERE `entry`=33880; +UPDATE `item_template` SET `armor`=236 WHERE `entry`=33917; +UPDATE `item_template` SET `armor`=329 WHERE `entry`=33767; +UPDATE `item_template` SET `armor`=457 WHERE `entry`=33769; +UPDATE `item_template` SET `armor`=357 WHERE `entry`=33916; +UPDATE `item_template` SET `armor`=415 WHERE `entry`=33768; +UPDATE `item_template` SET `armor`=501 WHERE `entry`=33771; +UPDATE `item_template` SET `armor`=300 WHERE `entry`=33915; +UPDATE `item_template` SET `armor`=424 WHERE `entry`=33746; +UPDATE `item_template` SET `armor`=323 WHERE `entry`=33679; +UPDATE `item_template` SET `armor`=323 WHERE `entry`=33682; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=33693; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=33674; +UPDATE `item_template` SET `armor`=386 WHERE `entry`=33770; +UPDATE `item_template` SET `armor`=323 WHERE `entry`=33747; +UPDATE `item_template` SET `armor`=323 WHERE `entry`=33720; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=33703; +UPDATE `item_template` SET `armor`=323 WHERE `entry`=33757; +UPDATE `item_template` SET `armor`=252 WHERE `entry`=34706; +UPDATE `item_template` SET `armor`=387 WHERE `entry`=34810; +UPDATE `item_template` SET `armor`=392 WHERE `entry`=34888; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=35356; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=35357; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35358; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=35359; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=35360; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=35361; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=35362; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35363; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=35364; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=35365; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=35371; +UPDATE `item_template` SET `armor`=267 WHERE `entry`=35372; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35373; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=35374; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=35375; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=35469; +UPDATE `item_template` SET `armor`=249 WHERE `entry`=35470; +UPDATE `item_template` SET `armor`=213 WHERE `entry`=35471; +UPDATE `item_template` SET `armor`=308 WHERE `entry`=34213; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35003; +UPDATE `item_template` SET `armor`=354 WHERE `entry`=35022; +UPDATE `item_template` SET `armor`=478 WHERE `entry`=35024; +UPDATE `item_template` SET `armor`=430 WHERE `entry`=35025; +UPDATE `item_template` SET `armor`=541 WHERE `entry`=35026; +UPDATE `item_template` SET `armor`=447 WHERE `entry`=35023; +UPDATE `item_template` SET `armor`=430 WHERE `entry`=35001; +UPDATE `item_template` SET `armor`=569 WHERE `entry`=35002; +UPDATE `item_template` SET `armor`=461 WHERE `entry`=34999; +UPDATE `item_template` SET `armor`=368 WHERE `entry`=34998; +UPDATE `item_template` SET `armor`=478 WHERE `entry`=35000; +UPDATE `item_template` SET `armor`=416 WHERE `entry`=35114; +UPDATE `item_template` SET `armor`=541 WHERE `entry`=35115; +UPDATE `item_template` SET `armor`=447 WHERE `entry`=35112; +UPDATE `item_template` SET `armor`=354 WHERE `entry`=35111; +UPDATE `item_template` SET `armor`=492 WHERE `entry`=35113; +UPDATE `item_template` SET `armor`=476 WHERE `entry`=35099; +UPDATE `item_template` SET `armor`=442 WHERE `entry`=35100; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35098; +UPDATE `item_template` SET `armor`=339 WHERE `entry`=35096; +UPDATE `item_template` SET `armor`=426 WHERE `entry`=35097; +UPDATE `item_template` SET `armor`=368 WHERE `entry`=35032; +UPDATE `item_template` SET `armor`=569 WHERE `entry`=35036; +UPDATE `item_template` SET `armor`=475 WHERE `entry`=35033; +UPDATE `item_template` SET `armor`=430 WHERE `entry`=35035; +UPDATE `item_template` SET `armor`=506 WHERE `entry`=35034; +UPDATE `item_template` SET `armor`=442 WHERE `entry`=35005; +UPDATE `item_template` SET `armor`=476 WHERE `entry`=35007; +UPDATE `item_template` SET `armor`=339 WHERE `entry`=35006; +UPDATE `item_template` SET `armor`=426 WHERE `entry`=35004; +UPDATE `item_template` SET `armor`=339 WHERE `entry`=35009; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35011; +UPDATE `item_template` SET `armor`=476 WHERE `entry`=35012; +UPDATE `item_template` SET `armor`=426 WHERE `entry`=35010; +UPDATE `item_template` SET `armor`=442 WHERE `entry`=35013; +UPDATE `item_template` SET `armor`=219 WHERE `entry`=35153; +UPDATE `item_template` SET `armor`=219 WHERE `entry`=35159; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35053; +UPDATE `item_template` SET `armor`=219 WHERE `entry`=35164; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=35165; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=35152; +UPDATE `item_template` SET `armor`=253 WHERE `entry`=35167; +UPDATE `item_template` SET `armor`=322 WHERE `entry`=35154; +UPDATE `item_template` SET `armor`=183 WHERE `entry`=35168; +UPDATE `item_template` SET `armor`=183 WHERE `entry`=35174; +UPDATE `item_template` SET `armor`=442 WHERE `entry`=35055; +UPDATE `item_template` SET `armor`=183 WHERE `entry`=35179; +UPDATE `item_template` SET `armor`=385 WHERE `entry`=35139; +UPDATE `item_template` SET `armor`=253 WHERE `entry`=35169; +UPDATE `item_template` SET `armor`=476 WHERE `entry`=35057; +UPDATE `item_template` SET `armor`=426 WHERE `entry`=35054; +UPDATE `item_template` SET `armor`=442 WHERE `entry`=35085; +UPDATE `item_template` SET `armor`=476 WHERE `entry`=35087; +UPDATE `item_template` SET `armor`=339 WHERE `entry`=35086; +UPDATE `item_template` SET `armor`=426 WHERE `entry`=35084; +UPDATE `item_template` SET `armor`=306 WHERE `entry`=35083; +UPDATE `item_template` SET `armor`=339 WHERE `entry`=35056; +UPDATE `item_template` SET `armor`=253 WHERE `entry`=35149; +UPDATE `item_template` SET `armor`=253 WHERE `entry`=35180; +UPDATE `item_template` SET `armor`=385 WHERE `entry`=35150; +UPDATE `item_template` SET `armor`=385 WHERE `entry`=35137; +UPDATE `item_template` SET `armor`=253 WHERE `entry`=35138; +UPDATE `item_template` SET `armor`=253 WHERE `entry`=35144; +UPDATE `item_template` SET `armor`=170 WHERE `entry`=6733; +UPDATE `item_template` SET `armor`=605 WHERE `entry`=15141; +UPDATE `item_template` SET `armor`=504 WHERE `entry`=37084; +UPDATE `item_template` SET `armor`=486 WHERE `entry`=39225; +UPDATE `item_template` SET `armor`=490 WHERE `entry`=40252; +UPDATE `item_template` SET `armor`=1788 WHERE `entry`=41190; +UPDATE `item_template` SET `armor`=337 WHERE `entry`=41238; +UPDATE `item_template` SET `armor`=1438 WHERE `entry`=42826; +UPDATE `item_template` SET `armor`=2880 WHERE `entry`=45267; +UPDATE `item_template` SET `armor`=3500 WHERE `entry`=49904; +UPDATE `item_template` SET `armor`=737 WHERE `entry`=50466; +UPDATE `item_template` SET `armor`=1735 WHERE `entry`=50802; +UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50849; +UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50850; +UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50856; +UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50857; +UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50863; +UPDATE `item_template` SET `armor`=3817 WHERE `entry`=50968; +UPDATE `item_template` SET `armor`=2658 WHERE `entry`=50978; +UPDATE `item_template` SET `armor`=2143 WHERE `entry`=50991; +UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51172; +UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51174; +UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51217; +UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50864; +UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51132; +UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51219; +UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51220; +UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51222; +UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51134; +UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51265; +UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51267; +UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51305; +UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51307; +UPDATE `item_template` SET `armor`=1869 WHERE `entry`=51901; +UPDATE `item_template` SET `armor`=649 WHERE `entry`=54801; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=42680; +UPDATE `item_template` SET `armor`=356 WHERE `entry`=42681; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=42682; +UPDATE `item_template` SET `armor`=331 WHERE `entry`=42683; +UPDATE `item_template` SET `armor`=429 WHERE `entry`=42684; +UPDATE `item_template` SET `armor`=283 WHERE `entry`=42685; +UPDATE `item_template` SET `armor`=356 WHERE `entry`=42686; +UPDATE `item_template` SET `armor`=400 WHERE `entry`=42687; +UPDATE `item_template` SET `armor`=331 WHERE `entry`=42688; +UPDATE `item_template` SET `armor`=429 WHERE `entry`=42689; diff --git a/sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql b/sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql deleted file mode 100644 index 89cc8f08cce..00000000000 --- a/sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql +++ /dev/null @@ -1,27 +0,0 @@ --- Add missing text and update old one --- Malygos -UPDATE `creature_text` SET `probability`=100 WHERE `entry`=28859; -- Was at 0 for some reason -UPDATE `creature_text` SET `text`='Unthinkable! The mortals will destroy... everything! My sister, what have you...',`sound`=14540 WHERE `entry`=28859 AND `groupid`=14 AND `id`=0; -DELETE FROM `creature_text` WHERE `entry`=28859 AND `groupid` IN (15,16); -DELETE FROM `creature_text` WHERE `entry`=30084; -INSERT INTO `creature_text` (`entry`,`groupid`,`text`,`type`,`probability`,`sound`,`comment`) VALUES -(28859,15, '%s fixes his eyes on you!', 42,100,0, 'Malygos'), -(28859,16, 'I am without limits here. The rules of your cherished reality do not apply. In this realm, I am in control!',14,100,14515, 'Malygos'), -(30084,0, 'A Power Spark forms from a nearby rift!',41,100,14522, 'Power spark to portal'); --- Alexstrasza, add missing sounds -UPDATE `creature_text` SET `probability`=100,`sound`=14406 WHERE `entry`=32295 AND `groupid`=0 AND `id`=0; -UPDATE `creature_text` SET `probability`=100,`sound`=14407 WHERE `entry`=32295 AND `groupid`=1 AND `id`=0; -UPDATE `creature_text` SET `probability`=100,`sound`=14408 WHERE `entry`=32295 AND `groupid`=2 AND `id`=0; -UPDATE `creature_text` SET `probability`=100,`sound`=14409 WHERE `entry`=32295 AND `groupid`=3 AND `id`=0; - --- Update portal InhabitType, otherwise it falls on summon -UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=30118; - --- Update drakes templates -UPDATE `creature_template` SET `unit_flags`=8,`InhabitType`=4 WHERE `entry`=30161; -- no fly aura present only enabled gravity in sniffs - --- Addon data -DELETE FROM `creature_template_addon` WHERE `entry` IN (30084,30161); -INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES -(30084,0,0,50331648,1,0,'55845'), -- Power Spark -(30161,0,0,50331648,1,0,'60534'); -- Wyrmrest Skytalon (uses no fly aura) diff --git a/sql/old/3.3.5a/2013_01_02_05_world_eye_of_eternity.sql b/sql/old/3.3.5a/2013_01_02_05_world_eye_of_eternity.sql new file mode 100644 index 00000000000..89cc8f08cce --- /dev/null +++ b/sql/old/3.3.5a/2013_01_02_05_world_eye_of_eternity.sql @@ -0,0 +1,27 @@ +-- Add missing text and update old one +-- Malygos +UPDATE `creature_text` SET `probability`=100 WHERE `entry`=28859; -- Was at 0 for some reason +UPDATE `creature_text` SET `text`='Unthinkable! The mortals will destroy... everything! My sister, what have you...',`sound`=14540 WHERE `entry`=28859 AND `groupid`=14 AND `id`=0; +DELETE FROM `creature_text` WHERE `entry`=28859 AND `groupid` IN (15,16); +DELETE FROM `creature_text` WHERE `entry`=30084; +INSERT INTO `creature_text` (`entry`,`groupid`,`text`,`type`,`probability`,`sound`,`comment`) VALUES +(28859,15, '%s fixes his eyes on you!', 42,100,0, 'Malygos'), +(28859,16, 'I am without limits here. The rules of your cherished reality do not apply. In this realm, I am in control!',14,100,14515, 'Malygos'), +(30084,0, 'A Power Spark forms from a nearby rift!',41,100,14522, 'Power spark to portal'); +-- Alexstrasza, add missing sounds +UPDATE `creature_text` SET `probability`=100,`sound`=14406 WHERE `entry`=32295 AND `groupid`=0 AND `id`=0; +UPDATE `creature_text` SET `probability`=100,`sound`=14407 WHERE `entry`=32295 AND `groupid`=1 AND `id`=0; +UPDATE `creature_text` SET `probability`=100,`sound`=14408 WHERE `entry`=32295 AND `groupid`=2 AND `id`=0; +UPDATE `creature_text` SET `probability`=100,`sound`=14409 WHERE `entry`=32295 AND `groupid`=3 AND `id`=0; + +-- Update portal InhabitType, otherwise it falls on summon +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=30118; + +-- Update drakes templates +UPDATE `creature_template` SET `unit_flags`=8,`InhabitType`=4 WHERE `entry`=30161; -- no fly aura present only enabled gravity in sniffs + +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (30084,30161); +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(30084,0,0,50331648,1,0,'55845'), -- Power Spark +(30161,0,0,50331648,1,0,'60534'); -- Wyrmrest Skytalon (uses no fly aura) -- cgit v1.2.3 From 028c72a9f2c606e8af391d284931c60247ad0160 Mon Sep 17 00:00:00 2001 From: Nay Date: Mon, 18 Feb 2013 12:24:18 +0000 Subject: Core/NPCs: Refactor equipments - creature_template.equipment_id deleted - creature_equip_template.entry == creature_template.entry - id field added to creature_equip_template -> PK(entry, id) - id field in creature_equip_template starts at 1 - creature.equipment_id references id of creature_equip_template - creature.equipment_id = 0 means no equipment at all (default 1) - creature.equipment_id = -1 means pick a random equipment from creature_equip_template - add equipment info to .npc info command While table creature_equip_template got bigger in size, this system is easier to mantain and allows creatures to have a random template from a group of equipments --- .../world/2013_02_18_00_world_misc_equip.sql | 73 +++++++++++++++++++ .../world/2013_02_18_01_world_trinity_string.sql | 3 + src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 4 +- src/server/game/AI/SmartScripts/SmartScript.cpp | 15 ++-- src/server/game/Entities/Creature/Creature.cpp | 20 +++--- src/server/game/Entities/Creature/Creature.h | 17 +++-- src/server/game/Events/GameEventMgr.cpp | 20 +++--- src/server/game/Events/GameEventMgr.h | 4 +- src/server/game/Globals/ObjectMgr.cpp | 82 +++++++++++++--------- src/server/game/Globals/ObjectMgr.h | 2 +- src/server/game/Miscellaneous/Language.h | 3 +- src/server/game/Spells/SpellEffects.cpp | 2 +- src/server/game/World/World.cpp | 6 +- src/server/scripts/Commands/cs_npc.cpp | 1 + src/server/scripts/Commands/cs_reload.cpp | 7 +- .../EasternKingdoms/ScarletEnclave/chapter1.cpp | 6 +- .../EasternKingdoms/ScarletEnclave/chapter2.cpp | 2 +- .../SerpentShrine/boss_leotheras_the_blind.cpp | 8 +-- .../Database/Implementation/WorldDatabase.cpp | 2 +- 19 files changed, 186 insertions(+), 91 deletions(-) create mode 100644 sql/updates/world/2013_02_18_00_world_misc_equip.sql create mode 100644 sql/updates/world/2013_02_18_01_world_trinity_string.sql (limited to 'sql') diff --git a/sql/updates/world/2013_02_18_00_world_misc_equip.sql b/sql/updates/world/2013_02_18_00_world_misc_equip.sql new file mode 100644 index 00000000000..a5964cd883b --- /dev/null +++ b/sql/updates/world/2013_02_18_00_world_misc_equip.sql @@ -0,0 +1,73 @@ +-- creature_template.equipment_id deleted +-- creature_equip_template.entry == creature_template.entry +-- id field added to creature_equip_template -> PK(entry, id) +-- id field in creature_equip_template starts at 1 +-- creature.equipment_id references id of creature_equip_template +-- creature.equipment_id = 0 means no equipment at all (default 1) +-- creature.equipment_id = -1 means pick a random equipment from creature_equip_template + +-- Diff_entries should use the same template of the normal entry +UPDATE `creature_template` SET `equipment_id` = 0 WHERE `name` LIKE '%(1)' OR `name` LIKE '%(2)' OR `name` LIKE '%(3)' OR `name` LIKE '%(4)'; + +-- Delete unused templates +DROP TABLE IF EXISTS `temp_c_e`; +CREATE TABLE IF NOT EXISTS `temp_c_e` (`entry` mediumint(8)); +ALTER TABLE `temp_c_e` ADD INDEX `ind` (`entry`); +INSERT INTO `temp_c_e` SELECT `equipment_id` FROM `creature_template` WHERE `equipment_id` != 0 UNION + SELECT `equipment_id` FROM `creature` WHERE `equipment_id` != 0 UNION + SELECT `equipment_id` FROM `game_event_model_equip` WHERE `equipment_id` != 0; +DELETE FROM `creature_equip_template` WHERE `entry` NOT IN (SELECT `entry` FROM `temp_c_e`); +DROP TABLE `temp_c_e`; + +-- Create temporary table to hold the values of creature_equip_template with converted entry +DROP TABLE IF EXISTS `creature_equip_template2`; +CREATE TABLE IF NOT EXISTS `creature_equip_template2` ( + `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `id` tinyint(3) unsigned NOT NULL DEFAULT '1', + `itemEntry1` mediumint(8) unsigned NOT NULL DEFAULT '0', + `itemEntry2` mediumint(8) unsigned NOT NULL DEFAULT '0', + `itemEntry3` mediumint(8) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`entry`, `id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `creature_equip_template2` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) + SELECT `creature_template`.`entry`, 1, `itemEntry1`, `itemEntry2`, `itemEntry3` + FROM `creature_template` + JOIN `creature_equip_template` ON `creature_equip_template`.`entry` = `equipment_id` + WHERE `equipment_id` != 0; + +INSERT IGNORE INTO `creature_equip_template2` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) + SELECT `id`, 2, `itemEntry1`, `itemEntry2`, `itemEntry3` + FROM `creature` + JOIN `creature_equip_template` ON `creature_equip_template`.`entry` = `equipment_id` + WHERE `equipment_id` != 0; + +DROP TABLE `creature_equip_template`; +RENAME TABLE `creature_equip_template2` TO `creature_equip_template`; + +UPDATE `creature` SET `equipment_id` = 2 WHERE `equipment_id` != 0; +UPDATE `creature` SET `equipment_id` = 1 WHERE `equipment_id` = 0; + +-- From game_event_model_equip +UPDATE `creature` SET `equipment_id` = 1 WHERE `guid` IN (12088, 12093, 12095, 79670, 79675, 79676, 79690, 79792, 79807, 79814); +UPDATE `game_event_model_equip` SET `equipment_id` = 2 WHERE `guid` IN (12088, 12093, 12095, 79670, 79675, 79676, 79690, 79792, 79807, 79814); +DELETE FROM `creature_equip_template` WHERE `entry` IN (1976, 23585, 424) AND `id`=2; +INSERT INTO `creature_equip_template` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) VALUES +(1976, 2, 2715, 143, 0), +(23585, 2, 2715, 143, 0), +(424, 2, 2715, 143, 0); + +-- ALTER TABLE `creature_equip_template` CHANGE `entry` `entry` mediumint(8) unsigned NOT NULL; +-- ALTER TABLE `creature_equip_template` ADD `id` tinyint(3) unsigned NOT NULL DEFAULT '1' AFTER `entry`; +-- ALTER TABLE `creature_equip_template` DROP INDEX `PRIMARY`, ADD PRIMARY KEY (`entry`, `id`); +ALTER TABLE `creature_template` DROP `equipment_id`; +ALTER TABLE `creature` CHANGE `equipment_id` `equipment_id` tinyint(3) unsigned NOT NULL DEFAULT '1'; +ALTER TABLE `game_event_model_equip` CHANGE `equipment_id` `equipment_id` tinyint(3) unsigned NOT NULL DEFAULT '1'; + +-- Conversion from SAI +UPDATE `smart_scripts` SET `action_param1` = 1 WHERE `entryorguid` = 2523901 AND `source_type` = 9 AND `id` = 3; +UPDATE `smart_scripts` SET `action_param1` = 0 WHERE `entryorguid` = 2523900 AND `source_type` = 9 AND `id` = 2; +UPDATE `smart_scripts` SET `action_param1` = 2 WHERE `entryorguid` = 32720 AND `source_type` = 0 AND `id` = 0; +DELETE FROM `creature_equip_template` WHERE `entry` = 25239 AND `id`=1; +INSERT INTO `creature_equip_template` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) VALUES +(25239, 1, 6829, 0, 0); diff --git a/sql/updates/world/2013_02_18_01_world_trinity_string.sql b/sql/updates/world/2013_02_18_01_world_trinity_string.sql new file mode 100644 index 00000000000..84d28222fe7 --- /dev/null +++ b/sql/updates/world/2013_02_18_01_world_trinity_string.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry` = 5036; +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +(5036, 'EquipmentId: %u (Original: %u).'); diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 6c947d11f07..2da40f287a5 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -370,9 +370,7 @@ void ScriptedAI::SetEquipmentSlots(bool loadDefault, int32 mainHand /*= EQUIP_NO { if (loadDefault) { - if (CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(me->GetEntry())) - me->LoadEquipment(creatureInfo->equipmentId, true); - + me->LoadEquipment(me->GetOriginalEquipmentId(), true); return; } diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 80388ce0be9..bc94169687c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1459,15 +1459,16 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (Creature* npc = (*itr)->ToCreature()) { uint32 slot[3]; - if (e.action.equip.entry) + int8 equipId = (int8)e.action.equip.entry; + if (equipId) { - EquipmentInfo const* einfo = sObjectMgr->GetEquipmentInfo(e.action.equip.entry); + EquipmentInfo const* einfo = sObjectMgr->GetEquipmentInfo(npc->GetEntry(), equipId); if (!einfo) { - sLog->outError(LOG_FILTER_SQL, "SmartScript: SMART_ACTION_EQUIP uses non-existent equipment info entry %u", e.action.equip.entry); + sLog->outError(LOG_FILTER_SQL, "SmartScript: SMART_ACTION_EQUIP uses non-existent equipment info id %u for creature %u", equipId, npc->GetEntry()); return; } - npc->SetCurrentEquipmentId(e.action.equip.entry); + npc->SetCurrentEquipmentId(equipId); slot[0] = einfo->ItemEntry[0]; slot[1] = einfo->ItemEntry[1]; slot[2] = einfo->ItemEntry[2]; @@ -1478,11 +1479,11 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u slot[1] = e.action.equip.slot2; slot[2] = e.action.equip.slot3; } - if (!e.action.equip.mask || e.action.equip.mask & 1) + if (!e.action.equip.mask || (e.action.equip.mask & 1)) npc->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, slot[0]); - if (!e.action.equip.mask || e.action.equip.mask & 2) + if (!e.action.equip.mask || (e.action.equip.mask & 2)) npc->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, slot[1]); - if (!e.action.equip.mask || e.action.equip.mask & 4) + if (!e.action.equip.mask || (e.action.equip.mask & 4)) npc->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, slot[2]); } } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 0bcb2d76055..9b991393c6e 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -145,7 +145,7 @@ Creature::Creature(bool isWorldObject): Unit(isWorldObject), MapCreature(), lootForPickPocketed(false), lootForBody(false), m_groupLootTimer(0), lootingGroupLowGUID(0), m_PlayerDamageReq(0), m_lootRecipient(0), m_lootRecipientGroup(0), m_corpseRemoveTime(0), m_respawnTime(0), m_respawnDelay(300), m_corpseDelay(60), m_respawnradius(0.0f), m_reactState(REACT_AGGRESSIVE), -m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_AlreadyCallAssistance(false), +m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(1), m_originalEquipmentId(1), m_AlreadyCallAssistance(false), m_AlreadySearchedAssistance(false), m_regenHealth(true), m_AI_locked(false), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_creatureInfo(NULL), m_creatureData(NULL), m_path_id(0), m_formation(NULL) { @@ -323,8 +323,8 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData* data // Load creature equipment if (!data || data->equipmentId == 0) // use default from the template - LoadEquipment(cinfo->equipmentId); - else if (data && data->equipmentId != -1) // override, -1 means no equipment + LoadEquipment(GetOriginalEquipmentId()); + else if (data && data->equipmentId != 0) // override, 0 means no equipment LoadEquipment(data->equipmentId); SetName(normalInfo->Name); // at normal entry always @@ -1089,7 +1089,7 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) data.mapid = mapid; data.phaseMask = phaseMask; data.displayid = displayId; - data.equipmentId = GetEquipmentId(); + data.equipmentId = GetCurrentEquipmentId(); data.posX = GetPositionX(); data.posY = GetPositionY(); data.posZ = GetPositionZMinusOffset(); @@ -1124,7 +1124,7 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) stmt->setUInt8(index++, spawnMask); stmt->setUInt16(index++, uint16(GetPhaseMask())); stmt->setUInt32(index++, displayId); - stmt->setInt32(index++, int32(GetEquipmentId())); + stmt->setInt32(index++, int32(GetCurrentEquipmentId())); stmt->setFloat(index++, GetPositionX()); stmt->setFloat(index++, GetPositionY()); stmt->setFloat(index++, GetPositionZ()); @@ -1355,24 +1355,24 @@ bool Creature::LoadCreatureFromDB(uint32 guid, Map* map, bool addToMap) return true; } -void Creature::LoadEquipment(uint32 equip_entry, bool force) +void Creature::LoadEquipment(int8 id, bool force /*= true*/) { - if (equip_entry == 0) + if (id == 0) { if (force) { - for (uint8 i = 0; i < 3; ++i) + for (uint8 i = 0; i < MAX_EQUIPMENT_ITEMS; ++i) SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i, 0); m_equipmentId = 0; } return; } - EquipmentInfo const* einfo = sObjectMgr->GetEquipmentInfo(equip_entry); + EquipmentInfo const* einfo = sObjectMgr->GetEquipmentInfo(GetEntry(), id); if (!einfo) return; - m_equipmentId = equip_entry; + m_equipmentId = id; for (uint8 i = 0; i < 3; ++i) SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i, einfo->ItemEntry[i]); } diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index efc4e44798f..827de8bfcef 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -136,7 +136,6 @@ struct CreatureTemplate uint32 questItems[MAX_CREATURE_QUEST_ITEMS]; uint32 movementId; bool RegenHealth; - uint32 equipmentId; uint32 MechanicImmuneMask; uint32 flags_extra; uint32 ScriptID; @@ -236,7 +235,8 @@ struct EquipmentInfo }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP EquipmentInfoContainer; +typedef UNORDERED_MAP EquipmentInfoContainerInternal; +typedef UNORDERED_MAP EquipmentInfoContainer; // from `creature` table struct CreatureData @@ -246,7 +246,7 @@ struct CreatureData uint16 mapid; uint16 phaseMask; uint32 displayid; - int32 equipmentId; + int8 equipmentId; float posX; float posY; float posZ; @@ -454,13 +454,12 @@ class Creature : public Unit, public GridObject, public MapCreature bool Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, uint32 vehId, uint32 team, float x, float y, float z, float ang, const CreatureData* data = NULL); bool LoadCreaturesAddon(bool reload = false); void SelectLevel(const CreatureTemplate* cinfo); - void LoadEquipment(uint32 equip_entry, bool force=false); + void LoadEquipment(int8 id = 1, bool force = false); uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; } void Update(uint32 time); // overwrited Unit::Update void GetRespawnPosition(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const; - uint32 GetEquipmentId() const { return GetCreatureTemplate()->equipmentId; } void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; } uint32 GetCorpseDelay() const { return m_corpseDelay; } @@ -558,8 +557,11 @@ class Creature : public Unit, public GridObject, public MapCreature void UpdateMaxPower(Powers power); void UpdateAttackPowerAndDamage(bool ranged = false); void UpdateDamagePhysical(WeaponAttackType attType); + + uint8 GetOriginalEquipmentId() const { return m_originalEquipmentId; } uint32 GetCurrentEquipmentId() { return m_equipmentId; } - void SetCurrentEquipmentId(uint32 entry) { m_equipmentId = entry; } + void SetCurrentEquipmentId(uint8 id) { m_equipmentId = id; } + float GetSpellDamageMod(int32 Rank); VendorItemData const* GetVendorItems() const; @@ -754,7 +756,8 @@ class Creature : public Unit, public GridObject, public MapCreature void Regenerate(Powers power); MovementGeneratorType m_defaultMovementType; uint32 m_DBTableGuid; ///< For new or temporary creatures is 0 for saved it is lowguid - uint32 m_equipmentId; + uint8 m_equipmentId; + uint8 m_originalEquipmentId; bool m_AlreadyCallAssistance; bool m_AlreadySearchedAssistance; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 95ed06bff37..3fc1345f444 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -450,8 +450,8 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 - QueryResult result = WorldDatabase.Query("SELECT creature.guid, game_event_model_equip.eventEntry, game_event_model_equip.modelid, game_event_model_equip.equipment_id " + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT creature.guid, creature.id, game_event_model_equip.eventEntry, game_event_model_equip.modelid, game_event_model_equip.equipment_id " "FROM creature JOIN game_event_model_equip ON creature.guid=game_event_model_equip.guid"); if (!result) @@ -466,7 +466,8 @@ void GameEventMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); - uint16 event_id = fields[1].GetUInt8(); + uint32 entry = fields[1].GetUInt32(); + uint16 event_id = fields[2].GetUInt8(); if (event_id >= mGameEventModelEquip.size()) { @@ -476,17 +477,18 @@ void GameEventMgr::LoadFromDB() ModelEquipList& equiplist = mGameEventModelEquip[event_id]; ModelEquip newModelEquipSet; - newModelEquipSet.modelid = fields[2].GetUInt32(); - newModelEquipSet.equipment_id = fields[3].GetUInt32(); + newModelEquipSet.modelid = fields[3].GetUInt32(); + newModelEquipSet.equipment_id = fields[4].GetUInt8(); newModelEquipSet.equipement_id_prev = 0; newModelEquipSet.modelid_prev = 0; if (newModelEquipSet.equipment_id > 0) { - if (!sObjectMgr->GetEquipmentInfo(newModelEquipSet.equipment_id)) + int8 equipId = static_cast(newModelEquipSet.equipment_id); + if (!sObjectMgr->GetEquipmentInfo(entry, equipId)) { - sLog->outError(LOG_FILTER_SQL, "Table `game_event_model_equip` have creature (Guid: %u) with equipment_id %u not found in table `creature_equip_template`, set to no equipment.", - guid, newModelEquipSet.equipment_id); + sLog->outError(LOG_FILTER_SQL, "Table `game_event_model_equip` have creature (Guid: %u, entry: %u) with equipment_id %u not found in table `creature_equip_template`, set to no equipment.", + guid, entry, newModelEquipSet.equipment_id); continue; } } @@ -1363,7 +1365,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) sObjectMgr->GetCreatureModelRandomGender(&displayID); if (data2->equipmentId == 0) - itr->second.equipement_id_prev = cinfo->equipmentId; + itr->second.equipement_id_prev = 1; else if (data2->equipmentId != -1) itr->second.equipement_id_prev = data->equipmentId; itr->second.modelid_prev = displayID; diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index d15b3e48dc9..4175e57f28a 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -73,9 +73,9 @@ struct GameEventData struct ModelEquip { uint32 modelid; - uint32 equipment_id; uint32 modelid_prev; - uint32 equipement_id_prev; + uint8 equipment_id; + uint8 equipement_id_prev; }; struct NPCVendorEntry diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 1dd824759c9..f21de9cbfa7 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -404,8 +404,8 @@ void ObjectMgr::LoadCreatureTemplates() "spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, " // 68 69 70 71 72 73 74 75 76 77 78 "InhabitType, HoverHeight, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, " - // 79 80 81 82 83 84 - " questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName " + // 79 80 81 82 83 84 + " questItem6, movementId, RegenHealth, mechanic_immune_mask, flags_extra, ScriptName " "FROM creature_template;"); if (!result) @@ -500,10 +500,9 @@ void ObjectMgr::LoadCreatureTemplates() creatureTemplate.movementId = fields[80].GetUInt32(); creatureTemplate.RegenHealth = fields[81].GetBool(); - creatureTemplate.equipmentId = fields[82].GetUInt32(); - creatureTemplate.MechanicImmuneMask = fields[83].GetUInt32(); - creatureTemplate.flags_extra = fields[84].GetUInt32(); - creatureTemplate.ScriptID = GetScriptId(fields[85].GetCString()); + creatureTemplate.MechanicImmuneMask = fields[82].GetUInt32(); + creatureTemplate.flags_extra = fields[83].GetUInt32(); + creatureTemplate.ScriptID = GetScriptId(fields[84].GetCString()); ++count; } @@ -858,15 +857,6 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) const_cast(cInfo)->MovementType = IDLE_MOTION_TYPE; } - if (cInfo->equipmentId > 0) // 0 no equipment - { - if (!GetEquipmentInfo(cInfo->equipmentId)) - { - sLog->outError(LOG_FILTER_SQL, "Table `creature_template` lists creature (Entry: %u) with `equipment_id` %u not found in table `creature_equip_template`, set to no equipment.", cInfo->Entry, cInfo->equipmentId); - const_cast(cInfo)->equipmentId = 0; - } - } - /// if not set custom creature scale then load scale from CreatureDisplayInfo.dbc if (cInfo->scale <= 0.0f) { @@ -986,11 +976,28 @@ CreatureAddon const* ObjectMgr::GetCreatureTemplateAddon(uint32 entry) return NULL; } -EquipmentInfo const* ObjectMgr::GetEquipmentInfo(uint32 entry) +EquipmentInfo const* ObjectMgr::GetEquipmentInfo(uint32 entry, int8& id) { EquipmentInfoContainer::const_iterator itr = _equipmentInfoStore.find(entry); - if (itr != _equipmentInfoStore.end()) - return &(itr->second); + if (itr == _equipmentInfoStore.end()) + return NULL; + + if (itr->second.empty()) + return NULL; + + if (id == -1) // select a random element + { + EquipmentInfoContainerInternal::const_iterator ritr = itr->second.begin(); + std::advance(ritr, urand(0u, itr->second.size())); + id = std::distance(itr->second.begin(), ritr) + 1; + return &ritr->second; + } + else + { + EquipmentInfoContainerInternal::const_iterator itr2 = itr->second.find(id); + if (itr2 != itr->second.end()) + return &itr2->second; + } return NULL; } @@ -999,7 +1006,8 @@ void ObjectMgr::LoadEquipmentTemplates() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT entry, itemEntry1, itemEntry2, itemEntry3 FROM creature_equip_template"); + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT entry, id, itemEntry1, itemEntry2, itemEntry3 FROM creature_equip_template"); if (!result) { @@ -1012,13 +1020,21 @@ void ObjectMgr::LoadEquipmentTemplates() { Field* fields = result->Fetch(); - uint16 entry = fields[0].GetUInt16(); + uint32 entry = fields[0].GetUInt32(); + + if (!sObjectMgr->GetCreatureTemplate(entry)) + { + sLog->outError(LOG_FILTER_SQL, "Creature template (Entry: %u) does not exist but has a record in `creature_equip_template`", entry); + continue; + } + + uint8 id = fields[1].GetUInt8(); - EquipmentInfo& equipmentInfo = _equipmentInfoStore[entry]; + EquipmentInfo& equipmentInfo = _equipmentInfoStore[entry][id]; - equipmentInfo.ItemEntry[0] = fields[1].GetUInt32(); - equipmentInfo.ItemEntry[1] = fields[2].GetUInt32(); - equipmentInfo.ItemEntry[2] = fields[3].GetUInt32(); + equipmentInfo.ItemEntry[0] = fields[2].GetUInt32(); + equipmentInfo.ItemEntry[1] = fields[3].GetUInt32(); + equipmentInfo.ItemEntry[2] = fields[4].GetUInt32(); for (uint8 i = 0; i < MAX_EQUIPMENT_ITEMS; ++i) { @@ -1029,8 +1045,8 @@ void ObjectMgr::LoadEquipmentTemplates() if (!dbcItem) { - sLog->outError(LOG_FILTER_SQL, "Unknown item (entry=%u) in creature_equip_template.itemEntry%u for entry = %u, forced to 0.", - equipmentInfo.ItemEntry[i], i+1, entry); + sLog->outError(LOG_FILTER_SQL, "Unknown item (entry=%u) in creature_equip_template.itemEntry%u for entry = %u and id=%u, forced to 0.", + equipmentInfo.ItemEntry[i], i+1, entry, id); equipmentInfo.ItemEntry[i] = 0; continue; } @@ -1045,8 +1061,8 @@ void ObjectMgr::LoadEquipmentTemplates() dbcItem->InventoryType != INVTYPE_THROWN && dbcItem->InventoryType != INVTYPE_RANGEDRIGHT) { - sLog->outError(LOG_FILTER_SQL, "Item (entry=%u) in creature_equip_template.itemEntry%u for entry = %u is not equipable in a hand, forced to 0.", - equipmentInfo.ItemEntry[i], i+1, entry); + sLog->outError(LOG_FILTER_SQL, "Item (entry=%u) in creature_equip_template.itemEntry%u for entry = %u and id = %u is not equipable in a hand, forced to 0.", + equipmentInfo.ItemEntry[i], i+1, entry, id); equipmentInfo.ItemEntry[i] = 0; } } @@ -1493,13 +1509,13 @@ void ObjectMgr::LoadCreatures() if (!ok) continue; - // -1 no equipment, 0 use default - if (data.equipmentId > 0) + // -1 random, 0 no equipment, 1 is default (may or may not have equipment) + if (data.equipmentId != 0) { - if (!GetEquipmentInfo(data.equipmentId)) + if (!GetEquipmentInfo(data.id, data.equipmentId) && data.equipmentId != 1) { sLog->outError(LOG_FILTER_SQL, "Table `creature` have creature (Entry: %u) with equipment_id %u not found in table `creature_equip_template`, set to no equipment.", data.id, data.equipmentId); - data.equipmentId = -1; + data.equipmentId = 1; } } @@ -1673,7 +1689,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float data.id = entry; data.mapid = mapId; data.displayid = 0; - data.equipmentId = cInfo->equipmentId; + data.equipmentId = 1; data.posX = x; data.posY = y; data.posZ = z; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 9339684964c..88496fa9d6e 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -663,7 +663,7 @@ class ObjectMgr CreatureModelInfo const* GetCreatureModelRandomGender(uint32* displayID); static uint32 ChooseDisplayId(uint32 team, const CreatureTemplate* cinfo, const CreatureData* data = NULL); static void ChooseCreatureFlags(const CreatureTemplate* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData* data = NULL); - EquipmentInfo const* GetEquipmentInfo(uint32 entry); + EquipmentInfo const* GetEquipmentInfo(uint32 entry, int8& id); CreatureAddon const* GetCreatureAddon(uint32 lowguid); CreatureAddon const* GetCreatureTemplateAddon(uint32 entry); ItemTemplate const* GetItemTemplate(uint32 entry); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 5868b60b722..28f7a2cb8a0 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1033,7 +1033,8 @@ enum TrinityStrings LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND = 5033, LANG_COMMAND_NO_OUTDOOR_PVP_FORUND = 5034, LANG_CALL_FOR_HELP = 5035, - // Room for more Trinity strings 5036-9999 + LANG_NPCINFO_EQUIPMENT = 5036, + // Room for more Trinity strings 5037-9999 // Level requirement notifications LANG_SAY_REQ = 6604, diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 93e4b2e4771..f5504f8b7c1 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3902,7 +3902,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) unitTarget->CastSpell(unitTarget, iTmpSpellId, true); Creature* npc = unitTarget->ToCreature(); - npc->LoadEquipment(npc->GetEquipmentId()); + npc->LoadEquipment(); return; } // Emblazon Runeblade diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d8eec66ea07..29ecdbb033e 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1405,12 +1405,12 @@ void World::SetInitialWorldSettings() sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Creature Model Based Info Data..."); sObjectMgr->LoadCreatureModelInfo(); - sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Equipment templates..."); - sObjectMgr->LoadEquipmentTemplates(); - sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Creature templates..."); sObjectMgr->LoadCreatureTemplates(); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Equipment templates..."); // must be after LoadCreatureTemplates + sObjectMgr->LoadEquipmentTemplates(); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Creature template addons..."); sObjectMgr->LoadCreatureTemplateAddons(); diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 7ccd5ed1177..818a17438bf 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -645,6 +645,7 @@ public: handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetDBTableGUIDLow(), target->GetGUIDLow(), faction, npcflags, Entry, displayid, nativeid); handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel()); + handler->PSendSysMessage(LANG_NPCINFO_EQUIPMENT, target->GetCurrentEquipmentId(), target->GetOriginalEquipmentId()); handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); handler->PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->getFaction()); handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str()); diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 43c2001fbf7..b2542d6a668 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -508,10 +508,9 @@ public: cInfo->questItems[5] = fields[78].GetUInt32(); cInfo->movementId = fields[79].GetUInt32(); cInfo->RegenHealth = fields[80].GetBool(); - cInfo->equipmentId = fields[81].GetUInt32(); - cInfo->MechanicImmuneMask = fields[82].GetUInt32(); - cInfo->flags_extra = fields[83].GetUInt32(); - cInfo->ScriptID = sObjectMgr->GetScriptId(fields[84].GetCString()); + cInfo->MechanicImmuneMask = fields[81].GetUInt32(); + cInfo->flags_extra = fields[82].GetUInt32(); + cInfo->ScriptID = sObjectMgr->GetScriptId(fields[83].GetCString()); sObjectMgr->CheckCreatureTemplate(cInfo); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 96293c635d6..14321873b0d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -102,10 +102,8 @@ public: npc_unworthy_initiateAI(Creature* creature) : ScriptedAI(creature) { me->SetReactState(REACT_PASSIVE); - if (!me->GetEquipmentId()) - if (const CreatureTemplate* info = sObjectMgr->GetCreatureTemplate(28406)) - if (info->equipmentId) - const_cast(me->GetCreatureTemplate())->equipmentId = info->equipmentId; + if (!me->GetCurrentEquipmentId()) + me->SetCurrentEquipmentId(me->GetOriginalEquipmentId()); } uint64 playerGUID; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index f508266434b..7e2515c42a7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -237,7 +237,7 @@ public: case 2: me->SetStandState(UNIT_STAND_STATE_STAND); DoCast(me, SPELL_KOLTIRA_TRANSFORM); - me->LoadEquipment(me->GetEquipmentId()); + me->LoadEquipment(); break; case 3: SetEscortPaused(true); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 2c8d067a865..37bad9c4e4f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -316,7 +316,7 @@ public: me->SetDisplayId(MODEL_NIGHTELF); // and reseting equipment - me->LoadEquipment(me->GetEquipmentId()); + me->LoadEquipment(); if (instance && instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { @@ -410,7 +410,7 @@ public: if (me->HasAura(AURA_BANISH)) return; - me->LoadEquipment(me->GetEquipmentId()); + me->LoadEquipment(); } void UpdateAI(const uint32 diff) @@ -558,7 +558,7 @@ public: { //switch to nightelf form me->SetDisplayId(MODEL_NIGHTELF); - me->LoadEquipment(me->GetEquipmentId()); + me->LoadEquipment(); CastConsumingMadness(); DespawnDemon(); @@ -589,7 +589,7 @@ public: Talk(SAY_FINAL_FORM); me->SetDisplayId(MODEL_NIGHTELF); - me->LoadEquipment(me->GetEquipmentId()); + me->LoadEquipment(); } } }; diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/src/server/shared/Database/Implementation/WorldDatabase.cpp index b807736f47b..89f3cf8fdce 100644 --- a/src/server/shared/Database/Implementation/WorldDatabase.cpp +++ b/src/server/shared/Database/Implementation/WorldDatabase.cpp @@ -78,7 +78,7 @@ void WorldDatabaseConnection::DoPrepareStatements() PrepareStatement(WORLD_INS_CREATURE_TRANSPORT, "INSERT INTO creature_transport (guid, npc_entry, transport_entry, TransOffsetX, TransOffsetY, TransOffsetZ, TransOffsetO) values (?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC); PrepareStatement(WORLD_UPD_CREATURE_TRANSPORT_EMOTE, "UPDATE creature_transport SET emote = ? WHERE transport_entry = ? AND guid = ?", CONNECTION_ASYNC); PrepareStatement(WORLD_SEL_COMMANDS, "SELECT name, security, help FROM command", CONNECTION_SYNCH); - PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction_A, faction_H, npcflag, speed_walk, speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, unit_flags2, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, HoverHeight, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = ?", CONNECTION_SYNCH); + PrepareStatement(WORLD_SEL_CREATURE_TEMPLATE, "SELECT difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction_A, faction_H, npcflag, speed_walk, speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, unit_flags2, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, HoverHeight, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, movementId, RegenHealth, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_WAYPOINT_SCRIPT_BY_ID, "SELECT guid, delay, command, datalong, datalong2, dataint, x, y, z, o FROM waypoint_scripts WHERE id = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_IP2NATION_COUNTRY, "SELECT c.country FROM ip2nationCountries c, ip2nation i WHERE i.ip < ? AND c.code = i.country ORDER BY i.ip DESC LIMIT 0,1", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_ITEM_TEMPLATE_BY_NAME, "SELECT entry FROM item_template WHERE name = ?", CONNECTION_SYNCH); -- cgit v1.2.3