From 41d140dcf3b060f3f0c6470a3fe67d043bb84946 Mon Sep 17 00:00:00 2001 From: Lee Date: Tue, 2 Apr 2019 12:52:14 +0100 Subject: [PATCH 01/13] Update of module --- src/mod_guild_house_npc.cpp | 1 - src/mod_guild_house_v2.cpp | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mod_guild_house_npc.cpp b/src/mod_guild_house_npc.cpp index 87a2f9d..933091f 100644 --- a/src/mod_guild_house_npc.cpp +++ b/src/mod_guild_house_npc.cpp @@ -100,7 +100,6 @@ public: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Go Back!", GOSSIP_SENDER_MAIN, 9); player->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, m_creature->GetGUID()); break; - break; case 6: // Auctioneer { uint32 auctioneer = 0; diff --git a/src/mod_guild_house_v2.cpp b/src/mod_guild_house_v2.cpp index 9aacc04..db3be4f 100644 --- a/src/mod_guild_house_v2.cpp +++ b/src/mod_guild_house_v2.cpp @@ -191,6 +191,8 @@ public: { if (newZone = 876) CheckPlayer(player); + else + player->SetPhaseMask(GetNormalPhase(player), true); } uint32 GetNormalPhase(Player* player) const @@ -242,7 +244,7 @@ public: player->SetPhaseMask(guildData->phase, true); } else - player->SetPhaseMask(GetNormalPhase(player), false); + player->SetPhaseMask(GetNormalPhase(player), true); } void teleport(Player* player) From 71182a0a1a0c259c0fc2169ce22dfc2d6347be58 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Mon, 22 Apr 2019 05:05:58 +1000 Subject: [PATCH 02/13] faction fix fixed creature factions https://github.com/azerothcore/mod-guildhouse/issues/1 --- sql/world/Creatures.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/world/Creatures.sql b/sql/world/Creatures.sql index a71ddc0..8af7b11 100644 --- a/sql/world/Creatures.sql +++ b/sql/world/Creatures.sql @@ -1,5 +1,5 @@ -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, 'Speedfang', '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); From 841712edf6cdc4d1b55b949f1abda4f6d3390e8c Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Sat, 10 Aug 2019 17:43:39 +1000 Subject: [PATCH 03/13] add spirit healer --- sql/world/guild_house_spawns.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/world/guild_house_spawns.sql b/sql/world/guild_house_spawns.sql index aa7fafd..934a977 100644 --- a/sql/world/guild_house_spawns.sql +++ b/sql/world/guild_house_spawns.sql @@ -91,6 +91,7 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien (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, 6491, 16218.6, 16241.1, 24.681, 2.298720, 'Spirit Healer'), (50, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'); /*!40000 ALTER TABLE `guild_house_spawns` ENABLE KEYS */; From b0334aa896186e8d6eb95a40922d87782b70adba Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Sat, 10 Aug 2019 17:45:24 +1000 Subject: [PATCH 04/13] update typo --- sql/world/guild_house_spawns.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/world/guild_house_spawns.sql b/sql/world/guild_house_spawns.sql index 934a977..052d3db 100644 --- a/sql/world/guild_house_spawns.sql +++ b/sql/world/guild_house_spawns.sql @@ -92,7 +92,7 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien (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, 6491, 16218.6, 16241.1, 24.681, 2.298720, 'Spirit Healer'), - (50, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'); + (51, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'); /*!40000 ALTER TABLE `guild_house_spawns` ENABLE KEYS */; From 425b9c82771c3f2abec2d30627323f0aebffa1c5 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Sat, 10 Aug 2019 18:13:53 +1000 Subject: [PATCH 05/13] add spirit healer --- src/mod_guild_house_npc.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mod_guild_house_npc.cpp b/src/mod_guild_house_npc.cpp index 933091f..de49cfb 100644 --- a/src/mod_guild_house_npc.cpp +++ b/src/mod_guild_house_npc.cpp @@ -44,6 +44,7 @@ public: player->ADD_GOSSIP_ITEM_EXTENDED(GOSSIP_ICON_MONEY_BAG, "Spawn Auctioneer", GOSSIP_SENDER_MAIN, 6, "Spawn auctioneer", GuildHouseAuctioneer, false); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "Spawn Primary Profession Trainers", GOSSIP_SENDER_MAIN, 7); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "Spawn Secondry Profession Trainers", GOSSIP_SENDER_MAIN, 8); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TALK, "Spawn Sprirt Healer", GOSSIP_SENDER_MAIN, 6491, "Spawn Spirit Healer?, GuildHouseSpirit, false); player->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, creature->GetGUID()); return true; } @@ -167,7 +168,8 @@ public: case 33618: // Skinning case 33608: // Alchemy case 33616: // Herbalism - case 33613: // Tailoring + + case 33613: // Tailoring case 33619: // Cooking case 33623: // Fishing case 33621: // First Aid @@ -187,6 +189,10 @@ public: cost = GuildHouseMailBox; SpawnObject(action, player); break; + case 6491: // spirit healer + cost = GuildHouseSpirit; + SpawnNPC(action, player); + break; case 1685: // forge case 4087: // Anvil case 187293: // Guild Vault @@ -350,6 +356,7 @@ public: GuildHouseObject = sConfigMgr->GetIntDefault("GuildHouseObject", 500000); GuildHousePortal = sConfigMgr->GetIntDefault("GuildHousePortal", 500000); GuildHouseProff = sConfigMgr->GetIntDefault("GuildHouseProff", 500000); + GuildHouseSpirit = sConfigMgr->GetIntDefault("GuildHouseSpirit, 100000); } }; From e477a91ff263a3d11b6d89d0c385d691311f3f82 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Sun, 11 Aug 2019 07:53:15 +1000 Subject: [PATCH 06/13] Add config option Spirit healer --- conf/mod_guild_house_v2.conf.dist | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conf/mod_guild_house_v2.conf.dist b/conf/mod_guild_house_v2.conf.dist index 4044c32..ad51f3a 100644 --- a/conf/mod_guild_house_v2.conf.dist +++ b/conf/mod_guild_house_v2.conf.dist @@ -69,3 +69,10 @@ GuildHousePortal = 1000000 # default = 500000 (50g) # GuildHouseProff = 500000 + +# GuildHouseSpirit +# +# Cost of Spirit Healer at the guildhouse graveyard . +# default = 100000 (10g) +# +GuildHouseSpirit = 100000 From bae0a04c4ed2a34c25dfba10a1f4e2aed624feb9 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Sun, 11 Aug 2019 07:57:26 +1000 Subject: [PATCH 07/13] Updates --- src/mod_guild_house_npc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod_guild_house_npc.cpp b/src/mod_guild_house_npc.cpp index de49cfb..7db97f7 100644 --- a/src/mod_guild_house_npc.cpp +++ b/src/mod_guild_house_npc.cpp @@ -10,7 +10,7 @@ #include "GameObject.h" #include "Transport.h" -int cost, GuildHouseInnKeeper, GuildHouseBank, GuildHouseMailBox, GuildHouseAuctioneer, GuildHouseTrainer, GuildHouseVendor, GuildHouseObject, GuildHousePortal, GuildHouseProff; +int cost, GuildHouseInnKeeper, GuildHouseBank, GuildHouseMailBox, GuildHouseAuctioneer, GuildHouseTrainer, GuildHouseVendor, GuildHouseObject, GuildHousePortal, GuildHouseSpirit, GuildHouseProff; class GuildHouseSpawner : public CreatureScript { From 691acf8f89c4cafe77079131f07cc27c48de8db3 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Wed, 14 Aug 2019 19:03:03 +1000 Subject: [PATCH 08/13] update fix build error --- src/mod_guild_house_npc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod_guild_house_npc.cpp b/src/mod_guild_house_npc.cpp index 7db97f7..5bb33ec 100644 --- a/src/mod_guild_house_npc.cpp +++ b/src/mod_guild_house_npc.cpp @@ -44,7 +44,7 @@ public: player->ADD_GOSSIP_ITEM_EXTENDED(GOSSIP_ICON_MONEY_BAG, "Spawn Auctioneer", GOSSIP_SENDER_MAIN, 6, "Spawn auctioneer", GuildHouseAuctioneer, false); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "Spawn Primary Profession Trainers", GOSSIP_SENDER_MAIN, 7); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "Spawn Secondry Profession Trainers", GOSSIP_SENDER_MAIN, 8); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TALK, "Spawn Sprirt Healer", GOSSIP_SENDER_MAIN, 6491, "Spawn Spirit Healer?, GuildHouseSpirit, false); + player->ADD_GOSSIP_ITEM_EXTENDED(GOSSIP_ICON_TALK, "Spawn Sprirt Healer", GOSSIP_SENDER_MAIN, 6491, "Spawn Spirit Healer?", GuildHouseSpirit, false); player->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, creature->GetGUID()); return true; } @@ -356,7 +356,7 @@ public: GuildHouseObject = sConfigMgr->GetIntDefault("GuildHouseObject", 500000); GuildHousePortal = sConfigMgr->GetIntDefault("GuildHousePortal", 500000); GuildHouseProff = sConfigMgr->GetIntDefault("GuildHouseProff", 500000); - GuildHouseSpirit = sConfigMgr->GetIntDefault("GuildHouseSpirit, 100000); + GuildHouseSpirit = sConfigMgr->GetIntDefault("GuildHouseSpirit", 100000); } }; From 24442d29c7cd7f0d6055e49317aaf532aa62ac83 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Wed, 14 Aug 2019 19:04:02 +1000 Subject: [PATCH 09/13] remove tabs --- sql/world/guild_house_spawns.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/world/guild_house_spawns.sql b/sql/world/guild_house_spawns.sql index 052d3db..f159638 100644 --- a/sql/world/guild_house_spawns.sql +++ b/sql/world/guild_house_spawns.sql @@ -92,7 +92,7 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien (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, 6491, 16218.6, 16241.1, 24.681, 2.298720, 'Spirit Healer'), - (51, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'); + (51, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'); /*!40000 ALTER TABLE `guild_house_spawns` ENABLE KEYS */; From 463eea30cf13b70ffcac27882d3695d7124c53a5 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Wed, 14 Aug 2019 19:13:18 +1000 Subject: [PATCH 10/13] fix build warning --- src/mod_guild_house_v2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod_guild_house_v2.cpp b/src/mod_guild_house_v2.cpp index db3be4f..86b45f9 100644 --- a/src/mod_guild_house_v2.cpp +++ b/src/mod_guild_house_v2.cpp @@ -189,7 +189,7 @@ public: void OnUpdateZone(Player* player, uint32 newZone, uint32 newArea) { - if (newZone = 876) + if (newZone == 876) CheckPlayer(player); else player->SetPhaseMask(GetNormalPhase(player), true); From 6fa05f5a060269b1a40e1105c7c3d958e9112a87 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Wed, 14 Aug 2019 20:52:10 +1000 Subject: [PATCH 11/13] update coordinates --- sql/world/guild_house_spawns.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/world/guild_house_spawns.sql b/sql/world/guild_house_spawns.sql index f159638..4128944 100644 --- a/sql/world/guild_house_spawns.sql +++ b/sql/world/guild_house_spawns.sql @@ -91,7 +91,7 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien (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, 6491, 16218.6, 16241.1, 24.681, 2.298720, 'Spirit Healer'), + (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)'); /*!40000 ALTER TABLE `guild_house_spawns` ENABLE KEYS */; From 6e3f23762ca4617e25fde93223523c73f05e6b87 Mon Sep 17 00:00:00 2001 From: Rob <34249320+rbedfordpro@users.noreply.github.com> Date: Tue, 8 Oct 2019 07:23:45 -0700 Subject: [PATCH 12/13] Updating Readme --- README.md | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e297534..b7328a3 100644 --- a/README.md +++ b/README.md @@ -4,20 +4,27 @@ ## 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 to from the same guild to visit their guild house. +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. +### Purchasables + +* Class Trainers (all available in Wrath) +* Primary Profession Trainers (all available in Wrath) +* Secondary Profession Trainers (all available in Wrath) +* Vendors: Reagents, Food & Water and Trade Goods +* Portals to Neutral, Horde and Alliance cities +* Spirit Healer +* Guild Bank and Personal Bank access +* Auctioneer ## 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) Purchase a guild house from the NPC (entry:55005), then either teleport to the guildhouse via the NPC or chat: `.guildhouse tele` +2) Once the player is in the location of the guild house the guild master has a command .guildhouse spawnnpc this will load the Guild House Assistant. +3) Speak with the Guild House Assistant to begin purchasing objects ## Requirements -My new module requires: - - AzerothCore v1.0.1+ ## Installation @@ -28,9 +35,9 @@ My new module requires: 3) Apply the guildhouse.patch to your source 4) Re-run cmake and launch a clean build of AzerothCore. ``` -## Patch Information +## Patch Information (guildhouse.patch) -The patch basicly turns the selected area from a bitmask to a uint, this fixes the issues with the phasing +The patch basically turns the selected area from a bitmask to a uint, this fixes the issues with the phasing Before Patch : Guild 1 Can see phase 1 @@ -46,7 +53,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 +* [Anhanga] (https://github.com/rbedfordpro) -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) From 9ffd5adbbb2071bb539e752a15b4ecd3d62a9d7b Mon Sep 17 00:00:00 2001 From: Rob <34249320+rbedfordpro@users.noreply.github.com> Date: Tue, 8 Oct 2019 07:24:28 -0700 Subject: [PATCH 13/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b7328a3..47c3d18 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,6 @@ If you need to change the module configuration, go to your server configuration * [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 -* [Anhanga] (https://github.com/rbedfordpro) +* [Anhanga](https://github.com/rbedfordpro) AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org/) - [discord chat community](https://discord.gg/64FH6Y8)