From 8d0a7142e9a1657807a3c34da9cd541039110446 Mon Sep 17 00:00:00 2001
From: MrMcX <mrmcx@hotmail.de>
Date: Mon, 12 Sep 2016 10:30:03 +0200
Subject: [PATCH] treasure fixed

---
 nbproject/private/private.properties          |  2 +-
 nbproject/private/private.xml                 |  5 +--
 .../dungeon/objects/Treasure.java             | 42 +++++++++++--------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
index 9e8f740..0a93cc4 100644
--- a/nbproject/private/private.properties
+++ b/nbproject/private/private.properties
@@ -3,4 +3,4 @@ do.depend=false
 do.jar=true
 javac.debug=true
 javadoc.preview=true
-user.properties.file=C:\\Users\\MrMcX\\AppData\\Roaming\\NetBeans\\8.1\\build.properties
+user.properties.file=/home/mosers/.netbeans/8.1/build.properties
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index e0aa48a..6807a2b 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -2,9 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/eu/smoser/dungeongenerator/dungeon/Dungeon.java</file>
-            <file>file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/eu/smoser/dungeongenerator/main/DungeonGeneratorUI.java</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/src/eu/smoser/dungeongenerator/dungeon/objects/Treasure.java b/src/eu/smoser/dungeongenerator/dungeon/objects/Treasure.java
index fda0725..3deb52f 100644
--- a/src/eu/smoser/dungeongenerator/dungeon/objects/Treasure.java
+++ b/src/eu/smoser/dungeongenerator/dungeon/objects/Treasure.java
@@ -123,14 +123,15 @@ public class Treasure extends ADungeonObject{
             case 11:
             case 12:
             case 13:
-            case 14: return Gems();
+            case 14: return Gem();
             case 15:
             case 16: return Coins() + " und " + Jewelry();
             case 17:
-            case 18: return Coins() + " und " + Gems();
-            case 19: return Jewelry() + " und " + Gems();
-            case 20: return Coins() + ", " + Jewelry() + " und " + Gems();
+            case 18: return Coins() + " und " + Gem();
+            case 19: return Jewelry() + " und " + Gem();
+            case 20: return Coins() + ", " + Jewelry() + " und " + Gem();
         }
+        return "";
     }
     
     private String Coins(){
@@ -156,6 +157,7 @@ public class Treasure extends ADungeonObject{
             case 19: 
             case 20: return Dice.Roll(20, 3) + " Dukaten";
         }
+        return "";
     }
     
     private String Jewelry(){
@@ -175,12 +177,13 @@ public class Treasure extends ADungeonObject{
             case 13:
             case 14: return Material() + "-Ring";
             case 15: return Material() + "-Armreif mit eingearbeitetem " + Gem();
-            case 16: return Material() + "-Brosche besetzt mit " + Dice.Roll(6, 1) + Gems();
-            case 17: return Material() + "-Diadem besetzt mit " + Dice.Roll(6, 1) + Gems();
-            case 18: return Material() + "-Kette mit Anhänger mit einem " + Gems();
-            case 19: return Material() + "-Ohrring mit einem " + Gems();
-            case 20: return Material() + "-Ring mit einem " + Gems();
+            case 16: return Material() + "-Brosche besetzt mit " + Dice.Roll(6, 1) + Gem();
+            case 17: return Material() + "-Diadem besetzt mit " + Dice.Roll(6, 1) + Gem();
+            case 18: return Material() + "-Kette mit Anhänger mit einem " + Gem();
+            case 19: return Material() + "-Ohrring mit einem " + Gem();
+            case 20: return Material() + "-Ring mit einem " + Gem();
         }
+        return "";
     }
     
     private String Material(){
@@ -206,9 +209,10 @@ public class Treasure extends ADungeonObject{
             case 19: return "Elektrum";
             case 20: return (Dice.Roll(6,1)==6 ? "Mindorium" : "Mondsilber");
         }
+        return "";
     }
     
-    private String Gems(){
+    private String Gem(){
         switch(Dice.Roll(20,1)){
             case 1: 
             case 2: return "Speckstein (weiß/braun/rot, " + Karat() + ")";
@@ -231,21 +235,25 @@ public class Treasure extends ADungeonObject{
             case 19: return "Rubin (rot, " + Karat() + ")";
             case 20: return "Diamant (durchsichtig, " + Karat() + ")";
         }
+        return "";
     }
     
     private String Karat(){
         switch(Dice.Roll(6,2)){
-            case 2: return Dice.Roll(20, 2).toString() + " Karat";
+            case 2: return Dice.Roll(20, 2) + " Karat";
             case 3: 
-            case 4: return Dice.Roll(6, 2).toString() + " Karat";
+            case 4: return Dice.Roll(6, 2) + " Karat";
             case 5: 
-            case 6: return Dice.Roll(6, 1).toString() + " Karat";
+            case 6: return Dice.Roll(6, 1) + " Karat";
             case 7:
             case 8:
-            case 9: return (Dice.Roll(6, 1)/2).toString() + " Karat";
-            case 10: return (Dice.Roll(6, 3)+3).toString() + " Karat";
-            case 11: return Dice.Roll(6, 5).toString() + " Karat";
-            case 12: return (Dice.Roll(20, 1)+10).toString() + " Karat";
+            case 9: return (Dice.Roll(6, 1)/2) + " Karat";
+            case 10: return (Dice.Roll(6, 3)+3) + " Karat";
+            case 11: return Dice.Roll(6, 5) + " Karat";
+            case 12: return (Dice.Roll(20, 1)+10) + " Karat";
         }
+        return "";
     }
+    
+    //TODO: other items (p. 188)
 }