OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-23 11:49:44 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Bugfix: change combat selection when a monster dies from a condition in combat. (thanks to Fala from the forums for finding it!)

Browse Source
This commit is contained in:
Oskar Wiksten
2013-03-29 22:55:53 +01:00
parent bb314eea66
commit a29ebb466b
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

@@ -123,8 +123,8 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
}
public boolean canExitCombat() { return getAdjacentMonster() == null; }
private Monster getAdjacentMonster() {
public boolean canExitCombat() { return getAdjacentAggressiveMonster() == null; }
private Monster getAdjacentAggressiveMonster() {
return MovementController.getAdjacentAggressiveMonster(world.model.currentMap, world.model.player);
}
@@ -140,7 +140,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
} else if (dx != 0 || dy != 0) {
executeFlee(dx, dy);
} else {
Monster m = getAdjacentMonster();
Monster m = getAdjacentAggressiveMonster();
if (m == null) return;
setCombatSelection(m);
executePlayerAttack();
@@ -160,6 +160,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
if (controllers.effectController.isRunningVisualEffect()) return;
if (!useAPs(world.model.player.getAttackCost())) return;
final Monster target = world.model.uiSelections.selectedMonster;
final Coord attackPosition = world.model.uiSelections.selectedPosition;
final AttackResult attack = playerAttacks(target);
this.lastAttackResult = attack;
@@ -167,11 +168,11 @@ public final class CombatController implements VisualEffectCompletedCallback {
if (attack.isHit) {
combatActionListeners.onPlayerAttackSuccess(target, attack);
if (lastAttackResult.targetDied) {
if (attack.targetDied) {
playerKilledMonster(target);
}
startAttackEffect(attack, world.model.uiSelections.selectedPosition, this, CALLBACK_PLAYERATTACK);
startAttackEffect(attack, attackPosition, this, CALLBACK_PLAYERATTACK);
} else {
combatActionListeners.onPlayerAttackMissed(target, attack);
playerAttackCompleted();
@@ -179,16 +180,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
private void playerAttackCompleted() {
if (lastAttackResult.targetDied) {
Monster nextMonster = getAdjacentMonster();
if (nextMonster == null) {
exitCombat(true);
return;
} else {
setCombatSelection(nextMonster);
}
if (world.model.uiSelections.selectedMonster == null) {
selectNextAggressiveMonster();
}
playerActionCompleted();
}
@@ -218,8 +213,22 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
combatActionListeners.onPlayerKilledMonster(killedMonster);
if (world.model.uiSelections.selectedMonster == killedMonster) {
selectNextAggressiveMonster();
}
}
private boolean selectNextAggressiveMonster() {
Monster nextMonster = getAdjacentAggressiveMonster();
if (nextMonster == null) {
setCombatSelection(null, null);
return false;
}
setCombatSelection(nextMonster);
return true;
}
private boolean playerHasApLeft() {
final Player player = world.model.player;
if (player.hasAPs(player.getUseItemCost())) return true;
@@ -228,6 +237,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
return false;
}
private void playerActionCompleted() {
if (canExitCombat()) {
exitCombat(true);
return;
}
if (!playerHasApLeft()) beginMonsterTurn(false);
}
private void continueTurn() {
@@ -250,8 +263,6 @@ public final class CombatController implements VisualEffectCompletedCallback {
world.model.player.nextPosition.set(dest);
controllers.movementController.moveToNextIfPossible(false);
if (canExitCombat()) exitCombat(true);
playerActionCompleted();
}
@@ -283,6 +294,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
controllers.actorStatsController.setActorMaxAP(m);
}
}
currentActiveMonster = null;
if (!isFirstRound) controllers.gameRoundController.onNewMonsterRound();
handleNextMonsterAction();
}
@@ -367,6 +379,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
private void newPlayerTurn(boolean isFirstRound) {
if (canExitCombat()) {
exitCombat(true);
return;
}
controllers.actorStatsController.setActorMaxAP(world.model.player);
if (!isFirstRound) controllers.gameRoundController.onNewPlayerRound();
world.model.uiSelections.isPlayersCombatTurn = true;