This commit is contained in:
2022-06-08 22:34:29 +01:00
parent 970858e129
commit 4e4759fb1c
17 changed files with 77 additions and 112 deletions
+10 -10
View File
@@ -817,7 +817,7 @@ data Modification
}
data Prop
= Projectile
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjStartPos :: Point2
, _pjVel :: Point2
, _prDraw :: Prop -> SPic
@@ -825,7 +825,7 @@ data Prop
, _pjUpdate :: Prop -> World -> World
}
| PropZ
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjStartPos :: Point2
, _pjVel :: Point2
, _prDraw :: Prop -> SPic
@@ -839,7 +839,7 @@ data Prop
, _pjColor :: Color
}
| Drone
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjStartPos :: Point2
, _pjVel :: Point2
, _prDraw :: Prop -> SPic
@@ -847,14 +847,14 @@ data Prop
, _pjUpdate :: Prop -> World -> World
}
| RecursiveProp
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjID :: Int
, _pjDraw :: Prop -> SPic
, _pjUpdate :: Prop -> World -> World
, _pjProp :: Prop
}
| ProjectileTimed
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjStartPos :: Point2
, _pjVel :: Point2
, _prDraw :: Prop -> SPic
@@ -863,7 +863,7 @@ data Prop
, _pjTime :: Int
}
| ShapeProp
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjID :: Int
, _pjRot :: Float
, _pjUpdate :: Prop -> World -> World
@@ -871,7 +871,7 @@ data Prop
, _prToggle :: Bool
}
| RemoteShell
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjStartPos :: Point2
, _pjVel :: Point2
, _prDraw :: Prop -> SPic
@@ -880,7 +880,7 @@ data Prop
, _pjPayload :: Point2 -> World -> World
}
| Shell
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjStartPos :: Point2
, _pjVel :: Point2
, _pjAcc :: Point2
@@ -894,7 +894,7 @@ data Prop
, _pjZ :: Float
}
| Bomb
{ _pjPos :: Point2
{ _prPos :: Point2
, _pjVel :: Point2
, _pjZ :: Float
, _pjVelZ :: Float
@@ -906,7 +906,7 @@ data Prop
}
| LinearShockwave
{ _prDraw :: Prop -> SPic
, _pjPos :: Point2
, _prPos :: Point2
, _pjID :: Int
, _pjUpdate :: Prop -> World -> World
, _pjPoints :: [(Point2,Point2)]