add spirit healer fix build warnings (#3)

* Update of module

* faction fix

fixed creature factions https://github.com/azerothcore/mod-guildhouse/issues/1

* add spirit healer

* update typo

* add spirit healer

* Add config option Spirit healer

* Updates

* update fix build error

* remove tabs

* fix build warning

* update coordinates
This commit is contained in:
Micrah
2019-08-15 08:58:11 +10:00
committed by GitHub
parent fe68660c54
commit b35e706730
4 changed files with 19 additions and 4 deletions

View File

@@ -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

View File

@@ -91,7 +91,8 @@ 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, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)');
(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 */;

View File

@@ -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 {
@@ -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_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;
}
@@ -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);
}
};

View File

@@ -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);