diff options
Diffstat (limited to 'entity.rhm')
| -rw-r--r-- | entity.rhm | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -2,12 +2,14 @@ import: rhombus/random "chunk.rhm" open + "item.rhm" open export: Entity EntityGatherable EntityPlayer ActionResponse + Slot let rand = random.Random() @@ -85,11 +87,11 @@ class Entity(id:: Int, mutable x :: Int, mutable y :: Int, mutable current_chunk | ~else: #false -class EntityGatherable(quantity :: Int, odds :: Real): +class EntityGatherable(quantity :: Int, odds :: Real, cap :: ItemCap): extends Entity - constructor(id :: Int, x :: Int, y :: Int, current_chunk :: Chunk): - super(id, x, y, current_chunk)(10, 1 / 10) + constructor(id :: Int, x :: Int, y :: Int, current_chunk :: Chunk, cap :: ItemCap): + super(id, x, y, current_chunk)(10, 1 / 10, cap) enum ActionResponse: ok @@ -100,11 +102,6 @@ enum ActionResponse: enum Slot: right_hand -enum Item: - bronze_axe - -class Stack(item :: Item, quantity :: Int) - class EntityPlayer(mutable timer :: Int): extends Entity @@ -131,14 +128,16 @@ class EntityPlayer(mutable timer :: Int): let right_type = target_entity is_a EntityGatherable fun validate_gather_resource(entity :: EntityGatherable) :: ActionResponse: + let right_tool = item_get_cap(equip.get(Slot.right_hand, #false)) == entity.cap // TODO odds should change based on skills of player // we should also validate player is carrying the right tool // we should also have the timer count down every tick // not just inside the gathering call let roll = rand.random() - if roll < entity.odds: - | ActionResponse.ok - | ActionResponse.unsuccessful + cond + | !right_tool: ActionResponse.invalid + | rand.random() < entity.odds: ActionResponse.ok + | ~else: ActionResponse.unsuccessful cond | timer != 0: ActionResponse.cooldown |