Mercurial > mm7

comparison Items.cpp @ 816:cfc65feef029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Player Recovery Times * Player Attack fixes * Debug log to timers
author Nomad
date Tue, 26 Mar 2013 12:40:27 +0200
parents cf2fbac6edc9
children 96796d55bb5d
comparison
equal deleted inserted replaced
813:d37b03507b3b 816:cfc65feef029
545 break; 545 break;
546 case 4: //Equip Stat 546 case 4: //Equip Stat
547 { 547 {
548 if ( !_strcmpi(test_string, "weapon") ) 548 if ( !_strcmpi(test_string, "weapon") )
549 { 549 {
550 pItems[item_counter].uEquipType = EQUIP_ONE_OR_TWO_HANDS; 550 pItems[item_counter].uEquipType = EQUIP_OFF_HAND;
551 break; 551 break;
552 } 552 }
553 if ( !_strcmpi(test_string, "weapon2") ) 553 if ( !_strcmpi(test_string, "weapon2") )
554 { 554 {
555 pItems[item_counter].uEquipType = EQUIP_TWO_HANDED; 555 pItems[item_counter].uEquipType = EQUIP_MAIN_HAND;
556 break; 556 break;
557 } 557 }
558 if ( !_strcmpi(test_string, "weapon1or2") ) 558 if ( !_strcmpi(test_string, "weapon1or2") )
559 { 559 {
560 pItems[item_counter].uEquipType = EQUIP_ONE_OR_TWO_HANDS; 560 pItems[item_counter].uEquipType = EQUIP_OFF_HAND;
561 break; 561 break;
562 } 562 }
563 if ( !(_strcmpi(test_string, "missile")&&_strcmpi(test_string, "bow"))) 563 if ( !(_strcmpi(test_string, "missile")&&_strcmpi(test_string, "bow")))
564 { 564 {
565 pItems[item_counter].uEquipType = EQUIP_BOW; 565 pItems[item_counter].uEquipType = EQUIP_BOW;
1607 { 1607 {
1608 ITEM_EQUIP_TYPE requested_equip; 1608 ITEM_EQUIP_TYPE requested_equip;
1609 PLAYER_SKILL_TYPE requested_skill = PLAYER_SKILL_INVALID; 1609 PLAYER_SKILL_TYPE requested_skill = PLAYER_SKILL_INVALID;
1610 switch (uTreasureType) 1610 switch (uTreasureType)
1611 { 1611 {
1612 case 20: requested_equip = EQUIP_ONE_OR_TWO_HANDS; break; 1612 case 20: requested_equip = EQUIP_OFF_HAND; break;
1613 case 21: requested_equip = EQUIP_ARMOUR; break; 1613 case 21: requested_equip = EQUIP_ARMOUR; break;
1614 case 22: requested_skill = PLAYER_SKILL_MISC; break; 1614 case 22: requested_skill = PLAYER_SKILL_MISC; break;
1615 case 23: requested_skill = PLAYER_SKILL_SWORD; break; 1615 case 23: requested_skill = PLAYER_SKILL_SWORD; break;
1616 case 24: requested_skill = PLAYER_SKILL_DAGGER; break; 1616 case 24: requested_skill = PLAYER_SKILL_DAGGER; break;
1617 case 25: requested_skill = PLAYER_SKILL_AXE; break; 1617 case 25: requested_skill = PLAYER_SKILL_AXE; break;
1758 out_item->uEnchantmentType = 0; 1758 out_item->uEnchantmentType = 0;
1759 } 1759 }
1760 //try get special enhansment 1760 //try get special enhansment
1761 switch (pItems[out_item->uItemID].uEquipType) 1761 switch (pItems[out_item->uItemID].uEquipType)
1762 { 1762 {
1763 case EQUIP_ONE_OR_TWO_HANDS: 1763 case EQUIP_OFF_HAND:
1764 case EQUIP_TWO_HANDED : 1764 case EQUIP_MAIN_HAND :
1765 case EQUIP_BOW : 1765 case EQUIP_BOW :
1766 if ( !uBonusChanceWpSpecial[v6] ) 1766 if ( !uBonusChanceWpSpecial[v6] )
1767 return; 1767 return;
1768 if ((rand() % 100)>=uBonusChanceWpSpecial[v6]) 1768 if ((rand() % 100)>=uBonusChanceWpSpecial[v6])
1769 return; 1769 return;