Tweak charmap; tweak zoom
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
@@ -35,10 +35,10 @@ startPara =
|
|||||||
]
|
]
|
||||||
<> makeParagraph
|
<> makeParagraph
|
||||||
55
|
55
|
||||||
( "My last memory is the reconstitution scan. "
|
( "My last memory is the pre-duplication scan. "
|
||||||
<> "Though experimental, this techology allows for perfect duplication. "
|
<> "Though experimental, this techology allows for the creation of perfect copies. "
|
||||||
<> "At least in theory, "
|
<> "At least in theory; "
|
||||||
<> "it hasn't been tested on humans. "
|
<> "it hasn't been tested on humans: "
|
||||||
<> "I'd only be duplicated if my original body was... non-functional."
|
<> "I'd only be duplicated if my original body was... non-functional."
|
||||||
)
|
)
|
||||||
<> ["", "","", "Hopefully I can take better care of this one."]
|
<> ["", "","", "Hopefully I can take better care of this one."]
|
||||||
|
|||||||
@@ -129,10 +129,10 @@ moveZoomCamera cfig theinput cr w campos =
|
|||||||
getAimZoom <$> (w ^? cWorld . lWorld . items . ix itid)
|
getAimZoom <$> (w ^? cWorld . lWorld . items . ix itid)
|
||||||
newItemZoom = changeZoom (campos ^. camItemZoom) idealItemZoom
|
newItemZoom = changeZoom (campos ^. camItemZoom) idealItemZoom
|
||||||
changeZoom curZoom idealZoom
|
changeZoom curZoom idealZoom
|
||||||
| curZoom > 1.02 * idealZoom
|
| curZoom > 1.01 * idealZoom
|
||||||
= ((zoomOutSpeed -1) * curZoom + (0.98*idealZoom)) / zoomOutSpeed
|
= ((zoomOutSpeed -1) * curZoom + (0.99*idealZoom)) / zoomOutSpeed
|
||||||
| curZoom < 0.98 * idealZoom
|
| curZoom < 0.99 * idealZoom
|
||||||
= ((zoomInSpeed -1) * curZoom + (1.02*idealZoom)) / zoomInSpeed
|
= ((zoomInSpeed -1) * curZoom + (1.01*idealZoom)) / zoomInSpeed
|
||||||
| otherwise = idealZoom
|
| otherwise = idealZoom
|
||||||
wallZoom = min4 (f (campos ^. camBoundDist))
|
wallZoom = min4 (f (campos ^. camBoundDist))
|
||||||
f (a,b,c,d) = (a+bordersize,b-bordersize,c+bordersize,d-bordersize)
|
f (a,b,c,d) = (a+bordersize,b-bordersize,c+bordersize,d-bordersize)
|
||||||
|
|||||||