1
This commit is contained in:
parent
bac7defa2e
commit
2480a9473e
@ -270,7 +270,7 @@ void BattleDataContext::CalcBattleStat(struct PlayerStats* stats)
|
|||||||
|
|
||||||
float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet)
|
float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet)
|
||||||
{
|
{
|
||||||
float total_atk = GetTotalAtk();
|
float total_atk = GetTotalAtk(bullet);
|
||||||
float normal_dmg = total_atk * (1 - target->GetBattleContext()->GetDef() / 1000);
|
float normal_dmg = total_atk * (1 - target->GetBattleContext()->GetDef() / 1000);
|
||||||
float crit = IsCrit() ? GetCritRate() : 0;
|
float crit = IsCrit() ? GetCritRate() : 0;
|
||||||
float dodge = IsDodge() ? GetDodgeRate() : 0;
|
float dodge = IsDodge() ? GetDodgeRate() : 0;
|
||||||
@ -278,9 +278,9 @@ float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet)
|
|||||||
return finaly_dmg;
|
return finaly_dmg;
|
||||||
}
|
}
|
||||||
|
|
||||||
float BattleDataContext::GetTotalAtk()
|
float BattleDataContext::GetTotalAtk(Bullet* bullet)
|
||||||
{
|
{
|
||||||
float total_atk = (GetHeroTotalAtk() / 100 + 1) * GetWeaponAtk();
|
float total_atk = (GetHeroTotalAtk() / 100 + 1) * GetWeaponAtk(bullet);
|
||||||
return total_atk;
|
return total_atk;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -294,7 +294,7 @@ float BattleDataContext::GetHeroTotalAtk()
|
|||||||
return atk_;
|
return atk_;
|
||||||
}
|
}
|
||||||
|
|
||||||
float BattleDataContext::GetWeaponAtk()
|
float BattleDataContext::GetWeaponAtk(Bullet* bullet)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -58,9 +58,9 @@ private:
|
|||||||
std::array<float, kHAT_End>& attr_rate,
|
std::array<float, kHAT_End>& attr_rate,
|
||||||
std::shared_ptr<a8::XObject> obj);
|
std::shared_ptr<a8::XObject> obj);
|
||||||
|
|
||||||
float GetTotalAtk();
|
float GetTotalAtk(Bullet* bullet);
|
||||||
float GetHeroTotalAtk();
|
float GetHeroTotalAtk();
|
||||||
float GetWeaponAtk();
|
float GetWeaponAtk(Bullet* bullet);
|
||||||
bool IsCrit();
|
bool IsCrit();
|
||||||
float GetCritRate();
|
float GetCritRate();
|
||||||
bool IsDodge();
|
bool IsDodge();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user