Mercurial > mm7

comparison Player.cpp @ 2197:42c8807225a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UIMSG_SpellBook_PressTab continue
author Ritor1
date Fri, 31 Jan 2014 17:30:36 +0600
parents 48a28fe1f32f
children 4bfee77e900d c2eeeb991a87
comparison
equal deleted inserted replaced
2196:628a0ad87136 2197:42c8807225a2
1585 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_TITAN) && ( enchType == 65 )) 1585 else if (MonsterStats::BelongsToSupertype(uTargetActorID, MONSTER_SUPERTYPE_TITAN) && ( enchType == 65 ))
1586 { 1586 {
1587 totalDmg *= 2; 1587 totalDmg *= 2;
1588 } 1588 }
1589 } 1589 }
1590 if ( (signed int)SkillToMastery(this->pActiveSkills[2]) >= 3 1590 if ( (signed int)SkillToMastery(this->pActiveSkills[PLAYER_SKILL_DAGGER]) >= 3
1591 && pItemsTable->pItems[itemId].uSkillType == 2 1591 && pItemsTable->pItems[itemId].uSkillType == 2
1592 && rand() % 100 < 10 ) 1592 && rand() % 100 < 10 )
1593 totalDmg *= 3; 1593 totalDmg *= 3;
1594 return totalDmg; 1594 return totalDmg;
1595 } 1595 }
1934 { 1934 {
1935 return 0; 1935 return 0;
1936 } 1936 }
1937 else 1937 else
1938 { 1938 {
1939 v6 = this->pActiveSkills[34]; 1939 v6 = this->pActiveSkills[PLAYER_SKILL_STEALING];
1940 v7 = v6 & 0x3F; 1940 v7 = v6 & 0x3F;
1941 v8 = SkillToMastery(v6); 1941 v8 = SkillToMastery(v6);
1942 itemvalue = itemToSteal->GetValue(); 1942 itemvalue = itemToSteal->GetValue();
1943 v10 = itemToSteal->GetItemEquipType(); 1943 v10 = itemToSteal->GetItemEquipType();
1944 if ( v10 == EQUIP_SINGLE_HANDED || v10 == EQUIP_TWO_HANDED || v10 == EQUIP_BOW ) 1944 if ( v10 == EQUIP_SINGLE_HANDED || v10 == EQUIP_TWO_HANDED || v10 == EQUIP_BOW )
1997 return 0; 1997 return 0;
1998 } 1998 }
1999 pGlobalTXT_LocalizationStrings[1]; 1999 pGlobalTXT_LocalizationStrings[1];
2000 if ( !(BYTE2(actroPtr->uAttributes) & 0x80) ) 2000 if ( !(BYTE2(actroPtr->uAttributes) & 0x80) )
2001 actroPtr->SetRandomGoldIfTheresNoItem(); 2001 actroPtr->SetRandomGoldIfTheresNoItem();
2002 unsigned __int16 v6 = this->pActiveSkills[34]; 2002 unsigned __int16 v6 = this->pActiveSkills[PLAYER_SKILL_STEALING];
2003 v7 = v6 & 0x3F; 2003 v7 = v6 & 0x3F;
2004 stealingMastery = SkillToMastery(v6); 2004 stealingMastery = SkillToMastery(v6);
2005 int v30 = StealingMasteryBonuses[stealingMastery]; 2005 int v30 = StealingMasteryBonuses[stealingMastery];
2006 int v29 = StealingRandomBonuses[rand() % 5]; 2006 int v29 = StealingRandomBonuses[rand() % 5];
2007 fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation); 2007 fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation);