add dual wield definition to docs

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="80"
-	android:versionName="0.8.13dev"
+	android:versionCode="77"
+	android:versionName="0.8.11"
 	android:installLocation="auto"
 	>
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

@@ -24,15 +24,15 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.13dev";
+	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.11";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 80;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 77;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

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

@@ -38,10 +38,6 @@ public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {
 		tv.setText(conditionType.name);
 		world.tileManager.setImageViewTile(getResources(), tv, conditionType);
 
-		TextView descriptionTv = (TextView) findViewById(R.id.actorconditioninfo_description);
-		if(conditionType.description != null && !conditionType.description.isEmpty()) descriptionTv.setText(conditionType.description);
-		else descriptionTv.setVisibility(View.GONE);
-
 		Button b = (Button) findViewById(R.id.actorconditioninfo_close);
 		b.setOnClickListener(new OnClickListener() {
 			@Override

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

@@ -152,12 +152,6 @@ public final class DebugInterface {
 			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);
-			}
 		})
 		}));
 
@@ -319,13 +313,6 @@ public final class DebugInterface {
 			}
 		})
 
-				,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) {
@@ -358,14 +345,14 @@ public final class DebugInterface {
 				,new DebugButton("#1", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_9", "north", 5, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waterway11_east", "west", 0, 0);
 			}
 		})
 
 				,new DebugButton("#2", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crackshot_hideout3", "South", 0, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothtomb1", "north", 0, 0);
 			}
 		})
 
@@ -373,49 +360,49 @@ public final class DebugInterface {
 				,new DebugButton("#3", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "fallhaven_derelict2", "up", 0, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "mountainlake8", "north", 0, 0);
 			}
 		})
 
 				,new DebugButton("#4", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "loneford4", "south", 0, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waterway5", "south", 0, 0);
 			}
 		})
 
 				,new DebugButton("#5", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waytogalmore1", "entrance2", 0, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island1", "south2", 0, 0);
 			}
 		})
 
 				,new DebugButton("#6", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_32", "south", 19, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothmanor1", "down2", 0, 0);
 			}
 		})
 
 				,new DebugButton("#7", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "cabin_norcity_road1", "north", 5, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "final_cave1", "up", 0, 0);
 			}
 		})
 
 				,new DebugButton("#8", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_86", "west", 0, 5);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "bwmfill3", "north2", 0, 0);
 			}
 		})
 
 				,new DebugButton("#9", new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "elm_2f_2", "west", 5, 0);
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island2", "down", 0, 0);
 			}
 		})
 

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

@@ -67,10 +67,8 @@ public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 				itemType.effects_equip,
 				itemType.effects_use == null ? null : Collections.singletonList(itemType.effects_use),
 				itemType.effects_hit == null ? null : Collections.singletonList(itemType.effects_hit),
-				itemType.effects_miss == null ? null : Collections.singletonList(itemType.effects_miss),
 				itemType.effects_kill == null ? null : Collections.singletonList(itemType.effects_kill),
 				itemType.effects_hitReceived == null ? null : Collections.singletonList(itemType.effects_hitReceived),
-				itemType.effects_missReceived == null ? null : Collections.singletonList(itemType.effects_missReceived),
 				null,
 				itemType.isWeapon()
 			);

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

@@ -90,10 +90,8 @@ public final class MonsterInfoActivity extends AndorsTrailBaseActivity {
 				null,
 				null,
 				monster.getOnHitEffectsAsList(),
-				monster.getOnMissEffectsAsList(),
 				null,
 				monster.getOnHitReceivedEffectsAsList(),
-				monster.getOnMissReceivedEffectsAsList(),
 				monster.getOnDeathEffects(),
 				false);
 		hp.update(monster.getMaxHP(), monster.getCurrentHP());

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

@@ -196,7 +196,7 @@ public final class SkillInfoActivity extends AndorsTrailBaseActivity {
 		case armorProficiencyShield: return res.getString(R.string.skill_longdescription_armor_prof_shield, SkillCollection.PER_SKILLPOINT_INCREASE_SHIELD_PROF_DR);
 		case armorProficiencyUnarmored: return res.getString(R.string.skill_longdescription_armor_prof_unarmored, SkillCollection.PER_SKILLPOINT_INCREASE_UNARMORED_BC);
 		case armorProficiencyLight: return res.getString(R.string.skill_longdescription_armor_prof_light, SkillCollection.PER_SKILLPOINT_INCREASE_LIGHT_ARMOR_BC_PERCENT);
-		case armorProficiencyHeavy: return res.getString(R.string.skill_longdescription_armor_prof_heavy, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_USECOST_PERCENT);
+		case armorProficiencyHeavy: return res.getString(R.string.skill_longdescription_armor_prof_heavy, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT);
 		case fightstyleDualWield: return res.getString(R.string.skill_longdescription_fightstyle_dualwield, SkillCollection.DUALWIELD_EFFICIENCY_LEVEL0, SkillCollection.DUALWIELD_EFFICIENCY_LEVEL1, SkillCollection.DUALWIELD_LEVEL1_OFFHAND_AP_COST_PERCENT, SkillCollection.DUALWIELD_EFFICIENCY_LEVEL2);
 		case fightstyle2hand: return res.getString(R.string.skill_longdescription_fightstyle_2hand, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_2HAND_DMG_PERCENT);
 		case fightstyleWeaponShield: return res.getString(R.string.skill_longdescription_fightstyle_weapon_shield, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_WEAPON_AC_PERCENT, SkillCollection.PER_SKILLPOINT_INCREASE_FIGHTSTYLE_SHIELD_BC_PERCENT);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java

@@ -183,25 +183,19 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		);
 
 		ArrayList<ItemTraits_OnUse> effects_hit = new ArrayList<ItemTraits_OnUse>();
-		ArrayList<ItemTraits_OnUse> effects_miss = new ArrayList<ItemTraits_OnUse>();
 		ArrayList<ItemTraits_OnUse> effects_kill = new ArrayList<ItemTraits_OnUse>();
 		ArrayList<ItemTraits_OnHitReceived> effects_hitReceived = new ArrayList<ItemTraits_OnHitReceived>();
-		ArrayList<ItemTraits_OnHitReceived> effects_missReceived = new ArrayList<ItemTraits_OnHitReceived>();
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			ItemType type = player.inventory.getItemTypeInWearSlot(slot);
 			if (type == null) continue;
 			if (type.effects_hit != null) effects_hit.add(type.effects_hit);
-			if (type.effects_miss != null) effects_miss.add(type.effects_miss);
 			if (type.effects_kill != null) effects_kill.add(type.effects_kill);
 			if (type.effects_hitReceived != null) effects_hitReceived.add(type.effects_hitReceived);
-			if (type.effects_missReceived != null) effects_missReceived.add(type.effects_missReceived);
 		}
 		if (effects_hit.isEmpty()) effects_hit = null;
-		if (effects_miss.isEmpty()) effects_miss = null;
 		if (effects_kill.isEmpty()) effects_kill = null;
 		if (effects_hitReceived.isEmpty()) effects_hitReceived = null;
-		if (effects_missReceived.isEmpty()) effects_missReceived = null;
-		actorinfo_onhiteffects.update(null, null, effects_hit, effects_miss, effects_kill, effects_hitReceived,effects_missReceived, null, false);
+		actorinfo_onhiteffects.update(null, null, effects_hit, effects_kill, effects_hitReceived, null, false);
 
 
 		updateStatsTableRow(world.model.statistics.getNumberOfCompletedQuests(world), R.id.heroinfo_gamestats_quests, R.id.heroinfo_gamestats_quests_row);

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

