Move towards removal of ssaTri, which was buggy
This commit is contained in:
@@ -204,7 +204,7 @@ moveShell pj w
|
||||
vel = _pjVel pj
|
||||
projectileExplosion = _pjPayload pj
|
||||
newPos = oldPos +.+ vel
|
||||
hitCr = fst <$> collideCircCrsPoint oldPos newPos 4 w
|
||||
hitCr = fst <$> collideCircCrsPoint oldPos newPos 4 (_creatures w)
|
||||
hitWl = fst <$> collideCircWalls oldPos newPos 2 (wallsNearPoint newPos w)
|
||||
thingHit = hitCr <|> hitWl
|
||||
|
||||
@@ -363,7 +363,7 @@ moveRemoteShell cid itid pj w
|
||||
accel = rotateV newdir (V2 2 0)
|
||||
(frict,g) = randomR (0.6,0.9) $ _randGen w
|
||||
(sparkD,_) = randomR (-0.5,0.5) $ _randGen w
|
||||
hitCr = fst <$> collideCircCrsPoint oldPos newPos 4 w
|
||||
hitCr = fst <$> collideCircCrsPoint oldPos newPos 4 (_creatures w)
|
||||
hitWl = fst <$> collideCircWalls oldPos newPos 2 (wallsNearPoint newPos w)
|
||||
thingHit = hitCr <|> hitWl
|
||||
r1 = _randGen w & evalState (randInCirc 10)
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
{- |
|
||||
Effects centered on creatures.
|
||||
These are typically item effects, and typical occur when an item is explictly used. -}
|
||||
module Dodge.Item.Weapon.UseEffect
|
||||
where
|
||||
module Dodge.Item.Weapon.UseEffect where
|
||||
import Dodge.Data
|
||||
import Dodge.Zone
|
||||
import Dodge.Picture.Layer
|
||||
--import Dodge.Zone
|
||||
--import Dodge.Picture.Layer
|
||||
import Picture
|
||||
import Geometry
|
||||
|
||||
@@ -78,7 +77,8 @@ mvRadar
|
||||
-> Point2 -- ^ Center of expanding circle
|
||||
-> World -> Particle -> (World, Maybe Particle)
|
||||
mvRadar 0 _ w _ = (w, Nothing)
|
||||
mvRadar x p w pt = undefined
|
||||
mvRadar _ _ w _ = (w, Nothing)
|
||||
--mvRadar x p w pt = undefined
|
||||
-- ( putBlips w
|
||||
-- , Just $ pt {_ptDraw = const pic ,_ptUpdate = mvRadar (x-1) p }
|
||||
-- )
|
||||
|
||||
Reference in New Issue
Block a user