diff --git a/.gitignore b/.gitignore
index f91ff2b..7da7938 100644
--- a/.gitignore
+++ b/.gitignore
@@ -214,3 +214,4 @@ pip-log.txt
#Mr Developer
.mr.developer.cfg
+/dist/
\ No newline at end of file
diff --git a/lib/itext-2.1.7.jar b/lib/itext-2.1.7.jar
new file mode 100644
index 0000000..3f2c188
Binary files /dev/null and b/lib/itext-2.1.7.jar differ
diff --git a/lib/jgrapht-demo-0.9.2.jar b/lib/jgrapht-demo-0.9.2.jar
deleted file mode 100644
index fbd2d23..0000000
Binary files a/lib/jgrapht-demo-0.9.2.jar and /dev/null differ
diff --git a/lib/jgrapht-ext-0.9.2-uber.jar b/lib/jgrapht-ext-0.9.2-uber.jar
deleted file mode 100644
index 03a2d24..0000000
Binary files a/lib/jgrapht-ext-0.9.2-uber.jar and /dev/null differ
diff --git a/lib/pdfbox-app-2.0.2.jar b/lib/pdfbox-app-2.0.2.jar
new file mode 100644
index 0000000..c65e3c4
Binary files /dev/null and b/lib/pdfbox-app-2.0.2.jar differ
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index ca6c2e6..e0aa48a 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -3,17 +3,8 @@
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/dungeon/Room.java
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/dungeon/Exit.java
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/.gitignore
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/dungeon/Dungeon.java
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/build.xml
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/nbproject/build-impl.xml
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/main/DungeonGeneratorUI.java
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/util/Counter.java
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/dungeon/Enemy.java
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/util/Dice.java
- file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/dungeon/Trap.java
+ file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/eu/smoser/dungeongenerator/dungeon/Dungeon.java
+ file:/C:/Users/MrMcX/ownCloud/Rollenspiel/DSA/Meister/DungeonGenerator/src/eu/smoser/dungeongenerator/main/DungeonGeneratorUI.java
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 74c8a00..e9bdf30 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,12 +30,12 @@ dist.jar=${dist.dir}/DungeonGenerator.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
+file.reference.itext-2.1.7.jar=lib/itext-2.1.7.jar
file.reference.jgraph-5.13.0.0.jar=lib/jgraph-5.13.0.0.jar
file.reference.jgrapht-core-0.9.2.jar=lib/jgrapht-core-0.9.2.jar
-file.reference.jgrapht-demo-0.9.2.jar=lib/jgrapht-demo-0.9.2.jar
-file.reference.jgrapht-ext-0.9.2-uber.jar=lib/jgrapht-ext-0.9.2-uber.jar
file.reference.jgrapht-ext-0.9.2.jar=lib/jgrapht-ext-0.9.2.jar
file.reference.jgraphx-2.0.0.1.jar=lib/jgraphx-2.0.0.1.jar
+file.reference.pdfbox-app-2.0.2.jar=lib/pdfbox-app-2.0.2.jar
file.reference.resources-images=resources/images
includes=**
jar.archive.disabled=${jnlp.enabled}
@@ -43,13 +43,13 @@ jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${libs.absolutelayout.classpath}:\
+ ${file.reference.resources-images}:\
${file.reference.jgraph-5.13.0.0.jar}:\
${file.reference.jgrapht-core-0.9.2.jar}:\
- ${file.reference.jgrapht-demo-0.9.2.jar}:\
- ${file.reference.jgrapht-ext-0.9.2-uber.jar}:\
${file.reference.jgrapht-ext-0.9.2.jar}:\
${file.reference.jgraphx-2.0.0.1.jar}:\
- ${file.reference.resources-images}
+ ${file.reference.itext-2.1.7.jar}:\
+ ${file.reference.pdfbox-app-2.0.2.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
diff --git a/src/eu/smoser/dungeongenerator/dungeon/Dungeon.java b/src/eu/smoser/dungeongenerator/dungeon/Dungeon.java
index ae26ce3..1ce106d 100644
--- a/src/eu/smoser/dungeongenerator/dungeon/Dungeon.java
+++ b/src/eu/smoser/dungeongenerator/dungeon/Dungeon.java
@@ -111,7 +111,7 @@ public class Dungeon {
});
rooms.stream().forEach((r) -> {
for (Exit e : r.exits) {
- if (e.isStart || e.room.number == 0 || g.containsEdge(r, e.room)) {
+ if (e.isStart || e.room.number == 0 || g.containsEdge(r, e.room)) {
continue;
}
g.addEdge(r, e.room, e);
diff --git a/src/eu/smoser/dungeongenerator/main/DungeonGeneratorUI.form b/src/eu/smoser/dungeongenerator/main/DungeonGeneratorUI.form
index 1faec82..73dec3f 100644
--- a/src/eu/smoser/dungeongenerator/main/DungeonGeneratorUI.form
+++ b/src/eu/smoser/dungeongenerator/main/DungeonGeneratorUI.form
@@ -21,42 +21,70 @@
-
+
+
+
+
+
+