Visible target

README.md

@@ -108,16 +108,23 @@ Actions
   - [ ] slippery floor?
 - [ ] entity component system
   - [ ] refactor
-    - [ ] extract all features into components
-    - [ ] all player actions can be performed by entities
-    - [ ] ai for entities to choose action
-    - [ ] control player movement with a spell
+    - [x] extract all features into components
+    - [x] all player actions can be performed by entities
+    - [ ] enemy sneak makes them not visible
+    - [ ] use the same move logic for everything
+  - [x] ai for entities to choose action
+    - [x] choose target
+    - [x] choose other actions
+  - [x] kick player
+  - [ ] control player movement with a spell
   - [x] enemies have inventory
   - [x] player and enemies drop inventory the same way
-  - [ ] enemies have view_distance
-  - [ ] target for enemies and friends
-  - [ ] enemies pickup items
-  - [ ] enemies use weapons
+  - [x] enemies have view_distance
+  - [x] target for enemies
+  - [ ] target for friends
+  - [x] enemies pickup items
+    - [ ] but don't pickup everything
+  - [x] enemies use weapons
   - [ ] npcs
 - [ ] friends
     - [x] enchant enemies into friends
@@ -143,13 +150,17 @@ Actions
     - [ ] dot repeat
         - doesn't seem possible, as game loop sets the last change
     - [ ] macros
+    - [ ] marks not working
+    - [ ] undo?
 - [x] varied entities
     - [x] item and enemy generation from dictionary
     - [x] item and enemy variations with different colours
 - [ ] map generation
     - [x] generate random map progressively
     - [x] have some structure to generated maps
     - [x] new buffer for down
+    - [ ] add enemies and items in a later stage
+    - [ ] pick a selection, not fully random
 - [ ] performance
     - [x] write buffer once per tick
     - [x] store map as 2D array

lua/neohack/actions.lua

@@ -56,13 +56,13 @@ M.actions = {
 
   ---comment
   drop = function(request)
-    state.player.inventory:drop({ request.object })
+    state.player.inventory:drop(request.object)
     M.tick()
   end,
 
   ---comment
   say = function(request)
-    state.player.speak:say({ request.object, request.target })
+    state.player.speak:say(request.object, request.target)
     M.tick()
   end,
 
@@ -265,7 +265,7 @@ M.prompt_wait = function()
     local str = M.prompt_one_word("Wait how long?")
     if str then
       -- M.insert_action("wait " .. str)
-      M.actions.wait({ object = str })
+      M.actions.wait({ action = "wait", object = str })
     end
   end, 50)
 end

lua/neohack/buffer.lua

@@ -2,6 +2,7 @@
 ---
 
 local view_buffer = require("neohack.view_buffer")
+local Def = require("neohack.def")
 
 ---@class Buffer
 --- @field bufnr integer
@@ -125,11 +126,17 @@ M.tick = function(callback)
   M.write_buf(nil)
 end
 
---- Get the entity at a specific position in a specific buffer
+--- Get the entity at a specific position in a specific buffer, including player
 ---@param row integer
 ---@param col integer
+---@param skip_player boolean?
 ---@return Entity
-M.get_entity_at_pos = function(row, col)
+M.get_entity_at_pos = function(row, col, skip_player)
+  if not skip_player then
+    if state.player.movement.row == row and state.player.movement.col == col then
+      return state.player
+    end
+  end
   local bufnr = state.current_bufnr
   local line = M.buffers[bufnr].cells[row]
   if not line then
@@ -156,7 +163,7 @@ end
 M.get_under_cursor = function()
   local row, col = unpack(vim.api.nvim_win_get_cursor(0))
   col = col + 1
-  local entity = M.get_entity_at_pos(row, col)
+  local entity = M.get_entity_at_pos(row, col, true)
   -- message.notify("under cursor " .. row .. " " .. col .. " " .. entity.movement.char)
   return row, col, entity
 end
@@ -174,9 +181,12 @@ M.set_entity_at_cell = function(row, col, entity)
   if not buf then
     error("no buffer")
   end
