From 6d86a8664b4c56fcf2b82080f70d9b2edd45d8e6 Mon Sep 17 00:00:00 2001
From: Renge <renge@marmot.website>
Date: Sun, 3 Apr 2022 18:23:29 -0400
Subject: [PATCH] fix: add required properties to MapTemplate

---
 .../Scenes/Layers/StoryLayer.ts               | 114 ------------------
 .../Tools/DataTypes/MapTemplate.ts            |  24 ++++
 2 files changed, 24 insertions(+), 114 deletions(-)
 delete mode 100644 src/shattered_sword/Scenes/Layers/StoryLayer.ts

diff --git a/src/shattered_sword/Scenes/Layers/StoryLayer.ts b/src/shattered_sword/Scenes/Layers/StoryLayer.ts
deleted file mode 100644
index 8055f10..0000000
--- a/src/shattered_sword/Scenes/Layers/StoryLayer.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// import Vec2 from "../../../Wolfie2D/DataTypes/Vec2";
-// import Sprite from "../../../Wolfie2D/Nodes/Sprites/Sprite";
-// import Label, { HAlign } from "../../../Wolfie2D/Nodes/UIElements/Label";
-// import { UIElementType } from "../../../Wolfie2D/Nodes/UIElements/UIElementTypes";
-// import Layer from "../../../Wolfie2D/Scene/Layer";
-// import Scene from "../../../Wolfie2D/Scene/Scene";
-// import Color from "../../../Wolfie2D/Utils/Color";
-// import Story from "../../Tools/DataTypes/Story";
-// import StorySceneTester from "../StorySceneTester";
-
-// export default class StoryLayer extends Layer {
-//     private progress: number;
-//     private sprites: Array<Sprite>;
-//     private currentSpeaker: string;
-//     private currentContent: string;
-
-
-//     constructor(scene: Scene, name: string, story: Story) {
-//         super(scene, name);
-//         this.story = story;
-//     }
-
-//     static async storyLayerFactory(scene: StorySceneTester, name: string, storyPath: string): Promise<StoryLayer> {
-//         const response = await (await fetch(storyPath)).json();
-//         let instance = new StoryLayer(scene, name, response);
-//         instance.story.resources.forEach((resource) => {
-//             switch (resource.type) {
-//                 case "image":
-//                     instance.scene.load.image(resource.key, resource.path);
-//                     break;
-//                 case "spritesheet":
-//                     instance.scene.load.spritesheet(resource.key, resource.path);
-//                     break;
-//                 case "audio":
-//                     instance.scene.load.audio(resource.key, resource.path);
-//                     break;
-//                 default:
-//                     break;
-//             }
-//         })
-
-//         instance.currentSpeaker = instance.story.texts[0].speaker;
-//         instance.currentContent = instance.story.texts[0].content;
-
-//         instance.textLabel = <Label>instance.scene.add.uiElement(UIElementType.LABEL, "story", { position: new Vec2(100, 300), text: (instance.currentSpeaker + instance.currentContent) });
-//         // instance.textLabel.textColor = new Color(0, 0, 0, 1);
-//         // instance.textLabel.font = "PixelSimple";
-//         // instance.textLabel.fontSize = 40;
-//         // instance.textLabel.setHAlign(HAlign.LEFT);
-//         scene.isInStoryMode = true;
-//         return instance;
-//     }
-
-//     hasNext(): boolean {
-//         return this.progress + 1 < this.story.texts.length;
-//     }
-
-//     update(): void {
-//         if (!this.hasNext()) {
-//             return;
-//         }
-//         this.progress++;
-//         console.log(this.progress);
-//         // this.currentSpeaker = this.story.texts[this.progress].speaker;
-//         // this.currentContent = this.story.texts[this.progress].content;
-//         // this.textLabel.text = (this.currentSpeaker + this.currentContent);
-//         // let tmp = undefined;
-//         // if (this.story.texts[this.progress].actions) {
-//         //     this.story.texts[this.progress].actions.forEach(action => {
-//         //         switch (action.type) {
-//         //             case "loadSprite":
-//         //                 tmp = this.scene.add.sprite(action.key, "UI");
-//         //                 tmp.position.set(action.positon[0], action.positon[1]);
-//         //                 tmp.scale.set(action.scale[0], action.scale[1]);
-//         //                 this.sprites.push(tmp);
-//         //                 break;
-//         //             case "loadSprite":
-//         //                 tmp = this.scene.add.sprite(action.key, "UI");
-//         //                 tmp.position.set(action.positon[0], action.positon[1]);
-//         //                 tmp.scale.set(action.scale[0], action.scale[1]);
-//         //                 this.sprites.push(tmp);
-//         //                 break;
-//         //             case "move":
-//         //                 tmp = this.sprites.find(function (sprite) {
-//         //                     return sprite.imageId === action.key;
-//         //                 });
-//         //                 tmp.position.set(action.positon[0], action.positon[1]);
-//         //                 tmp.scale.set(action.scale[0], action.scale[1]);
-//         //                 break;
-//         //             case "show":
-//         //                 tmp = this.sprites.find(function (sprite) {
-//         //                     return sprite.imageId === action.key;
-//         //                 });
-//         //                 tmp.visible = true;
-//         //                 break;
-//         //             case "hide":
-//         //                 tmp = this.sprites.find(function (sprite) {
-//         //                     return sprite.imageId === action.key;
-//         //                 });
-//         //                 tmp.visible = false;
-//         //                 break;
-//         //             default:
-//         //                 break;
-//         //         }
-//         //     })
-//         // }
-//     }
-
-//     unload(): void {
-//         this.sprites.forEach(sprite => {
-//             sprite.destroy();
-//         })
-//     }
-// }
\ No newline at end of file
diff --git a/src/shattered_sword/Tools/DataTypes/MapTemplate.ts b/src/shattered_sword/Tools/DataTypes/MapTemplate.ts
index b7edd83..83566cd 100644
--- a/src/shattered_sword/Tools/DataTypes/MapTemplate.ts
+++ b/src/shattered_sword/Tools/DataTypes/MapTemplate.ts
@@ -1,15 +1,38 @@
 export default class MapTemplate {
+    // Should be copied directly from Tiled
+    columns: number;
     tilewidth: number;
     tileheight: number;
+    tilecount: number;
+    firstgid: number;
+    imageheight: number;
+    imagewidth: number;
+    margin: number;
+    spacing: number;
+    name: string;
+    // Replace with the relative path to the dist/
+    image: string;
+    
     entrance: RoomTemplate;
     exit: RoomTemplate;
     rooms: Array<RoomTemplate>;
 }
 
 export class Entrance {
+    // Position of the top-left entrance and its width/height
     x: number;
     y: number;
     width: number;
+    // If the entrance exit, the top/left bottom/right will be replaced by alt_tile[0] and alt_tile[1]
+    alt_tile: [number, number];
+}
+
+export class Enemy {
+    // Position of the enemy and chance to spawn (0, 1]
+    x: number;
+    y: number;
+    type: string;
+    possibility: number;
 }
 
 export class RoomTemplate {
@@ -18,4 +41,5 @@ export class RoomTemplate {
     bottomLayer: Array<number>;
     topLayer: Array<number>;
     entrances: Array<Entrance>;
+    enemies?: Array<Enemy>;
 }
\ No newline at end of file