justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
justin
2025-08-27 00:34:24 +01:00
parent 06d50ac752
commit 79a0137d54
6 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -4,3 +4,4 @@
loop.cabal loop.cabal
*.lock *.lock
keys.json keys.json
log/*
src/Dodge/Creature/Impulse/UseItem.hs
+1 -1
View File
@@ -64,7 +64,7 @@ activateDetonator det = fromMaybe id $ do
return $ cWorld . lWorld . projectiles . ix pjid . pjTimer .~ 0 return $ cWorld . lWorld . projectiles . ix pjid . pjTimer .~ 0
toggleEquipmentAt :: NewInt InvInt -> Creature -> World -> World toggleEquipmentAt :: NewInt InvInt -> Creature -> World -> World
toggleEquipmentAt invid cr w = case getEquipmentAllocation invid w of toggleEquipmentAt invid cr w = case equipmentDesignation invid w of
DoNotMoveEquipment -> w DoNotMoveEquipment -> w
PutOnEquipment{_allocNewPos = newp} -> PutOnEquipment{_allocNewPos = newp} ->
w w
src/Dodge/Inventory/RBList.hs
+22 -19
View File
@@ -1,14 +1,15 @@
{-# LANGUAGE TupleSections #-}
module Dodge.Inventory.RBList ( module Dodge.Inventory.RBList (
updateRBList, updateRBList,
getEquipmentAllocation, equipmentDesignation,
eqSiteToPositions, eqTypeToSites,
) where ) where
import NewInt import NewInt
import qualified Data.IntMap.Strict as IM import qualified Data.IntMap.Strict as IM
import Dodge.Data.Equipment.Misc import Dodge.Data.Equipment.Misc
import Dodge.Data.EquipType import Dodge.Data.EquipType
import Control.Applicative --import Control.Applicative
import Control.Lens import Control.Lens
import Data.List (elemIndex, findIndex) import Data.List (elemIndex, findIndex)
import qualified Data.Map.Strict as M import qualified Data.Map.Strict as M
@@ -23,14 +24,14 @@ updateRBList w = case w ^. rbOptions of
EquipOptions{} -> w EquipOptions{} -> w
_ -> fromMaybe (w & rbOptions .~ NoRightButtonOptions) $ do _ -> fromMaybe (w & rbOptions .~ NoRightButtonOptions) $ do
i <- cr ^? crManipulation . manObject . imSelectedItem i <- cr ^? crManipulation . manObject . imSelectedItem
esite <- cr ^? crInv . ix i >>= \k -> w ^? cWorld . lWorld . items . ix k >>= equipType -- . itUse . uequipEffect . eeType itid <- cr ^? crInv . ix i
return $ etype <- w ^? cWorld . lWorld . items . ix itid >>= equipType
w & rbOptions return $ w & rbOptions
.~ EquipOptions .~ EquipOptions
{ _opSel = chooseEquipPosition (w ^. cWorld . lWorld . items) cr (eqSiteToPositions esite) (chooseEquipPosition (w ^. cWorld . lWorld . items) cr (eqTypeToSites etype))
}
where where
norightclick = not $ SDL.ButtonRight `M.member` (w ^. input . mouseButtons) --norightclick = not $ SDL.ButtonRight `M.member` (w ^. input . mouseButtons)
norightclick = null $ w ^. input . mouseButtons . at SDL.ButtonRight
cr = you w cr = you w
-- want to choose the current position if the item is equipped, otherwise try to -- want to choose the current position if the item is equipped, otherwise try to
@@ -47,14 +48,17 @@ chooseFreeSite cr = fromMaybe 0 . findIndex hasnoequipment
where where
hasnoequipment ep = isNothing $ cr ^? crEquipment . ix ep hasnoequipment ep = isNothing $ cr ^? crEquipment . ix ep
getEquipmentAllocation :: NewInt InvInt -> World -> EquipmentAllocation equipmentDesignation :: NewInt InvInt -> World -> EquipmentAllocation
getEquipmentAllocation invid w = fromMaybe DoNotMoveEquipment $ do equipmentDesignation invid w = fromMaybe DoNotMoveEquipment $ do
itid <- you w ^? crInv . ix invid itid <- you w ^? crInv . ix invid
esite <- w ^? cWorld . lWorld . items . ix itid >>= equipType etype <- w ^? cWorld . lWorld . items . ix itid >>= equipType
let mesite = w ^? cWorld . lWorld . items . ix itid . itLocation . ilEquipSite . _Just
i <- w ^? rbOptions . opSel i <- w ^? rbOptions . opSel
<|> Just (chooseEquipPosition (w ^. cWorld . lWorld . items) (you w) (eqSiteToPositions esite)) -- <|> (uncurry elemIndex =<< (mesite <&> (,eqSiteToPositions etype)))
es <- eqSiteToPositions esite ^? ix i -- <|> Just (chooseFreeSite (you w) (eqSiteToPositions etype))
return $ case you w ^? crInv . ix invid >>= \k -> w ^? cWorld . lWorld . items . ix k . itLocation . ilEquipSite . _Just of ---- <|> Just (chooseEquipPosition (w ^. cWorld . lWorld . items) (you w) (eqSiteToPositions etype))
es <- eqTypeToSites etype ^? ix i
return $ case mesite of
Just epos Just epos
| es == epos -> RemoveEquipment{_allocOldPos = epos} | es == epos -> RemoveEquipment{_allocOldPos = epos}
Just epos Just epos
@@ -76,10 +80,9 @@ getEquipmentAllocation invid w = fromMaybe DoNotMoveEquipment $ do
, _allocRemoveID = _crEquipment (you w) M.! es , _allocRemoveID = _crEquipment (you w) M.! es
} }
Nothing -> PutOnEquipment{_allocNewPos = es} Nothing -> PutOnEquipment{_allocNewPos = es}
where
eqSiteToPositions :: EquipType -> [EquipSite] eqTypeToSites :: EquipType -> [EquipSite]
eqSiteToPositions es = case es of eqTypeToSites es = case es of
GoesOnHead -> [OnHead] GoesOnHead -> [OnHead]
GoesOnChest -> [OnChest] GoesOnChest -> [OnChest]
GoesOnBack -> [OnBack] GoesOnBack -> [OnBack]
src/Dodge/Render/HUD.hs
+4 -3
View File
@@ -248,11 +248,12 @@ drawRBOptions :: Config -> World -> Picture
drawRBOptions cfig w = fold $ do drawRBOptions cfig w = fold $ do
guard $ ButtonRight `M.member` _mouseButtons (_input w) guard $ ButtonRight `M.member` _mouseButtons (_input w)
invid <- you w ^? crManipulation . manObject . imSelectedItem invid <- you w ^? crManipulation . manObject . imSelectedItem
itid <- you w ^? crInv . ix invid
eslist <- eslist <-
fmap eqSiteToPositions $ fmap eqTypeToSites $
you w ^? crInv . ix invid >>= \k -> w ^? cWorld . lWorld . items . ix k >>= equipType -- . itUse . uequipEffect . eeType w ^? cWorld . lWorld . items . ix itid >>= equipType
i <- w ^? rbOptions . opSel i <- w ^? rbOptions . opSel
let ae = getEquipmentAllocation invid w let ae = equipmentDesignation invid w
sss <- w ^? hud . diSections sss <- w ^? hud . diSections
Sel i' j _ <- w ^? hud . diSelection . _Just Sel i' j _ <- w ^? hud . diSelection . _Just
curpos <- selSecYint i' j sss curpos <- selSecYint i' j sss
src/Dodge/Update/Scroll.hs
+2 -2
View File
@@ -45,8 +45,8 @@ updateBaseWheelEvent yi w
bdown b = w & has (input . mouseButtons . ix b) bdown b = w & has (input . mouseButtons . ix b)
rbscrollmax = fromMaybe 1 $ do rbscrollmax = fromMaybe 1 $ do
invid <- you w ^? crManipulation . manObject . imSelectedItem invid <- you w ^? crManipulation . manObject . imSelectedItem
esite <- you w ^? crInv . ix invid >>= \k -> w ^? cWorld . lWorld . items . ix k >>= equipType -- . itUse . uequipEffect . eeType etype <- you w ^? crInv . ix invid >>= \k -> w ^? cWorld . lWorld . items . ix k >>= equipType
return . length $ eqSiteToPositions esite return . length $ eqTypeToSites etype
selectedItemScroll :: Int -> World -> Maybe World selectedItemScroll :: Int -> World -> Maybe World
selectedItemScroll yi w = do selectedItemScroll yi w = do
tags
+16 -16
View File
@@ -2841,9 +2841,9 @@ centroid src/Geometry/Polygon.hs 136;" f
centroidNum src/Geometry/Polygon.hs 139;" f centroidNum src/Geometry/Polygon.hs 139;" f
chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f
chainPairs src/Geometry.hs 363;" f chainPairs src/Geometry.hs 363;" f
changeSwapOther src/Dodge/Inventory.hs 139;" f changeSwapOther src/Dodge/Inventory.hs 140;" f
changeSwapSel src/Dodge/Inventory.hs 132;" f changeSwapSel src/Dodge/Inventory.hs 133;" f
changeSwapWith src/Dodge/Inventory.hs 173;" f changeSwapWith src/Dodge/Inventory.hs 174;" f
charToTuple src/Picture/Base.hs 317;" f charToTuple src/Picture/Base.hs 317;" f
charToTupleGrad src/Picture/Text.hs 18;" f charToTupleGrad src/Picture/Text.hs 18;" f
chartreuse src/Color.hs 24;" f chartreuse src/Color.hs 24;" f
@@ -2871,9 +2871,9 @@ checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f
chemFuelPouch src/Dodge/Item/Ammo.hs 75;" f chemFuelPouch src/Dodge/Item/Ammo.hs 75;" f
chestPQ src/Dodge/Creature/HandPos.hs 128;" f chestPQ src/Dodge/Creature/HandPos.hs 128;" f
chooseCursorBorders src/Dodge/Render/List.hs 156;" f chooseCursorBorders src/Dodge/Render/List.hs 156;" f
chooseEquipPosition src/Dodge/Inventory/RBList.hs 38;" f chooseEquipPosition src/Dodge/Inventory/RBList.hs 39;" f
chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 34;" f chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 34;" f
chooseFreeSite src/Dodge/Inventory/RBList.hs 45;" f chooseFreeSite src/Dodge/Inventory/RBList.hs 46;" f
chooseMovementLtAuto src/Dodge/CreatureEffect.hs 105;" f chooseMovementLtAuto src/Dodge/CreatureEffect.hs 105;" f
chooseMovementPistol src/Dodge/Humanoid.hs 203;" f chooseMovementPistol src/Dodge/Humanoid.hs 203;" f
chooseMovementPistol' src/Dodge/Humanoid.hs 208;" f chooseMovementPistol' src/Dodge/Humanoid.hs 208;" f
@@ -3536,7 +3536,7 @@ enterCombineInv src/Dodge/DisplayInventory.hs 322;" f
epText src/Dodge/Inventory/SelectionList.hs 76;" f epText src/Dodge/Inventory/SelectionList.hs 76;" f
eqConstr src/SameConstr.hs 17;" f eqConstr src/SameConstr.hs 17;" f
eqPosText src/Dodge/Equipment/Text.hs 5;" f eqPosText src/Dodge/Equipment/Text.hs 5;" f
eqSiteToPositions src/Dodge/Inventory/RBList.hs 81;" f eqSiteToPositions src/Dodge/Inventory/RBList.hs 84;" f
equipAllocString src/Dodge/Render/HUD.hs 305;" f equipAllocString src/Dodge/Render/HUD.hs 305;" f
equipAttachPos src/Dodge/Item/Draw.hs 33;" f equipAttachPos src/Dodge/Item/Draw.hs 33;" f
equipBackgroundEffect src/Dodge/Euse.hs 15;" f equipBackgroundEffect src/Dodge/Euse.hs 15;" f
@@ -3545,6 +3545,7 @@ equipItemSPic src/Dodge/Item/Draw/SPic.hs 171;" f
equipPosition src/Dodge/Item/Draw.hs 41;" f equipPosition src/Dodge/Item/Draw.hs 41;" f
equipSiteInfo src/Dodge/Item/Info.hs 254;" f equipSiteInfo src/Dodge/Item/Info.hs 254;" f
equipType src/Dodge/Data/EquipType.hs 10;" f equipType src/Dodge/Data/EquipType.hs 10;" f
equipmentDesignation src/Dodge/Inventory/RBList.hs 51;" f
equipmentStrValue src/Dodge/Creature/Statistics.hs 52;" f equipmentStrValue src/Dodge/Creature/Statistics.hs 52;" f
errorAngleVV src/Geometry.hs 60;" f errorAngleVV src/Geometry.hs 60;" f
errorClosestPointOnLine src/Geometry.hs 72;" f errorClosestPointOnLine src/Geometry.hs 72;" f
@@ -3696,7 +3697,6 @@ getCommand src/Dodge/Terminal.hs 58;" f
getCommands src/Dodge/Terminal.hs 55;" f getCommands src/Dodge/Terminal.hs 55;" f
getCrMoveSpeed src/Dodge/Creature/Statistics.hs 46;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 46;" f
getDistortions src/Dodge/Render.hs 435;" f getDistortions src/Dodge/Render.hs 435;" f
getEquipmentAllocation src/Dodge/Inventory/RBList.hs 50;" f
getGrenadeHitEffect src/Dodge/HeldUse.hs 1301;" f getGrenadeHitEffect src/Dodge/HeldUse.hs 1301;" f
getInventoryPath src/Dodge/Inventory/Path.hs 9;" f getInventoryPath src/Dodge/Inventory/Path.hs 9;" f
getItemValue src/Dodge/Inventory/SelectionList.hs 147;" f getItemValue src/Dodge/Inventory/SelectionList.hs 147;" f
@@ -3905,8 +3905,8 @@ invItemEffs src/Dodge/Creature/State.hs 62;" f
invItemLocUpdate src/Dodge/Creature/State.hs 70;" f invItemLocUpdate src/Dodge/Creature/State.hs 70;" f
invRootMap src/Dodge/Item/Grammar.hs 226;" f invRootMap src/Dodge/Item/Grammar.hs 226;" f
invSelectionItem src/Dodge/Inventory/SelectionList.hs 32;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 32;" f
invSetSelection src/Dodge/Inventory.hs 178;" f invSetSelection src/Dodge/Inventory.hs 179;" f
invSetSelectionPos src/Dodge/Inventory.hs 186;" f invSetSelectionPos src/Dodge/Inventory.hs 187;" f
invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f
invSize src/Dodge/Inventory/CheckSlots.hs 33;" f invSize src/Dodge/Inventory/CheckSlots.hs 33;" f
inventoryX src/Dodge/Creature.hs 113;" f inventoryX src/Dodge/Creature.hs 113;" f
@@ -4896,8 +4896,8 @@ screenPolygon src/Dodge/Base/Window.hs 17;" f
screenPolygonBord src/Dodge/Base/Window.hs 27;" f screenPolygonBord src/Dodge/Base/Window.hs 27;" f
screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenPosAbs src/Dodge/ScreenPos.hs 15;" f
screenToWorldPos src/Dodge/Base/Coordinate.hs 51;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 51;" f
scrollAugInvSel src/Dodge/Inventory.hs 189;" f scrollAugInvSel src/Dodge/Inventory.hs 190;" f
scrollAugNextInSection src/Dodge/Inventory.hs 202;" f scrollAugNextInSection src/Dodge/Inventory.hs 203;" f
scrollDebugInfoInt src/Dodge/Debug.hs 71;" f scrollDebugInfoInt src/Dodge/Debug.hs 71;" f
scrollRBOption src/Dodge/Update/Scroll.hs 217;" f scrollRBOption src/Dodge/Update/Scroll.hs 217;" f
scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f
@@ -5206,7 +5206,7 @@ swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 56;" f
swapInOutLinks src/Dodge/RoomLink.hs 80;" f swapInOutLinks src/Dodge/RoomLink.hs 80;" f
swapIndices src/ListHelp.hs 50;" f swapIndices src/ListHelp.hs 50;" f
swapInvItems src/Dodge/Inventory/Swap.hs 21;" f swapInvItems src/Dodge/Inventory/Swap.hs 21;" f
swapItemWith src/Dodge/Inventory.hs 162;" f swapItemWith src/Dodge/Inventory.hs 163;" f
swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f
swarmUsingCenter src/Dodge/Creature/Boid.hs 172;" f swarmUsingCenter src/Dodge/Creature/Boid.hs 172;" f
switchDoor src/Dodge/Placement/Instance/Door.hs 96;" f switchDoor src/Dodge/Placement/Instance/Door.hs 96;" f
@@ -5284,7 +5284,7 @@ thingHitFilt src/Dodge/WorldEvent/ThingsHit.hs 71;" f
thingsHit src/Dodge/WorldEvent/ThingsHit.hs 34;" f thingsHit src/Dodge/WorldEvent/ThingsHit.hs 34;" f
thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 92;" f thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 92;" f
threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f
throwItem src/Dodge/Creature/Action.hs 210;" f throwItem src/Dodge/Creature/Action.hs 211;" f
tileTexCoords src/Tile.hs 11;" f tileTexCoords src/Tile.hs 11;" f
tilesFromRooms src/Dodge/Layout.hs 205;" f tilesFromRooms src/Dodge/Layout.hs 205;" f
tilesToLine src/Shader/AuxAddition.hs 66;" f tilesToLine src/Shader/AuxAddition.hs 66;" f
@@ -5455,7 +5455,7 @@ updateBulVel src/Dodge/Bullet.hs 56;" f
updateBullet src/Dodge/Bullet.hs 21;" f updateBullet src/Dodge/Bullet.hs 21;" f
updateBullets src/Dodge/Update.hs 576;" f updateBullets src/Dodge/Update.hs 576;" f
updateCamera src/Dodge/Update/Camera.hs 30;" f updateCamera src/Dodge/Update/Camera.hs 30;" f
updateCloseObjects src/Dodge/Inventory.hs 113;" f updateCloseObjects src/Dodge/Inventory.hs 114;" f
updateCloud src/Dodge/Update.hs 814;" f updateCloud src/Dodge/Update.hs 814;" f
updateClouds src/Dodge/Update.hs 682;" f updateClouds src/Dodge/Update.hs 682;" f
updateCombinePositioning src/Dodge/DisplayInventory.hs 39;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 39;" f
@@ -5522,7 +5522,7 @@ updatePulse src/Dodge/Creature/Update.hs 136;" f
updatePulseBall src/Dodge/Update.hs 458;" f updatePulseBall src/Dodge/Update.hs 458;" f
updatePulseLaser src/Dodge/Update.hs 623;" f updatePulseLaser src/Dodge/Update.hs 623;" f
updatePulseLasers src/Dodge/Update.hs 453;" f updatePulseLasers src/Dodge/Update.hs 453;" f
updateRBList src/Dodge/Inventory/RBList.hs 20;" f updateRBList src/Dodge/Inventory/RBList.hs 21;" f
updateRadarBlip src/Dodge/RadarBlip.hs 11;" f updateRadarBlip src/Dodge/RadarBlip.hs 11;" f
updateRadarBlips src/Dodge/Update.hs 572;" f updateRadarBlips src/Dodge/Update.hs 572;" f
updateRadarSweep src/Dodge/RadarSweep.hs 39;" f updateRadarSweep src/Dodge/RadarSweep.hs 39;" f
@@ -5713,7 +5713,7 @@ yIntercepts' src/Dodge/Zoning/Base.hs 76;" f
yV2 src/Geometry/Vector.hs 210;" f yV2 src/Geometry/Vector.hs 210;" f
yellow src/Color.hs 17;" f yellow src/Color.hs 17;" f
you src/Dodge/Base/You.hs 13;" f you src/Dodge/Base/You.hs 13;" f
youDropItem src/Dodge/Creature/Action.hs 195;" f youDropItem src/Dodge/Creature/Action.hs 196;" f
yourAugmentedItem src/Dodge/Render/HUD.hs 234;" f yourAugmentedItem src/Dodge/Render/HUD.hs 234;" f
yourControl src/Dodge/Creature/YourControl.hs 29;" f yourControl src/Dodge/Creature/YourControl.hs 29;" f
yourDefaultStrideLength src/Dodge/Default/Creature.hs 110;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 110;" f