Make sure to not use APs when player attacks unless the attack is actually going...

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@190 08aca716-68be-ccc6-4d58-36f5abd142ac

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index 86f8f399d78d2d010763e6bca06106fd5fc4339c..bc831c202f498ba5203a021f5e99521f262c80a1 100644 (file)
--- 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 bb79f1e0005098c557db7eb3caf5fe9047686552..32cbf02edcf99cd4b79fe86e3a7ded8fc89b3923 100644 (file)
--- 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;