-  -- error("set entity at " .. row .. " " .. col)
-  -- message.notify(vim.inspect(buf.cells[row][col]))
-  buf.cells[row][col] = entity
+  -- don't set the player char
+  if entity.type ~= Def.DefType.player then
+    -- error("set entity at " .. row .. " " .. col)
+    -- message.notify(vim.inspect(buf.cells[row][col]))
+    buf.cells[row][col] = entity
+  end
 end
 
 --- Insert an entity at a specific position in a specific buffer

lua/neohack/components/attributes.lua

@@ -12,6 +12,7 @@
 ---@field hit_highlight string
 ---Decision
 ---@field randomness number
+---@field target Entity?
 ---Eat
 ---@field eat_attribute number
 ---Fuse

lua/neohack/components/combat.lua

@@ -32,13 +32,16 @@ function Combat.new(parent, damage, durability, hit_rate, default_weapon)
     --other
     default_weapon = default_weapon,
   }
-  --attributes
-  parent.attributes.dodge_attribute = 0.5
+  --as an attacker attributes
+  --TODO: generate these for enemies
+  parent.attributes.dodge_attribute = 0.1
   parent.attributes.deflect_attribute = 0.01
-  parent.attributes.weapon_attribute = 0.5
+  parent.attributes.weapon_attribute = 0.1
+  --as a weapon attribute
+  parent.attributes.hit_rate = hit_rate
   parent.attributes.damage = damage
   parent.attributes.durability = durability
-  parent.attributes.hit_rate = hit_rate
+
   --status
   parent.attributes.hit_highlight = nil
 
@@ -48,11 +51,13 @@ end
 
 function Combat:inspect()
   return "durability="
-    .. self.parent.attributes.durability
+    .. (self.parent.attributes.durability or "")
     .. " damage="
-    .. self.parent.attributes.damage
+    .. (self.parent.attributes.damage or "")
+    .. " weapon_damage="
+    .. (self:get_weapon().attributes.damage or "")
     .. " hit_rate="
-    .. self.parent.attributes.hit_rate
+    .. (self.parent.attributes.hit_rate or "")
     .. " dodge_skill="
     .. self:dodge_skill()
     .. " weapon_skill="
@@ -87,14 +92,14 @@ end
 ---@return number
 function Combat:dodge_skill()
   return self.parent.attributes.dodge_attribute
-    + self.parent.inventory:wear_effect(state.slot_types.feet, attributes.randomness, 0.3)
-    + self.parent.inventory:wear_effect(state.slot_types.feet, attributes.hit_rate, 0.2)
+    + self.parent.inventory:wear_effect(state.slot_types.feet, attributes.randomness, 0.15)
+    + self.parent.inventory:wear_effect(state.slot_types.feet, attributes.hit_rate, 0.15)
 end
 
 function Combat:deflect_skill()
   return self.parent.attributes.deflect_attribute
-    + self.parent.inventory:wear_effect(state.slot_types.body, attributes.durability, 0.4)
-    + self.parent.inventory:wear_effect(state.slot_types.left_hand, attributes.durability, 0.3)
+    + self.parent.inventory:wear_effect(state.slot_types.body, attributes.durability, 0.08)
+    + self.parent.inventory:wear_effect(state.slot_types.left_hand, attributes.durability, 0.05)
 end
 
 function Combat:weapon_skill()
@@ -207,10 +212,19 @@ function Combat:apply_damage(damage, target, weapon)
   end
 end
 
+---comment
+---@return Entity
+function Combat:get_weapon()
+  return self.parent.inventory:get_weapon() or self.default_weapon()
+end
+
 ---comment
 ---@param target Combat
+---@return boolean if damage was dealth
 function Combat:attack(target)
-  local weapon = self.parent.inventory:get_weapon() or self.default_weapon()
+  --the target will target the attacker
+  target.parent.attributes.target = self.parent
+  local weapon = self:get_weapon()
 
   local damage, dealt = self:try_damage_dealt(target, weapon)
   if not dealt then