From 9b7c25ecf261d3802a2a676be34d4ed74f1cb367 Mon Sep 17 00:00:00 2001
From: MegaBrutal <code+git@megabrutal.com>
Date: Wed, 12 Sep 2018 01:15:45 +0200
Subject: [PATCH] Remove test doors

	modified:   tilemap.json
	modified:   tilemap.tmx
	modified:   wgj58.js
---
 tilemap.json | 130 ++-------------------------------------------------
 tilemap.tmx  |  50 ++++----------------
 wgj58.js     |   1 -
 3 files changed, 15 insertions(+), 166 deletions(-)

diff --git a/tilemap.json b/tilemap.json
index 5a7025e..dc56dc6 100644
--- a/tilemap.json
+++ b/tilemap.json
@@ -2,7 +2,7 @@
  "infinite":false,
  "layers":[
         {
-         "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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 4, 2, 2, 4, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 4, 2, 2, 4, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 4, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 4, 2, 2, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":19,
          "name":"floor",
          "opacity":1,
@@ -13,7 +13,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354582, 2684354581, 2684354581, 1610612767, 61, 62, 3221225534, 61, 2684354591, 2684354581, 2684354581, 3221225494, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3221225493, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 2684354581, 2684354581, 3221225494, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612790, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354613, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612788, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354582, 2684354581, 2684354581, 1610612758, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 22, 2684354581, 2684354581, 1610612767, 61, 62, 3221225534, 61, 2684354591, 2684354581, 2684354581, 1610612758, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354582, 2684354581, 2684354581, 1610612767, 0, 0, 0, 0, 2684354591, 2684354581, 2684354581, 3221225494, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3221225493, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 2684354581, 2684354581, 3221225494, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612790, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354613, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612788, 0, 0, 21, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354582, 2684354581, 2684354581, 1610612758, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 22, 2684354581, 2684354581, 1610612767, 61, 62, 3221225534, 61, 2684354591, 2684354581, 2684354581, 1610612758, 0, 0, 0, 0, 0, 0, 0],
          "height":19,
          "name":"walls",
          "opacity":1,
@@ -67,46 +67,6 @@
                  "height":64,
                  "id":4,
                  "name":"cutedoor",
-                 "properties":
-                    {
-                     "longpanel":false
-                    },
-                 "propertytypes":
-                    {
-                     "longpanel":"bool"
-                    },
-                 "rotation":0,
-                 "type":"door",
-                 "visible":true,
-                 "width":64,
-                 "x":320,
-                 "y":580
-                }, 
-                {
-                 "gid":62,
-                 "height":64,
-                 "id":5,
-                 "name":"cutedoor",
-                 "properties":
-                    {
-                     "longpanel":false
-                    },
-                 "propertytypes":
-                    {
-                     "longpanel":"bool"
-                    },
-                 "rotation":180,
-                 "type":"door",
-                 "visible":true,
-                 "width":64,
-                 "x":448,
-                 "y":516
-                }, 
-                {
-                 "gid":62,
-                 "height":64,
-                 "id":7,
-                 "name":"cutedoor",
                  "properties":
                     {
                      "longpanel":true
@@ -120,12 +80,12 @@
                  "visible":true,
                  "width":64,
                  "x":320,
-                 "y":640
+                 "y":512
                 }, 
                 {
                  "gid":62,
                  "height":64,
-                 "id":10,
+                 "id":5,
                  "name":"cutedoor",
                  "properties":
                     {
@@ -140,87 +100,7 @@
                  "visible":true,
                  "width":64,
                  "x":448,
-                 "y":576
-                }, 
-                {
-                 "gid":62,
-                 "height":64,
-                 "id":11,
-                 "name":"cutedoor",
-                 "properties":
-                    {
-                     "longpanel":true
-                    },
-                 "propertytypes":
-                    {
-                     "longpanel":"bool"
-                    },
-                 "rotation":270,
-                 "type":"door",
-                 "visible":true,
-                 "width":64,
-                 "x":252.797924388358,
-                 "y":895.20591597973
-                }, 
-                {
-                 "gid":62,
-                 "height":64,
-                 "id":12,
-                 "name":"cutedoor",
-                 "properties":
-                    {
-                     "longpanel":false
-                    },
-                 "propertytypes":
-                    {
-                     "longpanel":"bool"
-                    },
-                 "rotation":270,
-                 "type":"door",
-                 "visible":true,
-                 "width":64,
-                 "x":192.798050825782,
-                 "y":895.32909258007
-                }, 
-                {
-                 "gid":62,
-                 "height":64,
-                 "id":13,
-                 "name":"cutedoor",
-                 "properties":
-                    {
-                     "longpanel":true
-                    },
-                 "propertytypes":
-                    {
-                     "longpanel":"bool"
-                    },
-                 "rotation":90,
-                 "type":"door",
-                 "visible":true,
-                 "width":64,
-                 "x":188.535282507552,
-                 "y":767.337574086597
-                }, 
-                {
-                 "gid":62,
-                 "height":64,
-                 "id":14,
-                 "name":"cutedoor",
-                 "properties":
-                    {
-                     "longpanel":false
-                    },
-                 "propertytypes":
-                    {
-                     "longpanel":"bool"
-                    },
-                 "rotation":90,
-                 "type":"door",
-                 "visible":true,
-                 "width":64,
-                 "x":128.535408944975,
-                 "y":767.460750686937
+                 "y":448
                 }],
          "opacity":1,
          "type":"objectgroup",
diff --git a/tilemap.tmx b/tilemap.tmx
index d05a758..d4c94e3 100644
--- a/tilemap.tmx
+++ b/tilemap.tmx
@@ -16,13 +16,13 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,
-0,2,2,2,4,2,2,4,2,2,2,0,0,0,0,0,0,0,0,
-0,2,2,2,4,2,2,4,2,2,2,0,0,0,0,0,0,0,0,
-0,2,2,2,4,4,4,4,2,2,2,2,2,2,0,0,0,0,0,
-0,4,4,4,4,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
-0,4,2,2,4,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
-0,4,2,2,4,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
-0,4,4,4,4,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
+0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,
+0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,
+0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
+0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
+0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
+0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
+0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,
 0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,
 0,2,2,1,1,1,1,1,1,2,2,0,0,0,0,0,0,0,0,
 0,2,2,1,1,1,1,1,1,2,2,0,0,0,0,0,0,0,0,
@@ -38,7 +38,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2684354582,2684354581,2684354581,1610612767,61,62,3221225534,61,2684354591,2684354581,2684354581,3221225494,0,0,0,0,0,0,0,
+2684354582,2684354581,2684354581,1610612767,0,0,0,0,2684354591,2684354581,2684354581,3221225494,0,0,0,0,0,0,0,
 21,0,0,0,0,0,0,0,0,0,0,3221225493,0,0,0,0,0,0,0,
 21,0,0,0,0,0,0,0,0,0,0,22,2684354581,2684354581,3221225494,0,0,0,0,
 21,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,
@@ -78,45 +78,15 @@
  <objectgroup name="objects">
   <object id="2" name="john" type="spawnpoint" gid="51" x="353.333" y="1121.33" width="64" height="64"/>
   <object id="3" name="clara" type="spawnpoint" gid="51" x="774.667" y="894.667" width="64" height="64"/>
-  <object id="4" name="cutedoor" type="door" gid="62" x="320" y="580" width="64" height="64">
-   <properties>
-    <property name="longpanel" type="bool" value="false"/>
-   </properties>
-  </object>
-  <object id="5" name="cutedoor" type="door" gid="62" x="448" y="516" width="64" height="64" rotation="180">
-   <properties>
-    <property name="longpanel" type="bool" value="false"/>
-   </properties>
-  </object>
-  <object id="7" name="cutedoor" type="door" gid="62" x="320" y="640" width="64" height="64">
-   <properties>
-    <property name="longpanel" type="bool" value="true"/>
-   </properties>
-  </object>
-  <object id="10" name="cutedoor" type="door" gid="62" x="448" y="576" width="64" height="64" rotation="180">
+  <object id="4" name="cutedoor" type="door" gid="62" x="320" y="512" width="64" height="64">
    <properties>
     <property name="longpanel" type="bool" value="true"/>
    </properties>
   </object>
-  <object id="11" name="cutedoor" type="door" gid="62" x="252.798" y="895.206" width="64" height="64" rotation="270">
+  <object id="5" name="cutedoor" type="door" gid="62" x="448" y="448" width="64" height="64" rotation="180">
    <properties>
     <property name="longpanel" type="bool" value="true"/>
    </properties>
   </object>
-  <object id="12" name="cutedoor" type="door" gid="62" x="192.798" y="895.329" width="64" height="64" rotation="270">
-   <properties>
-    <property name="longpanel" type="bool" value="false"/>
-   </properties>
-  </object>
-  <object id="13" name="cutedoor" type="door" gid="62" x="188.535" y="767.338" width="64" height="64" rotation="90">
-   <properties>
-    <property name="longpanel" type="bool" value="true"/>
-   </properties>
-  </object>
-  <object id="14" name="cutedoor" type="door" gid="62" x="128.535" y="767.461" width="64" height="64" rotation="90">
-   <properties>
-    <property name="longpanel" type="bool" value="false"/>
-   </properties>
-  </object>
  </objectgroup>
 </map>
diff --git a/wgj58.js b/wgj58.js
index 8885d24..459b8c6 100644
--- a/wgj58.js
+++ b/wgj58.js
@@ -235,7 +235,6 @@ class NPC_Clara extends GameNPC {
 					{ actor: this, text: "If I had no card, would I still exist?" },
 					{ actor: logic.player, text: "..." },
 					{ actor: logic.player, text: "You sound very philosophical today." } ] ));
-				logic.closeDoor("cutedoor");
 				break;
 			case 2:
 			case 3:
-- 
2.34.1