From 0e1d7d6d7e0ed93c7ab674550071a07a8b1b44d2 Mon Sep 17 00:00:00 2001
From: "A.Bond" <alexey.bond.94.55@gmail.com>
Date: Sun, 22 Apr 2018 12:31:34 +0600
Subject: [PATCH] Add more levels.

---
 _raw-assets/sprites/border-hard.svg           |  81 ++++++
 android/assets/commons.json                   |   3 +-
 android/assets/level0.json                    |   2 +-
 android/assets/level01.json                   |  90 ++++++
 android/assets/level02.json                   | 119 ++++++++
 android/assets/level03.json                   | 145 ++++++++++
 android/assets/level04.json                   | 268 ++++++++++++++++++
 .../old41_game/screens/GameScreen.java        |   2 +-
 8 files changed, 707 insertions(+), 3 deletions(-)
 create mode 100644 _raw-assets/sprites/border-hard.svg
 create mode 100644 android/assets/level01.json
 create mode 100644 android/assets/level02.json
 create mode 100644 android/assets/level03.json
 create mode 100644 android/assets/level04.json

diff --git a/_raw-assets/sprites/border-hard.svg b/_raw-assets/sprites/border-hard.svg
new file mode 100644
index 0000000..5369a8e
--- /dev/null
+++ b/_raw-assets/sprites/border-hard.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="64"
+   viewBox="0 0 135.46666 16.933334"
+   version="1.1"
+   id="svg7650"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="border-hard.svg"
+   inkscape:export-filename="D:\code\old-41-game\android\assets\sprites\border-hard.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs7644" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="232.91557"
+     inkscape:cy="19.386621"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid8195" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7647">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-280.06665)">
+    <rect
+       style="fill:#585858;fill-opacity:0.66169155;fill-rule:nonzero;stroke:#000000;stroke-width:0.46499997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99360329"
+       id="rect8197"
+       width="133.61458"
+       height="14.552083"
+       x="1.3229166"
+       y="281.12497"
+       ry="1.3229306" />
+    <rect
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46499997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99360328"
+       id="rect8756"
+       width="130.96875"
+       height="6.614583"
+       x="2.6458333"
+       y="285.09372"
+       ry="1.3229306" />
+  </g>
+</svg>
diff --git a/android/assets/commons.json b/android/assets/commons.json
index ceacd74..a53c17e 100644
--- a/android/assets/commons.json
+++ b/android/assets/commons.json
@@ -140,7 +140,8 @@
           "points": [10, 10, -10, -10]
         },
         "qe": {
-          "type": "qtgt"
+          "type": "qtgt",
+          "timeout": 3
         }
       }
     }
diff --git a/android/assets/level0.json b/android/assets/level0.json
index 5aeeaae..57cdb3d 100644
--- a/android/assets/level0.json
+++ b/android/assets/level0.json
@@ -83,7 +83,7 @@
     {
       "inherit": ["nextPointer"],
       "properties": {
-        "nextLevel": ["level1.json"]
+        "nextLevel": ["level01.json"]
       }
     }
   ]
