Modificada ubicacion de la llave

alfr3dosv · Nov 5, 2017 · d108ce3 · d108ce3
1 parent 8bc1a23
commit d108ce3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,6 +24,15 @@ jar {
     }
 }
 
+task fatJar(type: Jar) {
+	manifest {
+        attributes 'Main-Class': 'stickman.Launcher'
+    }
+    baseName = project.name + '-all'
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
+}
+
 dependencies {
     //compile 'com.google.guava:guava:20.0'
     compile 'net.java.dev.jna:jna:3.5.0'

diff --git a/src/main/resources/level/a_hard_one/a_hard_one.properties b/src/main/resources/level/a_hard_one/a_hard_one.properties
@@ -1,8 +1,8 @@
 stage:stage.txt
-key:4,50
+key:27,3
 player:1,20
 Asterisck1:5,10,DOWN,3,12
 Asterisck2:5,15,DOWN,15,12
 Asterisck3:68,10,LEFT,6,30
 Asterisck4:68,15,LEFT,6,30
-Asterisck5:68,19,LEFT,6,30
+Asterisck5:68,19,LEFT,6,30
diff --git a/src/main/resources/level/a_hard_one/stage.txt b/src/main/resources/level/a_hard_one/stage.txt
@@ -17,8 +17,8 @@
 *      -*---         *-------------------------------------------      *
 *--                  ********************************************      *
 *              ----  *                                                 *
-*                    *                           K                     *
+*                    *                                                 *
 *           ---      *                                                 *
 *                    *                                                 *
 *----   -----         -------------------------------------------------*                                                 
-************************************************************************
+************************************************************************
diff --git a/src/main/resources/level/enemies/enemies.properties b/src/main/resources/level/enemies/enemies.properties
@@ -4,4 +4,4 @@ player:1,14
 Asterisck1:5,5,DOWN,3,10
 Asterisck2:7,2,DOWN,20,15
 Asterisck3:9,5,UP,3,15
-Asterisck4:20,9,RIGHT,10,15
+Asterisck4:20,13,RIGHT,10,15
diff --git a/src/main/resources/level/walk/stage.txt b/src/main/resources/level/walk/stage.txt
@@ -5,7 +5,7 @@
 |     *****************************************************************|
 |     =================================================================|
 |                                                                      |
-|                                                                  K   |
+|                                                                      |
 |                                                                      |
 |======================================================================|
 |**********************************************************************|

diff --git a/src/main/resources/level/walk/walk.properties b/src/main/resources/level/walk/walk.properties
@@ -1,3 +1,3 @@
 stage:stage.txt
-key:10,10
-player:1,15
+key:68,11
+player:1,16
diff --git a/src/main/resources/storyline.properties b/src/main/resources/storyline.properties
@@ -1,8 +1,8 @@
-storyline:scene1,level1,level2,level3,level4,level5,level6
+storyline:level5,level1,level2,level3,level4,level5,level6
 level1:level/walk
 level2:level/wall
 level3:level/jumps
 level4:level/enemies
 level5:level/a_hard_one
 level6:level/windows
-scene1:scene/tutorial
+scene1:scene/tutorial