diff --git a/src/main/java/controls/StepScheduler.java b/src/main/java/controls/StepScheduler.java index 19ed6e5..ff50f63 100644 --- a/src/main/java/controls/StepScheduler.java +++ b/src/main/java/controls/StepScheduler.java @@ -57,6 +57,21 @@ public boolean isDeckLess(){ return algo.getDeck().size()==0; } + public boolean isSucceedLatestAttack(){ + if(isATurn){ + if(isDeckLess()){ + return algo.getSucceedSelectA().getKey(); + }else{ + return algo.getSucceedDrawA().getKey(); + } + }else { + if(isDeckLess()){ + return algo.getSucceedSelectB().getKey(); + }else{ + return algo.getSucceedDrawB().getKey(); + } + } + } public boolean getIsATurn(){ return isATurn; } diff --git a/src/main/java/interfaces/IAttack.java b/src/main/java/interfaces/IAttack.java index 691afcd..6a4c620 100644 --- a/src/main/java/interfaces/IAttack.java +++ b/src/main/java/interfaces/IAttack.java @@ -14,4 +14,5 @@ Map.Entry getTopCard(); boolean isDeckLess(); + boolean isSucceedLatestAttack(); } diff --git a/src/main/java/views/MainPanel.java b/src/main/java/views/MainPanel.java index 9da1f54..71d12d0 100644 --- a/src/main/java/views/MainPanel.java +++ b/src/main/java/views/MainPanel.java @@ -98,7 +98,7 @@ stepScheduler.Attack(g, attacker, t); setStep(Step.Confirm); - boolean isSucceed=stepScheduler.getOpponentHands().get(t).getKey()==g; + boolean isSucceed=stepScheduler.isSucceedLatestAttack(); String resultMessage="Your Attack Was "; resultMessage+=isSucceed?"Succeed.":"Failed.";