From 4713945458e077eaeb7c37fd832c7f9a9b6113f3 Mon Sep 17 00:00:00 2001 From: "oskar.wiksten@gmail.com" Date: Wed, 12 Oct 2011 22:16:44 +0000 Subject: [PATCH] Recalculate monster stats after actor conditions have worn off. git-svn-id: https://andors-trail.googlecode.com/svn/trunk@178 08aca716-68be-ccc6-4d58-36f5abd142ac --- .../AndorsTrail/controller/ActorStatsController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java index 442c3d9..bc100d3 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java @@ -131,10 +131,7 @@ public class ActorStatsController { } view.mainActivity.updateStatus(); - boolean removedAnyConditions = decreaseDurationAndRemoveConditions(player); - if (removedAnyConditions) { - recalculatePlayerCombatTraits(player); - } + decreaseDurationAndRemoveConditions(player); } public void applyConditionsToMonsters(PredefinedMap map, boolean isFullRound) { @@ -163,7 +160,7 @@ public class ActorStatsController { } } - private static boolean decreaseDurationAndRemoveConditions(Actor actor) { + private static void decreaseDurationAndRemoveConditions(Actor actor) { boolean removedAnyConditions = false; for(int i = actor.conditions.size() - 1; i >= 0; --i) { ActorCondition c = actor.conditions.get(i); @@ -174,7 +171,9 @@ public class ActorStatsController { removedAnyConditions = true; } } - return removedAnyConditions; + if (removedAnyConditions) { + recalculateActorCombatTraits(actor); + } } public void applyUseEffect(Actor source, Actor target, ItemTraits_OnUse effect) { -- 2.49.0