diff --git a/android/assets/level01.json b/android/assets/level01.json
new file mode 100644
index 0000000..73972a8
--- /dev/null
+++ b/android/assets/level01.json
@@ -0,0 +1,90 @@
+{
+  "include": ["commons.json"],
+  "entities": [
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["0", "100"],
+        "rotation": ["90"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["200", "100"],
+        "rotation": ["90"]
+      }
+    },
+
+    {
+      "inherit": ["source-box-1"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+
+    //    {
+    //      "inherit": ["turn-box"],
+    //      "properties": {
+    //        "position": ["0", "100"]
+    //      }
+    //    },
+
+    {
+      "inherit": ["black-box"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+
+    {
+      "inherit": ["nextPointer"],
+      "properties": {
+        "nextLevel": ["level02.json"]
+      }
+    }
+  ]
+}
diff --git a/android/assets/level02.json b/android/assets/level02.json
new file mode 100644
index 0000000..0749a64
--- /dev/null
+++ b/android/assets/level02.json
@@ -0,0 +1,119 @@
+{
+  "include": ["commons.json"],
+  "entities": [
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["100", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-100", "-100"]
+      }
+    },
+    {
+      "inherit": ["border"],
+      "properties": {
+        "position": ["100", "0"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["0", "100"],
+        "rotation": ["90"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["200", "100"],
+        "rotation": ["90"]
+      }
+    },
+
+    {
+      "inherit": ["source-box-1"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["-200", "0"]
+      }
+    },
+
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+
+    {
+      "inherit": ["nextPointer"],
+      "properties": {
+        "nextLevel": ["level03.json"]
+      }
+    }
+  ]
+}
diff --git a/android/assets/level03.json b/android/assets/level03.json
new file mode 100644
index 0000000..b1fc922
--- /dev/null
+++ b/android/assets/level03.json
@@ -0,0 +1,145 @@
+{
+  "include": ["commons.json"],
+  "entities": [
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["300", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["300", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["300", "100"]
+      }
+    },
+    {
+      "inherit": ["border"],
+      "properties": {
+        "position": ["-100", "50"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["0", "100"],
+        "rotation": ["90"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["100", "0"],
+        "rotation": ["0"]
+      }
+    },
+    {
+      "inherit": ["border"],
+      "properties": {
+        "position": ["200", "100"],
+        "rotation": ["90"]
+      }
+    },
+
+    {
+      "inherit": ["source-box-1"],
+      "properties": {
+        "position": ["-300", "0"]
+      }
+    },
+
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["-100", "150"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["-120", "100"]
+      }
+    },
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["-80", "100"]
+      }
+    },
+
+    {
+      "inherit": ["black-box"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+
+    {
+      "inherit": ["nextPointer"],
+      "properties": {
+        "nextLevel": ["level04.json"]
+      }
+    }
+  ]
+}
diff --git a/android/assets/level04.json b/android/assets/level04.json
new file mode 100644
index 0000000..af92cea
--- /dev/null
+++ b/android/assets/level04.json
@@ -0,0 +1,268 @@
+{
+  "include": ["commons.json"],
+  "entities": [
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["0", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-100", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["200", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-100", "100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-100", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["100", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["200", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-100", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-200", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-100", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["200", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["100", "-100"]
+      }
+    },
+
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["0", "-80"],
+        "rotation": ["90"]
+      }
+    },
+
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["-340", "150"],
+        "rotation": ["0"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["340", "150"],
+        "rotation": ["0"]
+      }
+    },
+
+    {
+      "inherit": ["border"],
+      "properties": {
+        "position": ["250", "-100"],
+        "rotation": ["90"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["250", "60"],
+        "rotation": ["90"]
+      }
+    },
+
+    {
+      "inherit": ["border"],
+      "properties": {
+        "position": ["-250", "-100"],
+        "rotation": ["90"]
+      }
+    },
+    {
+      "inherit": ["border-hard"],
+      "properties": {
+        "position": ["-250", "60"],
+        "rotation": ["90"]
+      }
+    },
+
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["-300", "-100"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["350", "-100"]
+      }
+    },
+
+    {
+      "inherit": ["source-box-1"],
+      "properties": {
+        "position": ["-300", "-100"]
+      }
+    },
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["300", "100"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["350", "-100"]
+      }
+    },
+
+    {
+      "inherit": ["border"],
+      "properties": {
+        "position": ["350", "0"]
+      }
+    },
+    {
+      "inherit": ["mountpoint"],
+      "properties": {
+        "position": ["300", "100"]
+      }
+    },
+
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["-100", "-100"]
+      }
+    },
+    {
+      "inherit": ["target-box"],
+      "properties": {
+        "position": ["-200", "-100"]
+      }
+    },
+
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["-200", "0"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["-100", "0"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["-200", "100"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["-100", "100"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["0", "100"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["100", "100"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["200", "100"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["100", "0"]
+      }
+    },
+    {
+      "inherit": ["turn-box"],
+      "properties": {
+        "position": ["200", "0"]
+      }
+    },
+
+    {
+      "inherit": ["nextPointer"],
+      "properties": {
+        "nextLevel": ["level05.json"]
+      }
+    }
+  ]
+}
diff --git a/core/src/com/github/oldnpluslusteam/old41_game/screens/GameScreen.java b/core/src/com/github/oldnpluslusteam/old41_game/screens/GameScreen.java
index 4eddea3..5abfb27 100644
--- a/core/src/com/github/oldnpluslusteam/old41_game/screens/GameScreen.java
+++ b/core/src/com/github/oldnpluslusteam/old41_game/screens/GameScreen.java
@@ -29,7 +29,7 @@
 import com.github.oldnpluslusteam.old41_game.components.quantum.QuantumSystem;
 
 public class GameScreen extends DefaultScreen {
-    public static String INITIAL_LEVEL = "level0.json";
+    public static String INITIAL_LEVEL = "level04.json";
 
     private final String levelName;