From: MegaBrutal <code+git@megabrutal.com>
Date: Thu, 13 Sep 2018 21:55:00 +0000 (+0200)
Subject: Add Saiki
X-Git-Tag: early-release~15
X-Git-Url: http://git.megabrutal.com/?p=wgj58.git;a=commitdiff_plain;h=6728cfc308b9dfb44dc7f123cbcf6a375730d66b;hp=775ea6b84786cc901dcc918f6d0a8837087fb53a

Add Saiki

	modified:   tilemap.json
	modified:   tilemap.tmx
	modified:   wgj58.js
---

diff --git a/tilemap.json b/tilemap.json
index a8f1755..445b630 100644
--- a/tilemap.json
+++ b/tilemap.json
@@ -273,6 +273,18 @@
                  "width":64,
                  "x":1600,
                  "y":1728
+                }, 
+                {
+                 "gid":51,
+                 "height":64,
+                 "id":32,
+                 "name":"saiki",
+                 "rotation":0,
+                 "type":"spawnpoint",
+                 "visible":true,
+                 "width":64,
+                 "x":2336,
+                 "y":1408
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -280,7 +292,7 @@
          "x":0,
          "y":0
         }],
- "nextobjectid":32,
+ "nextobjectid":33,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.1.6",
diff --git a/tilemap.tmx b/tilemap.tmx
index be58aad..634f76d 100644
--- a/tilemap.tmx
+++ b/tilemap.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="45" height="40" tilewidth="64" tileheight="64" infinite="0" nextobjectid="32">
+<map version="1.0" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="45" height="40" tilewidth="64" tileheight="64" infinite="0" nextobjectid="33">
  <tileset firstgid="1" name="tileset" tilewidth="64" tileheight="64" tilecount="50" columns="10">
   <image source="tileset.png" width="640" height="320"/>
  </tileset>
@@ -192,5 +192,6 @@
     <property name="longpanel" type="bool" value="true"/>
    </properties>
   </object>
+  <object id="32" name="saiki" type="spawnpoint" gid="51" x="2336" y="1408" width="64" height="64"/>
  </objectgroup>
 </map>
diff --git a/wgj58.js b/wgj58.js
index 5b5929a..2183a22 100644
--- a/wgj58.js
+++ b/wgj58.js
@@ -383,6 +383,13 @@ class NPC_Carlos extends GameNPC {
 	}
 }
 
+class NPC_Saiki extends GameNPC {
+	actionTalk() {
+		super.actionTalk();
+		logic.endTalk();
+	}
+}
+
 
 class GameInterface extends Phaser.Group {
 	constructor(game, parent) {
@@ -579,6 +586,10 @@ class GameLogic {
 				newChar = new NPC_Carlos(object.x, object.y, 'carlos', "Carlos", "Carlos Elbacalper", 150);
 				this.carlos = newChar;
 				break;
+			case 'saiki':
+				newChar = new NPC_Saiki(object.x, object.y, 'saiki', "Saiki", "Saiki Ytpme", 200);
+				this.saiki = newChar;
+				break;
 			default:
 				console.error("Unknown character:", object);
 		}