Tests, a lot of textures and bug fixes

2020-07-09 20:27:53 +02:00
parent cb7408b7f1
commit 1cb2bc5da6
29 changed files with 1071 additions and 608 deletions
--- a/src/main/resources/assets/jfx/game.fxml
+++ b/src/main/resources/assets/jfx/game.fxml
@@ -58,7 +58,7 @@
                        <VBox fx:id="questBox" />
                     </content>
                  </ScrollPane>
-                  <VBox alignment="CENTER" onDragDropped="#onTrashDragDropped" onDragOver="#onTrashDragOver" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="TOP">
+                  <VBox alignment="CENTER" onDragDropped="#onTrashDragDropped" onDragEntered="#onTrashDragEntered" onDragExited="#onTrashDragExited" onDragOver="#onTrashDragOver" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="TOP">
                     <GridPane.margin>
                        <Insets />
                     </GridPane.margin>
@@ -114,9 +114,9 @@
                     <content>
                        <TableView fx:id="balanceHistoryTable" prefHeight="200.0" prefWidth="200.0">
                          <columns>
-                              <TableColumn prefWidth="50.666626400416135" styleClass="align-right" text="%game.balance.history.index" />
-                            <TableColumn maxWidth="500.0" prefWidth="100.0" styleClass="align-right" text="%game.balance.history.change" />
-                            <TableColumn maxWidth="1.7976931348623157E308" prefWidth="300.0" text="%game.balance.history.type" />
+                              <TableColumn prefWidth="50.666626400416135" sortable="false" styleClass="align-right" text="%game.balance.history.index" />
+                            <TableColumn maxWidth="500.0" prefWidth="100.0" sortable="false" styleClass="align-right" text="%game.balance.history.change" />
+                            <TableColumn maxWidth="1.7976931348623157E308" prefWidth="300.0" sortable="false" text="%game.balance.history.type" />
                          </columns>
                          <placeholder>
                              <Label text="%game.balance.history.no-data" />
--- a/src/main/resources/assets/jfx/storage_slot.fxml
+++ b/src/main/resources/assets/jfx/storage_slot.fxml
@@ -26,9 +26,9 @@
              <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" vgrow="SOMETIMES" />
          </rowConstraints>
          <children>
-              <ImageView fx:id="slot0" fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="2" GridPane.columnSpan="2" GridPane.rowSpan="2" />
-              <ImageView fx:id="slot1" fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
-              <ImageView fx:id="slot2" fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true" GridPane.columnSpan="2" GridPane.rowIndex="2" GridPane.rowSpan="2" />
+              <ImageView fx:id="slot0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="2" GridPane.columnSpan="2" GridPane.rowSpan="2" />
+              <ImageView fx:id="slot1" fitWidth="60.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
+              <ImageView fx:id="slot2" fitWidth="60.0" pickOnBounds="true" preserveRatio="true" GridPane.columnSpan="2" GridPane.rowIndex="2" GridPane.rowSpan="2" />
              <HBox alignment="CENTER_LEFT" prefHeight="100.0" GridPane.columnIndex="4" GridPane.rowIndex="1">
                  <children>
                      <Label fx:id="slot0Title" styleClass="storage-slot-item-title" text="%game.storage.empty">
@@ -36,7 +36,7 @@
                              <Font name="System Bold" size="12.0" />
                          </font>
                      </Label>
-                      <Label fx:id="slot0Description" />
+                      <Label fx:id="slot0Description" textOverrun="CLIP" />
                  </children>
              </HBox>
              <HBox alignment="CENTER_LEFT" prefHeight="100.0" GridPane.columnIndex="3" GridPane.columnSpan="2147483647" GridPane.rowIndex="2">
