Mercurial > mm7

comparison Items.cpp @ 2496:5abd8fc8f1c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
for ITEM_ARTIFACT_LADYS_ESCORT
author Ritor1
date Thu, 18 Sep 2014 17:38:54 +0600
parents 7b076fe64f23
children
comparison
equal deleted inserted replaced
2495:7b076fe64f23 2496:5abd8fc8f1c6
466 strtok(pItemsTXT_Raw, "\r"); 466 strtok(pItemsTXT_Raw, "\r");
467 strtok(NULL, "\r"); 467 strtok(NULL, "\r");
468 uAllItemsCount = 0; 468 uAllItemsCount = 0;
469 item_counter = 0; 469 item_counter = 0;
470 while (item_counter < 800) 470 while (item_counter < 800)
471 { 471 {
472 test_string = strtok(NULL, "\r") + 1; 472 test_string = strtok(NULL, "\r") + 1;
473 auto tokens = Tokenize(test_string, '\t'); 473 auto tokens = Tokenize(test_string, '\t');
474 item_counter=atoi(tokens[0]); 474 item_counter=atoi(tokens[0]);
475 uAllItemsCount=item_counter; 475 uAllItemsCount=item_counter;
476 pItems[item_counter].pIconName = RemoveQuotes(tokens[1]); 476 pItems[item_counter].pIconName = RemoveQuotes(tokens[1]);
477 pItems[item_counter].pName = RemoveQuotes(tokens[2]); 477 pItems[item_counter].pName = RemoveQuotes(tokens[2]);
496 pItems[item_counter].uDamageDice=0; 496 pItems[item_counter].uDamageDice=0;
497 pItems[item_counter].uDamageRoll=0; 497 pItems[item_counter].uDamageRoll=0;
498 } 498 }
499 pItems[item_counter].uDamageMod=atoi(tokens[7]); 499 pItems[item_counter].uDamageMod=atoi(tokens[7]);
500 auto findResult3 = materialMap.find(tokens[8]); 500 auto findResult3 = materialMap.find(tokens[8]);
501 pItems[item_counter].uMaterial = findResult3 == materialMap.end() ? MATERIAL_COMMON : findResult->second; 501 pItems[item_counter].uMaterial = findResult3 == materialMap.end() ? MATERIAL_COMMON : findResult3->second;
502 pItems[item_counter].uItemID_Rep_St=atoi(tokens[9]); 502 pItems[item_counter].uItemID_Rep_St=atoi(tokens[9]);
503 pItems[item_counter].pUnidentifiedName = RemoveQuotes(tokens[10]); 503 pItems[item_counter].pUnidentifiedName = RemoveQuotes(tokens[10]);
504 pItems[item_counter].uSpriteID=atoi(tokens[11]); 504 pItems[item_counter].uSpriteID=atoi(tokens[11]);
505 505
506 pItems[item_counter]._additional_value=0; 506 pItems[item_counter]._additional_value=0;
1644 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 30); 1644 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 30);
1645 1645
1646 itemId = ITEM_ARTIFACT_HEROS_BELT; 1646 itemId = ITEM_ARTIFACT_HEROS_BELT;
1647 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 15); 1647 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_STRENGTH, 15);
1648 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER, 5); 1648 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_SKILL_ARMSMASTER, 5);
1649
1650 itemId = ITEM_ARTIFACT_LADYS_ESCORT;
1651 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_FIRE, 10);
1652 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_AIR, 10);
1653 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_WATER, 10);
1654 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_EARTH, 10);
1655 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_MIND, 10);
1656 NEWBONUSINTOARTIFACTLIST(CHARACTER_ATTRIBUTE_RESIST_BODY, 10);
1649 } 1657 }
1650 1658
1651 void ItemGen::GetItemBonusSpecialEnchantment( Player* owner, CHARACTER_ATTRIBUTE_TYPE attrToGet, int* additiveBonus, int* halfSkillBonus ) 1659 void ItemGen::GetItemBonusSpecialEnchantment( Player* owner, CHARACTER_ATTRIBUTE_TYPE attrToGet, int* additiveBonus, int* halfSkillBonus )
1652 { 1660 {
1653 auto bonusList = ItemGen::specialBonusMap.find(this->uSpecEnchantmentType); 1661 auto bonusList = ItemGen::specialBonusMap.find(this->uSpecEnchantmentType);