targeting is working except for enchants

Cardshifter · Sep 4, 2014 · 4c3fd9b · 4c3fd9b
1 parent 030ab99
commit 4c3fd9b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/cardshifter-fx/src/main/java/com/cardshifter/fx/CardNode.java b/cardshifter-fx/src/main/java/com/cardshifter/fx/CardNode.java
@@ -136,20 +136,18 @@ private void buttonClick(ActionEvent event) {
                             return;
                         }
 
-                        //int targetIndex = Integer.parseInt(input.nextLine());
-                        int targetIndex = 0;
-                        if (targetIndex < 0 || targetIndex >= cardActions.size()) {
-                            return;
+                        List<Card>targetCards = new ArrayList<>();
+                        for(Targetable target : targets) {
+                            if (target instanceof Card) {
+                                targetCards.add((Card)target);
+                            }
                         }
-
-                        //TODO: add a check to make sure the target is valid//
-                        Targetable target = targets.get(targetIndex);
-                        targetAction.setTarget(target);
-                        targetAction.perform();
+                        this.controller.markTargets(targetCards);
+                        this.controller.nextAction = targetAction;
                     }
                     else action.perform();
+                    this.controller.createData();
                 }
-                this.controller.createData();
                 this.controller.render();
             }
         }

diff --git a/cardshifter-fx/src/main/java/com/cardshifter/fx/CardNodeBattlefield.java b/cardshifter-fx/src/main/java/com/cardshifter/fx/CardNodeBattlefield.java
@@ -151,10 +151,12 @@ private void buttonClick(ActionEvent event) {
                         Targetable target = targets.get(targetIndex);
                         targetAction.setTarget(target);
                         targetAction.perform();
+                    } else {
+                        action.perform();
+                        this.controller.createData();
+                        this.controller.render();
                     }
-                    else action.perform();
                 }
-                this.controller.render();
             }
         }
     }
@@ -178,6 +180,6 @@ private void createCardTargetButton() {
         this.getChildren().add(button);
     }
     private void targetButtonClick(ActionEvent event) {
-
+        this.controller.performNextAction(this.card);
     }
 }
diff --git a/cardshifter-fx/src/main/java/com/cardshifter/fx/ChoiceBoxNode.java b/cardshifter-fx/src/main/java/com/cardshifter/fx/ChoiceBoxNode.java
@@ -90,19 +90,18 @@ private void buttonClick(ActionEvent event) {
                 for(Targetable target : targets) {
                     if (target instanceof Card) {
                         targetCards.add((Card)target);
+                    } else {
+                        //attacking the other player here
+                        targetAction.setTarget(target);
+                        targetAction.perform();
                     }
                 }
                 this.controller.markTargets(targetCards);
-
-                //int targetIndex = Integer.parseInt(input.nextLine());
-                //int targetIndex = 0;
-
-                //TODO: add a check to make sure the target is valid//
-                //Targetable target = targets.get(targetIndex);
-                //targetAction.setTarget(target);
-                //targetAction.perform();
+                this.controller.nextAction = targetAction;
+            } else {
+                this.action.perform();
+                this.controller.createData();
             }
-            else this.action.perform();
         }
         this.controller.render();
     }

diff --git a/cardshifter-fx/src/main/java/com/cardshifter/fx/FXMLGameController.java b/cardshifter-fx/src/main/java/com/cardshifter/fx/FXMLGameController.java
@@ -24,6 +24,8 @@
 import com.cardshifter.core.Card;
 import com.cardshifter.core.Game;
 import com.cardshifter.core.Player;
+import com.cardshifter.core.TargetAction;
+import com.cardshifter.core.Targetable;
 import com.cardshifter.core.UsableAction;
 import com.cardshifter.core.Zone;
 import com.cardshifter.core.console.CommandLineOptions;
@@ -293,6 +295,13 @@ public void buildChoiceBoxPane(Card card, List<UsableAction> actionList) {
     }
 
     //TARGETING
+    public TargetAction nextAction;
+    public void performNextAction(Targetable target) {
+        nextAction.setTarget(target);
+        nextAction.perform();
+        this.createData();
+        this.render();
+    }
     public void markTargets(List<Card> targets) {
         List<Node> cardsInPlayerBattlefield = playerBattlefieldPane.getChildren();
         List<Node> cardsInOpponentBattlefield = opponentBattlefieldPane.getChildren();