Cleanup launchers

This commit is contained in:
2022-03-02 08:36:16 +00:00
parent b3ba0697b4
commit be1fda266a
7 changed files with 44 additions and 60 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ followImpulse cr w imp = case imp of
TurnToward p a -> crup $ creatureTurnToward p a cr
TurnTo p -> crup $ creatureTurnTo p cr
ChangePosture post -> crup $ cr & crStance . posture .~ post
UseItem -> (tryUseItem cr, cr)
UseItem -> (useItem cr, cr)
SwitchToItem i -> crup $ cr & crInvSel .~ i
Melee cid' -> (hitCr cid'
, crMvBy (10 *.* normalizeV (posFromID cid' -.- cpos)) $ cr & crMeleeCooldown .~ 20)
+3 -3
View File
@@ -1,5 +1,5 @@
module Dodge.Creature.Impulse.UseItem
( tryUseItem
( useItem
, useLeftItem
) where
import Dodge.Data
@@ -9,8 +9,8 @@ import qualified Data.IntMap.Strict as IM
import Control.Lens
import Data.Maybe
tryUseItem :: Creature -> World -> World
tryUseItem cr' w = fromMaybe w $ do
useItem :: Creature -> World -> World
useItem cr' w = fromMaybe w $ do
cr <- w ^? creatures . ix (_crID cr')
it <- cr ^? crInv . ix (_crInvSel cr)
return $ itemEffect cr it w