Created
March 10, 2012 12:36
-
-
Save Jeidai/2011315 to your computer and use it in GitHub Desktop.
мда...
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From e33a022611a4c940a91d6d8ddd03866003b93608 Mon Sep 17 00:00:00 2001 | |
| From: Frozenarmor <venom.victorios@gmail.com> | |
| Date: Wed, 1 Feb 2012 04:03:27 +0500 | |
| Subject: [PATCH] Missed changes | |
| --- | |
| .../world/2012_02_01_world_script_name.sql | 1 + | |
| src/server/scripts/Northrend/argenttournament.cpp | 5 +++-- | |
| 2 files changed, 4 insertions(+), 2 deletions(-) | |
| create mode 100644 sql/ChaosEMU/world/2012_02_01_world_script_name.sql | |
| diff --git a/sql/ChaosEMU/world/2012_02_01_world_script_name.sql b/sql/ChaosEMU/world/2012_02_01_world_script_name.sql | |
| new file mode 100644 | |
| index 0000000..c0c75fb | |
| --- /dev/null | |
| +++ b/sql/ChaosEMU/world/2012_02_01_world_script_name.sql | |
| @@ -0,0 +1 @@ | |
| +UPDATE `creature_template` SET `ScriptName` = 'npc_black_knight_gryphon', `AIName` = '' WHERE `entry` = 33519; | |
| \ No newline at end of file | |
| diff --git a/src/server/scripts/Northrend/argenttournament.cpp b/src/server/scripts/Northrend/argenttournament.cpp | |
| index b504347..f44b6ac 100644 | |
| --- a/src/server/scripts/Northrend/argenttournament.cpp | |
| +++ b/src/server/scripts/Northrend/argenttournament.cpp | |
| @@ -3039,7 +3039,7 @@ enum eSquireCavin | |
| { | |
| QUEST_THE_BLACK_KNIGHT_FALL = 13664, | |
| NPC_BLACK_KNIGHT = 33785, | |
| - SPELL_RIDING_ARGENT_CHARGER = 63663 | |
| + //SPELL_RIDING_ARGENT_CHARGER = 63663 need fix | |
| }; | |
| #define GOSSIP_SQUIRE_C_ITEM_1 "Ask Cavian to summon the black knight" | |
| @@ -3053,7 +3053,7 @@ public: | |
| bool OnGossipHello(Player* player, Creature* creature) | |
| { | |
| - if (player->GetQuestStatus(QUEST_THE_BLACK_KNIGHT_FALL) == QUEST_STATUS_INCOMPLETE && player->HasAura(SPELL_RIDING_ARGENT_CHARGER)) | |
| + if (player->GetQuestStatus(QUEST_THE_BLACK_KNIGHT_FALL) == QUEST_STATUS_INCOMPLETE) | |
| player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SQUIRE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); | |
| player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); | |
| return true; | |
| @@ -3107,4 +3107,5 @@ void AddSC_Argen_Tournament() | |
| new npc_maiden_of_drak_mar; | |
| new npc_free_your_mind; | |
| new npc_squire_cavin; | |
| + new npc_black_knight_gryphon; | |
| } | |
| \ No newline at end of file | |
| -- | |
| 1.7.7.msysgit.1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment