Show
Ignore:
Timestamp:
11/19/08 13:23:29 (17 years ago)
Author:
yumileroy
Message:

[svn] * Little fix in RandomMovementGenerator?
* Updated to 6731 and 680

Original author: Neo2003
Date: 2008-10-06 04:48:59-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/game/QuestDef.cpp

    r2 r18  
    2424{ 
    2525    QuestId = questRecord[0].GetUInt32(); 
    26     ZoneOrSort = questRecord[1].GetInt32(); 
    27     SkillOrClass = questRecord[2].GetInt32(); 
    28     MinLevel = questRecord[3].GetUInt32(); 
    29     QuestLevel = questRecord[4].GetUInt32(); 
    30     Type = questRecord[5].GetUInt32(); 
    31     RequiredRaces = questRecord[6].GetUInt32(); 
    32     RequiredSkillValue = questRecord[7].GetUInt32(); 
    33     RepObjectiveFaction = questRecord[8].GetUInt32(); 
    34     RepObjectiveValue = questRecord[9].GetInt32(); 
    35     RequiredMinRepFaction = questRecord[10].GetUInt32(); 
    36     RequiredMinRepValue = questRecord[11].GetInt32(); 
    37     RequiredMaxRepFaction = questRecord[12].GetUInt32(); 
    38     RequiredMaxRepValue = questRecord[13].GetInt32(); 
    39     SuggestedPlayers = questRecord[14].GetUInt32(); 
    40     LimitTime = questRecord[15].GetUInt32(); 
    41     QuestFlags = questRecord[16].GetUInt16(); 
    42     uint32 SpecialFlags = questRecord[17].GetUInt16(); 
    43     CharTitleId = questRecord[18].GetUInt32(); 
    44     PrevQuestId = questRecord[19].GetInt32(); 
    45     NextQuestId = questRecord[20].GetInt32(); 
    46     ExclusiveGroup = questRecord[21].GetInt32(); 
    47     NextQuestInChain = questRecord[22].GetUInt32(); 
    48     SrcItemId = questRecord[23].GetUInt32(); 
    49     SrcItemCount = questRecord[24].GetUInt32(); 
    50     SrcSpell = questRecord[25].GetUInt32(); 
    51     Title = questRecord[26].GetCppString(); 
    52     Details = questRecord[27].GetCppString(); 
    53     Objectives = questRecord[28].GetCppString(); 
    54     OfferRewardText = questRecord[29].GetCppString(); 
    55     RequestItemsText = questRecord[30].GetCppString(); 
    56     EndText = questRecord[31].GetCppString(); 
    57  
    58     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
    59         ObjectiveText[i] = questRecord[32+i].GetCppString(); 
    60  
    61     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
    62         ReqItemId[i] = questRecord[36+i].GetUInt32(); 
    63  
    64     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
    65         ReqItemCount[i] = questRecord[40+i].GetUInt32(); 
     26    QuestMethod = questRecord[1].GetUInt32(); 
     27    ZoneOrSort = questRecord[2].GetInt32(); 
     28    SkillOrClass = questRecord[3].GetInt32(); 
     29    MinLevel = questRecord[4].GetUInt32(); 
     30    QuestLevel = questRecord[5].GetUInt32(); 
     31    Type = questRecord[6].GetUInt32(); 
     32    RequiredRaces = questRecord[7].GetUInt32(); 
     33    RequiredSkillValue = questRecord[8].GetUInt32(); 
     34    RepObjectiveFaction = questRecord[9].GetUInt32(); 
     35    RepObjectiveValue = questRecord[10].GetInt32(); 
     36    RequiredMinRepFaction = questRecord[11].GetUInt32(); 
     37    RequiredMinRepValue = questRecord[12].GetInt32(); 
     38    RequiredMaxRepFaction = questRecord[13].GetUInt32(); 
     39    RequiredMaxRepValue = questRecord[14].GetInt32(); 
     40    SuggestedPlayers = questRecord[15].GetUInt32(); 
     41    LimitTime = questRecord[16].GetUInt32(); 
     42    QuestFlags = questRecord[17].GetUInt16(); 
     43    uint32 SpecialFlags = questRecord[18].GetUInt16(); 
     44    CharTitleId = questRecord[19].GetUInt32(); 
     45    PrevQuestId = questRecord[20].GetInt32(); 
     46    NextQuestId = questRecord[21].GetInt32(); 
     47    ExclusiveGroup = questRecord[22].GetInt32(); 
     48    NextQuestInChain = questRecord[23].GetUInt32(); 
     49    SrcItemId = questRecord[24].GetUInt32(); 
     50    SrcItemCount = questRecord[25].GetUInt32(); 
     51    SrcSpell = questRecord[26].GetUInt32(); 
     52    Title = questRecord[27].GetCppString(); 
     53    Details = questRecord[28].GetCppString(); 
     54    Objectives = questRecord[29].GetCppString(); 
     55    OfferRewardText = questRecord[30].GetCppString(); 
     56    RequestItemsText = questRecord[31].GetCppString(); 
     57    EndText = questRecord[32].GetCppString(); 
     58 
     59    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
     60        ObjectiveText[i] = questRecord[33+i].GetCppString(); 
     61 
     62    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
     63        ReqItemId[i] = questRecord[37+i].GetUInt32(); 
     64 
     65    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
     66        ReqItemCount[i] = questRecord[41+i].GetUInt32(); 
    6667 
    6768    for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) 
    68         ReqSourceId[i] = questRecord[44+i].GetUInt32(); 
     69        ReqSourceId[i] = questRecord[45+i].GetUInt32(); 
    6970 
    7071    for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) 
    71         ReqSourceCount[i] = questRecord[48+i].GetUInt32(); 
     72        ReqSourceCount[i] = questRecord[49+i].GetUInt32(); 
    7273 
    7374    for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) 
    74         ReqSourceRef[i] = questRecord[52+i].GetUInt32(); 
    75  
    76     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
    77         ReqCreatureOrGOId[i] = questRecord[56+i].GetInt32(); 
    78  
    79     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
    80         ReqCreatureOrGOCount[i] = questRecord[60+i].GetUInt32(); 
    81  
    82     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
    83         ReqSpell[i] = questRecord[64+i].GetUInt32(); 
     75        ReqSourceRef[i] = questRecord[53+i].GetUInt32(); 
     76 
     77    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
     78        ReqCreatureOrGOId[i] = questRecord[57+i].GetInt32(); 
     79 
     80    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
     81        ReqCreatureOrGOCount[i] = questRecord[61+i].GetUInt32(); 
     82 
     83    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) 
     84        ReqSpell[i] = questRecord[65+i].GetUInt32(); 
    8485 
    8586    for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i) 
    86         RewChoiceItemId[i] = questRecord[68+i].GetUInt32(); 
     87        RewChoiceItemId[i] = questRecord[69+i].GetUInt32(); 
    8788 
    8889    for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i) 
    89         RewChoiceItemCount[i] = questRecord[74+i].GetUInt32(); 
     90        RewChoiceItemCount[i] = questRecord[75+i].GetUInt32(); 
    9091 
    9192    for (int i = 0; i < QUEST_REWARDS_COUNT; ++i) 
    92         RewItemId[i] = questRecord[80+i].GetUInt32(); 
     93        RewItemId[i] = questRecord[81+i].GetUInt32(); 
    9394 
    9495    for (int i = 0; i < QUEST_REWARDS_COUNT; ++i) 
    95         RewItemCount[i] = questRecord[84+i].GetUInt32(); 
     96        RewItemCount[i] = questRecord[85+i].GetUInt32(); 
    9697 
    9798    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) 
    98         RewRepFaction[i] = questRecord[88+i].GetUInt32(); 
     99        RewRepFaction[i] = questRecord[89+i].GetUInt32(); 
    99100 
    100101    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) 
    101         RewRepValue[i] = questRecord[93+i].GetInt32(); 
    102  
    103     RewOrReqMoney = questRecord[98].GetInt32(); 
    104     RewMoneyMaxLevel = questRecord[99].GetUInt32(); 
    105     RewSpell = questRecord[100].GetUInt32(); 
    106     RewSpellCast = questRecord[101].GetUInt32(); 
    107     RewMailTemplateId = questRecord[102].GetUInt32(); 
    108     RewMailDelaySecs = questRecord[103].GetUInt32(); 
    109     PointMapId = questRecord[104].GetUInt32(); 
    110     PointX = questRecord[105].GetFloat(); 
    111     PointY = questRecord[106].GetFloat(); 
    112     PointOpt = questRecord[107].GetUInt32(); 
     102        RewRepValue[i] = questRecord[94+i].GetInt32(); 
     103 
     104    RewOrReqMoney = questRecord[99].GetInt32(); 
     105    RewMoneyMaxLevel = questRecord[100].GetUInt32(); 
     106    RewSpell = questRecord[101].GetUInt32(); 
     107    RewSpellCast = questRecord[102].GetUInt32(); 
     108    RewMailTemplateId = questRecord[103].GetUInt32(); 
     109    RewMailDelaySecs = questRecord[104].GetUInt32(); 
     110    PointMapId = questRecord[105].GetUInt32(); 
     111    PointX = questRecord[106].GetFloat(); 
     112    PointY = questRecord[107].GetFloat(); 
     113    PointOpt = questRecord[108].GetUInt32(); 
    113114 
    114115    for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) 
    115         DetailsEmote[i] = questRecord[108+i].GetUInt32(); 
    116  
    117     IncompleteEmote = questRecord[112].GetUInt32(); 
    118     CompleteEmote = questRecord[113].GetUInt32(); 
     116        DetailsEmote[i] = questRecord[109+i].GetUInt32(); 
     117 
     118    IncompleteEmote = questRecord[113].GetUInt32(); 
     119    CompleteEmote = questRecord[114].GetUInt32(); 
    119120 
    120121    for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) 
    121         OfferRewardEmote[i] = questRecord[114+i].GetInt32(); 
    122  
    123     QuestStartScript = questRecord[118].GetUInt32(); 
    124     QuestCompleteScript = questRecord[119].GetUInt32(); 
     122        OfferRewardEmote[i] = questRecord[115+i].GetInt32(); 
     123 
     124    QuestStartScript = questRecord[119].GetUInt32(); 
     125    QuestCompleteScript = questRecord[120].GetUInt32(); 
    125126 
    126127    QuestFlags |= SpecialFlags << 16;