diff options
| -rw-r--r-- | sql/updates/1325_world.sql | 2 | ||||
| -rw-r--r-- | sql/updates/1414_world.sql | 2 | ||||
| -rw-r--r-- | sql/updates/1414_world_scripts.sql | 264 | ||||
| -rw-r--r-- | src/game/ObjectMgr.cpp | 20 | ||||
| -rw-r--r-- | src/game/Player.cpp | 2 | ||||
| -rw-r--r-- | src/game/QuestDef.cpp | 46 | ||||
| -rw-r--r-- | src/game/QuestDef.h | 2 |
7 files changed, 169 insertions, 169 deletions
diff --git a/sql/updates/1325_world.sql b/sql/updates/1325_world.sql deleted file mode 100644 index 45184bfdaf5..00000000000 --- a/sql/updates/1325_world.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `quest_template` ADD COLUMN `RewChoiceItemId7` mediumint(8) unsigned NOT NULL default '0' AFTER `RewChoiceItemId6`; -ALTER TABLE `quest_template` ADD COLUMN `RewChoiceItemCount7` smallint(5) unsigned NOT NULL default '0' AFTER `RewChoiceItemCount6`; diff --git a/sql/updates/1414_world.sql b/sql/updates/1414_world.sql new file mode 100644 index 00000000000..9ac90c40385 --- /dev/null +++ b/sql/updates/1414_world.sql @@ -0,0 +1,2 @@ +ALTER TABLE `quest_template` DROP COLUMN `RewChoiceItemId7`; +ALTER TABLE `quest_template` DROP COLUMN `RewChoiceItemCount7`; diff --git a/sql/updates/1414_world_scripts.sql b/sql/updates/1414_world_scripts.sql index a1bc61eb8a2..a6b2e374460 100644 --- a/sql/updates/1414_world_scripts.sql +++ b/sql/updates/1414_world_scripts.sql @@ -1,132 +1,132 @@ --- r826_scriptdev2_script_texts.sql
-ALTER TABLE eventai_texts ADD COLUMN emote tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER language;
-
-
--- r847_scriptdev2_script_texts.sql
-UPDATE script_texts SET emote=15 WHERE entry=-1000123;
-UPDATE script_texts SET emote=1 WHERE entry=-1560028;
-UPDATE script_texts SET emote=1 WHERE entry=-1560031;
-UPDATE script_texts SET emote=5 WHERE entry=-1560032;
-UPDATE script_texts SET emote=16 WHERE entry=-1000119;
-UPDATE script_texts SET emote=254 WHERE entry=-1249002;
-UPDATE script_texts SET emote=293 WHERE entry=-1249003;
-UPDATE script_texts SET emote=1 WHERE entry=-1033000;
-
-
--- r848_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry BETWEEN -1540047 AND -1540042;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1540042,'Ours is the true Horde! The only Horde!',10323,1,0,0,'kargath SAY_AGGRO1'),
-(-1540043,'I\'ll carve the meat from your bones!',10324,1,0,0,'kargath SAY_AGGRO2'),
-(-1540044,'I am called Bladefist for a reason, as you will see!',10325,1,0,0,'kargath SAY_AGGRO3'),
-(-1540045,'For the real Horde!',10326,1,0,0,'kargath SAY_SLAY1'),
-(-1540046,'I am the only Warchief!',10327,1,0,0,'kargath SAY_SLAY2'),
-(-1540047,'The true Horde... will.. prevail...',10328,1,0,0,'kargath SAY_DEATH');
-
-DELETE FROM script_texts WHERE entry BETWEEN -1533118 AND -1533109;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1533109,'You are mine now!',8825,1,0,0,'heigan SAY_AGGRO1'),
-(-1533110,'I see you!',8826,1,0,0,'heigan SAY_AGGRO2'),
-(-1533111,'You...are next!',8827,1,0,0,'heigan SAY_AGGRO3'),
-(-1533112,'Close your eyes... sleep!',8829,1,0,0,'heigan SAY_SLAY'),
-(-1533113,'The races of the world will perish. It is only a matter of time.',8830,1,0,0,'heigan SAY_TAUNT1'),
-(-1533114,'I see endless suffering, I see torment, I see rage. I see... everything!',8831,1,0,0,'heigan SAY_TAUNT2'),
-(-1533115,'Soon... the world will tremble!',8832,1,0,0,'heigan SAY_TAUNT3'),
-(-1533116,'The end is upon you.',8833,1,0,0,'heigan SAY_TAUNT4'),
-(-1533117,'Hungry worms will feast on your rotten flesh!',8834,1,0,0,'heigan SAY_TAUNT5'),
-(-1533118,'Noo... o...',8828,1,0,0,'heigan SAY_DEATH');
-
-
--- r849_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry=-1070000;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1070000,'None may steal the secrets of the makers!',5851,1,0,0,'ironaya SAY_AGGRO');
-
-DELETE FROM script_texts WHERE entry BETWEEN -1129004 AND -1129000;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1129000,'You\'ll never leave this place... alive.',5825,1,0,0,'amnennar SAY_AGGRO'),
-(-1129001,'To me, my servants!',5828,1,0,0,'amnennar SAY_SUMMON60'),
-(-1129002,'Come, spirits, attend your master!',5829,1,0,0,'amnennar SAY_SUMMON30'),
-(-1129003,'I am the hand of the Lich King!',5827,1,0,0,'amnennar SAY_HP'),
-(-1129004,'Too...easy!',5826,1,0,0,'amnennar SAY_KILL');
-
-DELETE FROM script_texts WHERE entry IN (-1230001,-1230002);
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1230001,'Come to aid the Throne!',0,1,0,0,'dagran SAY_AGGRO'),
-(-1230002,'Hail to the king, baby!',0,1,0,0,'dagran SAY_SLAY');
-
-
--- r852_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry BETWEEN -1189021 AND -1189011;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1189011,'Tell me... tell me everything!',5847,1,0,0,'vishas SAY_AGGRO'),
-(-1189012,'Naughty secrets!',5849,1,0,0,'vishas SAY_HEALTH1'),
-(-1189013,'I\'ll rip the secrets from your flesh!',5850,1,0,0,'vishas SAY_HEALTH2'),
-(-1189014,'Purged by pain!',5848,1,0,0,'vishas SAY_KILL'),
-(-1189015,'The monster got what he deserved.',0,0,1,0,'vishas SAY_TRIGGER_VORREL'),
-(-1189016,'We hunger for vengeance.',5844,1,0,0,'thalnos SAY_AGGRO'),
-(-1189017,'No rest, for the angry dead.',5846,1,0,0,'thalnos SAY_HEALTH'),
-(-1189018,'More... More souls.',5845,1,0,0,'thalnos SAY_KILL'),
-(-1189019,'You will not defile these mysteries!',5842,1,0,0,'doan SAY_AGGRO'),
-(-1189020,'Burn in righteous fire!',5843,1,0,0,'doan SAY_SPECIALAE'),
-(-1189021,'Release the hounds!',5841,1,0,0,'loksey SAY_AGGRO');
-
-
--- r854_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry BETWEEN -1070001 AND -1070006;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1070001,'Taste blade, mongrel!',0,0,0,0,'SAY_GUARD_SIL_AGGRO1'),
-(-1070002,'Please tell me that you didn\'t just do what I think you just did. Please tell me that I\'m not going to have to hurt you...',0,0,0,0,'SAY_GUARD_SIL_AGGRO2'),
-(-1070003,'As if we don\'t have enough problems, you go and create more!',0,0,0,0,'SAY_GUARD_SIL_AGGRO3'),
-(-1070004,'looks up at you quizzically. Maybe you should inspect it?',0,2,0,0,'cluck EMOTE_A_HELLO'),
-(-1070005,'looks at you unexpectadly.',0,2,0,0,'cluck EMOTE_H_HELLO'),
-(-1070006,'starts pecking at the feed.',0,2,0,0,'cluck EMOTE_CLUCK_TEXT2');
-
-
--- r855_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry IN (-1000004,-1000001);
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1000001,'goes into a killing frenzy!',0,2,0,0,'EMOTE_GENERIC_FRENZY_KILL'),
-(-1000004,'goes into a berserker rage!',0,2,0,0,'EMOTE_GENERIC_BERSERK');
-
-DELETE FROM script_texts WHERE entry = -1000005;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1000005,'Greetings citizen',0,0,7,0,'general_marcus SAY_GREETING');
-
-DELETE FROM script_texts WHERE entry BETWEEN -1329003 AND -1329000;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1329000,'Thanks to Egan',0,0,0,0,'freed_soul SAY_ZAPPED0'),
-(-1329001,'Rivendare must die',0,0,0,0,'freed_soul SAY_ZAPPED1'),
-(-1329002,'Who you gonna call?',0,0,0,0,'freed_soul SAY_ZAPPED2'),
-(-1329003,'Don\'t cross those beams!',0,0,0,0,'freed_soul SAY_ZAPPED3');
-
-DELETE FROM script_texts WHERE entry BETWEEN -1999925 AND -1999900;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1999900,'Let the games begin.',8280,1,0,0,'example_creature SAY_AGGRO'),
-(-1999901,'I see endless suffering. I see torment. I see rage. I see everything.',8831,1,0,0,'example_creature SAY_RANDOM_0'),
-(-1999902,'Muahahahaha',8818,1,0,0,'example_creature SAY_RANDOM_1'),
-(-1999903,'These mortal infedels my lord, they have invaded your sanctum and seek to steal your secrets.',8041,1,0,0,'example_creature SAY_RANDOM_2'),
-(-1999904,'You are already dead.',8581,1,0,0,'example_creature SAY_RANDOM_3'),
-(-1999905,'Where to go? What to do? So many choices that all end in pain, end in death.',8791,1,0,0,'example_creature SAY_RANDOM_4'),
-(-1999906,'$N, I sentance you to death!',8588,1,0,0,'example_creature SAY_BESERK'),
-(-1999907,'The suffering has just begun!',0,1,0,0,'example_creature SAY_PHASE'),
-(-1999908,'I always thought I was a good dancer.',0,0,0,0,'example_creature SAY_DANCE'),
-(-1999909,'Move out Soldier!',0,0,0,0,'example_creature SAY_SALUTE'),
-(-1999910,'Help $N! I\'m under attack!',0,0,0,0,'example_escort SAY_AGGRO1'),
-(-1999911,'Die scum!',0,0,0,0,'example_escort SAY_AGGRO2'),
-(-1999912,'Hmm a nice day for a walk alright',0,0,0,0,'example_escort SAY_WP_1'),
-(-1999913,'Wild Felboar attack!',0,0,0,0,'example_escort SAY_WP_2'),
-(-1999914,'Time for me to go! See ya around $N!',0,0,0,3,'example_escort SAY_WP_3'),
-(-1999915,'Bye Bye!',0,0,0,3,'example_escort SAY_WP_4'),
-(-1999916,'How dare you leave me like that! I hate you! =*(',0,3,0,0,'example_escort SAY_DEATH_1'),
-(-1999917,'...no...how could you let me die $N',0,0,0,0,'example_escort SAY_DEATH_2'),
-(-1999918,'ugh...',0,0,0,0,'example_escort SAY_DEATH_3'),
-(-1999919,'Taste death!',0,0,0,0,'example_escort SAY_SPELL'),
-(-1999920,'Fireworks!',0,0,0,0,'example_escort SAY_RAND_1'),
-(-1999921,'Hmm, I think I could use a buff.',0,0,0,0,'example_escort SAY_RAND_2'),
-(-1999922,'Normal select, guess you\'re not interested.',0,0,0,0,'example_gossip_codebox SAY_NOT_INTERESTED'),
-(-1999923,'Wrong!',0,0,0,0,'example_gossip_codebox SAY_WRONG'),
-(-1999924,'You\'re right, you are allowed to see my inner secrets.',0,0,0,0,'example_gossip_codebox SAY_CORRECT'),
-(-1999925,'Hi!',0,0,0,0,'example_areatrigger SAY_HI');
-
-
+-- r826_scriptdev2_script_texts.sql +ALTER TABLE eventai_texts ADD COLUMN emote tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER language; + + +-- r847_scriptdev2_script_texts.sql +UPDATE script_texts SET emote=15 WHERE entry=-1000123; +UPDATE script_texts SET emote=1 WHERE entry=-1560028; +UPDATE script_texts SET emote=1 WHERE entry=-1560031; +UPDATE script_texts SET emote=5 WHERE entry=-1560032; +UPDATE script_texts SET emote=16 WHERE entry=-1000119; +UPDATE script_texts SET emote=254 WHERE entry=-1249002; +UPDATE script_texts SET emote=293 WHERE entry=-1249003; +UPDATE script_texts SET emote=1 WHERE entry=-1033000; + + +-- r848_scriptdev2_script_texts.sql +DELETE FROM script_texts WHERE entry BETWEEN -1540047 AND -1540042; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1540042,'Ours is the true Horde! The only Horde!',10323,1,0,0,'kargath SAY_AGGRO1'), +(-1540043,'I\'ll carve the meat from your bones!',10324,1,0,0,'kargath SAY_AGGRO2'), +(-1540044,'I am called Bladefist for a reason, as you will see!',10325,1,0,0,'kargath SAY_AGGRO3'), +(-1540045,'For the real Horde!',10326,1,0,0,'kargath SAY_SLAY1'), +(-1540046,'I am the only Warchief!',10327,1,0,0,'kargath SAY_SLAY2'), +(-1540047,'The true Horde... will.. prevail...',10328,1,0,0,'kargath SAY_DEATH'); + +DELETE FROM script_texts WHERE entry BETWEEN -1533118 AND -1533109; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1533109,'You are mine now!',8825,1,0,0,'heigan SAY_AGGRO1'), +(-1533110,'I see you!',8826,1,0,0,'heigan SAY_AGGRO2'), +(-1533111,'You...are next!',8827,1,0,0,'heigan SAY_AGGRO3'), +(-1533112,'Close your eyes... sleep!',8829,1,0,0,'heigan SAY_SLAY'), +(-1533113,'The races of the world will perish. It is only a matter of time.',8830,1,0,0,'heigan SAY_TAUNT1'), +(-1533114,'I see endless suffering, I see torment, I see rage. I see... everything!',8831,1,0,0,'heigan SAY_TAUNT2'), +(-1533115,'Soon... the world will tremble!',8832,1,0,0,'heigan SAY_TAUNT3'), +(-1533116,'The end is upon you.',8833,1,0,0,'heigan SAY_TAUNT4'), +(-1533117,'Hungry worms will feast on your rotten flesh!',8834,1,0,0,'heigan SAY_TAUNT5'), +(-1533118,'Noo... o...',8828,1,0,0,'heigan SAY_DEATH'); + + +-- r849_scriptdev2_script_texts.sql +DELETE FROM script_texts WHERE entry=-1070000; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1070000,'None may steal the secrets of the makers!',5851,1,0,0,'ironaya SAY_AGGRO'); + +DELETE FROM script_texts WHERE entry BETWEEN -1129004 AND -1129000; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1129000,'You\'ll never leave this place... alive.',5825,1,0,0,'amnennar SAY_AGGRO'), +(-1129001,'To me, my servants!',5828,1,0,0,'amnennar SAY_SUMMON60'), +(-1129002,'Come, spirits, attend your master!',5829,1,0,0,'amnennar SAY_SUMMON30'), +(-1129003,'I am the hand of the Lich King!',5827,1,0,0,'amnennar SAY_HP'), +(-1129004,'Too...easy!',5826,1,0,0,'amnennar SAY_KILL'); + +DELETE FROM script_texts WHERE entry IN (-1230001,-1230002); +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1230001,'Come to aid the Throne!',0,1,0,0,'dagran SAY_AGGRO'), +(-1230002,'Hail to the king, baby!',0,1,0,0,'dagran SAY_SLAY'); + + +-- r852_scriptdev2_script_texts.sql +DELETE FROM script_texts WHERE entry BETWEEN -1189021 AND -1189011; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1189011,'Tell me... tell me everything!',5847,1,0,0,'vishas SAY_AGGRO'), +(-1189012,'Naughty secrets!',5849,1,0,0,'vishas SAY_HEALTH1'), +(-1189013,'I\'ll rip the secrets from your flesh!',5850,1,0,0,'vishas SAY_HEALTH2'), +(-1189014,'Purged by pain!',5848,1,0,0,'vishas SAY_KILL'), +(-1189015,'The monster got what he deserved.',0,0,1,0,'vishas SAY_TRIGGER_VORREL'), +(-1189016,'We hunger for vengeance.',5844,1,0,0,'thalnos SAY_AGGRO'), +(-1189017,'No rest, for the angry dead.',5846,1,0,0,'thalnos SAY_HEALTH'), +(-1189018,'More... More souls.',5845,1,0,0,'thalnos SAY_KILL'), +(-1189019,'You will not defile these mysteries!',5842,1,0,0,'doan SAY_AGGRO'), +(-1189020,'Burn in righteous fire!',5843,1,0,0,'doan SAY_SPECIALAE'), +(-1189021,'Release the hounds!',5841,1,0,0,'loksey SAY_AGGRO'); + + +-- r854_scriptdev2_script_texts.sql +DELETE FROM script_texts WHERE entry BETWEEN -1070001 AND -1070006; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1070001,'Taste blade, mongrel!',0,0,0,0,'SAY_GUARD_SIL_AGGRO1'), +(-1070002,'Please tell me that you didn\'t just do what I think you just did. Please tell me that I\'m not going to have to hurt you...',0,0,0,0,'SAY_GUARD_SIL_AGGRO2'), +(-1070003,'As if we don\'t have enough problems, you go and create more!',0,0,0,0,'SAY_GUARD_SIL_AGGRO3'), +(-1070004,'looks up at you quizzically. Maybe you should inspect it?',0,2,0,0,'cluck EMOTE_A_HELLO'), +(-1070005,'looks at you unexpectadly.',0,2,0,0,'cluck EMOTE_H_HELLO'), +(-1070006,'starts pecking at the feed.',0,2,0,0,'cluck EMOTE_CLUCK_TEXT2'); + + +-- r855_scriptdev2_script_texts.sql +DELETE FROM script_texts WHERE entry IN (-1000004,-1000001); +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1000001,'goes into a killing frenzy!',0,2,0,0,'EMOTE_GENERIC_FRENZY_KILL'), +(-1000004,'goes into a berserker rage!',0,2,0,0,'EMOTE_GENERIC_BERSERK'); + +DELETE FROM script_texts WHERE entry = -1000005; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1000005,'Greetings citizen',0,0,7,0,'general_marcus SAY_GREETING'); + +DELETE FROM script_texts WHERE entry BETWEEN -1329003 AND -1329000; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1329000,'Thanks to Egan',0,0,0,0,'freed_soul SAY_ZAPPED0'), +(-1329001,'Rivendare must die',0,0,0,0,'freed_soul SAY_ZAPPED1'), +(-1329002,'Who you gonna call?',0,0,0,0,'freed_soul SAY_ZAPPED2'), +(-1329003,'Don\'t cross those beams!',0,0,0,0,'freed_soul SAY_ZAPPED3'); + +DELETE FROM script_texts WHERE entry BETWEEN -1999925 AND -1999900; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1999900,'Let the games begin.',8280,1,0,0,'example_creature SAY_AGGRO'), +(-1999901,'I see endless suffering. I see torment. I see rage. I see everything.',8831,1,0,0,'example_creature SAY_RANDOM_0'), +(-1999902,'Muahahahaha',8818,1,0,0,'example_creature SAY_RANDOM_1'), +(-1999903,'These mortal infedels my lord, they have invaded your sanctum and seek to steal your secrets.',8041,1,0,0,'example_creature SAY_RANDOM_2'), +(-1999904,'You are already dead.',8581,1,0,0,'example_creature SAY_RANDOM_3'), +(-1999905,'Where to go? What to do? So many choices that all end in pain, end in death.',8791,1,0,0,'example_creature SAY_RANDOM_4'), +(-1999906,'$N, I sentance you to death!',8588,1,0,0,'example_creature SAY_BESERK'), +(-1999907,'The suffering has just begun!',0,1,0,0,'example_creature SAY_PHASE'), +(-1999908,'I always thought I was a good dancer.',0,0,0,0,'example_creature SAY_DANCE'), +(-1999909,'Move out Soldier!',0,0,0,0,'example_creature SAY_SALUTE'), +(-1999910,'Help $N! I\'m under attack!',0,0,0,0,'example_escort SAY_AGGRO1'), +(-1999911,'Die scum!',0,0,0,0,'example_escort SAY_AGGRO2'), +(-1999912,'Hmm a nice day for a walk alright',0,0,0,0,'example_escort SAY_WP_1'), +(-1999913,'Wild Felboar attack!',0,0,0,0,'example_escort SAY_WP_2'), +(-1999914,'Time for me to go! See ya around $N!',0,0,0,3,'example_escort SAY_WP_3'), +(-1999915,'Bye Bye!',0,0,0,3,'example_escort SAY_WP_4'), +(-1999916,'How dare you leave me like that! I hate you! =*(',0,3,0,0,'example_escort SAY_DEATH_1'), +(-1999917,'...no...how could you let me die $N',0,0,0,0,'example_escort SAY_DEATH_2'), +(-1999918,'ugh...',0,0,0,0,'example_escort SAY_DEATH_3'), +(-1999919,'Taste death!',0,0,0,0,'example_escort SAY_SPELL'), +(-1999920,'Fireworks!',0,0,0,0,'example_escort SAY_RAND_1'), +(-1999921,'Hmm, I think I could use a buff.',0,0,0,0,'example_escort SAY_RAND_2'), +(-1999922,'Normal select, guess you\'re not interested.',0,0,0,0,'example_gossip_codebox SAY_NOT_INTERESTED'), +(-1999923,'Wrong!',0,0,0,0,'example_gossip_codebox SAY_WRONG'), +(-1999924,'You\'re right, you are allowed to see my inner secrets.',0,0,0,0,'example_gossip_codebox SAY_CORRECT'), +(-1999925,'Hi!',0,0,0,0,'example_areatrigger SAY_HI'); + + diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 35302bc867b..050ccc0f82e 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -2796,19 +2796,19 @@ void ObjectMgr::LoadQuests() "ReqCreatureOrGOId1, ReqCreatureOrGOId2, ReqCreatureOrGOId3, ReqCreatureOrGOId4, ReqCreatureOrGOCount1, ReqCreatureOrGOCount2, ReqCreatureOrGOCount3, ReqCreatureOrGOCount4," // 67 68 69 70 "ReqSpellCast1, ReqSpellCast2, ReqSpellCast3, ReqSpellCast4," - // 71 72 73 74 75 76 77 - "RewChoiceItemId1, RewChoiceItemId2, RewChoiceItemId3, RewChoiceItemId4, RewChoiceItemId5, RewChoiceItemId6, RewChoiceItemId7," - // 78 79 80 81 82 83 84 - "RewChoiceItemCount1, RewChoiceItemCount2, RewChoiceItemCount3, RewChoiceItemCount4, RewChoiceItemCount5, RewChoiceItemCount6, RewChoiceItemCount7," - // 85 86 87 88 89 90 91 92 + // 71 72 73 74 75 76 + "RewChoiceItemId1, RewChoiceItemId2, RewChoiceItemId3, RewChoiceItemId4, RewChoiceItemId5, RewChoiceItemId6," + // 77 78 79 80 81 82 + "RewChoiceItemCount1, RewChoiceItemCount2, RewChoiceItemCount3, RewChoiceItemCount4, RewChoiceItemCount5, RewChoiceItemCount6," + // 83 84 85 86 87 88 89 90 "RewItemId1, RewItemId2, RewItemId3, RewItemId4, RewItemCount1, RewItemCount2, RewItemCount3, RewItemCount4," - // 93 94 95 96 97 98 99 100 101 102 + // 91 92 93 94 95 96 97 98 99 100 "RewRepFaction1, RewRepFaction2, RewRepFaction3, RewRepFaction4, RewRepFaction5, RewRepValue1, RewRepValue2, RewRepValue3, RewRepValue4, RewRepValue5," - // 103 104 105 106 107 108 109 110 111 112 113 + // 101 102 103 104 105 106 107 108 109 110 111 "RewHonorableKills, RewOrReqMoney, RewMoneyMaxLevel, RewSpell, RewSpellCast, RewMailTemplateId, RewMailDelaySecs, PointMapId, PointX, PointY, PointOpt," - // 114 115 116 117 118 119 120 121 122 123 - "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4,IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4," - // 124 125 + // 112 113 114 115 116 117 118 119 120 121 + "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4,IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4," + // 122 123 "StartScript, CompleteScript" " FROM quest_template"); if(result == NULL) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8b7423a5e56..3bb7c959ca0 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6986,7 +6986,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl ApplyFeralAPBonus(feral_bonus, apply); } - if(IsInFeralForm() || !CanUseAttackType(attType)) + if(!IsInFeralForm() || !CanUseAttackType(attType)) return; if (proto->Delay) diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp index d07b56c6157..5d5b4bdf6f5 100644 --- a/src/game/QuestDef.cpp +++ b/src/game/QuestDef.cpp @@ -91,43 +91,43 @@ Quest::Quest(Field * questRecord) RewChoiceItemId[i] = questRecord[71+i].GetUInt32(); for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i) - RewChoiceItemCount[i] = questRecord[78+i].GetUInt32(); + RewChoiceItemCount[i] = questRecord[77+i].GetUInt32(); for (int i = 0; i < QUEST_REWARDS_COUNT; ++i) - RewItemId[i] = questRecord[85+i].GetUInt32(); + RewItemId[i] = questRecord[83+i].GetUInt32(); for (int i = 0; i < QUEST_REWARDS_COUNT; ++i) - RewItemCount[i] = questRecord[89+i].GetUInt32(); + RewItemCount[i] = questRecord[87+i].GetUInt32(); for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) - RewRepFaction[i] = questRecord[93+i].GetUInt32(); + RewRepFaction[i] = questRecord[91+i].GetUInt32(); for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) - RewRepValue[i] = questRecord[98+i].GetInt32(); - - RewHonorableKills = questRecord[103].GetUInt32(); - RewOrReqMoney = questRecord[104].GetInt32(); - RewMoneyMaxLevel = questRecord[105].GetUInt32(); - RewSpell = questRecord[106].GetUInt32(); - RewSpellCast = questRecord[107].GetUInt32(); - RewMailTemplateId = questRecord[108].GetUInt32(); - RewMailDelaySecs = questRecord[109].GetUInt32(); - PointMapId = questRecord[110].GetUInt32(); - PointX = questRecord[111].GetFloat(); - PointY = questRecord[112].GetFloat(); - PointOpt = questRecord[113].GetUInt32(); + RewRepValue[i] = questRecord[96+i].GetInt32(); + + RewHonorableKills = questRecord[101].GetUInt32(); + RewOrReqMoney = questRecord[102].GetInt32(); + RewMoneyMaxLevel = questRecord[103].GetUInt32(); + RewSpell = questRecord[104].GetUInt32(); + RewSpellCast = questRecord[105].GetUInt32(); + RewMailTemplateId = questRecord[106].GetUInt32(); + RewMailDelaySecs = questRecord[107].GetUInt32(); + PointMapId = questRecord[108].GetUInt32(); + PointX = questRecord[109].GetFloat(); + PointY = questRecord[110].GetFloat(); + PointOpt = questRecord[111].GetUInt32(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) - DetailsEmote[i] = questRecord[114+i].GetUInt32(); + DetailsEmote[i] = questRecord[112+i].GetUInt32(); - IncompleteEmote = questRecord[118].GetUInt32(); - CompleteEmote = questRecord[119].GetUInt32(); + IncompleteEmote = questRecord[116].GetUInt32(); + CompleteEmote = questRecord[117].GetUInt32(); for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) - OfferRewardEmote[i] = questRecord[120+i].GetInt32(); + OfferRewardEmote[i] = questRecord[118+i].GetInt32(); - QuestStartScript = questRecord[124].GetUInt32(); - QuestCompleteScript = questRecord[125].GetUInt32(); + QuestStartScript = questRecord[122].GetUInt32(); + QuestCompleteScript = questRecord[123].GetUInt32(); QuestFlags |= SpecialFlags << 16; diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h index 3b5e7b1a3d9..c9bfdf83874 100644 --- a/src/game/QuestDef.h +++ b/src/game/QuestDef.h @@ -35,7 +35,7 @@ class ObjectMgr; #define QUEST_OBJECTIVES_COUNT 4 #define QUEST_SOURCE_ITEM_IDS_COUNT 4 -#define QUEST_REWARD_CHOICES_COUNT 7 +#define QUEST_REWARD_CHOICES_COUNT 6 #define QUEST_REWARDS_COUNT 4 #define QUEST_DEPLINK_COUNT 10 #define QUEST_REPUTATIONS_COUNT 5 |