Merge pull request #19 from azerothcore/sudlud-pach-42-3

Author: sudlud

sql/README.md data/sql/README.mdsql/README.md renamed to data/sql/README.md

@@ -1,7 +1,12 @@
 -- The example of the creature --
 DELETE FROM `creature_template` WHERE `entry`=55005;
-INSERT INTO `creature_template` (`entry`, `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`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES 
-(55005, 0, 0, 0, 0, 0, 1525, 0, 0, 0, 'Guild House', 'AzerothCore', NULL, 0, 80, 80, 0, 35, 1, 1, 1.14286, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 2, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 50, 50, 1, 1, 0, 0, 1, 0, 0, 0, 'guildmaster', 12340);
+INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES 
+(55005, 0, 0, 0, 0, 0, 'Guild House', 'AzerothCore', NULL, 0, 80, 80, 0, 35, 1, 1, 1.14286, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 2, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 50, 50, 1, 1, 0, 0, 1, 0, 0, 0, 'guildmaster', 12340);
+
+-- NPC MODEL
+DELETE FROM `creature_template_model` WHERE `CreatureID` = 55005;
+INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
+(55005, 0, 1525, 1, 1, 0);
 
 -- All creatures for guild houses --
 DELETE FROM `creature` WHERE id1=55005;

sql/auth/.gitkeep data/sql/db-auth/.gitkeepsql/auth/.gitkeep renamed to data/sql/db-auth/.gitkeep

@@ -1,8 +1,8 @@
+#include "DatabaseEnv.h"
 #include "Player.h"
+#include "ScriptedGossip.h"
 #include "ScriptMgr.h"
 #include "World.h"
-#include "DatabaseEnv.h"
-#include "ScriptedGossip.h"
 
 #define COST_GH_BUY 1000 //1000 g.
 #define COST_GH_SELL 500 //500 g.
@@ -161,9 +161,7 @@ class guildmaster : public CreatureScript
         }
 
         if (isPlayerHasGuildhouse(player, _creature, true))
-        {
             return;
-        }
 
         QueryResult result;
         //check if somebody already occupied this GH
@@ -217,9 +215,7 @@ class guildmaster : public CreatureScript
             break;
         default:
             if (action > OFFSET_SHOWBUY_FROM)
-            {
                 showBuyList(player, _creature, action - OFFSET_SHOWBUY_FROM);
-            }
             else if (action > OFFSET_GH_ID_TO_ACTION)
             {
                 CloseGossipMenuFor(player);
@@ -243,13 +239,9 @@ class guildmaster : public CreatureScript
         if (isPlayerGuildLeader(player))
         {
             if (isPlayerHasGuildhouse(player, _creature))
-            {
                 AddGossipItemFor(player, ICON_GOSSIP_GOLD, MSG_GOSSIP_SELL, GOSSIP_SENDER_MAIN, ACTION_SELL_GUILDHOUSE, MSG_SELL_CONFIRM, 0, false);
-            }
             else
-            {
                 AddGossipItemFor(player, ICON_GOSSIP_GOLD, MSG_GOSSIP_BUY, GOSSIP_SENDER_MAIN, ACTION_SHOW_BUYLIST);
-            }
         }
 
         SendGossipMenuFor(player, DEFAULT_GOSSIP_MESSAGE, _creature->GetGUID());