a few sprites

this can be triggered by
 - walking up to an enemy
 - get the popup to attack it
 - cancel it, which finishes the round
 - repeat

with this it is very easy to for example use a heal over time food in a very short time or getting rid of an unwanted actor condition

the fix tries to just not grant a finished round when closing the window asking if the player wants to start attacking

Signed-off-by: OMGeeky <git@omgeeky.de>

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="82"
-	android:versionName="0.8.15"
+	android:versionCode="83"
+	android:versionName="0.8.16"
 	android:installLocation="auto"
 	>
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java

@@ -29,9 +29,6 @@ public final class DebugInterface {
 	private final WorldContext world;
 
 	private DebugButton[] buttons;
-	private List<DebugButton> tpButtons  = new ArrayList<DebugButton>();
-	private List<DebugButton> tpButtons2 = new ArrayList<DebugButton>();
-	private List<DebugButton> tpButtons3 = new ArrayList<DebugButton>();
 
 	public DebugInterface(ControllerContext controllers, WorldContext world, MainActivity mainActivity) {
 		this.controllerContext = controllers;
@@ -53,36 +50,23 @@ public final class DebugInterface {
 						for (int i = 1; i < buttons.length; i++) {
 							buttons[i].b.setVisibility(hidden ? View.GONE : View.VISIBLE);
 						}
-						for (DebugButton b : tpButtons) {
-							b.b.setVisibility(View.GONE);
-						}
-						for (DebugButton b : tpButtons2) {
-							b.b.setVisibility(View.GONE);
-						}
-						for (DebugButton b : tpButtons3) {
-							b.b.setVisibility(View.GONE);
-						}
 					}
 				})
 				,new DebugButton("teleport", new OnClickListener() {
-			public void onClick(View arg0) {
-				for (int i = 0; i < buttons.length; i++) {
-					buttons[i].b.setVisibility(View.GONE);
-				}
-				for (DebugButton tpButton : tpButtons) {
-					tpButton.b.setVisibility(View.VISIBLE);
-				}
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "debugmap", "entry", 0, 0);
+					}
+				})
 				,new DebugButton("dmg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.player.damagePotential.set(500, 500);
-				world.model.player.attackChance = 500;
-				world.model.player.attackCost = 1;
-				showToast(mainActivity, "DEBUG: damagePotential=500, chance=500%, cost=1", Toast.LENGTH_SHORT);
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						world.model.player.damagePotential.set(500, 500);
+						world.model.player.attackChance = 500;
+						world.model.player.attackCost = 1;
+						showToast(mainActivity, "DEBUG: damagePotential=500, chance=500%, cost=1", Toast.LENGTH_SHORT);
+					}
+				})
 				/*,new DebugButton("dmg=1", new OnClickListener() {
                     @Override
                     public void onClick(View arg0) {
@@ -91,378 +75,78 @@ public final class DebugInterface {
                     }
                 })*/
 				,new DebugButton("itm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				for (ItemType item : world.itemTypes.UNITTEST_getAllItemTypes().values()) {
-					world.model.player.inventory.addItem(item, 10);
-				}
-				world.model.player.inventory.gold += 50000;
-				showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						for (ItemType item : world.itemTypes.UNITTEST_getAllItemTypes().values()) {
+							world.model.player.inventory.addItem(item, 10);
+						}
+						world.model.player.inventory.gold += 50000;
+						showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
+					}
+				})
 				,new DebugButton("xp", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.actorStatsController.addExperience(10000);
-				showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.actorStatsController.addExperience(10000);
+						showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
+					}
+				})
 				,new DebugButton("rst", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				for(PredefinedMap map : world.maps.getAllMaps()) {
-					map.resetTemporaryData();
-				}
-				showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						for(PredefinedMap map : world.maps.getAllMaps()) {
+							map.resetTemporaryData();
+						}
+						showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
+					}
+				})
 				,new DebugButton("hp", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.player.baseTraits.maxHP = 500;
-				world.model.player.health.max = world.model.player.baseTraits.maxHP;
-				controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
-				world.model.player.conditions.clear();
-				showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						world.model.player.baseTraits.maxHP = 500;
+						world.model.player.health.max = world.model.player.baseTraits.maxHP;
+						controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
+						world.model.player.conditions.clear();
+						showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
+					}
+				})
 				,new DebugButton("skl", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.player.availableSkillIncreases += 10;
-				showToast(mainActivity, "DEBUG: 10 skill points", Toast.LENGTH_SHORT);
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						world.model.player.availableSkillIncreases += 10;
+						showToast(mainActivity, "DEBUG: 10 skill points", Toast.LENGTH_SHORT);
+					}
+				})
 				,new DebugButton("spd", new OnClickListener() {
-			boolean fast = Constants.MINIMUM_INPUT_INTERVAL == Constants.MINIMUM_INPUT_INTERVAL_FAST;
-			@Override
-			public void onClick(View arg0) {
-				fast = !fast;
-				if (fast) {
-					Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_FAST;
-				} else {
-					Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_STD;
-				}
-				MainView.SCROLL_DURATION = Constants.MINIMUM_INPUT_INTERVAL;
-				AndorsTrailApplication.getApplicationFromActivity(mainActivity).getControllerContext().movementController.resetMovementHandler();
-			}
-		})
+					boolean fast = Constants.MINIMUM_INPUT_INTERVAL == Constants.MINIMUM_INPUT_INTERVAL_FAST;
+					@Override
+					public void onClick(View arg0) {
+						fast = !fast;
+						if (fast) {
+							Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_FAST;
+						} else {
+							Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_STD;
+						}
+						MainView.SCROLL_DURATION = Constants.MINIMUM_INPUT_INTERVAL;
+						AndorsTrailApplication.getApplicationFromActivity(mainActivity).getControllerContext().movementController.resetMovementHandler();
+					}
+				})
 				,new DebugButton("map", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				showToast(mainActivity, "DEBUG: map=" + world.model.currentMaps.map.name , Toast.LENGTH_SHORT);
-			}
-		})
+					@Override
+					public void onClick(View arg0) {
+						showToast(mainActivity, "DEBUG: map=" + world.model.currentMaps.map.name , Toast.LENGTH_SHORT);
+					}
+				})
 				,new DebugButton("tim", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.worldData.tickWorldTime(10);
-			}
-		})
-		}));
-
-		tpButtons.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
 					@Override
 					public void onClick(View arg0) {
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons) {
-							tpButton.b.setVisibility(View.GONE);
-						}
+						world.model.worldData.tickWorldTime(10);
 					}
 				})
-				,new DebugButton("cg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossglen", "hall", 0, 0);
-			}
-		})
-				,new DebugButton("vg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "vilegard_s", "tavern", 0, 0);
-			}
-		})
-				,new DebugButton("cr", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossroads", "middle", 0, 0);
-			}
-		})
-				,new DebugButton("lf", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "loneford9", "south", 0, 0);
-			}
-		})
-				,new DebugButton("fh", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "fallhaven_ne", "clothes", 0, 0);
-			}
-		})
-				,new DebugButton("prm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain29", "south", 0, 0);
-			}
-		})
-				,new DebugButton("bwm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain43", "south", 0, 0);
-			}
-		})
-				,new DebugButton("rmg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "remgard0", "east", 0, 0);
-			}
-		})
-				,new DebugButton("chr", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waytolostmine2", "minerhouse4", 0, 0);
-			}
-		})
-				,new DebugButton("ldr", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lodarhouse0", "lodarhouse", 0, 0);
-			}
-		})
-				,new DebugButton("sf", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wild20", "south2", 0, 0);
-			}
-		})
-				,new DebugButton("gm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_1", "farmhouse", 0, 0);
-			}
-		})
 		}));
-		buttonList.addAll(tpButtons);
-
-		tpButtons2.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("brv", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "brimhaven4", "south2", 0, 0);
-			}
-		})
-				,new DebugButton("aru", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "mountainlake5", "north", 0, 0);
-			}
-		})
-				,new DebugButton("ws", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "woodsettlement0", "east", 0, 0);
-			}
-		})
-				,new DebugButton("sul", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard2", "south", 0, 0);
-			}
-		})
-				,new DebugButton("gal", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_19", "south", 0, 0);
-			}
-		})
-
-				,new DebugButton("apl", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard_apple_farm_east", "house", 0, 0);
-			}
-		})
-
-				,new DebugButton("wch", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_0", "west", 0, 0);
-			}
-		})
-
-				,new DebugButton("la1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothisland2", "south2", 0, 0);
-			}
-		})
-
-				,new DebugButton("la2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island3", "cave", 0, 0);
-			}
-		})
-
-				,new DebugButton("wx", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wexlow_village", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("fey", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_17", "north", 0, 0);
-			}
-		})
-
-
-		}));
-		buttonList.addAll(tpButtons2);
-
-		tpButtons3.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (int i = 0; i < buttons.length; i++) {
-							buttons[i].b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("#1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_9", "north", 5, 0);
-			}
-		})
-
-				,new DebugButton("#2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "undertell_3_lava_01", "west", 0, 0);
-			}
-		})
-
-
-				,new DebugButton("#3", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_cavea", "up", 0, 0);
-			}
-		})
-
-				,new DebugButton("#4", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_35", "south", 11, 0);
-			}
-		})
-
-				,new DebugButton("#5", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "way_to_sullengard_west_5", "east", 0, 5);
-			}
-		})
-
-				,new DebugButton("#6", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_32", "south", 19, 0);
-			}
-		})
-
-				,new DebugButton("#7", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "cabin_norcity_road1", "north", 5, 0);
-			}
-		})
-
-				,new DebugButton("#8", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wayto_feygard_duleian_2", "south", 0, 5);
-			}
-		})
-
-				,new DebugButton("#9", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_58", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("#10", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "moesforest_03", "north1", 0, 0);
-			}
-		})
-
-				,new DebugButton("#11", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_17", "outside", 0, 0);
-			}
-		})
-
-				,new DebugButton("#12", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_48", "west", 0, 10);
-			}
-		})
-
-				,new DebugButton("#13", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "feygard_outside1", "south", 6, 0);
-			}
-		})
-
-
-		}));
-		buttonList.addAll(tpButtons3);
 
 		buttons = buttonList.toArray(new DebugButton[buttonList.size()]);
 		addDebugButtons(buttons);
