Add skeleton for gathering

2 files changed, 22 insertions, 1 deletions

diff --git a/main.rhm b/main.rhm
index 6911dc0..91d62f6 100644
--- a/main.rhm
+++ b/main.rhm
@@ -47,5 +47,9 @@ entity.current_chunk.set_tile(0, 1, world.Tile(#'wall_north))
 test(!entity.move(0, 0), "Blocked by wall")
 test(entity.move(1,1), "Move by wall")
 
+reset_entity(entity, 0, 0)
+let other_ent = world.Entity(1, 1, 1, chunk)
+test(entity.gather(other_ent), "Gathering")
+
 //world.entities
 //println(@str{Entity is @(entity.x) @(entity.y)})
diff --git a/world.rhm b/world.rhm
index dbedf15..a528f89 100644
--- a/world.rhm
+++ b/world.rhm
@@ -116,13 +116,30 @@ class Entity(id:: Int, mutable x :: Int, mutable y :: Int, mutable current_chunk
 
         cond
         | validate_dist(x, y, max_dist) && target_chunk != #false && validate_move(x, y, max_dist, target_chunk!!):
-            this.current_chunk := target_chunk
+            this.current_chunk := target_chunk!!
             this.x := x
             this.y := y
             #true
         | ~else:
             #false
 
+    method gather(target_entity :: Entity):
+        let x = target_entity.x
+        let y = target_entity.y
+        let target_chunk = validate_chunk(x, y)
+
+        fun validate_gather_resource() :: Boolean:
+            // TODO figure out how to implement resource gathering
+            // it could be better to keep them as a tile and update the
+            // tile from regular to consumed
+            #false
+
+        cond
+        | validate_dist(x, y, 1) && target_chunk != #false && validate_gather_resource():
+            #true
+        | ~else:
+            #false
+
 class World(chunks :: MutableList.now_of(Chunk),
             entities :: MutableList.now_of(Entity)):