Cleanup
This commit is contained in:
@@ -280,17 +280,6 @@ crGetTargeting cr = do
|
|||||||
<|> (guard (canAttachTargetingBelow itm)
|
<|> (guard (canAttachTargetingBelow itm)
|
||||||
>> cr ^? crInv . ix (i+1) . itUse . equipTargeting . _Just)
|
>> 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 :: Creature -> World -> World
|
||||||
weaponReloadSounds cr w = case cr ^? crManipulation . manObject . inInventory . iselAction of
|
weaponReloadSounds cr w = case cr ^? crManipulation . manObject . inInventory . iselAction of
|
||||||
Just ReloadAction{_reloadAction = la} ->
|
Just ReloadAction{_reloadAction = la} ->
|
||||||
@@ -302,20 +291,6 @@ weaponReloadSounds cr w = case cr ^? crManipulation . manObject . inInventory .
|
|||||||
w
|
w
|
||||||
_ -> w
|
_ -> w
|
||||||
where
|
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
|
cid = _crID cr
|
||||||
|
|
||||||
updateMovement :: Creature -> Creature
|
updateMovement :: Creature -> Creature
|
||||||
|
|||||||
Reference in New Issue
Block a user