diff --git a/src/Dodge/Creature/Impulse/Movement.hs b/src/Dodge/Creature/Impulse/Movement.hs index a39396d26..0d4c7c81b 100644 --- a/src/Dodge/Creature/Impulse/Movement.hs +++ b/src/Dodge/Creature/Impulse/Movement.hs @@ -37,7 +37,6 @@ crMvByNoStride p lw cr = crMvAbsoluteNoStride lw (rotateV (_crDir cr) p) cr crMvAbsolute :: LWorld -> Point2 -> Creature -> Creature crMvAbsolute lw p' cr = --- advanceStepCounter (magV p) cr & crPos . _xy +~ p & crMvDir .~ argV p @@ -58,14 +57,6 @@ strengthFactor i crMvForward :: Float -> LWorld -> Creature -> Creature crMvForward speed = crMvBy (V2 speed 0) -advanceStepCounter :: Float -> Creature -> Creature -advanceStepCounter speed cr = cr & crStance . carriage %~ f - where - f car = case car of - Standing -> f (Walking 0 RightForward) - Walking i ff -> Walking (min (cr ^. crStance . strideLength) (i + speed)) ff - _ -> car - creatureTurnTo :: Point2 -> Creature -> Creature creatureTurnTo p cr | vToTarg == V2 0 0 = cr -- this should deal with the angleVV error diff --git a/src/Dodge/Data/Creature/Stance.hs b/src/Dodge/Data/Creature/Stance.hs index a1894570e..3b8543da8 100644 --- a/src/Dodge/Data/Creature/Stance.hs +++ b/src/Dodge/Data/Creature/Stance.hs @@ -21,7 +21,6 @@ data Stance = Stance data Carriage = Walking {_strideAmount :: Float, _currentFoot :: FootForward} - | Standing | Floating | Flying | Boosting Point2 diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 4421ac98f..939ec8d81 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -125,7 +125,7 @@ updateDisplaySections w cfig = , sinv , IM.singleton 0 $ SelItem [displayFreeSlots (crNumFreeSlots (w ^. cWorld . lWorld . items) cr)] 1 15 True invDimColor 2 Nothing NoSIDisplayMod - , sfclose + , sfclose1 , sclose , interfaceshead , btitems @@ -137,6 +137,9 @@ updateDisplaySections w cfig = filterSectionsPair invfiltcurs plainRegex invitems "INVENTORY" $ w ^? hud . diInvFilter . _Just closefiltcurs = mselpos ^? _Just . slSec == Just 2 + sfclose1 + | null sclose && sfclose ^? ix 0 . siIsSelectable == Just False = mempty + | otherwise = sfclose (sfclose, sclose) = filterSectionsPair closefiltcurs plainRegex closeitms "NEARBY ITEMS" $ w ^? hud . diCloseFilter . _Just