From 87cba61ce7edf81466f2b5a32cac6e75cbfe4e21 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Thu, 8 Apr 2021 21:40:49 +0100
Subject: [PATCH] WIP Smart Tiles

---
 !TheEsc/!RunImage,ff8 | Bin 19524 -> 19824 bytes
 !TheEsc/c/CTheEscape  |   4 +--
 !TheEsc/c/Mission2    |  59 +++++++++++++++++++++++++++++++++++++++---
 !TheEsc/m2_smart,ffd  | Bin 0 -> 1200 bytes
 !TheEsc/mission2,ffd  | Bin 10000 -> 10000 bytes
 5 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 !TheEsc/m2_smart,ffd

diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index a25b02bf86722da79b4f43ecf22e7722fbc01252..669d7ed199a71b237631acb46e37102e65688881 100644
GIT binary patch
delta 3209
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
T9^m*+xcqkK%mjX~_Obs1|DMv^

delta 2847
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
KXu3Ub*Z%<LBr=o$

diff --git a/!TheEsc/c/CTheEscape b/!TheEsc/c/CTheEscape
index 705dcb0..106697f 100644
--- a/!TheEsc/c/CTheEscape
+++ b/!TheEsc/c/CTheEscape
@@ -5,8 +5,8 @@
 #include "Sound.h"
 #include "Graphics.h"
 
-//#define SKIP_INTRO
-//#define SKIP_MISSION1
+#define SKIP_INTRO
+#define SKIP_MISSION1
 //#define SKIP_MISSION2
 
 // SWI Registers
diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2
index 3825faa..90f96cb 100644
--- a/!TheEsc/c/Mission2
+++ b/!TheEsc/c/Mission2
@@ -12,6 +12,7 @@ extern _kernel_swi_regs outreg;
 
 #define TILESX 10
 #define TILESY 10
+#define SMARTTILES 100
 
 // map[0] is the 'master', [1] and [2] represents what is currently
 // believed to be displayed in the corresponding (+1) screen buffer
@@ -38,9 +39,31 @@ struct TilePlayer_s {
 
 struct TilePlayer_s TilePlayer;
 
+struct SmartTile_s {
+  int Tile;
+  int ActionTarget;
+  unsigned char Action;
+  unsigned char ActionValue;
+};
+
+struct SmartTile_s SmartTiles[SMARTTILES];
+
+void game2_savesmarttiles(char* filename)
+{
+  // Attempt to get file info
+  inreg.r[0] = 10;
+  inreg.r[1] = (int) filename;
+  inreg.r[2] = 0xffd;
+  inreg.r[4] = (int) SmartTiles;
+  inreg.r[5] = (int) SmartTiles + (sizeof(SmartTiles));
+
+  _kernel_swi(OS_File,&inreg,&outreg);
+ 
+}
+
 void game2_loadmap(char* filename)
 {
-  int length;
+  int length,i;
 
   // Attempt to get file info
   inreg.r[0] = 5;
@@ -64,7 +87,23 @@ void game2_loadmap(char* filename)
   inreg.r[3] = 0;
 
   _kernel_swi(OS_File,&inreg,&outreg);
- 
+
+  for(i = 0; i < SMARTTILES; i++)
+    SmartTiles[i].Tile = -1;
+
+  SmartTiles[0].Tile = 1206;
+  SmartTiles[0].ActionTarget = 1206;
+  SmartTiles[0].Action = 0;
+  SmartTiles[0].ActionValue = 1;
+  SmartTiles[1].Tile = 1207;
+  SmartTiles[1].ActionTarget = 1206;
+  SmartTiles[1].Action = 0;
+  SmartTiles[1].ActionValue = 16;
+  SmartTiles[2].Tile = 1205;
+  SmartTiles[2].ActionTarget = 1206;
+  SmartTiles[2].Action = 0;
+  SmartTiles[2].ActionValue = 16;
+  game2_savesmarttiles("m2_smart");
 }
 
 void game2_death()
@@ -211,6 +250,7 @@ int game2_tick()
 {
   int x;
   int y;
+  int i;
   int udt = 0;
   lasttick = tick;
   tick = clock();
@@ -219,6 +259,17 @@ int game2_tick()
 
   if(1)
   {
+    for(i = 0; i < SMARTTILES; i++)
+    {
+      if(SmartTiles[i].Tile == TilePlayer.rawtile)
+      {
+        // Change tile sprite
+        if(SmartTiles[i].Action == 0)
+          fullmap[SmartTiles[i].ActionTarget] = SmartTiles[i].ActionValue;
+      }
+    }
+  
+  
     game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y);
     for(x = 0; x < TILESX; x++)
     {
@@ -247,9 +298,11 @@ int game2_tick()
       }
     }
 
+    TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100);
+    
 /*    draw_sprite("lcarsblack",1000,DISPLAY_Y-164);
 
-    TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100);
+
     sprintf(textbuffer,"Tile:%i\nSprite:%i",TilePlayer.rawtile,fullmap[TilePlayer.rawtile]);
     draw_spritetext(textbuffer, 1070, 950);*/
 
diff --git a/!TheEsc/m2_smart,ffd b/!TheEsc/m2_smart,ffd
new file mode 100644
index 0000000000000000000000000000000000000000..5cbd2a2e15bbfa6139ecab9fb0f2674a560d6934
GIT binary patch
literal 1200
tcmdnS!oaW%h#43e7`DUM0t^gWk=Xx%0H^{CM%km`Fq#HN)4)Kb0RVJQhY0`x

literal 0
HcmV?d00001

diff --git a/!TheEsc/mission2,ffd b/!TheEsc/mission2,ffd
index 0d59fe53a16fcdf046f293130cb04b2b183898e2..b05a0b00f71e003f895bd9128994f16db1b0d061 100644
GIT binary patch
delta 25
gcmbQ>H^GmQak2n=5(@((KljA+L?%YYji=ny08g3*E&u=k

delta 22
dcmbQ>H^FbR14jxo6BE<K^h72eo{gv6)BsEY244UG