games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fixed abilities of Efreet.

Browse Source
This commit is contained in:
DjWarmonger
2013-05-25 07:21:02 +00:00
parent c9e95f76df
commit 5436950119
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/creatures/inferno.json
View File

@@ -266,7 +266,8 @@
}, },
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY" "type" : "FIRE_IMMUNITY",
"subtype" : 0
} }
}, },
"upgrades": ["efreetSultan"], "upgrades": ["efreetSultan"],
@@ -308,12 +309,13 @@
}, },
"immuneToFire" : "immuneToFire" :
{ {
"type" : "FIRE_IMMUNITY" "type" : "FIRE_IMMUNITY",
"subtype" : 0
}, },
"fireShield" : "fireShield" :
{ {
"type" : "FIRE_SHIELD", "type" : "FIRE_SHIELD",
"subtype" : 36 //FIXME: what is this magic number for? "val" : 30
} }
}, },
"graphics" : "graphics" :
@@ -398,7 +400,7 @@
"hateArchAngels" : "hateArchAngels" :
{ {
"type" : "HATE", "type" : "HATE",
"subtype" : "creature.archangel", "subtype" : "creature.angel",
"val" : 50 "val" : 50
}, },
"FLYING_ARMY" : "FLYING_ARMY" :

2
server/CGameHandler.cpp
View File

@@ -804,7 +804,7 @@ void CGameHandler::applyBattleEffects(BattleAttack &bat, const CStack *att, cons
bsa.flags |= BattleStackAttacked::EFFECT; bsa.flags |= BattleStackAttacked::EFFECT;
bsa.effect = 11; bsa.effect = 11;
bsa.damageAmount = (bsa.damageAmount * def->valOfBonuses(Bonus::FIRE_SHIELD)) / 100; bsa.damageAmount = (bsa.damageAmount * def->valOfBonuses(Bonus::FIRE_SHIELD)) / 100; //TODO: scale with attack/defense
att->prepareAttacked(bsa); att->prepareAttacked(bsa);
bat.bsa.push_back(bsa); bat.bsa.push_back(bsa);
} }