From 96440f27b0a0a76a6b618574b4d1ee4debd95645 Mon Sep 17 00:00:00 2001
From: LucasDelvallet <lucas.delvallet@hotmail.fr>
Date: Mon, 9 Feb 2015 20:20:48 +0100
Subject: [PATCH 01/11] Old conversation are now grayed out

Old conversation are now grayed out for a better lisibility.
---
 .../activity/ConversationActivity.java            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 8bc394546..dbeb0c423 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -46,6 +46,9 @@ public final class ConversationActivity
 	private static final int playerPhraseColor = 0;
 	private static final int NPCPhraseColor = 0;
 	private static final int rewardColor = Color.argb(255, 0x99, 0x99, 0x55);
+	private static final int oldPhraseColor = Color.argb(255,0x5a,0x5a, 0x5a);
+    	private static final int oldPlayerNameColor = Color.argb(255, 0x5d, 0x11, 0x11);
+    	private static final int oldNPCNameColor = Color.argb(255, 0x5d, 0x5d, 0x11);
 
 	private WorldContext world;
 	private Player player;
@@ -206,7 +209,19 @@ public final class ConversationActivity
 		return null; // No reply was found. This is probably an error.
 	}
 
+	private void greyAllConversationStatement(){
+		for(ConversationStatement conversation : this.conversationHistory ){
+			conversation.textColor = oldPhraseColor;
+			if(conversation.isPlayerActor){
+				conversation.nameColor = oldPlayerNameColor;
+			} else {
+				conversation.nameColor = oldNPCNameColor;
+			}
+		}
+	}
+
 	private void nextButtonClicked() {
+		greyAllConversationStatement();
 		RadioButton rb = getSelectedReplyButton();
 		replyGroup.removeAllViews();
 		nextButton.setEnabled(false);

From 31dc4f7ba8218c6dcecc995c78a3606ff3804c9c Mon Sep 17 00:00:00 2001
From: LucasDelvallet <lucas.delvallet@hotmail.fr>
Date: Thu, 26 Feb 2015 13:19:26 +0100
Subject: [PATCH 02/11] Improved greyAllConvervationStatement

I've improved this method, now reward text have they own color when greyed and it only iterate text that not have been greyed yet.
---
 .../activity/ConversationActivity.java        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index dbeb0c423..7b6437b12 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -35,6 +35,7 @@ import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 import java.util.ArrayList;
+import java.util.ListIterator;
 
 public final class ConversationActivity
 		extends Activity
@@ -49,11 +50,13 @@ public final class ConversationActivity
 	private static final int oldPhraseColor = Color.argb(255,0x5a,0x5a, 0x5a);
     	private static final int oldPlayerNameColor = Color.argb(255, 0x5d, 0x11, 0x11);
     	private static final int oldNPCNameColor = Color.argb(255, 0x5d, 0x5d, 0x11);
+    	private static final int oldRewardColor = Color.argb(255, 0x4C, 0x4C, 0x2A);
 
 	private WorldContext world;
 	private Player player;
 	private final ArrayList<ConversationStatement> conversationHistory = new ArrayList<ConversationStatement>();
 	private ConversationController.ConversationStatemachine conversationState;
+	private int numberOfNewMessage = 0;
 
 	private StatementContainerAdapter listAdapter;
 	private Button nextButton;
@@ -210,12 +213,19 @@ public final class ConversationActivity
 	}
 
 	private void greyAllConversationStatement(){
-		for(ConversationStatement conversation : this.conversationHistory ){
-			conversation.textColor = oldPhraseColor;
-			if(conversation.isPlayerActor){
-				conversation.nameColor = oldPlayerNameColor;
-			} else {
-				conversation.nameColor = oldNPCNameColor;
+		int numberOfMessage = this.conversationHistory.size();
+		ListIterator<ConversationStatement> conversations = this.conversationHistory.listIterator(numberOfMessage-this.numberOfNewMessage);
+		while(conversations.hasNext()){
+			ConversationStatement conversation = conversations.next();
+			if(conversation.hasActor()){
+				conversation.textColor = oldPhraseColor;
+				if(conversation.isPlayerActor){
+					conversation.nameColor = oldPlayerNameColor;
+				} else {
+					conversation.nameColor = oldNPCNameColor;
+				}
+			}else{
+				conversation.textColor = oldRewardColor;
 			}
 		}
 	}
@@ -248,6 +258,7 @@ public final class ConversationActivity
 		s.textColor = textColor;
 		s.isPlayerActor = actor != null && actor == player;
 		conversationHistory.add(s);
+		numberOfNewMessage++;
 		statementList.clearFocus();
 		listAdapter.notifyDataSetChanged();
 		statementList.requestLayout();

From f8143c89572eaacc45911d7d7c9a93fc4f854c87 Mon Sep 17 00:00:00 2001
From: LucasDelvallet <lucas.delvallet@hotmail.fr>
Date: Thu, 26 Feb 2015 13:51:53 +0100
Subject: [PATCH 03/11] Added missing line

Added the missing line who put numberOfNewMessage to 0
---
 .../com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 7b6437b12..53b74dbca 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -228,6 +228,7 @@ public final class ConversationActivity
 				conversation.textColor = oldRewardColor;
 			}
 		}