-
-		for (DebugButton b : tpButtons) {
-			b.b.setVisibility(View.GONE);
-		}
-		for (DebugButton b : tpButtons2) {
-			b.b.setVisibility(View.GONE);
-		}
-		for (DebugButton b : tpButtons3) {
-			b.b.setVisibility(View.GONE);
-		}
 	}
 
 	private void showToast(Context context, String msg, int duration) {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java

@@ -139,7 +139,7 @@ public final class MainActivity
 			if (resultCode == Activity.RESULT_OK) {
 				controllers.combatController.enterCombat(CombatController.BeginTurnAs.player);
 			} else {
-				controllers.combatController.exitCombat(false);
+				controllers.combatController.exitCombat(false, true);
 			}
 			break;
 		case INTENTREQUEST_CONVERSATION:

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/CombatController.java

@@ -57,6 +57,9 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		else continueTurn();
 	}
 	public void exitCombat(boolean pickupLootBags) {
+		exitCombat(pickupLootBags, false);
+	}
+	public void exitCombat(boolean pickupLootBags, boolean canceledCombat) {
 		setCombatSelection(null, null);
 		world.model.uiSelections.isInCombat = false;
 		if (pickupLootBags) {
@@ -66,7 +69,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		controllers.actorStatsController.setActorMaxAP(world.model.player);
 		world.model.uiSelections.selectedPosition = null;
 		world.model.uiSelections.selectedMonster = null;
-		if (world.model.player.isDead()) {
+		if (world.model.player.isDead() || canceledCombat) {
 			controllers.gameRoundController.resetRoundTimers();
 		} else {
 			endOfCombatRound();

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java

@@ -48,9 +48,16 @@ public final class Constants {
 	public static final String FILENAME_WORLDMAP_HTMLFILE_SUFFIX = ".html";
 	public static final String FILENAME_SAVEGAME_FILENAME_PREFIX = "savegame";
 	public static final String PLACEHOLDER_PLAYERNAME = "$playername";
+	public static final String PLACEHOLDER_REG1 = "$reg1";
+	public static final String PLACEHOLDER_REG2 = "$reg2";
+	public static final String PLACEHOLDER_REG3 = "$reg3";
 	public static final String CHEAT_DETECTION_FOLDER = "dEAGyGE3YojqXjI3x4x7";
 	public static final String PASSIVE_ACHIEVEMENT_CHECK_PHRASE = "passive_achievement_check";
 
+	public static final String FACTION_SCORE_CALC_REGISTER1_NAME = "reg1";
+	public static final String FACTION_SCORE_CALC_REGISTER2_NAME = "reg2";
+	public static final String FACTION_SCORE_CALC_REGISTER3_NAME = "reg3";
+
 	public static final String SAVEGAME_FILE_MIME_TYPE = "application/octet-stream";
 	public static final String WORLDMAP_FILE_MIME_TYPE = "image/png";
 	public static final String NO_FILE_EXTENSION_MIME_TYPE = "application/no_file_extension_mime_type";

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java

@@ -1,5 +1,6 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import static com.gpl.rpg.AndorsTrail.controller.CombatController.BeginTurnAs.player;
 import static com.gpl.rpg.AndorsTrail.controller.SkillController.canLevelupSkillWithQuest;
 
 import java.util.ArrayList;
@@ -17,6 +18,7 @@ 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.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
 import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
@@ -31,6 +33,7 @@ import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.model.script.Requirement;
 import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.L;
 
@@ -100,6 +103,30 @@ public final class ConversationController {
 			case alignmentSet:
 				setAlignmentReward(player, effect.effectID, effect.value);
 				break;
+			case alignmentToReg1:
+				toAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER1_NAME);
+				break;
+			case alignmentToReg2:
+				toAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER2_NAME);
+				break;
+			case alignmentToReg3:
+				toAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER3_NAME);
+				break;
+			case alignmentFromReg1:
+				fromAkkuAlignmentReward(player, effect.effectID, Constants.FACTION_SCORE_CALC_REGISTER1_NAME);
+				break;
+			case alignmentAdd:
+				addAlignmentReward(player, effect.effectID);
+				break;
+			case alignmentSub:
+				subAlignmentReward(player, effect.effectID);
+				break;
+			case alignmentDiv:
+				divAlignmentReward(player, effect.effectID, effect.value);
+				break;
+			case alignmentMult:
+				multAlignmentReward(player, effect.effectID, effect.value);
+				break;
 			case giveItem:
 				addItemReward(effect.effectID, effect.value, result);
 				break;
@@ -130,6 +157,9 @@ public final class ConversationController {
 			case mapchange:
 				mapchange(effect.mapName, effect.effectID);
 				break;
+			case changeIcon:
+				changeIcon(res, player, effect.effectID, effect.value );
+				break;
 		}
 	}
 
@@ -185,6 +215,29 @@ public final class ConversationController {
 		controllers.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, mapName, place, 0, 0);
 	}
 
+	private void changeIcon(Resources res, Player player, String hero, int heroNr ) {
+		switch (heroNr) {
+			case 0:
+				player.replaceIcon(TileManager.CHAR_HERO_0);
+				break;
+			case 1:
+				player.replaceIcon(TileManager.CHAR_HERO_1);
+				break;
+			case 2:
+				player.replaceIcon(TileManager.CHAR_HERO_2);
+				break;
+			case 10:
+				player.replaceIcon(TileManager.CHAR_HERO_SHIP);
+				break;
+			case 11:
+				player.replaceIcon(TileManager.CHAR_HERO_SHEEP);
+				break;
+			case 999:
+				player.replaceIcon(player.iconID);
+				break;
+		}
+	}
+
 	private void addAlignmentReward(Player player, String faction, int delta) {
 		player.addAlignment(faction, delta);
 		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
@@ -195,6 +248,47 @@ public final class ConversationController {
 		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
 	}
 
+	private void toAkkuAlignmentReward(Player player, String faction, String reg) {
+		Integer i = player.getAlignment(faction);
+		player.setAlignment(reg, i);
+	}
+
+	private void fromAkkuAlignmentReward(Player player, String faction, String reg) {
+		Integer i = player.getAlignment(reg);
+		player.setAlignment(faction, i);
+		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
+	}
+
+	private void addAlignmentReward(Player player, String faction) {
+		Integer i = player.getAlignment(faction);
+		player.addAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME, i);
+	}
+
+	private void subAlignmentReward(Player player, String faction) {
+		Integer i = -1 * player.getAlignment(faction);
+		player.addAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME, i);
+	}
+
+	/// @param multiplier multiplies the faction alignment before dividing. Use 100 for percentages.
+	private void divAlignmentReward(Player player, String faction, int multiplier ) {
+		Integer i1, i2;
+		if (multiplier == 0) { multiplier = 1; }
+		i1 = player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME) * multiplier;
+		i2 = player.getAlignment(faction);
+		if (i2 != 0)
+		{
+			player.setAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME, i1 / i2 );
+		}
+	}
+
+	/// @param multiplier the factor to multiply by. If 0, uses the faction score from the {@link Constants.FACTION_SCORE_CALC_REGISTER1_NAME} as multiplier.
+	private void multAlignmentReward(Player player, String faction, int multiplier ) {
+		Integer  i;
+		if (multiplier == 0) { multiplier = player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME); }
+		i = player.getAlignment(faction) * multiplier;
+		player.setAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME, i );
+	}
+
 	private void addQuestProgressReward(Player player, String questID, int questProgress, ScriptEffectResult result) {
 		QuestProgress progress = new QuestProgress(questID, questProgress);
 		boolean added = player.addQuestProgress(progress);
@@ -372,7 +466,10 @@ public final class ConversationController {
 	private static String getDisplayMessage(Phrase phrase, Player player) { return replacePlayerName(phrase.message, player); }
 	private static String getDisplayMessage(Reply reply, Player player) { return replacePlayerName(reply.text, player); }
 	private static String replacePlayerName(String s, Player player) {
-		return s.replace(Constants.PLACEHOLDER_PLAYERNAME, player.getName());
+		return s.replace(Constants.PLACEHOLDER_PLAYERNAME, player.getName())
+				.replace(Constants.PLACEHOLDER_REG1, String.valueOf(player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER1_NAME)))
+				.replace(Constants.PLACEHOLDER_REG2, String.valueOf(player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER2_NAME)))
+				.replace(Constants.PLACEHOLDER_REG3, String.valueOf(player.getAlignment(Constants.FACTION_SCORE_CALC_REGISTER3_NAME)));
 	}
 
 	public static final class ConversationStatemachine {
@@ -420,6 +517,7 @@ public final class ConversationController {
 			this.currentPhraseID = phraseID;
 			this.currentPhrase = world.conversationLoader.loadPhrase(phraseID, conversationCollection, res);
 			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
+				L.log("Phrase_trace: " + phraseID);
 				if (currentPhrase == null) currentPhrase = new Phrase("(phrase \"" + phraseID + "\" not implemented yet)", null, null, null);
 			}
 			if (this.currentPhrase.switchToNPC != null) {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MapController.java

@@ -144,6 +144,7 @@ public final class MapController {
 		controllers.actorStatsController.recalculatePlayerStats(player);
 		controllers.actorStatsController.setActorMaxAP(player);
 		controllers.actorStatsController.setActorMaxHealth(player);
+		player.mapIconID = player.baseTraits.iconID;
 		for (PredefinedMap m : world.maps.getAllMaps()) {
 			m.resetTemporaryData();
 		}

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java

@@ -105,38 +105,41 @@ public final class MonsterMovementController implements EvaluateWalkable {
 	}
 
 	private void determineMonsterNextPosition(Monster m, MonsterSpawnArea area, Coord playerPosition) {
-//		if (m.isAgressive()) {
-			boolean searchForPath = false;
-			if (m.getMovementAggressionType() == MonsterType.AggressionType.protectSpawn) {
-				if (area.area.contains(playerPosition)) searchForPath = true;
-			} else if (m.getMovementAggressionType() == MonsterType.AggressionType.wholeMap) {
-				searchForPath = true;
+		MonsterType.AggressionType aggressionType = m.getMovementAggressionType();
+		if ((aggressionType == MonsterType.AggressionType.protectSpawn && area.area.contains(playerPosition)) ||
+				aggressionType == MonsterType.AggressionType.wholeMap
+		) {
+			if (findPathFor(m, playerPosition)) {
+				// we use m.nextPosition from the pathfinding
+				return;
 			}
-			if (searchForPath) {
-				if (findPathFor(m, playerPosition)) return;
+		} else if (aggressionType == MonsterType.AggressionType.flee) {
+			// if flee then run towards the point where the PC is not
+			m.movementDestination = new Coord(playerPosition);
+			m.movementDestination.x = Math.clamp((long)2 * m.position.x - playerPosition.x, 0, world.model.currentMaps.map.size.width - 1);// mx - ( px - mx )
+			m.movementDestination.y = Math.clamp((long)2 * m.position.y - playerPosition.y, 0, world.model.currentMaps.map.size.height - 1);// my - ( py - my )
+		}
+
+		// Monster has waited and should start to move again.
+		if (m.movementDestination == null) {
+			m.movementDestination = new Coord(m.position);
+			if (Constants.rnd.nextBoolean()) {
+				m.movementDestination.x = area.area.topLeft.x + Constants.rnd.nextInt(area.area.size.width);
+			} else {
+				m.movementDestination.y = area.area.topLeft.y + Constants.rnd.nextInt(area.area.size.height);
 			}
-//		}
-			
-			// Monster has waited and should start to move again.
-			if (m.movementDestination == null) {
-				m.movementDestination = new Coord(m.position);
-				if (Constants.rnd.nextBoolean()) {
-					m.movementDestination.x = area.area.topLeft.x + Constants.rnd.nextInt(area.area.size.width);
-				} else {
-					m.movementDestination.y = area.area.topLeft.y + Constants.rnd.nextInt(area.area.size.height);
-				}
-			}
-			
+		}
+
 		// Monster is moving in a straight line.
 		m.nextPosition.topLeft.set(
 				m.position.x + sgn(m.movementDestination.x - m.position.x)
-				,m.position.y + sgn(m.movementDestination.y - m.position.y)
-			);
+				, m.position.y + sgn(m.movementDestination.y - m.position.y)
+		);
 	}
 
 	private static void cancelCurrentMonsterMovement(final Monster m) {
 		m.movementDestination = null;
-		m.nextActionTime = System.currentTimeMillis() + (getMillisecondsPerMove(m) * Constants.rollValue(Constants.monsterWaitTurns));
+		m.nextActionTime = System.currentTimeMillis() + ((long) getMillisecondsPerMove(m) * Constants.rollValue(Constants.monsterWaitTurns));
 	}
 
 	private static int getMillisecondsPerMove(Monster m) {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java

@@ -113,6 +113,7 @@ public final class MonsterType {
 		,helpOthers		// Will move to help if the player attacks some other monster in the same spawn.
 		,protectSpawn	// Will move to attack if the player stands inside the spawn.
 		,wholeMap		// Will move to attack even outside its spawn area
+		,flee           // Will try to flee from the player
 		;
 
 		public static AggressionType fromString(String s, AggressionType default_) {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java

@@ -38,6 +38,7 @@ public final class Player extends Actor {
 	public final Coord nextPosition;
 
 	// TODO: Should be privates
+	public int mapIconID;
 	public int level;
 	public final PlayerBaseTraits baseTraits = new PlayerBaseTraits();
 	public final Range levelExperience; // ranges from 0 to the delta-amount of exp required for next level
@@ -240,6 +241,10 @@ public final class Player extends Actor {
 		this.name = name;
 	}
 
+	public void replaceIcon(int iconId) {
+		this.mapIconID = iconId;
+	}
+
 	public int getReequipCost() { return reequipCost; }
 	public int getUseItemCost() { return useItemCost; }
 	public int getAvailableSkillIncreases() { return availableSkillIncreases; }
@@ -297,6 +302,11 @@ public final class Player extends Actor {
 		if (fileversion <= 33) LegacySavegameFormatReaderForPlayer.readCombatTraitsPreV034(src, fileversion);
 
 		this.baseTraits.iconID = src.readInt();
+		if (fileversion <= 82) {
+			this.mapIconID = this.baseTraits.iconID;
+		} else {
+			this.mapIconID = src.readInt();
+		}
 		if (fileversion <= 33) /*this.tileSize = */new Size(src, fileversion);
 		this.baseTraits.maxAP = src.readInt();
 		this.baseTraits.maxHP = src.readInt();
@@ -421,6 +431,7 @@ public final class Player extends Actor {
 
 	public void writeToParcel(DataOutputStream dest) throws IOException {
 		dest.writeInt(baseTraits.iconID);
+		dest.writeInt(mapIconID);
 		dest.writeInt(baseTraits.maxAP);
 		dest.writeInt(baseTraits.maxHP);
 		dest.writeUTF(name);
@@ -478,6 +489,7 @@ public final class Player extends Actor {
 	}
 	public void addToChecksum(ChecksumBuilder builder) {
 		//builder.add(baseTraits.iconID);// Do not add to checksum so that it can be changed without invalidating checksums
+		//builder.add(baseTraits.mapIconID);// Do not add to checksum so that it can be changed without invalidating checksums
 		builder.add(baseTraits.maxAP);
 		builder.add(baseTraits.maxHP);
 		//builder.add(name);// Do not add to checksum so that it can be changed without invalidating checksums

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java

@@ -9,6 +9,16 @@ public final class ScriptEffect {
 		, actorConditionImmunity
 		, alignmentChange
 		, alignmentSet
+		, alignmentToReg1
+		, alignmentToReg2
+		, alignmentToReg3
+		, alignmentFromReg1
+		, alignmentFromReg2
+		, alignmentFromReg3
+		, alignmentAdd
+		, alignmentSub
+		, alignmentMult
+		, alignmentDiv
 		, giveItem
 		, createTimer
 		, spawnAll
@@ -19,6 +29,7 @@ public final class ScriptEffect {
 		, removeQuestProgress
 		, changeMapFilter
 		, mapchange
+		, changeIcon
 	}
 
 	public final ScriptEffectType type;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java

@@ -63,6 +63,8 @@ public final class ResourceLoader {
 		/*TileManager.iconID_CHAR_HERO_0 = */loader.prepareTileID(R.drawable.char_hero, 0);
 		/*TileManager.iconID_CHAR_HERO_1 = */loader.prepareTileID(R.drawable.char_hero_maksiu_girl_01, 0);
 		/*TileManager.iconID_CHAR_HERO_2 = */loader.prepareTileID(R.drawable.char_hero_maksiu_boy_01, 0);
+		/*TileManager.iconID_CHAR_HERO_SHIP = */loader.prepareTileID(R.drawable.char_hero_boat, 0); //todo: Ship icon
+		/*TileManager.iconID_CHAR_HERO_SHEEP = */loader.prepareTileID(R.drawable.char_hero_sheep, 0);
 		/*TileManager.iconID_selection_red = */loader.prepareTileID(R.drawable.ui_selections, 0);
 		/*TileManager.iconID_selection_yellow = */loader.prepareTileID(R.drawable.ui_selections, 1);
 		/*TileManager.iconID_groundbag = */loader.prepareTileID(R.drawable.ui_icon_equipment, 0);
@@ -263,6 +265,7 @@ public final class ResourceLoader {
 		final Size sz7x4 = new Size(7, 4);
 		final Size sz8x3 = new Size(8, 3);
 		final Size sz8x4 = new Size(8, 4);
+		final Size sz10x2 = new Size(10, 2);
 		final Size sz16x8 = new Size(16, 8);
 		final Size sz16x10 = new Size(16, 10);
 		final Size sz20x12 = new Size(20, 12);
@@ -273,6 +276,8 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.char_hero, "char_hero", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.char_hero_maksiu_girl_01, "char_hero_maksiu_girl_01", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.char_hero_maksiu_boy_01, "char_hero_maksiu_boy_01", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.char_hero_boat, "char_hero_boat", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.char_hero_sheep, "char_hero_sheep", sz1x1, sz1x1, mTileSize);
 
 		loader.prepareTileset(R.drawable.ui_selections, "ui_selections", new Size(5, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.ui_quickslots, "ui_quickslots", sz2x1, sz1x1, mTileSize);
@@ -350,6 +355,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_newb_2, "monsters_newb_2", new Size(8, 2), sz1x2, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_newb_3, "monsters_newb_3", new Size(10, 10), sz2x2, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_newb_4, "monsters_newb_4", new Size(4, 1), sz2x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_nut, "monsters_nut", sz16x8, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_rats, "monsters_rats", new Size(5, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_redshrike1, "monsters_redshrike1", sz7x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), sz1x1, mTileSize);
@@ -387,6 +393,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_phoenix01, "monsters_phoenix01", sz16x8, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_cats, "monsters_cats", new Size(10, 2), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_1x2, "monsters_1x2", new Size(10, 5), sz1x2, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_antison, "monsters_antison", sz10x2, sz1x1, mTileSize);
 		/*INSERT_NPCS_TILESETS_HERE*/
 		
 		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", sz16x10, sz1x1, mTileSize);
@@ -406,6 +413,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_chair_table_2, "map_chair_table_2", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_crate_1, "map_crate_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_cupboard_1, "map_cupboard_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cupboard_2, "map_cupboard_2", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_curtain_1, "map_curtain_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_entrance_1, "map_entrance_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_entrance_2, "map_entrance_2", mapTileSize, sz1x1, mTileSize);
@@ -423,6 +431,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_ground_7, "map_ground_7", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_ground_8, "map_ground_8", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_ground_9, "map_ground_9", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_ground_10, "map_ground_10", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_guynmart, "map_guynmart", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_house_1, "map_house_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_house_2, "map_house_2", mapTileSize, sz1x1, mTileSize);
@@ -454,6 +463,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_sign_ladder_omi2, "map_sign_ladder_omi2", new Size(8, 4), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_table_1, "map_table_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_table_2, "map_table_2", new Size(14, 8), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_table_3, "map_table_3", new Size(12, 10), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_temple_1, "map_temple_1", new Size(23, 16), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_trail_1, "map_trail_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_1, "map_transition_1", mapTileSize, sz1x1, mTileSize);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java

@@ -26,7 +26,7 @@ public final class ConversationListParser extends JsonCollectionParserFor<Phrase
 			String requireID = o.getString(JsonFieldNames.ReplyRequires.requireID);
 			return new Requirement(
 					type
-					,type == Requirement.RequirementType.random ? null : requireID
+					,(type == Requirement.RequirementType.random || type == Requirement.RequirementType.consumedBonemeals) ? null : requireID
 					,o.optInt(JsonFieldNames.ReplyRequires.value, 0)
 					,o.optBoolean(JsonFieldNames.ReplyRequires.negate, false)
 					,type == Requirement.RequirementType.random ? ResourceParserUtils.parseChance(requireID) : null

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java

@@ -44,12 +44,14 @@ public final class TileManager {
 	public static final int CHAR_HERO_0 = BEGIN_ID;
 	public static final int CHAR_HERO_1 = CHAR_HERO_0+1;
 	public static final int CHAR_HERO_2 = CHAR_HERO_1+1;
+	public static final int CHAR_HERO_SHIP = CHAR_HERO_2+1;
+	public static final int CHAR_HERO_SHEEP = CHAR_HERO_2+2;
 	//Default hero
 	public static final int CHAR_HERO = CHAR_HERO_0;
 	//Max hero icon ID in this version.
 	public static final int LAST_HERO = CHAR_HERO_2;
 	
-	public static final int iconID_selection_red = CHAR_HERO_2+1;
+	public static final int iconID_selection_red = CHAR_HERO_SHEEP+1;
 	public static final int iconID_selection_yellow = iconID_selection_red+1;
 	public static final int iconID_attackselect = iconID_selection_red;
 	public static final int iconID_moveselect = iconID_selection_yellow;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/MainView.java

@@ -420,13 +420,13 @@ public final class MainView extends SurfaceView
 		}
 
 		if (!model.player.hasVFXRunning) {
-			drawFromMapPosition(canvas, area, playerPosition, model.player.iconID);
+			drawFromMapPosition(canvas, area, playerPosition, model.player.mapIconID);
 		} 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);
+			tiles.drawTile(canvas, model.player.mapIconID, x, y, mPaint);
 		}
 		for (MonsterSpawnArea a : currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {

AndorsTrail/res/raw/actorconditions_debug.json

@@ -1,47 +1,2 @@
 [
-    {
-        "id": "chaotic_grip",
-        "iconID": "actorconditions_1:96",
-        "name": "Chaotic grip",
-        "category": "mental",
-        "abilityEffect": {
-            "increaseBlockChance": -10,
-            "increaseDamageResistance": -1
-        }
-    },
-    {
-        "id": "chaotic_test",
-        "iconID": "actorconditions_1:95",
-        "name": "Chaotic test",
-        "category": "mental",
-        "abilityEffect": {
-            "increaseBlockChance": -10,
-            "increaseDamageResistance": -1
-        }
-    },
-    {
-        "id": "chaotic_test2",
-        "iconID": "actorconditions_1:94",
-        "name": "Chaotic test2",
-        "category": "mental",
-        "abilityEffect": {
-            "increaseBlockChance": -10,
-            "increaseDamageResistance": -1
-        }
-    },
-    {
-        "id": "chaotic_curse",
-        "iconID": "actorconditions_1:89",
-        "name": "Chaotic curse",
-        "category": "mental",
-        "abilityEffect": {
-            "increaseMaxAP": -1,
-            "increaseAttackDamage": {
-                "min": -1,
-                "max": -1
-            },
-            "increaseBlockChance": -10,
-            "increaseDamageResistance": -1
-        }
-    }
 ]

AndorsTrail/res/raw/conversationlist_factions.json

@@ -2262,9 +2262,11 @@
         ]
     },
     {
-        "id":"faction_scores"
-    },
-    {
-        "id":"faction_scores"
+        "id":"faction_scores",
+        "replies":[
+            {
+                "nextPhraseID":"fsc_calc"
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_fsc_calc.json

@@ -0,0 +1,128 @@
+[{ "id":"fsc_calc", "replies":[{ "nextPhraseID":"fsc_andor_914" }], "rewards":[{ "rewardType":"alignmentSet", "rewardID":"fsc_shd", "value":0 },{ "rewardType":"alignmentSet", "rewardID":"fsc_shd9", "value":0 },{ "rewardType":"alignmentSet", "rewardID":"fsc_fey", "value":0 },{ "rewardType":"alignmentSet", "rewardID":"fsc_fey9", "value":0 },{ "rewardType":"alignmentSet", "rewardID":"fsc_thv", "value":0 },{ "rewardType":"alignmentSet", "rewardID":"fsc_thv9", "value":0 }] },
+
+  { "id":"fsc_andor_914", "replies":[{ "nextPhraseID":"fsc_andor_914_r", "requires":[{ "requireType":"questProgress", "requireID":"andor", "value":914 }] }, { "nextPhraseID":"fsc_vacor_60" }]},   { "id":"fsc_andor_914_r", "replies":[{ "nextPhraseID":"fsc_vacor_60" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":1 }] },
+  { "id":"fsc_vacor_60", "replies":[{ "nextPhraseID":"fsc_vacor_60_r", "requires":[{ "requireType":"questProgress", "requireID":"vacor", "value":60 }] }, { "nextPhraseID":"fsc_vacor_61" }]},   { "id":"fsc_vacor_60_r", "replies":[{ "nextPhraseID":"fsc_vacor_61" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 }] },
+  { "id":"fsc_vacor_61", "replies":[{ "nextPhraseID":"fsc_vacor_61_r", "requires":[{ "requireType":"questProgress", "requireID":"vacor", "value":61 }] }, { "nextPhraseID":"fsc_bonemeal_100" }]},   { "id":"fsc_vacor_61_r", "replies":[{ "nextPhraseID":"fsc_bonemeal_100" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 }] },
+  { "id":"fsc_bonemeal_100", "replies":[{ "nextPhraseID":"fsc_bonemeal_100_r", "requires":[{ "requireType":"questProgress", "requireID":"bonemeal", "value":100 }] }, { "nextPhraseID":"fsc_bonemeal_110" }]},   { "id":"fsc_bonemeal_100_r", "replies":[{ "nextPhraseID":"fsc_bonemeal_110" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_bonemeal_110", "replies":[{ "nextPhraseID":"fsc_bonemeal_110_r", "requires":[{ "requireType":"questProgress", "requireID":"bonemeal", "value":110 }] }, { "nextPhraseID":"fsc_guynmart_210" }]},   { "id":"fsc_bonemeal_110_r", "replies":[{ "nextPhraseID":"fsc_guynmart_210" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_guynmart_210", "replies":[{ "nextPhraseID":"fsc_guynmart_210_r", "requires":[{ "requireType":"questProgress", "requireID":"guynmart", "value":210 }] }, { "nextPhraseID":"fsc_guynmart_211" }]},   { "id":"fsc_guynmart_210_r", "replies":[{ "nextPhraseID":"fsc_guynmart_211" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":3 }] },
+  { "id":"fsc_guynmart_211", "replies":[{ "nextPhraseID":"fsc_guynmart_211_r", "requires":[{ "requireType":"questProgress", "requireID":"guynmart", "value":211 }] }, { "nextPhraseID":"fsc_kaverin_21" }]},   { "id":"fsc_guynmart_211_r", "replies":[{ "nextPhraseID":"fsc_kaverin_21" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":3 }] },
+  { "id":"fsc_kaverin_21", "replies":[{ "nextPhraseID":"fsc_kaverin_21_r", "requires":[{ "requireType":"questProgress", "requireID":"kaverin", "value":21 }] }, { "nextPhraseID":"fsc_kaverin_100" }]},   { "id":"fsc_kaverin_21_r", "replies":[{ "nextPhraseID":"fsc_kaverin_100" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 }] },
+  { "id":"fsc_kaverin_100", "replies":[{ "nextPhraseID":"fsc_kaverin_100_r", "requires":[{ "requireType":"questProgress", "requireID":"kaverin", "value":100 }] }, { "nextPhraseID":"fsc_feygard_shipment_80" }]},   { "id":"fsc_kaverin_100_r", "replies":[{ "nextPhraseID":"fsc_feygard_shipment_80" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 }] },
+  { "id":"fsc_feygard_shipment_80", "replies":[{ "nextPhraseID":"fsc_feygard_shipment_80_r", "requires":[{ "requireType":"questProgress", "requireID":"feygard_shipment", "value":80 }] }, { "nextPhraseID":"fsc_feygard_shipment_82" }]},   { "id":"fsc_feygard_shipment_80_r", "replies":[{ "nextPhraseID":"fsc_feygard_shipment_82" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_feygard_shipment_82", "replies":[{ "nextPhraseID":"fsc_feygard_shipment_82_r", "requires":[{ "requireType":"questProgress", "requireID":"feygard_shipment", "value":82 }] }, { "nextPhraseID":"fsc_thieves_hidden_80" }]},   { "id":"fsc_feygard_shipment_82_r", "replies":[{ "nextPhraseID":"fsc_thieves_hidden_80" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_thieves_hidden_80", "replies":[{ "nextPhraseID":"fsc_thieves_hidden_80_r", "requires":[{ "requireType":"questProgress", "requireID":"thieves_hidden", "value":80 }] }, { "nextPhraseID":"fsc_stoutford_castle_50" }]},   { "id":"fsc_thieves_hidden_80_r", "replies":[{ "nextPhraseID":"fsc_stoutford_castle_50" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":1 }] },
+  { "id":"fsc_stoutford_castle_50", "replies":[{ "nextPhraseID":"fsc_stoutford_castle_60" }]},
+  { "id":"fsc_stoutford_castle_60", "replies":[{ "nextPhraseID":"fsc_stoutford_castle_70" }]},
+  { "id":"fsc_stoutford_castle_70", "replies":[{ "nextPhraseID":"fsc_Thieves03_32" }]},
+  { "id":"fsc_Thieves03_32", "replies":[{ "nextPhraseID":"fsc_Thieves03_32_r", "requires":[{ "requireType":"questProgress", "requireID":"Thieves03", "value":32 }] }, { "nextPhraseID":"fsc_darkprotector_70" }]},   { "id":"fsc_Thieves03_32_r", "replies":[{ "nextPhraseID":"fsc_darkprotector_70" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":4 }] },
+  { "id":"fsc_darkprotector_70", "replies":[{ "nextPhraseID":"fsc_darkprotector_40" }]},
+  { "id":"fsc_darkprotector_40", "replies":[{ "nextPhraseID":"fsc_darkprotector_40_r", "requires":[{ "requireType":"questProgress", "requireID":"darkprotector", "value":40 }] }, { "nextPhraseID":"fsc_darkprotector_41" }]},   { "id":"fsc_darkprotector_40_r", "replies":[{ "nextPhraseID":"fsc_darkprotector_41" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_darkprotector_41", "replies":[{ "nextPhraseID":"fsc_darkprotector_41_r", "requires":[{ "requireType":"questProgress", "requireID":"darkprotector", "value":41 }] }, { "nextPhraseID":"fsc_xulviir_20" }]},   { "id":"fsc_darkprotector_41_r", "replies":[{ "nextPhraseID":"fsc_xulviir_20" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_xulviir_20", "replies":[{ "nextPhraseID":"fsc_xulviir_30" }]},
+  { "id":"fsc_xulviir_30", "replies":[{ "nextPhraseID":"fsc_rogorn_50" }]},
+  { "id":"fsc_rogorn_50", "replies":[{ "nextPhraseID":"fsc_rogorn_50_r", "requires":[{ "requireType":"questProgress", "requireID":"rogorn", "value":50 }] }, { "nextPhraseID":"fsc_rogorn_55" }]},   { "id":"fsc_rogorn_50_r", "replies":[{ "nextPhraseID":"fsc_rogorn_55" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":3 }] },
+  { "id":"fsc_rogorn_55", "replies":[{ "nextPhraseID":"fsc_rogorn_55_r", "requires":[{ "requireType":"questProgress", "requireID":"rogorn", "value":55 }] }, { "nextPhraseID":"fsc_loneford_55" }]},   { "id":"fsc_rogorn_55_r", "replies":[{ "nextPhraseID":"fsc_loneford_55" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":3 }] },
+  { "id":"fsc_loneford_55", "replies":[{ "nextPhraseID":"fsc_loneford_55_r", "requires":[{ "requireType":"questProgress", "requireID":"loneford", "value":55 }] }, { "nextPhraseID":"fsc_loneford_60" }]},   { "id":"fsc_loneford_55_r", "replies":[{ "nextPhraseID":"fsc_loneford_60" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_loneford_60", "replies":[{ "nextPhraseID":"fsc_loneford_60_r", "requires":[{ "requireType":"questProgress", "requireID":"loneford", "value":60 }] }, { "nextPhraseID":"fsc_wanted_men_65" }]},   { "id":"fsc_loneford_60_r", "replies":[{ "nextPhraseID":"fsc_wanted_men_65" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 }] },
+  { "id":"fsc_wanted_men_65", "replies":[{ "nextPhraseID":"fsc_wanted_men_65_r", "requires":[{ "requireType":"questProgress", "requireID":"wanted_men", "value":65 }] }, { "nextPhraseID":"fsc_wanted_men_80" }]},   { "id":"fsc_wanted_men_65_r", "replies":[{ "nextPhraseID":"fsc_wanted_men_80" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":8 }] },
+  { "id":"fsc_wanted_men_80", "replies":[{ "nextPhraseID":"fsc_wanted_men_80_r", "requires":[{ "requireType":"questProgress", "requireID":"wanted_men", "value":80 }] }, { "nextPhraseID":"fsc_Thieves02_75" }]},   { "id":"fsc_wanted_men_80_r", "replies":[{ "nextPhraseID":"fsc_Thieves02_75" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":3 }] },
+  { "id":"fsc_Thieves02_75", "replies":[{ "nextPhraseID":"fsc_Thieves02_75_r", "requires":[{ "requireType":"questProgress", "requireID":"Thieves02", "value":75 }] }, { "nextPhraseID":"fsc_Thieves02_76" }]},   { "id":"fsc_Thieves02_75_r", "replies":[{ "nextPhraseID":"fsc_Thieves02_76" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":5 }] },
+  { "id":"fsc_Thieves02_76", "replies":[{ "nextPhraseID":"fsc_Thieves02_76_r", "requires":[{ "requireType":"questProgress", "requireID":"Thieves02", "value":76 }] }, { "nextPhraseID":"fsc_Thieves01_51" }]},   { "id":"fsc_Thieves02_76_r", "replies":[{ "nextPhraseID":"fsc_Thieves01_51" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":5 }] },
+  { "id":"fsc_Thieves01_51", "replies":[{ "nextPhraseID":"fsc_Thieves01_51_r", "requires":[{ "requireType":"questProgress", "requireID":"Thieves01", "value":51 }] }, { "nextPhraseID":"fsc_Thieves01_55" }]},   { "id":"fsc_Thieves01_51_r", "replies":[{ "nextPhraseID":"fsc_Thieves01_55" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":1 }] },
+  { "id":"fsc_Thieves01_55", "replies":[{ "nextPhraseID":"fsc_Thieves01_55_r", "requires":[{ "requireType":"questProgress", "requireID":"Thieves01", "value":55 }] }, { "nextPhraseID":"fsc_farrik_70" }]},   { "id":"fsc_Thieves01_55_r", "replies":[{ "nextPhraseID":"fsc_farrik_70" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":1 }] },
+  { "id":"fsc_farrik_70", "replies":[{ "nextPhraseID":"fsc_farrik_70_r", "requires":[{ "requireType":"questProgress", "requireID":"farrik", "value":70 }] }, { "nextPhraseID":"fsc_farrik_90" }]},   { "id":"fsc_farrik_70_r", "replies":[{ "nextPhraseID":"fsc_farrik_90" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":4 }] },
+  { "id":"fsc_farrik_90", "replies":[{ "nextPhraseID":"fsc_farrik_90_r", "requires":[{ "requireType":"questProgress", "requireID":"farrik", "value":90 }] }, { "nextPhraseID":"fsc_jolnor_20" }]},   { "id":"fsc_farrik_90_r", "replies":[{ "nextPhraseID":"fsc_jolnor_20" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":4 }] },
+  { "id":"fsc_jolnor_20", "replies":[{ "nextPhraseID":"fsc_jolnor_20_r", "requires":[{ "requireType":"questProgress", "requireID":"jolnor", "value":20 }] }, { "nextPhraseID":"fsc_jolnor_21" }]},   { "id":"fsc_jolnor_20_r", "replies":[{ "nextPhraseID":"fsc_jolnor_21" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":1 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":1 }] },
+  { "id":"fsc_jolnor_21", "replies":[{ "nextPhraseID":"fsc_jolnor_21_r", "requires":[{ "requireType":"questProgress", "requireID":"jolnor", "value":21 }] }, { "nextPhraseID":"fsc_beer_bootlegging_90" }]},   { "id":"fsc_jolnor_21_r", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_90" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":1 }] },
+  { "id":"fsc_beer_bootlegging_90", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_90_r", "requires":[{ "requireType":"questProgress", "requireID":"beer_bootlegging", "value":90 }] }, { "nextPhraseID":"fsc_beer_bootlegging_100" }]},   { "id":"fsc_beer_bootlegging_90_r", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_100" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":4 }] },
+  { "id":"fsc_beer_bootlegging_100", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_100_r", "requires":[{ "requireType":"questProgress", "requireID":"beer_bootlegging", "value":100 }] }, { "nextPhraseID":"fsc_beer_bootlegging_110" }]},   { "id":"fsc_beer_bootlegging_100_r", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_110" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":5 }] },
+  { "id":"fsc_beer_bootlegging_110", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_110_r", "requires":[{ "requireType":"questProgress", "requireID":"beer_bootlegging", "value":110 }] }, { "nextPhraseID":"fsc_beer_bootlegging_120" }]},   { "id":"fsc_beer_bootlegging_110_r", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_120" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":4 }] },
+  { "id":"fsc_beer_bootlegging_120", "replies":[{ "nextPhraseID":"fsc_beer_bootlegging_120_r", "requires":[{ "requireType":"questProgress", "requireID":"beer_bootlegging", "value":120 }] }, { "nextPhraseID":"fsc_darkness_in_daylight_280" }]},   { "id":"fsc_beer_bootlegging_120_r", "replies":[{ "nextPhraseID":"fsc_darkness_in_daylight_280" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_thv", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":4 },{ "rewardType":"alignmentChange", "rewardID":"fsc_thv9", "value":5 }] },
+  { "id":"fsc_darkness_in_daylight_280", "replies":[{ "nextPhraseID":"fsc_darkness_in_daylight_280_r", "requires":[{ "requireType":"questProgress", "requireID":"darkness_in_daylight", "value":280 }] }, { "nextPhraseID":"fsc_shadows_260" }]},   { "id":"fsc_darkness_in_daylight_280_r", "replies":[{ "nextPhraseID":"fsc_shadows_260" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":2 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":2 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":2 }] },
+  { "id":"fsc_shadows_260", "replies":[{ "nextPhraseID":"fsc_shadows_260_r", "requires":[{ "requireType":"questProgress", "requireID":"shadows", "value":260 }] }, { "nextPhraseID":"fsc_end_of_list" }]},   { "id":"fsc_shadows_260_r", "replies":[{ "nextPhraseID":"fsc_end_of_list" }], "rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":2 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":2 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":2 }] },
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { "id":"fsc_end_of_list","replies":[{ "nextPhraseID":"fsc_calc_bmp_1000", "requires":[{ "requireType":"consumedBonemeals", "requireID":"x", "value":1000 }]  }, { "nextPhraseID":"fsc_calc_bmp_100", "requires":[{ "requireType":"consumedBonemeals", "requireID":"x", "value":100 }]  }, { "nextPhraseID":"fsc_calc_bmp_10", "requires":[{ "requireType":"consumedBonemeals", "requireID":"x", "value":10 }]  }, { "nextPhraseID":"fsc_calc_bmp_1", "requires":[{ "requireType":"consumedBonemeals", "requireID":"x", "value":1 }]  }, { "nextPhraseID":"fsc_calc_bmp_0" }] },
+  { "id":"fsc_calc_bmp_1000","replies":[{ "nextPhraseID":"fsc_calc_bmp_x" }],"rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":9 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":9 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":0 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":9 }] },
+  { "id":"fsc_calc_bmp_100","replies":[{ "nextPhraseID":"fsc_calc_bmp_x" }],"rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":7 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":7 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":0 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":7 }] },
+  { "id":"fsc_calc_bmp_10","replies":[{ "nextPhraseID":"fsc_calc_bmp_x" }],"rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":0 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":5 }] },
+  { "id":"fsc_calc_bmp_1","replies":[{ "nextPhraseID":"fsc_calc_bmp_x" }],"rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":3 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":0 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":3 }] },
+  { "id":"fsc_calc_bmp_0","replies":[{ "nextPhraseID":"fsc_calc_bmp_x" }],"rewards":[{ "rewardType":"alignmentChange", "rewardID":"fsc_shd", "value":0 },{ "rewardType":"alignmentChange", "rewardID":"fsc_shd9", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey", "value":5 },{ "rewardType":"alignmentChange", "rewardID":"fsc_fey9", "value":5 }] },
+  { "id":"fsc_calc_bmp_x","replies":[{ "nextPhraseID":"fsc_calc_shd_x", "requires":[{ "requireType":"questProgress", "requireID":"scores", "value":10 }]  }, { "nextPhraseID":"fsc_calc_shd" }],"rewards":[{ "rewardType":"alignmentToReg1", "rewardID":"fsc_shd" }, { "rewardType":"alignmentDiv", "rewardID":"fsc_shd9", "value":100 }, { "rewardType":"alignmentFromReg1", "rewardID":"fsc_shd2" }] },
+
+  { "id":"fsc_calc_shd",   "replies":[{ "nextPhraseID":"fsc_calc_shd_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd9", "value":11, "negate":true }] },{ "nextPhraseID":"fsc_calc_shd_8", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":90 }] },{ "nextPhraseID":"fsc_calc_shd_7", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":60 }] },{ "nextPhraseID":"fsc_calc_shd_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":40 }] },{ "nextPhraseID":"fsc_calc_shd_3", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":10 }] },{ "nextPhraseID":"fsc_calc_shd_2" }] },
+  { "id":"fsc_calc_shd_2", "replies":[{ "nextPhraseID":"fsc_calc_shd_x" }], "rewards":[{ "rewardType":"questProgress", "rewardID":"scores", "value":12 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":13 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":15 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":17 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":18 }] },
+  { "id":"fsc_calc_shd_3", "replies":[{ "nextPhraseID":"fsc_calc_shd_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":12 }, { "rewardType":"questProgress", "rewardID":"scores", "value":13 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":15 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":17 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":18 }] },
+  { "id":"fsc_calc_shd_5", "replies":[{ "nextPhraseID":"fsc_calc_shd_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":12 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":13 }, { "rewardType":"questProgress", "rewardID":"scores", "value":15 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":17 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":18 }] },
+  { "id":"fsc_calc_shd_7", "replies":[{ "nextPhraseID":"fsc_calc_shd_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":12 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":13 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":15 }, { "rewardType":"questProgress", "rewardID":"scores", "value":17 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":18 }] },
+  { "id":"fsc_calc_shd_8", "replies":[{ "nextPhraseID":"fsc_calc_shd_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":12 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":13 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":15 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":17 }, { "rewardType":"questProgress", "rewardID":"scores", "value":18 }] },
+  { "id":"fsc_calc_shd_x", "replies":[{ "nextPhraseID":"fsc_calc_fey_x", "requires":[{ "requireType":"questProgress", "requireID":"scores", "value":20 }]  }, { "nextPhraseID":"fsc_calc_fey" }],"rewards":[{ "rewardType":"alignmentToReg1", "rewardID":"fsc_fey" }, { "rewardType":"alignmentDiv", "rewardID":"fsc_fey9", "value":100 }, { "rewardType":"alignmentFromReg1", "rewardID":"fsc_fey2" }] },
+
+  { "id":"fsc_calc_fey",   "replies":[{ "nextPhraseID":"fsc_calc_fey_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey9", "value":11, "negate":true }] },{ "nextPhraseID":"fsc_calc_fey_8", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":90 }] },{ "nextPhraseID":"fsc_calc_fey_7", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":60 }] },{ "nextPhraseID":"fsc_calc_fey_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":40 }] },{ "nextPhraseID":"fsc_calc_fey_3", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":10 }] },{ "nextPhraseID":"fsc_calc_fey_2" }] },
+  { "id":"fsc_calc_fey_2", "replies":[{ "nextPhraseID":"fsc_calc_fey_x" }], "rewards":[{ "rewardType":"questProgress", "rewardID":"scores", "value":22 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":23 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":25 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":27 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":28 }] },
+  { "id":"fsc_calc_fey_3", "replies":[{ "nextPhraseID":"fsc_calc_fey_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":22 }, { "rewardType":"questProgress", "rewardID":"scores", "value":23 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":25 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":27 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":28 }] },
+  { "id":"fsc_calc_fey_5", "replies":[{ "nextPhraseID":"fsc_calc_fey_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":22 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":23 }, { "rewardType":"questProgress", "rewardID":"scores", "value":25 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":27 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":28 }] },
+  { "id":"fsc_calc_fey_7", "replies":[{ "nextPhraseID":"fsc_calc_fey_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":22 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":23 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":25 }, { "rewardType":"questProgress", "rewardID":"scores", "value":27 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":28 }] },
+  { "id":"fsc_calc_fey_8", "replies":[{ "nextPhraseID":"fsc_calc_fey_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":22 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":23 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":25 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":27 }, { "rewardType":"questProgress", "rewardID":"scores", "value":28 }] },
+  { "id":"fsc_calc_fey_x", "replies":[{ "nextPhraseID":"fsc_calc_thv_x", "requires":[{ "requireType":"questProgress", "requireID":"scores", "value":30 }]  }, { "nextPhraseID":"fsc_calc_thv" }],"rewards":[{ "rewardType":"alignmentToReg1", "rewardID":"fsc_thv" }, { "rewardType":"alignmentDiv", "rewardID":"fsc_thv9", "value":100 }, { "rewardType":"alignmentFromReg1", "rewardID":"fsc_thv2" }] },
+
+  { "id":"fsc_calc_thv",   "replies":[{ "nextPhraseID":"fsc_calc_thv_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_thv9", "value":11, "negate":true }] },{ "nextPhraseID":"fsc_calc_thv_8", "requires":[{ "requireType":"factionScore", "requireID":"fsc_thv2", "value":90 }] },{ "nextPhraseID":"fsc_calc_thv_7", "requires":[{ "requireType":"factionScore", "requireID":"fsc_thv2", "value":60 }] },{ "nextPhraseID":"fsc_calc_thv_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_thv2", "value":40 }] },{ "nextPhraseID":"fsc_calc_thv_3", "requires":[{ "requireType":"factionScore", "requireID":"fsc_thv2", "value":10 }] },{ "nextPhraseID":"fsc_calc_thv_2" }] },
+  { "id":"fsc_calc_thv_2", "replies":[{ "nextPhraseID":"fsc_calc_thv_x" }], "rewards":[{ "rewardType":"questProgress", "rewardID":"scores", "value":32 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":33 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":35 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":37 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":38 }] },
+  { "id":"fsc_calc_thv_3", "replies":[{ "nextPhraseID":"fsc_calc_thv_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":32 }, { "rewardType":"questProgress", "rewardID":"scores", "value":33 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":35 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":37 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":38 }] },
+  { "id":"fsc_calc_thv_5", "replies":[{ "nextPhraseID":"fsc_calc_thv_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":32 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":33 }, { "rewardType":"questProgress", "rewardID":"scores", "value":35 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":37 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":38 }] },
+  { "id":"fsc_calc_thv_7", "replies":[{ "nextPhraseID":"fsc_calc_thv_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":32 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":33 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":35 }, { "rewardType":"questProgress", "rewardID":"scores", "value":37 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":38 }] },
+  { "id":"fsc_calc_thv_8", "replies":[{ "nextPhraseID":"fsc_calc_thv_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":32 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":33 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":35 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":37 }, { "rewardType":"questProgress", "rewardID":"scores", "value":38 }] },
+  { "id":"fsc_calc_thv_x", "replies":[{ "nextPhraseID":"fsc_calc_shd1_x", "requires":[{ "requireType":"questProgress", "requireID":"scores", "value":10 }]  }, { "nextPhraseID":"fsc_calc_shd1" }] },
+
+  { "id":"fsc_calc_shd1",   "replies":[{ "nextPhraseID":"fsc_calc_shd1_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd9", "value":11, "negate":true }] },{ "nextPhraseID":"fsc_calc_shd1_8", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":90 }] },{ "nextPhraseID":"fsc_calc_shd1_7", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":60 }] },{ "nextPhraseID":"fsc_calc_shd1_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":40 }] },{ "nextPhraseID":"fsc_calc_shd1_3", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":10 }] },{ "nextPhraseID":"fsc_calc_shd1_2" }] },
+  { "id":"fsc_calc_shd1_2", "replies":[{ "nextPhraseID":"fsc_calc_shd1_x" }], "rewards":[{ "rewardType":"questProgress", "rewardID":"scores", "value":112 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":113 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":115 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":117 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":118 }] },
+  { "id":"fsc_calc_shd1_3", "replies":[{ "nextPhraseID":"fsc_calc_shd1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":112 }, { "rewardType":"questProgress", "rewardID":"scores", "value":113 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":115 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":117 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":118 }] },
+  { "id":"fsc_calc_shd1_5", "replies":[{ "nextPhraseID":"fsc_calc_shd1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":112 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":113 }, { "rewardType":"questProgress", "rewardID":"scores", "value":115 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":117 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":118 }] },
+  { "id":"fsc_calc_shd1_7", "replies":[{ "nextPhraseID":"fsc_calc_shd1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":112 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":113 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":115 }, { "rewardType":"questProgress", "rewardID":"scores", "value":117 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":118 }] },
+  { "id":"fsc_calc_shd1_8", "replies":[{ "nextPhraseID":"fsc_calc_shd1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":112 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":113 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":115 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":117 }, { "rewardType":"questProgress", "rewardID":"scores", "value":118 }] },
+  { "id":"fsc_calc_shd1_x", "replies":[{ "nextPhraseID":"fsc_calc_fey1_x", "requires":[{ "requireType":"questProgress", "requireID":"scores", "value":20 }]  }, { "nextPhraseID":"fsc_calc_fey1" }] },
+
+  { "id":"fsc_calc_fey1",   "replies":[{ "nextPhraseID":"fsc_calc_fey1_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey9", "value":11, "negate":true }] },{ "nextPhraseID":"fsc_calc_fey1_8", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":90 }] },{ "nextPhraseID":"fsc_calc_fey1_7", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":60 }] },{ "nextPhraseID":"fsc_calc_fey1_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":40 }] },{ "nextPhraseID":"fsc_calc_fey1_3", "requires":[{ "requireType":"factionScore", "requireID":"fsc_fey2", "value":10 }] },{ "nextPhraseID":"fsc_calc_fey1_2" }] },
+  { "id":"fsc_calc_fey1_2", "replies":[{ "nextPhraseID":"fsc_calc_fey1_x" }], "rewards":[{ "rewardType":"questProgress", "rewardID":"scores", "value":122 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":123 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":125 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":127 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":128 }] },
+  { "id":"fsc_calc_fey1_3", "replies":[{ "nextPhraseID":"fsc_calc_fey1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":122 }, { "rewardType":"questProgress", "rewardID":"scores", "value":123 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":125 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":127 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":128 }] },
+  { "id":"fsc_calc_fey1_5", "replies":[{ "nextPhraseID":"fsc_calc_fey1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":122 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":123 }, { "rewardType":"questProgress", "rewardID":"scores", "value":125 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":127 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":128 }] },
+  { "id":"fsc_calc_fey1_7", "replies":[{ "nextPhraseID":"fsc_calc_fey1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":122 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":123 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":125 }, { "rewardType":"questProgress", "rewardID":"scores", "value":127 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":128 }] },
+  { "id":"fsc_calc_fey1_8", "replies":[{ "nextPhraseID":"fsc_calc_fey1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":122 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":123 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":125 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":127 }, { "rewardType":"questProgress", "rewardID":"scores", "value":128 }] },
+  { "id":"fsc_calc_fey1_x", "replies":[{ "nextPhraseID":"fsc_calc_thv1_x", "requires":[{ "requireType":"questProgress", "requireID":"scores", "value":30 }]  }, { "nextPhraseID":"fsc_calc_thv1" }] },
+
+  { "id":"fsc_calc_thv1",   "replies":[{ "nextPhraseID":"fsc_calc_thv1_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_thv9", "value":11, "negate":true }] },{ "nextPhraseID":"fsc_calc_thv1_8", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":90 }] },{ "nextPhraseID":"fsc_calc_thv1_7", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":60 }] },{ "nextPhraseID":"fsc_calc_thv1_5", "requires":[{ "requireType":"factionScore", "requireID":"fsc_shd2", "value":40 }] },{ "nextPhraseID":"fsc_calc_thv1_3", "requires":[{ "requireType":"factionScore", "requireID":"fsc_thv2", "value":10 }] },{ "nextPhraseID":"fsc_calc_thv1_2" }] },
+  { "id":"fsc_calc_thv1_2", "replies":[{ "nextPhraseID":"fsc_calc_thv1_x" }], "rewards":[{ "rewardType":"questProgress", "rewardID":"scores", "value":132 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":133 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":135 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":137 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":138 }] },
+  { "id":"fsc_calc_thv1_3", "replies":[{ "nextPhraseID":"fsc_calc_thv1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":132 }, { "rewardType":"questProgress", "rewardID":"scores", "value":133 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":135 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":137 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":138 }] },
+  { "id":"fsc_calc_thv1_5", "replies":[{ "nextPhraseID":"fsc_calc_thv1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":132 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":133 }, { "rewardType":"questProgress", "rewardID":"scores", "value":135 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":137 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":138 }] },
+  { "id":"fsc_calc_thv1_7", "replies":[{ "nextPhraseID":"fsc_calc_thv1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":132 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":133 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":135 }, { "rewardType":"questProgress", "rewardID":"scores", "value":137 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":138 }] },
+  { "id":"fsc_calc_thv1_8", "replies":[{ "nextPhraseID":"fsc_calc_thv1_x" }], "rewards":[{ "rewardType":"removeQuestProgress", "rewardID":"scores", "value":132 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":133 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":135 }, { "rewardType":"removeQuestProgress", "rewardID":"scores", "value":137 }, { "rewardType":"questProgress", "rewardID":"scores", "value":138 }] },
+  { "id":"fsc_calc_thv1_x" }]

AndorsTrail/res/raw/droplists_debug.json

@@ -1,185 +1,2 @@
 [
-    {
-        "id": "debugshop1",
-        "items": [
-            {
-                "itemID": "club1",
-                "quantity": {
-                    "min": 10,
-                    "max": 10
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "club3",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "hammer0",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "hammer1",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "shirt1",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "shirt2",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "dagger0",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": "100"
-            }
-        ]
-    },
-    {
-        "id": "debuglist1",
-        "items": [
-            {
-                "itemID": "gold",
-                "quantity": {
-                    "min": 3,
-                    "max": 3
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "dagger0",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "shirt1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "club3",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            }
-        ]
-    },
-    {
-        "id": "debuglist2",
-        "items": [{
-                "itemID": "gold",
-                "quantity": {
-                    "min": 3,
-                    "max": 3
-                },
-                "chance": "100"
-            }]
-    },
-    {
-        "id": "startitems",
-        "items": [
-            {
-                "itemID": "gold",
-                "quantity": {
-                    "min": 12,
-                    "max": 12
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "club1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "shirt1",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "dagger0",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "debug_dagger1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "debug_ring1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            },
-            {
-                "itemID": "shadow_slayer",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": "100"
-            }
-        ]
-    },
-     {
-    "id": "debugrequires10gold_droplist",
-    "items": [
-      {
-        "quantity": {
-          "min": 10,
-          "max": 10
-        },
-        "itemID": "gold",
-        "chance": "100"
-      }
-    ]
-  }
 ]

AndorsTrail/res/raw/itemlist_debug.json

@@ -1,199 +1,2 @@
 [
-    {
-        "id": "debug_dagger1",
-        "iconID": "items_weapons:20",
-        "name": "Black heart dagger",
-        "category": "dagger",
-        "displaytype": "extraordinary",
-        "hasManualPrice": 1,
-        "baseMarketCost": 6,
-        "equipEffect": {
-            "increaseAttackCost": 2,
-            "increaseAttackChance": 100,
-            "increaseCriticalSkill": 30,
-            "setCriticalMultiplier": 3,
-            "increaseAttackDamage": {
-                "min": 5,
-                "max": 10
-            }
-        }
-    },
-    {
-        "id": "debug_ring1",
-        "iconID": "items_jewelry:4",
-        "name": "Black heart ring",
-        "category": "ring",
-        "displaytype": "quest",
-        "hasManualPrice": 1,
-        "baseMarketCost": 3,
-        "equipEffect": {
-            "increaseAttackChance": 50,
-            "increaseAttackDamage": {
-                "min": 10,
-                "max": 10
-            }
-        }
-    },
-    {
-    "id":"choatic_potion",
-    "iconID":"items_consumables:62",
-    "name":"Chaotic Potion",
-    "category":"pot",
-    "useEffect":{
-        "conditionsSource":[
-            {
-                "condition":"chaotic_grip",
-                "magnitude":1,
-                "duration":5,
-                "chance":"100"
-            }
-        ]
-    }
-    },
-    {
-    "id":"choatic_cure",
-    "iconID":"items_consumables:65",
-    "name":"Chaotic Cure",
-    "category":"pot",
-    "useEffect":{
-        "conditionsSource":[
-            {
-                "condition":"chaotic_grip",
-                "magnitude":-99,
-                "duration": 0,
-                "chance":"100"
-            }
-        ]
-       }
-    },
-    {
-    "id":"choatic_vaccine",
-    "iconID":"items_consumables:65",
-    "name":"Chaotic Vaccine",
-    "category":"pot",
-    "useEffect":{
-        "conditionsSource":[
-            {
-                "condition":"chaotic_grip",
-                "magnitude":-99,
-                "duration": 5,
-                "chance":"100"
-            }
-        ]
-     }
-    },
-    {
-        "id": "chaotic_redeemer",
-        "iconID": "items_weapons:61",
-        "name": "Chaotic redeemer",
-        "category": "lsword",
-        "displaytype": "extraordinary",
-        "hasManualPrice": 1,
-        "baseMarketCost": 0,
-        "equipEffect": {
-            "increaseMaxAP": 2,
-            "increaseAttackCost": 7,
-            "increaseAttackChance": 25,
-            "increaseCriticalSkill": 10,
-            "setCriticalMultiplier": 2,
-            "increaseAttackDamage": {
-                "min": 5,
-                "max": 9
-            },
-            "addedConditions":[
-            	{
-                	"condition":"chaotic_grip",
-                	"magnitude":-99
-            	}
-        	]
-        },
-        "killEffect": {
-            "increaseCurrentHP": {
-                "min": 1,
-                "max": 1
-            }
-        }
-    },
-    {
-        "id": "chaotic_penalty",
-        "iconID": "items_weapons:61",
-        "name": "Chaotic Penalty",
-        "category": "lsword",
-        "displaytype": "extraordinary",
-        "hasManualPrice": 1,
-        "baseMarketCost": 0,
-        "equipEffect": {
-            "increaseMaxAP": 2,
-            "increaseAttackCost": 7,
-            "increaseAttackChance": 25,
-            "increaseCriticalSkill": 10,
-            "setCriticalMultiplier": 2,
-            "increaseAttackDamage": {
-                "min": 5,
-                "max": 9
-            },
-            "addedConditions":[
-            	{
-                	"condition":"chaotic_grip",
-                	"magnitude": 5
-            	}
-        	]
-        },
-        "killEffect": {
-            "increaseCurrentHP": {
-                "min": 1,
-                "max": 1
-            }
-        },
-        "hitEffect":{
-        	"conditionsTarget":[
-            	{
-                	"condition":"chaotic_test",
-                	"magnitude":5,
-                	"duration":2,
-                	"chance":"100"
-            	}
-        	]
-    	},
-    	"hitReceivedEffect" : {
-        	"increaseCurrentHP": {
-                "min": 1,
-                "max": 1
-            },
-            "increaseCurrentAP": {
-                "min": 1,
-                "max": 1
-            },
-            "increaseAttackerCurrentHP": {
-                "min": 1,
-                "max": 1
-            },
-            "increaseAttackerCurrentAP": {
-                "min": 1,
-                "max": 1
-            },
-            "conditionsSource":[
-            	{
-                "condition":"chaotic_grip",
-                "magnitude": 2,
-                "duration": 5,
-                "chance":"50"
-            	}
-        	],
-            "conditionsTarget":[
-            	{
-                "condition":"chaotic_grip",
-                "magnitude": 2,
-                "duration": 5,
-                "chance":"80"
-            	},
-            	{
-                "condition":"chaotic_test2",
-                "magnitude":3,
-                "duration":4,
-                "chance":"50"
-            	}
-        	]
-        }
-    }
 ]

AndorsTrail/res/raw/monsterlist_burhczyd.json

@@ -1,194 +1,47 @@
 [
-    {
-        "id":"burhczyd1",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd1"
-    },
-    {
-        "id":"burhczyd2",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd2"
-    },
-    {
-        "id":"burhczyd3",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd3"
-    },
-    {
-        "id":"burhczyd4",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd4"
-    },
-    {
-        "id":"burhczyd5",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd5"
-    },
-    {
-        "id":"burhczyd6",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd6"
-    },
-    {
-        "id":"burhczyd7",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd7"
-    },
-    {
-        "id":"burhczyd8",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd8"
-    },
-    {
-        "id":"burhczyd9",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd9"
-    },
-    {
-        "id":"burhczyd10",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd10"
-    },
-    {
-        "id":"burhczyd11",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd11"
-    },
-    {
-        "id":"burhczyd12",
-        "name":"Burhczyd",
-        "iconID":"monsters_ld2:8",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd12"
-    },
-    {
-        "id":"burhczyd1e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd1"
-    },
-    {
-        "id":"burhczyd2e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd2"
-    },
-    {
-        "id":"burhczyd3e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd3"
-    },
-    {
-        "id":"burhczyd4e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd4"
-    },
-    {
-        "id":"burhczyd5e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd5"
-    },
-    {
-        "id":"burhczyd6e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd6"
-    },
-    {
-        "id":"burhczyd7e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd7"
-    },
-    {
-        "id":"burhczyd8e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd8"
-    },
-    {
-        "id":"burhczyd9e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd9"
-    },
-    {
-        "id":"burhczyd10e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd10"
-    },
-    {
-        "id":"burhczyd11e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd11"
-    },
-    {
-        "id":"burhczyd12e",
-        "name":"Knight of Elythom",
-        "iconID":"monsters_men:3",
-        "unique":1,
-        "monsterClass":"humanoid",
-        "phraseID":"burhczyd12"
-    }
+    { "id":"burhczyd1", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd1" },
+    { "id":"burhczyd2", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd2" },
+    { "id":"burhczyd3", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd3" },
+    { "id":"burhczyd4", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd4" },
+    { "id":"burhczyd5", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd5" },
+    { "id":"burhczyd6", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd6" },
+    { "id":"burhczyd7", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd7" },
+    { "id":"burhczyd8", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd8" },
+    { "id":"burhczyd9", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd9" },
+    { "id":"burhczyd10", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd10" },
+    { "id":"burhczyd11", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd11" },
+    { "id":"burhczyd12", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd12" },
+    { "id":"burhczyd13", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd13" },
+    { "id":"burhczyd14", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd14" },
+    { "id":"burhczyd15", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd15" },
+    { "id":"burhczyd16", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd16" },
+    { "id":"burhczyd17", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd17" },
+    { "id":"burhczyd18", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd18" },
+    { "id":"burhczyd19", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd19" },
+    { "id":"burhczyd20", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd20" },
+    { "id":"burhczyd21", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd21" },
+    { "id":"burhczyd22", "name":"Burhczyd", "iconID":"monsters_ld2:8", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd22" },
+	
+    { "id":"burhczyd1e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd1" },
+    { "id":"burhczyd2e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd2" },
+    { "id":"burhczyd3e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd3" },
+    { "id":"burhczyd4e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd4" },
+    { "id":"burhczyd5e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd5" },
+    { "id":"burhczyd6e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd6" },
+    { "id":"burhczyd7e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd7" },
+    { "id":"burhczyd8e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd8" },
+    { "id":"burhczyd9e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd9" },
+    { "id":"burhczyd10e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd10" },
+    { "id":"burhczyd11e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd11" },
+    { "id":"burhczyd12e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd12" },
+    { "id":"burhczyd13e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd13" },
+    { "id":"burhczyd14e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd14" },
+    { "id":"burhczyd15e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd15" },
+    { "id":"burhczyd16e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd16" },
+    { "id":"burhczyd17e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd17" },
+    { "id":"burhczyd18e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd18" },
+    { "id":"burhczyd19e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd19" },
+    { "id":"burhczyd20e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd20" },
+    { "id":"burhczyd21e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd21" },
+    { "id":"burhczyd22e", "name":"Knight of Elythom", "iconID":"monsters_men:3", "unique":1, "monsterClass":"humanoid", "phraseID":"burhczyd22" }
 ]

AndorsTrail/res/raw/monsterlist_crossglen_npcs.json

@@ -5,7 +5,7 @@
         "iconID":"monsters_mage2:0",
         "monsterClass":"humanoid",
         "spawnGroup":"mikhail",
-        "phraseID":"mikhail_start_select",
+        "phraseID":"test_changeIcon",
         "horizontalFlipChance":100
     },
     {

AndorsTrail/res/raw/monsterlist_debug.json

@@ -1,137 +1,2 @@
 [
-    {
-        "id": "traveller1",
-        "iconID": "monsters_man1:0",
-        "name": "Traveller1",
-        "spawnGroup": "debugNPC1",
-        "monsterClass": "humanoid",
-        "unique": 1,
-        "maxHP": 10,
-        "maxAP": 10,
-        "moveCost": 10,
-        "attackCost": 10,
-        "attackChance": 50,
-        "droplistID": "debugshop1",
-        "phraseID": "debugshop",
-        "movementAggressionType":"wholeMap",
-        "attackDamage": {
-            "min": 1,
-            "max": 2
-        }
-    },
-    {
-        "id": "traveller2",
-        "iconID": "monsters_man1:0",
-        "name": "Traveller2",
-        "spawnGroup": "debugNPC2",
-        "monsterClass": "humanoid",
-        "unique": 1,
-        "maxHP": 10,
-        "maxAP": 10,
-        "moveCost": 10,
-        "attackCost": 10,
-        "attackChance": 50,
-        "droplistID": "debugshop1",
-        "phraseID": "debugquest",
-        "attackDamage": {
-            "min": 1,
-            "max": 2
-        }
-    },
-    {
-        "id": "traveller3",
-        "iconID": "monsters_man1:0",
-        "name": "Traveller3",
-        "spawnGroup": "debugNPC3",
-        "monsterClass": "humanoid",
-        "unique": 1,
-        "maxHP": 10,
-        "maxAP": 10,
-        "moveCost": 10,
-        "attackCost": 10,
-        "attackChance": 50,
-        "phraseID": "npc3_0",
-        "attackDamage": {
-            "min": 1,
-            "max": 2
-        }
-    },
-    {
-        "id": "debug_black_ant",
-        "iconID": "monsters_insects:0",
-        "name": "Ant",
-        "spawnGroup": "debug_insect",
-        "monsterClass": "insect",
-        "maxHP": 10,
-        "maxAP": 10,
-        "moveCost": 3,
-        "attackCost": 3,
-        "attackChance": 50,
-        "droplistID": "debuglist1",
-        "movementAggressionType": "helpOthers",
-        "attackDamage": {
-            "min": 1,
-            "max": 2
-        }
-    },
-    {
-        "id": "debug_small_wasp",
-        "iconID": "monsters_insects:1",
-        "name": "Pitiful debug bug with long name",
-        "spawnGroup": "debug_insect",
-        "monsterClass": "insect",
-        "maxHP": 10,
-        "maxAP": 10,
-        "moveCost": 5,
-        "attackCost": 10,
-        "attackChance": 50,
-        "droplistID": "debuglist1",
-        "movementAggressionType":"wholeMap",
-        "attackDamage": {
-            "min": 1,
-            "max": 2
-        }
-    },
-    {
-        "id": "debug_winged_demon",
-        "iconID": "monsters_demon1:0",
-        "name": "Winged demon",
-        "spawnGroup": "debug_demon",
-        "size": "2x2",
-        "monsterClass": "demon",
-        "maxHP": 10,
-        "maxAP": 10,
-        "moveCost": 10,
-        "attackCost": 10,
-        "attackChance": 50,
-        "droplistID": "debuglist1",
-        "attackDamage": {
-            "min": 10,
-            "max": 20
-        }
-    },
-    {
-        "id": "debug_troll",
-        "iconID": "monsters_misc:5",
-        "name": "Troll",
-        "spawnGroup": "debug_troll",
-        "monsterClass": "giant",
-        "maxHP": 10,
-        "maxAP": 10,
-        "moveCost": 10,
-        "attackCost": 2,
-        "attackChance": 50,
-        "droplistID": "debuglist2",
-        "attackDamage": {
-            "min": 1,
-            "max": 2
-        }
-    },
-    {
-        "id":"chaotic_rewarder",
-        "name":"Chaotic rewarder",
-        "iconID":"monsters_men2:5",
-        "spawnGroup":"chaotic_rewarder",
-        "phraseID":"chaotic_rewarder_0"
-    }
 ]

AndorsTrail/res/raw/questlist_burhczyd.json

@@ -37,208 +37,188 @@
             {
                 "progress":70,
                 "logText":"You found Burhczyd collapsed at a table in the tavern, his lute lying in front of him. The landlord forbade him to play his lovely music, because then all the guests forgot to drink.",
-                "rewardExperience":2000
+                "rewardExperience":1500
             },
             {
                 "progress":80,
                 "logText":"Again you met Burhczyd in a tavern. He told you that he had become a master thief.",
-                "rewardExperience":5000
+                "rewardExperience":2000
             },
             {
                 "progress":90,
                 "logText":"When you met Burhczyd again, he gave you some of your things back.",
-                "rewardExperience":10000
+                "rewardExperience":3000
             },
             {
                 "progress":100,
                 "logText":"You've talked with a Knight of Elythom who happened to be an old acquaintance - Burhczyd. He had to hide from the Elythom, because he had 'borrowed' something of value from their leader.",
-                "rewardExperience":20000
+                "rewardExperience":4000
             },
             {
                 "progress":110,
-                "logText":"Burhczyd was no longer dressed like a knight of the Elythom. He said he's going to marry the prettiest girl in the world - she just doesn't know yet...\n\n[Quest is not completable at this time.]",
-                "rewardExperience":30000
+                "logText":"Burhczyd was no longer dressed like a knight of the Elythom. He said he's going to marry the prettiest girl in the world - she just doesn't know yet...",
+                "rewardExperience":5000
             },
             {
                 "progress":120,
-                "logText":"You've met Burhczyd 12",
-                "rewardExperience":40000
+                "logText":"You've met a very depressed Burhczyd. His love was going to marry a baker! Therefore, he bought an oven to outdo his rival.",
+                "rewardExperience":6000
+            },
+            {
+                "progress":130,
+                "logText":"Burhczyd planned to bake larger and more beautiful loaves of bread in the tavern than the baker whom his love is going to marry. Yet he still had to learn how to bake.",
+                "rewardExperience":7000
+            },
+            {
+                "progress":140,
+                "logText":"Burhczyd has begun the life of a monk. Fasting was not at all easy for him.\n\n[Quest is not completable at this time.]",
+                "rewardExperience":8000
+            },
+            {
+                "progress":150,
+                "logText":"-",
+                "rewardExperience":10000
+            },
+            {
+                "progress":160,
+                "logText":"-",
+                "rewardExperience":12000
+            },
+            {
+                "progress":170,
+                "logText":"-",
+                "rewardExperience":15000
+            },
+            {
+                "progress":180,
+                "logText":"-",
+                "rewardExperience":20000
+            },
+            {
+                "progress":190,
+                "logText":"-",
+                "rewardExperience":22000
+            },
+            {
+                "progress":200,
+                "logText":"-",
+                "rewardExperience":25000
+            },
+            {
+                "progress":210,
+                "logText":"-",
+                "rewardExperience":30000
+            },
+            {
+                "progress":220,
+                "logText":"-",
+                "rewardExperience":32000
             }
         ]
     },
     {
         "id":"quest_burhczyd_nd",
         "name":"Young merchant Non-displayed",
-        "showInLog":0,
+        "showInLog":1,
         "stages":[
-            {
-                "progress":60,
-                "logText":"60=listened to merchant completely"
-            },
-            {
-                "progress":61,
-                "logText":"61=talked to merchant Crossglen"
-            },
-            {
-                "progress":62,
-                "logText":"62=talked to merchant Fallhaven"
-            },
-            {
-                "progress":63,
-                "logText":"63=talked to merchant Loneford"
-            },
-            {
-                "progress":64,
-                "logText":"64=talked to merchant Vilegard"
-            },
-            {
-                "progress":65,
-                "logText":"65=talked to merchant Stoutford"
-            },
-            {
-                "progress":66,
-                "logText":"66=talked to merchant BWM"
-            },
-            {
-                "progress":67,
-                "logText":"67=talked to merchant Remgard"
-            },
-            {
-                "progress":68,
-                "logText":"68=talked to merchant WoodSettlement"
-            },
-            {
-                "progress":69,
-                "logText":"69=talked to merchant Prim"
-            },
-            {
-                "progress":610,
-                "logText":"610=talked to merchant Brimhaven"
-            },
-            {
-                "progress":611,
-                "logText":"611=talked to merchant Sullengard"
-            },
-            {
-                "progress":612,
-                "logText":"612=talked to merchant ..."
-            },
-            {
-                "progress":71,
-                "logText":"71=temp merchant Crossglen"
-            },
-            {
-                "progress":72,
-                "logText":"72=temp merchant Fallhaven"
-            },
-            {
-                "progress":73,
-                "logText":"73=temp merchant Loneford"
-            },
-            {
-                "progress":74,
-                "logText":"74=temp merchant Vilegard"
-            },
-            {
-                "progress":75,
-                "logText":"75=temp merchant Stoutford"
-            },
-            {
-                "progress":76,
-                "logText":"76=temp merchant BWM"
-            },
-            {
-                "progress":77,
-                "logText":"77=temp merchant Remgard"
-            },
-            {
-                "progress":78,
-                "logText":"78=temp merchant WoodSettlement"
-            },
-            {
-                "progress":79,
-                "logText":"79=temp merchant Prim?"
-            },
-            {
-                "progress":710,
-                "logText":"710=temp merchant Brimhaven"
-            },
-            {
-                "progress":711,
-                "logText":"711=temp merchant Sullengard"
-            },
-            {
-                "progress":712,
-                "logText":"712=temp merchant ..."
-            },
-            {
-                "progress":81,
-                "logText":"81=100 gold"
-            },
-            {
-                "progress":82,
-                "logText":"82=necklace_undead"
-            },
-            {
-                "progress":83,
-                "logText":"83=ring_mikhail"
-            },
-            {
-                "progress":84,
-                "logText":"84=gem2 ruby gem"
-            },
-            {
-                "progress":85,
-                "logText":"85=dagger_shadow_priests"
-            },
-            {
-                "progress":91,
-                "logText":"91=finished merchant Crossglen"
-            },
-            {
-                "progress":92,
-                "logText":"92=finished merchant Fallhaven"
-            },
-            {
-                "progress":93,
-                "logText":"93=finished merchant Loneford"
-            },
-            {
-                "progress":94,
-                "logText":"94=finished merchant Vilegard"
-            },
-            {
-                "progress":95,
-                "logText":"95=finished merchant Stoutford"
-            },
-            {
-                "progress":96,
-                "logText":"96=finished merchant BWM"
-            },
-            {
-                "progress":97,
-                "logText":"97=finished merchant Remgard"
-            },
-            {
-                "progress":98,
-                "logText":"98=finished merchant WoodSettlement"
-            },
-            {
-                "progress":99,
-                "logText":"99=finished merchant Prim"
-            },
-            {
-                "progress":910,
-                "logText":"910=finished merchant Brimhaven"
-            },
-            {
-                "progress":911,
-                "logText":"911=finished merchant Sullengard"
-            },
-            {
-                "progress":912,
-                "logText":"912=finished merchant ..."
-            }
+            { "progress":51, "logText":"51=show oven in Crossglen" },
+            { "progress":52, "logText":"52=show oven in Fallhaven" },
+            { "progress":53, "logText":"53=show oven in Loneford" },
+            { "progress":54, "logText":"54=show oven in Vilegard" },
+            { "progress":55, "logText":"55=show oven in Stoutford" },
+            { "progress":56, "logText":"56=show oven in BWM" },
+            { "progress":57, "logText":"57=show oven in Remgard" },
+            { "progress":58, "logText":"58=show oven in WoodSettlement" },
+            { "progress":59, "logText":"59=show oven in Prim" },
+            { "progress":510, "logText":"510=show oven in Brimhaven" },
+            { "progress":511, "logText":"511=show oven in Sullengard" },
+            { "progress":512, "logText":"512=show oven in Crossroad" },
+            { "progress":513, "logText":"513=show oven in Foaming Flask" },
+            { "progress":514, "logText":"514=show oven in Brightport bakery" },
+            { "progress":515, "logText":"515=show oven in ..." },
+            { "progress":516, "logText":"516=show oven in ..." },
+            { "progress":517, "logText":"517=show oven in ..." },
+            { "progress":518, "logText":"518=show oven in ..." },
+            { "progress":519, "logText":"519=show oven in ..." },
+            { "progress":520, "logText":"520=show oven in ..." },
+            { "progress":521, "logText":"521=show oven in ..." },
+            { "progress":522, "logText":"522=show oven in ..." },
+			
+            { "progress":60, "logText":"60=listened to merchant completely" },
+            { "progress":61, "logText":"61=talked to merchant Crossglen" },
+            { "progress":62, "logText":"62=talked to merchant Fallhaven" },
+            { "progress":63, "logText":"63=talked to merchant Loneford" },
+            { "progress":64, "logText":"64=talked to merchant Vilegard" },
+            { "progress":65, "logText":"65=talked to merchant Stoutford" },
+            { "progress":66, "logText":"66=talked to merchant BWM" },
+            { "progress":67, "logText":"67=talked to merchant Remgard" },
+            { "progress":68, "logText":"68=talked to merchant WoodSettlement" },
+            { "progress":69, "logText":"69=talked to merchant Prim" },
+            { "progress":610, "logText":"610=talked to merchant Brimhaven" },
+            { "progress":611, "logText":"611=talked to merchant Sullengard" },
+            { "progress":612, "logText":"612=talked to merchant Crossroad" },
+            { "progress":613, "logText":"613=talked to merchant Foaming Flask" },
+            { "progress":614, "logText":"614=talked to merchant Brightport bakery" },
+            { "progress":615, "logText":"615=talked to merchant ..." },
+            { "progress":616, "logText":"616=talked to merchant ..." },
+            { "progress":617, "logText":"617=talked to merchant ..." },
+            { "progress":618, "logText":"618=talked to merchant ..." },
+            { "progress":619, "logText":"619=talked to merchant ..." },
+            { "progress":620, "logText":"620=talked to merchant ..." },
+            { "progress":621, "logText":"621=talked to merchant ..." },
+            { "progress":622, "logText":"622=talked to merchant ..." },
+			
+            { "progress":71, "logText":"71=temp merchant Crossglen" },
+            { "progress":72, "logText":"72=temp merchant Fallhaven" },
+            { "progress":73, "logText":"73=temp merchant Loneford" },
+            { "progress":74, "logText":"74=temp merchant Vilegard" },
+            { "progress":75, "logText":"75=temp merchant Stoutford" },
+            { "progress":76, "logText":"76=temp merchant BWM" }, 
+			{ "progress":77, "logText":"77=temp merchant Remgard" }, 
+			{ "progress":78, "logText":"78=temp merchant WoodSettlement" }, 
+			{ "progress":79, "logText":"79=temp merchant Prim?" },
+            { "progress":710, "logText":"710=temp merchant Brimhaven" },
+            { "progress":711, "logText":"711=temp merchant Sullengard" },
+            { "progress":712, "logText":"712=temp merchant Crossroad" },
+            { "progress":713, "logText":"713=temp merchant Foaming Flask" },
+            { "progress":714, "logText":"714=temp merchant Brightport bakery" },
+            { "progress":715, "logText":"715=temp merchant ..." },
+            { "progress":716, "logText":"716=temp merchant ..." },
+            { "progress":717, "logText":"717=temp merchant ..." },
+            { "progress":718, "logText":"718=temp merchant ..." },
+            { "progress":719, "logText":"719=temp merchant ..." },
+            { "progress":720, "logText":"720=temp merchant ..." },
+            { "progress":721, "logText":"721=temp merchant ..." },
+            { "progress":722, "logText":"722=temp merchant ..." },
+			
+            { "progress":81, "logText":"81=100 gold" },
+            { "progress":82, "logText":"82=necklace_undead" },
+            { "progress":83, "logText":"83=ring_mikhail" },
+            { "progress":84, "logText":"84=gem2 ruby gem" },
+            { "progress":85, "logText":"85=dagger_shadow_priests" },
+			
+            { "progress":91, "logText":"91=finished merchant Crossglen" },
+            { "progress":92, "logText":"92=finished merchant Fallhaven" },
+            { "progress":93, "logText":"93=finished merchant Loneford" },
+            { "progress":94, "logText":"94=finished merchant Vilegard" },
+            { "progress":95, "logText":"95=finished merchant Stoutford" },
+            { "progress":96, "logText":"96=finished merchant BWM" },
+            { "progress":97, "logText":"97=finished merchant Remgard" },
+            { "progress":98, "logText":"98=finished merchant WoodSettlement" },
+            { "progress":99, "logText":"99=finished merchant Prim" },
+            { "progress":910, "logText":"910=finished merchant Brimhaven" },
+            { "progress":911, "logText":"911=finished merchant Sullengard" },
+            { "progress":912, "logText":"912=finished merchant Crossroad" },
+            { "progress":913, "logText":"913=finished merchant Foaming Flask" },
+            { "progress":914, "logText":"914=finished merchant Brightport bakery" },
+            { "progress":915, "logText":"915=finished merchant ..." },
+            { "progress":916, "logText":"916=finished merchant ..." },
+            { "progress":917, "logText":"917=finished merchant ..." },
+            { "progress":918, "logText":"918=finished merchant ..." },
+            { "progress":919, "logText":"919=finished merchant ..." },
+            { "progress":920, "logText":"920=finished merchant ..." },
+            { "progress":921, "logText":"921=finished merchant ..." },
+            { "progress":922, "logText":"922=finished merchant ..." }
         ]
     }
 ]

AndorsTrail/res/raw/questlist_factions.json

@@ -1,552 +1,593 @@
 [
     {
-        "id":"scores",
-        "name":"scores",
-        "showInLog":0,
-        "stages":[
+        "id": "scores",
+        "name": "scores",
+        "showInLog": 1,
+        "stages": [
             {
-                "progress":12,
-                "logText":"Absolute Shadow hater"
+                "progress": 10,
+                "logText": "Shadow score fixed"
             },
             {
-                "progress":13,
-                "logText":"Shadow hater"
+                "progress": 12,
+                "logText": "Absolute Shadow hater"
             },
             {
-                "progress":15,
-                "logText":"Balanced Shadow feelings"
+                "progress": 13,
+                "logText": "Shadow hater"
             },
             {
-                "progress":17,
-                "logText":"Shadow fan"
+                "progress": 15,
+                "logText": "Balanced Shadow feelings"
             },
             {
-                "progress":18,
-                "logText":"Absolute Shadow fan"
+                "progress": 17,
+                "logText": "Shadow fan"
             },
             {
-                "progress":22,
-                "logText":"Absolute Feygard hater"
+                "progress": 18,
+                "logText": "Absolute Shadow fan"
             },
             {
-                "progress":23,
-                "logText":"Feygard hater"
+                "progress": 20,
+                "logText": "Feygard score fixed"
             },
             {
-                "progress":25,
-                "logText":"Balanced Feygard feelings"
+                "progress": 22,
+                "logText": "Absolute Feygard hater"
             },
             {
-                "progress":27,
-                "logText":"Feygard fan"
+                "progress": 23,
+                "logText": "Feygard hater"
             },
             {
-                "progress":28,
-                "logText":"Absolute Feygard fan"
+                "progress": 25,
+                "logText": "Balanced Feygard feelings"
             },
             {
-                "progress":32,
-                "logText":"Absolute Thieves guild hater"
+                "progress": 27,
+                "logText": "Feygard fan"
             },
             {
-                "progress":33,
-                "logText":"Thieves guild hater"
+                "progress": 28,
+                "logText": "Absolute Feygard fan"
             },
             {
-                "progress":35,
-                "logText":"Balanced Thieves guild feelings"
+                "progress": 30,
+                "logText": "Thieves score fixed"
             },
             {
-                "progress":37,
-                "logText":"Thieves guild fan"
+                "progress": 32,
+                "logText": "Absolute Thieves guild hater"
             },
             {
-                "progress":38,
-                "logText":"Absolute Thieves guild fan"
+                "progress": 33,
+                "logText": "Thieves guild hater"
             },
             {
-                "progress":101,
-                "logText":"Clear preference: Shadow over Feygard"
+                "progress": 35,
+                "logText": "Balanced Thieves guild feelings"
             },
             {
-                "progress":102,
-                "logText":"Clear preference: Feygard over Shadow"
+                "progress": 37,
+                "logText": "Thieves guild fan"
             },
             {
-                "progress":999,
-                "logText":"-"
+                "progress": 38,
+                "logText": "Absolute Thieves guild fan"
+            },
+            {
+                "progress": 40,
+                "logText": "Kazaul score fixed"
+            },
+            {
+                "progress": 42,
+                "logText": "Absolute Kazaul hater"
+            },
+            {
+                "progress": 43,
+                "logText": "Kazaul hater"
+            },
+            {
+                "progress": 45,
+                "logText": "Balanced Kazaul feelings"
+            },
+            {
+                "progress": 47,
+                "logText": "Kazaul fan"
+            },
+            {
+                "progress": 48,
+                "logText": "Absolute Kazaul fan"
+            },
+            {
+                "progress": 50,
+                "logText": "XX score fixed"
+            },
+            {
+                "progress": 52,
+                "logText": "Absolute XX hater"
+            },
+            {
+                "progress": 53,
+                "logText": "XX hater"
+            },
+            {
+                "progress": 55,
+                "logText": "Balanced XX feelings"
+            },
+            {
+                "progress": 57,
+                "logText": "XX fan"
+            },
+            {
+                "progress": 58,
+                "logText": "Absolute XX fan"
+            },
+            {
+                "progress": 101,
+                "logText": "Clear preference: Shadow over Feygard"
+            },
+            {
+                "progress": 102,
+                "logText": "Clear preference: Feygard over Shadow"
+            },
+            {
+                "progress": 112,
+                "logText": "Max Absolute Shadow hater"
+            },
+            {
+                "progress": 113,
+                "logText": "Max Shadow hater"
+            },
+            {
+                "progress": 115,
+                "logText": "Max Balanced Shadow feelings"
+            },
+            {
+                "progress": 117,
+                "logText": "Max Shadow fan"
+            },
+            {
+                "progress": 118,
+                "logText": "Max Absolute Shadow fan"
+            },
+            {
+                "progress": 122,
+                "logText": "Max Absolute Feygard hater"
+            },
+            {
+                "progress": 123,
+                "logText": "Max Feygard hater"
+            },
+            {
+                "progress": 125,
+                "logText": "Max Balanced Feygard feelings"
+            },
+            {
+                "progress": 127,
+                "logText": "Max Feygard fan"
+            },
+            {
+                "progress": 128,
+                "logText": "Max Absolute Feygard fan"
+            },
+            {
+                "progress": 132,
+                "logText": "Max Absolute Thieves guild hater"
+            },
+            {
+                "progress": 133,
+                "logText": "Max Thieves guild hater"
+            },
+            {
+                "progress": 135,
+                "logText": "Max Balanced Thieves guild feelings"
+            },
+            {
+                "progress": 137,
+                "logText": "Max Thieves guild fan"
+            },
+            {
+                "progress": 138,
+                "logText": "Max Absolute Thieves guild fan"
+            },
+            {
+                "progress": 999,
+                "logText": "-"
             }
         ]
     },
     {
-        "id":"faction_count_shadow",
-        "name":"faction_count_shadow",
-        "showInLog":0,
-        "stages":[
+        "id": "faction_count_shadow",
+        "name": "faction_count_shadow",
+        "showInLog": 0,
+        "stages": [
             {
-                "progress":0,
-                "logText":"Ranges  30:max | 18:very high | 6:high | -5:low | -14:very low | -23:even lower"
+                "progress": 0,
+                "logText": "Ranges  30:max | 18:very high | 6:high | -5:low | -14:very low | -23:even lower"
             },
             {
-                "progress":10,
-                "logText":" 4   vacor:61   Killed Vacor"
+                "progress": 10,
+                "logText": " 4   vacor:61   Killed Vacor"
             },
             {
-                "progress":20,
-                "logText":" 4-  vacor:60   Killed Unzel"
+                "progress": 20,
+                "logText": " 4-  vacor:60   Killed Unzel"
             },
             {
-                "progress":30,
-                "logText":" 4-  kaverin:21   Declined to help Kaverin ->0"
+                "progress": 30,
+                "logText": " 4-  kaverin:21   Declined to help Kaverin ->0"
             },
             {
-                "progress":32,
-                "logText":" 4   kaverin:40   Delivered Message to Unzel"
+                "progress": 32,
+                "logText": " 4   kaverin:40   Delivered Message to Unzel"
             },
             {
-                "progress":34,
-                "logText":" 4-  kaverin:40   Delivered Message to Vacor"
+                "progress": 34,
+                "logText": " 4-  kaverin:40   Delivered Message to Vacor"
             },
             {
-                "progress":40,
-                "logText":" 4   feygard_shipment:82   Reported back to Ailshara"
+                "progress": 40,
+                "logText": " 4   feygard_shipment:82   Reported back to Ailshara"
             },
             {
-                "progress":42,
-                "logText":" 4-  feygard_shipment:80   Reported back to Gandoren"
+                "progress": 42,
+                "logText": " 4-  feygard_shipment:80   Reported back to Gandoren"
             },
             {
-                "progress":50,
-                "logText":" 1   thieves_hidden:80   Talked about thieves to Thoronir"
+                "progress": 50,
+                "logText": " 1   thieves_hidden:80   Talked about thieves to Thoronir"
             },
             {
-                "progress":60,
-                "logText":" 4   stoutford_castle:50   Yolgen examined the ring"
+                "progress": 60,
+                "logText": " 4   stoutford_castle:50   Yolgen examined the ring"
             },
             {
-                "progress":70,
-                "logText":" 4-  stoutford_castle:60   Kept the ring for myself, which upset Yolgen"
+                "progress": 70,
+                "logText": " 4-  stoutford_castle:60   Kept the ring for myself, which upset Yolgen"
             },
             {
-                "progress":80,
-                "logText":" 4-  stoutford_castle:70   Kept the ring for myself and didn't tell Yolgen"
+                "progress": 80,
+                "logText": " 4-  stoutford_castle:70   Kept the ring for myself and didn't tell Yolgen"
             },
             {
-                "progress":90,
-                "logText":" "
+                "progress": 90,
+                "logText": " "
             },
             {
-                "progress":100,
-                "logText":" 4   kaverin:100   Found Vacor's old hideout"
+                "progress": 100,
+                "logText": " 4   kaverin:100   Found Vacor's old hideout"
             },
             {
-                "progress":110,
-                "logText":" 4   Thieves03:32   The patrol sergeant has left to call for backup"
+                "progress": 110,
+                "logText": " 4   Thieves03:32   The patrol sergeant has left to call for backup"
             },
             {
-                "progress":120,
-                "logText":" 4-  darkprotector:70   Restored the helmet"
+                "progress": 120,
+                "logText": " 4-  darkprotector:70   Restored the helmet"
             },
             {
-                "progress":130,
-                "logText":" 5   darkprotector:40   Ulirfendor has given me the dark blessing of the Shadow"
+                "progress": 130,
+                "logText": " 5   darkprotector:40   Ulirfendor has given me the dark blessing of the Shadow"
             },
             {
-                "progress":140,
-                "logText":" 4   darkprotector:41   Ulirfendor wanted to give me the dark blessing of the Shadow, but I declined"
+                "progress": 140,
+                "logText": " 4   darkprotector:41   Ulirfendor wanted to give me the dark blessing of the Shadow, but I declined"
             },
             {
-                "progress":150,
-                "logText":" 4   xulviir:30   Destroyed the Xul'viir"
+                "progress": 150,
+                "logText": " 4   xulviir:30   Destroyed the Xul'viir"
             },
             {
-                "progress":160,
-                "logText":" 4-  xulviir:20   Restored the Xul'viir"
+                "progress": 160,
+                "logText": " 4-  xulviir:20   Restored the Xul'viir"
             },
             {
-                "progress":170,
-                "logText":" 3-  rogorn:50   Killed Rogorn"
+                "progress": 170,
+                "logText": " 3-  rogorn:50   Killed Rogorn"
             },
             {
-                "progress":180,
-                "logText":" 3   rogorn:55   Lie about Rogorn killed"
+                "progress": 180,
+                "logText": " 3   rogorn:55   Lie about Rogorn killed"
             },
             {
-                "progress":190,
-                "logText":" 1-  loneford:55   Talked to Kuldan about the illness"
+                "progress": 190,
+                "logText": " 1-  loneford:55   Talked to Kuldan about the illness"
             },
             {
-                "progress":200,
-                "logText":" 1   loneford:60   Didn't tell Kuldan about the illness"
+                "progress": 200,
+                "logText": " 1   loneford:60   Didn't tell Kuldan about the illness"
             },
             {
-                "progress":210,
-                "logText":" "
+                "progress": 210,
+                "logText": " "
             },
             {
-                "progress":220,
-                "logText":" "
+                "progress": 220,
+                "logText": " "
             },
             {
-                "progress":230,
-                "logText":" "
+                "progress": 230,
+                "logText": " "
             },
             {
-                "progress":240,
-                "logText":" "
+                "progress": 240,
+                "logText": " "
             },
             {
-                "progress":250,
-                "logText":" "
+                "progress": 250,
+                "logText": " "
             },
             {
-                "progress":260,
-                "logText":" "
+                "progress": 260,
+                "logText": " "
             },
             {
-                "progress":270,
-                "logText":" "
+                "progress": 270,
+                "logText": " "
             },
             {
-                "progress":280,
-                "logText":" "
+                "progress": 280,
+                "logText": " "
             },
             {
-                "progress":290,
-                "logText":" "
+                "progress": 290,
+                "logText": " "
             }
         ]
     },
     {
-        "id":"faction_count_feygard",
-        "name":"faction_count_feygard",
-        "showInLog":0,
-        "stages":[
+        "id": "faction_count_feygard",
+        "name": "faction_count_feygard",
+        "showInLog": 0,
+        "stages": [
             {
-                "progress":0,
-                "logText":"Ranges: ..."
+                "progress": 0,
+                "logText": "Ranges: ..."
             },
             {
-                "progress":10,
-                "logText":" "
+                "progress": 10,
+                "logText": " "
             },
             {
-                "progress":20,
-                "logText":" "
+                "progress": 20,
+                "logText": " "
             },
             {
-                "progress":30,
-                "logText":" "
+                "progress": 30,
+                "logText": " "
             },
             {
-                "progress":40,
-                "logText":" "
+                "progress": 40,
+                "logText": " "
             },
             {
-                "progress":50,
-                "logText":" "
+                "progress": 50,
+                "logText": " "
             },
             {
-                "progress":60,
-                "logText":" "
+                "progress": 60,
+                "logText": " "
             },
             {
-                "progress":70,
-                "logText":" "
+                "progress": 70,
+                "logText": " "
             },
             {
-                "progress":80,
-                "logText":" "
+                "progress": 80,
+                "logText": " "
             },
             {
-                "progress":90,
-                "logText":" "
+                "progress": 90,
+                "logText": " "
             },
             {
-                "progress":100,
-                "logText":" "
+                "progress": 100,
+                "logText": " "
             },
             {
-                "progress":110,
-                "logText":" "
+                "progress": 110,
+                "logText": " "
             },
             {
-                "progress":120,
-                "logText":" "
+                "progress": 120,
+                "logText": " "
             },
             {
-                "progress":130,
-                "logText":" "
+                "progress": 130,
+                "logText": " "
             },
             {
-                "progress":140,
-                "logText":" "
+                "progress": 140,
+                "logText": " "
             },
             {
-                "progress":150,
-                "logText":" "
+                "progress": 150,
+                "logText": " "
             },
             {
-                "progress":160,
-                "logText":" "
+                "progress": 160,
+                "logText": " "
             },
             {
-                "progress":170,
-                "logText":" "
+                "progress": 170,
+                "logText": " "
             },
             {
-                "progress":180,
-                "logText":" "
+                "progress": 180,
+                "logText": " "
             },
             {
-                "progress":190,
-                "logText":" "
+                "progress": 190,
+                "logText": " "
             },
             {
-                "progress":200,
-                "logText":" "
+                "progress": 200,
+                "logText": " "
             },
             {
-                "progress":210,
-                "logText":" "
+                "progress": 210,
+                "logText": " "
             },
             {
-                "progress":220,
-                "logText":" "
+                "progress": 220,
+                "logText": " "
             },
             {
-                "progress":230,
-                "logText":" "
+                "progress": 230,
+                "logText": " "
             },
             {
-                "progress":240,
-                "logText":" "
+                "progress": 240,
+                "logText": " "
             },
             {
-                "progress":250,
-                "logText":" "
+                "progress": 250,
+                "logText": " "
             },
             {
-                "progress":260,
-                "logText":" "
+                "progress": 260,
+                "logText": " "
             },
             {
-                "progress":270,
-                "logText":" "
+                "progress": 270,
+                "logText": " "
             },
             {
-                "progress":280,
-                "logText":" "
+                "progress": 280,
+                "logText": " "
             },
             {
-                "progress":290,
-                "logText":" "
+                "progress": 290,
+                "logText": " "
             }
         ]
     },
     {
-        "id":"faction_count_thieves",
-        "name":"faction_count_thieves",
-        "showInLog":0,
-        "stages":[
+        "id": "faction_count_thieves",
+        "name": "faction_count_thieves",
+        "showInLog": 0,
+        "stages": [
             {
-                "progress":0,
-                "logText":"Ranges: ..."
+                "progress": 0,
+                "logText": "Ranges: ..."
             },
             {
-                "progress":10,
-                "logText":" 8-  wanted_men:65   Returned fake key to Troublemaker"
+                "progress": 10,
+                "logText": " 8-  wanted_men:65   Returned fake key to Troublemaker"
             },
             {
-                "progress":20,
-                "logText":" 3   wanted_men:80   Defy and his men killed"
+                "progress": 20,
+                "logText": " 3   wanted_men:80   Defy and his men killed"
             },
             {
-                "progress":30,
-                "logText":" "
+                "progress": 30,
+                "logText": " "
             },
             {
-                "progress":40,
-                "logText":" "
+                "progress": 40,
+                "logText": " "
             },
             {
-                "progress":50,
-                "logText":" "
+                "progress": 50,
+                "logText": " "
             },
             {
-                "progress":60,
-                "logText":" "
+                "progress": 60,
+                "logText": " "
             },
             {
-                "progress":70,
-                "logText":" "
+                "progress": 70,
+                "logText": " "
             },
             {
-                "progress":80,
-                "logText":" "
+                "progress": 80,
+                "logText": " "
             },
             {
-                "progress":90,
-                "logText":" "
+                "progress": 90,
+                "logText": " "
             },
             {
-                "progress":100,
-                "logText":" "
+                "progress": 100,
+                "logText": " "
             },
             {
-                "progress":110,
-                "logText":" "
+                "progress": 110,
+                "logText": " "
             },
             {
-                "progress":120,
-                "logText":" "
+                "progress": 120,
+                "logText": " "
             },
             {
-                "progress":130,
-                "logText":" "
+                "progress": 130,
+                "logText": " "
             },
             {
-                "progress":140,
-                "logText":" "
+                "progress": 140,
+                "logText": " "
             },
             {
-                "progress":150,
-                "logText":" "
+                "progress": 150,
+                "logText": " "
             },
             {
-                "progress":160,
-                "logText":" "
+                "progress": 160,
+                "logText": " "
             },
             {
-                "progress":170,
-                "logText":" "
+                "progress": 170,
+                "logText": " "
             },
             {
-                "progress":180,
-                "logText":" "
+                "progress": 180,
+                "logText": " "
             },
             {
-                "progress":190,
-                "logText":" "
+                "progress": 190,
+                "logText": " "
             },
             {
-                "progress":200,
-                "logText":" "
+                "progress": 200,
+                "logText": " "
             },
             {
-                "progress":210,
-                "logText":" "
+                "progress": 210,
+                "logText": " "
             },
             {
-                "progress":220,
-                "logText":" "
+                "progress": 220,
+                "logText": " "
             },
             {
-                "progress":230,
-                "logText":" "
+                "progress": 230,
+                "logText": " "
             },
             {
-                "progress":240,
-                "logText":" "
+                "progress": 240,
+                "logText": " "
             },
             {
-                "progress":250,
-                "logText":" "
+                "progress": 250,
+                "logText": " "
             },
             {
-                "progress":260,
-                "logText":" "
+                "progress": 260,
+                "logText": " "
             },
             {
-                "progress":270,
-                "logText":" "
+                "progress": 270,
+                "logText": " "
             },
             {
-                "progress":280,
-                "logText":" "
+                "progress": 280,
+                "logText": " "
             },
             {
-                "progress":290,
-                "logText":" "
-            }
-        ]
-    },
-    {
-        "id":"scores",
-        "name":"scores",
-        "showInLog":0,
-        "stages":[
-            {
-                "progress":12,
-                "logText":"Absolute Shadow hater"
-            },
-            {
-                "progress":13,
-                "logText":"Shadow hater"
-            },
-            {
-                "progress":15,
-                "logText":"Balanced Shadow feelings"
-            },
-            {
-                "progress":17,
-                "logText":"Shadow fan"
-            },
-            {
-                "progress":18,
-                "logText":"Absolute Shadow fan"
-            },
-            {
-                "progress":22,
-                "logText":"Absolute Feygard hater"
-            },
-            {
-                "progress":23,
-                "logText":"Feygard hater"
-            },
-            {
-                "progress":25,
-                "logText":"Balanced Feygard feelings"
-            },
-            {
-                "progress":27,
-                "logText":"Feygard fan"
-            },
-            {
-                "progress":28,
-                "logText":"Absolute Feygard fan"
-            },
-            {
-                "progress":32,
-                "logText":"Absolute Thieves guild hater"
-            },
-            {
-                "progress":33,
-                "logText":"Thieves guild hater"
-            },
-            {
-                "progress":35,
-                "logText":"Balanced Thieves guild feelings"
-            },
-            {
-                "progress":37,
-                "logText":"Thieves guild fan"
-            },
-            {
-                "progress":38,
-                "logText":"Absolute Thieves guild fan"
-            },
-            {
-                "progress":101,
-                "logText":"Clear preference: Shadow over Feygard"
-            },
-            {
-                "progress":102,
-                "logText":"Clear preference: Feygard over Shadow"
-            },
-            {
-                "progress":999,
-                "logText":"-"
+                "progress": 290,
+                "logText": " "
             }
         ]
     }

AndorsTrail/res/values/loadresources.xml

@@ -480,6 +480,8 @@
         <item>@raw/conversationlist_mt_galmore2</item>
         <!--Added by ATCS v0.6.24 for project next_release-->
         <item>@raw/conversationlist_next_release</item>
+        <item>@raw/conversationlist_debug</item>
+        <item>@raw/conversationlist_fsc_calc</item>
     </array>
         
     <array name="loadresource_monsters">
@@ -1687,6 +1689,7 @@
         <item>@xml/stoutford_filler_2</item>
         <item>@xml/stoutford_filler_3</item>
         <item>@xml/stoutford_filler_4</item>
+        <item>@xml/debugmap</item>
     </array>
         
 </resources>

AndorsTrail/res/xml/brightport5.tmx

@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="19">
+ <properties>
+  <property name="outdoors" value="1"/>
+ </properties>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4561" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4689" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4817" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4945" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5073" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5201" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5329" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5457" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5585" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5713" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5841" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5969" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6097" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6225" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6353" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6481" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6609" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="6729" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="6849" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="6969" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7097" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7225" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="7333" name="map_tree_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
+  <image source="../drawable/map_tree_3.png" width="1024" height="544"/>
+ </tileset>
+ <tileset firstgid="7877" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7997" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="8125" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="8253" name="map_brightport" tilewidth="32" tileheight="32" tilecount="112" columns="16">
+  <image source="../drawable/map_brightport.png" width="512" height="224"/>
+ </tileset>
+ <tileset firstgid="8365" name="map_brightport" tilewidth="32" tileheight="32" tilecount="112" columns="16">
+  <image source="../drawable/map_brightport.png" width="512" height="224"/>
+ </tileset>
+ <tileset firstgid="8477" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="8605" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Base" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIwlc5BxoF9AewPyITg8WgOwedDYMU2IuNjPQxagZNoTMwOZHaphLSC2usKWHn8lVOwoQAFc+IaRnoMKbmumLXLthbFL0kaqHHPXU1j/UwEjzLwyMVH/TGwx0ONPD/sucEDyYwGB0EyUAAOSqK3c=
+  </data>
+ </layer>
+ <layer id="2" name="Ground" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy9lb9OhEAQxq/F9hIqEtlXOOObkPgE+ABaSKWJhYk8w5XWvIHSXafmYq1Wl9CoFb1s2Akfw/7FYPGFZSD85pvdYfbRarVXKo6H9ZLKE7/3LtZ2LcW9XdsVyr2ycNGPixtai3sNt0qnHt+72EenT3WVwticWjylU3HuVxf77vSjrlIYs+Vgq/eN6K+Pinstxt9y+dXlQM9895z84rdcfiulUzHE6ZkPc5f03LrTRkz3XdbjEPWq0yFOMV9vGTtXZ0K/3yhicNn6/DLuWVLnSqacXjQ10vmV79G7pjOdA8/EzYS9Rq2lpugRzx3yModfk2x7yXsvYx5zjzrP4aJHXW1N3CrVr21c6iHeey6u6XweYC9dot6jcydz0HHlPCiA6/t9Uz6t0rPy/ZqOGSQ5D8pkPI8o19pQ35B+k0IGsrfJeB6diPG+uWa9z7wnhqt/keuauSHznmpeeHBxruB8mcOlmpfgnf+LaI1zBecL9mjIOdiqvSXv3C+dq83RoAdYY4+G/nPQu6nOKMmlNeYzh0vefbhL6I3d38X/x+VseV8uzG86tXGvJhrEc2mYdM9CuTbpcsLcbPn8hTtHPtxffbLX7w==
+  </data>
+ </layer>
+ <layer id="3" name="Objects" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJydVjtMVEEUfWx4YKw2El/DGt7aEFsEBezEkKgdu1mimFCgwCrGKET5BQsIEfyUBGNiY2yx1AaIJtL5Tfy0WlJB4af03syczHmzb1n1JDcz7868OffeuXdmxvJB8Enks0i5JQimRCa9VvFLxn+LvM4FwZZIifpoFfinPV+5DtqT3thz+X6RN/+jX7a8G01GGMcyph2VOT9k7k+RXlqzj/ps2ynRj1mevWyvBcwrpvjYS3Hh9RDjORo/mne++L5Vw+Om9FbXK9BeAmuxk4UwCK5HQfAsruTrajbtkLQXm5O6WoA/Gg/d90e59HnDYaXutOUYl3bC9s8Qr9owm0naqmgjHwHN0bdxUhSbsVlD17p60K2r2G0wwrrx0NkFPcbmsya/bkk7mTV7qNgin9eJV9HdbPZ9IjR9RabRCGIwJWPz3v6ovpt4FedlvETyRdb9anMKvLznvO9rsbMRY0t2DPbe9NaHXLFzCjnnL/Z9ndb9V2CPeG+13vU7sy85V+POvP2h22f1Af1R0ZdDt7bimx27TfV3ZI9aQ+0O5I3PqCvN4RGKGTBSb3JfMUe5uUM2FFNydigyuVmg/EG/6J1VC7Z+wHNPOO+LPKg337vEpbztKXzAYS+2HV4skM98PqrP7BvuhL4q/jJQY0DaWas2fLB2a/sxdnn6PjY6jT/GXxHXSzsOe1FDdY1JjtIeMamFrhpnM2wFN+of+Nv75X/s2YgNn+Y4zkbOYaDV/rNtBTWi7TbpdU/5W6VMuu+xq7d3cTJPWr048X3gnxmb9l+Ff/f5d7/+lyWuc7YG0+4czSXkp44h7sw7mHIfpWH/Afcu6fXyBzH2+Ute7TLvtdDdRwqtDb5rEYen8t9OS/LNwGtzPrVR7KDvyFfeRQrcr1obfM+dsHct3+fIJcRa77tOq4PPxy03nyHgZbt5LvfP0h2H+Ti7EO8e+7bw12MMpPibdgb6uhuRiXM7vZ/Ux+Go0gfeb7X/jsxZiip5L1Q5Z2bzZl+wJucz7LpM9+5AZGoRcdA3rNZhw6EgWJaxN7GrQdjC9i5aHfAk6/r8DkVf1x8U//rpn6KNxySdXcqtfHdFLtXJm8nyqK2LVo85sKtox1inUP6C9U959bvHfiP/VkX/UGRFZEZk2vIORUlbpml8psrYMnHP2f3gmLMwVqwNygsO2OS3Or7qzWHuTsoPnM9p7wOG8oKjGlYiFyvWcSw4Hzj3dH//AISKV1o=
+  </data>
+ </layer>
+ <layer id="4" name="Above" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy9Vs1KA0EMHgur1Yu1oqct7voAvkxB9OzBFW/Ss+BzeBR/HsBXaPUk6BOI2B8LgvoEZtiGZrOZmWxb+sGws0k2XyY7mUy2Z8wZjAzGfWrMAwwLOs8mNhRc1gfbgWCP89vYmLvYlIByqrffrNTLthy1epmHcqNPKutCjL20qLd4AtkzjC0FbxNsLrfzOX1Sf5SHoxPlT7rGVMG777GxuXDlmOMwCttQnOy6dU0hpqFj3Zo1ankxF6cN+L+NqTy0/u/N+XhdOtw/2n8g4cLD69Lx2lkWNLxHsM+OPXst9H07Lp8zWFd0D185OP6S6fwlKeo0dc6B8XYC9fObuHWc9yAQB+ZHytUn8Dwmeb2NHDWH4LXXJmctP9sl8BzT/EvrxXjPd8K+OV4Ff1Tn0795dAjtmheFZfJpzwK0+0jy9/ek+O1Y8Dcm7z+ens5B96eUB02vt7A9jt5LKEI5lmLV9iPa4yQ/Lu6q/53HY3vcos71Kj3C9riQPeqva7PFI/VRKpPuT/yOOEtN8T5Kfc7SRweKHIVQNYZssu4h2I0q+q8am4S1ljH1VlH2Bb7GzF8X3nsK2TxYhzg2WmG7flz8V9rcueC7I1JEENsqiQ9zx/PF9/a8vBw3kzsyzZe0B/4B9JWUlg==
+  </data>
+ </layer>
+ <layer id="5" name="Top" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIw0Icgy0C0bBKIAARhqmxUIx2pk9CkbBKBgFo2AUjIJRMFwAAG18AKo=
+  </data>
+ </layer>
+ <layer id="6" name="Walkable" width="30" height="30" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzNktkNwCAMQ5mie7H/MhV/qEpsk6NtJNQjxC+YzGuM2bBWvFET0bHyX7CrmEh7j/27i2lxq5lI34tOnyNn9vKoTtGP+HISal9ZzdO78PT2fxU85cxsLqq4yIdqLtNj3Cif9e7lT7ld8Veu5VXVLHbXRjUyHmU1sl5FdNhcMA0vUK3iT7R3ywe2n+mgviyG2ifiIv6pjpdD92/te74jTbVfNLORyOh1zgm6S3W+qrjqsnxZzxt9TdwW
+  </data>
+ </layer>
+ <objectgroup id="7" name="Mapevents" visible="0">
+  <object id="1" name="south" type="mapchange" x="160" y="928" width="32" height="32">
+   <properties>
+    <property name="map" value="brightport7"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object id="2" name="west" type="mapchange" x="0" y="96" width="32" height="704">
+   <properties>
+    <property name="map" value="brightport3"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object id="3" name="church" type="mapchange" x="288" y="672" width="32" height="32">
+   <properties>
+    <property name="map" value="brightport_temple1"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object id="4" name="bakery" type="mapchange" x="384" y="224" width="64" height="32">
+   <properties>
+    <property name="map" value="brightport_bakery"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object id="5" name="inn" type="mapchange" x="640" y="448" width="32" height="32">
+   <properties>
+    <property name="map" value="brightport_inn"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object id="6" name="south3" type="mapchange" x="896" y="928" width="32" height="32">
+   <properties>
+    <property name="map" value="brightport7"/>
+    <property name="place" value="north3"/>
+   </properties>
+  </object>
+  <object id="7" name="east" type="mapchange" x="928" y="832" width="32" height="96">
+   <properties>
+    <property name="map" value="brightport8"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object id="8" name="south1" type="mapchange" x="768" y="928" width="32" height="32">
+   <properties>
+    <property name="map" value="brightport7"/>
+    <property name="place" value="north1"/>
+   </properties>
+  </object>
+  <object id="9" name="brightport_newcommander_script" type="script" x="128" y="256" width="480" height="352"/>
+  <object id="10" name="east1" type="mapchange" x="928" y="192" width="32" height="64">
+   <properties>
+    <property name="map" value="brightport9"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object id="11" name="north" type="mapchange" x="704" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="brightport6"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object id="18" name="burhczyd_check14" type="script" x="352" y="256" width="128" height="32"/>
+ </objectgroup>
+ <objectgroup id="8" name="Spawn" visible="0">
+  <object id="12" name="brightportbakeryoutside" type="spawn" x="224" y="352" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="brightportbakeryoutside"/>
+   </properties>
+  </object>
+  <object id="13" name="brightportcitizen1" type="spawn" x="480" y="288" width="64" height="160">
+   <properties>
+    <property name="spawngroup" value="brightportcitizen1"/>
+   </properties>
+  </object>
+  <object id="14" name="brightportguard2" type="spawn" x="608" y="576" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="brightportguard2"/>
+   </properties>
+  </object>
+  <object id="15" name="brightportguard" type="spawn" x="352" y="256" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="brightportguard"/>
+   </properties>
+  </object>
+  <object id="16" name="brightportbakeryoutside2" type="spawn" x="96" y="160" width="96" height="160">
+   <properties>
+    <property name="spawngroup" value="brightportbakeryoutside2"/>
+   </properties>
+  </object>
+  <object id="17" name="brightportbakeryoutside2" type="spawn" x="160" y="320" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="brightportbakeryoutside2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="9" name="Keys" visible="0"/>
+ <objectgroup id="10" name="Replace"/>
+</map>

AndorsTrail/res/xml/brightport_bakery.tmx

@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="25" height="12" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="16">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7609" name="map_brightport" tilewidth="32" tileheight="32" tilecount="112" columns="16">
+  <image source="../drawable/map_brightport.png" width="512" height="224"/>
+ </tileset>
+ <layer id="1" name="Base" width="25" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIxnoceHnDxU7hgsgFFbUCDt62EErAABPGQIx
+  </data>
+ </layer>
+ <layer id="2" name="Ground" width="25" height="12">
+  <data encoding="base64" compression="zlib">
+   eJy7LMbAcJkAvs5JGSZkPsyOV7LkYVLc8kuWPAzTT4xb9LjIw8S6EWQPuXagu1FNHFUexv9FgR2/0OwwQ7MDnU9JeFHDnIG0A5amCMUHLj6xcY4cn4Tig5z4AZnPyUUZhpmFTw0APSeP3g==
+  </data>
+ </layer>
+ <layer id="3" name="Objects" width="25" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAfuAsj2JZMCLaLMKZaQgCkv5EfwpaRZWCoZ0OwQSCeDcJ2Q1LzlQ/TbnS3YZP7w8rAoAPULww0U4QNwgaJ5UPZ/4Ds/1A1yADkL5CdILv5ge4Q4Ee4o54N4dYLQJoHyP8oxsCgDKRVoGyQGEjuCJDNB2TzQ8VBQFoMNTyR7cbFpgQ8YWFgmAK08xmQPsGPyl/Kj1C3ESi2iQDeLIbwBwyA/MICDMMtQHE2VogYOn8oAGzphxYAOfyJ4ZMDkMP/ET8qfyU/ZvyksyAwMjgIVHMIig9jiXtaAgDtUjom
+  </data>
+ </layer>
+ <layer id="4" name="Above" width="25" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF9AIfxSD4Oj/xenagqZ1Kgl5C4AaaWTfxmN2BJNeJrE4Ovx0PZEl21iiAgsdUjGtagkd0dCcAtdUKXA==
+  </data>
+ </layer>
+ <layer id="5" name="Top" width="25" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYBg84LHY4LeDGP3DxY5PMDVyEOqMLEJuvyyGcrLsoBSM2jG47KA1AADQuQ6Y
+  </data>
+ </layer>
+ <layer id="11" name="oven" width="25" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUDAZwkm2gXTD4AQDwxgDQ
+  </data>
+ </layer>
+ <layer id="6" name="Walkable" width="25" height="12">
+  <data encoding="base64" compression="zlib">
+   eJy7KMbAcHEU0wSDADY2uhoYINVscgAh92BzP7p+bGYSsgObHKWAWuYMpB3EhhUlcU9u2qWmeaTYiU8NAI2qn7g=
+  </data>
+ </layer>
+ <objectgroup id="7" name="Mapevents">
+  <object id="1" name="stair" type="mapchange" x="736" y="96" width="32" height="32">
+   <properties>
+    <property name="map" value="brightport_bakery2"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object id="2" name="entrance" type="mapchange" x="512" y="352" width="64" height="32">
+   <properties>
+    <property name="map" value="brightport5"/>
+    <property name="place" value="bakery"/>
+   </properties>
+  </object>
+  <object id="3" name="east" type="mapchange" x="768" y="192" width="32" height="64">
+   <properties>
+    <property name="map" value="brightport_bakery1"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="8" name="Spawn">
+  <object id="4" name="brightportbakery" type="spawn" x="160" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="brightportbakery"/>
+   </properties>
+  </object>
+  <object id="5" name="brightportbakeryvisitor" type="spawn" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="brightportbakeryvisitor"/>
+   </properties>
+  </object>
+  <object id="6" name="brightportbakery1" type="spawn" x="32" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="brightportbakery1"/>
+   </properties>
+  </object>
+  <object id="7" name="brightportbakery3" type="spawn" x="352" y="128" width="160" height="32">
+   <properties>
+    <property name="spawngroup" value="brightportbakery3"/>
+   </properties>
+  </object>
+  <object id="8" name="brightportbakery2" type="spawn" x="512" y="128" width="160" height="32">
+   <properties>
+    <property name="spawngroup" value="brightportbakery2"/>
+   </properties>
+  </object>
+  <object id="9" name="brightport_gunfrykstill" type="spawn" x="640" y="288" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="brightport_gunfrykstill"/>
+   </properties>
+  </object>
+  <object id="10" name="brightport_newcommander" type="spawn" x="640" y="256" width="96" height="64">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="brightport_newcommander"/>
+   </properties>
+  </object>
+  <object id="14" name="burhczyd14" type="spawn" x="32" y="288" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object id="15" name="burhczyd14e" type="spawn" x="32" y="288" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="9" name="Keys">
+  <object id="11" name="Object" type="key" x="384" y="160" width="96" height="32">
+   <properties>
+    <property name="phrase" value="brightport_bakery3"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+  <object id="12" name="Objects" type="key" x="512" y="160" width="128" height="32">
+   <properties>
+    <property name="phrase" value="brightport_bakery"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="10" name="Replace">
+  <object id="13" name="oven" type="replace" x="64" y="288" width="32" height="32">
+   <properties>
+    <property name="Above" value="oven"/>
+    <property name="requireId" value="quest_burhczyd_nd"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="514"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>

AndorsTrail/res/xml/crossroads.tmx

@@ -268,6 +268,7 @@
   </object>
   <object id="14" name="achieve_road" type="script" x="576" y="608" width="64" height="32"/>
   <object id="15" name="dds_miri_spawn" type="script" x="608" y="352" width="64" height="32"/>
+  <object name="burhczyd_check12" type="script" x="608" y="352" width="64" height="32"/>
  </objectgroup>
  <objectgroup id="6" name="Spawn uniques" visible="0">
   <object id="16" name="fieldwasp_unique" type="spawn" x="32" y="64" width="256" height="352">

AndorsTrail/res/xml/debugmap.tmx

@@ -1,283 +1,249 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="18" height="18" tilewidth="32" tileheight="32" nextobjectid="18">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="18" height="18" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="25">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_dynamic_placeholders" tilewidth="32" tileheight="32" tilecount="20" columns="10">
+ <tileset firstgid="7609" name="map_dynamic_placeholders" tilewidth="32" tileheight="32" tilecount="20" columns="10">
   <image source="../drawable/map_dynamic_placeholders.png" width="320" height="64"/>
  </tileset>
- <layer name="Ground" width="18" height="18">
+ <layer id="9" name="Base" width="18" height="18">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEU48Q53AwMFwaBO2B4CxIezOYcGyD3jOJRTAkGAOdR634=
+   eJy7yMnAcHEUE41fcSHwcDJnFI/iUczAAADzLBTi
   </data>
  </layer>
- <layer name="Objects" width="18" height="18">
+ <layer id="1" name="Ground" width="18" height="18">
   <data encoding="base64" compression="zlib">
-   eJzjFGOAg5OiCLYrK8OAg3AW6pt5VZSwGnqBvUwDa7+CIHXMMcBiDpcYptgoGBrgJP9Au2DgAADprgS2
+   eJy7yMnAcHGY45tcDAy3kPBtIAYBUs15CdUHA6+HiTk/gfp+IeHfZJozikfxUMcArNsJrA==
   </data>
  </layer>
- <layer name="Above" width="18" height="18">
+ <layer id="2" name="Objects" width="18" height="18">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFIxXMlB1oF4yCUTC4AAA1SQC3
+   eJxjYBg5gFVsoF0AAamsEJpDGEJ/FB04t4yCUTAKEAAA9WABpw==
   </data>
  </layer>
- <layer name="Walkable" width="18" height="18">
+ <layer id="3" name="Above" width="18" height="18">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFAwU2ig20C0bBKBgFyAAAzSQAyA==
+   eJxjYBgFo2AUjIJRAAIABRAAAQ==
   </data>
  </layer>
- <objectgroup name="Object Layer 1">
-  <object id="1" name="debugsign" type="sign" x="192" y="96" width="32" height="32"/>
-  <object id="2" name="start" type="rest" x="96" y="64" width="32" height="32"/>
-  <object id="3" name="Unopenable key area" type="key" x="32" y="128" width="32" height="32">
+ <layer id="4" name="Walkable" width="18" height="18">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRAAIABRAAAQ==
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents">
+  <object id="18" name="entry" type="mapchange" x="160" y="160" width="32" height="32"/>
+  <object id="24" name="fsc_calc" type="script" x="128" y="64" width="96" height="96">
    <properties>
-    <property name="phrase" value="debugrequireskey"/>
-    <property name="requireId" value="no_quest"/>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="10" name="Keys">
+  <object id="21" name="dbg_shop" type="key" x="96" y="160" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dbg_shop"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
     <property name="requireType" value="questProgress"/>
-    <property name="requireValue" value="10"/>
+    <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="4" name="Openable by quest" type="key" x="0" y="128" width="32" height="32">
+  <object id="22" name="dbg_teleport" type="key" x="224" y="160" width="32" height="32">
    <properties>
-    <property name="phrase" value="debugrequireskey"/>
-    <property name="requireId" value="debugquest"/>
+    <property name="phrase" value="dbg_teleport"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
     <property name="requireType" value="questProgress"/>
-    <property name="requireValue" value="100"/>
+    <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="5" name="place2" type="mapchange" x="192" y="256" width="32" height="32">
+  <object id="23" name="dbg_scores" type="key" x="160" y="96" width="32" height="32">
    <properties>
-    <property name="map" value="debugmap"/>
-    <property name="place" value="place1"/>
-   </properties>
-  </object>
-  <object id="6" name="place1" type="mapchange" x="0" y="0" width="32" height="32">
-   <properties>
-    <property name="map" value="debugmap"/>
-    <property name="place" value="place2"/>
-   </properties>
-  </object>
-  <object id="7" name="startitems" type="container" x="192" y="0" width="32" height="32"/>
-  <object id="8" name="Toll both. 10 gold." type="key" x="96" y="0" width="32" height="32">
-   <properties>
-    <property name="phrase" value="debugrequires10gold"/>
-    <property name="requireId" value="gold"/>
-    <property name="requireType" value="inventoryRemove"/>
-    <property name="requireValue" value="10"/>
+    <property name="phrase" value="dbg_scores"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object id="9" name="debug_insect" type="spawn" x="384" y="128" width="192" height="160">
-   <properties>
-    <property name="quantity" value="15"/>
-   </properties>
-  </object>
-  <object id="10" name="debug_troll" type="spawn" x="512" y="256" width="64" height="64">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object id="11" name="debugNPC1" type="spawn" x="288" y="0" width="32" height="32"/>
-  <object id="12" name="debugNPC2" type="spawn" x="256" y="0" width="32" height="32"/>
-  <object id="13" name="debugNPC3" type="spawn" x="32" y="448" width="32" height="32"/>
-  <object id="14" name="chaotic_dialogue" type="spawn" x="256" y="64" width="32" height="32">
-   <properties>
-    <property name="spawngroup" value="chaotic_rewarder"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup name="Inactive">
-  <properties>
-   <property name="active" value="false"/>
-  </properties>
-  <object id="15" name="signbeer" type="sign" x="288" y="448" width="32" height="32"/>
-  <object id="16" name="debug_insect_inactive" type="spawn" x="96" y="416" width="160" height="96">
-   <properties>
-    <property name="active" value="false"/>
-    <property name="quantity" value="11"/>
-    <property name="spawngroup" value="debug_insect"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup name="Active">
-  <object id="17" name="signnobeer" type="sign" x="288" y="448" width="32" height="32"/>
- </objectgroup>
+ <objectgroup id="6" name="Spawn"/>
 </map>

AndorsTrail/res/xml/foaming_flask.tmx

@@ -1,248 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="13" tilewidth="32" tileheight="32">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="20" height="13" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12">
  <properties>
   <property name="colorfilter" value="none"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="13">
+ <layer id="1" name="Ground" width="20" height="13">
   <data encoding="base64" compression="zlib">
-   eJwT4mJgEKIyNpGmDoaZd4eVgcFZGj++hKbmJ5B/A00MZt5WTgaGY0gYxLdhhdD48AuomjpuBoYGblTzcGF0eWzq+4BmTUAyz5sVVT06vsyK37x5QLMWcCPiAt1+9HBGl0fGyHIm0HDEJoaM0eVx2QVS+5ATFaPrR8fodqHr3yyGimH6CoHsYjHsZiLLoevHZR6xmN7moYfHVk5MMXzhBQAhw5Lw
+   eJwz4mJgMKIyDpGmDoaZ94eVgSFZGj/+hKZGko2B4QeaGMy8q5wMDM+QMIgfwwqh8WEONgg9j5uBYQE3qnm4MLo8NvXrgGZtQDIvmxVVPTr+zIrfvH1Asw5wI+IC3X70cEaXR8bIciHQcMQmhozR5XHZBVLLyIWK0fWjY3S70PVfFkPFMH0TgezJYtjNRJZD14/LPGIxvc1DDw+QHnQxfOEFAEijnoU=
   </data>
  </layer>
- <layer name="Objects" width="20" height="13">
+ <layer id="2" name="Objects" width="20" height="13">
   <data encoding="base64" compression="zlib">
-   eJxjYECATjYGqoGrfAwMM6Hm/ZJBiOHjw8SQ+chgJdQ8LllUcVL5b1gZGC6KMTA0CzAwFANxBStEHCQGA49YUfmcbAg1i1kYGNSxO5FsYI7GR7YbF7BjgdDtQLfy4VH3iB+CGQUQYleRNDyG+tWPBVPvMWjY7EBS/4kfgfGBOBZMu2DgBD4HA4E5FreQA5JYIWYdB7r1JD+muSD+YQL+QAawMJ8IDK/JOOIIJkeMH2BhhK52CiuqG0HAgkphgg8AALOtKH8=
+   eJxjYECAlWwMVANf+RgYdkLNk5JFiOHjw8SQ+cjgJNQ8LTR5Uvk8QHM+ijEwLBZgYJgMxDNYIeIgMRhgYkPla7Ih1BxmYWBQx+5EsoE5Gh/ZblwgjgVCLwe6nw+POiYBCFYUQIh9RdLADPVrHgum3mfQsLmBpF5IAIHxgToWTLtg4AU+BwNBOBa3kAOaWCFmPednYHjJj2kuiP+Yn3jzYGG+ERhem3HEEUyOGD/Awghd7RZWVDeCQASVwgQfAADUjCRr
   </data>
  </layer>
- <layer name="Above" width="20" height="13">
+ <layer id="3" name="Above" width="20" height="13">
   <data encoding="base64" compression="zlib">
-   eJxjYKA+OCw2ah4tzUOXR+ZvYyVNPTH2oYNLBPSjy5NqFz79lKgdBYQBANe/Dog=
+   eJxjYKA+eCw2ah4tzUOXR+ZfYyVNPTH2oYNPBPSjy5NqFz79lKgdBYQBAKsKEKg=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="13" visible="0">
+ <layer id="9" name="oven" width="20" height="13">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsHEEYhDAJgYD2PjE6EMHhMzFZgeyGnLdj08vseYRI4dLPS49xLiNUHhSEtf4zCTWfFqYh80MavifVD0AzM2Ueg==
+   eJxjYBgFo2D4g5NsA+2CoQEA82IA0A==
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="entrance" type="mapchange" x="256" y="384" width="32" height="32">
+ <layer id="4" name="Walkable" width="20" height="13" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy7KMbAcHEEYhDAJgYD2PjE6EMHhMzFZgeyGnLdj08vseYRI4dLPS49xLiNUHhSEtf4zCTWfFqYh80MavifVD0A6UqsWg==
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="entrance" type="mapchange" x="256" y="384" width="32" height="32">
    <properties>
     <property name="map" value="road1"/>
     <property name="place" value="foaming_flask"/>
    </properties>
   </object>
-  <object name="bed" type="rest" x="576" y="128" width="32" height="32"/>
+  <object id="2" name="bed" type="rest" x="576" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="ff_cook" type="spawn" x="32" y="128" width="96" height="64">
+ <objectgroup id="6" name="Spawn">
+  <object id="3" name="ff_cook" type="spawn" x="32" y="128" width="96" height="64">
    <properties>
     <property name="spawngroup" value="ff_cook"/>
    </properties>
   </object>
-  <object name="torilo" type="spawn" x="256" y="224" width="128" height="128">
+  <object id="4" name="torilo" type="spawn" x="256" y="224" width="128" height="128">
    <properties>
     <property name="spawngroup" value="torilo"/>
    </properties>
   </object>
-  <object name="ff_guard" type="spawn" x="192" y="256" width="320" height="128">
+  <object id="5" name="ff_guard" type="spawn" x="192" y="256" width="320" height="128">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="ff_guard"/>
    </properties>
   </object>
-  <object name="ff_captain" type="spawn" x="320" y="288" width="96" height="128">
+  <object id="6" name="ff_captain" type="spawn" x="320" y="288" width="96" height="128">
    <properties>
     <property name="spawngroup" value="ff_captain"/>
    </properties>
   </object>
-  <object name="ambelie" type="spawn" x="160" y="320" width="32" height="64">
+  <object id="7" name="ambelie" type="spawn" x="160" y="320" width="32" height="64">
    <properties>
     <property name="spawngroup" value="ambelie"/>
    </properties>
   </object>
+  <object id="8" name="burhczyd13" type="spawn" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object id="9" name="burhczyd13e" type="spawn" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys">
-  <object name="nondisplay:10" type="key" x="384" y="96" width="32" height="32">
+ <objectgroup id="7" name="Keys">
+  <object id="10" name="nondisplay:10" type="key" x="384" y="96" width="32" height="32">
    <properties>
     <property name="phrase" value="foaming_flask_tavern_room"/>
     <property name="requireId" value="nondisplay"/>
@@ -251,4 +267,14 @@
    </properties>
   </object>
  </objectgroup>
+ <objectgroup id="8" name="Replace" visible="0">
+  <object id="11" name="oven" type="replace" x="192" y="288" width="32" height="32">
+   <properties>
+    <property name="Above" value="oven"/>
+    <property name="requireId" value="quest_burhczyd_nd"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="513"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>

AndorsTrail/res/xml/houseatcrossroads0.tmx

@@ -1,203 +1,208 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="16" height="12" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="13">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="16" height="12" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="16">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer id="1" name="Ground" width="16" height="12">
   <data encoding="base64" compression="zlib">
-   eJw7z8nAcJ5CfFUKgpHZxGCY/qdSEAxiX2JlYLgMxFeA+CorQg4bhuk/BMXIbBg2ZEXlB0L5jqyY+kFuQtePD6Prf0qhflLxQOkvFGNgKBZDxDe59l+VIj3MkDFI70NOBD7EiconJA7CAOVinos=
+   eJx7z8nA8J5C/FUKgpHZxGCYflZpCAaxP7EyMHwG4i9A/JUVIYcNw/Q/gmJkNgwHsqLyC6H8RFZM/SA3oevHh9H1g9xEiX5S8UDpnyjGwDBZDBHf5NoP0ktqmCFjkF5GLgQGiSHzCYmDMACndZyl
   </data>
  </layer>
  <layer id="2" name="Objects" width="16" height="12">
   <data encoding="base64" compression="zlib">
-   eJxjYCAddLKh8t/yMTC844Owr/KhYhD4JYPANkC9M9kgNLGASxaBfYD6VrJBaBi4IcjAwCkGYT9iZWB4DMRPgPgpK0RsMpBuAeJWKP+iGHZ7YO4lBlSwovIT8fgH5D4QCAbqecjPwMAowMDALIBdjTkLA4MdC4JGBslA/Z/4ERiXW/yg+mE0OjBEE+tE0o+sD5d+dLADKdxA6uOgeuLQ9MP8OBEY/pOR4uAElnCHqcUGHFkgmBoAAN3SJxc=
+   eJxjYCAdrGRD5fPyMzDw8UPYX/lQMQhIySJwDFDvTjYITSzQkkXgHKC+k2wQGgZ+CDIwaIpB2ExAcWYgZgFiVqiazawMDEuAeCkrhP9RDLs9MPcSA2awovIb8fgH5D4QKAbqYRRgYFAEYmUB7GrCWRgY4lgQNDJoBuoXEkBgXG7Jg+qH0eggEE1sJZJ+ZH249KODG0jhBlJfB9VTh6Yf5seNwPDfjBQHL7CEO0wtNpDIAsHUAADmWiLk
   </data>
  </layer>
  <layer id="3" name="Above" width="16" height="12">
   <data encoding="base64" compression="zlib">
-   eJxjYKAcHBbDzgaBXzKU6eeShdAlrAwMpayk6weBi1jE0PUHsuHWTwgg67lEoX4QOM5PmX4YECXSHHT9Yvz43XESKH4YSY6cMEMG5IQZtQAAmB8T4w==
+   eJxjYKAcPBbDzgYBKVnK9GtB9U9hZWCYykq6fhD4iEUMXX8hG279hACynk8U6geB5/yU6YcBUyLNQddvxo/fHS+B4o+R5MgJM2RATphRCwAA0msWRA==
+  </data>
+ </layer>
+ <layer id="9" name="oven" width="16" height="12">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFowA7OMk20C6gPQAAu1YA0A==
   </data>
  </layer>
  <layer id="4" name="Walkable" width="16" height="12">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsHGIYxggRT0u/cQCXOYRqweb/ejuQJcjJgzw6SfkB2L1U2o/MWFADCAUr4TEQRgAD4da9A==
+   eJy7KMbAcHGIYxggRT0u/cQCXOYRqweb/ejuQJcjJgzw6SfkB2L1U2o/MWFADCAUr4TEQRgApH5plA==
   </data>
  </layer>
  <objectgroup id="5" name="Mapevents">
@@ -237,6 +242,28 @@
     <property name="spawngroup" value="dds_miri"/>
    </properties>
   </object>
+  <object id="13" name="burhczyd12" type="spawn" x="128" y="256" width="160" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object id="14" name="burhczyd12e" type="spawn" x="128" y="256" width="160" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup id="7" name="Keys"/>
+ <objectgroup id="8" name="Replace" visible="0">
+  <object id="15" name="oven" type="replace" x="224" y="256" width="32" height="32">
+   <properties>
+    <property name="Above" value="oven"/>
+    <property name="requireId" value="quest_burhczyd_nd"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="512"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>

AndorsTrail/res/xml/road1.tmx

@@ -1,221 +1,221 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="20">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="21">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="161" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="289" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="417" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="545" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="673" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="781" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="889" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="997" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1105" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1233" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1361" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1489" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1617" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1745" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1873" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2001" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2129" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2257" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2385" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2513" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2641" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2769" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2897" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3025" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3153" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3281" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3409" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3537" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3665" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3793" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3921" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4049" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4177" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4305" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4433" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4561" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4689" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4817" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4945" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5073" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5201" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5329" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5457" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5585" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5713" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5841" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5969" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6097" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6225" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6353" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6481" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6609" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6737" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6865" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6993" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7113" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7233" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7353" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7481" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer id="1" name="Ground" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eAHtksENAjEMBCMhhHjzQrQBNAA0QKeICmjkSqAG7IMRJnISEpHPicfKSWzv3vo8rEO4Cy7LT1zlrrDvWjeYWj3zZiM91Ho5ajydMbcS7RrIt6IDNzGlcRP+GsCnOpxt9HS2mxB2gr2g5Edr4WO23ImexkH6joKToORHa5ULfv4R/ERPhxye1FeM0edrb/gfNfNCA0+zxdOb+gPq8zx/zwodeuOY8xLXtt6noqH+a72wS7Wz+1YH/tSulnTRIebqU7ua6yEHv43kekSro+ceGnD20vLm/Wut3N6ghc/W6Plo5fr39d3lqc33AVqdySY=
+   eAHtk7ENAjEQBJ0gREJCBIS0BDQANECniApo5MXtoxGH5bfxCycvgtXavvMue2+6dQjLTQi3xSfuthf8ufo66+dMa848+7rWqRo9KZ++tjKfGjgftOEhj4fp1wA95WHtOeWz34ZwMBwNpTzqRY/ZsodTHie7dzZcDKU86pUW+v574iFO+VAnk3LF6HPaffXmvnvJg0y7+Sub8gHlvM7es8KH3xdzLkvcO3Y/FQ/lr83CW6qd3bc+6A+91ZIvPnCuf+i/nbtDDX3P1Fqw99G6hQearbxS8/61V+7d4EXOsZzKMVbrf6/tW57afJ876gRo
   </data>
  </layer>
  <layer id="2" name="Objects" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eAGNlLtuFUEMhi0iEFXENRISPAIloYKHgZqehgqQeAB4EJpADwqXVIHocEkFQohzgAakiArhTzsfx0x2Qyx5Z8Zj+/fvmdmIf+XNyYhna0vbIufz1G/nlrbvZb60js+mfPcy527q+ukh7nnOEXBqzO+2P+xOf/v6NpMHIpfbJyLk8uHUsOd39Yyzg8dZ5qw47xuGXB62tVys4cn5iKep/xP8oqvNmM3sj1w+po9c7h0dPF5n7M4hMPCr/SXa9YvEkAt2+MnlTuLcTb2feuNIxMuzET+PRcjNkbhr6VP7hA2BAzLPvHJhLRfmyIOMv5UYCnhwG+NYceDxqGEQK5e1lksuO1n7dvGjrosXBrTKU/zPWS849gkM19uZq3IBY5a60elWrr0P5r2ed/Jmcu19WT8u8e9yXjHsF2+1lyvHI66OKH7iW3sfu5c4vEmEnomz1eEY7/0fIiJ+TNxd9o3h7CsO7x+cL03519DvKZnnOXxNVVgvypo3qlQcbYzigYVYG6PS4yxKXn0Y6WmPw/tEPq3ux8IOjjXv5rzyYb/nhA0B51dTz8n/J/uVF3Wh5nLED6l3p/abt8CdRsQTyxj/P5wZPIx/1XiDe5D4Rmu/eyziV8o/wD4x2jsx5FbvKf+yKr5dbGNY5OAc+vzmrrmYe8/oV+XxNrmzFq9i0T95kMPcxCBTd4x+EVvzztK20ZT/AwKWOeUz7Oz/6scO5+eZ8D7JbU7263ni+7fPed5jfLwnxFYBo89d95nbA+s3v+dSazG22uThHmPNUd8aWOYVz7ga432zNjGM6XPUWH3IyzmzJl8/Xsp/9nrTyzmCoU1fa3Pt+AfYMCpH
+   eAGNlbluVEEQRQuLxTOAwDYYjAAhkRPyF4SYCD4GYnISR4DEB+APIQFykFkcGSwb44Q6en005Z43wiX19PKq7q1bvUzESTtcifi2Plub3oiYZLt0a7Z2uYxnq+OjRb7riXmcPJtrQ9z3xglPjbl7bRy3X+3z20kdmFpeX41Qy5nGOXhEPDglx0FiVp6/jUMtH9pcLebw5XbE12z/M/zurY577WR91LKU+avl3bnB/3fG7p+CA79aX6Kd/0gOtbCOPrW8SZ632d5ne7kU8fN6xNqFCLXZE/c8fWqdWMPQgE1So1qYq4Uxtp3xW8mhwYe2MY2VBx2fGgexannYsNSyn7nvFT/yenRnYKs65T+f+cJjneBwvpdYVQscB9k+dm03554HcV/kmXyVWntf5p9L/FGOK4f14q729nQ54tlIw09+c+9jrRfr1Eye3Y7HeM+/OKvdvXKd3hj2vvJw/+FZbo23hnovsknuw8VsGvNpmXNHtcrjGr18cGHmRq/1PNMFOVHTnof7iZ29Ms/FOjzmfLxxUg/fe02sYfDcbI23E/P9ZFx1kRdNLHv8sHp2ar25C5xpTD65jPH9Yc/QYfyvViPP2YAy/+sdrfXuuYi6X94A60Rv7URWWz2nvGXVvLusjXGBwbnq8cWuWIw9Z9Sr6viTNWcuX+WifuoAQ2xisEVnjHoRW3HrG8P7gMElpnqGL/O/+vGF/XNPuJ9gi8n3up/4Wmf+q8b0eE6IrQZHj12/M7YG5i+++1JzMbauqcNv9BWjvh1wiSufcTXG82ZuchjTY9RYfcBln5mD1/eP883ebO1J9nC4pq+5Obf/B/ANquI=
   </data>
  </layer>
  <layer id="3" name="Above" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eAHFVkEKAjEMrILoXRAE/+HH9IX+QE+KCvoSG+rAkI3rrFkwsKRJk5lM28OW0uy2fi9Ed63192VcbFi2H5nC85hHnePmJoscnqKDGRRNz6rbn53Cs5uVsq+fomladX+6G543sz6sut2Kjm5Xy5w2zUOnRceAo1U1fRk+4PzD291kZvf9Po40KTVRn+WsF3au60tPjLohnvG5j3k4P8aasXlt2F5jhs+wYJ4H+YzPYA55EzgTeJ45yvG+rb+9dz4n7lWw/ftRdSnYPMtQHX138wu3nwUxeMbEBJZ5GHgQq56xVAylh2v8LMZj+/Z5w57PZ2NVW8Szff+rsCbGewGiKFl9
+   eAHFVkEKAjEMrILgXRAEL/opP6Yv9Ad6UlRs6A4M2bjOmgUDS5o0mcm0PWwpzZ6bbiG6R61/reJiw7L9yBSe2TLqnDa3S3IoOnhiRdO8zuTPTuE5Lko51U/RtK8cn+6G582sz+t+t6Kj39Uy123z0GnRJeBoVU1fhg84//B2N5nZfb+PI01KTdRnOeuF3er6PhCjboxnfO5jHs5PsWZsXhu215jhMyyY50E+4zOYY94EzgSeZ45yvG/rb++dz4l7FWz/flRdCjbPMlbH0N38wu1nQQyeKTGBZR4GHsSqZywVQ+nhGj+L8di+fd6w5/PZWNUW8Ry6fxXWxHhv141jAA==
   </data>
  </layer>
  <layer id="4" name="Above_replace" width="25" height="25" visible="0">
   <data encoding="base64" compression="zlib">
-   eAFjYBgFoyEwGgKDIQRaBGjvClrbcUuSgYHWdtA+lEZtGA2B0RAYDYGhEQIAUygCsA==
+   eAFjYBgFoyEwGgKDIQSWCNDeFbS245ckAwOt7aB9KI3aMBoCoyEwGgJDIwQAMVUDMA==
   </data>
  </layer>
  <layer id="5" name="Walkable" width="25" height="25" visible="0">
   <data encoding="base64" compression="zlib">
-   eAHNjwEKwzAMA/uK/f8L/eEmxoEwcew0GczQypYlub1f13V/nqqkOfH8yx19x87/VP/BfueGvFXt5uP/9Z0q3/d8E//vs/fy+Izes7o93iwPnrw4w6/giYx4j8yIrmPn3KyX3iv6maNu5vFd1Xs+PZ44w68gGSNcyelqqzvsu3mZjhzHTPuU92z1K4W38qBzdE/Go2HPPEI0IJo4wztGTZzRwgtVzN+pfnf0aMAstdpnPvF4HZ2febs7z/a+63ed+9VTkZ/t8DiO/Kc43elmvQHo9s+O
+   eAHNjwEKwzAMA/uK/f9L/dEmxoEwcew0GczQypYlub1f13V/nqqkOfH8yx19x87/VP/BfueGvFXt5uP/9Z0q3/d8E//vs/fy+Izes7o93iwPnrw4w6/giYx4j8yIrmPn3KyX3iv6maNu5vFd1Xs+PZ44w68gGSNcyelqqzvsu3mZjhzHTPuU92z1K4W38qBzdE/Go2HPPEI0IJo4wztGTZzRwgtVzN+pfnf0aMAstdpnPvF4HZ2febs7z/a+63ed+9VTkZ/t8DiO/Kc43elmvQG7qPDu
   </data>
  </layer>
  <layer id="6" name="Walkable_replace" width="25" height="25" visible="0">
   <data encoding="base64" compression="zlib">
-   eAFjYBgFoyEwGgKDIQQ2itHeFbS2A2Q+re2gfSiN2jAaAqMhMBoCQyMEAN77Ax0=
+   eAFjYBgFoyEwGgKDIQQuitHeFbS2A2Q+re2gfSiN2jAaAqMhMBoCQyMEAL0oA50=
   </data>
  </layer>
  <layer id="7" name="Above_replace2" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eAFjYBgFoyEwGgKjIUCdELglSR1zRk0ZDYHREBgNgdEQIBwCADcSAPQ=
+   eAFjYBgFoyEwGgKjIUCdEPglSR1zRk0ZDYHREBgNgdEQIBwCAOWSARQ=
   </data>
  </layer>
  <layer id="8" name="Walkable_replace2" width="25" height="25" visible="0">
@@ -263,6 +263,7 @@
    </properties>
   </object>
   <object id="10" name="achieve_road" type="script" x="128" y="224" width="32" height="256"/>
+  <object id="20" name="burhczyd_check13" type="script" x="544" y="224" width="64" height="32"/>
  </objectgroup>
  <objectgroup id="10" name="Spawn" visible="0">
   <object id="11" name="ff_outsideguard" type="spawn" x="640" y="224" width="32" height="32">

AndorsTrail/res/xml/stoutford_se.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="32" height="18" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="16">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="32" height="18" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="16">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -222,7 +222,7 @@
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="4" name="burhczyd_check5" type="script" x="384" y="480" width="96" height="32"/>
+  <object id="4" name="burhczyd_check5" type="script" x="384" y="288" width="96" height="32"/>
   <object id="5" name="farmer2" type="mapchange" x="864" y="480" width="32" height="32">
    <properties>
     <property name="map" value="stoutford_farmhouse2"/>

ContentFormatReference/AndorsTrail_ContentFormatReference.md

@@ -827,7 +827,11 @@ A **dialogue** ***can*** have the following fields defined:
 
 
 - A **reward** ***must*** have the following fields defined:
-  - "rewardType" with one of the following values: "**questProgress**", "**removeQuestProgress**", "**dropList**", "**skillIncrease**", "**actorCondition**", "**actorConditionImmunity**", "**alignmentChange**", "**alignmentSet**", "**giveItem**", "**createTimer**", "**spawnAll**", "**removeSpawnArea**", "**deactivateSpawnArea**", "**activateMapObjectGroup**", "**deactivateMapObjectGroup**", "**changeMapFilter**", "**mapchange**". Explanation for all rewards type, and associated constraints on the other fields of a reply definition is below.
+  - "rewardType" with one of the following values: "**questProgress**", "**removeQuestProgress**", "**dropList**", "**skillIncrease**", 
+    "**actorCondition**", "**actorConditionImmunity**", "**alignmentChange**", "**alignmentSet**", "**alignmentToReg1**", "**alignmentFromReg1**",
+    "**alignmentAdd**", "**alignmentSub**", "**alignmentMult**", "**alignmentDiv**", "**giveItem**", "**createTimer**", "**spawnAll**", 
+    "**removeSpawnArea**", "**deactivateSpawnArea**", "**activateMapObjectGroup**", "**deactivateMapObjectGroup**", "**changeMapFilter**",
+    "**mapchange**". Explanation for all rewards type, and associated constraints on the other fields of a reply definition is below.
 
   - "rewardID" with a textual value generally matching the ID of a game object. As it depends on the "**rewardType**" selected, see below for details.