From 4563cfb6e31ac97578f9c793a72183ae1c91503c Mon Sep 17 00:00:00 2001
From: J0QUE <jpdejeu@hotmail.nl>
Date: Fri, 14 Apr 2017 11:09:40 +0200
Subject: [PATCH] Small updates

---
 src/main/java/nl/minkema/leendert/Game.java        |  8 ++++----
 src/main/java/nl/minkema/leendert/Main.java        |  5 +++++
 src/main/java/nl/minkema/leendert/Player.java      |  9 +++++++--
 .../resources/svg/{bloemtjesbord.svg => bord2.svg} |  0
 src/main/resources/text/specials.properties        | 14 ++++++++++++++
 5 files changed, 30 insertions(+), 6 deletions(-)
 rename src/main/resources/svg/{bloemtjesbord.svg => bord2.svg} (100%)

diff --git a/src/main/java/nl/minkema/leendert/Game.java b/src/main/java/nl/minkema/leendert/Game.java
index efec337..1669686 100644
--- a/src/main/java/nl/minkema/leendert/Game.java
+++ b/src/main/java/nl/minkema/leendert/Game.java
@@ -29,7 +29,7 @@ public class Game extends Pane {
 
     public Game() {
         Collections.shuffle(players);
-        Image bord = new Image(ModLoader.getFile("/svg/Bord.svg"));
+        Image bord = new Image(ModLoader.getFile("/svg/bord2.svg"));
         ImageView view = new ImageView(bord);
 
         view.setPreserveRatio(true);
@@ -59,7 +59,7 @@ public class Game extends Pane {
         playerTurn.setFitHeight(400);
 
         Label l = new Label();
-        l.setTranslateX(1035);
+        l.setTranslateX(965);
         l.setTranslateY(370);
 
 
@@ -75,7 +75,7 @@ public class Game extends Pane {
             if (roll == 4) Player.four();
             int next = players.get(Player.getNextActive()).getCh();
             playerTurn.setImage(Menu.images[next]);
-            l.setText(Menu.names[next]);
+            l.setText(Menu.names[next] + " is aan de beurt!");
             Player.four();
         }));
         //this.setBackground(new Background(new BackgroundFill(Color.RED, null, null)));
@@ -84,7 +84,7 @@ public class Game extends Pane {
         }
 
         playerTurn.setImage(Menu.images[players.get(1).getCh()]);
-        l.setText(Menu.names[players.get(1).getCh()]);
+        l.setText(Menu.names[players.get(1).getCh()] + " is aan de beurt!");
 
         String loc = this.getClass().getResource("/music/game.mp3").toString();
         Media music = new Media(loc);
diff --git a/src/main/java/nl/minkema/leendert/Main.java b/src/main/java/nl/minkema/leendert/Main.java
index 42bec80..c3594b9 100644
--- a/src/main/java/nl/minkema/leendert/Main.java
+++ b/src/main/java/nl/minkema/leendert/Main.java
@@ -14,7 +14,12 @@ import java.util.Properties;
 public class Main extends Application {
     public static Scene scene;
 
+    public static boolean memes = false;
+
     public static void main(String[] args) throws Exception {
+        for (String s : args) {
+            if (s.equals("-memes")) memes = true;
+        }
 
         Properties properties = new Properties();
         properties.load(Main.class.getResourceAsStream("/text/locations.properties"));
diff --git a/src/main/java/nl/minkema/leendert/Player.java b/src/main/java/nl/minkema/leendert/Player.java
index 590a0fd..2dc824d 100644
--- a/src/main/java/nl/minkema/leendert/Player.java
+++ b/src/main/java/nl/minkema/leendert/Player.java
@@ -51,7 +51,7 @@ public class Player {
     public ImageView getImageView() {
         return view;
     }
-    
+
     public int getCh() {
         return ch;
     }
@@ -61,6 +61,9 @@ public class Player {
         if (roll == 4)
             alert.contentTextProperty().setValue("Je hebt " + roll + " gegooid!\nKlavertje 4! Je mag dus nog een keer!");
         alert.titleProperty().setValue("");
+        if (plaats + roll == 69 && Main.memes) {
+            alert.contentTextProperty().setValue("heheheh 69 icksdie\n" + alert.getContentText());
+        }
         if (!Game.specials.containsKey(plaats + roll))
             alert.show();
         if (roll + plaats > 100) {
@@ -107,9 +110,11 @@ public class Player {
 
         tt.play();
 
+
         if (plaats == 100) {
             System.out.println("Een speler heeft gewonnen!");
-
+            Alert alert2 = new Alert(Alert.AlertType.WARNING, "Speler " + Menu.names[getCh()], ButtonType.OK);
+            alert2.show();
         }
     }
 
diff --git a/src/main/resources/svg/bloemtjesbord.svg b/src/main/resources/svg/bord2.svg
similarity index 100%
rename from src/main/resources/svg/bloemtjesbord.svg
rename to src/main/resources/svg/bord2.svg
diff --git a/src/main/resources/text/specials.properties b/src/main/resources/text/specials.properties
index e69de29..cb6d268 100644
--- a/src/main/resources/text/specials.properties
+++ b/src/main/resources/text/specials.properties
@@ -0,0 +1,14 @@
+5=10
+7=4
+18=13
+20=27
+30=24
+42=88
+50=43
+57=65
+63=52
+71=62
+80=82
+88=87
+92=97
+98=90