From 4116210d06850f68c32aa45be2ed28448adbc31c Mon Sep 17 00:00:00 2001
From: Juraj Michalek <juraj.michalek@ysoft.com>
Date: Sun, 27 Dec 2015 23:18:18 +0100
Subject: [PATCH] simplify first level

---
 data/levels/level-01.json |  2 +-
 data/levels/level-02.json |  6 ++--
 data/levels/level-03.json |  4 +--
 data/levels/level-04.json |  6 ++--
 data/levels/level-05.json | 64 +++++++++++++++++++++++++++++++++++++++
 index.html                |  4 ++-
 js/app/level-01.js        |  7 ++---
 js/app/level-02.js        | 25 ++++++++-------
 js/app/level-03.js        | 41 +++++++++----------------
 js/app/level-04.js        | 28 +++++------------
 js/app/level-05.js        | 42 +++++++++++++++++++++++++
 js/app/level-selector.js  |  4 +--
 12 files changed, 156 insertions(+), 77 deletions(-)
 create mode 100644 data/levels/level-05.json
 create mode 100644 js/app/level-05.js

diff --git a/data/levels/level-01.json b/data/levels/level-01.json
index 2039538..d31703e 100644
--- a/data/levels/level-01.json
+++ b/data/levels/level-01.json
@@ -23,7 +23,7 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"sky",
          "opacity":1,
