changed visual layout of hand and battlefield cards

Cardshifter · Oct 6, 2014 · d29b658 · d29b658
1 parent e28a5dc
commit d29b658
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardHandDocumentController.java b/cardshifter-fx/src/main/java/com/cardshifter/client/views/CardHandDocumentController.java
@@ -22,10 +22,8 @@ public final class CardHandDocumentController extends CardView {
     @FXML private Label cardId;
     @FXML private Label manaCost;
     @FXML private Label scrapCost;
-    @FXML private Label cardType;
     @FXML private Label creatureType;
-    @FXML private Label enchStrength;
-    @FXML private Label enchHealth;
+	@FXML private Label abilityText;
 	@FXML private Rectangle background;
 	@FXML private AnchorPane anchorPane;
 

diff --git a/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardBattlefieldDocument.fxml b/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardBattlefieldDocument.fxml
@@ -17,22 +17,21 @@
 
       <!-- Non Functional Card Layout Pieces -->
       <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#b90707" height="105.0" layoutX="5.0" layoutY="2.0" stroke="BLACK" strokeType="INSIDE" width="79.0" />
-      <Label layoutX="53.0" layoutY="73.0" text="/" textFill="WHITE">
+      <Label layoutX="53.0" layoutY="46.0" text="/" textFill="WHITE">
          <font>
             <Font size="18.0" />
          </font>
       </Label>
 
       <!-- Card Labels -->
-      <Label fx:id="strength" layoutX="40.0" layoutY="76.0" text="#" textFill="WHITE" />
-      <Label fx:id="health" layoutX="69.0" layoutY="77.0" text="#" textFill="WHITE" />
-      <Label fx:id="cardId" layoutX="12.0" layoutY="4.0" text="Card Id =" textFill="WHITE" />
-      <Label fx:id="cardType" layoutX="12.0" layoutY="20.0" text="Type" textFill="WHITE" />
-      <Label fx:id="creatureType" layoutX="12.0" layoutY="36.0" text="Type" textFill="WHITE" />
+      <Label fx:id="strength" layoutX="39.0" layoutY="51.0" text="#" textFill="WHITE" />
+      <Label fx:id="health" layoutX="69.0" layoutY="51.0" text="#" textFill="WHITE" />
+      <Label fx:id="cardId" layoutX="7.0" layoutY="6.0" text="Card Id =" textFill="WHITE" />
+      <Label fx:id="creatureType" layoutX="8.0" layoutY="27.0" text="Type" textFill="WHITE" />
       <Circle fx:id="sicknessCircle" fill="#bfc6cd" layoutX="45.0" layoutY="36.0" radius="23.0" stroke="BLACK" strokeType="INSIDE" visible="false" />
 
 	  <!-- Scrap Button -->
-      <Button fx:id="scrapButton" layoutX="7.0" layoutY="66.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="30.0" text="S" visible="false" />
+      <Button fx:id="scrapButton" layoutX="19.0" layoutY="77.0" mnemonicParsing="false" prefHeight="24.0" prefWidth="53.0" text="Scrap" visible="false" />
 
    </children>
 </AnchorPane>
diff --git a/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardHandDocument.fxml b/cardshifter-fx/src/main/resources/com/cardshifter/client/views/CardHandDocument.fxml
@@ -17,24 +17,21 @@
 
       <!-- Non Functional Card Layout Pieces -->
       <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#b90707" height="164.0" layoutX="12.0" layoutY="12.0" stroke="BLACK" strokeType="INSIDE" width="106.0" />
-      <Rectangle arcHeight="5.0" arcWidth="5.0" height="16.0" layoutX="12.0" layoutY="127.0" stroke="BLACK" strokeType="INSIDE" width="106.0" />
-      <Label layoutX="93.0" layoutY="105.0" text="/" textFill="WHITE">
+      <Rectangle arcHeight="5.0" arcWidth="5.0" height="16.0" layoutX="12.0" layoutY="106.0" stroke="BLACK" strokeType="INSIDE" width="106.0" />
+      <Label layoutX="87.0" layoutY="83.0" text="/" textFill="WHITE">
          <font>
             <Font size="18.0" />
          </font>
       </Label>
-      <Label layoutX="18.0" layoutY="86.0" text="Card Type =" textFill="WHITE" />
 
       <!-- Card Labels -->
-      <Label fx:id="strength" layoutX="78.0" layoutY="108.0" text="#" textFill="WHITE" />
-      <Label fx:id="health" layoutX="108.0" layoutY="108.0" text="#" textFill="WHITE" />
-      <Label fx:id="cardId" layoutX="34.0" layoutY="14.0" text="Card Id ="  textFill="WHITE" />
+      <Label fx:id="strength" layoutX="73.0" layoutY="86.0" text="#" textFill="WHITE" />
+      <Label fx:id="health" layoutX="103.0" layoutY="87.0" text="#" textFill="WHITE" />
+      <Label fx:id="cardId" layoutX="16.0" layoutY="17.0" text="Card Id =" textFill="WHITE" />
       <Label fx:id="manaCost" layoutX="17.0" layoutY="45.0" text="Mana Cost =" textFill="WHITE" />
       <Label fx:id="scrapCost" layoutX="17.0" layoutY="61.0" text="Scrap Cost =" textFill="WHITE" />
-      <Label fx:id="cardType" layoutX="19.0" layoutY="108.0" text="Type" textFill="WHITE" />
-      <Label fx:id="enchStrength" layoutX="16.0" layoutY="140.0" text="Ench Str =" textFill="WHITE" />
-      <Label fx:id="enchHealth" layoutX="17.0" layoutY="156.0" prefHeight="16.0" prefWidth="95.0" text="Ench Hth =" textFill="WHITE" />
-      <Label fx:id="creatureType" layoutX="19.0" layoutY="127.0" text="Type" textFill="WHITE" />
+      <Label fx:id="creatureType" layoutX="15.0" layoutY="106.0" text="Type" textFill="WHITE" />
+      <Label fx:id="abilityText" layoutX="16.0" layoutY="125.0" text="Ability" textFill="WHITE" />
 
    </children>
 </AnchorPane>