Commit towards merge

2022-03-20 17:18:12 +00:00
parent 6c3e335ded
commit 5e897c6a6c
10 changed files with 301 additions and 98 deletions
@@ -174,7 +174,7 @@ data ScreenLayer
        , _scOptionFlag :: OptionScreenFlag
        }
    | ColumnsScreen String [(String,String)]
-    | InputScreen String
+    | InputScreen String String
    | WaitScreen
        { _scWaitMessage :: Universe -> String
        , _scWaitTime    :: Int
@@ -616,6 +616,7 @@ data ItemParams
        , _shellThrustDelay :: Int
        }
    | Refracting    {_phaseV :: Float}
+    | Traction    {_power :: Point2}
    | BulletShooter -- this should possibly be moved into ammo type
        { _muzVel   :: Float
        , _rifling  :: Float