Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Spells/SpellMgr.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/World/npcs_special.cpp src/server/worldserver/worldserver.conf.dist
This commit is contained in:
commit
cc85d1b5b7
28 files changed
+405
-190
No files matched your search
@@ -467,7 +467,7 @@ public:
|
||||
CallDragon(DATA_TENEBRON);
|
||||
break;
|
||||
case EVENT_CALL_SHADRON:
|
||||
CallDragon(DATA_SHADRON);
|
||||
CallDragon(DATA_SHADRON);
|
||||
break;
|
||||
case EVENT_CALL_VESPERON:
|
||||
CallDragon(DATA_VESPERON);
|
||||
|
||||
@@ -195,8 +195,8 @@ public:
|
||||
|
||||
struct npc_crystal_spike_triggerAI : public ScriptedAI
|
||||
{
|
||||
npc_crystal_spike_triggerAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
npc_crystal_spike_triggerAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
_count = 0;
|
||||
_despawntimer = 0;
|
||||
}
|
||||
|
||||
@@ -258,7 +258,7 @@ class boss_svala : public CreatureScript
|
||||
case EVENT_INTRO_TRANSFORM_0:
|
||||
{
|
||||
if (Creature* arthas = ObjectAccessor::GetCreature(*me, _arthasGUID))
|
||||
arthas->CastSpell(me, SPELL_TRANSFORMING_CHANNEL, false);
|
||||
arthas->CastSpell(me, SPELL_TRANSFORMING_CHANNEL, true);
|
||||
Position pos;
|
||||
pos.Relocate(me);
|
||||
pos.m_positionZ += 8.0f;
|
||||
|
||||
@@ -428,8 +428,8 @@ public:
|
||||
|
||||
struct npc_jennyAI : public ScriptedAI
|
||||
{
|
||||
npc_jennyAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
npc_jennyAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
setCrateNumber = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -1125,7 +1125,7 @@ public:
|
||||
|
||||
struct npc_oscillating_frequency_scanner_master_bunnyAI : public ScriptedAI
|
||||
{
|
||||
npc_oscillating_frequency_scanner_master_bunnyAI(Creature* creature) : ScriptedAI(creature)
|
||||
npc_oscillating_frequency_scanner_master_bunnyAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
playerGuid = 0;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript
|
||||
uint64 ownerGuid = me->GetOwnerGUID();
|
||||
if (!ownerGuid)
|
||||
return;
|
||||
|
||||
|
||||
// Find victim of Summon Gargoyle spell
|
||||
std::list<Unit*> targets;
|
||||
Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 30.0f);
|
||||
|
||||
@@ -34,7 +34,6 @@ npc_garments_of_quests 80% NPC's related to all Garments of-quests 5621, 56
|
||||
npc_injured_patient 100% patients for triage-quests (6622 and 6624)
|
||||
npc_doctor 100% Gustaf Vanhowzen and Gregory Victor, quest 6622 and 6624 (Triage)
|
||||
npc_mount_vendor 100% Regular mount vendors all over the world. Display gossip if player doesn't meet the requirements to buy
|
||||
npc_rogue_trainer 80% Scripted trainers, so they are able to offer item 17126 for class quest 6681
|
||||
npc_sayge 100% Darkmoon event fortune teller, buff player based on answers given
|
||||
npc_snake_trap_serpents 80% AI for snakes that summoned by Snake Trap
|
||||
npc_shadowfiend 100% restore 5% of owner's mana when shadowfiend die from damage
|
||||
@@ -1233,87 +1232,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
/*######
|
||||
## npc_rogue_trainer
|
||||
######*/
|
||||
|
||||
#define GOSSIP_HELLO_ROGUE1 "I wish to unlearn my talents"
|
||||
#define GOSSIP_HELLO_ROGUE2 "<Take the letter>"
|
||||
#define GOSSIP_HELLO_ROGUE3 "Purchase a Dual Talent Specialization."
|
||||
|
||||
class npc_rogue_trainer : public CreatureScript
|
||||
{
|
||||
public:
|
||||
npc_rogue_trainer() : CreatureScript("npc_rogue_trainer") { }
|
||||
|
||||
bool OnGossipHello(Player* player, Creature* creature) OVERRIDE
|
||||
{
|
||||
if (creature->IsQuestGiver())
|
||||
player->PrepareQuestMenu(creature->GetGUID());
|
||||
|
||||
if (creature->IsTrainer())
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
|
||||
|
||||
if (player->getClass() == CLASS_ROGUE)
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE1, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
|
||||
|
||||
if (player->GetSpecsCount() == 1 && player->getLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL))
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE3, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_LEARNDUALSPEC);
|
||||
|
||||
if (player->getClass() == CLASS_ROGUE && player->getLevel() >= 24 && !player->HasItemCount(17126) && !player->GetQuestRewardStatus(6681))
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ROGUE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
|
||||
player->SEND_GOSSIP_MENU(5996, creature->GetGUID());
|
||||
} else
|
||||
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE
|
||||
{
|
||||
player->PlayerTalkClass->ClearMenus();
|
||||
switch (action)
|
||||
{
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
player->CastSpell(player, 21100, false);
|
||||
break;
|
||||
case GOSSIP_ACTION_TRAIN:
|
||||
player->GetSession()->SendTrainerList(creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_OPTION_UNLEARNTALENTS:
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
player->SendTalentWipeConfirm(creature->GetGUID());
|
||||
break;
|
||||
case GOSSIP_OPTION_LEARNDUALSPEC:
|
||||
if (player->GetSpecsCount() == 1 && !(player->getLevel() < sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)))
|
||||
{
|
||||
if (!player->HasEnoughMoney(uint64(10000000)))
|
||||
{
|
||||
player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
|
||||
player->PlayerTalkClass->SendCloseGossip();
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
player->ModifyMoney(int64(-10000000));
|
||||
|
||||
// Cast spells that teach dual spec
|
||||
// Both are also ImplicitTarget self and must be cast by player
|
||||
player->CastSpell(player, 63680, true, NULL, NULL, player->GetGUID());
|
||||
player->CastSpell(player, 63624, true, NULL, NULL, player->GetGUID());
|
||||
|
||||
// Should show another Gossip text with "Congratulations..."
|
||||
player->PlayerTalkClass->SendCloseGossip();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
/*######
|
||||
## npc_sayge
|
||||
######*/
|
||||
@@ -2439,7 +2357,6 @@ void AddSC_npcs_special()
|
||||
new npc_garments_of_quests();
|
||||
new npc_guardian();
|
||||
new npc_mount_vendor();
|
||||
new npc_rogue_trainer();
|
||||
new npc_sayge();
|
||||
new npc_steam_tonk();
|
||||
new npc_tonk_mine();
|
||||
|
||||
Reference in new issue
Block a user