Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update battle_troop.cpp #2

Merged
merged 7 commits into from
Jun 16, 2024
Merged

Update battle_troop.cpp #2

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d75394b
Update battle_troop.cpp
Cheerfulbull Jun 16, 2024
6f4910f
Update battle_troop.cpp
Cheerfulbull Jun 16, 2024
fa5add5
Update battle_troop.cpp
Cheerfulbull Jun 16, 2024
3d921cf
Update battle_troop.cpp
Cheerfulbull Jun 16, 2024
369c937
Update battle_troop.cpp
Cheerfulbull Jun 16, 2024
f243c7c
Update battle_troop.cpp
Cheerfulbull Jun 16, 2024
c13d6ed
Update battle_troop.cpp
Cheerfulbull Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 23 additions & 59 deletions src/fheroes2/battle/battle_troop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,68 +1377,32 @@ uint32_t Battle::Unit::CalculateSpellDamage( const Spell & spell, uint32_t spell
{
assert( spell.isDamage() );

// TODO: use fheroes2::getSpellDamage function to remove code duplication.
uint32_t dmg = fheroes2::getSpellDamage( spell, spellPoints, applyingHero );

switch ( GetID() ) {
case Monster::IRON_GOLEM:
case Monster::STEEL_GOLEM:
switch ( spell.GetID() ) {
// 50% damage
case Spell::COLDRAY:
case Spell::COLDRING:
case Spell::FIREBALL:
case Spell::FIREBLAST:
case Spell::LIGHTNINGBOLT:
case Spell::CHAINLIGHTNING:
case Spell::ELEMENTALSTORM:
case Spell::ARMAGEDDON:
dmg /= 2;
break;
default:
break;
}
break;

case Monster::WATER_ELEMENT:
switch ( spell.GetID() ) {
// 200% damage
case Spell::FIREBALL:
case Spell::FIREBLAST:
dmg *= 2;
break;
default:
break;
}
break;

case Monster::AIR_ELEMENT:
switch ( spell.GetID() ) {
// 200% damage
case Spell::ELEMENTALSTORM:
case Spell::LIGHTNINGBOLT:
case Spell::CHAINLIGHTNING:
dmg *= 2;
break;
default:
break;
for ( const fheroes2::MonsterAbility & targetAbility : fheroes2::getMonsterData( GetID() ).battleStats.abilities ) {
if ( targetAbility.type == fheroes2::MonsterAbilityType::ELEMENTAL_SPELL_DAMAGE_REDUCTION ) {
switch ( spell.GetID() ) {
// Reduced elemental spell damage
case Spell::COLDRAY:
case Spell::COLDRING:
case Spell::FIREBALL:
case Spell::FIREBLAST:
case Spell::LIGHTNINGBOLT:
case Spell::CHAINLIGHTNING:
case Spell::ELEMENTALSTORM:
case Spell::ARMAGEDDON:
dmg -= dmg * targetAbility.percentage / 100;
break;
default:
break;
}
}
break;

case Monster::FIRE_ELEMENT:
switch ( spell.GetID() ) {
// 200% damage
case Spell::COLDRAY:
case Spell::COLDRING:
dmg *= 2;
break;
default:
break;
}
for ( const fheroes2::MonsterWeakness & targetWeakness : fheroes2::getMonsterData( GetID() ).battleStats.weaknesses ) {
if ( targetWeakness.type == fheroes2::MonsterWeaknessType::EXTRA_DAMAGE_FROM_CERTAIN_SPELL ) {
if ( spell.GetID() == (int)targetWeakness.value ) {
dmg += dmg * targetWeakness.percentage / 100;
Cheerfulbull marked this conversation as resolved.
Show resolved Hide resolved
}
}
break;

default:
break;
}

// check artifact
Expand Down
Loading