games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Add missing code fix

Browse Source
This commit is contained in:
dydzio 2017-01-29 12:19:50 +01:00
parent 2f1f725ae6
commit 330c0961b7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/bonuses_texts.json
View File

@ -332,7 +332,7 @@
"SOUL_STEAL": "SOUL_STEAL":
{ {
"name": "Soul Steal", "name": "Soul Steal",
"description": "Gains ${val}% new creatures for each enemy killed" "description": "Gains ${val} new creatures for each enemy killed"
}, },
"SPELLCASTER": "SPELLCASTER":

6
server/CGameHandler.cpp
View File

@ -145,7 +145,7 @@ static void SummonGuardiansHelper(std::vector<BattleHex> & output, const BattleH
if (targetIsAttacker) //handle front guardians, TODO: should we handle situation when units start battle near opposite side of the battlefield? Cannot happen in normal H3... if (targetIsAttacker) //handle front guardians, TODO: should we handle situation when units start battle near opposite side of the battlefield? Cannot happen in normal H3...
BattleHex::checkAndPush(targetPosition.movedInDir(BattleHex::EDir::RIGHT, false).movedInDir(BattleHex::EDir::RIGHT, false), output); BattleHex::checkAndPush(targetPosition.movedInDir(BattleHex::EDir::RIGHT, false).movedInDir(BattleHex::EDir::RIGHT, false), output);
else else
BattleHex::checkAndPush(BattleHex(targetPosition).movedInDir(BattleHex::EDir::LEFT, false).movedInDir(BattleHex::EDir::LEFT, false), output); BattleHex::checkAndPush(targetPosition.movedInDir(BattleHex::EDir::LEFT, false).movedInDir(BattleHex::EDir::LEFT, false), output);
//guardian spawn locations for four default position cases for attacker and defender, non-default starting location for att and def is handled in first two if's //guardian spawn locations for four default position cases for attacker and defender, non-default starting location for att and def is handled in first two if's
if (targetIsAttacker && ((y % 2 == 0) || (x > 1))) if (targetIsAttacker && ((y % 2 == 0) || (x > 1)))
@ -993,7 +993,7 @@ void CGameHandler::applyBattleEffects(BattleAttack &bat, const CStack *att, cons
StacksHealedOrResurrected::HealInfo hi; StacksHealedOrResurrected::HealInfo hi;
hi.stackID = att->ID; hi.stackID = att->ID;
hi.healedHP = bsa.killedAmount * att->valOfBonuses(Bonus::SOUL_STEAL) * att->MaxHealth(); //TODO: Should unit be additionally healed after life drain? hi.healedHP = bsa.killedAmount * att->valOfBonuses(Bonus::SOUL_STEAL) * att->MaxHealth(); //TODO: Should unit be additionally healed after life drain?
hi.lowLevelResurrection = false; hi.lowLevelResurrection = att->hasBonusOfType(Bonus::SOUL_STEAL, 1);
shi.healedStacks.push_back(hi); shi.healedStacks.push_back(hi);
if (hi.healedHP > 0) if (hi.healedHP > 0)
@ -6391,7 +6391,7 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CArmedInstance * _army, Battl
StackLocation sl(army, st->slot); StackLocation sl(army, st->slot);
newStackCounts.push_back(TStackAndItsNewCount(sl, st->count)); newStackCounts.push_back(TStackAndItsNewCount(sl, st->count));
} }
else if (st->count > army->getStackCount(st->slot) && !st->hasBonusOfType(Bonus::SOUL_STEAL, 1)) else if (st->count > army->getStackCount(st->slot))
{ {
logGlobal->debug("Stack gained %d units.", st->count - army->getStackCount(st->slot)); logGlobal->debug("Stack gained %d units.", st->count - army->getStackCount(st->slot));
StackLocation sl(army, st->slot); StackLocation sl(army, st->slot);