fix: various minor issues (#115)

* fix: cancel timer when close button pressed

* fix: change opponent tag for boxer in location 4

* chore: disable new game screen after game end

* fix: move calls to callback to the main FX thread

* feat: add icon

* docs: update

* refact: move assets to package

* chore: final fixes

build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'checkstyle'
 }
 group 'io.rpg'
-version '1.0'
+version '1.0.0'
 
 repositories {
     mavenCentral()
@@ -81,13 +81,20 @@ run {
 jlink {
     imageZip = project.file("${buildDir}/distributions/app-${javafx.platform.classifier}.zip")
     options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
+
+    jpackage {
+        icon = 'src/main/resources/io/rpg/app.png'
+        appVersion = "1.0.0"
+    }
+
     launcher {
-        name = 'app'
+        name = 'RPG-IO'
         jvmArgs = ['--add-exports=javafx.graphics/com.sun.javafx.scene=io.rpg']
     }
     forceMerge('log4j-api')
 }
 
+
 jlinkZip {
     group = 'distribution'
 }

configurations/demo-config-2/locations/location-4/objects/boxer.json

@@ -9,7 +9,7 @@
     "condition": {
       "tag": "whatever",
       "type": "defeat-opponent",
-      "opponent-tag": "zombie-2"
+      "opponent-tag": "zombie-4"
     }
   },
   "onRightClick": {

docs/resources.md

@@ -1,4 +1,5 @@
 # Resources
 
 * Default popup backgrounds and buttons: [Wood button vector created by upklyak - www.freepik.com](https://www.freepik.com/vectors/wood-button>)
-* Coin: [Money sign vector created by rawpixel.com - www.freepik.com]("https://www.freepik.com/vectors/money-sign">)
+* Coin: [Money sign vector created by rawpixel.com - www.freepik.com]("https://www.freepik.com/vectors/money-sign">)
+* Characters: [by segel](https://opengameart.org/users/segel) (not all :D)

src/main/java/io/rpg/Main.java

@@ -2,14 +2,16 @@
 
 import com.kkafara.rt.Result;
 import io.rpg.wrapper.WrapperController;
-import java.io.IOException;
 import javafx.application.Application;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
 
+import java.io.IOException;
+
 /**
  * Entry point of the app.
  */
@@ -20,6 +22,11 @@ public class Main extends Application {
   public void start(Stage stage) throws IOException {
     Configurator.setRootLevel(Level.WARN);
     String path = getParameters().getNamed().get("config");
+
+    stage.setTitle("RPG-IO");
+
+    stage.getIcons().add(new Image((Main.class.getResource("app.png").toString())));
+
     if (path == null) {
       WrapperController wrapperController = WrapperController.load();
       wrapperController.show(stage);

src/main/java/io/rpg/controller/Controller.java

@@ -140,16 +140,16 @@ else if (tagToLocationViewMap.size() != tagToLocationModelMap.size())
 
   @Override
   public void onKeyboardEvent(KeyboardEvent event) {
-    // TODO: implement event handling
     logger.trace("Controller notified on key pressed from " + event.source());
-    //TODO: call Player::set...Pressed depending on keyCode and whether the key was pressed or released
 
     KeyEvent payload = event.payload();
 
     if (payload.getEventType() == KeyEvent.KEY_PRESSED) {
       switch (payload.getCode()) {
-        case E ->
-            popupController.openInventoryPopup(playerController.getPlayer().getInventory(), getWindowCenterX(), getWindowCenterY(), playerController.getPlayer());
+        case E -> {
+          stopPlayer();
+          popupController.openInventoryPopup(playerController.getPlayer().getInventory(), getWindowCenterX(), getWindowCenterY(), playerController.getPlayer());
+        }
       }
     }
   }

src/main/java/io/rpg/model/actions/ActionEngine.java

@@ -96,13 +96,11 @@ public void acceptQuizResult(GameObject opponent, boolean correct, int pointsCou
       } else {
         controller.getPopupController().hidePopup();
       }
+      opponent.setOnLeftClickAction(Action.VOID);
     } else {
       controller.getPopupController().hidePopup();
       logger.info("Wrong answer provided");
     }
-
-    // TODO: better action disabling
-    opponent.setOnLeftClickAction(Action.VOID);
   }
 
   public void onAction(GameEndAction action) {

src/main/java/io/rpg/view/popups/BattleReflexPopup.java

@@ -128,7 +128,7 @@ public BattleReflexPopup(int pointsPerSecond, BiConsumer<Boolean, Integer> callb
 
     timer.schedule(new TimerTask() {
       public void run() {
-        Platform.runLater(() -> timerTick());
+        timerTick();
       }
     }, 1000, 1000);
     button.setOnAction((event) -> {
@@ -154,8 +154,8 @@ public String generateRandomSequence(int length) {
   private void timerTick() {
     timeToCountDown--;
     if (timeToCountDown < 0) {
-      timer.cancel();
       lose();
+      timer.cancel();
       return;
     }
     timerDots[timeToCountDown].setImage(new Image(PathUtils.resolvePathToJFXFormat(
@@ -164,15 +164,18 @@ private void timerTick() {
   }
 
   public void win() {
-    callback.accept(true, timeToCountDown * pointsPerSecond);
+    Platform.runLater(() -> callback.accept(true, timeToCountDown * pointsPerSecond));
     timer.cancel();
   }
 
   public void lose() {
-    callback.accept(false, 0);
+    Platform.runLater(() -> callback.accept(false, 0));
   }
 
   public void setCloseButtonActionListener(EventHandler<ActionEvent> value) {
-    button.setOnAction(value);
+    button.setOnAction(event -> {
+      timer.cancel();
+      value.handle(event);
+    });
   }
 }

src/main/java/io/rpg/wrapper/WrapperController.java

@@ -117,7 +117,7 @@ private void onLoadClick() {
       loadGame(path).ifOk(
           g -> {
             game = g;
-            game.setOnEnd(() -> show(stage));
+//            game.setOnEnd(() -> show(stage));
           }
       );
     }