From 688afd5ff60253388e7580cef98cf78ea8fb470f Mon Sep 17 00:00:00 2001 From: "oskar.wiksten" Date: Thu, 20 Oct 2011 17:05:03 +0000 Subject: [PATCH] Make sure to not use APs when player attacks unless the attack is actually going to happen. git-svn-id: https://andors-trail.googlecode.com/svn/trunk@190 08aca716-68be-ccc6-4d58-36f5abd142ac --- .../src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java | 2 +- .../com/gpl/rpg/AndorsTrail/controller/CombatController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java index 86f8f39..bc831c2 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java @@ -42,7 +42,7 @@ public final class DebugInterface { /*,new DebugButton("dmg=1", new OnClickListener() { @Override public void onClick(View arg0) { - world.model.player.traits.damagePotential.set(1, 1); + world.model.player.traits.combatTraits.set(1, 1); mainActivity.updateStatus(); mainActivity.showToast("DEBUG: damagePotential=1", Toast.LENGTH_SHORT); } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index bb79f1e..32cbf02 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -172,8 +172,8 @@ public final class CombatController implements VisualEffectCompletedCallback { private Monster currentlyAttackedMonster; private AttackResult lastAttackResult; private void executePlayerAttack() { - if (!useAPs(model.player.combatTraits.attackCost)) return; if (context.effectController.isRunningVisualEffect()) return; + if (!useAPs(model.player.combatTraits.attackCost)) return; final Monster target = model.uiSelections.selectedMonster; this.currentlyAttackedMonster = target; -- 2.49.0