Mercurial > mm7

comparison Actor.cpp @ 1928:4fa815c2112d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DamageMonsterFromParty removed LABEL_67
author Grumpy7
date Tue, 22 Oct 2013 23:18:41 -0700
parents 50d00b884765
children 4cce1e24b7e7
comparison
equal deleted inserted replaced
1927:50d00b884765 1928:4fa815c2112d
3699 v50 = pMonster->pMonsterInfo.uID; 3699 v50 = pMonster->pMonsterInfo.uID;
3700 a2 = 4; 3700 a2 = 4;
3701 //v27 = player->CalculateMeleeDamageTo(0, 0, v50); 3701 //v27 = player->CalculateMeleeDamageTo(0, 0, v50);
3702 uDamageAmount = player->CalculateMeleeDamageTo(false, false, v50); 3702 uDamageAmount = player->CalculateMeleeDamageTo(false, false, v50);
3703 //if ( !v57 ) 3703 //if ( !v57 )
3704 goto LABEL_67; 3704 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
3705 {
3706 player->PlaySound(SPEECH_52, 0);
3707 return;
3708 }
3709 goto LABEL_69;
3705 //goto LABEL_69; 3710 //goto LABEL_69;
3706 } 3711 }
3707 3712
3708 3713
3709 v19 = v4->spell_id == SPELL_DARK_SOULDRINKER; 3714 v19 = v4->spell_id == SPELL_DARK_SOULDRINKER;
3760 v61 = 1; 3765 v61 = 1;
3761 if ( (signed int)SkillToMastery(v16) >= 3 ) 3766 if ( (signed int)SkillToMastery(v16) >= 3 )
3762 a4 = player->pActiveSkills[7] & 0x3F; 3767 a4 = player->pActiveSkills[7] & 0x3F;
3763 a2 = 4; 3768 a2 = 4;
3764 uDamageAmount = player->CalculateMeleeDamageTo(true, true, 0); 3769 uDamageAmount = player->CalculateMeleeDamageTo(true, true, 0);
3765 goto LABEL_67; 3770 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
3771 {
3772 player->PlaySound(SPEECH_52, 0);
3773 return;
3774 }
3775 goto LABEL_69;
3766 } 3776 }
3767 if ( v15 != SPELL_BOW_ARROW ) 3777 if ( v15 != SPELL_BOW_ARROW )
3768 { 3778 {
3769 if ( v15 == SPELL_101 ) 3779 if ( v15 == SPELL_101 )
3770 { 3780 {
3774 v20 = SHIDWORD(pMonster->pActorBuffs[15].uExpireTime) < 0; 3784 v20 = SHIDWORD(pMonster->pActorBuffs[15].uExpireTime) < 0;
3775 uDamageAmount = v18; 3785 uDamageAmount = v18;
3776 if ( !v20 && (!(v20 | v19) || LODWORD(pMonster->pActorBuffs[15].uExpireTime)) ) 3786 if ( !v20 && (!(v20 | v19) || LODWORD(pMonster->pActorBuffs[15].uExpireTime)) )
3777 uDamageAmount >>= 1; 3787 uDamageAmount >>= 1;
3778 v59 = 1; 3788 v59 = 1;
3779 goto LABEL_67; 3789 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
3790 {
3791 player->PlaySound(SPEECH_52, 0);
3792 return;
3793 }
3794 goto LABEL_69;
3780 } 3795 }
3781 if ( v15 == SPELL_EARTH_BLADES ) 3796 if ( v15 == SPELL_EARTH_BLADES )
3782 { 3797 {
3783 a4 = 5 * v4->spell_level; 3798 a4 = 5 * v4->spell_level;
3784 a2 = player->GetSpellSchool(0x27u); 3799 a2 = player->GetSpellSchool(0x27u);
3793 uDamageAmount >>= 1; 3808 uDamageAmount >>= 1;
3794 v59 = 0; 3809 v59 = 0;
3795 LABEL_67: 3810 LABEL_67:
3796 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) ) 3811 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
3797 { 3812 {
3798 //LABEL_68:
3799 player->PlaySound(SPEECH_52, 0); 3813 player->PlaySound(SPEECH_52, 0);
3800 return; 3814 return;
3801 } 3815 }
3802 goto LABEL_69; 3816 goto LABEL_69;
3803 } 3817 }
3804 if ( v15 == SPELL_EARTH_STUN ) 3818 if ( v15 == SPELL_EARTH_STUN )
3805 { 3819 {
3806 uDamageAmount = 0; 3820 uDamageAmount = 0;
3807 a2 = 4; 3821 a2 = 4;
3808 hit_will_stun = 1; 3822 hit_will_stun = 1;
3809 goto LABEL_67; 3823 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
3824 {
3825 player->PlaySound(SPEECH_52, 0);
3826 return;
3827 }
3828 goto LABEL_69;
3810 } 3829 }
3811 a2 = player->GetSpellSchool(v4->spell_id); 3830 a2 = player->GetSpellSchool(v4->spell_id);
3812 v25 = v4->spell_level; 3831 v25 = v4->spell_level;
3813 v26 = v4->spell_id; 3832 v26 = v4->spell_id;
3814 v50 = pMonster->sCurrentHP; 3833 v50 = pMonster->sCurrentHP;
3837 && (SHIDWORD(pMonster->pActorBuffs[15].uExpireTime) > 0 || LODWORD(pMonster->pActorBuffs[15].uExpireTime)) ) 3856 && (SHIDWORD(pMonster->pActorBuffs[15].uExpireTime) > 0 || LODWORD(pMonster->pActorBuffs[15].uExpireTime)) )
3838 uDamageAmount >>= 1; 3857 uDamageAmount >>= 1;
3839 v59 = 1; 3858 v59 = 1;
3840 //LABEL_66: 3859 //LABEL_66:
3841 if ( !v57 ) 3860 if ( !v57 )
3842 goto LABEL_67; 3861 {
3862 if ( !stru_50C198.PlayerHitOrMiss(player, pMonster, v61, a4) )
3863 {
3864 player->PlaySound(SPEECH_52, 0);
3865 return;
3866 }
3867 goto LABEL_69;
3868 }
3843 LABEL_69: 3869 LABEL_69:
3844 if (player->IsWeak()) 3870 if (player->IsWeak())
3845 uDamageAmount /= 1; 3871 uDamageAmount /= 1;
3846 if ( (signed __int64)pMonster->pActorBuffs[5].uExpireTime > 0 ) 3872 if ( (signed __int64)pMonster->pActorBuffs[5].uExpireTime > 0 )
3847 uDamageAmount = 0; 3873 uDamageAmount = 0;