From: Paul Hänsch <paul@plutz.net>
Date: Thu, 13 Feb 2020 13:12:53 +0000 (+0100)
Subject: process map change events (Milestone! Full Travel! Yeah!)
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=f01d5a0d558f4d6037f5a6d3770d12571cc60fa9;p=flarejs

process map change events (Milestone! Full Travel! Yeah!)
---

diff --git a/engine.js b/engine.js
index 281debb..cca0717 100644
--- a/engine.js
+++ b/engine.js
@@ -12,6 +12,7 @@ var gfx = {
     return this[def];
   }
 };
+var map;
 
 function Textfile(txtfile) {
   // fetch and parse gamedata file into structured object
@@ -85,6 +86,11 @@ function Textfile(txtfile) {
     case /^duration=[0-9]+s$/.test(line):
       ref["duration"] = line.split(/=|s$/)[1] * 1000;
       break;
+    // numeric array types
+    case /^(location|hero_pos|render_size|render_offset)=[0-9,-]+$/.test(line):
+      key = line.split(/[=]/)[0]; value = line.split(/[=]/)[1].split(/,/);
+      ref[key] = value.map(m => m * 1);
+      break;
     // general numeric value (key=#)
     case /^[^#].*=[0-9]+$/.test(line):
       key = line.split(/[=]/)[0];  value = line.split(/=/).slice(1) * 1;
@@ -125,14 +131,23 @@ function Map(textdef) {
   }
 
   const npcs = [];
-  for (let def of this.info.npc) {
-    let npc = new Npc(def.filename)
-    let loc = def.location.split(',')[1] * 1 * w + def.location.split(',')[0] * 1;
-    npc.place(dx[loc], dy[loc]);
-    npcs[loc] = npc;
+  if (this.info.npc) for (let def of this.info.npc) {
+    let loc = def.location[1] * w + def.location[0];
+    npcs[loc] = new Npc(def.filename)
+    npcs[loc].place(dx[loc], dy[loc]);
     this.info.layer.find(l => l.type == "collision").data[loc] = 1;
   }
 
+  this.events = [];
+  for (let ev of this.info.event) {
+    for (let x = ev.location[0]; x < ev.location[0] + ev.location[2]; x++)
+      for (let y = ev.location[1]; y < ev.location[1] + ev.location[3]; y++) {
+        let loc = y * w + x;
+        if (!this.events[loc]) this.events[loc] = [];
+        this.events[loc].push(ev);
+      }
+  }
+
   // tile index for pixel position on map
   this.tileAt = function(x, y) {
     var r = (y + th / 2) / th; var c = (x - w * tw /2) / tw;
@@ -141,9 +156,9 @@ function Map(textdef) {
   }
 
   // vice versa the pixel coordinates of a given map tile
-  this.positionOf = tile => [dx[tile], dy[tile]];
-  this.xOf = tile => dx[tile];
-  this.yOf = tile => dy[tile];
+  this.positionOf = (tl, ty = -1) => (~ty) ? [dx[ty * w + tl], dy[ty * w + tl]] : [ dx[tl], dy[tl] ];
+  this.xOf = (tl, ty = -1) => (~ty) ? dx[ty * w + tl] : dx[tl];
+  this.yOf = (tl, ty = -1) => (~ty) ? dy[ty * w + tl] : dy[tl]; 
 
   // center map to pixel position (by setting drawing offsets)
   this.center = function(x, y) {
@@ -213,8 +228,7 @@ function Mob(textdef) {
   // assume, that we can just loop horizontally over the image
   if (!info[animation].frame){
     info[animation].frame = [];
-    let rs = info.render_size.split(/,/);   rs = [ rs[0] * 1, rs[1] * 1 ];
-    let ro = info.render_offset.split(/,/); ro = [ ro[0] * 1, ro[1] * 1 ];
+    let rs = info.render_size, ro = info.render_offset;
 
     for (let i = 0; i < info[animation].frames; i++ )
       info[animation].frame[i] = [[ i * rs[0], 0, rs[0], rs[1], ro[0], ro[1]]];
@@ -366,7 +380,7 @@ function Hero(gender = "female", hair = "short"){
   this.swing  = () => this.animate("swing" );
 }
 
-function Controls(hero, map){
+function Controls(hero){
   // processes keyboard / touch / mouse
   // causes according player actions
   // single player only, conrol will be assigned to server in multi player
@@ -377,7 +391,6 @@ function Controls(hero, map){
     right: 68, altright: 39,
   }
   var keys = [];
-  var col = map.info.layer.find(l => l.type == "collision").data;
 
   window.addEventListener("keydown", e => keys[e.keyCode] = true );
   window.addEventListener("keyup"  , e => keys[e.keyCode] = false);
@@ -393,6 +406,7 @@ function Controls(hero, map){
     var dx = x * sx, hx = hero.position[0];
     var dy = y * sy, hy = hero.position[1];
     var f = 2.1;
+    const col = map.info.layer.find(l => l.type == "collision").data;
 
     if (col[map.tileAt(hx + dx, hy + dy)] == 0 )
             hero.place(hx + dx, hy + dy);
@@ -407,6 +421,20 @@ function Controls(hero, map){
     else player.stance();
 
     map.center(hero.position[0], hero.position[1]);
+    events(hero.position[0], hero.position[1]);
+  }
+
+  function events(x, y) {
+    const i = map.tileAt(x,y); var ev;
+    if (map.events[i]) {
+      // intermap
+      if ( ev = map.events[i].find(e => (e.activate == "on_trigger" && e.intermap)) ){
+        ev = ev.intermap.split(/[,]/);
+        map = new Map(ev[0]);
+        hero.place( map.xOf(ev[1] * 1, ev[2] * 1), map.yOf(ev[1] * 1, ev[2] * 1) );
+        map.center( map.xOf(ev[1] * 1, ev[2] * 1), map.yOf(ev[1] * 1, ev[2] * 1) );
+      }
+    }
   }
 
   // process input and decide on according action
@@ -445,11 +473,11 @@ window.addEventListener("resize", function(){
 // player = new Mob("animations/enemies/zombie.txt"); player.stats = { speed: 3 };
 player = new Hero();
 map = new Map("/maps/arrival.txt");
-player.place(map.xOf(map.info.header.hero_pos.split(',')[1] * 1 * map.info.header.width + map.info.header.hero_pos.split(',')[0] * 1),
-             map.yOf(map.info.header.hero_pos.split(',')[1] * 1 * map.info.header.width + map.info.header.hero_pos.split(',')[0] * 1));
+player.place(map.xOf(map.info.header.hero_pos[0], map.info.header.hero_pos[1]),
+             map.yOf(map.info.header.hero_pos[0], map.info.header.hero_pos[1]));
 player.direct(6).stance();
 
 map.center(player.position[0], player.position[1]);
-c = new Controls(player, map);
+c = new Controls(player);
 
 setInterval (() => map.draw([player]), 33.33 );