Work on tweak datatypes

2021-11-29 23:05:51 +00:00
parent 02dc7c29e0
commit e75cbdf6cb
5 changed files with 32 additions and 45 deletions
@@ -516,34 +516,26 @@ data AmmoType
        { _amString :: String }
    | GenericAmmo
 data ItemParams
-    = UtilityItem
-    | NoParams
+    = NoParams
    | ShellLauncher
-        { _tweakParams :: [TweakParam]
+        { _tweakParams :: IM.IntMap TweakParam
        , _tweakSel    :: Int
        , _shellSpinDrag    :: Int
        , _shellSpinAmount  :: Int
        , _shellThrustDelay :: Int
        }
+    | Refracting    {_phaseVel :: Float}
    | MultiBarrel
        { _barrelSpread :: BarrelSpread
        , _barrelNum    :: Int
        }
-    | SingleBarrel
-        {_inaccuracy :: Float}
+    | SingleBarrel  {_inaccuracy :: Float}
    | AngleWalk
        { _maxWalkAngle :: Float
        , _currentWalkAngle :: Float
        , _walkSpeed :: Float
        }
-data TweakParam
-    = PjExtraUpdate
-        { _pjMoveParam  :: Int -> Item -> Creature -> Prop -> World -> World
-        , _curTweak     :: Int
-        , _pjMaxParam   :: Int
-        , _pjDisplayParam :: Int -> String
-        }
-    | TweakItem
+data TweakParam = TweakParam
        { _doTweak :: Int -> Item -> Item
        , _curTweak  :: Int
        , _maxTweak  :: Int