diff options
Diffstat (limited to 'src/entity.rhm')
| -rw-r--r-- | src/entity.rhm | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/entity.rhm b/src/entity.rhm index 3fcd812..831228a 100644 --- a/src/entity.rhm +++ b/src/entity.rhm @@ -13,7 +13,7 @@ export: let rand = random.Random() -class Entity(id:: Int, mutable x :: Int, mutable y :: Int, mutable current_chunk :: Chunk): +class Entity(id:: Int, mutable x :: Int, mutable y :: Int): nonfinal // Validate that the provided coordinates are within the max distance range of // entities current coordinates. @@ -30,8 +30,7 @@ class Entity(id:: Int, mutable x :: Int, mutable y :: Int, mutable current_chunk // Validate that the x,y coordinates map to a chunk that is // near the current coordinates of the entity - method validate_chunk(x :: Int, y :: Int) :: maybe(Chunk): - let current_chunk = this.current_chunk + method validate_chunk(x :: Int, y :: Int, current_chunk :: Chunk) :: maybe(Chunk): let local_x = x - current_chunk.offset_x * current_chunk.width let local_y = y - current_chunk.offset_y * current_chunk.height let less_x = local_x < 0 @@ -55,8 +54,8 @@ class Entity(id:: Int, mutable x :: Int, mutable y :: Int, mutable current_chunk // Validate that the tile at the coordinates would not block a movement of the entity // to those coordinates from its current coordinates - method validate_move(x :: Int, y :: Int, max_dist :: Int, target_chunk :: Chunk): - let current_tile = this.current_chunk.get_tile(this.x, this.y) + method validate_move(x :: Int, y :: Int, max_dist :: Int, current_chunk :: Chunk, target_chunk :: Chunk): + let current_tile = current_chunk.get_tile(this.x, this.y) let target_tile = target_chunk.get_tile(x, y) let diff_x = x - this.x let diff_y = y - this.y @@ -74,24 +73,23 @@ class Entity(id:: Int, mutable x :: Int, mutable y :: Int, mutable current_chunk !(direction == current_block || direction == target_block) method - | move(x :: Int, y :: Int): move(x, y, 1) - | move(x :: Int, y :: Int, max_dist :: Int) :: Boolean: - let target_chunk = validate_chunk(x, y) + | move(x :: Int, y :: Int, current_chunk :: Chunk): move(x, y, 1, current_chunk) + | move(x :: Int, y :: Int, max_dist :: Int, current_chunk :: Chunk) :: maybe(Chunk): + let target_chunk = validate_chunk(x, y, 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!! + | validate_dist(x, y, max_dist) && target_chunk != #false && validate_move(x, y, max_dist, current_chunk, target_chunk!!): this.x := x this.y := y - #true + target_chunk!! | ~else: #false class EntityGatherable(quantity :: Int, odds :: Real, cap :: ItemCap): extends Entity - constructor(id :: Int, x :: Int, y :: Int, current_chunk :: Chunk, cap :: ItemCap): - super(id, x, y, current_chunk)(10, 1 / 10, cap) + constructor(id :: Int, x :: Int, y :: Int, cap :: ItemCap): + super(id, x, y)(10, 1 / 10, cap) enum ActionResponse: ok @@ -109,8 +107,8 @@ class EntityPlayer(mutable timer :: Int): field inventory :: Array.now_of(maybe(Stack)) = Array.make(20, #false) field equip :: MutableMap.now_of(Slot, Item) = MutableMap() - constructor(id :: Int, x :: Int, y :: Int, current_chunk :: Chunk): - super(id, x, y, current_chunk)(0) + constructor(id :: Int, x :: Int, y :: Int): + super(id, x, y)(0) method tick(): // TODO this "ticks" the entity. Things like healing and other @@ -121,10 +119,10 @@ class EntityPlayer(mutable timer :: Int): | timer := max_timer | timer := timer - 1 - method gather(target_entity :: Entity) :: ActionResponse: + method gather(target_entity :: Entity, current_chunk :: Chunk) :: ActionResponse: let x = target_entity.x let y = target_entity.y - let target_chunk = validate_chunk(x, y) + let target_chunk = validate_chunk(x, y, current_chunk) let right_type = target_entity is_a EntityGatherable fun validate_gather_resource(entity :: EntityGatherable) :: ActionResponse: |