Merge pull request #57 from gnpurvin/GUI

fixed bugs
gnpurvin · Apr 25, 2019 · 5153247 · 5153247
2 parents 4e8914c + 50ccc63
commit 5153247
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/DPS/src/Connectivity/Client.java b/DPS/src/Connectivity/Client.java
@@ -273,9 +273,8 @@ private String getHostIP(){
 
     //CALL THIS METHOD FROM GUI WHEN MAP CHANGES
     public void handleSendMap(String mapStr) throws IOException {
-        this.sendMsg(mapStr);
-        System.out.println(mapStr);
-        System.out.println("Handlesendmap");
+        String cmd = mapStr + "\n";
+        this.serverOut.write(cmd.getBytes());
     }
 
     private void handleRecieveMap(String tokens[]) {

diff --git a/DPS/src/Connectivity/ServerWorker.java b/DPS/src/Connectivity/ServerWorker.java
@@ -55,10 +55,8 @@ public void HandleClient() throws IOException {
 
         //loop to constantly grab input
         while ((line = reader.readLine()) != null) {
-            System.out.println(line);
             //divide the input byte array by whitespace and get commands accordingly
             String[] tokens = line.split(" ");
-            System.out.println(tokens);
 
             if (tokens != null && tokens.length > 0) {
                 String cmd = tokens[0];
@@ -72,7 +70,6 @@ public void HandleClient() throws IOException {
                     HandleRollDice(tokens);
                 } else if ("map".equalsIgnoreCase(cmd)){
                     HandleMap(tokens);
-                    System.out.println("handlingthings");
                 } else if("tokenmove".equalsIgnoreCase(cmd)){
                     HandleTokenMove(tokens);
                 } else if (cmd.startsWith("#")) {   //if # is the first character, then it's a direct message.

diff --git a/DPS/src/GUI/PlayerSessionController.java b/DPS/src/GUI/PlayerSessionController.java
@@ -148,7 +148,7 @@ public void initialize(URL url, ResourceBundle rb) {
                 try {
                     OpenMap(temp);
                 } catch (IOException ex) {
-                    Logger.getLogger(PlayerSessionController.class.getName()).log(Level.SEVERE, null, ex);
+                    System.out.println("nope");
                 }
             });
             if(mapIds.size() != 0)
@@ -161,7 +161,7 @@ public void initialize(URL url, ResourceBundle rb) {
     @FXML
     protected void ChatSend(ActionEvent action) throws IOException{
         Player.sendMsg(ChatOut.getText());
-        ChatIn.setText(ChatIn.getText() + "/n" + username + ": " + ChatOut.getText());
+        ChatIn.setText(ChatIn.getText() + "\n" + username + ": " + ChatOut.getText());
         ChatOut.clear();
     }
 
@@ -368,6 +368,6 @@ public void mapLoad(String s){
         Map map = mapCon.loadMap(s);
         mapCon.c = MapCanvas;
         mapCon.currMap = map;
-        mapCon.drawMap(MapCanvas);
+        mapCon.drawMap2(MapCanvas);
     }
 }
diff --git a/DPS/src/dps/Map.java b/DPS/src/dps/Map.java
@@ -255,7 +255,6 @@ public final String toString(){
                 }
             }
         }
-        System.out.println(dungeon);
         return dungeon;
     }
 

diff --git a/DPS/src/dps/mapController.java b/DPS/src/dps/mapController.java
@@ -84,7 +84,29 @@ public void drawMap(Canvas c){
         }
 
     }
+    public void drawMap2(Canvas c){
+        gc = c.getGraphicsContext2D();
+
+        //iterates across each row
+        for(int i = 0; i < currMap.sizeX; i++){
+
+                //iterates down each column
+            for(int j = 0; j < currMap.sizeY; j++){
+
+                if(this.currMap.getTileAt(i, j).getIsRoom() == true){
+                    gc.setFill(roomColor);
+                }
+                else {
+                    gc.setFill(wallColor);
+                }
+
+                gc.strokeRect((i*20), (j*20), 19, 19);
+                gc.fillRect((i*20), (j*20), 19, 19);
+
+            }
+        }
 
+    }
 
     ////////////////////////////////////////
     /// Section for