diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml index 08ac9aaa2..77c4f4a10 100644 --- a/AndorsTrail/res/values/strings.xml +++ b/AndorsTrail/res/values/strings.xml @@ -504,7 +504,7 @@ When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks. About - + @@ -562,6 +562,7 @@ Re-equip cost (AP): Use item cost (AP): + %1$s moves. Combat log [Quest completed: \"%1$s\"] [Quest updated: \"%1$s\"] diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java index 44e615078..037170cce 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java @@ -323,6 +323,12 @@ public final class MainActivity extends Activity implements PlayerMovementListen } } + @Override + public void onMonsterMovedDuringCombat(Monster m) { + String monsterName = m.getName(); + message(getString(R.string.combat_result_monstermoved, monsterName)); + } + @Override public void onPlayerKilledMonster(Monster target) { } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index c9431f6a3..9099b617c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -15,6 +15,7 @@ import com.gpl.rpg.AndorsTrail.model.AttackResult; import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; 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.item.ItemTraits_OnUse; import com.gpl.rpg.AndorsTrail.model.item.Loot; @@ -296,34 +297,83 @@ public final class CombatController implements VisualEffectCompletedCallback { handleNextMonsterAction(); } - private Monster determineNextMonster(Monster previousMonster) { - if (previousMonster != null) { - if (previousMonster.hasAPs(previousMonster.getAttackCost())) return previousMonster; + private static final int ACTION_NONE = 0; + private static final int ACTION_ATTACK = 1; + private static final int ACTION_MOVE = 2; + private int determineNextMonsterAction(Coord playerPosition) { + if (currentActiveMonster != null) { + if (shouldAttackWithMonsterInCombat(currentActiveMonster, playerPosition)) return ACTION_ATTACK; } for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) { for (Monster m : a.monsters) { if (!m.isAgressive()) continue; - if (m.isAdjacentTo(world.model.player)) { - if (m.hasAPs(m.getAttackCost())) return m; + if (shouldAttackWithMonsterInCombat(m, playerPosition)) { + currentActiveMonster = m; + return ACTION_ATTACK; + } else if (shouldMoveMonsterInCombat(m, a, playerPosition)) { + currentActiveMonster = m; + return ACTION_MOVE; } } } - return null; + return ACTION_NONE; + } + + private static boolean shouldAttackWithMonsterInCombat(Monster m, Coord playerPosition) { + if (!m.hasAPs(m.getAttackCost())) return false; + if (!m.rectPosition.isAdjacentTo(playerPosition)) return false; + return true; + } + private static boolean shouldMoveMonsterInCombat(Monster m, MonsterSpawnArea a, Coord playerPosition) { + final int movementAggressionType = m.getMovementAggressionType(); + if (movementAggressionType == MonsterType.AGGRESSIONTYPE_NONE) return false; + + if (!m.hasAPs(m.getMoveCost())) return false; + if (m.position.isAdjacentTo(playerPosition)) return false; + + if (movementAggressionType == MonsterType.AGGRESSIONTYPE_PROTECT_SPAWN) { + if (a.area.contains(playerPosition)) return true; + } else if (movementAggressionType == MonsterType.AGGRESSIONTYPE_HELP_OTHERS) { + for (Monster o : a.monsters) { + if (o == m) continue; + if (o.rectPosition.isAdjacentTo(playerPosition)) return true; + } + } + return false; } private void handleNextMonsterAction() { if (!world.model.uiSelections.isMainActivityVisible) return; - currentActiveMonster = determineNextMonster(currentActiveMonster); - if (currentActiveMonster == null) { + int nextMonsterAction = determineNextMonsterAction(world.model.player.position); + if (nextMonsterAction == ACTION_NONE) { endMonsterTurn(); + } else if (nextMonsterAction == ACTION_ATTACK) { + attackWithCurrentMonster(); + } else if (nextMonsterAction == ACTION_MOVE) { + moveCurrentMonster(); + } + } + + private void moveCurrentMonster() { + controllers.actorStatsController.useAPs(currentActiveMonster, currentActiveMonster.getMoveCost()); + if (!controllers.monsterMovementController.findPathFor(currentActiveMonster, world.model.player.position)) { + // Couldn't find a path to move on. + handleNextMonsterAction(); return; } + + controllers.monsterMovementController.moveMonsterToNextPosition(currentActiveMonster, world.model.currentMap); + combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster); + waitForNextMonsterAction(); + } + + private void attackWithCurrentMonster() { controllers.actorStatsController.useAPs(currentActiveMonster, currentActiveMonster.getAttackCost()); - - combatTurnListeners.onMonsterIsAttacking(currentActiveMonster); + + combatTurnListeners.onMonsterIsAttacking(currentActiveMonster); AttackResult attack = monsterAttacks(currentActiveMonster); this.lastAttackResult = attack; @@ -337,7 +387,7 @@ public final class CombatController implements VisualEffectCompletedCallback { waitForNextMonsterAction(); } } - + private static final int CALLBACK_MONSTERATTACK = 0; private static final int CALLBACK_PLAYERATTACK = 1; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java index 9b299b3fe..3f13a3903 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java @@ -20,6 +20,8 @@ public final class Constants { public static final float EXP_FACTOR_SCALING = 0.7f; public static final int FLEE_FAIL_CHANCE_PERCENT = 20; public static final long MINIMUM_INPUT_INTERVAL = AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS ? 50 : 200; + public static final int MAX_MAP_WIDTH = 33; + public static final int MAX_MAP_HEIGHT = 33; public static final int MONSTER_MOVEMENT_TURN_DURATION_MS = 1200; public static final int ATTACK_ANIMATION_FPS = 10; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java index 6a01e1fcf..589cd5d0e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java @@ -3,16 +3,18 @@ package com.gpl.rpg.AndorsTrail.controller; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterMovementListeners; +import com.gpl.rpg.AndorsTrail.controller.PathFinder.EvaluateWalkable; import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap; import com.gpl.rpg.AndorsTrail.model.map.MapObject; +import com.gpl.rpg.AndorsTrail.model.actor.MonsterType; import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.CoordRect; -public final class MonsterMovementController { +public final class MonsterMovementController implements EvaluateWalkable { private final ControllerContext controllers; private final WorldContext world; public final MonsterMovementListeners monsterMovementListeners = new MonsterMovementListeners(); @@ -79,11 +81,7 @@ public final class MonsterMovementController { // Monster has been moving and arrived at the destination. cancelCurrentMonsterMovement(m); } else { - // Monster is moving. - m.nextPosition.topLeft.set( - m.position.x + sgn(m.movementDestination.x - m.position.x) - ,m.position.y + sgn(m.movementDestination.y - m.position.y) - ); + determineMonsterNextPosition(m, area, world.model.player.position); if (!monsterCanMoveTo(map, tileMap, m.nextPosition)) { cancelCurrentMonsterMovement(m); @@ -97,14 +95,26 @@ public final class MonsterMovementController { monsterMovementListeners.onMonsterSteppedOnPlayer(m); controllers.combatController.monsterSteppedOnPlayer(m); } else { - CoordRect previousPosition = new CoordRect(new Coord(m.position), m.rectPosition.size); - m.position.set(m.nextPosition.topLeft); - monsterMovementListeners.onMonsterMoved(map, m, previousPosition); + moveMonsterToNextPosition(m, map); } } } - private static void cancelCurrentMonsterMovement(final Monster m) { + private void determineMonsterNextPosition(Monster m, MonsterSpawnArea area, Coord playerPosition) { + if (m.getMovementAggressionType() == MonsterType.AGGRESSIONTYPE_PROTECT_SPAWN) { + if (area.area.contains(playerPosition)) { + if (findPathFor(m, playerPosition)) return; + } + } + + // 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) + ); + } + + private static void cancelCurrentMonsterMovement(final Monster m) { m.movementDestination = null; m.nextActionTime += getMillisecondsPerMove(m) * Constants.rollValue(Constants.monsterWaitTurns); } @@ -118,4 +128,20 @@ public final class MonsterMovementController { if (i >= 1) return 1; return 0; } + + private final PathFinder pathfinder = new PathFinder(Constants.MAX_MAP_WIDTH, Constants.MAX_MAP_HEIGHT, this); + public boolean findPathFor(Monster m, Coord to) { + return pathfinder.findPathBetween(m.rectPosition, to, m.nextPosition); + } + + @Override + public boolean isWalkable(CoordRect r) { + return monsterCanMoveTo(world.model.currentMap, world.model.currentTileMap, r); + } + + public void moveMonsterToNextPosition(Monster m, PredefinedMap map) { + CoordRect previousPosition = new CoordRect(new Coord(m.position), m.rectPosition.size); + m.position.set(m.nextPosition.topLeft); + monsterMovementListeners.onMonsterMoved(map, m, previousPosition); + } } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java new file mode 100644 index 000000000..31efbca3a --- /dev/null +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java @@ -0,0 +1,139 @@ +package com.gpl.rpg.AndorsTrail.controller; + +import java.util.Arrays; + +import com.gpl.rpg.AndorsTrail.util.Coord; +import com.gpl.rpg.AndorsTrail.util.CoordRect; + +public class PathFinder { + private final int maxWidth; + private final int maxHeight; + private final boolean visited[]; + private final ListOfCoords visitQueue; + private final EvaluateWalkable map; + public int iterations = 0; + + public PathFinder(int maxWidth, int maxHeight, EvaluateWalkable map) { + this.maxWidth = maxWidth; + this.maxHeight = maxHeight; + this.map = map; + this.visited = new boolean[maxWidth*maxHeight]; + this.visitQueue = new ListOfCoords(maxWidth*maxHeight); + } + + public interface EvaluateWalkable { + public boolean isWalkable(CoordRect r); + } + + public boolean findPathBetween(final CoordRect from, final Coord to, CoordRect nextStep) { + iterations = 0; + if (from.equals(to)) return false; + + Coord measureDistanceTo = from.topLeft; + Coord p = nextStep.topLeft; + Arrays.fill(visited, false); + visitQueue.reset(); + + visitQueue.push(to.x, to.y, 0); + visited[(to.y * maxWidth) + to.x] = true; + + while (!visitQueue.isEmpty()) { + visitQueue.popFirst(p); + ++iterations; + + if (iterations > 100) return false; + + if (from.isAdjacentTo(p)) return true; + + p.x -= 1; visit(nextStep, measureDistanceTo); + p.x += 2; visit(nextStep, measureDistanceTo); + p.x -= 1; p.y -= 1; visit(nextStep, measureDistanceTo); + p.y += 2; visit(nextStep, measureDistanceTo); + p.x -= 1; visit(nextStep, measureDistanceTo); + p.x += 2; visit(nextStep, measureDistanceTo); + p.y -= 2; visit(nextStep, measureDistanceTo); + p.x -= 2; visit(nextStep, measureDistanceTo); + } + return false; + } + + private void visit(CoordRect r, Coord measureDistanceTo) { + final int x = r.topLeft.x; + final int y = r.topLeft.y; + + if (x < 0) return; + if (y < 0) return; + if (x >= maxWidth) return; + if (y >= maxHeight) return; + + final int i = (y * maxWidth) + x; + if (visited[i]) return; + visited[i] = true; + if (!map.isWalkable(r)) return; + + int dx = (measureDistanceTo.x - x); + int dy = (measureDistanceTo.y - y); + visitQueue.push(x, y, dx * dx + dy * dy); + } + + private static final class ListOfCoords { + private final int coords[]; + private final int weights[]; + private final int maxIndex; + private int lastIndex; // Index of the last coord that was inserted + private int frontIndex; // Index to the first coord that is not discarded + private static final int DISCARDED = -1; + + public ListOfCoords(int maxSize) { + this.maxIndex = maxSize-1; + this.coords = new int[maxSize]; + this.weights = new int[maxSize]; + } + public void reset() { + lastIndex = -1; + frontIndex = 0; + } + private static int coordsToInt(int x, int y) { + return ((y << 8) & 0xff00) | (x & 0xff); + } + private static void intToCoords(int c, Coord dest) { + dest.x = c & 0xff; + dest.y = (c >> 8) & 0xff; + } + + public void push(int x, int y, int weight) { + if (lastIndex == maxIndex) return; + ++lastIndex; + coords[lastIndex] = coordsToInt(x, y); + weights[lastIndex] = weight; + } + + public int popFirst(Coord dest) { + int i = frontIndex; + int lowestWeightIndex = i; + int lowestWeight = weights[i]; + ++i; + for(;i <= lastIndex; ++i) { + if (weights[i] == DISCARDED) continue; + if (weights[i] < lowestWeight) { + lowestWeightIndex = i; + lowestWeight = weights[i]; + } + } + intToCoords(coords[lowestWeightIndex], dest); + weights[lowestWeightIndex] = DISCARDED; + + // Increase frontIndex to the first index that is not discarded. + while (frontIndex <= lastIndex) { + if (weights[frontIndex] == DISCARDED) ++frontIndex; + else break; + } + + return lowestWeight; + } + + public boolean isEmpty() { + return frontIndex > lastIndex; + } + } +} diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java index dadc26ef2..8fb4e1a8c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java @@ -8,6 +8,7 @@ public interface CombatActionListener { void onPlayerAttackSuccess(Monster target, AttackResult attackResult); void onMonsterAttackMissed(Monster attacker, AttackResult attackResult); void onMonsterAttackSuccess(Monster attacker, AttackResult attackResult); + void onMonsterMovedDuringCombat(Monster m); void onPlayerKilledMonster(Monster target); void onPlayerStartedFleeing(); void onPlayerFailedFleeing(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java index 86e150c75..464655646 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java @@ -21,8 +21,12 @@ public final class CombatActionListeners extends ListOfListeners onMonsterAttackSuccess = new Function2() { @Override public void call(CombatActionListener listener, Monster attacker, AttackResult attackResult) { listener.onMonsterAttackSuccess(attacker, attackResult); } }; - - private final Function1 onPlayerKilledMonster = new Function1() { + + private final Function1 onMonsterMovedDuringCombat = new Function1() { + @Override public void call(CombatActionListener listener, Monster m) { listener.onMonsterMovedDuringCombat(m); } + }; + + private final Function1 onPlayerKilledMonster = new Function1() { @Override public void call(CombatActionListener listener, Monster target) { listener.onPlayerKilledMonster(target); } }; @@ -58,6 +62,11 @@ public final class CombatActionListeners extends ListOfListeners 0 , o.optString(JsonFieldNames.Monster.faction, null) , o.optInt(JsonFieldNames.Monster.monsterClass, MonsterType.MONSTERCLASS_HUMANOID) + , o.optInt(JsonFieldNames.Monster.movementAggressionType, MonsterType.AGGRESSIONTYPE_NONE) , ResourceParserUtils.parseSize(o.optString(JsonFieldNames.Monster.size, null), size1x1) //TODO: This could be loaded from the tileset size instead. , ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.Monster.iconID)) , maxAP diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java index e33ae7879..59b221282 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java @@ -109,6 +109,7 @@ public final class JsonFieldNames { public static final String spawnGroup = "spawnGroup"; public static final String size = "size"; public static final String monsterClass = "monsterClass"; + public static final String movementAggressionType = "movementAggressionType"; public static final String unique = "unique"; public static final String faction = "faction"; public static final String maxHP = "maxHP"; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java index 5059e1517..60d23ce9c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java @@ -455,8 +455,13 @@ public final class MainView extends SurfaceView @Override public void onMonsterMoved(PredefinedMap map, Monster m, CoordRect previousPosition) { if (map != currentMap) return; - if (!mapViewArea.intersects(m.rectPosition)) return; - redrawNextTick = true; + if (!mapViewArea.intersects(m.rectPosition) && !mapViewArea.intersects(previousPosition)) return; + if (model.uiSelections.isInCombat) { + redrawArea(previousPosition, REDRAW_AREA_MONSTER_MOVED); + redrawArea(m.rectPosition, REDRAW_AREA_MONSTER_MOVED); + } else { + redrawNextTick = true; + } } @Override diff --git a/AndorsTrailEdit/js/defaults.js b/AndorsTrailEdit/js/defaults.js index d6e8f1210..c742f02f5 100644 --- a/AndorsTrailEdit/js/defaults.js +++ b/AndorsTrailEdit/js/defaults.js @@ -34,6 +34,7 @@ var ATEditor = (function(ATEditor, _) { ,moveCost: 10 ,unique: 0 ,monsterClass: 0 + ,movementAggressionType: 0 ,attackDamage: {} ,hitEffect: { increaseCurrentHP: {}, increaseCurrentAP: {}, conditionsSource: [], conditionsTarget: [] } } diff --git a/AndorsTrailEdit/partials/edit_monster.html b/AndorsTrailEdit/partials/edit_monster.html index c5be63e54..b97cc6c08 100644 --- a/AndorsTrailEdit/partials/edit_monster.html +++ b/AndorsTrailEdit/partials/edit_monster.html @@ -65,6 +65,14 @@ +
+ + +