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 d21858aa6..7e3098056 100644 Binary files a/data/charMaps/cMap16x32.Custom.png and b/data/charMaps/cMap16x32.Custom.png differ 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)