@@ -76,7 +76,8 @@ public final class ActorStatsController {
 				c.magnitude -= magnitude;
 				actorConditionListeners.onActorConditionMagnitudeChanged(actor, c);
 			} else {
-				actorConditionsRemove(actor, c, i);
+				actor.conditions.remove(i);
+				actorConditionListeners.onActorConditionRemoved(actor, c);
 			}
 			break;
 		}
@@ -231,9 +232,9 @@ public final class ActorStatsController {
 	public void removeAllTemporaryConditions(final Actor actor) {
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.conditions.get(i);
-			if (c.isTemporaryEffect() || c.isDurationForeverUntilSleep()) {
-				actorConditionsRemove(actor, c, i);
-			}
+			if (!c.isTemporaryEffect()) continue;
+			actor.conditions.remove(i);
+			actorConditionListeners.onActorConditionRemoved(actor, c);
 		}
 	}
 
@@ -241,7 +242,8 @@ public final class ActorStatsController {
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.conditions.get(i);
 			if (!c.conditionType.conditionTypeID.equals(conditionTypeID)) continue;
-			actorConditionsRemove(actor, c, i);
+			actor.conditions.remove(i);
+			actorConditionListeners.onActorConditionRemoved(actor, c);
 		}
 	}
 
@@ -404,14 +406,14 @@ public final class ActorStatsController {
 			ActorCondition c = actor.conditions.get(i);
 			if (!c.isTemporaryEffect()) continue;
 			if (c.duration <= 1) {
-				actorConditionsRemove(actor, c, i);
+				actor.conditions.remove(i);
+				actorConditionListeners.onActorConditionRemoved(actor, c);
 				removedAnyConditions = true;
 			} else {
 				c.duration -= 1;
 				actorConditionListeners.onActorConditionDurationChanged(actor, c);
 			}
 		}
-		// Immunities
 		for(int i = actor.immunities.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.immunities.get(i);
 			if (!c.isTemporaryEffect()) continue;
@@ -455,50 +457,6 @@ public final class ActorStatsController {
 		}
 	}
 
