Big update

.gitignore

@@ -46,3 +46,8 @@ local.properties
 .loadpath
 .project
 .cproject
+
+#
+# Config file
+#
+conf/mod_guild_house_v2.conf

.travis.yml

@@ -0,0 +1,76 @@
+sudo: required
+dist: bionic # (18.04)
+
+language: cpp
+
+cache: ccache
+
+addons:
+  apt:
+    update: true
+
+services:
+  - mysql
+
+git:
+  depth: 10
+
+stages:
+  - prepare_cache
+  - run
+
+jobs:
+  include:
+    - stage: prepare_cache
+      env: TRAVIS_BUILD_ID="1"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - mv "$TRAVIS_BUILD_DIR" azerothcore-wotlk/modules
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh OFF
+      script:
+        - source ./apps/ci/ci-compile.sh
+
+    - stage: run
+      env: TRAVIS_BUILD_ID="1"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - mv "$TRAVIS_BUILD_DIR" azerothcore-wotlk/modules
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh ON
+        - source ./apps/ci/ci-import-db.sh
+      script:
+        - source ./apps/ci/ci-compile.sh
+        - source ./apps/ci/ci-worldserver-dry-run.sh
+
+    - stage: prepare_cache
+      env: TRAVIS_BUILD_ID="2"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - mv "$TRAVIS_BUILD_DIR" azerothcore-wotlk/modules
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh OFF
+      script:
+        - source ./apps/ci/ci-compile.sh
+
+    - stage: run
+      env: TRAVIS_BUILD_ID="2"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - mv "$TRAVIS_BUILD_DIR" azerothcore-wotlk/modules
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh ON
+      script:
+        - source ./apps/ci/ci-compile.sh

README.md

@@ -1,36 +1,48 @@
-
+# ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore
+- Latest build status with azerothcore: [![Build Status](https://travis-ci.org/azerothcore/mod-guildhouse.svg?branch=master)](https://travis-ci.org/azerothcore/mod-guildhouse)
 # Guild House Module
 
 
 ## Description
 
-This is a phased guild house system for Azerothcore, it allows players to from the same guild to visit their guild house to explore, train ect
-All guilds will get their own phasing system which then the guild master will have to purchase NPC's creatures and other stuff to complete the creation. 
+This is a phased guild house system for AzerothCore, it allows players from the same guild to visit their guild house.
+All guilds will get their own phasing system and then the guild master can purchase NPC creatures and other stuff to complete the Guild House.
+
+### Purchasables
 
+* Class Trainers (all available in Wrath)
+* Primary Profession Trainers (all available in Wrath)
+* Secondary Profession Trainers (all available in Wrath)
+* Vendors: Reagents Vendor, Food & Water, Trade Goods, and Repairs/Ammo Vendor
+* Portals to Neutral, Horde and Alliance cities
+* Spirit Healer
+* Guild Bank and Personal Bank access
+* Auctioneer
+* Stable Master
 
 ## How to use ingame
-Once a player has brought a guild house from the NPC they can either teleport to the guildhouse by via the NPC or do .guildhouse tele
 
-Once the player is in the location of the guild house the guild master has a command .guildhouse spawnnpc this will allow the guild master
-to start placing objects / npc within the guild house.
+1) After installation, as GM you will need to: `.npc add 70101` -> somewhere public and accessible by other players.
+2) Players can purchase a guild house from the added NPC, then either teleport to the guildhouse via the NPC or chat: `.guildhouse tele`
+3) Each new Guild House starts with a portal to either Orgrimmar or Stormwind, based on Team (ALLIANCE / HORDE), and the Guild House Assistant.
+4) Speak with the Guild House Assistant to begin purchasing additions to your Guild House!
 
 ## Requirements
 
-My new module requires:
-
 - AzerothCore v1.0.1+
 
 ## Installation
 
 ```
-1) Simply place the module under the `modules` directory of your AzerothCore source. 
-2) Import the SQL manually to the right Database (auth, world or characters)
+1) Place the module under the `modules` directory of your AzerothCore source. 
+2) Import the SQL files manually to the right Database (auth, world or characters)
 3) Apply the guildhouse.patch to your source 
 4) Re-run cmake and launch a clean build of AzerothCore.
 ```
-## Patch Information
 
-The patch basicly turns the selected area from a bitmask to a uint, this fixes the issues with the phasing
+## Patch Information (guildhouse.patch)
+
+The patch basically turns the selected area from a bitmask to a uint, this fixes the issues with the phasing on GM Island ONLY
 
 Before Patch :
 Guild 1 Can see phase 1
@@ -46,7 +58,8 @@ If you need to change the module configuration, go to your server configuration
 
 ## Credits
 
