Mercurial > mm7

comparison mm7_6.cpp @ 1955:0c5326e2044a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[11] to pActorBuffs[ACTOR_BUFF_FATE]
author Grumpy7
date Fri, 25 Oct 2013 11:16:52 -0700
parents 4ed7d18abe93
children 3d0c57c4fa83
comparison
equal deleted inserted replaced
1954:730166317ed0 1955:0c5326e2044a
353 v4 = LODWORD(pActor->pActorBuffs[17].uExpireTime) == 0; 353 v4 = LODWORD(pActor->pActorBuffs[17].uExpireTime) == 0;
354 break; 354 break;
355 } 355 }
356 case 47: 356 case 47:
357 { 357 {
358 if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) < 0 ) 358 if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) < 0 )
359 return 1; 359 return 1;
360 if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) > 0 ) 360 if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) > 0 )
361 return 0; 361 return 0;
362 v3 = 0; 362 v3 = 0;
363 v4 = LODWORD(pActor->pActorBuffs[11].uExpireTime) == 0; 363 v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime) == 0;
364 break; 364 break;
365 } 365 }
366 case 51: 366 case 51:
367 { 367 {
368 if ( SHIDWORD(pActor->pActorBuffs[18].uExpireTime) < 0 ) 368 if ( SHIDWORD(pActor->pActorBuffs[18].uExpireTime) < 0 )
473 v10 = v7 + v6; 473 v10 = v7 + v6;
474 if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 ) 474 if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 )
475 a2a = pActor->pActorBuffs[14].uPower; 475 a2a = pActor->pActorBuffs[14].uPower;
476 if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > a2a ) 476 if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > a2a )
477 a2a = pActor->pActorBuffs[17].uPower; 477 a2a = pActor->pActorBuffs[17].uPower;
478 if ( (signed __int64)pActor->pActorBuffs[11].uExpireTime > 0 ) 478 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
479 { 479 {
480 a2a += pActor->pActorBuffs[11].uPower; 480 a2a += pActor->pActorBuffs[ACTOR_BUFF_FATE].uPower;
481 pActor->pActorBuffs[11].Reset(); 481 pActor->pActorBuffs[ACTOR_BUFF_FATE].Reset();
482 } 482 }
483 return rand() % (v10 + 2 * pActor->pMonsterInfo.uLevel + 10) + a2a + 1 > v10 + 5; 483 return rand() % (v10 + 2 * pActor->pMonsterInfo.uLevel + 10) + a2a + 1 > v10 + 5;
484 } 484 }
485 485
486 //----- (004274AD) -------------------------------------------------------- 486 //----- (004274AD) --------------------------------------------------------
493 v3 = 0; 493 v3 = 0;
494 if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 ) 494 if ( (signed __int64)pActor->pActorBuffs[14].uExpireTime > 0 )
495 v3 = pActor->pActorBuffs[14].uPower; 495 v3 = pActor->pActorBuffs[14].uPower;
496 if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > v3 ) 496 if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > v3 )
497 v3 = pActor->pActorBuffs[17].uPower; 497 v3 = pActor->pActorBuffs[17].uPower;
498 if ( (signed __int64)pActor->pActorBuffs[11].uExpireTime > 0 ) 498 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_FATE].uExpireTime > 0 )
499 { 499 {
500 v3 += pActor->pActorBuffs[11].uPower; 500 v3 += pActor->pActorBuffs[ACTOR_BUFF_FATE].uPower;
501 pActor->pActorBuffs[11].Reset(); 501 pActor->pActorBuffs[ACTOR_BUFF_FATE].Reset();
502 } 502 }
503 v4 = pPlayer->GetActualAC() + 2 * pActor->pMonsterInfo.uLevel + 10; 503 v4 = pPlayer->GetActualAC() + 2 * pActor->pMonsterInfo.uLevel + 10;
504 v5 = rand() % v4 + 1; 504 v5 = rand() % v4 + 1;
505 return v3 + v5 > pPlayer->GetActualAC() + 5; 505 return v3 + v5 > pPlayer->GetActualAC() + 5;
506 } 506 }