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

Refactor bullet hit effect towards penetrating bullets

Browse Source
This commit is contained in:
jgk
2021-03-22 13:11:08 +01:00
parent 3bee30895d
commit b50dd8605a
6 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Data.hs
+8 -5
View File
@@ -447,7 +447,7 @@ data Particle' =
, _btPassThrough' :: Maybe Int
, _btWidth' :: Float
, _btTimer' :: Int
, _btHitEffect' :: HitEffect'
, _btHitEffect' :: HitEffect
}
| Pt' { _ptPict' :: Drawing
, _ptUpdate' :: World -> Particle' -> (World, Maybe Particle')
@@ -457,7 +457,7 @@ data Particle' =
, _btPassThrough' :: Maybe Int
, _btWidth' :: Float
, _btTimer' :: Int
, _btHitEffect' :: HitEffect'
, _btHitEffect' :: HitEffect
}
| Shockwave'
{ _ptPict' :: Drawing
@@ -471,10 +471,14 @@ data Particle' =
, _btTimer' :: Int
}
type HitEffect = Particle' -> [( Point2, [(Point2, (Either3 Creature Wall ForceField))] )]
-> World -> World
type HitEffect' = Particle' -> (Point2, (Either3 Creature Wall ForceField)) -> World -> World
type HitEffect'' = Particle' -> [(Point2, (Either3 Creature Wall ForceField))] -> World -> World
type HitEffect = Particle' -> [(Point2, (Either3 Creature Wall ForceField))] -> World
-> (World,Maybe Particle')
data Particle =
Particle { _ptPos :: Point2
, _ptStartPos :: Point2
@@ -492,7 +496,6 @@ data Particle =
, _btPassThrough :: Maybe Int
, _btColor :: Color
, _btWidth :: Float
-- , _btHitEffect :: Particle -> [(Point2, Either3 Creature Wall ForceField)] -> World -> World
}
| Bullet'
{ _ptPos :: Point2