diff --git a/src/Dodge/Creature/State.hs b/src/Dodge/Creature/State.hs index 077a28501..47b1a4b87 100644 --- a/src/Dodge/Creature/State.hs +++ b/src/Dodge/Creature/State.hs @@ -280,17 +280,6 @@ crGetTargeting cr = do <|> (guard (canAttachTargetingBelow itm) >> cr ^? crInv . ix (i+1) . itUse . equipTargeting . _Just) - - --- itm <- find hastargeting $ helditem ++ IM.elems (getCrEquipment cr) --- itm ^? itUse . useTargeting . _Just --- where --- hastargeting itm = isJust (itm ^? itUse . useTargeting . _Just) --- helditem = fromMaybe [] $ do --- i <- cr ^? crManipulation . manObject . inInventory . ispItem --- itm <- cr ^? crInv . ix i --- return [itm] - weaponReloadSounds :: Creature -> World -> World weaponReloadSounds cr w = case cr ^? crManipulation . manObject . inInventory . iselAction of Just ReloadAction{_reloadAction = la} -> @@ -302,20 +291,6 @@ weaponReloadSounds cr w = case cr ^? crManipulation . manObject . inInventory . w _ -> w where - -- PassiveReload stype | Just (_laReloadTime am) == am ^? laTransfer . transferTime - -- -> soundContinue (CrReloadSound 0) (_crPos cr) stype Nothing w - -- PassiveReload _ -> w - -- ActiveClear | am ^? laTransfer . transferTime == Just 0 -> stopSoundFrom (CrReloadSound cid) w - -- ActiveClear | _laTransfer am == NoTransfer -> w - -- ActiveClear -> soundContinue (CrReloadSound cid) (_crPos cr) reloadS (Just 1) w - -- ActivePartial{} | am ^? laTransfer . transferTime == Just 0 -> stopSoundFrom (CrReloadSound cid) w - -- ActivePartial{} | _laTransfer am == NoTransfer -> w - -- ActivePartial{} -> soundContinue (CrReloadSound cid) (_crPos cr) reloadS (Just 1) w - -- Just ChargeableAmmo {} -> w - -- Just NoConsumption {} -> w - -- Just ItemItselfConsumable {} -> w - -- Nothing -> w - cid = _crID cr updateMovement :: Creature -> Creature