From af31da8cfc9caee8c2cd44df5ee5c1ed3a9b3ed7 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 14 May 2022 11:49:15 -0400 Subject: feat(grfn/xanthous): Use dual-wielding to calculate damage When dual-wielding weapons, do damage from both weapons and use both weapons' attack messages. Change-Id: I3c404946d0167c9b5c2bcf58ab5c3429cc5269fc Reviewed-on: https://cl.tvl.fyi/c/depot/+/5605 Autosubmit: grfn Tested-by: BuildkiteCI Reviewed-by: grfn --- users/grfn/xanthous/src/Xanthous/Entities/Character.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'users/grfn/xanthous/src/Xanthous/Entities/Character.hs') diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Character.hs b/users/grfn/xanthous/src/Xanthous/Entities/Character.hs index 0a993a2f479c..c8153086f1ac 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Character.hs +++ b/users/grfn/xanthous/src/Xanthous/Entities/Character.hs @@ -218,7 +218,9 @@ defaultCharacterDamage = 1 characterDamage :: Character -> Hitpoints characterDamage = fromMaybe defaultCharacterDamage - . preview (inventory . wielded . wieldedItems . wieldableItem . Raw.damage) + . filter (/= 0) + . Just + . sumOf (inventory . wielded . wieldedItems . wieldableItem . Raw.damage) -- | Is the character fully healed up to or past their initial hitpoints? isFullyHealed :: Character -> Bool -- cgit 1.4.1