From: oskar.wiksten@gmail.com <oskar.wiksten@gmail.com@08aca716-68be-ccc6-4d58-36f5abd142ac>
Date: Wed, 12 Oct 2011 22:16:44 +0000 (+0000)
Subject: Recalculate monster stats after actor conditions have worn off.
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4713945458e077eaeb7c37fd832c7f9a9b6113f3;p=users%2Fmchehab%2Fandors-trail.git

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
---

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) {