Mercurial > mm7

comparison mm7_5.cpp @ 1039:682ba1c83fd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Thu, 23 May 2013 03:32:36 +0200
parents 39f42990698f ff2d888f8033
children d36681a9e4f8
comparison
equal deleted inserted replaced
1038:39f42990698f 1039:682ba1c83fd3
4741 } 4741 }
4742 if ( SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) >= (signed int)v41 4742 if ( SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) >= (signed int)v41
4743 && (SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) > (signed int)v41 4743 && (SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) > (signed int)v41
4744 || LODWORD(pMonster->pActorBuffs[20].uExpireTime) > v41) 4744 || LODWORD(pMonster->pActorBuffs[20].uExpireTime) > v41)
4745 && uDamageAmount != v41 ) 4745 && uDamageAmount != v41 )
4746 player->ReceiveDamage(uDamageAmount, a2); 4746 player->ReceiveDamage(uDamageAmount, (DAMAGE_TYPE)a2);
4747 v50 = 24; 4747 v50 = 24;
4748 v59 = 20 * v61 / (signed int)pMonster->pMonsterInfo.uHP; 4748 v59 = 20 * v61 / (signed int)pMonster->pMonsterInfo.uHP;
4749 if ( (player->_48EA46_calc_special_bonus_by_items(24) || hit_will_stun != v41) 4749 if ( (player->_48EA46_calc_special_bonus_by_items(24) || hit_will_stun != v41)
4750 && stru_50C198.GetMagicalResistance(pMonster, 3u) ) 4750 && stru_50C198.GetMagicalResistance(pMonster, 3u) )
4751 { 4751 {
4993 v22 = v7->pMonsterInfo.uAttack1Type; 4993 v22 = v7->pMonsterInfo.uAttack1Type;
4994 } 4994 }
4995 LABEL_43: 4995 LABEL_43:
4996 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) 4996 if ( !(dword_6BE368_debug_settings_2 & 0x10) )
4997 { 4997 {
4998 v24 = v6->ReceiveDamage(v77, v22); 4998 v24 = v6->ReceiveDamage(v77, (DAMAGE_TYPE)v22);
4999 if ( SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) >= 0 4999 if ( SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) >= 0
5000 && (SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v6->pPlayerBuffs[10].uExpireTime)) ) 5000 && (SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v6->pPlayerBuffs[10].uExpireTime)) )
5001 { 5001 {
5002 v25 = v7->uAIState; 5002 v25 = v7->uAIState;
5003 if ( v25 != 5 ) 5003 if ( v25 != 5 )
5056 v6->_48DCF6(v7->pMonsterInfo.uSpecialAttack, v7); 5056 v6->_48DCF6(v7->pMonsterInfo.uSpecialAttack, v7);
5057 } 5057 }
5058 if ( !pParty->bTurnBasedModeOn ) 5058 if ( !pParty->bTurnBasedModeOn )
5059 { 5059 {
5060 v35 = v6->GetActualEndurance(); 5060 v35 = v6->GetActualEndurance();
5061 v36 = (double)(20 - v6->_48EA1B_get_static_effect(v35)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333; 5061 v36 = (double)(20 - v6->GetParameterBonus(v35)) * flt_6BE3A4_debug_recmod1 * 2.133333333333333;
5062 v6->SetRecoveryTime((signed __int64)v36); 5062 v6->SetRecoveryTime((signed __int64)v36);
5063 } 5063 }
5064 if ( v77 ) 5064 if ( v77 )
5065 { 5065 {
5066 v73 = (double)(signed int)v75; 5066 v73 = (double)(signed int)v75;
5178 else 5178 else
5179 v50 = 4; 5179 v50 = 4;
5180 LABEL_133: 5180 LABEL_133:
5181 if ( !(dword_6BE368_debug_settings_2 & 0x10) ) 5181 if ( !(dword_6BE368_debug_settings_2 & 0x10) )
5182 { 5182 {
5183 v54 = v45->ReceiveDamage(v77, v50); 5183 v54 = v45->ReceiveDamage(v77, (DAMAGE_TYPE)v50);
5184 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 ) 5184 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 )
5185 { 5185 {
5186 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) ) 5186 if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) )
5187 { 5187 {
5188 v55 = v44->uAIState; 5188 v55 = v44->uAIState;
5244 && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType ) 5244 && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType )
5245 v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44); 5245 v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44);
5246 if ( !pParty->bTurnBasedModeOn ) 5246 if ( !pParty->bTurnBasedModeOn )
5247 { 5247 {
5248 v65 = v45->GetActualEndurance(); 5248 v65 = v45->GetActualEndurance();
5249 v66 = (double)(20 - v45->_48EA1B_get_static_effect(v65)) 5249 v66 = (double)(20 - v45->GetParameterBonus(v65))
5250 * flt_6BE3A4_debug_recmod1 5250 * flt_6BE3A4_debug_recmod1
5251 * 2.133333333333333; 5251 * 2.133333333333333;
5252 v45->SetRecoveryTime((signed __int64)v66); 5252 v45->SetRecoveryTime((signed __int64)v66);
5253 } 5253 }
5254 return; 5254 return;
5275 else 5275 else
5276 { 5276 {
5277 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); 5277 v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0);
5278 v69 = 0; 5278 v69 = 0;
5279 } 5279 }
5280 a4b->ReceiveDamage(v68, v69); 5280 a4b->ReceiveDamage(v68, (DAMAGE_TYPE)v69);
5281 if ( v38 == OBJECT_Player && !qword_A750D8 ) 5281 if ( v38 == OBJECT_Player && !qword_A750D8 )
5282 { 5282 {
5283 qword_A750D8 = 256i64; 5283 qword_A750D8 = 256i64;
5284 word_A750E0 = 44; 5284 word_A750E0 = 44;
5285 word_A750E2 = uActorID + 1; 5285 word_A750E2 = uActorID + 1;
10589 } 10589 }
10590 if ( v51 == 1 ) 10590 if ( v51 == 1 )
10591 { 10591 {
10592 v0->RemoveItemAtInventoryIndex(v18); 10592 v0->RemoveItemAtInventoryIndex(v18);
10593 v26 = rand(); 10593 v26 = rand();
10594 v0->ReceiveDamage(v26 % 11 + 10, 0); 10594 v0->ReceiveDamage(v26 % 11 + 10, DMGT_FIRE);
10595 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0); 10595 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
10596 10596
10597 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 10597 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
10598 10598
10599 v42 = (int *)&a2.y; 10599 v42 = (int *)&a2.y;
10605 { 10605 {
10606 if ( v51 == 2 ) 10606 if ( v51 == 2 )
10607 { 10607 {
10608 v0->RemoveItemAtInventoryIndex(v18); 10608 v0->RemoveItemAtInventoryIndex(v18);
10609 v25 = rand(); 10609 v25 = rand();
10610 v0->ReceiveDamage(v25 % 71 + 30, 0); 10610 v0->ReceiveDamage(v25 % 71 + 30, DMGT_FIRE);
10611 v23 = 1; 10611 v23 = 1;
10612 } 10612 }
10613 else 10613 else
10614 { 10614 {
10615 if ( v51 == 3 ) 10615 if ( v51 == 3 )
10616 { 10616 {
10617 v0->RemoveItemAtInventoryIndex(v18); 10617 v0->RemoveItemAtInventoryIndex(v18);
10618 v24 = rand(); 10618 v24 = rand();
10619 v0->ReceiveDamage(v24 % 201 + 50, 0); 10619 v0->ReceiveDamage(v24 % 201 + 50, DMGT_FIRE);
10620 v23 = 5; 10620 v23 = 5;
10621 } 10621 }
10622 else 10622 else
10623 { 10623 {
10624 if ( v51 != 4 ) 10624 if ( v51 != 4 )