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

Add limit to forcefield size

Browse Source
This commit is contained in:
justin
2022-06-07 16:08:18 +01:00
parent 1c80447f9a
commit f938f9a717
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Item/Weapon/ExtraEffect.hs
+2 -1
View File
@@ -94,9 +94,10 @@ targetDistanceDraw itm _ cfig w = fromMaybe mempty $ do
let p1 = worldPosToScreen w p let p1 = worldPosToScreen w p
mwp = mouseWorldPos w mwp = mouseWorldPos w
p2 = worldPosToScreen w mwp p2 = worldPosToScreen w mwp
thecol = if dist p mwp > 100 then red else white
return $ winScale cfig return $ winScale cfig
$ setLayer FixedCoordLayer $ setLayer FixedCoordLayer
$ color white $ color thecol
$ line [p1, p2] $ line [p1, p2]
<> translate (20) (f p1 p2) (uncurryV translate (0.5 *.* (p1 +.+ p2)) . scale 0.1 0.1 $ text $ shortShow $ dist p mwp) <> translate (20) (f p1 p2) (uncurryV translate (0.5 *.* (p1 +.+ p2)) . scale 0.1 0.1 $ text $ shortShow $ dist p mwp)
where where
src/Dodge/Item/Weapon/Utility.hs
+4 -1
View File
@@ -19,6 +19,7 @@ import ShapePicture
import Data.Maybe import Data.Maybe
--import qualified Data.Map.Strict as M --import qualified Data.Map.Strict as M
import Control.Lens import Control.Lens
--import Control.Monad
rewindGun :: Item rewindGun :: Item
rewindGun = defaultGun rewindGun = defaultGun
@@ -156,7 +157,9 @@ forceFieldGun = defaultGun
useForceFieldGun :: Item -> Creature -> World -> World useForceFieldGun :: Item -> Creature -> World -> World
useForceFieldGun itm cr w = fromMaybe w $ do useForceFieldGun itm cr w = fromMaybe w $ do
a <- _tgPos $ _itTargeting itm a <- _tgPos $ _itTargeting itm
let wlline = (a,mouseWorldPos w) let mwp = mouseWorldPos w
b = if dist a mwp < 100 then mwp else a +.+ 100 *.* normalizeV (mwp -.- a)
wlline = (a,b)
return $ w return $ w
& walls %~ IM.insertWith (\_ x -> x) i forceField {_wlID = i} & walls %~ IM.insertWith (\_ x -> x) i forceField {_wlID = i}
& creatures . ix (_crID cr) . crInv . ix (fromJust (_itInvPos itm)) . itParams . paramMID ?~ i & creatures . ix (_crID cr) . crInv . ix (fromJust (_itInvPos itm)) . itParams . paramMID ?~ i