Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Vincent-Michael committed 2014-04-28 09:49:24 +02:00
2 parents f743ca2816 bd6474b369
commit f4fd258ad1
2 files changed
+89 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/updates/world/2014_04_28_00_world_creature_template.sql
+88
View File
@@ -0,0 +1,88 @@
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=37611;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=37610;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=35353;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=35354;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=35355;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=35356;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=35357;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=35358;
UPDATE `creature_template` SET `faction`=16 WHERE `entry`=34276;
UPDATE `creature_template` SET `faction`=16 WHERE `entry`=33839;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=33942;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=33815;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=33730;
UPDATE `creature_template` SET `faction`=16 WHERE `entry`=34277;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=34131;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=33396;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31956;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37274;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31952;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=31959;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37277;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31992;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37311;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37301;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=32000;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=37319;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=32010;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37329;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=32023;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37343;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=32002;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37321;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=32009;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37328;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31969;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37288;
UPDATE `creature_template` SET `faction`=1216 WHERE `entry`=31971;
UPDATE `creature_template` SET `faction`=1216 WHERE `entry`=37290;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37295;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=37238;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31961;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31987;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37306;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=31931;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37249;
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=31973;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31993;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37312;
UPDATE `creature_template` SET `faction`=29 WHERE `entry`=31945;
UPDATE `creature_template` SET `faction`=29 WHERE `entry`=37263;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=31944;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37262;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=31940;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37258;
UPDATE `creature_template` SET `faction`=29 WHERE `entry`=31939;
UPDATE `creature_template` SET `faction`=29 WHERE `entry`=37257;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37341;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31990;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37309;
UPDATE `creature_template` SET `faction`=29 WHERE `entry`=32044;
UPDATE `creature_template` SET `faction`=32 WHERE `entry`=37245;
UPDATE `creature_template` SET `faction`=29 WHERE `entry`=31930;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31984;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37303;
UPDATE `creature_template` SET `faction`=1216 WHERE `entry`=31953;
UPDATE `creature_template` SET `faction`=1216 WHERE `entry`=31957;
UPDATE `creature_template` SET `faction`=1216 WHERE `entry`=37275;
UPDATE `creature_template` SET `faction`=1215 WHERE `entry`=37298;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31980;
UPDATE `creature_template` SET `faction`=1216 WHERE `entry`=37272;
UPDATE `creature_template` SET `faction`=1335 WHERE `entry`=37342;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31955;
UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=31958;
UPDATE `creature_template` SET `npcflag`=1048577 WHERE `entry`=37298;
UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=31961;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31980;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31930;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31943;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31973;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=32044;
UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=37272;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31953;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37363;
UPDATE `creature_template` SET `npcflag`=4226 WHERE `entry`=37342;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31962;
UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=31955;
UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31958;
UPDATE `creature_template` SET `npcflag`=1 WHERE `entry`=31952;
src/server/game/Globals/ObjectMgr.cpp
+1 -1
View File
@@ -420,7 +420,7 @@ void ObjectMgr::LoadCreatureTemplates()
// 0 1 2 3 4 5 6 7 8
QueryResult result = WorldDatabase.Query("SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, "
// 9 10 11 12 13 14 15 16 17 18 19 20 21
"modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, exp_unk, faction, npcflag, speed_walk, speed_run"
"modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, exp_unk, faction, npcflag, speed_walk, speed_run, "
// 22 23 24 25 26 27 28 29 30 31 32 33
"scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, unit_flags2, "
// 34 35 36 37 38 39 40 41 42