diff --git a/src/Dodge/Debug/Terminal.hs b/src/Dodge/Debug/Terminal.hs index 8dd7e1dfa..6a4c0cc29 100644 --- a/src/Dodge/Debug/Terminal.hs +++ b/src/Dodge/Debug/Terminal.hs @@ -32,6 +32,7 @@ applyTerminalCommand s = case s of (uvWorld . cWorld . lWorld %~ initSpecificCrItemLocations 0) . (uvWorld . cWorld . lWorld . creatures . ix 0 . crInv .~ IM.fromList (zip [0 ..] $ inventoryX x)) . (uvWorld . cWorld . lWorld . creatures . ix 0 . crInvCapacity .~ 50) + ['I','S',x,y] -> (uvWorld . cWorld . lWorld . creatures . ix 0 . crInvCapacity .~ read [x,y]) "GODON" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crMaterial .~ Crystal "GODOFF" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crMaterial .~ Flesh _ -> id diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index 8608df92e..f084902bc 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -146,15 +146,6 @@ drawSubInventory subinv cfig w = case subinv of closeobjectcursor = case selectedCloseObject w of Nothing -> mempty Just (i,_) -> drawCursorAt (invDisplayParams w & ldpCursorType .~ BorderCursor (Set.fromList [North,South])) cfig (Just i) (inventorySelectionList w) --- Just (i, co) -> --- listCursorNS --- clObjFloatIn --- 0 --- cfig --- (selNumPos i w) --- (closeObjectCol co) --- topInvW --- (invSelSize i w) itcol = fromMaybe (greyN 0.5) (it ^? _Just . itInvColor) cr = you w it = yourItem w diff --git a/src/Dodge/Render/List.hs b/src/Dodge/Render/List.hs index b706c2f7b..76f29f401 100644 --- a/src/Dodge/Render/List.hs +++ b/src/Dodge/Render/List.hs @@ -100,17 +100,18 @@ listCursorChooseBorderScale ygap s borders xoff yoff cfig yint col cursxsize cur -- this is probably because it is 8 pixels plus one for the border listCursorChooseBorder :: Set CardinalPoint -> Float -> Float -> Configuration -> Int -> Color -> Int -> Int -> Picture -listCursorChooseBorder borders xoff yoff cfig yint col cursxsize cursysize = - winScale cfig - . translate - (6 + xoff - halfWidth cfig) - (halfHeight cfig + 12.5 - (20 * fromIntegral yint + yoff + 20 + hgt)) - . color col - $ chooseCursorBorders wth hgt borders - where - x = 9 - wth = x * fromIntegral cursxsize + 9 - hgt = 20 * fromIntegral cursysize +listCursorChooseBorder = listCursorChooseBorderScale 10 1 +--listCursorChooseBorder borders xoff yoff cfig yint col cursxsize cursysize = +-- winScale cfig +-- . translate +-- (6 + xoff - halfWidth cfig) +-- (halfHeight cfig + 12.5 - (20 * fromIntegral yint + yoff + 20 + hgt)) +-- . color col +-- $ chooseCursorBorders wth hgt borders +-- where +-- x = 9 +-- wth = x * fromIntegral cursxsize + 9 +-- hgt = 20 * fromIntegral cursysize -- note we cannot simply scale lines because they are drawn as solid rectangles chooseCursorBorders :: Float -> Float -> Set CardinalPoint -> Picture