--- a/src/main/resources/assets/textures/bin_bordered.svg
+++ b/src/main/resources/assets/textures/bin_bordered.svg
--- a/src/main/resources/assets/textures/bin_closed.png
+++ b/src/main/resources/assets/textures/bin_closed.png
--- a/src/main/resources/content/lang/de_de.lang
+++ b/src/main/resources/content/lang/de_de.lang
@@ -0,0 +1,58 @@
+test.hello-world = Hallo Welt!
+
+game.budget = Budget: %d\u20ac
+game.quit = Spiel beenden
+game.quests = Auftr\u00e4ge
+game.quests.next = N\u00e4chster Auftrag
+game.quest.reward = %d\u20ac
+game.trash = M\u00fclltonne
+game.trash.hover = Zerst\u00f6ren
+game.storage = Lager
+game.storage.empty = Leer
+game.balance.history = Buchungen
+game.balance.history.no-data = Noch keine Buchungen
+game.balance.history.index = 
+game.balance.history.change = Wert in \u20ac
+game.balance.history.type = Beschreibung
+game.balance.history.type.abandon = Auftrag abgelehnt
+game.balance.history.type.destroy = Produkt zerst\u00f6rt
+game.balance.history.type.move = Produkt bewegt
+game.balance.history.type.noop = NOOP
+game.balance.history.type.sell = Produkt ausgelagert
+game.balance.history.type.store = Produkt eingelagert
+game.balance.chart = Bilanz
+game.balance.chart.line = Budget
+game.balance.total-income = Gesamteinahmen: %d\u20ac
+game.balance.total-loss = Gesamtverluste: %d\u20ac
+
+quests.normal = Normal
+
+products.paper = Papier
+products.paper.color = Farbe
+products.paper.color.white = wei\u00df
+products.paper.color.green = gr\u00fcn
+products.paper.color.blue = blau
+products.paper.format = Format
+products.paper.format.a3 = A3
+products.paper.format.a4 = A4
+products.paper.format.a5 = A5
+
+products.wood = Holz
+products.wood.type = Art
+products.wood.type.beech = Buche
+products.wood.type.oak = Eiche
+products.wood.type.pine = Fichte
+products.wood.form = Form
+products.wood.form.pieces = Scheite
+products.wood.form.boards = Bretter
+products.wood.form.beams = Balken
+
+products.stone = Stein
+products.stone.type = Art
+products.stone.type.granite = Granit
+products.stone.type.marble = Marmor
+products.stone.type.sandstone = Sandstein
+products.stone.weight = Gewicht
+products.stone.weight.light = Leicht
+products.stone.weight.medium = Mittel
+products.stone.weight.heavy = Schwer
--- a/src/main/resources/content/products/stone.properties
+++ b/src/main/resources/content/products/stone.properties
@@ -1,4 +1,4 @@
 properties = type, weight
 type.variants = marble, granite, sandstone
 weight.variants = light, medium, heavy
-weight.heavy.y = 1
+weight.heavy.y = 2
--- a/src/main/resources/content/textures/products/package.png
+++ b/src/main/resources/content/textures/products/package.png
--- a/src/main/resources/content/textures/products/package.svg
+++ b/src/main/resources/content/textures/products/package.svg
@@ -7,82 +7,110 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="package.svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 132.29166 132.29167"
+   width="500"
   height="500"
-   width="500">
+   viewBox="0 0 132.29166 132.29167"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="package.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="D:\coding\java\what-a-storage\src\main\resources\content\textures\products\package.png"
+   inkscape:export-xdpi="95.999992"
+   inkscape:export-ydpi="95.999992">
  <defs
-     id="defs2" />
+     id="defs2">
+    <clipPath
+       id="clipPath879"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         d="M 26.458333,0 0,26.458333 V 132.29166 h 105.83333 l 26.45833,-26.45833 V 0 Z"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.058;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path881" />
+    </clipPath>
+    <clipPath
+       id="clipPath883"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         d="M 26.458333,0 0,26.458333 V 132.29166 h 105.83333 l 26.45833,-26.45833 V 0 Z"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.058;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path885" />
+    </clipPath>
+    <clipPath
+       id="clipPath887"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         d="M 26.458333,0 0,26.458333 V 132.29166 h 105.83333 l 26.45833,-26.45833 V 0 Z"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.058;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path889" />
+    </clipPath>
+  </defs>
  <sodipodi:namedview
