Mercurial > mm7
diff Player.cpp @ 1648:a4390cef284c
DamagePlayerFromMonster starting cleanup
| author | Grumpy7 |
|---|---|
| date | Tue, 17 Sep 2013 07:30:41 +0200 |
| parents | 511cd6dd1048 |
| children | d25389b91029 |
line wrap: on
line diff
--- a/Player.cpp Sun Sep 15 03:08:12 2013 +0200 +++ b/Player.cpp Tue Sep 17 07:30:41 2013 +0200 @@ -7488,7 +7488,7 @@ signed int v22; // edi@36 int v23; // eax@38 signed int v24; // eax@44 - unsigned __int16 v25; // cx@47 + AIState v25; // cx@47 signed int v26; // eax@49 int v27; // eax@54 float v28; // ST18_4@58 @@ -7562,59 +7562,25 @@ || v10 > 11 ) { v14 = rand() % 4; - if ( !v14 ) - { - v71 = (SoundID)108; - goto LABEL_24; - } - v15 = v14 - 1; - if ( !v15 ) + switch (v14) { - v71 = (SoundID)109; - goto LABEL_24; - } - v16 = v15 - 1; - if ( !v16 ) - { - v71 = (SoundID)110; - goto LABEL_24; - } - if ( v16 == 1 ) - { - v71 = (SoundID)44; - goto LABEL_24; + case 0 : v17 = (SoundID)108; break; + case 1 : v17 = (SoundID)109; break; + case 2 : v17 = (SoundID)110; break; + case 3 : v17 = (SoundID)44; break; } } else { v11 = rand() % 4; - if ( !v11 ) - { - v71 = (SoundID)105; - goto LABEL_24; - } - v12 = v11 - 1; - if ( !v12 ) - { - v71 = (SoundID)106; - goto LABEL_24; - } - v13 = v12 - 1; - if ( !v13 ) + switch (v11) { - v71 = (SoundID)107; - goto LABEL_24; + case 0 : v17 = (SoundID)105; break; + case 1 : v17 = (SoundID)106; break; + case 2 : v17 = (SoundID)107; break; + case 3 : v17 = (SoundID)45; break; } - if ( v13 == 1 ) - { - v71 = (SoundID)45; -LABEL_24: - v17 = v71; - goto LABEL_26; - } - } - v17 = (SoundID)a4; -LABEL_26: + } pAudioPlayer->PlaySound(v17, PID(OBJECT_Player,a4 + 80), 0, -1, 0, 0, 0, 0); v18 = Actor::_43B3E0_CalcDamage(v7, v74); v19 = HIDWORD(v7->pActorBuffs[3].uExpireTime) == 0; @@ -7626,38 +7592,24 @@ if ( v21 ) v77 /= (signed int)v21; } - if ( v74 ) - { - if ( v74 == 1 ) - { - v22 = v7->pMonsterInfo.uAttack2Type; - } - else - { - if ( v74 == 2 ) - { - v23 = v7->pMonsterInfo.uSpell1ID; - } - else - { - if ( v74 != 3 ) - { - if ( v74 == 4 ) - v22 = v7->pMonsterInfo.field_3C_some_special_attack; - else - v22 = 4; - goto LABEL_43; - } - v23 = v7->pMonsterInfo.uSpell2ID; - } + switch (v74) + { + case 0: v22 = v7->pMonsterInfo.uAttack1Type; + break; + case 1: v22 = v7->pMonsterInfo.uAttack2Type; + break; + case 2: v23 = v7->pMonsterInfo.uSpell1ID; v22 = LOBYTE(pSpellStats->pInfos[v23].uSchool); - } - } - else - { - v22 = v7->pMonsterInfo.uAttack1Type; - } -LABEL_43: + break; + case 3: v23 = v7->pMonsterInfo.uSpell2ID; + v22 = LOBYTE(pSpellStats->pInfos[v23].uSchool); + break; + case 4: v22 = v7->pMonsterInfo.field_3C_some_special_attack; + break; + default: + case 5: v22 = 4; //yes, the original just assigned the value 4 + break; + } if ( !(dword_6BE368_debug_settings_2 & 0x10) ) { v24 = v6->ReceiveDamage(v77, (DAMAGE_TYPE)v22); @@ -7665,52 +7617,39 @@ && (SHIDWORD(v6->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v6->pPlayerBuffs[10].uExpireTime)) ) { v25 = v7->uAIState; - if ( v25 != 5 ) + if ( v25 != Dying && v25 != Dead) { - if ( v25 != 4 ) + v26 = stru_50C198.CalcMagicalDamageToActor(v7, v22, v24); + v7->sCurrentHP -= v26; + if ( v26 ) { - v26 = stru_50C198.CalcMagicalDamageToActor(v7, v22, v24); - v7->sCurrentHP -= v26; - if ( v26 ) + if ( v7->sCurrentHP >= 1 ) { - if ( v7->sCurrentHP >= 1 ) + Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); + Actor::AggroSurroundingPeasants(uActorID, 1); + } + else + { + if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 ) { - Actor::AI_Stun(uActorID, PID(OBJECT_Player,a4), 0); - Actor::AggroSurroundingPeasants(uActorID, 1); - } - else - { - if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 ) + v27 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v7->uActorRadius : v7->uActorRadius; + if ( pRenderer->pRenderD3D ) { - v27 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v7->uActorRadius : v7->uActorRadius; - v74 = v27; - if ( pRenderer->pRenderD3D ) + if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) { - if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) - { - v28 = (double)v74; - v74 = v7->vPosition.z; - v29 = (double)v74; - v74 = v7->vPosition.y; - v30 = v29; - v31 = (double)v74; - v74 = v7->vPosition.x; - v32 = v31; - v33 = (double)v74; - pDecalBuilder->AddBloodsplat(v33, v32, v30, 1.0, 0.0, 0.0, v28, 0, 0); - } + pDecalBuilder->AddBloodsplat(v7->vPosition.x, v7->vPosition.y, v7->vPosition.z, 1.0, 0.0, 0.0, v27, 0, 0); } } - Actor::Die(uActorID); - Actor::ApplyFineForKillingPeasant(uActorID); - Actor::AggroSurroundingPeasants(uActorID, 1); - if ( v7->pMonsterInfo.uExp ) - GivePartyExp(pMonsterStats->pInfos[v7->pMonsterInfo.uID].uExp); - v34 = SPEECH_51; - if ( rand() % 100 < 20 ) - v34 = ((signed int)v7->pMonsterInfo.uHP >= 100) + 1; - v6->PlaySound((PlayerSpeech)v34, 0); } + Actor::Die(uActorID); + Actor::ApplyFineForKillingPeasant(uActorID); + Actor::AggroSurroundingPeasants(uActorID, 1); + if ( v7->pMonsterInfo.uExp ) + GivePartyExp(pMonsterStats->pInfos[v7->pMonsterInfo.uID].uExp); + v34 = SPEECH_51; + if ( rand() % 100 < 20 ) + v34 = ((signed int)v7->pMonsterInfo.uHP >= 100) + 1; + v6->PlaySound((PlayerSpeech)v34, 0); } } } @@ -7741,119 +7680,113 @@ viewparams->bRedrawGameUI = 1; return; } - v37 = &pSpriteObjects[uActorID]; - v38 = PID_TYPE(v37->spell_caster_pid); - v39 = PID_ID(v37->spell_caster_pid); - v40 = PID_TYPE(v37->spell_caster_pid); - uActorID = PID_ID(v37->spell_caster_pid); - v41 = v40 - 2; - if ( !v41 ) - goto LABEL_80; - v42 = v41 - 1; - if ( !v42 ) - { - v44 = &pActors[v39]; - if ( a4 == -1 ) - a4 = stru_50C198.which_player_would_attack(v44); - v45 = &pParty->pPlayers[a4]; - v77 = Actor::_43B3E0_CalcDamage(v44, v74); - v46 = v37->uType; - if ( v37->uType == 545 ) - { - LOBYTE(v51) = v45->GetActualSkillLevel(PLAYER_SKILL_UNARMED); - v52 = v51; - if ( (signed int)SkillToMastery(v51) >= 4 && rand() % 100 < (v52 & 0x3F) ) + else + { + v37 = &pSpriteObjects[uActorID]; + v38 = PID_TYPE(v37->spell_caster_pid); + v39 = PID_ID(v37->spell_caster_pid); + v40 = PID_TYPE(v37->spell_caster_pid); + uActorID = PID_ID(v37->spell_caster_pid); + v41 = v40 - 2; + if ( !v41 ) + goto LABEL_80; + v42 = v41 - 1; + if ( !v42 ) + { + v44 = &pActors[v39]; + if ( a4 == -1 ) + a4 = stru_50C198.which_player_would_attack(v44); + v45 = &pParty->pPlayers[a4]; + v77 = Actor::_43B3E0_CalcDamage(v44, v74); + v46 = v37->uType; + if ( v37->uType == 545 ) { - sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], v45->pName); - ShowStatusBarString(pTmpBuf.data(), 2u); - v45->PlaySound(SPEECH_6, 0); - return; + LOBYTE(v51) = v45->GetActualSkillLevel(PLAYER_SKILL_UNARMED); + v52 = v51; + if ( (signed int)SkillToMastery(v51) >= 4 && rand() % 100 < (v52 & 0x3F) ) + { + sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[637], v45->pName); + ShowStatusBarString(pTmpBuf.data(), 2u); + v45->PlaySound(SPEECH_6, 0); + return; + } } - } - else - { - if ( v46 != 555 - && v46 != 510 - && v46 != 500 - && v46 != 515 - && v46 != 505 - && v46 != 530 - && v46 != 525 - && v46 != 520 - && v46 != 535 - && v46 != 540 ) - goto LABEL_115; - } - if ( !stru_50C198.ActorHitOrMiss(v44, v45) ) - return; - if ( (signed __int64)v45->pPlayerBuffs[13].uExpireTime > 0 ) - v77 >>= 1; - if ( v45->HasEnchantedItemEquipped(36) ) - v77 >>= 1; - if ( v45->HasEnchantedItemEquipped(69) ) - v77 >>= 1; - if ( v45->HasItemEquipped(EQUIP_ARMOUR) - && *(_DWORD *)&v45->pInventoryItemList[v45->pEquipment.uArmor-1] == 504 ) - v77 >>= 1; - v75 = 0; - v47 = (int)&v45->pEquipment; - do - { - if ( v45->HasItemEquipped((ITEM_EQUIP_TYPE)v75) ) + else { - v48 = *(int *)&v45[36 * *(int *)v47 + 496]; - if ( v48 == 520 ) - v77 >>= 1; - if ( v48 == 531 ) - v77 >>= 1; - if ( v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4 ) + if ( v46 != 555 + && v46 != 510 + && v46 != 500 + && v46 != 515 + && v46 != 505 + && v46 != 530 + && v46 != 525 + && v46 != 520 + && v46 != 535 + && v46 != 540 ) + goto LABEL_115; + } + if ( !stru_50C198.ActorHitOrMiss(v44, v45) ) + return; + if ( (signed __int64)v45->pPlayerBuffs[13].uExpireTime > 0 ) + v77 >>= 1; + if ( v45->HasEnchantedItemEquipped(36) ) + v77 >>= 1; + if ( v45->HasEnchantedItemEquipped(69) ) + v77 >>= 1; + if ( v45->HasItemEquipped(EQUIP_ARMOUR) + && v45->pInventoryItemList[v45->pEquipment.uArmor-1].uItemID == ITEM_ARTIFACT_GOVERNORS_ARMOR ) + v77 >>= 1; + if ( v45->HasItemEquipped(EQUIP_MAIN_HAND)) + { + v48 = v45->pInventoryItemList[v45->pEquipment.uMainHand - 1].uItemID; + if ( v48 == ITEM_RELIC_KELEBRIM || v48 == ITEM_ARTIFACT_ELFBANE || (v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) v77 >>= 1; } - ++v75; - v47 += 4; - } - while ( (signed int)v75 <= 1 ); -LABEL_115: - if ( (signed __int64)v44->pActorBuffs[3].uExpireTime > 0 ) - { - v49 = v44->pActorBuffs[3].uPower; - if ( v49 ) - v77 /= (signed int)v49; - } - if ( !v74 ) - { - v50 = v44->pMonsterInfo.uAttack1Type; - goto LABEL_133; - } - if ( v74 == 1 ) - { - v50 = v44->pMonsterInfo.uAttack2Type; - goto LABEL_133; - } - if ( v74 == 2 ) - { - v53 = v44->pMonsterInfo.uSpell1ID; - } - else - { - if ( v74 != 3 ) + if ( v45->HasItemEquipped(EQUIP_OFF_HAND)) + { + v48 = v45->pInventoryItemList[v45->pEquipment.uShield - 1].uItemID; + if ( v48 == ITEM_RELIC_KELEBRIM || v48 == ITEM_ARTIFACT_ELFBANE || (v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4)) + v77 >>= 1; + } + LABEL_115: + if ( (signed __int64)v44->pActorBuffs[3].uExpireTime > 0 ) + { + v49 = v44->pActorBuffs[3].uPower; + if ( v49 ) + v77 /= (signed int)v49; + } + if ( !v74 ) + { + v50 = v44->pMonsterInfo.uAttack1Type; + goto LABEL_133; + } + if ( v74 == 1 ) { - if ( v74 == 4 ) - v50 = v44->pMonsterInfo.field_3C_some_special_attack; - else - v50 = 4; -LABEL_133: - if ( !(dword_6BE368_debug_settings_2 & 0x10) ) + v50 = v44->pMonsterInfo.uAttack2Type; + goto LABEL_133; + } + if ( v74 == 2 ) + { + v53 = v44->pMonsterInfo.uSpell1ID; + } + else + { + if ( v74 != 3 ) { - v54 = v45->ReceiveDamage(v77, (DAMAGE_TYPE)v50); - if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 ) + if ( v74 == 4 ) + v50 = v44->pMonsterInfo.field_3C_some_special_attack; + else + v50 = 4; + LABEL_133: + if ( !(dword_6BE368_debug_settings_2 & 0x10) ) { - if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) ) + v54 = v45->ReceiveDamage(v77, (DAMAGE_TYPE)v50); + if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) >= 0 ) { - v55 = v44->uAIState; - if ( v55 != 5 ) + if ( SHIDWORD(v45->pPlayerBuffs[10].uExpireTime) > 0 || LODWORD(v45->pPlayerBuffs[10].uExpireTime) ) { - if ( v55 != 4 ) + v55 = v44->uAIState; + if ( v55 != Dying && v55 != Dead) { v56 = stru_50C198.CalcMagicalDamageToActor(v44, v50, v54); v44->sCurrentHP -= v56; @@ -7869,21 +7802,11 @@ if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 ) { v57 = byte_4D864C && BYTE2(pGame->uFlags) & 8 ? 10 * v44->uActorRadius : v44->uActorRadius; - v75 = v57; if ( pRenderer->pRenderD3D ) { if ( pGame->uFlags2 & GAME_FLAGS_2_DRAW_BLOODSPLATS ) { - v58 = (double)(signed int)v75; - v75 = v44->vPosition.z; - v59 = (double)(signed int)v75; - v75 = v44->vPosition.y; - v60 = v59; - v61 = (double)(signed int)v75; - v75 = v44->vPosition.x; - v62 = v61; - v63 = (double)(signed int)v75; - pDecalBuilder->AddBloodsplat(v63, v62, v60, 1.0, 0.0, 0.0, v58, 0, 0); + pDecalBuilder->AddBloodsplat(v44->vPosition.x, v44->vPosition.y, v44->vPosition.z, 1.0, 0.0, 0.0, v57, 0, 0); } } } @@ -7902,71 +7825,71 @@ } } } + if ( !v74 + && !(dword_6BE368_debug_settings_2 & 0x10) + && v44->pMonsterInfo.uSpecialAttack + && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType ) + v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44); + if ( !pParty->bTurnBasedModeOn ) + { + v65 = v45->GetActualEndurance(); + v66 = (double)(20 - v45->GetParameterBonus(v65)) + * flt_6BE3A4_debug_recmod1 + * 2.133333333333333; + v45->SetRecoveryTime((signed __int64)v66); + } + return; } - if ( !v74 - && !(dword_6BE368_debug_settings_2 & 0x10) - && v44->pMonsterInfo.uSpecialAttack - && rand() % 100 < v44->pMonsterInfo.uLevel * v44->pMonsterInfo.uSpecialAttackType ) - v45->_48DCF6(v44->pMonsterInfo.uSpecialAttack, v44); - if ( !pParty->bTurnBasedModeOn ) - { - v65 = v45->GetActualEndurance(); - v66 = (double)(20 - v45->GetParameterBonus(v65)) - * flt_6BE3A4_debug_recmod1 - * 2.133333333333333; - v45->SetRecoveryTime((signed __int64)v66); - } - return; + v53 = v44->pMonsterInfo.uSpell2ID; } - v53 = v44->pMonsterInfo.uSpell2ID; - } - v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); - goto LABEL_133; - } - if ( v42 != 1 ) - return; -LABEL_80: - if ( a4 != -1 ) - { - v43 = &pParty->pPlayers[a4]; -LABEL_168: - a4b = v43; - if ( v38 != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) - { - v70 = v43->GetMaxHealth(); - v68 = _43AFE3_calc_spell_damage(v37->spell_id, v37->spell_level, v37->spell_skill, v70); - v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); - } - else - { - v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); - v69 = 0; - } - a4b->ReceiveDamage(v68, (DAMAGE_TYPE)v69); - if ( v38 == OBJECT_Player && !qword_A750D8 ) - { - qword_A750D8 = 256i64; - PlayerSpeechID = SPEECH_44; - uSpeakingCharacter = uActorID + 1; - } - return; - } - v74 = 0; - a4a = 1; - do - { - if ( pPlayers[a4a]->CanAct() ) - { - v67 = v74++; - *(&v72 + v67) = a4a; - } - ++a4a; - } - while ( a4a <= 4 ); - if ( v74 ) - { - v43 = &pParty->pPlayers[*(&v72+rand()%v74)-1];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; - goto LABEL_168; + v50 = LOBYTE(pSpellStats->pInfos[v53].uSchool); + goto LABEL_133; + } + if ( v42 != 1 ) + return; + LABEL_80: + if ( a4 != -1 ) + { + v43 = &pParty->pPlayers[a4]; + LABEL_168: + a4b = v43; + if ( v38 != OBJECT_Player || v37->spell_id != SPELL_BOW_ARROW) + { + v70 = v43->GetMaxHealth(); + v68 = _43AFE3_calc_spell_damage(v37->spell_id, v37->spell_level, v37->spell_skill, v70); + v69 = LOBYTE(pSpellStats->pInfos[v37->spell_id].uSchool); + } + else + { + v68 = pParty->pPlayers[uActorID].CalculateRangedDamageTo(0); + v69 = 0; + } + a4b->ReceiveDamage(v68, (DAMAGE_TYPE)v69); + if ( v38 == OBJECT_Player && !qword_A750D8 ) + { + qword_A750D8 = 256i64; + PlayerSpeechID = SPEECH_44; + uSpeakingCharacter = uActorID + 1; + } + return; + } + v74 = 0; + a4a = 1; + do + { + if ( pPlayers[a4a]->CanAct() ) + { + v67 = v74++; + *(&v72 + v67) = a4a; + } + ++a4a; + } + while ( a4a <= 4 ); + if ( v74 ) + { + v43 = &pParty->pPlayers[*(&v72+rand()%v74)-1];//&stru_AA1058[3].pSounds[6972 * *(&v72 + rand() % v74) + 40552]; + goto LABEL_168; + } } } //----- (00421EA6) --------------------------------------------------------