Merge branch 'dev'

Avariusnet · Feb 13, 2017 · f16db3a · f16db3a
2 parents 6ee63a1 + 32c2785
commit f16db3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/sql/custom/world/NPC/world_z_blizz_astraler_seelenhaendler_npc_adjuestment.sql b/sql/custom/world/NPC/world_z_blizz_astraler_seelenhaendler_npc_adjuestment.sql
diff --git a/sql/custom/world/NPC/world_z_blizz_astraler_seelenhaendler_npc_adjustment.sql b/sql/custom/world/NPC/world_z_blizz_astraler_seelenhaendler_npc_adjustment.sql
@@ -3,9 +3,15 @@
 DELETE FROM `creature` WHERE `guid`='798013';
 DELETE FROM `creature` WHERE `guid`='798022';
 
-/* Astraler Seelenhändler in der Mitte von Dalaran */
+/* Astraler Seelenhändler in der Mitte von Dalaran, derzeit nicht gespawned, erst freischalten wenn die Items angepasst wurden
 
 DELETE FROM `creature` WHERE `guid` ='2000001';
 
 INSERT INTO `creature` (guid, id, map, zoneId, areaId, spawnMask, phaseMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, spawndist, currentwaypoint, curhealth, curmana, MovementType, npcflag, unit_flags, dynamicflags, VerifiedBuild) VALUES
 ('2000001', '600900', '571', '0', '0', '1', '1', '0', '0', '5802.48', '660.302', '647.807', '4.92167', '300', '0', '0', '1', '0', '0', '0', '0', '0', '0');
+
+löscht den Gildenhaustoken und den Astralen Kredit raus */
+
+DELETE FROM `npc_vendor` WHERE `entry`='600900' and`item`='200000' and`ExtendedCost`='2411'; 	-- Gildenhaustoken
+DELETE FROM `npc_vendor` WHERE `entry`='600900' and`item`='38186' and`ExtendedCost`='0';		-- Astraler Kredit
+