From 1d53ff42779a12a19d853f83ac1d3dc62ba2edb7 Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 7 Dec 2025 12:16:46 +0000 Subject: [PATCH] Tweak charmap; tweak zoom --- .../{ => Old}/cMap16x32.CodePage437.png | Bin .../{ => Old}/cMap16x32.CodePage437.xcf | Bin .../{ => Old}/cMap16x32background.png | Bin data/charMaps/{ => Old}/charMapVert16Tall.png | Bin .../charMapVert16x32.CodePage437pinta.png | Bin data/charMaps/{ => Old}/charMapVert32Tall.png | Bin data/charMaps/cMap16x32.Custom.png | Bin 12381 -> 12380 bytes src/Dodge/StartNewGame.hs | 8 ++++---- src/Dodge/Update/Camera.hs | 8 ++++---- 9 files changed, 8 insertions(+), 8 deletions(-) rename data/charMaps/{ => Old}/cMap16x32.CodePage437.png (100%) rename data/charMaps/{ => Old}/cMap16x32.CodePage437.xcf (100%) rename data/charMaps/{ => Old}/cMap16x32background.png (100%) rename data/charMaps/{ => Old}/charMapVert16Tall.png (100%) rename data/charMaps/{ => Old}/charMapVert16x32.CodePage437pinta.png (100%) rename data/charMaps/{ => Old}/charMapVert32Tall.png (100%) diff --git a/data/charMaps/cMap16x32.CodePage437.png b/data/charMaps/Old/cMap16x32.CodePage437.png similarity index 100% rename from data/charMaps/cMap16x32.CodePage437.png rename to data/charMaps/Old/cMap16x32.CodePage437.png diff --git a/data/charMaps/cMap16x32.CodePage437.xcf b/data/charMaps/Old/cMap16x32.CodePage437.xcf similarity index 100% rename from data/charMaps/cMap16x32.CodePage437.xcf rename to data/charMaps/Old/cMap16x32.CodePage437.xcf diff --git a/data/charMaps/cMap16x32background.png b/data/charMaps/Old/cMap16x32background.png similarity index 100% rename from data/charMaps/cMap16x32background.png rename to data/charMaps/Old/cMap16x32background.png diff --git a/data/charMaps/charMapVert16Tall.png b/data/charMaps/Old/charMapVert16Tall.png similarity index 100% rename from data/charMaps/charMapVert16Tall.png rename to data/charMaps/Old/charMapVert16Tall.png diff --git a/data/charMaps/charMapVert16x32.CodePage437pinta.png b/data/charMaps/Old/charMapVert16x32.CodePage437pinta.png similarity index 100% rename from data/charMaps/charMapVert16x32.CodePage437pinta.png rename to data/charMaps/Old/charMapVert16x32.CodePage437pinta.png diff --git a/data/charMaps/charMapVert32Tall.png b/data/charMaps/Old/charMapVert32Tall.png similarity index 100% rename from data/charMaps/charMapVert32Tall.png rename to data/charMaps/Old/charMapVert32Tall.png diff --git a/data/charMaps/cMap16x32.Custom.png b/data/charMaps/cMap16x32.Custom.png index d21858aa64929e63e2da3b8d097db9c11f7aae25..7e309805696382c0b3b1add781948ea237072986 100644 GIT binary patch delta 6956 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 bNcsf^J5BylIocEWdwWaEK(kui?&1FdlN&dh delta 6956 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 diff --git a/src/Dodge/StartNewGame.hs b/src/Dodge/StartNewGame.hs index 11d078aa4..e9a97152a 100644 --- a/src/Dodge/StartNewGame.hs +++ b/src/Dodge/StartNewGame.hs @@ -35,10 +35,10 @@ startPara = ] <> makeParagraph 55 - ( "My last memory is the reconstitution scan. " - <> "Though experimental, this techology allows for perfect duplication. " - <> "At least in theory, " - <> "it hasn't been tested on humans. " + ( "My last memory is the pre-duplication scan. " + <> "Though experimental, this techology allows for the creation of perfect copies. " + <> "At least in theory; " + <> "it hasn't been tested on humans: " <> "I'd only be duplicated if my original body was... non-functional." ) <> ["", "","", "Hopefully I can take better care of this one."] diff --git a/src/Dodge/Update/Camera.hs b/src/Dodge/Update/Camera.hs index 5c0a36b76..154f08391 100644 --- a/src/Dodge/Update/Camera.hs +++ b/src/Dodge/Update/Camera.hs @@ -129,10 +129,10 @@ moveZoomCamera cfig theinput cr w campos = getAimZoom <$> (w ^? cWorld . lWorld . items . ix itid) newItemZoom = changeZoom (campos ^. camItemZoom) idealItemZoom changeZoom curZoom idealZoom - | curZoom > 1.02 * idealZoom - = ((zoomOutSpeed -1) * curZoom + (0.98*idealZoom)) / zoomOutSpeed - | curZoom < 0.98 * idealZoom - = ((zoomInSpeed -1) * curZoom + (1.02*idealZoom)) / zoomInSpeed + | curZoom > 1.01 * idealZoom + = ((zoomOutSpeed -1) * curZoom + (0.99*idealZoom)) / zoomOutSpeed + | curZoom < 0.99 * idealZoom + = ((zoomInSpeed -1) * curZoom + (1.01*idealZoom)) / zoomInSpeed | otherwise = idealZoom wallZoom = min4 (f (campos ^. camBoundDist)) f (a,b,c,d) = (a+bordersize,b-bordersize,c+bordersize,d-bordersize)