diff --git a/data/levels/level-02.json b/data/levels/level-02.json
index f49ca16..2039538 100644
--- a/data/levels/level-02.json
+++ b/data/levels/level-02.json
@@ -1,7 +1,7 @@
 { "height":6,
  "layers":[
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 2, 1, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"ground",
          "opacity":1,
@@ -12,7 +12,7 @@
          "y":0
         }, 
         {
-         "data":[0, 51, 51, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 51, 51, 51, 51, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 51, 51, 51, 21, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 51, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 51, 51, 51, 51, 41, 51, 51, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 41, 41, 41, 41, 41, 41, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"walls",
          "opacity":1,
@@ -23,7 +23,7 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"sky",
          "opacity":1,
diff --git a/data/levels/level-03.json b/data/levels/level-03.json
index fbe82db..f49ca16 100644
--- a/data/levels/level-03.json
+++ b/data/levels/level-03.json
@@ -1,7 +1,7 @@
 { "height":6,
  "layers":[
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 2, 1, 2, 0, 0, 4, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 1, 1, 12, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"ground",
          "opacity":1,
@@ -12,7 +12,7 @@
          "y":0
         }, 
         {
-         "data":[0, 51, 51, 51, 51, 41, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 22, 0, 32, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 52, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 42, 0, 22, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 41, 41, 41, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 51, 51, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 51, 51, 51, 51, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 51, 51, 51, 21, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 51, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"walls",
          "opacity":1,
diff --git a/data/levels/level-04.json b/data/levels/level-04.json
index 41e3627..fbe82db 100644
--- a/data/levels/level-04.json
+++ b/data/levels/level-04.json
@@ -1,7 +1,7 @@
 { "height":6,
  "layers":[
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 14, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 2, 1, 2, 0, 0, 4, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 1, 1, 12, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"ground",
          "opacity":1,
@@ -12,7 +12,7 @@
          "y":0
         }, 
         {
-         "data":[0, 41, 41, 41, 41, 41, 41, 0, 41, 41, 41, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 41, 41, 41, 41, 0, 31, 31, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 31, 31, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 41, 0, 31, 0, 31, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 51, 51, 51, 51, 41, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 22, 0, 32, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 52, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 42, 0, 22, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 21, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 41, 41, 41, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"walls",
          "opacity":1,
@@ -23,7 +23,7 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":6,
          "name":"sky",
          "opacity":1,
diff --git a/data/levels/level-05.json b/data/levels/level-05.json
new file mode 100644
index 0000000..41e3627
--- /dev/null
+++ b/data/levels/level-05.json
@@ -0,0 +1,64 @@
+{ "height":6,
+ "layers":[
+        {
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 14, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "height":6,
+         "name":"ground",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":18,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "data":[0, 41, 41, 41, 41, 41, 41, 0, 41, 41, 41, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 41, 41, 41, 41, 0, 31, 31, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 31, 31, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 41, 0, 31, 0, 31, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 0],
+         "height":6,
+         "name":"walls",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":18,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "height":6,
+         "name":"sky",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":18,
+         "x":0,
+         "y":0
+        }],
+ "nextobjectid":4,
+ "orientation":"orthogonal",
+ "properties":
+    {
+
+    },
+ "renderorder":"right-down",
+ "tileheight":64,
+ "tilesets":[
+        {
+         "firstgid":1,
+         "image":"..\/images\/gfx64\/tiles.png",
+         "imageheight":448,
+         "imagewidth":640,
+         "margin":0,
+         "name":"base",
+         "properties":
+            {
+
+            },
+         "spacing":0,
+         "tilecount":70,
+         "tileheight":64,
+         "tilewidth":64
+        }],
+ "tilewidth":64,
+ "version":1,
+ "width":18
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index 9b77f39..fc85345 100644
--- a/index.html
+++ b/index.html
@@ -13,18 +13,20 @@
     <script src="js/app/level-02.js"></script>
     <script src="js/app/level-03.js"></script>
     <script src="js/app/level-04.js"></script>
+    <script src="js/app/level-05.js"></script>
 </head>
 <body>
 
 <script>
 var state = new Kiwi.State('state');
-var levels = [level1, level2, level3, level4];
+var levels = [level1, level2, level3, level4, level5];
 
 state.preload = function() {
 	this.addJSON('level1', 'data/levels/level-01.json');
 	this.addJSON('level2', 'data/levels/level-02.json');
     this.addJSON('level3', 'data/levels/level-03.json');
     this.addJSON('level4', 'data/levels/level-04.json');
+    this.addJSON('level5', 'data/levels/level-05.json');
 	this.addSpriteSheet('base', './data/images/gfx64/tiles.png', 64, 64);
     this.addSpriteSheet('character', './data/images/gfx64/marble_black.png', 80, 80 );
 	this.addSpriteSheet('oneWay', './data/images/gfx64/st_oneway.png', 64, 64 );
diff --git a/js/app/level-01.js b/js/app/level-01.js
index 96eb075..633c478 100644
--- a/js/app/level-01.js
+++ b/js/app/level-01.js
@@ -1,16 +1,13 @@
 var level1 = {};
 level1.create = function(context) {
     // Define start coordinates
-    context.character.initialX = 4*64;
+    context.character.initialX = 2*64;
     context.character.initialY = 2*64;
     context.character.initialVelocityX = 64;
     context.character.initialVelocityY = 0;
     
     // Define finish coordinates
-    context.finishMarker.x = 2*64;
+    context.finishMarker.x = 7*64;
     context.finishMarker.y = 2*64;
 
-    // Create redirector objects
-    addRedirector(context, 6, 1, -1, 0, 9);
-
 }
\ No newline at end of file
diff --git a/js/app/level-02.js b/js/app/level-02.js
index 506144f..0e728a2 100644
--- a/js/app/level-02.js
+++ b/js/app/level-02.js
@@ -1,17 +1,16 @@
 var level2 = {};
 level2.create = function(context) {
-    // Create redirector objects
-    addRedirector(context, 6, 3, 1, 0, 0);
-    addRedirector(context, 4, 3, 0, 1, 6);
-        
-    // Define player coordinates
-    context.character.x = 2*64 - 8;
-    context.character.y = 64 - 8;
-    context.character.physics.acceleration.x = 0;
-	context.character.physics.maxVelocity.y = 140;
+    // Define start coordinates
+    context.character.initialX = 4*64;
+    context.character.initialY = 2*64;
+    context.character.initialVelocityX = 64;
+    context.character.initialVelocityY = 0;
     
     // Define finish coordinates
-    context.finishMarker.x = 6*64;
-    context.finishMarker.y = 4*64;
-}
-	
+    context.finishMarker.x = 2*64;
+    context.finishMarker.y = 2*64;
+
+    // Create redirector objects
+    addRedirector(context, 6, 1, -1, 0, 9);
+
+}
\ No newline at end of file
diff --git a/js/app/level-03.js b/js/app/level-03.js
index c258b75..15976dd 100644
--- a/js/app/level-03.js
+++ b/js/app/level-03.js
@@ -1,30 +1,17 @@
 var level3 = {};
 level3.create = function(context) {
-    // Define finish coordinates
-    context.finishMarker.x = 8*64;
-    context.finishMarker.y = 2*64;
-
-    // Add teleport    
-    var teleport = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 4*64, 2*64);	
-	teleport.animation.add('idle', [ 0, 1, 2, 3 ], 0.3, true);
-	teleport.animation.play('idle', true);
-    teleport.type = 'teleport';
-    teleport.affectedX = 9*64;
-    teleport.affectedY = 2*64;
-    context.redirectorGroup.addChild(teleport);
-
-    // Add target teleport marker
-    var teleportTarget = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 9*64, 2*64);	
-	teleportTarget.animation.add('idle', [ 3, 2, 1, 0 ], 0.3, true);
-	teleportTarget.animation.play('idle', true);
-    teleportTarget.type = 'teleport';
-    teleportTarget.affectedX = 4*64;
-    teleportTarget.affectedY = 2*64;
-    context.redirectorGroup.addChild(teleportTarget);
-
     // Create redirector objects
-    addRedirector(context, 9, 1, -1, 0, 9);
-    addRedirector(context, 9, 3, 1, 0, 0);
-    addRedirector(context, 10, 2, 0, -1, 3);
-
-}
\ No newline at end of file
+    addRedirector(context, 6, 3, 1, 0, 0);
+    addRedirector(context, 4, 3, 0, 1, 6);
+        
+    // Define player coordinates
+    context.character.x = 2*64 - 8;
+    context.character.y = 64 - 8;
+    context.character.physics.acceleration.x = 0;
+	context.character.physics.maxVelocity.y = 140;
+    
+    // Define finish coordinates
+    context.finishMarker.x = 6*64;
+    context.finishMarker.y = 4*64;
+}
+	
diff --git a/js/app/level-04.js b/js/app/level-04.js
index c6e1dc1..bbf5bb4 100644
--- a/js/app/level-04.js
+++ b/js/app/level-04.js
@@ -1,39 +1,27 @@
 var level4 = {};
 level4.create = function(context) {
-    // Define start coordinates
-    context.character.initialX = 1*64;
-    context.character.initialY = 1*64;
-    context.character.initialVelocityX = 64;
-    context.character.initialVelocityY = 0;
-    
     // Define finish coordinates
-    context.finishMarker.x = 9*64;
-    context.finishMarker.y = 4*64;
+    context.finishMarker.x = 8*64;
+    context.finishMarker.y = 2*64;
 
     // Add teleport    
-    var teleport = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 3*64, 3*64);	
+    var teleport = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 4*64, 2*64);	
 	teleport.animation.add('idle', [ 0, 1, 2, 3 ], 0.3, true);
 	teleport.animation.play('idle', true);
     teleport.type = 'teleport';
-    teleport.affectedX = 10*64;
-    teleport.affectedY = 1*64;
+    teleport.affectedX = 9*64;
+    teleport.affectedY = 2*64;
     context.redirectorGroup.addChild(teleport);
 
     // Add target teleport marker
-    var teleportTarget = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 10*64, 1*64);	
+    var teleportTarget = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 9*64, 2*64);	
 	teleportTarget.animation.add('idle', [ 3, 2, 1, 0 ], 0.3, true);
 	teleportTarget.animation.play('idle', true);
     teleportTarget.type = 'teleport';
-    teleportTarget.affectedX = 3*64;
-    teleportTarget.affectedY = 3*64;
+    teleportTarget.affectedX = 4*64;
+    teleportTarget.affectedY = 2*64;
     context.redirectorGroup.addChild(teleportTarget);
 
-    // Add block    
-    var box = new Kiwi.GameObjects.Sprite(context, context.textures.box, 4*64, 1*64);	
-    box.type = 'box';
-    context.redirectorGroup.addChild(box);
-
-
     // Create redirector objects
     addRedirector(context, 9, 1, -1, 0, 9);
     addRedirector(context, 9, 3, 1, 0, 0);
diff --git a/js/app/level-05.js b/js/app/level-05.js
new file mode 100644
index 0000000..744ba20
--- /dev/null
+++ b/js/app/level-05.js
@@ -0,0 +1,42 @@
+var level5 = {};
+level5.create = function(context) {
+    // Define start coordinates
+    context.character.initialX = 1*64;
+    context.character.initialY = 1*64;
+    context.character.initialVelocityX = 64;
+    context.character.initialVelocityY = 0;
+    
+    // Define finish coordinates
+    context.finishMarker.x = 9*64;
+    context.finishMarker.y = 4*64;
+
+    // Add teleport    
+    var teleport = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 3*64, 3*64);	
+	teleport.animation.add('idle', [ 0, 1, 2, 3 ], 0.3, true);
+	teleport.animation.play('idle', true);
+    teleport.type = 'teleport';
+    teleport.affectedX = 10*64;
+    teleport.affectedY = 1*64;
+    context.redirectorGroup.addChild(teleport);
+
+    // Add target teleport marker
+    var teleportTarget = new Kiwi.GameObjects.Sprite(context, context.textures.teleport, 10*64, 1*64);	
+	teleportTarget.animation.add('idle', [ 3, 2, 1, 0 ], 0.3, true);
+	teleportTarget.animation.play('idle', true);
+    teleportTarget.type = 'teleport';
+    teleportTarget.affectedX = 3*64;
+    teleportTarget.affectedY = 3*64;
+    context.redirectorGroup.addChild(teleportTarget);
+
+    // Add block    
+    var box = new Kiwi.GameObjects.Sprite(context, context.textures.box, 4*64, 1*64);	
+    box.type = 'box';
+    context.redirectorGroup.addChild(box);
+
+
+    // Create redirector objects
+    addRedirector(context, 9, 1, -1, 0, 9);
+    addRedirector(context, 9, 3, 1, 0, 0);
+    addRedirector(context, 10, 2, 0, -1, 3);
+
+}
\ No newline at end of file
diff --git a/js/app/level-selector.js b/js/app/level-selector.js
index dde8cc7..dccf74b 100644
--- a/js/app/level-selector.js
+++ b/js/app/level-selector.js
@@ -6,8 +6,8 @@ levelSelectorState.preload = function() {
 
 levelSelectorState.create = function() {
 	for (var i=1; i<levels.length+1; i++) {
-		var text = new Kiwi.GameObjects.Textfield( this, "Level " + i.toString(), 66+i*140, 60, "#000", 32, 'normal', 'Impact' );
-		var sprite = new Kiwi.GameObjects.Sprite(this, this.textures.button, 50+i*140, 50);
+		var text = new Kiwi.GameObjects.Textfield( this, "Level " + i.toString(), 16+(i-1)*140, 60, "#000", 32, 'normal', 'Impact' );
+		var sprite = new Kiwi.GameObjects.Sprite(this, this.textures.button, (i-1)*140, 50);
 		sprite.levelIndex = i;
 		sprite.input.onUp.add( this.buttonReleased, this );	
 		this.addChild( sprite );