From a2b843b05622f540557fc29ab8962a7f64395fb0 Mon Sep 17 00:00:00 2001
From: Lucas Fryzek <lucas.fryzek@fryzekconcepts.com>
Date: Sat, 22 Mar 2025 13:11:09 +0000
Subject: Work out more of gathering logic

---
 main.rhm | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'main.rhm')

diff --git a/main.rhm b/main.rhm
index 91d62f6..2d306bb 100644
--- a/main.rhm
+++ b/main.rhm
@@ -1,6 +1,7 @@
 #lang rhombus/static
 
-import "world.rhm"
+import:
+    "world.rhm"
 
 fun test(test_result :: Boolean, test_str :: String):
     if test_result
@@ -16,7 +17,7 @@ fun
 let wrld = world.World()
 let chunk = world.Chunk(64, 64, 0, 0)
 wrld.chunks.add(chunk)
-let entity = world.Entity(0, 0, 0, chunk)
+let entity = world.EntityPlayer(0, 0, 0, chunk)
 wrld.entities.add(entity)
 
 
@@ -36,7 +37,7 @@ reset_entity(entity)
 test(!entity.move(0, 0), "starting pos")
 
 let new_chunk = world.Chunk(64, 64, 1, 0)
-chunk.add_neighbour(new_chunk, #'east)
+chunk.add_neighbour(new_chunk, world.Direction.east)
 reset_entity(entity, 63, 0)
 test(entity.move(64, 0), "cross chunk")
 test(entity.current_chunk == new_chunk, "changed chunk")
@@ -44,12 +45,22 @@ test(entity.current_chunk == new_chunk, "changed chunk")
 entity.current_chunk := chunk
 reset_entity(entity, 0, 1)
 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")
+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")
+let other_ent = world.EntityGatherable(1, 1, 1, chunk)
+let gather_result = entity.gather(other_ent)
+test(gather_result == world.ActionResponse.ok || gather_result == world.ActionResponse.unsuccessful, "gathering")
 
-//world.entities
-//println(@str{Entity is @(entity.x) @(entity.y)})
+reset_entity(other_ent, 2, 2)
+entity.timer := 0
+test(entity.gather(other_ent) == world.ActionResponse.invalid, "gather too far away")
+
+reset_entity(other_ent, 64, 0)
+reset_entity(entity, 63, 0)
+entity.timer := 0
+let gather_result = entity.gather(other_ent)
+test(gather_result == world.ActionResponse.ok || gather_result == world.ActionResponse.unsuccessful, "gather accross chunk")
+entity.tick()
+test(entity.gather(other_ent) == world.ActionResponse.cooldown, "gather cooldown")
-- 
cgit v1.2.3