-* [Me](https://github.com/talamortis) (author of the module)
+* [Talamortis](https://github.com/talamortis) (Original author of the module)
 * [Rochet2](https://github.com/Rochet2/): Thanks for the help with the phasing situation & General support
+* [rbedfordpro](https://github.com/rbedfordpro) & [WiZZy](https://github.com/wizzymore)
 
-AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org/) - [discord chat community](https://discord.gg/PaqQRkd)
+AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org/) - [discord chat community](https://discord.gg/64FH6Y8)

conf/mod_guild_house_v2.conf.dist

@@ -63,9 +63,29 @@ GuildHouseObject = 500000
 #
 GuildHousePortal = 1000000
 
-# GuildHouseProff
+# GuildHouseProf
 #
 # Cost of profession vendors within the guild.
 # default = 500000 (50g)
 #
-GuildHouseProff = 500000
+GuildHouseProf = 500000
+
+# GuildHouseSpirit
+#
+# Cost of Spirit Healer at the guildhouse graveyard .
+# default = 100000 (10g)
+#
+GuildHouseSpirit = 100000
+
+# GuildHouseBuyRank
+#
+# Minimum GuildRank able to make purchases in guild house
+# default = 0 (Guild Master)
+# GR_GUILDMASTER  = 0
+# GR_OFFICER      = 1
+# GR_VETERAN      = 2
+# GR_MEMBER       = 3
+# GR_INITIATE     = 4
+#
+GuildHouseBuyRank = 0
+

guildhouse.patch

@@ -1,17 +1,17 @@
-diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
-index 0d779cd7..4d0d0594 100644
---- a/src/server/game/Entities/Object/Object.h
-+++ b/src/server/game/Entities/Object/Object.h
-@@ -796,7 +796,11 @@ class WorldObject : public Object, public WorldLocation
-         virtual void SetPhaseMask(uint32 newPhaseMask, bool update);
-         uint32 GetPhaseMask() const { return m_phaseMask; }
-         bool InSamePhase(WorldObject const* obj) const { return InSamePhase(obj->GetPhaseMask()); }
--        bool InSamePhase(uint32 phasemask) const { return (GetPhaseMask() & phasemask); }
-+        bool InSamePhase(uint32 phasemask) const {
-+            if (GetZoneId() == 876)
-+                return GetPhaseMask() == phasemask;
-+            return (GetPhaseMask() & phasemask) != 0;
-+        }
- 
-         virtual uint32 GetZoneId(bool forceRecalc = false) const;
-         virtual uint32 GetAreaId(bool forceRecalc = false) const;
+diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
+index 0d779cd7..4d0d0594 100644
+--- a/src/server/game/Entities/Object/Object.h
++++ b/src/server/game/Entities/Object/Object.h
+@@ -796,7 +796,11 @@ class WorldObject : public Object, public WorldLocation
+         virtual void SetPhaseMask(uint32 newPhaseMask, bool update);
+         uint32 GetPhaseMask() const { return m_phaseMask; }
+         bool InSamePhase(WorldObject const* obj) const { return InSamePhase(obj->GetPhaseMask()); }
+-        bool InSamePhase(uint32 phasemask) const { return (GetPhaseMask() & phasemask); }
++        bool InSamePhase(uint32 phasemask) const {
++            if (GetZoneId() == 876)
++                return GetPhaseMask() == phasemask;
++            return (GetPhaseMask() & phasemask) != 0;
++        }
+
+         virtual uint32 GetZoneId(bool forceRecalc = false) const;
+         virtual uint32 GetAreaId(bool forceRecalc = false) const;

sql/world/Creatures.sql

@@ -1,5 +1,6 @@
-REPLACE INTO `creature_template` VALUES (70101, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Talamortis', 'Guild House Seller', '', 0, 35, 35, 0, 12, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSeller', 12340),
+REPLACE INTO `creature_template` VALUES (70101, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Talamortis', 'Guild House Seller', '', 0, 35, 35, 0, 35, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSeller', 12340),
 (18649, 0, 0, 0, 0, 0, 18234, 0, 0, 0, 'Innkeeper Monica', NULL, NULL, 0, 1, 2, 0, 35, 65537, 0.8, 0.28571, 1, 0, 2, 2, 0, 26, 4.6, 2000, 1900, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 100, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 1, 3, 1, 1, 1, 1, 0, 70, 1, 0, 2, 'npc_innkeeper', 12340),
 (33251, 0, 0, 0, 0, 0, 28516, 0, 0, 0, 'Death Knight Trainer', '', '', 9691, 80, 80, 2, 35, 51, 1, 1.14286, 1, 1, 422, 586, 0, 642, 7.5, 2000, 2000, 1, 32768, 2048, 0, 0, 0, 0, 6, 0, 345, 509, 103, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 10, 1, 1, 0, 0, 1, 8388624, 0, '', 12340),
-(70102, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Speedfang', 'Guild House Assistant', '', 0, 35, 35, 0, 12, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSpawner', 12340);
-
+(70102, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Xrispins', 'Guild House Assistant', '', 0, 35, 35, 0, 35, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSpawner', 12340),
+(70103, 0, 0, 0, 0, 0, 27211, 0, 0, 0, 'Essenbaum', 'Food & Water Vendor', '', 0, 80, 80, 0, 2007, 640, 1, 1.4286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, '', 12340),
+(70104, 0, 0, 0, 0, 0, 26307, 0, 0, 0, 'Archie', 'Ammo & Repairs', '', 0, 80, 80, 0, 2007, 4480, 1, 1.4286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, '', 12340);

sql/world/Vendor_items.sql

@@ -0,0 +1,2 @@
+REPLACE INTO `npc_vendor` VALUES(70103, 0, 1179, 0, 0, 0, 12340),(70103, 0, 414, 0, 0, 0, 12340),(70103, 0, 1205, 0, 0, 0, 12340),(70103, 0, 422, 0, 0, 0, 12340),(70103, 0, 1708, 0, 0, 0, 12340),(70103, 0, 1707, 0, 0, 0, 12340),(70103, 0, 1645, 0, 0, 0, 12340),(70103, 0, 1707, 0, 0, 0, 12340),(70103, 0, 8766, 0, 0, 0, 12340),(70103, 0, 8953, 0, 0, 0, 12340),(70103, 0, 18300, 0, 0, 0, 12340),(70103, 0, 29393, 0, 0, 0, 12340),(70103, 0, 27860, 0, 0, 0, 12340),(70103, 0, 38428, 0, 0, 0, 12340),(70103, 0, 44941, 0, 0, 0, 12340),(70103, 0, 42430, 0, 0, 0, 12340),(70103, 0, 33445, 0, 0, 0, 12340),(70103, 0, 42431, 0, 0, 0, 12340),
+(70104, 0, 2515, 0, 0, 0, 12340),(70104, 0, 2519, 0, 0, 0, 12340),(70104, 0, 3030, 0, 0, 0, 12340),(70104, 0, 11285, 0, 0, 0, 12340),(70104, 0, 11284, 0, 0, 0, 12340),(70104, 0, 28053, 0, 0, 0, 12340),(70104, 0, 28060, 0, 0, 0, 12340),(70104, 0, 28056, 0, 0, 0, 12340),(70104, 0, 28061, 0, 0, 0, 12340),(70104, 0, 41586, 0, 0, 0, 12340),(70104, 0, 41584, 0, 0, 0, 12340)

sql/world/guild_house_spawns.sql

@@ -44,7 +44,7 @@ CREATE TABLE IF NOT EXISTS `guild_house_spawns` (
   UNIQUE KEY `entry` (`entry`)
 ) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8;
 
--- Dumping data for table acore_world.guild_house_spawns: ~29 rows (approximately)
+-- Dumping data for table acore_world.guild_house_spawns: ~56 rows (approximately)
 /*!40000 ALTER TABLE `guild_house_spawns` DISABLE KEYS */;
 REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orientation`, `comment`) VALUES
 	(1, 26327, 16216.5, 16279.4, 20.9306, 0.552869, 'Paladin Trainer'),
@@ -86,12 +86,18 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien
 	(41, 183326, 16202.1, 16223.1, 1.03401, 0.829316, 'Portal: Thunder Bluff (Object)'),
 	(42, 183324, 16196.8, 16227.5, 1.37206, 0.762557, 'Portal: Silvermoon (Object)'),
 	(43, 183321, 16196.8, 16227.5, 1.37206, 0.762557, 'Portal: Exodar (Object)'),
-	(44, 191164, 16206, 16216, 1.10669, 1.0453, 'Portal: Dalaran (Object)'),
+	(44, 195682, 16207, 16216, 1.10669, 1.0453, 'Portal: Dalaran (Object)'),
 	(45, 187293, 16230.5, 16283.5, 13.9061, 3, 'Guild Vault (Object)'),
 	(46, 28692, 16230.2, 16316.4, 20.8455, 6.25643, 'Trade Supplies'),
 	(48, 28776, 16236.3, 16316.1, 20.8454, 3.06771, 'Tabard Vendor'),
-	(49, 29715, 16223.7, 16293.3, 20.852, 4.57958, 'Food & Drink'),
-	(50, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)');
+	(49, 70103, 16223.7, 16293.3, 20.852, 4.57958, 'Food & Drink'),
+    (50, 6491, 16319.937, 16242.404, 24.4747, 2.206830, 'Spirit Healer'),
+    (51, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'),
+    (52, 191013, 16203, 16216, 1.10669, 1.0453, 'Portal: Shattrath (Object) - Alliance'),
+    (53, 29636, 16233.5, 16316.1, 20.8455, 3.07558, 'Reagent Vendor'),
+    (54, 191014, 16203, 16216, 1.10669, 1.0453, 'Portal: Shattrath (Object) - Horde'),
+    (55, 70104, 16242.8, 16302.1, 13.174, 4.6153, 'Ammo & Repair Vendor'),
+    (56, 28690, 16226.97, 16267.9, 13.15, 4.6533, 'Stable Master');
 
 /*!40000 ALTER TABLE `guild_house_spawns` ENABLE KEYS */;