-     inkscape:guide-bbox="true"
-     inkscape:lockguides="false"
-     showguides="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="-7"
-     inkscape:window-x="-7"
-     inkscape:window-height="1010"
-     inkscape:window-width="1920"
-     units="px"
-     showgrid="false"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="mm"
-     inkscape:cy="217.09446"
-     inkscape:cx="307.26355"
-     inkscape:zoom="0.7"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
+     id="base"
     pagecolor="#ffffff"
-     id="base">
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="182.88496"
+     inkscape:cy="254.64746"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1010"
+     inkscape:window-x="-7"
+     inkscape:window-y="-7"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:lockguides="false"
+     inkscape:guide-bbox="true">
    <sodipodi:guide
-       inkscape:color="rgb(0,0,255)"
-       inkscape:locked="false"
-       inkscape:label=""
+       position="105.83333,105.83333"
+       orientation="0,1"
       id="guide1410"
-       orientation="0,1"
-       position="105.83333,105.83333" />
-    <sodipodi:guide
-       inkscape:color="rgb(0,0,255)"
-       inkscape:locked="false"
       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="105.83333,105.83333"
+       orientation="-1,0"
       id="guide1412"
-       orientation="-1,0"
-       position="105.83333,105.83333" />
-    <sodipodi:guide
-       inkscape:color="rgb(0,0,255)"
-       inkscape:locked="false"
       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="26.458333,105.83333"
+       orientation="-1,0"
       id="guide1414"
-       orientation="-1,0"
-       position="26.458333,105.83333" />
-    <sodipodi:guide
-       inkscape:color="rgb(0,0,255)"
-       inkscape:locked="false"
       inkscape:label=""
-       id="guide1416"
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="105.83333,26.458333"
       orientation="0,1"
-       position="105.83333,26.458333" />
+       id="guide1416"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       id="guide1418"
+       position="0,132.29166"
       orientation="0,500"
-       position="0,132.29166" />
+       id="guide1418" />
    <sodipodi:guide
-       id="guide1420"
+       position="132.29166,132.29166"
       orientation="500,0"
-       position="132.29166,132.29166" />
+       id="guide1420" />
    <sodipodi:guide
-       id="guide1422"
+       position="132.29166,0"
       orientation="0,-500"
-       position="132.29166,0" />
+       id="guide1422" />
    <sodipodi:guide
-       id="guide1424"
+       position="0,0"
       orientation="-500,0"
-       position="0,0" />
+       id="guide1424" />
  </sodipodi:namedview>
  <metadata
     id="metadata5">
@@ -92,29 +120,32 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
-     id="layer1"
+     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
    <rect
-       ry="1.9382317e-06"
-       y="26.458336"
-       x="0"
-       height="105.83333"
-       width="105.83333"
+       clip-path="url(#clipPath887)"
+       style="fill:#d6b285;stroke-width:1.05799995;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:bevel"
       id="rect1426"
-       style="fill:#d6b285;stroke-width:0.264583;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+       width="105.83333"
+       height="105.83333"
+       x="0"
+       y="26.458336"
+       ry="1.9382317e-06" />
    <path
-       id="path1428"
+       clip-path="url(#clipPath883)"
+       style="fill:#e4ccaf;stroke:#000000;stroke-width:1.05799995;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
       d="M 0,26.458336 26.458333,4.9999997e-6 H 132.29166 L 105.83333,26.458336 H 0"
-       style="fill:#e4ccaf;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+       id="path1428" />
    <path
-       id="path1430"
+       clip-path="url(#clipPath879)"
+       style="fill:#ba915e;stroke:#000000;stroke-width:1.05799995;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
       d="m 105.83333,132.29166 26.45833,-26.45833 V 4.9999997e-6 L 105.83333,26.458336 Z"
-       style="fill:#ba915e;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+       id="path1430" />
  </g>
 </svg>