From 10a20f44a2657f7cc44bd6ff4a25a91a0b318241 Mon Sep 17 00:00:00 2001
From: MegaBrutal <code+git@megabrutal.com>
Date: Fri, 21 Sep 2018 00:30:00 +0200
Subject: [PATCH] Change door open conditions

	modified:   tilemap.json
	modified:   tilemap.tmx
	modified:   wgj58.js
---
 tilemap.json |  8 ++++----
 tilemap.tmx  |  8 ++++----
 wgj58.js     | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/tilemap.json b/tilemap.json
index 820e279..08580e2 100644
--- a/tilemap.json
+++ b/tilemap.json
@@ -198,7 +198,7 @@
                  "gid":62,
                  "height":64,
                  "id":24,
-                 "name":"saikidoor",
+                 "name":"peterdoor",
                  "properties":
                     {
                      "longpanel":false
@@ -218,7 +218,7 @@
                  "gid":62,
                  "height":64,
                  "id":25,
-                 "name":"saikidoor",
+                 "name":"peterdoor",
                  "properties":
                     {
                      "longpanel":false
@@ -238,7 +238,7 @@
                  "gid":62,
                  "height":64,
                  "id":27,
-                 "name":"peterdoor",
+                 "name":"biancadoor",
                  "properties":
                     {
                      "longpanel":true
@@ -258,7 +258,7 @@
                  "gid":62,
                  "height":64,
                  "id":28,
-                 "name":"peterdoor",
+                 "name":"biancadoor",
                  "properties":
                     {
                      "longpanel":true
diff --git a/tilemap.tmx b/tilemap.tmx
index 85c7dcc..3ccf1e3 100644
--- a/tilemap.tmx
+++ b/tilemap.tmx
@@ -172,22 +172,22 @@
     <property name="longpanel" type="bool" value="false"/>
    </properties>
   </object>
-  <object id="24" name="saikidoor" type="door" gid="62" x="832" y="1024" width="64" height="64">
+  <object id="24" name="peterdoor" type="door" gid="62" x="832" y="1024" width="64" height="64">
    <properties>
     <property name="longpanel" type="bool" value="false"/>
    </properties>
   </object>
-  <object id="25" name="saikidoor" type="door" gid="62" x="960" y="960" width="64" height="64" rotation="180">
+  <object id="25" name="peterdoor" type="door" gid="62" x="960" y="960" width="64" height="64" rotation="180">
    <properties>
     <property name="longpanel" type="bool" value="false"/>
    </properties>
   </object>
-  <object id="27" name="peterdoor" type="door" gid="62" x="1472" y="1792" width="64" height="64">
+  <object id="27" name="biancadoor" type="door" gid="62" x="1472" y="1792" width="64" height="64">
    <properties>
     <property name="longpanel" type="bool" value="true"/>
    </properties>
   </object>
-  <object id="28" name="peterdoor" type="door" gid="62" x="1600" y="1728" width="64" height="64" rotation="180">
+  <object id="28" name="biancadoor" type="door" gid="62" x="1600" y="1728" width="64" height="64" rotation="180">
    <properties>
     <property name="longpanel" type="bool" value="true"/>
    </properties>
diff --git a/wgj58.js b/wgj58.js
index b0ed447..9914ff4 100644
--- a/wgj58.js
+++ b/wgj58.js
@@ -422,6 +422,7 @@ class NPC_Saiki extends GameNPC {
 						{ actor: logic.player, text: "Haha! I always get it, Saiki!" } ] ));
 					logic.closeDoor("carlosdoor");
 					logic.openDoor("saikidoor");
+					logic.openDoor("peterdoor");
 					break;
 				case 1:
 					logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "Now that I think about it, there's still one thing. You could look into why the access control system is acting so funny today." },
@@ -509,6 +510,7 @@ class NPC_Saiki extends GameNPC {
 	actionTake() {
 		logic.closeDoor("carlosdoor");
 		logic.openDoor("saikidoor");
+		logic.openDoor("peterdoor");
 		logic.carlos.kill();
 		return super.actionTake();
 	}
@@ -527,9 +529,22 @@ class NPC_Saiki extends GameNPC {
 }
 
 class NPC_Peter extends GameNPC {
+	actionTake() {
+		logic.closeDoor("saikidoor");
+		logic.openDoor("peterdoor");
+		logic.openDoor("biancadoor");
+		return super.actionTake();
+	}
 }
 
 class NPC_Bianca extends GameNPC {
+	actionTake() {
+		// All doors open for you if you have all the cards.
+		logic.openDoor("cutedoor");
+		logic.openDoor("carlosdoor");
+		logic.openDoor("saikidoor");
+		return super.actionTake();
+	}
 }
 
 
-- 
2.34.1