-	int actorConditionsRemove(Actor actor, ActorCondition c, int i) {
-		int magnitude = 0;	//default: No condition from worn items
-
-		if (actor instanceof Player) {
-			Player player = (Player) actor;
-			magnitude = gotConditionFromWornItem(player, c);
-			if (magnitude > 0) {			//condition from worn items?
-				c.magnitude = magnitude;	// -> readd condition
-				actorConditionListeners.onActorConditionMagnitudeChanged(actor, c);
-				c.duration = ActorCondition.DURATION_FOREVER;
-				actorConditionListeners.onActorConditionDurationChanged(actor, c);
-			}
-		}
-		if (magnitude == 0) {
-			actor.conditions.remove(i);
-			actorConditionListeners.onActorConditionRemoved(actor, c);
-		}
-
-		return magnitude;
-	}
-
-	int gotConditionFromWornItem(Player player, ActorCondition c) {
-		int magnitude = 0;	//Default: No worn item with this condition
-
-		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
-			ItemType t = player.inventory.getItemTypeInWearSlot(slot);
-			if (t == null) continue;
-			ItemTraits_OnEquip equipEffects = t.effects_equip;
-			if (equipEffects == null) continue;
-			if (equipEffects.addedConditions == null) continue;
-			for (ActorConditionEffect e : equipEffects.addedConditions) {
-				if (e.conditionType.conditionTypeID.equals(c.conditionType.conditionTypeID)) {
-					if (e.magnitude == ActorCondition.MAGNITUDE_REMOVE_ALL) {
-						return 0;	//On an item-based immunity the result is always 0
-					}
-					if (magnitude < e.magnitude) {
-						magnitude = e.magnitude;
-					}
-				}
-			}
-		}
-		return magnitude;
-	}
-
 	public void applyUseEffect(Actor source, Actor target, ItemTraits_OnUse effect) {
 		if (effect == null) return;
 

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

@@ -250,8 +250,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		if (!loot.hasItemsOrGold()) {
 			world.model.currentMaps.map.removeGroundLoot(loot);
 		} else if (world.model.uiSelections.isInCombat) {
-			if(!killedMonsterBags.contains(loot))
-				killedMonsterBags.add(loot);
+			killedMonsterBags.add(loot);
 		}
 
 		combatActionListeners.onPlayerKilledMonster(killedMonster);
@@ -595,10 +594,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 
 	private AttackResult attack(final Actor attacker, final Actor target) {
 		int hitChance = getAttackHitChance(attacker, target);
-		if (!Constants.roll100(hitChance)) {
-			applyAttackMissStatusEffects(attacker, target);
-			return AttackResult.MISS;
-		}
+		if (!Constants.roll100(hitChance)) return AttackResult.MISS;
 
 		int damage = Constants.rollValue(attacker.getDamagePotential());
 		boolean isCriticalHit = false;
@@ -632,21 +628,6 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 	}
 
-	private void applyAttackMissStatusEffects(Actor attacker, Actor target) {
-		ItemTraits_OnUse[] onMissEffects = attacker.getOnMissEffects();
-		ItemTraits_OnHitReceived[] onMissReceivedEffects = target.getOnMissReceivedEffects();
-		if (onMissEffects != null) {
-			for (ItemTraits_OnUse e : onMissEffects) {
-				controllers.actorStatsController.applyUseEffect(attacker, target, e);
-			}
-		}
-		if (onMissReceivedEffects != null) {
-			for (ItemTraits_OnHitReceived e : onMissReceivedEffects) {
-				controllers.actorStatsController.applyHitReceivedEffect(target, attacker, e);
-			}
-		}
-	}
-
 	public void endOfCombatRound() {
 		world.model.worldData.tickWorldTime();
 		controllers.gameRoundController.resetRoundTimers();

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

@@ -195,27 +195,19 @@ public final class ItemController {
 
 	public static void recalculateHitEffectsFromWornItems(Player player) {
 		ArrayList<ItemTraits_OnUse> effects_onHit = null;
-		ArrayList<ItemTraits_OnUse> effects_onMiss = null;
 		ArrayList<ItemTraits_OnHitReceived> effects_onHitReceived = null;
-		ArrayList<ItemTraits_OnHitReceived> effects_onMissReceived = null;
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			ItemType type = player.inventory.getItemTypeInWearSlot(slot);
 			if (type == null) continue;
 			ItemTraits_OnUse eh = type.effects_hit;
 			ItemTraits_OnHitReceived ehr = type.effects_hitReceived;
-			ItemTraits_OnUse em = type.effects_miss;
-			ItemTraits_OnHitReceived emr = type.effects_missReceived;
-			if (eh == null && ehr == null && em == null && emr == null) continue;
+			if (eh == null && ehr == null) continue;
 
 			if (effects_onHit == null) effects_onHit = new ArrayList<ItemTraits_OnUse>();
 			if (eh != null) effects_onHit.add(eh);
-			if (effects_onMiss == null) effects_onMiss = new ArrayList<ItemTraits_OnUse>();
-			if (em != null) effects_onMiss.add(em);
 			
 			if (effects_onHitReceived == null) effects_onHitReceived = new ArrayList<ItemTraits_OnHitReceived>();
 			if (ehr != null) effects_onHitReceived.add(ehr);
-			if (effects_onMissReceived == null) effects_onMissReceived = new ArrayList<ItemTraits_OnHitReceived>();
-			if (emr != null) effects_onMissReceived.add(emr);
 		}
 
 		if (effects_onHit != null) {
@@ -225,13 +217,6 @@ public final class ItemController {
 		} else {
 			player.onHitEffects = null;
 		}
-		if (effects_onMiss != null) {
-			ItemTraits_OnUse[] effects_ = new ItemTraits_OnUse[effects_onMiss.size()];
-			effects_ = effects_onMiss.toArray(effects_);
-			player.onMissEffects = effects_;
-		} else {
-			player.onMissEffects = null;
-		}
 
 		if (effects_onHitReceived != null) {
 			ItemTraits_OnHitReceived[] effects_ = new ItemTraits_OnHitReceived[effects_onHitReceived.size()];
@@ -240,13 +225,6 @@ public final class ItemController {
 		} else {
 			player.onHitReceivedEffects = null;
 		}
-		if (effects_onMissReceived != null) {
-			ItemTraits_OnHitReceived[] effects_ = new ItemTraits_OnHitReceived[effects_onMissReceived.size()];
-			effects_ = effects_onMissReceived.toArray(effects_);
-			player.onMissReceivedEffects = effects_;
-		} else {
-			player.onMissReceivedEffects = null;
-		}
 	}
 
 	public void consumeNonItemLoot(Loot loot) {

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

@@ -253,7 +253,6 @@ public final class SkillController {
 					addPercentBlockChance(player, itemType, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT * skillLevelHeavyArmor, 0);
 					playerTraits.moveCost -= getPercentage(itemType.effects_equip.stats.increaseMoveCost, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT * skillLevelHeavyArmor, 0);
 					playerTraits.attackCost -= getPercentage(itemType.effects_equip.stats.increaseAttackCost, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT * skillLevelHeavyArmor, 0);
-					playerTraits.useItemCost -= getPercentage(itemType.effects_equip.stats.increaseUseItemCost, SkillCollection.PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_USECOST_PERCENT * skillLevelHeavyArmor, 0);
 				}
 			}
 		}

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

@@ -21,21 +21,14 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public final class VisualEffectController {
-	private static final long EFFECT_UPDATE_INTERVAL = 25;
+	private int effectCount = 0;
+
 	private final ControllerContext controllers;
 	private final WorldContext world;
 	private final VisualEffectCollection effectTypes;
-	private final Handler animationHandler = new Handler();
-	private final List<VisualEffectAnimation> activeAnimations = new ArrayList<>();
 
 	public final VisualEffectFrameListeners visualEffectFrameListeners = new VisualEffectFrameListeners();
-	private long getEffectUpdateInterval() {
-		return EFFECT_UPDATE_INTERVAL * controllers.preferences.attackspeed_milliseconds / AndorsTrailPreferences.ATTACKSPEED_DEFAULT_MILLISECONDS;
-	}
 	
 	public VisualEffectController(ControllerContext controllers, WorldContext world) {
 		this.controllers = controllers;
@@ -44,41 +37,11 @@ public final class VisualEffectController {
 	}
 
 	public void startEffect(Coord position, VisualEffectCollection.VisualEffectID effectID, String displayValue, VisualEffectCompletedCallback callback, int callbackValue) {
-		VisualEffectAnimation animation = new VisualEffectAnimation(effectTypes.getVisualEffect(effectID), position, displayValue, callback, callbackValue);
-		animation.start();
+		++effectCount;
+		(new VisualEffectAnimation(effectTypes.getVisualEffect(effectID), position, displayValue, callback, callbackValue))
+		.start();
 	}
 
-	private void startAnimation(VisualEffectAnimation animation) {
-		activeAnimations.add(animation);
-		animation.update();
-		if (activeAnimations.size() == 1) {
-			animationHandler.postDelayed(animationRunnable, 0);
-		}
-	}
-
-	private final Runnable animationRunnable = new Runnable() {
-		@Override
-		public void run() {
-			if(!activeAnimations.isEmpty()) {
-				long updateInterval = getEffectUpdateInterval();
-				if(updateInterval > 0) animationHandler.postDelayed(this, updateInterval);
-
-				for (int i = 0; i < activeAnimations.size(); i++) {
-					VisualEffectAnimation animation = activeAnimations.get(i);
-					animation.durationPassed += updateInterval;
-					animation.updateFrame();
-					animation.update();
-					if (controllers.preferences.attackspeed_milliseconds <= 0  ||  animation.currentFrame >= animation.effect.lastFrame) {
-						animation.onCompleted();
-						activeAnimations.remove(i);
-						i--;
-					}
-				}
-				visualEffectFrameListeners.onNewAnimationFrames(activeAnimations);
-			}
-		}
-	};
-
 	private VisualEffectCollection.VisualEffectID enqueuedEffectID = null;
 	private int enqueuedEffectValue = 0;
 	public void enqueueEffect(VisualEffectCollection.VisualEffectID effectID, int displayValue) {
@@ -97,13 +60,15 @@ public final class VisualEffectController {
 	}
 	
 	public void startActorMoveEffect(Actor actor, PredefinedMap map, Coord origin, Coord destination, int duration, VisualEffectCompletedCallback callback, int callbackValue) {
+		++effectCount;
 		(new SpriteMoveAnimation(origin, destination, duration, actor, map, callback, callbackValue))
 		.start();
 	}
 
-	public final class SpriteMoveAnimation implements Runnable {
-		private final Handler handler = new Handler();
-
+	public final class SpriteMoveAnimation extends Handler implements Runnable {
+		
+//		private static final int millisecondsPerFrame=25;
+		
 		private final VisualEffectCompletedCallback callback;
 		private final int callbackValue;
 
@@ -117,6 +82,11 @@ public final class VisualEffectController {
 		@Override
 		public void run() {
 			onCompleted();
+//			update();
+//			if (System.currentTimeMillis() - actor.vfxStartTime >= duration) {
+//			} else {
+//				postDelayed(this, millisecondsPerFrame);
+//			}
 		}
 		
 		public SpriteMoveAnimation(Coord origin, Coord destination, int duration, Actor actor, PredefinedMap map, VisualEffectCompletedCallback callback, int callbackValue) {
@@ -129,12 +99,19 @@ public final class VisualEffectController {
 			this.destination = destination;
 
 		}
+		
+//		private void update() {
+//			
+//			visualEffectFrameListeners.onNewSpriteMoveFrame(this);
+//		}
 
 		private void onCompleted() {
+			--effectCount;
 			actor.hasVFXRunning = false;
 			if (callback != null) callback.onVisualEffectCompleted(callbackValue);
 			visualEffectFrameListeners.onSpriteMoveCompleted(this);
 		}
+		
 
 		public void start() {
 			actor.hasVFXRunning = true;
@@ -143,9 +120,12 @@ public final class VisualEffectController {
 			visualEffectFrameListeners.onSpriteMoveStarted(this);
 			if (duration == 0 || !controllers.preferences.enableUiAnimations) onCompleted();
 			else {
-				handler.postDelayed(this, duration);
+				postDelayed(this, duration);
 			}
 		}
+		
+		
+		
 	}
 
 	public static final Paint textPaint = new Paint();
@@ -154,45 +134,41 @@ public final class VisualEffectController {
 		textPaint.setAlpha(255);
 		textPaint.setTextAlign(Align.CENTER);
 	}
+	
+	public final class VisualEffectAnimation extends Handler implements Runnable {
 
-	/// only for combat effects, movement & blood splatters etc. are handled elsewhere.
-	public final class VisualEffectAnimation  {
-		public int tileID;
-		public int textYOffset;
-		public long durationPassed = 0;
-
-		private void updateFrame() {
-			long frameDuration = (long) effect.millisecondPerFrame * controllers.preferences.attackspeed_milliseconds / AndorsTrailPreferences.ATTACKSPEED_DEFAULT_MILLISECONDS;
-			while (frameDuration > 0 && durationPassed > frameDuration) {
-				currentFrame++;
-				durationPassed -= frameDuration;
+		@Override
+		public void run() {
+			if (currentFrame >= effect.lastFrame) {
+				onCompleted();
+			} else {
+				postDelayed(this, effect.millisecondPerFrame * controllers.preferences.attackspeed_milliseconds / AndorsTrailPreferences.ATTACKSPEED_DEFAULT_MILLISECONDS);
+				update();
 			}
 		}
+
 		private void update() {
-			if (currentFrame >= effect.lastFrame) {
-				return;
+			++currentFrame;
+			int frame = currentFrame;
+
+			int tileID = effect.frameIconIDs[frame];
+			int textYOffset = -2 * (frame);
+			if (frame >= beginFadeAtFrame && displayText != null) {
+				textPaint.setAlpha(255 * (effect.lastFrame - frame) / (effect.lastFrame - beginFadeAtFrame));
 			}
-
-			tileID = effect.frameIconIDs[currentFrame];
-			textYOffset = -2 * (currentFrame);
-
-			if (currentFrame >= beginFadeAtFrame && displayText != null) {
-				textPaint.setAlpha(255 * (effect.lastFrame - currentFrame) / (effect.lastFrame - beginFadeAtFrame));
-			}
-
 			area.topLeft.y = position.y - 1;
+			visualEffectFrameListeners.onNewAnimationFrame(this, tileID, textYOffset);
 		}
 
 		private void onCompleted() {
+			--effectCount;
 			visualEffectFrameListeners.onAnimationCompleted(this);
 			if (callback != null) callback.onVisualEffectCompleted(callbackValue);
 		}
 
 		public void start() {
-            if (!controllers.preferences.enableUiAnimations
-					|| effect.duration == 0
-					|| controllers.preferences.attackspeed_milliseconds <= 0) onCompleted();
-            else startAnimation(this);
+			if (!controllers.preferences.enableUiAnimations) onCompleted();
+			else postDelayed(this, 0);
 		}
 
 		private int currentFrame = 0;
@@ -221,7 +197,7 @@ public final class VisualEffectController {
 			this.area = new CoordRect(new Coord(position.x - (widthNeededInTiles / 2), position.y - 1), new Size(widthNeededInTiles, 2));
 			this.beginFadeAtFrame = effect.lastFrame / 2;
 		}
-
+		
 		public Paint getTextPaint(){
 			return textPaint;
 		}
@@ -232,7 +208,7 @@ public final class VisualEffectController {
 	}
 
 	public boolean isRunningVisualEffect() {
-		return !activeAnimations.isEmpty();
+		return effectCount > 0;
 	}
 
 
@@ -292,10 +268,10 @@ public final class VisualEffectController {
 			return -1;
 		}
 	}
-
+	
 	public void asyncUpdateArea(CoordRect area) {
 		visualEffectFrameListeners.onAsyncAreaUpdate(area);
 	}
 
-
+	
 }

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

@@ -25,7 +25,6 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
 import com.gpl.rpg.AndorsTrail.model.map.MapLayer;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
@@ -315,32 +314,4 @@ public final class WorldMapController {
 
 		return true;
 	}
-
-	public static void populateWorldMap(Context context, WorldContext world, Resources res) throws IOException {
-		ensureWorldmapDirectoryExists(context);
-		File dir = getWorldmapDirectory(context);
-
-		File idFile = new File(dir, world.model.player.id);
-		if (idFile.exists()) return;
-		idFile.createNewFile();
-
-		for (PredefinedMap map : world.maps.getAllMaps()) {
-			if (!map.visited) continue;
-
-			String worldMapSegmentName = world.maps.getWorldMapSegmentNameForMap(map.name);
-			if (worldMapSegmentName == null) continue;
-
-			boolean mapFileExists = fileForMapExists(context, map);
-			File worldMapFile = getCombinedWorldMapFile(context, worldMapSegmentName);
-			if (mapFileExists && worldMapFile.exists()) continue;
-
-			LayeredTileMap mapTiles = TMXMapTranslator.readLayeredTileMap(res, world.tileManager.tileCache, map);
-			mapTiles.changeColorFilter(map.currentColorFilter);
-			TileCollection cachedTiles = world.tileManager.loadTilesFor(map, mapTiles, world, res);
-
-			MapRenderer renderer = new MapRenderer(world, map, mapTiles, cachedTiles);
-			updateCachedBitmap(context, map, renderer);
-			updateWorldMapSegment(context, res, world, worldMapSegmentName);
-		}
-	}
 }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java

@@ -4,10 +4,8 @@ import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnima
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
-import java.util.List;
-
 public interface VisualEffectFrameListener {
-	void onNewAnimationFrames(List<VisualEffectAnimation> effects);
+	void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset);
 	void onAnimationCompleted(VisualEffectAnimation animation);
 	void onSpriteMoveStarted(SpriteMoveAnimation animation);
 	void onNewSpriteMoveFrame(SpriteMoveAnimation animation);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java

@@ -5,12 +5,10 @@ import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAni
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
-import java.util.List;
-
 public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffectFrameListener> implements VisualEffectFrameListener {
 
-	private final Function1<VisualEffectFrameListener, List<VisualEffectAnimation>> onNewAnimationFrames = new Function1<VisualEffectFrameListener, List<VisualEffectAnimation>>() {
-		@Override public void call(VisualEffectFrameListener listener, List<VisualEffectAnimation> effects) { listener.onNewAnimationFrames(effects); }
+	private final Function3<VisualEffectFrameListener, VisualEffectAnimation, Integer, Integer> onNewAnimationFrame = new Function3<VisualEffectFrameListener, VisualEffectAnimation, Integer, Integer>() {
+		@Override public void call(VisualEffectFrameListener listener, VisualEffectAnimation animation, Integer tileID, Integer textYOffset) { listener.onNewAnimationFrame(animation, tileID, textYOffset); }
 	};
 
 	private final Function1<VisualEffectFrameListener, VisualEffectAnimation> onAnimationCompleted = new Function1<VisualEffectFrameListener, VisualEffectAnimation>() {
@@ -32,10 +30,10 @@ public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffe
 	private final Function1<VisualEffectFrameListener, CoordRect> onAsyncAreaUpdate = new Function1<VisualEffectFrameListener, CoordRect>() {
 		@Override public void call(VisualEffectFrameListener listener, CoordRect area) { listener.onAsyncAreaUpdate(area); }
 	};
-
+	
 	@Override
-	public void onNewAnimationFrames(List<VisualEffectAnimation> effects) {
-		callAllListeners(this.onNewAnimationFrames, effects);
+	public void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset) {
+		callAllListeners(this.onNewAnimationFrame, animation, tileID, textYOffset);
 	}
 
 	@Override

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java

@@ -9,7 +9,6 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 public final class ActorCondition {
 	public static final int MAGNITUDE_REMOVE_ALL = -99;
 	public static final int DURATION_FOREVER = 999;
-	public static final int DURATION_FOREVER_UNTIL_SLEEP = 998;
 	public static final int DURATION_NONE = 0;
 
 	public final ActorConditionType conditionType;
@@ -28,12 +27,7 @@ public final class ActorCondition {
 
 	public boolean isTemporaryEffect() { return isTemporaryEffect(duration); }
 	public static boolean isTemporaryEffect(int duration) {
-		return ( duration != DURATION_FOREVER && duration != DURATION_FOREVER_UNTIL_SLEEP );
-	}
-
-	public boolean isDurationForeverUntilSleep() { return isDurationForeverUntilSleep(duration); }
-	public static boolean isDurationForeverUntilSleep(int duration) {
-		return ( duration == DURATION_FOREVER_UNTIL_SLEEP );
+		return duration != DURATION_FOREVER;
 	}
 
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java

@@ -10,7 +10,6 @@ public final class ActorConditionType {
 
 	public final String conditionTypeID;
 	public final String name;
-	public final String description;
 	public final int iconID;
 	public final ConditionCategory conditionCategory;
 	public final boolean isStacking;
@@ -22,7 +21,6 @@ public final class ActorConditionType {
 	public ActorConditionType(
 			String conditionTypeID
 			, String name
-			, String description
 			, int iconID
 			, ConditionCategory conditionCategory
 			, boolean isStacking
@@ -33,7 +31,6 @@ public final class ActorConditionType {
 	) {
 		this.conditionTypeID = conditionTypeID;
 		this.name = name;
-		this.description = description;
 		this.iconID = iconID;
 		this.conditionCategory = conditionCategory;
 		this.isStacking = isStacking;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java

@@ -112,7 +112,6 @@ public final class SkillCollection {
 	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT = 20;
 	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT = 25;
 	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT = 25;
-	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_USECOST_PERCENT = 25;
 	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_2HAND_DMG_PERCENT = 30;
 	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_DMG_PERCENT = 50;
 	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_AC_PERCENT = 20;
@@ -187,12 +186,12 @@ public final class SkillCollection {
 		initializeSkill(new SkillInfo(SkillID.resistanceBlood, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, SkillCategory.immunity, null, position++));
 		initializeSkill(new SkillInfo(SkillID.shadowBless, 1, SkillInfo.LevelUpType.onlyByQuests, SkillCategory.immunity, null, position++));
 		initializeSkill(new SkillInfo(SkillID.crit1, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.criticals, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 2)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 2)
+			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 3)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 3)
 		}, position++));
 		initializeSkill(new SkillInfo(SkillID.crit2, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.criticals, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 4)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 4)
+			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 6)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 6)
 			,SkillLevelRequirement.requireOtherSkill(SkillID.crit1, 1)
 		}, position++));
 		initializeSkill(new SkillInfo(SkillID.rejuvenation, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.immunity, new SkillLevelRequirement[] {

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

@@ -35,9 +35,7 @@ public class Actor {
 	public int blockChance;
 	public int damageResistance;
 	public ItemTraits_OnUse[] onHitEffects;
-	public ItemTraits_OnUse[] onMissEffects;
 	public ItemTraits_OnHitReceived[] onHitReceivedEffects;
-	public ItemTraits_OnHitReceived[] onMissReceivedEffects;
 	public ItemTraits_OnUse onDeathEffects;
 	public boolean hasVFXRunning = false;
 	public long vfxStartTime = 0;
@@ -71,12 +69,8 @@ public class Actor {
 	public int getDamageResistance() { return damageResistance; }
 	public ItemTraits_OnUse[] getOnHitEffects() { return onHitEffects; }
 	public List<ItemTraits_OnUse> getOnHitEffectsAsList() { return onHitEffects == null ? null : Arrays.asList(onHitEffects); }
-	public ItemTraits_OnUse[] getOnMissEffects() { return onMissEffects; }
-	public List<ItemTraits_OnUse> getOnMissEffectsAsList() { return onMissEffects == null ? null : Arrays.asList(onMissEffects); }
 	public ItemTraits_OnHitReceived[] getOnHitReceivedEffects() { return onHitReceivedEffects; }
 	public List<ItemTraits_OnHitReceived> getOnHitReceivedEffectsAsList() { return onHitReceivedEffects == null ? null : Arrays.asList(onHitReceivedEffects); }
-	public ItemTraits_OnHitReceived[] getOnMissReceivedEffects() { return onMissReceivedEffects; }
-	public List<ItemTraits_OnHitReceived> getOnMissReceivedEffectsAsList() { return onMissReceivedEffects == null ? null : Arrays.asList(onMissReceivedEffects); }
 	public ItemTraits_OnUse getOnDeathEffects() { return onDeathEffects; }
 	
 	public boolean hasCriticalSkillEffect() { return getCriticalSkill() != 0; }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/item/ItemType.java

@@ -33,10 +33,8 @@ public final class ItemType {
 	public final ItemTraits_OnEquip effects_equip;
 	public final ItemTraits_OnUse effects_use;
 	public final ItemTraits_OnUse effects_hit;
-	public final ItemTraits_OnUse effects_miss;
 	public final ItemTraits_OnUse effects_kill;
 	public final ItemTraits_OnHitReceived effects_hitReceived;
-	public final ItemTraits_OnHitReceived effects_missReceived;
 
 	public ItemType(
 			String id
@@ -50,10 +48,8 @@ public final class ItemType {
 			, ItemTraits_OnEquip effects_equip
 			, ItemTraits_OnUse effects_use
 			, ItemTraits_OnUse effects_hit
-			, ItemTraits_OnUse effects_miss
 			, ItemTraits_OnUse effects_kill
 			, ItemTraits_OnHitReceived effects_hitReceived
-			, ItemTraits_OnHitReceived effects_missReceived
 	) {
 		this.id = id;
 		this.iconID = iconID;
@@ -67,10 +63,8 @@ public final class ItemType {
 		this.effects_equip = effects_equip;
 		this.effects_use = effects_use;
 		this.effects_hit = effects_hit;
-		this.effects_miss = effects_miss;
 		this.effects_kill = effects_kill;
 		this.effects_hitReceived = effects_hitReceived;
-		this.effects_missReceived = effects_missReceived;
 		this.hasPersonalizedName = name.contains(Constants.PLACEHOLDER_PLAYERNAME);
 	}
 

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

@@ -256,14 +256,11 @@ public final class ResourceLoader {
 		final Size sz2x2 = new Size(2, 2);
 		final Size sz2x3 = new Size(2, 3);
 		final Size sz3x1 = new Size(3, 1);
-		final Size sz4x1 = new Size(4, 1);
 		final Size sz5x1 = new Size(5, 1);
 		final Size sz6x1 = new Size(6, 1);
 		final Size sz7x1 = new Size(7, 1);
-		final Size sz7x4 = new Size(7, 4);
 		final Size sz8x3 = new Size(8, 3);
 		final Size sz16x8 = new Size(16, 8);
-		final Size sz16x10 = new Size(16, 10);
 		final Size sz20x12 = new Size(20, 12);
 		final Size mapTileSize = new Size(16, 8);
 		final Size sz8x8 = new Size(8, 8);
@@ -283,7 +280,6 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.actorconditions_1, "actorconditions_1", new Size(14, 8), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", sz3x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_japozero, "actorconditions_japozero", new Size(16, 4), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.actorconditions_newb, "actorconditions_newb", new Size(20, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_omi1, "actorconditions_omi1", sz2x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.actorconditions_omi2, "actorconditions_omi2", sz5x1, sz1x1, mTileSize);
 		/*INSERT_ACTORCONDITIONS_TILESETS_HERE*/
@@ -325,19 +321,18 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_cyclops, "monsters_cyclops", sz1x1, sz2x3, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", sz1x1, sz2x2, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_demon2, "monsters_demon2", sz1x1, sz2x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_dogs, "monsters_dogs", sz7x4, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_dogs, "monsters_dogs", sz7x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_eye1, "monsters_eye1", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_eye2, "monsters_eye2", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_eye3, "monsters_eye3", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_eye4, "monsters_eye4", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_ghost1, "monsters_ghost1", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_hydra1, "monsters_hydra1", sz1x1, sz2x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", sz16x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_johny, "monsters_johny", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", sz6x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_karvis1, "monsters_karvis1", sz2x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", sz20x12, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_liches, "monsters_liches", new Size(4, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", sz1x1, sz1x1, mTileSize);
@@ -347,7 +342,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_misc, "monsters_misc", new Size(13, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_newb_1, "monsters_newb_1", new Size(40, 34), sz1x1, mTileSize);
 		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_3, "monsters_newb_3", new Size(10, 2), sz2x2, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_newb_4, "monsters_newb_4", new Size(4, 1), sz2x1, 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);
@@ -378,7 +373,7 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_omi1_b, "monsters_omi1_b", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_unknown, "monsters_unknown", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_arulirs, "monsters_arulirs", new Size(8, 2), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_fatboy73, "monsters_fatboy73", sz20x12, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.monsters_fatboy73, "monsters_fatboy73", new Size(20, 12), sz1x1, mTileSize);
         loader.prepareTileset(R.drawable.monsters_giantbasilisk, "monsters_giantbasilisk", sz1x1, sz2x2, mTileSize);
         loader.prepareTileset(R.drawable.monsters_gisons, "monsters_gisons", new Size(8, 2), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_bosses_2x2, "monsters_bosses_2x2", sz1x1, sz2x2, mTileSize);
@@ -387,12 +382,11 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_cats, "monsters_cats", new Size(10, 2), sz1x1, mTileSize);
 		/*INSERT_NPCS_TILESETS_HERE*/
 		
-		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", sz16x10, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_boats_1, "map_boats_1", new Size(16, 9), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_boats_1, "map_boats_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_border_1, "map_border_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_2, "map_bridge_2", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_brightport, "map_brightport", new Size(16, 7), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_broken_1, "map_broken_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_cavewall_1, "map_cavewall_1", new Size(18, 6), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_cavewall_2, "map_cavewall_2", new Size(18, 6), sz1x1, mTileSize);

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

@@ -26,7 +26,6 @@ public final class ActorConditionsTypeParser extends JsonCollectionParserFor<Act
 		ActorConditionType result = new ActorConditionType(
 				conditionTypeID
 				,translationLoader.translateActorConditionName(o.getString(JsonFieldNames.ActorCondition.name))
-				,translationLoader.translateActorConditionName(o.optString(JsonFieldNames.ActorCondition.description))
 				,ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.ActorCondition.iconID))
 				,ActorConditionType.ConditionCategory.valueOf(o.getString(JsonFieldNames.ActorCondition.category))
 				,o.optInt(JsonFieldNames.ActorCondition.isStacking) > 0

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

@@ -41,11 +41,9 @@ public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 		final ItemTraits_OnEquip equipEffect = itemTraitsParser.parseItemTraits_OnEquip(o.optJSONObject(JsonFieldNames.ItemType.equipEffect));
 		final ItemTraits_OnUse useEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.useEffect));
 		final ItemTraits_OnUse hitEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.hitEffect));
-		final ItemTraits_OnUse missEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.missEffect));
 		final ItemTraits_OnUse killEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.killEffect));
 		final ItemTraits_OnHitReceived hitReceivedEffect = itemTraitsParser.parseItemTraits_OnHitReceived(o.optJSONObject(JsonFieldNames.ItemType.hitReceivedEffect));
-		final ItemTraits_OnHitReceived missReceivedEffect = itemTraitsParser.parseItemTraits_OnHitReceived(o.optJSONObject(JsonFieldNames.ItemType.missReceivedEffect));
-
+		
 		final int baseMarketCost = o.optInt(JsonFieldNames.ItemType.baseMarketCost);
 		final boolean hasManualPrice = o.optInt(JsonFieldNames.ItemType.hasManualPrice, 0) > 0;
 		final ItemType itemType = new ItemType(
@@ -60,10 +58,8 @@ public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 				, equipEffect
 				, useEffect
 				, hitEffect
-				, missEffect
 				, killEffect
 				, hitReceivedEffect
-				, missReceivedEffect
 			);
 		return new Pair<String, ItemType>(id, itemType);
 	}

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

@@ -8,7 +8,6 @@ import org.xmlpull.v1.XmlPullParserException;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
@@ -25,13 +24,11 @@ public final class WorldMapParser {
 	}
 
 	private static void read(XmlResourceParser xrp, final MapCollection maps, final TranslationLoader translationLoader) {
-		String s = "";
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("WorldMapParser:");
 		try {
 			int eventType;
 			while ((eventType = xrp.next()) != XmlResourceParser.END_DOCUMENT) {
 				if (eventType == XmlResourceParser.START_TAG) {
-					s = xrp.getName();
+					String s = xrp.getName();
 					if (s.equals("segment")) {
 						WorldMapSegment segment = parseSegment(xrp, maps, translationLoader);
 						maps.worldMapSegments.put(segment.name, segment);
@@ -40,7 +37,7 @@ public final class WorldMapParser {
 			}
 			xrp.close();
 		} catch (Exception e) {
-			L.log("Error reading worldmap: " + s + " " + e.toString());
+			L.log("Error reading worldmap: " + e.toString());
 		}
 	}
 
@@ -49,13 +46,11 @@ public final class WorldMapParser {
 		final WorldMapSegment segment = new WorldMapSegment(segmentName);
 
 		final ArrayList<Pair<String, String>> mapsInNamedAreas = new ArrayList<Pair<String,String>>();
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("segment: " + segmentName);
 		XmlResourceParserUtils.readCurrentTagUntilEnd(xrp, new XmlResourceParserUtils.TagHandler() {
 			@Override
 			public void handleTag(XmlResourceParser xrp, String tagName) throws XmlPullParserException, IOException {
 				if (tagName.equals("map")) {
 					String mapName = xrp.getAttributeValue(null, "id");
-					if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("  map: " + mapName);
 					if (maps.findPredefinedMap(mapName) == null) return;
 					Coord mapPosition = new Coord(
 							xrp.getAttributeIntValue(null, "x", -1),
@@ -70,7 +65,6 @@ public final class WorldMapParser {
 					String id = xrp.getAttributeValue(null, "id");
 					String name = translationLoader.translateWorldmapLocation(xrp.getAttributeValue(null, "name"));
 					String type = xrp.getAttributeValue(null, "type");
-					if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("  namedarea: id=" + id + " name=" + name + " type=" + type);
 					segment.namedAreas.put(id, new NamedWorldMapArea(id, name, type));
 				}
 			}

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

@@ -4,7 +4,6 @@ public final class JsonFieldNames {
 	public static final class ActorCondition {
 		public static final String conditionTypeID = "id";
 		public static final String name = "name";
-		public static final String description = "description";
 		public static final String iconID = "iconID";
 		public static final String category = "category";
 		public static final String isStacking = "isStacking";
@@ -167,10 +166,8 @@ public final class JsonFieldNames {
 		public static final String equipEffect = "equipEffect";
 		public static final String useEffect = "useEffect";
 		public static final String hitEffect = "hitEffect";
-		public static final String missEffect = "missEffect";
 		public static final String killEffect = "killEffect";
 		public static final String hitReceivedEffect = "hitReceivedEffect";
-		public static final String missReceivedEffect = "missReceivedEffect";
 	}
 
 

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

@@ -76,17 +76,14 @@ public final class TileCache {
 			ResourceFileTile tile = resourceTiles[tileID];
 			if(tile == null && AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
 				L.log("could not find resourceTiles for id: " + tileID);
-				L.log("iconIDs: " + iconIDs);
 			}
-			if(tile != null || AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA){
-				SparseArray<ResourceFileTile> tiles = tilesToLoadPerSourceFile.get(tile.tileset);
-				if (tiles == null) {
-					tiles = new SparseArray<TileCache.ResourceFileTile>();
-					tilesToLoadPerSourceFile.put(tile.tileset, tiles);
-				}
-				tiles.put(tileID, tile);
-				maxTileID = Math.max(maxTileID, tileID);
+			SparseArray<ResourceFileTile> tiles = tilesToLoadPerSourceFile.get(tile.tileset);
+			if (tiles == null) {
+				tiles = new SparseArray<TileCache.ResourceFileTile>();
+				tilesToLoadPerSourceFile.put(tile.tileset, tiles);
 			}
+			tiles.put(tileID, tile);
+			maxTileID = Math.max(maxTileID, tileID);
 		}
 
 		boolean hasLoadedTiles = false;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/savegames/Savegames.java

@@ -27,7 +27,6 @@ import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
@@ -105,7 +104,7 @@ public final class Savegames {
 			}
 
 			FileInputStream fos = getInputFile(androidContext, slot);
-			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, androidContext, fos, fh);
+			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos, fh);
 			fos.close();
 			if (result == LoadSavegameResult.success && slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
                 // save to the quicksave slot before deleting the file
@@ -224,7 +223,7 @@ public final class Savegames {
 		dest.close();
 	}
 
-    public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, Context androidContext, InputStream inState, FileHeader fh) throws IOException {
+    public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState, FileHeader fh) throws IOException {
         DataInputStream src = new DataInputStream(inState);
         final FileHeader header = new FileHeader(src, fh.skipIcon);
         if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION)
@@ -232,7 +231,6 @@ public final class Savegames {
 
 		world.maps.readFromParcel(src, world, controllers, header.fileversion);
 		world.model = new ModelContainer(src, world, controllers, header.fileversion);
-		WorldMapController.populateWorldMap(androidContext, world, controllers.getResources());
 		src.close();
 		
 		if (header.fileversion < 45) {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/CoordRect.java

@@ -30,18 +30,6 @@ public final class CoordRect {
 		return true;
 	}
 
-	public static CoordRect union(CoordRect r1, CoordRect r2) {
-		int left = Math.min(r1.topLeft.x, r2.topLeft.x);
-		int top = Math.min(r1.topLeft.y, r2.topLeft.y);
-		int right = Math.max(r1.topLeft.x + r1.size.width, r2.topLeft.x + r2.size.width);
-		int bottom = Math.max(r1.topLeft.y + r1.size.height, r2.topLeft.y + r2.size.height);
-
-		int width = right - left;
-		int height = bottom - top;
-
-		return new CoordRect(new Coord(left, top), new Size(width, height));
-	}
-
 	/*
 	public static boolean contains(final int x, final int y, final Size size, final Coord p) {
 		if (p.x < x) return false;

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

@@ -292,8 +292,6 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 			}
 			if (condition.duration == ActorCondition.DURATION_FOREVER || condition.duration == ActorCondition.DURATION_NONE) {
 				duration = "\u221e";
-			} else if (condition.duration == ActorCondition.DURATION_FOREVER_UNTIL_SLEEP) {
-				duration = "";
 			} else {
 				duration = Integer.toString(condition.duration);
 			}

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

@@ -20,17 +20,13 @@ public final class ItemEffectsView extends LinearLayout {
 	private final ActorConditionEffectList itemeffect_onequip_conditions;
 	private final ItemEffectsView_OnUse itemeffect_onuse;
 	private final ItemEffectsView_OnUse itemeffect_onhit;
-	private final ItemEffectsView_OnUse itemeffect_onmiss;
 	private final ItemEffectsView_OnUse itemeffect_onkill;
 	private final ItemEffectsView_OnHitReceived itemeffect_onhitreceived;
-	private final ItemEffectsView_OnHitReceived itemeffect_onmissreceived;
 	private final ItemEffectsView_OnDeath itemeffect_ondeath;
 	private final TextView itemeffect_onuse_title;
 	private final TextView itemeffect_onhit_title;
-	private final TextView itemeffect_onmiss_title;
 	private final TextView itemeffect_onkill_title;
 	private final TextView itemeffect_onhitreceived_title;
-	private final TextView itemeffect_onmissreceived_title;
 	private final TextView itemeffect_ondeath_title;
 
 	public ItemEffectsView(Context context, AttributeSet attr) {
@@ -45,17 +41,13 @@ public final class ItemEffectsView extends LinearLayout {
 
 		itemeffect_onuse = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onuse);
 		itemeffect_onhit = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onhit);
-		itemeffect_onmiss = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onmiss);
 		itemeffect_onkill = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onkill);
 		itemeffect_onhitreceived = (ItemEffectsView_OnHitReceived) findViewById(R.id.itemeffect_onhitreceived);
-		itemeffect_onmissreceived = (ItemEffectsView_OnHitReceived) findViewById(R.id.itemeffect_onmissreceived);
 		itemeffect_ondeath = (ItemEffectsView_OnDeath) findViewById(R.id.itemeffect_ondeath);
 		itemeffect_onuse_title = (TextView) findViewById(R.id.itemeffect_onuse_title);
 		itemeffect_onhit_title = (TextView) findViewById(R.id.itemeffect_onhit_title);
-		itemeffect_onmiss_title = (TextView) findViewById(R.id.itemeffect_onmiss_title);
 		itemeffect_onkill_title = (TextView) findViewById(R.id.itemeffect_onkill_title);
 		itemeffect_onhitreceived_title = (TextView) findViewById(R.id.itemeffect_onhitreceived_title);
-		itemeffect_onmissreceived_title = (TextView) findViewById(R.id.itemeffect_onmissreceived_title);
 		itemeffect_ondeath_title = (TextView) findViewById(R.id.itemeffect_ondeath_title);
 	}
 
@@ -63,10 +55,8 @@ public final class ItemEffectsView extends LinearLayout {
 			ItemTraits_OnEquip effects_equip,
 			Collection<ItemTraits_OnUse> effects_use,
 			Collection<ItemTraits_OnUse> effects_hit,
-			Collection<ItemTraits_OnUse> effects_miss,
 			Collection<ItemTraits_OnUse> effects_kill,
 			Collection<ItemTraits_OnHitReceived> effects_hitreceived,
-			Collection<ItemTraits_OnHitReceived> effects_missreceived,
 			ItemTraits_OnUse effects_death,
 			boolean isWeapon
 			) {
@@ -100,12 +90,6 @@ public final class ItemEffectsView extends LinearLayout {
 		} else {
 			itemeffect_onhit_title.setVisibility(View.GONE);
 		}
-		itemeffect_onmiss.update(effects_miss);
-		if (effects_miss != null) {
-			itemeffect_onmiss_title.setVisibility(View.VISIBLE);
-		} else {
-			itemeffect_onmiss_title.setVisibility(View.GONE);
-		}
 
 		itemeffect_onkill.update(effects_kill);
 		if (effects_kill != null) {
@@ -120,12 +104,6 @@ public final class ItemEffectsView extends LinearLayout {
 		} else {
 			itemeffect_onhitreceived_title.setVisibility(View.GONE);
 		}
-		itemeffect_onmissreceived.update(effects_missreceived);
-		if (effects_missreceived != null) {
-			itemeffect_onmissreceived_title.setVisibility(View.VISIBLE);
-		} else {
-			itemeffect_onmissreceived_title.setVisibility(View.GONE);
-		}
 
 		itemeffect_ondeath.update(effects_death);
 		if (effects_death != null) {

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

@@ -1,7 +1,6 @@
 package com.gpl.rpg.AndorsTrail.view;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
@@ -159,8 +158,8 @@ public final class MainView extends SurfaceView
 //		this.surfaceSize = new Size(w, h);
 		this.surfaceSize = new Size((int) (getWidth() / scale), (int) (getHeight() / scale));
 		this.screenSizeTileCount = new Size(
-				 getWidth()  / scaledTileSize
-				,getHeight() / scaledTileSize
+				(int) Math.floor(getWidth() / scaledTileSize)
+				,(int) Math.floor(getHeight() / scaledTileSize)
 			);
 		
 		if (sh.getSurfaceFrame().right != surfaceSize.width || sh.getSurfaceFrame().bottom != surfaceSize.height) {
@@ -227,28 +226,28 @@ public final class MainView extends SurfaceView
 			if (scrolling && why != RedrawAllDebugReason.MapScrolling) return;
 			if (!scrolling && movingSprites > 0 && why != RedrawAllDebugReason.SpriteMoved) return;
 		}
-		redrawArea_(mapViewArea, null);
+		redrawArea_(mapViewArea, null, 0, 0);
 	}
 	private void redrawTile(final Coord p, RedrawTileDebugReason why) {
 		if (scrolling) return;
 		p1x1.topLeft.set(p);
-		redrawArea_(p1x1, null);
+		redrawArea_(p1x1, null, 0, 0);
 	}
 	private void redrawArea(final CoordRect area, RedrawAreaDebugReason why) {
 		if (scrolling) return;
-		redrawArea_(area, null);
+		redrawArea_(area, null, 0, 0);
 	}
-	private void redrawArea_(CoordRect area, final List<VisualEffectAnimation> effects) {
+	private void redrawArea_(CoordRect area, final VisualEffectAnimation effect, int tileID, int textYOffset) {
 		if (!hasSurface) return;
 
-
+		
 		if (!currentMap.intersects(area)) return;
 		if (!mapViewArea.intersects(area)) return;
 
 		if (shouldRedrawEverything()) {
 			area = mapViewArea;
 		}
-
+		
 		calculateRedrawRect(area);
 		redrawRect.intersect(redrawClip);
 		Canvas c = null;
@@ -264,7 +263,7 @@ public final class MainView extends SurfaceView
 			if (area == mapViewArea) {
 				area = adaptAreaToScrolling(area);
 			}
-
+			
 			synchronized (holder) { synchronized (tiles) {
 				int xScroll = 0;
 				int yScroll = 0;
@@ -276,25 +275,32 @@ public final class MainView extends SurfaceView
 				}
 				c.clipRect(redrawClip);
 				c.translate(screenOffset.x + xScroll, screenOffset.y + yScroll);
+//				c.scale(scale, scale);
 				doDrawRect(c, area);
-				renderEffects(c, effects);
+				if (effect != null) {
+					drawFromMapPosition(c, area, effect.position, tileID);
+					if (effect.displayText != null) {
+						drawEffectText(c, area, effect, textYOffset, effect.getTextPaint());
+					}
+				}
+
+//				c.drawRect(new Rect(
+//						(area.topLeft.x - mapViewArea.topLeft.x) * tileSize, 
+//						(area.topLeft.y - mapViewArea.topLeft.y) * tileSize, 
+//						(area.topLeft.x - mapViewArea.topLeft.x + area.size.width) * tileSize - 1, 
+//						(area.topLeft.y - mapViewArea.topLeft.y + area.size.height) * tileSize - 1),
+//						redrawHighlight);
+//				if (touchedTile != null) c.drawRect(new Rect(
+//						(touchedTile.x - mapViewArea.topLeft.x) * tileSize, 
+//						(touchedTile.y - mapViewArea.topLeft.y) * tileSize, 
+//						(touchedTile.x - mapViewArea.topLeft.x + 1) * tileSize - 1, 
+//						(touchedTile.y - mapViewArea.topLeft.y + 1) * tileSize - 1), 
+//						touchHighlight);
 			} }
 		} finally {
 			if (c != null) holder.unlockCanvasAndPost(c);
 		}
 	}
-
-	private void renderEffects(Canvas canvas ,List<VisualEffectAnimation> effects) {
-		if(effects == null) return;
-		for (VisualEffectAnimation effect : effects) {
-			int tileID = effect.tileID;
-			int textYOffset = effect.textYOffset;
-			drawFromMapPosition(canvas, effect.area, effect.position, tileID);
-			if (effect.displayText != null) {
-				drawEffectText(canvas, effect.area, effect, textYOffset, effect.getTextPaint());
-			}
-		}
-	}
 	
 	private boolean isRedrawRectWholeScreen(Rect redrawRect) {
 //		if (redrawRect.width() < mapViewArea.size.width * scaledTileSize) return false;
@@ -311,21 +317,11 @@ public final class MainView extends SurfaceView
 		return true;
 	}
 	private final Rect redrawRect = new Rect();
-	private void redrawAreaWithEffect(List<VisualEffectAnimation> effects) {
-		CoordRect area = null;
-		for (int i = 0; i < effects.size(); i++) {
-			VisualEffectAnimation effect = effects.get(i);
-			if (area == null) {
-				area = effect.area;
-			} else {
-				area = CoordRect.union(area, effect.area);
-			}
-		}
-		if (area != null) {
-			redrawArea_(area, effects);
-		}
+	private void redrawAreaWithEffect(final VisualEffectAnimation effect, int tileID, int textYOffset) {
+		CoordRect area = effect.area;
+//		if (shouldRedrawEverythingForVisualEffect()) area = mapViewArea;
+		redrawArea_(area, effect, tileID, textYOffset);
 	}
-
 	private void clearCanvas() {
 		if (!hasSurface) return;
 		Canvas c = null;
@@ -798,8 +794,8 @@ public final class MainView extends SurfaceView
 	}
 
 	@Override
-	public void onNewAnimationFrames(List<VisualEffectAnimation> effects) {
-		redrawAreaWithEffect(effects);
+	public void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset) {
+		redrawAreaWithEffect(animation, tileID, textYOffset);
 	}
 
 	@Override