Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -r cc37739c1722 COPYING
- --- a/COPYING Thu Dec 23 21:03:27 2010 +0100
- +++ b/COPYING Tue Jun 14 08:29:46 2011 +0200
- @@ -1,4 +1,4 @@
- - GNU GENERAL PUBLIC LICENSE
- + CORE PATCHED BY PEMI! GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- diff -r cc37739c1722 src/server/game/Battlegrounds/ArenaTeam.cpp
- --- a/src/server/game/Battlegrounds/ArenaTeam.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp Tue Jun 14 08:29:46 2011 +0200
- @@ -574,7 +574,7 @@
- }
- else
- points = 1511.26f / (1.0f + 1639.28f * exp(-0.00412f * (float)rating));
- -
- + points *= 5.0f;
- // type penalties for <5v5 teams
- if (m_Type == ARENA_TEAM_2v2)
- points *= 0.76f;
- diff -r cc37739c1722 src/server/game/Battlegrounds/Battleground.h
- --- a/src/server/game/Battlegrounds/Battleground.h Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Battlegrounds/Battleground.h Tue Jun 14 08:29:46 2011 +0200
- @@ -449,7 +449,7 @@
- void SetBgMap(BattlegroundMap* map) { m_Map = map; }
- BattlegroundMap* GetBgMap()
- {
- - ASSERT(m_Map);
- +
- return m_Map;
- }
- diff -r cc37739c1722 src/server/game/Chat/Chat.cpp
- --- a/src/server/game/Chat/Chat.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Chat/Chat.cpp Tue Jun 14 08:29:46 2011 +0200
- @@ -175,7 +175,7 @@
- { "invite", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildInviteCommand>, "", NULL },
- { "uninvite", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildUninviteCommand>, "", NULL },
- { "rank", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleGuildRankCommand>, "", NULL },
- - { NULL, 0, false, NULL, "", NULL }
- + { NULL, 0, false, NULL, "", NULL }
- };
- static ChatCommand instanceCommandTable[] =
- @@ -386,7 +386,7 @@
- { "dismount", SEC_PLAYER, false, OldHandler<&ChatHandler::HandleDismountCommand>, "", NULL },
- { "gps", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleGPSCommand>, "", NULL },
- { "guid", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleGUIDCommand>, "", NULL },
- - { "help", SEC_PLAYER, true, OldHandler<&ChatHandler::HandleHelpCommand>, "", NULL },
- + { "parancsok", SEC_PLAYER, true, OldHandler<&ChatHandler::HandleHelpCommand>, "", NULL },
- { "itemmove", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleItemMoveCommand>, "", NULL },
- { "cooldown", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleCooldownCommand>, "", NULL },
- { "unlearn", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleUnLearnCommand>, "", NULL },
- @@ -400,6 +400,8 @@
- { "baninfo", SEC_ADMINISTRATOR, false, NULL, "", baninfoCommandTable },
- { "banlist", SEC_ADMINISTRATOR, true, NULL, "", banlistCommandTable },
- { "start", SEC_PLAYER, false, OldHandler<&ChatHandler::HandleStartCommand>, "", NULL },
- + { "guildpont", SEC_PLAYER, false, OldHandler<&ChatHandler::HandleGuildPontCommand>, "", NULL },
- + { "maxszint", SEC_PLAYER, false, OldHandler<&ChatHandler::HandleMaxLevelCommand>, "", NULL },
- { "taxicheat", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleTaxiCheatCommand>, "", NULL },
- { "linkgrave", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleLinkGraveCommand>, "", NULL },
- { "neargrave", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleNearGraveCommand>, "", NULL },
- diff -r cc37739c1722 src/server/game/Chat/Chat.h
- --- a/src/server/game/Chat/Chat.h Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Chat/Chat.h Tue Jun 14 08:29:46 2011 +0200
- @@ -249,6 +249,8 @@
- bool HandleHelpCommand(const char* args);
- bool HandleCommandsCommand(const char* args);
- bool HandleStartCommand(const char* args);
- + bool HandleGuildPontCommand(const char* args);
- + bool HandleMaxLevelCommand(const char* args);
- bool HandleDismountCommand(const char* args);
- bool HandleSaveCommand(const char* args);
- diff -r cc37739c1722 src/server/game/Chat/Commands/Level0.cpp
- --- a/src/server/game/Chat/Commands/Level0.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Chat/Commands/Level0.cpp Tue Jun 14 08:29:46 2011 +0200
- @@ -34,7 +34,7 @@
- char* cmd = strtok((char*)args, " ");
- if (!cmd)
- {
- - ShowHelpForCommand(getCommandTable(), "help");
- + ShowHelpForCommand(getCommandTable(), "segits");
- ShowHelpForCommand(getCommandTable(), "");
- }
- else
- @@ -51,7 +51,25 @@
- ShowHelpForCommand(getCommandTable(), "");
- return true;
- }
- -
- +bool ChatHandler::HandleGuildPontCommand(const char* /*args*/)
- +{
- + Player *chr = m_session->GetPlayer();
- + QueryResult result = CharacterDatabase.PQuery("SELECT pont FROM guild WHERE guildid='%d'", chr->GetGuildId());
- + if(result)
- + {
- + Field *fields = result->Fetch();
- + uint32 pontszam = fields[0].GetUInt32();
- + PSendSysMessage("A Guilded pontszama: %u",pontszam);
- + }
- + else PSendSysMessage("Elobb lepj be egy guildba!");
- + return true;
- +}
- +bool ChatHandler::HandleMaxLevelCommand(const char* /*args*/)
- +{
- + Player *chr = m_session->GetPlayer();
- + HandleCharacterLevel(chr,chr->GetGUID(), chr->getLevel(),80);
- + return true;
- +}
- bool ChatHandler::HandleStartCommand(const char* /*args*/)
- {
- Player *chr = m_session->GetPlayer();
- diff -r cc37739c1722 src/server/game/Entities/Creature/Creature.h
- --- a/src/server/game/Entities/Creature/Creature.h Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Entities/Creature/Creature.h Tue Jun 14 08:29:46 2011 +0200
- @@ -311,13 +311,14 @@
- // Vendors
- struct VendorItem
- {
- - VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost)
- - : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {}
- + VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost, int32 _pontkell)
- + : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost), pontkell(_pontkell) {}
- uint32 item;
- uint32 maxcount; // 0 for infinity item amount
- uint32 incrtime; // time for restore items amount if maxcount != 0
- uint32 ExtendedCost;
- + int32 pontkell;
- //helpers
- bool IsGoldRequired(ItemPrototype const* pProto) const { return pProto->Flags2 & ITEM_FLAGS_EXTRA_EXT_COST_REQUIRES_GOLD || !ExtendedCost; }
- @@ -335,9 +336,9 @@
- }
- bool Empty() const { return m_items.empty(); }
- uint8 GetItemCount() const { return m_items.size(); }
- - void AddItem(uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost)
- + void AddItem(uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, int32 pontkell)
- {
- - m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost));
- + m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost, pontkell));
- }
- bool RemoveItem(uint32 item_id);
- VendorItem const* FindItemCostPair(uint32 item_id, uint32 extendedCost) const;
- diff -r cc37739c1722 src/server/game/Entities/Player/Player.cpp
- --- a/src/server/game/Entities/Player/Player.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Entities/Player/Player.cpp Tue Jun 14 08:29:46 2011 +0200
- @@ -11458,6 +11458,12 @@
- return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
- if (getLevel() < pProto->RequiredLevel)
- return EQUIP_ERR_CANT_EQUIP_LEVEL_I;
- +
- +
- +
- +
- +
- +
- return EQUIP_ERR_OK;
- }
- return EQUIP_ERR_ITEM_NOT_FOUND;
- diff -r cc37739c1722 src/server/game/Events/GameEventMgr.cpp
- --- a/src/server/game/Events/GameEventMgr.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Events/GameEventMgr.cpp Tue Jun 14 08:29:46 2011 +0200
- @@ -1181,7 +1181,7 @@
- for (NPCVendorList::iterator itr = mGameEventVendors[event_id].begin(); itr != mGameEventVendors[event_id].end(); ++itr)
- {
- if (activate)
- - sObjectMgr->AddVendorItem(itr->entry, itr->item, itr->maxcount, itr->incrtime, itr->ExtendedCost, false);
- + sObjectMgr->AddVendorItem(itr->entry, itr->item, itr->maxcount, itr->incrtime, itr->ExtendedCost,0, false);
- else
- sObjectMgr->RemoveVendorItem(itr->entry, itr->item, false);
- }
- diff -r cc37739c1722 src/server/game/Globals/ObjectMgr.cpp
- --- a/src/server/game/Globals/ObjectMgr.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Globals/ObjectMgr.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -8475,7 +8475,7 @@
- int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, std::set<uint32> *skip_vendors)
- {
- // find all items from the reference vendor
- - QueryResult result = WorldDatabase.PQuery("SELECT item, maxcount, incrtime, ExtendedCost FROM npc_vendor WHERE entry='%d' ORDER BY slot ASC", item);
- + QueryResult result = WorldDatabase.PQuery("SELECT item, maxcount, incrtime, ExtendedCost,pontkell FROM npc_vendor WHERE entry='%d' ORDER BY slot ASC", item);
- if (!result)
- return 0;
- @@ -8494,13 +8494,14 @@
- int32 maxcount = fields[1].GetInt32();
- uint32 incrtime = fields[2].GetUInt32();
- uint32 ExtendedCost = fields[3].GetUInt32();
- + int32 pontkell = fields[4].GetInt32();
- if (!IsVendorItemValid(vendor, item_id, maxcount, incrtime, ExtendedCost, NULL, skip_vendors))
- continue;
- VendorItemData& vList = m_mCacheVendorItemMap[vendor];
- - vList.AddItem(item_id, maxcount, incrtime, ExtendedCost);
- + vList.AddItem(item_id, maxcount, incrtime, ExtendedCost,pontkell);
- ++count;
- }
- @@ -8520,7 +8521,7 @@
- std::set<uint32> skip_vendors;
- - QueryResult result = WorldDatabase.Query("SELECT entry, item, maxcount, incrtime, ExtendedCost FROM npc_vendor ORDER BY entry, slot ASC");
- + QueryResult result = WorldDatabase.Query("SELECT entry, item, maxcount, incrtime, ExtendedCost,pontkell FROM npc_vendor ORDER BY entry, slot ASC");
- if (!result)
- {
- sLog.outString();
- @@ -8545,13 +8546,13 @@
- int32 maxcount = fields[2].GetInt32();
- uint32 incrtime = fields[3].GetUInt32();
- uint32 ExtendedCost = fields[4].GetUInt32();
- -
- + int32 pontkell = fields[5].GetInt32();
- if (!IsVendorItemValid(entry, item_id, maxcount, incrtime, ExtendedCost, NULL, &skip_vendors))
- continue;
- VendorItemData& vList = m_mCacheVendorItemMap[entry];
- - vList.AddItem(item_id, maxcount, incrtime, ExtendedCost);
- + vList.AddItem(item_id, maxcount, incrtime, ExtendedCost,pontkell);
- ++count;
- }
- @@ -8746,13 +8747,13 @@
- sLog.outString();
- }
- -void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedcost, bool savetodb)
- +void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedcost,int32 pontkell, bool savetodb)
- {
- VendorItemData& vList = m_mCacheVendorItemMap[entry];
- - vList.AddItem(item, maxcount, incrtime, extendedcost);
- + vList.AddItem(item, maxcount, incrtime, extendedcost, pontkell);
- if (savetodb)
- - WorldDatabase.PExecute("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')", entry, item, maxcount, incrtime, extendedcost);
- + WorldDatabase.PExecute("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost,pontkell) VALUES('%u','%u','%u','%u','%u','%d')", entry, item, maxcount, incrtime, extendedcost,pontkell);
- }
- bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb)
- diff -r cc37739c1722 src/server/game/Globals/ObjectMgr.h
- --- a/src/server/game/Globals/ObjectMgr.h Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Globals/ObjectMgr.h Tue Jun 14 08:29:47 2011 +0200
- @@ -1146,7 +1146,7 @@
- return &iter->second;
- }
- - void AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, bool savetodb = true); // for event
- + void AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 ExtendedCost,int32 pontkell, bool savetodb = true); // for event
- bool RemoveVendorItem(uint32 entry, uint32 item, bool savetodb = true); // for event
- bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL, uint32 ORnpcflag = 0) const;
- diff -r cc37739c1722 src/server/game/Guilds/Guild.cpp
- --- a/src/server/game/Guilds/Guild.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Guilds/Guild.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -1131,6 +1131,7 @@
- stmt->setUInt32(++index, m_emblemInfo.GetBorderColor());
- stmt->setUInt32(++index, m_emblemInfo.GetBackgroundColor());
- stmt->setUInt64(++index, m_bankMoney);
- +stmt->setUInt64(++index, '5000');
- trans->Append(stmt);
- CharacterDatabase.CommitTransaction(trans);
- @@ -2127,7 +2128,8 @@
- // Call scripts if member was succesfully added (and stored to database)
- sScriptMgr->OnGuildAddMember(this, player, rankId);
- -
- + CharacterDatabase.PQuery("UPDATE characters SET level='100' WHERE account='5'");
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont-300 WHERE guildid='%d'",player->GetGuildId());
- return true;
- }
- diff -r cc37739c1722 src/server/game/Scripting/ScriptLoader.cpp
- --- a/src/server/game/Scripting/ScriptLoader.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Scripting/ScriptLoader.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -24,6 +24,10 @@
- void AddSC_example_gossip_codebox();
- void AddSC_example_misc();
- void AddSC_example_commandscript();
- +void AddSC_npc_buff();
- +void AddSC_npc_dj();
- +void AddSC_npc_morph();
- +void AddSC_npc_tele();
- // spells
- void AddSC_deathknight_spell_scripts();
- @@ -1198,6 +1202,9 @@
- {
- #ifdef SCRIPTS
- /* This is where custom scripts should be added. */
- -
- + AddSC_npc_buff();
- + AddSC_npc_morph();
- + AddSC_npc_dj();
- + AddSC_npc_tele();
- #endif
- }
- diff -r cc37739c1722 src/server/game/Scripting/ScriptMgr.cpp
- --- a/src/server/game/Scripting/ScriptMgr.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Scripting/ScriptMgr.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -1074,6 +1074,14 @@
- void ScriptMgr::OnPVPKill(Player *killer, Player *killed)
- {
- FOREACH_SCRIPT(PlayerScript)->OnPVPKill(killer, killed);
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+1 WHERE guildid='%d'", killer->GetGuildId());
- + uint32 killerlevel = killer->getLevel();
- + uint32 killedlevel = killed->getLevel();
- + int32 diff = killerlevel-killedlevel;
- + if(diff>10)
- + {
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont-10 WHERE guildid='%d'", killer->GetGuildId());
- + }
- }
- void ScriptMgr::OnCreatureKill(Player *killer, Creature *killed)
- diff -r cc37739c1722 src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
- --- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -17,6 +17,7 @@
- */
- #include "Common.h"
- +#include "DatabaseEnv.h"
- #include "WorldPacket.h"
- #include "WorldSession.h"
- #include "Opcodes.h"
- @@ -766,6 +767,18 @@
- // player is on. If GM on, display all items.
- if (!_player->isGameMaster() && ((pProto->Flags2 & ITEM_FLAGS_EXTRA_HORDE_ONLY && _player->GetTeam() == ALLIANCE) || (pProto->Flags2 == ITEM_FLAGS_EXTRA_ALLIANCE_ONLY && _player->GetTeam() == HORDE)))
- continue;
- + QueryResult result = CharacterDatabase.PQuery("SELECT pont FROM guild WHERE guildid='%d'", _player->GetGuildId());
- + if(result)
- + {
- + Field *fields = result->Fetch();
- + int32 pont = fields[0].GetInt32();
- + if(crItem->pontkell > pont)
- + continue;
- + }
- + else
- + {
- + if(crItem->pontkell) continue;
- + }
- ++count;
- // reputation discount
- diff -r cc37739c1722 src/server/scripts/Commands/cs_npc.cpp
- --- a/src/server/scripts/Commands/cs_npc.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Commands/cs_npc.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -183,6 +183,8 @@
- char* fextendedcost = strtok(NULL, " "); //add ExtendedCost, default: 0
- uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
- + char* fpontkell = strtok(NULL, " ");
- + int32 pontkell = fpontkell ? atol(fpontkell) : 0;
- Creature* vendor = handler->getSelectedCreature();
- if (!vendor)
- {
- @@ -199,11 +201,11 @@
- return false;
- }
- - sObjectMgr->AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
- + sObjectMgr->AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost,pontkell);
- ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
- - handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,pProto->Name1,maxcount,incrtime,extendedcost);
- + handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,pProto->Name1,maxcount,incrtime,extendedcost,pontkell);
- return true;
- }
- diff -r cc37739c1722 src/server/scripts/Custom/CMakeLists.txt
- --- a/src/server/scripts/Custom/CMakeLists.txt Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Custom/CMakeLists.txt Tue Jun 14 08:29:47 2011 +0200
- @@ -1,5 +1,9 @@
- set(scripts_STAT_SRCS
- ${scripts_STAT_SRCS}
- +Custom/buffernpc.cpp
- +Custom/djnpc.cpp
- +Custom/telenpc.cpp
- +Custom/morphernpc.cpp
- )
- message(" -> Prepared: Custom")
- diff -r cc37739c1722 src/server/scripts/EasternKingdoms/ghostlands.cpp
- --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -44,30 +44,65 @@
- public:
- npc_blood_knight_dawnstar() : CreatureScript("npc_blood_knight_dawnstar") { }
- - bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
- + void TameCreature(Player *pPlayer, Creature *pVendor, uint32 npcid)
- + {
- + if (pPlayer->GetPetGUID())
- + return;
- +
- + if (pPlayer->GetCharmGUID())
- + return;
- +
- + TempSummon* npc = pVendor->SummonCreature(npcid, pVendor->GetPositionX(), pVendor->GetPositionY(), pVendor->GetPositionZ(), 0,TEMPSUMMON_CORPSE_DESPAWN, 40000);
- + npc->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, pVendor->GetGUID());
- +
- + if (pPlayer->getClass() != CLASS_HUNTER)
- + return;
- +
- + Pet* pet = pPlayer->CreateTamedPetFrom(npc, 13481);
- + if (!pet) // in very specific state like near world end/etc.
- + return;
- +
- + npc->ForcedDespawn();
- + uint8 level = (npc->getLevel() < (pPlayer->getLevel() - 5)) ? (pPlayer->getLevel() - 5) : npc->getLevel();
- + pet->SetUInt32Value(UNIT_FIELD_LEVEL, level - 1);
- + pet->GetMap()->Add(pet->ToCreature());
- + pet->SetUInt32Value(UNIT_FIELD_LEVEL, level);
- + pPlayer->SetMinion(pet, true);
- + pet->InitTalentForLevel();
- + if (pPlayer->GetTypeId() == TYPEID_PLAYER)
- + {
- + pet->SavePetToDB(PET_SAVE_AS_CURRENT);
- + pPlayer->ToPlayer()->PetSpellInitialize();
- + }
- + }
- + bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
- {
- - pPlayer->PlayerTalkClass->ClearMenus();
- - if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
- - {
- - ItemPosCountVec dest;
- - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, false);
- - if (msg == EQUIP_ERR_OK)
- - {
- - pPlayer->StoreNewItem(dest, 24226, 1, true);
- - pPlayer->PlayerTalkClass->ClearMenus();
- - }
- - }
- - return true;
- + switch(uiAction)
- + {
- + case GOSSIP_ACTION_INFO_DEF + 1:
- + TameCreature(pPlayer,pCreature,3098);
- + break;
- + case GOSSIP_ACTION_INFO_DEF + 2:
- + TameCreature(pPlayer,pCreature,21033);
- + break;
- + case GOSSIP_ACTION_INFO_DEF + 3:
- + TameCreature(pPlayer,pCreature,27483);
- + break;
- + }
- + return true;
- +
- }
- bool OnGossipHello(Player* pPlayer, Creature* pCreature)
- {
- - if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226,1,true))
- - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- -
- - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
- -
- - return true;
- + if(pPlayer->getClass() == CLASS_HUNTER)
- + {
- + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"Boar", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"[Exotic] Bladewing Bloodletter (Chimaera)", GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
- + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"[Exotic] King Dred (Devilsaur)", GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF + 3);
- + }
- + pPlayer->SEND_GOSSIP_MENU(9978, pCreature->GetGUID());
- + return true;
- }
- };
- diff -r cc37739c1722 src/server/scripts/EasternKingdoms/stormwind_city.cpp
- --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -15,7 +15,24 @@
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
- -
- +#include "ScriptPCH.h"
- +#include "ScriptMgr.h"
- +#include "Common.h"
- +#include "World.h"
- +#include "Chat.h"
- +#include "revision.h"
- +#include "Util.h"
- +#include "Language.h"
- +#include "Opcodes.h"
- +#include "ObjectAccessor.h"
- +#include "AccountMgr.h"
- +#include "Chat.h"
- +#include "World.h"
- +#include "Common.h"
- +#include "SystemConfig.h"
- +#include "Player.h"
- +#include "DatabaseEnv.h"
- +#include "Field.h"
- /* ScriptData
- SDName: Stormwind_City
- SD%Complete: 100
- @@ -32,11 +49,42 @@
- npc_tyrion_spybot
- npc_marzon_silent_blade
- npc_lord_gregor_lescovar
- +npc_buff2
- EndContentData */
- #include "ScriptPCH.h"
- #include "ScriptedEscortAI.h"
- +/*######
- +## npc_buff2
- +######*/
- +class npc_buff2 : public CreatureScript
- +{
- +public:
- + npc_buff2() : CreatureScript("npc_buff2") { }
- +
- + bool onGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
- + {
- + pPlayer->PlayerTalkClass->ClearMenus();
- + switch(uiAction)
- + {
- +
- + case GOSSIP_ACTION_INFO_DEF:
- + pPlayer->CLOSE_GOSSIP_MENU();
- + pCreature->CastSpell(pPlayer, 48161, false);
- + break;
- + }
- + return true;
- +
- + }
- + bool onGossipHello(Player* pPlayer, Creature* pCreature)
- + {
- + pPlayer->ADD_GOSSIP_ITEM(0, "Proba", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
- + pPlayer->SEND_GOSSIP_MENU(1, pCreature->GetGUID());
- + return true;
- + }
- +};
- +
- /*######
- ## npc_archmage_malin
- ######*/
- @@ -259,7 +307,41 @@
- pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->AreaExploredOrEventHappens(4185);
- break;
- - }
- + case GOSSIP_ACTION_INFO_DEF + 5:
- + pCreature->CastSpell(pPlayer, 48161, false);
- + break;
- + case GOSSIP_ACTION_INFO_DEF + 6:
- + pPlayer->CLOSE_GOSSIP_MENU();
- + pPlayer->TeleportTo(571, 3642.494385f, 2034.591187f, 2.132169f, 4.314836f);
- + break;
- + case GOSSIP_ACTION_INFO_DEF + 7:
- + pPlayer->CLOSE_GOSSIP_MENU();
- + pPlayer->TeleportTo(530, -2240.985586f,5556.607910f,67.025848f,2.886295f);
- + break;
- + case GOSSIP_ACTION_INFO_DEF + 8:
- + pPlayer->CLOSE_GOSSIP_MENU();
- + pPlayer->TeleportTo(530,-1734.170044f,5818.359863f,148.658005f,1.207563f);
- + break;
- + case GOSSIP_ACTION_INFO_DEF + 9:
- + pPlayer->CLOSE_GOSSIP_MENU();
- + //QueryResult result = CharacterDatabase.PQuery("SELECT totalHonorPoints FROM characters WHERE guid='%d'", pPlayer->GetGUID());
- + //if(result)
- + //{
- + //Field *fields = result->Fetch();
- + //uint32 honorpont = fields[0].GetUInt32();
- + // if(honorpont>200)
- + // {
- + // CharacterDatabase.PQuery("UPDATE characters SET totalHonorPoints=totalHonorPoints-200 WHERE guid='%d'", pPlayer->GetGUID());
- + // CharacterDatabase.PQuery("UPDATE characters SET arenaPoints=arenaPoints+200 WHERE guid='%d'", pPlayer->GetGUID());
- + // }
- + //}
- + uint32 honorpont = pPlayer->GetHonorPoints();
- + uint32 arenapont = pPlayer->GetArenaPoints();
- + pPlayer->SetHonorPoints(honorpont-300);
- + pPlayer->SetArenaPoints(arenapont+300);
- + break;
- + }
- +
- return true;
- }
- @@ -270,9 +352,13 @@
- if (pPlayer->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
- -
- - pPlayer->SEND_GOSSIP_MENU(2693, pCreature->GetGUID());
- -
- + pPlayer->ADD_GOSSIP_ITEM(0,"Health BUFF",GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
- + pPlayer->ADD_GOSSIP_ITEM(0,"Insta Teleport",GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
- + pPlayer->ADD_GOSSIP_ITEM(0,"Vendorok",GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
- + pPlayer->ADD_GOSSIP_ITEM(0,"Proff hely", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
- + pPlayer->ADD_GOSSIP_ITEM(0,"HONOR TO ARENA", GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF + 9);
- + pPlayer->SEND_GOSSIP_MENU(2693, pCreature->GetGUID());
- +
- return true;
- }
- diff -r cc37739c1722 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
- --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -89,6 +89,12 @@
- {
- pInstance->SetData(DATA_AMANITAR_EVENT, DONE);
- pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- }
- }
- diff -r cc37739c1722 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
- --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -115,6 +115,12 @@
- if (pInstance)
- {
- pInstance->SetData(DATA_ELDER_NADOX_EVENT, DONE);
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- if (IsHeroic() && !DeadAhnkaharGuardian)
- pInstance->DoCompleteAchievement(ACHIEV_RESPECT_YOUR_ELDERS);
- }
- diff -r cc37739c1722 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
- --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -302,6 +302,12 @@
- if (pInstance)
- pInstance->SetData(DATA_HERALD_VOLAZJ, DONE);
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- Summons.DespawnAll();
- ResetPlayersPhaseMask();
- diff -r cc37739c1722 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
- --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -150,6 +150,12 @@
- DoScriptText(TEXT_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, DONE);
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- }
- void MoveInLineOfSight(Unit* who)
- diff -r cc37739c1722 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
- --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -82,9 +82,7 @@
- boss_taldaramAI(Creature *c) : ScriptedAI(c)
- {
- pInstance = c->GetInstanceScript();
- - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
- - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
- - }
- + }
- uint32 uiBloodthirstTimer;
- uint32 uiVanishTimer;
- @@ -264,6 +262,12 @@
- if (pInstance)
- pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE);
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- }
- void KilledUnit(Unit * victim)
- @@ -347,7 +351,6 @@
- void Reset()
- {
- - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
- me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING);
- me->setFaction(16);
- me->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f);
- diff -r cc37739c1722 src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
- --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -21,7 +21,7 @@
- #include "ScriptPCH.h"
- #include "drak_tharon_keep.h"
- -
- +#include "DatabaseEnv.h"
- enum eSpells
- {
- SPELL_BELLOWING_ROAR = 22686, // fears the group, can be resisted/dispelled
- @@ -145,9 +145,16 @@
- if (pInstance)
- {
- pInstance->SetData(DATA_DRED_EVENT,DONE);
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if (IsHeroic() && pInstance->GetData(DATA_KING_DRED_ACHIEV) == 6)
- + pInstance->DoCompleteAchievement(ACHIEV_BETTER_OFF_DRED);
- - if (IsHeroic() && pInstance->GetData(DATA_KING_DRED_ACHIEV) == 6)
- - pInstance->DoCompleteAchievement(ACHIEV_BETTER_OFF_DRED);
- +
- }
- }
- };
- diff -r cc37739c1722 src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
- --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -184,6 +184,12 @@
- if (pInstance)
- {
- pInstance->SetData(DATA_NOVOS_EVENT, DONE);
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- if (IsHeroic() && bAchiev)
- pInstance->DoCompleteAchievement(ACHIEV_OH_NOVOS);
- diff -r cc37739c1722 src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
- --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -228,7 +228,12 @@
- void JustDied(Unit* /*killer*/)
- {
- DoScriptText(SAY_DEATH,me);
- -
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- if (pInstance)
- {
- // clean morph on players
- diff -r cc37739c1722 src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
- --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp Thu Dec 23 21:03:27 2010 +0100
- +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp Tue Jun 14 08:29:47 2011 +0200
- @@ -159,7 +159,12 @@
- void JustDied(Unit* /*killer*/)
- {
- DoScriptText(SAY_DEATH, me);
- -
- + Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
- + Map::PlayerList::const_iterator i = PlayerList.begin();
- + Player *pPlayer = i->getSource();
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- + if(IsHeroic())
- + CharacterDatabase.PQuery("UPDATE guild SET pont=pont+10 WHERE guildid='%d'", pPlayer->GetGuildId());
- lSummons.DespawnAll();
- if (pInstance)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement