Update default config, general cleanup
This commit is contained in:
@@ -40,11 +40,11 @@ thingsHit sp ep w =
|
||||
(map (second Right) (wlsHit sp ep w))
|
||||
|
||||
{- Does not hit corpses -}
|
||||
thingsHitZ :: Point2 -> Point2 -> World -> [(Point2, Either Creature Wall)]
|
||||
thingsHitZ sp ep w =
|
||||
thingsHitZ :: Float -> Point2 -> Point2 -> World -> [(Point2, Either Creature Wall)]
|
||||
thingsHitZ z sp ep w =
|
||||
List.mergeOn
|
||||
(dist sp . fst)
|
||||
(map (second Left) (crsHitZ sp ep w))
|
||||
(map (second Left) (crsHitZ z sp ep w))
|
||||
(map (second Right) (wlsHit sp ep w))
|
||||
|
||||
crWlPbHit :: Point2 -> Point2 -> World -> [(Point2, Object)]
|
||||
@@ -68,8 +68,8 @@ crsHit sp ep w
|
||||
. crixsNearSeg sp ep
|
||||
$ w
|
||||
|
||||
crsHitZ :: Point2 -> Point2 -> World -> [(Point2, Creature)]
|
||||
crsHitZ sp ep w
|
||||
crsHitZ :: Float -> Point2 -> Point2 -> World -> [(Point2, Creature)]
|
||||
crsHitZ z sp ep w
|
||||
| sp == ep = mempty
|
||||
| otherwise =
|
||||
sortOn (dist sp . fst)
|
||||
@@ -79,8 +79,10 @@ crsHitZ sp ep w
|
||||
. crixsNearSeg sp ep
|
||||
$ w
|
||||
where
|
||||
f cr
|
||||
f cr
|
||||
| HP{} <- cr ^. crHP = Just cr
|
||||
| CrIsCorpse{} <- cr ^. crHP
|
||||
, z < 5 = Just cr
|
||||
| otherwise = Nothing
|
||||
|
||||
pbsHit :: Point2 -> Point2 -> World -> [(Point2, PulseBall)]
|
||||
|
||||
Reference in New Issue
Block a user