+		numberOfNewMessage = 0;
 	}
 
 	private void nextButtonClicked() {

From f9e7455f14364fda32e39687cd2140f33b8cf4c5 Mon Sep 17 00:00:00 2001
From: LucasDelvallet <lucas.delvallet@hotmail.fr>
Date: Mon, 2 Mar 2015 15:01:07 +0100
Subject: [PATCH 04/11] Modified the quest editor, in order to allow the
 creation of a removeQuestProgress reward in any stage of a quest. If the
 field is emmpty, the stage won't have a this reward. In order to work, the
 progress must exit in the quest.

---
 AndorsTrailEdit/js/legacyimport.js       | 4 ++--
 AndorsTrailEdit/partials/edit_quest.html | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AndorsTrailEdit/js/legacyimport.js b/AndorsTrailEdit/js/legacyimport.js
index 37aeea11d..d4b92eb75 100644
--- a/AndorsTrailEdit/js/legacyimport.js
+++ b/AndorsTrailEdit/js/legacyimport.js
@@ -7,7 +7,7 @@ var ATEditor = (function(ATEditor, model, FieldList, _) {
 				+ "hasAbilityEffect|boostMaxHP|boostMaxAP|moveCostPenalty|attackCost|attackChance|criticalChance|criticalMultiplier|attackDamage_Min|attackDamage_Max|blockChance|damageResistance|"
 				+ "];"
 			);
-		model.quests.legacyFieldList = new FieldList("[id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|];");
+		model.quests.legacyFieldList = new FieldList("[id|name|showInLog|stages[progress|logText|rewardExperience|removeQuestProgress|finishesQuest|]|];");
 		model.items.legacyFieldList = new FieldList("[id|iconID|name|category|displaytype|hasManualPrice|baseMarketCost|"
 				+ "hasEquipEffect|equip_boostMaxHP|equip_boostMaxAP|equip_moveCostPenalty|equip_attackCost|equip_attackChance|equip_criticalChance|equip_criticalMultiplier|equip_attackDamage_Min|equip_attackDamage_Max|equip_blockChance|equip_damageResistance|equip_conditions[condition|magnitude|]|"
 				+ "hasUseEffect|use_boostHP_Min|use_boostHP_Max|use_boostAP_Min|use_boostAP_Max|use_conditionsSource[condition|magnitude|duration|chance|]|"
@@ -94,7 +94,7 @@ var ATEditor = (function(ATEditor, model, FieldList, _) {
 	
 	
 	function convertQuest(obj) {
-		// [id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|];
+		// [id|name|showInLog|stages[progress|logText|rewardExperience|removeQuestProgress|finishesQuest|]|];
 		return obj;
 	}
 	
diff --git a/AndorsTrailEdit/partials/edit_quest.html b/AndorsTrailEdit/partials/edit_quest.html
index 62d736965..85c5ef813 100644
--- a/AndorsTrailEdit/partials/edit_quest.html
+++ b/AndorsTrailEdit/partials/edit_quest.html
@@ -22,6 +22,7 @@
 				<th><span class="hint  hint--top" data-hint="This number will not be displayed to the player. Must be some unique number for this quest though. Prefer values from 10-100.">Progress</span></th>
 				<th>Logtext</th>
 				<th><span class="hint  hint--top" data-hint="Reaching this quest stage gives this much experience">Experience</span></th>
+				<th><span class="hint  hint--top" data-hint="Finishing this stage will get you back to a specified progress">Remove quest progress</span></th>
 				<th>Finishes quest</th>
 				<th></th>
 			</tr></thead>
@@ -30,6 +31,7 @@
 					<td><input type="text" size="3" ng-model="stage.progress" class="at-input-stat"/></td>
 					<td><textarea rows="2" cols="40" ng-model="stage.logText"></textarea></td>
 					<td><input type="text" size="7" ng-model="stage.rewardExperience" class="at-input-stat"/></td>
+					<td><input type="text" size="7" ng-model="stage.removeQuestProgress" class="at-input-stat"/></td>
 					<td><input type="checkbox" ng-model="stage.finishesQuest" ng-true-value="1" ng-false-value="0" /></td>
 					<td><a ng-click="removeQuestStage(stage)" class="btn btn-mini" title="Remove row"><i class="icon-trash"></i></a></td>
 				</tr>

From 4b406eb4f7f80e926dd4ff05b7bdc2c70c172481 Mon Sep 17 00:00:00 2001
From: FlorianDoublet <florian.doublet@hotmail.fr>
Date: Fri, 13 Feb 2015 17:31:03 +0100
Subject: [PATCH 05/11] Added repeatable quest

---
 .../controller/ConversationController.java            | 11 +++++++++++
 .../com/gpl/rpg/AndorsTrail/model/actor/Player.java   |  9 +++++++++
 .../gpl/rpg/AndorsTrail/model/script/Requirement.java |  1 +
 .../rpg/AndorsTrail/model/script/ScriptEffect.java    |  1 +
 4 files changed, 22 insertions(+)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index 79f1eae58..17218b434 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -18,6 +18,7 @@ import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.model.script.Requirement;
@@ -108,6 +109,9 @@ public final class ConversationController {
 			case deactivateMapChangeArea:
 				deactivateMapChangeArea(effect.mapName, effect.effectID);
 				break;
+			case removeQuestProgress:
+				addRemoveQuestProgressReward(player, effect.effectID, effect.value);
+				break;
 		}
 	}
 
@@ -156,14 +160,21 @@ public final class ConversationController {
 	private void addQuestProgressReward(Player player, String questID, int questProgress, ScriptEffectResult result) {
 		QuestProgress progress = new QuestProgress(questID, questProgress);
 		boolean added = player.addQuestProgress(progress);
+
 		if (!added) return; // Only apply exp reward if the quest stage was reached just now (and not re-reached)
 
 		QuestLogEntry stage = world.quests.getQuestLogEntry(progress);
 		if (stage == null) return;
+
 		result.loot.exp += stage.rewardExperience;
 		result.questProgress.add(progress);
 	}
 
+	private void addRemoveQuestProgressReward(Player player, String questID, int questProgress) {
+		Quest currentQuest = world.quests.getQuest(questID);
+		player.removeQuestProgress(currentQuest,questProgress);
+	}
+
 	private void addDropListReward(Player player, String droplistID, ScriptEffectResult result) {
 		world.dropLists.getDropList(droplistID).createRandomLoot(result.loot, player);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index c49f88868..d39dc0405 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -11,6 +11,8 @@ import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Inventory;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForPlayer;
@@ -21,8 +23,11 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map.Entry;
 
 public final class Player extends Actor {
@@ -154,6 +159,10 @@ public final class Player extends Actor {
 		return true; //Progress was added.
 	}
 
+	public void removeQuestProgress(Quest quest, int removeProgress){
+		questProgress.get(quest.questID).remove(progress);
+	}
+
 	public void recalculateLevelExperience() {
 		int experienceRequiredToReachThisLevel = getRequiredExperience(level);
 		levelExperience.set(getRequiredExperienceForNextLevel(level), totalExperience - experienceRequiredToReachThisLevel);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
index e7d1399bd..f86d28679 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
@@ -14,6 +14,7 @@ public final class Requirement {
 		,spentGold
 		,consumedBonemeals
 		,hasActorCondition
+		,removeQuestProgress
 	}
 
 	public final RequirementType requireType;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
index 0303b7606..096ac1e1c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
@@ -14,6 +14,7 @@ public final class ScriptEffect {
 		, deactivateSpawnArea
 		, activateMapChangeArea
 		, deactivateMapChangeArea
+		, removeQuestProgress
 	}
 
 	public final ScriptEffectType type;

From 00caf44ef1e9e037dae6e8d3b857bed97de9854f Mon Sep 17 00:00:00 2001
From: LucasDelvallet <lucas.delvallet@hotmail.fr>
Date: Fri, 6 Mar 2015 14:28:33 +0100
Subject: [PATCH 06/11] Added removeQuestProgress Reward

---
 AndorsTrailEdit/js/legacyimport.js          |  4 ++--
 AndorsTrailEdit/partials/edit_dialogue.html | 11 +++++++++++
 AndorsTrailEdit/partials/edit_quest.html    |  2 --
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/AndorsTrailEdit/js/legacyimport.js b/AndorsTrailEdit/js/legacyimport.js
index d4b92eb75..37aeea11d 100644
--- a/AndorsTrailEdit/js/legacyimport.js
+++ b/AndorsTrailEdit/js/legacyimport.js
@@ -7,7 +7,7 @@ var ATEditor = (function(ATEditor, model, FieldList, _) {
 				+ "hasAbilityEffect|boostMaxHP|boostMaxAP|moveCostPenalty|attackCost|attackChance|criticalChance|criticalMultiplier|attackDamage_Min|attackDamage_Max|blockChance|damageResistance|"
 				+ "];"
 			);
-		model.quests.legacyFieldList = new FieldList("[id|name|showInLog|stages[progress|logText|rewardExperience|removeQuestProgress|finishesQuest|]|];");
+		model.quests.legacyFieldList = new FieldList("[id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|];");
 		model.items.legacyFieldList = new FieldList("[id|iconID|name|category|displaytype|hasManualPrice|baseMarketCost|"
 				+ "hasEquipEffect|equip_boostMaxHP|equip_boostMaxAP|equip_moveCostPenalty|equip_attackCost|equip_attackChance|equip_criticalChance|equip_criticalMultiplier|equip_attackDamage_Min|equip_attackDamage_Max|equip_blockChance|equip_damageResistance|equip_conditions[condition|magnitude|]|"
 				+ "hasUseEffect|use_boostHP_Min|use_boostHP_Max|use_boostAP_Min|use_boostAP_Max|use_conditionsSource[condition|magnitude|duration|chance|]|"
@@ -94,7 +94,7 @@ var ATEditor = (function(ATEditor, model, FieldList, _) {
 	
 	
 	function convertQuest(obj) {
-		// [id|name|showInLog|stages[progress|logText|rewardExperience|removeQuestProgress|finishesQuest|]|];
+		// [id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|];
 		return obj;
 	}
 	
diff --git a/AndorsTrailEdit/partials/edit_dialogue.html b/AndorsTrailEdit/partials/edit_dialogue.html
index 45a9c49b3..8c0ddb895 100644
--- a/AndorsTrailEdit/partials/edit_dialogue.html
+++ b/AndorsTrailEdit/partials/edit_dialogue.html
@@ -31,6 +31,7 @@
 				<label for="rewardType">Reward Type:</label>
 				<select class="field" id="rewardType" ng-model="reward.rewardType">
 					<option value="questProgress">Quest progress</option>
+					<option value="removeQuestProgress">Remove Quest progress</option>
 					<option value="dropList">Droplist</option>
 					<option value="skillIncrease">Skill increase</option>
 					<option value="actorCondition">Actor condition</option>
@@ -74,6 +75,16 @@
 					<input type="text" size="3" id="rewardvalue" class="field at-input-quantity" ng-model="reward.value" />
 				</div>
 			</div>
+			<div ng-show="reward.rewardType=='removeQuestProgress'">
+				<div class="fieldWithLabel">
+					<label for="rewardID">Quest ID:</label>
+					<input type="text" size="30" id="rewardID" class="field at-input-id" ng-model="reward.rewardID" />
+				</div>
+				<div class="fieldWithLabel">
+					<label for="rewardvalue">Stage:</label>
+					<input type="text" size="3" id="rewardvalue" class="field at-input-quantity" ng-model="reward.value" />
+				</div>
+			</div>
 			<div ng-show="reward.rewardType=='dropList'">
 				<div class="fieldWithLabel">
 					<label for="rewardID">Droplist ID:</label>
diff --git a/AndorsTrailEdit/partials/edit_quest.html b/AndorsTrailEdit/partials/edit_quest.html
index 85c5ef813..62d736965 100644
--- a/AndorsTrailEdit/partials/edit_quest.html
+++ b/AndorsTrailEdit/partials/edit_quest.html
@@ -22,7 +22,6 @@
 				<th><span class="hint  hint--top" data-hint="This number will not be displayed to the player. Must be some unique number for this quest though. Prefer values from 10-100.">Progress</span></th>
 				<th>Logtext</th>
 				<th><span class="hint  hint--top" data-hint="Reaching this quest stage gives this much experience">Experience</span></th>
-				<th><span class="hint  hint--top" data-hint="Finishing this stage will get you back to a specified progress">Remove quest progress</span></th>
 				<th>Finishes quest</th>
 				<th></th>
 			</tr></thead>
@@ -31,7 +30,6 @@
 					<td><input type="text" size="3" ng-model="stage.progress" class="at-input-stat"/></td>
 					<td><textarea rows="2" cols="40" ng-model="stage.logText"></textarea></td>
 					<td><input type="text" size="7" ng-model="stage.rewardExperience" class="at-input-stat"/></td>
-					<td><input type="text" size="7" ng-model="stage.removeQuestProgress" class="at-input-stat"/></td>
 					<td><input type="checkbox" ng-model="stage.finishesQuest" ng-true-value="1" ng-false-value="0" /></td>
 					<td><a ng-click="removeQuestStage(stage)" class="btn btn-mini" title="Remove row"><i class="icon-trash"></i></a></td>
 				</tr>

From 804d0feaa0e7096beb0c46d937a07d8bf31eadab Mon Sep 17 00:00:00 2001
From: LucasDelvallet <lucas.delvallet@hotmail.fr>
Date: Fri, 6 Mar 2015 17:54:39 +0100
Subject: [PATCH 07/11] Method optimisation

---
 .../gpl/rpg/AndorsTrail/activity/ConversationActivity.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 53b74dbca..b8a336709 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -214,9 +214,8 @@ public final class ConversationActivity
 
 	private void greyAllConversationStatement(){
 		int numberOfMessage = this.conversationHistory.size();
-		ListIterator<ConversationStatement> conversations = this.conversationHistory.listIterator(numberOfMessage-this.numberOfNewMessage);
-		while(conversations.hasNext()){
-			ConversationStatement conversation = conversations.next();
+		while(numberOfNewMessage != 0){
+			ConversationStatement conversation = conversationHistory.get(numberOfMessage - numberOfNewMessage);
 			if(conversation.hasActor()){
 				conversation.textColor = oldPhraseColor;
 				if(conversation.isPlayerActor){
@@ -227,8 +226,8 @@ public final class ConversationActivity
 			}else{
 				conversation.textColor = oldRewardColor;
 			}
+			numberOfNewMessage--;
 		}
-		numberOfNewMessage = 0;
 	}
 
 	private void nextButtonClicked() {

From 6124e074ec88d0bfb4b6d5ab0f2fd0ea2b302efc Mon Sep 17 00:00:00 2001
From: FlorianDoublet <florian.doublet@hotmail.fr>
Date: Fri, 6 Mar 2015 18:26:13 +0100
Subject: [PATCH 08/11] repeatableQuest improvement

repeatableQuest improvement

add our name into authors file

add our name into authors file
---
 AndorsTrail/res/values/authors.xml                          | 2 ++
 .../rpg/AndorsTrail/controller/ConversationController.java  | 6 ++++--
 .../src/com/gpl/rpg/AndorsTrail/model/actor/Player.java     | 6 ++++--
 .../com/gpl/rpg/AndorsTrail/model/script/Requirement.java   | 1 -
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index 72d9e17eb..3078720ad 100644
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -16,6 +16,8 @@
 		Additional programming by Ethan Wessel&lt;br /&gt;
 		Additional programming by Scott Lund&lt;br /&gt;
 		Additional programming by &lt;a href="https://github.com/Zukero"&gt;Kevin Pochat&lt;/a&gt;&lt;br /&gt;
+		Additional programming by Lucas Delvallet&lt;br /&gt;
+		Additional programming by Florian Doublet&lt;br /&gt;
 		Additional graphics by Karvis&lt;br /&gt;
 		Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz&lt;br /&gt;
 		Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico&lt;br /&gt;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index 17218b434..f6137d07b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -1,6 +1,8 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.res.Resources;
+import android.util.Log;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -171,8 +173,8 @@ public final class ConversationController {
 	}
 
 	private void addRemoveQuestProgressReward(Player player, String questID, int questProgress) {
-		Quest currentQuest = world.quests.getQuest(questID);
-		player.removeQuestProgress(currentQuest,questProgress);
+        QuestProgress progress = new QuestProgress(questID, questProgress);
+		boolean removed = player.removeQuestProgress(progress);
 	}
 
 	private void addDropListReward(Player player, String droplistID, ScriptEffectResult result) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index d39dc0405..12a66bea6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -159,8 +159,10 @@ public final class Player extends Actor {
 		return true; //Progress was added.
 	}
 
-	public void removeQuestProgress(Quest quest, int removeProgress){
-		questProgress.get(quest.questID).remove(progress);
+	public boolean removeQuestProgress(QuestProgress progress){
+        if (!hasExactQuestProgress(progress.questID, progress.progress)) return false;
+		questProgress.get(progress.questID).remove(progress.progress);
+		return true; //Progress was removed.
 	}
 
 	public void recalculateLevelExperience() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
index f86d28679..e7d1399bd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
@@ -14,7 +14,6 @@ public final class Requirement {
 		,spentGold
 		,consumedBonemeals
 		,hasActorCondition
-		,removeQuestProgress
 	}
 
 	public final RequirementType requireType;

From ba58195f49120ffc7bbd4bacd466981bd575eb14 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Wed, 18 Mar 2015 23:14:56 +0100
Subject: [PATCH 09/11] Code cleanup: - Removed unused imports. - Removed
 useless variable

---
 .../AndorsTrail/activity/DebugInterface.java  |  1 -
 .../controller/ConversationController.java    | 14 +++++++------
 .../rpg/AndorsTrail/model/actor/Player.java   | 20 ++++++++-----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index 036e6e73c..9fb451a32 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
@@ -13,7 +13,6 @@ import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 
-@SuppressWarnings("unused")
 public final class DebugInterface {
 	private final ControllerContext controllerContext;
 	private final MainActivity mainActivity;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index f6137d07b..b7acc4de6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -1,13 +1,18 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import java.util.ArrayList;
+
 import android.content.res.Resources;
-import android.util.Log;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.GameStatistics;
-import com.gpl.rpg.AndorsTrail.model.ability.*;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
 import com.gpl.rpg.AndorsTrail.model.actor.Actor;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
@@ -20,7 +25,6 @@ import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.model.script.Requirement;
@@ -28,8 +32,6 @@ import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.util.ArrayList;
-
 public final class ConversationController {
 
 	private final ControllerContext controllers;
@@ -174,7 +176,7 @@ public final class ConversationController {
 
 	private void addRemoveQuestProgressReward(Player player, String questID, int questProgress) {
         QuestProgress progress = new QuestProgress(questID, questProgress);
-		boolean removed = player.removeQuestProgress(progress);
+		player.removeQuestProgress(progress);
 	}
 
 	private void addDropListReward(Player player, String droplistID, ScriptEffectResult result) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index 12a66bea6..b2cd16402 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -1,7 +1,15 @@
 package com.gpl.rpg.AndorsTrail.model.actor;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map.Entry;
+
 import android.util.FloatMath;
 import android.util.SparseIntArray;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -11,8 +19,6 @@ import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Inventory;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
-import com.gpl.rpg.AndorsTrail.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForPlayer;
@@ -20,16 +26,6 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.Range;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
 public final class Player extends Actor {
 
 	public static final int DEFAULT_PLAYER_ATTACKCOST = 4;

From c5cddf96ba653e47c37409c3d9f7de07a5a39b62 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Fri, 10 Apr 2015 11:40:17 +0200
Subject: [PATCH 10/11] Animated movements ! Enhancements in debug map
 graphics, and more monster to better test animations. Player slides from tile
 to tile in MIN_INPUT_DEPLAY / 2 ms. Mobs slide at a speed proportional to
 their Move cost / Max AP ratio. Animation refresh rate is 25ms.

---
 AndorsTrail/res/raw/monsterlist_debug.json    |  2 +-
 AndorsTrail/res/xml/debugmap.tmx              | 10 +--
 .../rpg/AndorsTrail/controller/Constants.java |  2 +-
 .../controller/MonsterMovementController.java | 18 ++--
 .../controller/MovementController.java        | 23 +++--
 .../controller/VisualEffectController.java    | 65 ++++++++++++++
 .../listeners/VisualEffectFrameListener.java  |  3 +
 .../listeners/VisualEffectFrameListeners.java | 19 ++++
 .../rpg/AndorsTrail/model/actor/Actor.java    |  4 +
 .../rpg/AndorsTrail/model/actor/Player.java   |  2 -
 .../gpl/rpg/AndorsTrail/util/CoordRect.java   | 20 +++++
 .../gpl/rpg/AndorsTrail/view/MainView.java    | 89 +++++++++++++++++--
 12 files changed, 231 insertions(+), 26 deletions(-)

diff --git a/AndorsTrail/res/raw/monsterlist_debug.json b/AndorsTrail/res/raw/monsterlist_debug.json
index f1fa767a2..eb168b5aa 100644
--- a/AndorsTrail/res/raw/monsterlist_debug.json
+++ b/AndorsTrail/res/raw/monsterlist_debug.json
@@ -62,7 +62,7 @@
         "monsterClass": "insect",
         "maxHP": 10,
         "maxAP": 10,
-        "moveCost": 10,
+        "moveCost": 5,
         "attackCost": 10,
         "attackChance": 50,
         "droplistID": "debuglist1",
diff --git a/AndorsTrail/res/xml/debugmap.tmx b/AndorsTrail/res/xml/debugmap.tmx
index 4d9b20e2c..1c7683509 100644
--- a/AndorsTrail/res/xml/debugmap.tmx
+++ b/AndorsTrail/res/xml/debugmap.tmx
@@ -122,12 +122,12 @@
  </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcHSQ4ydUNOsEEqalultkmgcAw35PpQ==
+   eJw7ysbAcHQQ4wYOBoYnVDTvBBKmpbpbZJoHAISsT2I=
   </data>
  </layer>
  <layer name="Objects" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYMAOktlxSNAYSFDRXlsm6plFLwAA6HwAyQ==
+   eJyby88AB7FI7JvMDBSDbDLMyOQnrIZYYMtEPbNIBfPI9AcAQ5QDxw==
   </data>
  </layer>
  <layer name="Above" width="10" height="10">
@@ -140,7 +140,7 @@
    eJxjYBi+wFVgoF1AOgAAPUQAVg==
   </data>
  </layer>
- <objectgroup name="Object Layer 1">
+ <objectgroup name="Object Layer 1" width="0" height="0">
   <object name="debugsign" type="sign" x="192" y="96" width="32" height="32"/>
   <object name="start" type="rest" x="96" y="64" width="32" height="32"/>
   <object name="Unopenable key area" type="key" x="32" y="128" width="32" height="32">
@@ -181,10 +181,10 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="insect" type="spawn" x="96" y="128" width="192" height="160">
    <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="15"/>
    </properties>
   </object>
   <object name="troll" type="spawn" x="256" y="256" width="64" height="64">
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
index b5782ae34..57618f122 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
@@ -32,7 +32,7 @@ public final class Constants {
 	public static final int TICKS_PER_FULLROUND = FULLROUND_DURATION / TICK_DELAY;
 	public static final int SPLATTER_DURATION_MS = 20000;
 
-	public static final ConstRange monsterWaitTurns = new ConstRange(30,4);
+	public static final ConstRange monsterWaitTurns = new ConstRange(5,1);
 	public static final long MAP_UNVISITED_RESPAWN_DURATION_MS = 3 * 60 * 1000; // 3 min in milliseconds
 
 	public static final String PREFERENCE_MODEL_LASTRUNVERSION = "lastversion";
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
index 2a19631bc..b8b8f68ca 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
@@ -74,7 +74,7 @@ public final class MonsterMovementController implements EvaluateWalkable {
 	private void moveMonster(final Monster m, final MonsterSpawnArea area) {
 		PredefinedMap map = world.model.currentMap;
 		LayeredTileMap tileMap = world.model.currentTileMap;
-		m.nextActionTime += getMillisecondsPerMove(m);
+		m.nextActionTime = System.currentTimeMillis() + getMillisecondsPerMove(m);
 		if (m.movementDestination == null) {
 			// Monster has waited and should start to move again.
 			m.movementDestination = new Coord(m.position);
@@ -128,7 +128,7 @@ public final class MonsterMovementController implements EvaluateWalkable {
 
 	private static void cancelCurrentMonsterMovement(final Monster m) {
 		m.movementDestination = null;
-		m.nextActionTime += getMillisecondsPerMove(m) * Constants.rollValue(Constants.monsterWaitTurns);
+		m.nextActionTime = System.currentTimeMillis() + (getMillisecondsPerMove(m) * Constants.rollValue(Constants.monsterWaitTurns));
 	}
 
 	private static int getMillisecondsPerMove(Monster m) {
@@ -151,9 +151,17 @@ public final class MonsterMovementController implements EvaluateWalkable {
 		return monsterCanMoveTo(world.model.currentMap, world.model.currentTileMap, r);
 	}
 
-	public void moveMonsterToNextPosition(Monster m, PredefinedMap map) {
-		CoordRect previousPosition = new CoordRect(new Coord(m.position), m.rectPosition.size);
+	public void moveMonsterToNextPosition(final Monster m, final PredefinedMap map) {
+		final CoordRect previousPosition = new CoordRect(new Coord(m.position), m.rectPosition.size);
+		m.lastPosition.set(previousPosition.topLeft);
 		m.position.set(m.nextPosition.topLeft);
-		monsterMovementListeners.onMonsterMoved(map, m, previousPosition);
+		controllers.effectController.startActorMoveEffect(m, previousPosition.topLeft, m.position, getMillisecondsPerMove(m) / 4, new VisualEffectController.VisualEffectCompletedCallback() {
+			
+			@Override
+			public void onVisualEffectCompleted(int callbackValue) {
+
+				monsterMovementListeners.onMonsterMoved(map, m, previousPosition);
+			}
+		}, 0);
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index 66aa575b7..878d40c20 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -228,15 +228,24 @@ public final class MovementController implements TimedMessageTask.Callback {
 		player.lastPosition.set(player.position);
 		player.position.set(newPosition);
 		controllers.combatController.setCombatSelection(null, null);
-		playerMovementListeners.onPlayerMoved(newPosition, player.lastPosition);
+		
+		controllers.effectController.startActorMoveEffect(player, player.lastPosition, newPosition, (int) (Constants.MINIMUM_INPUT_INTERVAL / 2), new VisualEffectController.VisualEffectCompletedCallback() {
+			
+			@Override
+			public void onVisualEffectCompleted(int callbackValue) {
+				playerMovementListeners.onPlayerMoved(newPosition, player.lastPosition);
 
-		controllers.mapController.handleMapEventsAfterMovement(currentMap, newPosition, player.lastPosition);
+				controllers.mapController.handleMapEventsAfterMovement(currentMap, newPosition, player.lastPosition);
 
-		if (!world.model.uiSelections.isInCombat) {
-			//currentMap can be outdated due to mapchange events processed above.
-			Loot loot = world.model.currentMap.getBagAt(newPosition);
-			if (loot != null) controllers.itemController.playerSteppedOnLootBag(loot);
-		}
+				if (!world.model.uiSelections.isInCombat) {
+					//currentMap can be outdated due to mapchange events processed above.
+					Loot loot = world.model.currentMap.getBagAt(newPosition);
+					if (loot != null) controllers.itemController.playerSteppedOnLootBag(loot);
+				}
+			}
+		}, 0);
+		
+		
 	}
 
 	public void respawnPlayer(Resources res) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
index 63812e7ab..bd422491f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
@@ -4,9 +4,11 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.os.Handler;
+
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.listeners.VisualEffectFrameListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
@@ -54,7 +56,70 @@ public final class VisualEffectController {
 		enqueuedEffectID = null;
 		enqueuedEffectValue = 0;
 	}
+	
+	public void startActorMoveEffect(Actor actor, Coord origin, Coord destination, int duration, VisualEffectCompletedCallback callback, int callbackValue) {
+		++effectCount;
+		(new SpriteMoveAnimation(origin, destination, duration, actor, callback, callbackValue))
+		.start();
+	}
 
+	public final class SpriteMoveAnimation extends Handler implements Runnable {
+		
+		private static final int millisecondsPerFrame=25;
+		
+		private final VisualEffectCompletedCallback callback;
+		private final int callbackValue;
+
+		public final int duration;
+		public final Actor actor;
+		public final Coord origin;
+		public final Coord destination;
+		
+		public int timeElapsed;
+		
+		@Override
+		public void run() {
+			update();
+			if (System.currentTimeMillis() - actor.vfxStartTime >= duration) {
+				onCompleted();
+			} else {
+				postDelayed(this, millisecondsPerFrame);
+			}
+		}
+		
+		public SpriteMoveAnimation(Coord origin, Coord destination, int duration, Actor actor, VisualEffectCompletedCallback callback, int callbackValue) {
+			this.callback = callback;
+			this.callbackValue = callbackValue;
+			this.duration = duration;
+			this.actor = actor;
+			this.origin = origin;
+			this.destination = destination;
+			this.timeElapsed = 0;
+
+		}
+		
+		private void update() {
+			
+			visualEffectFrameListeners.onNewSpriteMoveFrame(this);
+		}
+
+		private void onCompleted() {
+			--effectCount;
+			actor.hasVFXRunning = false;
+			if (callback != null) callback.onVisualEffectCompleted(callbackValue);
+			visualEffectFrameListeners.onSpriteMoveCompleted(this);
+		}
+		
+
+		public void start() {
+			actor.hasVFXRunning = true;
+			actor.vfxDuration = duration;
+			actor.vfxStartTime = System.currentTimeMillis();
+			postDelayed(this, 0);
+		}
+		
+	}
+	
 	public final class VisualEffectAnimation extends Handler implements Runnable {
 
 		@Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java
index 4fb6a7d96..c794c8624 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java
@@ -1,8 +1,11 @@
 package com.gpl.rpg.AndorsTrail.controller.listeners;
 
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
 
 public interface VisualEffectFrameListener {
 	void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset);
 	void onAnimationCompleted(VisualEffectAnimation animation);
+	void onNewSpriteMoveFrame(SpriteMoveAnimation animation);
+	void onSpriteMoveCompleted(SpriteMoveAnimation animation);
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
index 0801938c7..cec0fcdba 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
@@ -1,5 +1,6 @@
 package com.gpl.rpg.AndorsTrail.controller.listeners;
 
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
 import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
@@ -12,6 +13,14 @@ public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffe
 	private final Function1<VisualEffectFrameListener, VisualEffectAnimation> onAnimationCompleted = new Function1<VisualEffectFrameListener, VisualEffectAnimation>() {
 		@Override public void call(VisualEffectFrameListener listener, VisualEffectAnimation animation) { listener.onAnimationCompleted(animation); }
 	};
+	
+	private final Function1<VisualEffectFrameListener, SpriteMoveAnimation> onNewSpriteMoveFrame = new Function1<VisualEffectFrameListener, SpriteMoveAnimation>() {
+		@Override public void call(VisualEffectFrameListener listener, SpriteMoveAnimation animation) { listener.onNewSpriteMoveFrame(animation); }
+	};
+	
+	private final Function1<VisualEffectFrameListener, SpriteMoveAnimation> onSpriteMoveCompleted = new Function1<VisualEffectFrameListener, SpriteMoveAnimation>() {
+		@Override public void call(VisualEffectFrameListener listener, SpriteMoveAnimation animation) { listener.onSpriteMoveCompleted(animation); }
+	};
 
 	@Override
 	public void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset) {
@@ -22,4 +31,14 @@ public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffe
 	public void onAnimationCompleted(VisualEffectAnimation animation) {
 		callAllListeners(this.onAnimationCompleted, animation);
 	}
+	
+	@Override
+	public void onNewSpriteMoveFrame(SpriteMoveAnimation animation) {
+		callAllListeners(this.onNewSpriteMoveFrame, animation);
+	}
+	
+	@Override
+	public void onSpriteMoveCompleted(SpriteMoveAnimation animation) {
+		callAllListeners(this.onSpriteMoveCompleted, animation);
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
index a318bf2db..49b59eb1d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
@@ -34,6 +34,10 @@ public class Actor {
 	public int blockChance;
 	public int damageResistance;
 	public ItemTraits_OnUse[] onHitEffects;
+	public boolean hasVFXRunning = false;
+	public long vfxStartTime = 0;
+	public int vfxDuration = 0;
+	public final Coord lastPosition = new Coord();
 
 	public Actor(
 			Size tileSize
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index b2cd16402..16c6c0a7b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -29,7 +29,6 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 public final class Player extends Actor {
 
 	public static final int DEFAULT_PLAYER_ATTACKCOST = 4;
-	public final Coord lastPosition;
 	public final Coord nextPosition;
 
 	// TODO: Should be privates
@@ -87,7 +86,6 @@ public final class Player extends Actor {
 			, true // isPlayer
 			, false // isImmuneToCriticalHits
 		);
-		this.lastPosition = new Coord();
 		this.nextPosition = new Coord();
 		this.levelExperience = new Range();
 		this.inventory = new Inventory();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
index b74f80833..7472936f2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
@@ -72,4 +72,24 @@ public final class CoordRect {
 	public String toString() {
 		return '{' + topLeft.toString() + ", " + size.toString() + '}';
 	}
+	
+	public static CoordRect getBoundingRect(Coord c1, Coord c2) {
+		int x, y, w, h;
+		if (c2.x < c1.x) {
+			x = c2.x;
+			w = 1 + c1.x - c2.x;
+		} else {
+			x = c1.x;
+			w = 1 + c2.x - c1.x;
+		}
+		if (c2.y < c1.y) {
+			y = c2.y;
+			h = 1 + c1.y - c2.y;
+		} else {
+			y = c1.y;
+			h = 1 + c2.y - c1.y;
+		}
+		
+		return new CoordRect(new Coord(x, y), new Size(w, h));
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
index 540d7b4dd..ec684ef13 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
@@ -10,12 +10,14 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.InputController;
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.BloodSplatter;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
 import com.gpl.rpg.AndorsTrail.controller.listeners.*;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
@@ -29,6 +31,7 @@ import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MainView extends SurfaceView
@@ -49,7 +52,8 @@ public final class MainView extends SurfaceView
 	private final Coord screenOffset = new Coord(); // pixel offset where the image begins
 	private final Coord mapTopLeft = new Coord(); // Map coords of visible map
 	private CoordRect mapViewArea; // Area in mapcoordinates containing the visible map. topleft == this.topleft
-
+	private Rect redrawClip = new Rect(); //Area in screen coordinates containing the visible map.
+	
 	private final ModelContainer model;
 	private final WorldContext world;
 	private final ControllerContext controllers;
@@ -199,6 +203,7 @@ public final class MainView extends SurfaceView
 				}
 			}
 			synchronized (holder) { synchronized (tiles) {
+				c.clipRect(redrawClip);
 				c.translate(screenOffset.x, screenOffset.y);
 				c.scale(scale, scale);
 				doDrawRect(c, area);
@@ -213,6 +218,34 @@ public final class MainView extends SurfaceView
 			if (c != null) holder.unlockCanvasAndPost(c);
 		}
 	}
+	
+	private void redrawMoveArea_(CoordRect area, final SpriteMoveAnimation effect) {
+		if (!hasSurface) return;
+
+		if (currentMap.isOutside(area)) return;
+		if (!mapViewArea.intersects(area)) return;
+
+		calculateRedrawRect(area);
+		Canvas c = null;
+		try {
+			c = holder.lockCanvas(redrawRect);
+			// lockCanvas sometimes changes redrawRect, when the double-buffer has not been
+			// sufficiently filled beforehand. In those cases, we need to redraw the whole scene.
+			if (area != mapViewArea) {
+				if (isRedrawRectWholeScreen(redrawRect)) {
+					area = mapViewArea;
+				}
+			}
+			synchronized (holder) { synchronized (tiles) {
+				c.clipRect(redrawClip);
+				c.translate(screenOffset.x, screenOffset.y);
+				c.scale(scale, scale);
+				doDrawRect(c, area);
+			} }
+		} finally {
+			if (c != null) holder.unlockCanvasAndPost(c);
+		}
+	}
 
 	private boolean isRedrawRectWholeScreen(Rect redrawRect) {
 		if (redrawRect.width() < mapViewArea.size.width * scaledTileSize) return false;
@@ -256,13 +289,25 @@ public final class MainView extends SurfaceView
 	}
 
 	private void doDrawRect(Canvas canvas, CoordRect area) {
-
+		doDrawRect_Below(canvas, area);
+		doDrawRect_Objects(canvas, area);
+		doDrawRect_Above(canvas, area);
+		
+	}
+	
+	private void doDrawRect_Below(Canvas canvas, CoordRect area) {
 		drawMapLayer(canvas, area, currentTileMap.currentLayout.layerGround);
 		tryDrawMapLayer(canvas, area, currentTileMap.currentLayout.layerObjects);
 
 		for (BloodSplatter splatter : currentMap.splatters) {
 			drawFromMapPosition(canvas, area, splatter.position, splatter.iconID);
 		}
+	}
+	
+	private void doDrawRect_Objects(Canvas canvas, CoordRect area) {
+		for (BloodSplatter splatter : currentMap.splatters) {
+			drawFromMapPosition(canvas, area, splatter.position, splatter.iconID);
+		}
 
 		for (Loot l : currentMap.groundBags) {
 			if (l.isVisible) {
@@ -270,13 +315,31 @@ public final class MainView extends SurfaceView
 			}
 		}
 
-		drawFromMapPosition(canvas, area, playerPosition, model.player.iconID);
+		if (!model.player.hasVFXRunning) {
+			drawFromMapPosition(canvas, area, playerPosition, model.player.iconID);
+		} else if (area.contains(playerPosition)) {
+			int vfxElapsedTime = (int) (System.currentTimeMillis() - model.player.vfxStartTime);
+			if (vfxElapsedTime > model.player.vfxDuration) vfxElapsedTime = model.player.vfxDuration;
+			int x = ((model.player.position.x - mapViewArea.topLeft.x) * tileSize * vfxElapsedTime + ((model.player.lastPosition.x - mapViewArea.topLeft.x) * tileSize * (model.player.vfxDuration - vfxElapsedTime))) / model.player.vfxDuration;
+			int y = ((model.player.position.y - mapViewArea.topLeft.y) * tileSize * vfxElapsedTime + ((model.player.lastPosition.y - mapViewArea.topLeft.y) * tileSize * (model.player.vfxDuration - vfxElapsedTime))) / model.player.vfxDuration;
+			tiles.drawTile(canvas, model.player.iconID, x, y, mPaint);
+		}
 		for (MonsterSpawnArea a : currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
-				drawFromMapPosition(canvas, area, m.rectPosition, m.iconID);
+				if (!m.hasVFXRunning) {
+					drawFromMapPosition(canvas, area, m.rectPosition, m.iconID);
+				} else if (area.intersects(m.rectPosition) || area.contains(m.lastPosition)) {
+					int vfxElapsedTime = (int) (System.currentTimeMillis() - m.vfxStartTime);
+					if (vfxElapsedTime > m.vfxDuration) vfxElapsedTime = m.vfxDuration;
+					int x = ((m.position.x - mapViewArea.topLeft.x) * tileSize * vfxElapsedTime + ((m.lastPosition.x - mapViewArea.topLeft.x) * tileSize * (m.vfxDuration - vfxElapsedTime))) / m.vfxDuration;
+					int y = ((m.position.y - mapViewArea.topLeft.y) * tileSize * vfxElapsedTime + ((m.lastPosition.y - mapViewArea.topLeft.y) * tileSize * (m.vfxDuration - vfxElapsedTime))) / m.vfxDuration;
+					tiles.drawTile(canvas, m.iconID, x, y, mPaint);
+				}
 			}
 		}
-
+	}
+	
+	private void doDrawRect_Above(Canvas canvas, CoordRect area) {
 		tryDrawMapLayer(canvas, area, currentTileMap.currentLayout.layerAbove);
 
 		if (model.uiSelections.selectedPosition != null) {
@@ -342,6 +405,7 @@ public final class MainView extends SurfaceView
 					,Math.min(screenSizeTileCount.height, currentMap.size.height)
 				);
 			mapViewArea = new CoordRect(mapTopLeft, visibleNumberOfTiles);
+			updateClip();
 
 			screenOffset.set(
 					(surfaceSize.width - scaledTileSize * visibleNumberOfTiles.width) / 2
@@ -370,8 +434,13 @@ public final class MainView extends SurfaceView
 				mapTopLeft.y = Math.max(0, playerPosition.y - mapViewArea.size.height/2);
 				mapTopLeft.y = Math.min(mapTopLeft.y, currentMap.size.height - mapViewArea.size.height);
 			}
+			updateClip();
 		}
 	}
+	
+	private void updateClip() {
+		worldCoordsToScreenCords(mapViewArea, redrawClip);
+	}
 
 	@Override
 	public void onPlayerMoved(Coord newPosition, Coord previousPosition) {
@@ -492,6 +561,16 @@ public final class MainView extends SurfaceView
 	public void onAnimationCompleted(VisualEffectAnimation animation) {
 		redrawArea(animation.area, RedrawAreaDebugReason.EffectCompleted);
 	}
+	
+	@Override
+	public void onNewSpriteMoveFrame(SpriteMoveAnimation animation) {
+		redrawMoveArea_(CoordRect.getBoundingRect(animation.origin, animation.destination), animation);
+	}
+	
+	@Override
+	public void onSpriteMoveCompleted(SpriteMoveAnimation animation) {
+		redrawArea(CoordRect.getBoundingRect(animation.origin, animation.destination), RedrawAreaDebugReason.EffectCompleted);
+	}
 
 	@Override
 	public void onNewTick() {

From 348c9d215dd6feeead7bc64958928f97bfaff42d Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Mon, 13 Apr 2015 17:23:37 +0200
Subject: [PATCH 11/11] Fixed bugs introduced by new BWM maps.

---
 AndorsTrail/res/values/loadresources.xml     | 3 +++
 AndorsTrail/res/xml/blackwater_mountain5.tmx | 4 ++--
 AndorsTrail/res/xml/blackwater_mountain9.tmx | 9 ++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 66244fbe8..660f592ad 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -355,8 +355,11 @@
 		<item>@xml/blackwater_mountain3</item>
 		<item>@xml/blackwater_mountain4</item>
 		<item>@xml/blackwater_mountain5</item>
+		<item>@xml/blackwater_mountain5a</item>
+		<item>@xml/blackwater_mountain5c</item>
 		<item>@xml/blackwater_mountain6</item>
 		<item>@xml/blackwater_mountain7</item>
+		<item>@xml/blackwater_mountain7a</item>
 		<item>@xml/blackwater_mountain8</item>
 		<item>@xml/blackwater_mountain9</item>
 		<item>@xml/blackwater_mountain10</item>
diff --git a/AndorsTrail/res/xml/blackwater_mountain5.tmx b/AndorsTrail/res/xml/blackwater_mountain5.tmx
index 6750a72e3..cf19834f6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -174,11 +174,11 @@
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="quest:queststage" type="replace" x="192" y="352" width="96" height="128">
+  <object name="futurequest:10" type="replace" x="192" y="352" width="96" height="128">
    <properties>
     <property name="Above" value="Above_replace"/>
     <property name="Objects" value="Objects_replace"/>
-    <property name="Walkalbe" value="Walkalbe_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/blackwater_mountain9.tmx b/AndorsTrail/res/xml/blackwater_mountain9.tmx
index b9dc72d34..287b86896 100644
--- a/AndorsTrail/res/xml/blackwater_mountain9.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain9.tmx
@@ -237,15 +237,10 @@
  </objectgroup>
  <objectgroup name="Keys" width="19" height="12"/>
  <objectgroup name="Replace" width="19" height="12">
-  <object name="quest:queststage" type="replace" x="0" y="224" width="192" height="96">
+  <object name="futurequest:10" type="replace" x="0" y="192" width="192" height="128">
    <properties>
-    <property name="Walkalbe" value="Walkalbe_replace"/>
-   </properties>
-  </object>
-  <object name="quest:queststage" type="replace" x="0" y="192" width="192" height="128">
-   <properties>
-    <property name="Above" value="Walkable_replace"/>
     <property name="Objects" value="Objects_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
    </properties>
   </object>
  </objectgroup>