*Merge.

--HG--
branch : trunk

sql/updates/1325_world.sql

@@ -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`;

sql/updates/1414_world.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `quest_template` DROP COLUMN `RewChoiceItemId7`;
+ALTER TABLE `quest_template` DROP COLUMN `RewChoiceItemCount7`;

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
+    //   71                72                73                74                75                76
-        "RewChoiceItemId1, RewChoiceItemId2, RewChoiceItemId3, RewChoiceItemId4, RewChoiceItemId5, RewChoiceItemId6, RewChoiceItemId7,"
+        "RewChoiceItemId1, RewChoiceItemId2, RewChoiceItemId3, RewChoiceItemId4, RewChoiceItemId5, RewChoiceItemId6,"
-    //   78                   79                   80                   81                   82                   83                   84
+    //   77                   78                   79                   80                   81                   82
-        "RewChoiceItemCount1, RewChoiceItemCount2, RewChoiceItemCount3, RewChoiceItemCount4, RewChoiceItemCount5, RewChoiceItemCount6, RewChoiceItemCount7,"
+        "RewChoiceItemCount1, RewChoiceItemCount2, RewChoiceItemCount3, RewChoiceItemCount4, RewChoiceItemCount5, RewChoiceItemCount6,"
-    //   85          86          87          88          89             90             91             92
+    //   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
+    //   112            113            114            115           116              117            118                119                120                121
-    "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4,IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4,"
+        "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4,IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4,"
-    //   124          125
+    //   122          123
         "StartScript, CompleteScript"
         " FROM quest_template");
     if(result == NULL)

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)

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();
+        RewRepValue[i] = questRecord[96+i].GetInt32();
 
-    RewHonorableKills = questRecord[103].GetUInt32();
+    RewHonorableKills = questRecord[101].GetUInt32();
-    RewOrReqMoney = questRecord[104].GetInt32();
+    RewOrReqMoney = questRecord[102].GetInt32();
-    RewMoneyMaxLevel = questRecord[105].GetUInt32();
+    RewMoneyMaxLevel = questRecord[103].GetUInt32();
-    RewSpell = questRecord[106].GetUInt32();
+    RewSpell = questRecord[104].GetUInt32();
-    RewSpellCast = questRecord[107].GetUInt32();
+    RewSpellCast = questRecord[105].GetUInt32();
-    RewMailTemplateId = questRecord[108].GetUInt32();
+    RewMailTemplateId = questRecord[106].GetUInt32();
-    RewMailDelaySecs = questRecord[109].GetUInt32();
+    RewMailDelaySecs = questRecord[107].GetUInt32();
-    PointMapId = questRecord[110].GetUInt32();
+    PointMapId = questRecord[108].GetUInt32();
-    PointX = questRecord[111].GetFloat();
+    PointX = questRecord[109].GetFloat();
-    PointY = questRecord[112].GetFloat();
+    PointY = questRecord[110].GetFloat();
-    PointOpt = questRecord[113].GetUInt32();
+    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();
+    IncompleteEmote = questRecord[116].GetUInt32();
-    CompleteEmote = questRecord[119].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();
+    QuestStartScript = questRecord[122].GetUInt32();
-    QuestCompleteScript = questRecord[125].GetUInt32();
+    QuestCompleteScript = questRecord[123].GetUInt32();
 
     QuestFlags |= SpecialFlags << 16;
 

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