JavaFX_GUI

json/original_data/npcs.json

@@ -103,7 +103,7 @@
           "rightHand": "hands"
         }
       ],
-      "intro": "Hey, rat. . . you dead??\n*You let out a groan...*\nWhat are you doing?!? Don't you know it's crazy to sleep so close to the recruits' camp? A guard will come down those stairs soon enough and catch you! You'll end up being drafted! You better come back in.\nBy the way, what's your name?",
+      "intro": "Hey, rat. . . you dead??\n*You let out a groan...*\nWhat are you doing?!? Don't you know it's crazy to sleep so close to the recruits' camp?\nA guard will come down those stairs soon enough and catch you! You'll end up being drafted! You better come back in.\nBy the way, what's your name?",
       "allies": [
       	"Sewer Rat"
       ],

src/main/java/com/jadventure/game/CharacterNameController.java

@@ -0,0 +1,78 @@
+package com.jadventure.game;
+
+import com.jadventure.game.entities.Player;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TextField;
+import javafx.scene.text.Text;
+import javafx.stage.WindowEvent;
+
+public class CharacterNameController {
+
+    // Reference to the main application.
+    private JAdventure jAdventure;
+    private Player player;
+    private Game game;
+
+    public CharacterNameController() {
+    }
+
+    @FXML
+    private MenuItem back;
+    @FXML
+    private MenuItem close;
+    @FXML
+    private MenuItem github;
+    @FXML
+    private Text intro;
+    @FXML
+    private TextField name;
+    @FXML
+    private Button create;
+
+    @FXML
+    public void createCharacter() throws DeathException {
+        player.setName(name.getText());
+        game.newGameStart(player);
+        jAdventure.loadWelcome(player, "new");
+    }
+
+    @FXML
+    public void goToMainMenu() {
+        jAdventure.loadMainMenu();
+    }
+
+    @FXML
+    public void goToGithub() {
+        // Goes to https://github.com/Progether/JAdventure
+    }
+
+    @FXML
+    public void quitGame() throws Exception {
+        jAdventure.getPrimaryStage().fireEvent(
+                new WindowEvent(jAdventure.getPrimaryStage(), WindowEvent.WINDOW_CLOSE_REQUEST));
+    }
+
+    public void showIntro() {
+        intro.setText(player.getIntro());
+    }
+
+    /**
+     * Is called by the main application to give a reference back to itself.
+     * 
+     * @param jAdventure
+     */
+    public void setMainApp(JAdventure jAdventure) {
+        this.jAdventure = jAdventure;
+    }
+
+    public void setPlayer(Player player) {
+        this.player = player;
+        showIntro();
+    }
+
+    public void setGame(Game game) {
+        this.game = game;
+    }
+}

src/main/java/com/jadventure/game/Client.java

@@ -56,14 +56,14 @@ public Client(String serverName, int port) {
     }
 
     public void getInput() {
-         Scanner input;
-         try {
-             input = new Scanner(System.in);
+         //Scanner input;
+         try (Scanner input = new Scanner(System.in)) {
+             //input = new Scanner(System.in);
              String userInput = input.nextLine();
              out.writeUTF(userInput);
          } catch (IOException e) {
-             e.printStackTrace(); 
-         } 
+            e.printStackTrace();
+        } 
     }
 }
 

src/main/java/com/jadventure/game/Game.java

@@ -19,23 +19,23 @@ public class Game {
     public Monster monster;
     Player player = null;
 
-    public Game(Player player, String playerType) throws DeathException {
-          this.parser = new CommandParser(player);
-          this.player = player;
-          switch (playerType) {
-              case "new":
-                  newGameStart(player);
-                  break;
-              case "old":
-                  QueueProvider.offer("Welcome back, " + player.getName() + "!");
-                  QueueProvider.offer("");
-                  player.getLocation().print();
-                  gamePrompt(player);
-                  break;
-              default:
-                  QueueProvider.offer("Invalid player type");
-                  break;
-          }
+    public Game(Player player, String playerType, JAdventure jAdventure) throws DeathException {
+
+        this.parser = new CommandParser(player);
+        this.player = player;
+        switch (playerType) {
+        case "new":
+            jAdventure.loadCharacterName(player, this);
+            break;
+        case "old":
+            jAdventure.loadWelcome(player, "old");
+            //player.getLocation().print();
+            //gamePrompt(player);
+            break;
+        default:
+            QueueProvider.offer("Invalid player type");
+            break;
+        } 
     }
 
     /**
@@ -44,6 +44,15 @@ public Game(Player player, String playerType) throws DeathException {
      * character and welcomes him / her. After that, it goes to the normal game prompt.
      */
     public void newGameStart(Player player) throws DeathException {
+        LocationRepository locationRepo = GameBeans.getLocationRepository(player.getName());
+        this.player.setLocation(locationRepo.getInitialLocation());
+        player.save();
+        //QueueProvider.offer("Welcome to Silliya, " + player.getName() + ".");
+        //player.getLocation().print();
+        //gamePrompt(player);
+    }
+
+    public void newGameStart_old(Player player) throws DeathException {
         QueueProvider.offer(player.getIntro());
         String userInput = QueueProvider.take();
         player.setName(userInput);