Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source
This commit is contained in:
Nay
2012-08-20 23:44:35 +01:00
parent 61b0e289df 542521a026
commit 5a324ff036
3 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/scripts/Northrend/wintergrasp.cpp
View File

@@ -22,13 +22,16 @@
#include "ObjectMgr.h"
#include "Vehicle.h"
#include "GameObjectAI.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "SpellScript.h"
#define GOSSIP_HELLO_DEMO1 "Build catapult."
#define GOSSIP_HELLO_DEMO2 "Build demolisher."
#define GOSSIP_HELLO_DEMO3 "Build siege engine."
#define GOSSIP_HELLO_DEMO4 "I cannot build more!"
enum eWGqueuenpctext
enum WGqueuenpctext
{
WG_NPCQUEUE_TEXT_H_NOWAR = 14775,
WG_NPCQUEUE_TEXT_H_QUEUE = 14790,
@@ -98,7 +101,8 @@ enum QuestIds
uint8 const MAX_WINTERGRASP_VEHICLES = 4;
uint32 const vehiclesList[MAX_WINTERGRASP_VEHICLES] = {
uint32 const vehiclesList[MAX_WINTERGRASP_VEHICLES] =
{
NPC_WINTERGRASP_CATAPULT,
NPC_WINTERGRASP_DEMOLISHER,
NPC_WINTERGRASP_SIEGE_ENGINE_ALLIANCE,
@@ -135,7 +139,7 @@ class npc_wg_demolisher_engineer : public CreatureScript
return true;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender */ , uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender */, uint32 action)
{
player->CLOSE_GOSSIP_MENU();

25
src/server/scripts/World/achievement_scripts.cpp
View File

@@ -235,30 +235,6 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript
}
};
class achievement_wg_didnt_stand_a_chance : public AchievementCriteriaScript
{
public:
achievement_wg_didnt_stand_a_chance() : AchievementCriteriaScript("achievement_wg_didnt_stand_a_chance") { }
bool OnCheck(Player* source, Unit* target)
{
if (!target)
return false;
if (Player* victim = target->ToPlayer())
{
if (!victim->IsMounted())
return false;
if (Vehicle* vehicle = source->GetVehicle())
if (vehicle->GetVehicleInfo()->m_ID == 244) // Wintergrasp Tower Cannon
return true;
}
return false;
}
};
class achievement_bg_sa_defense_of_ancients : public AchievementCriteriaScript
{
public:
@@ -344,7 +320,6 @@ void AddSC_achievement_scripts()
new achievement_bg_ic_mowed_down();
new achievement_bg_sa_artillery();
new achievement_sickly_gazelle();
new achievement_wg_didnt_stand_a_chance();
new achievement_everything_counts();
new achievement_bg_av_perfection();
new achievement_arena_kills("achievement_arena_2v2_kills", ARENA_TYPE_2v2);