Implement teleporting bullets

2022-02-21 20:51:01 +00:00
parent 724ee21afc
commit f626fce105
23 changed files with 245 additions and 154 deletions
@@ -375,25 +375,20 @@ data Item
        , _itCurseStatus :: CurseStatus
        , _itParams     :: ItemParams
        , _itTweaks     :: ItemTweaks
-        , _itModules    :: ItemModules
+        , _itModules    :: M.Map ModuleSlot ItemModule
        }

-data ItemModules = ItemModules
-    { _modHitEffect :: ItemModule HitEffect
-    , _modRifleMag  :: ItemModule RifleMag
-    }
-data RifleMag = DrumMag | BeltMag | MagnetMag
-
 data ModuleSlot
    = ModBullet
    | ModRifleMag
+    | ModAutoMag
+    | ModBulletTarget
+  deriving (Eq,Ord)

-data ItemModule a 
-    = BlockedModule
-    | DefaultModule
+data ItemModule
+    = DefaultModule
    | ItemModule
-        { _theModule :: a
-        , _modName :: [String]
+        { _modName :: [String]
        , _modSize :: Int
        , _modModification :: Item -> Item
        }
@@ -938,5 +933,4 @@ makeLenses ''ItemPortage
 makeLenses ''Magnet
 makeLenses ''Gust
 makeLenses ''GunBarrels
-makeLenses ''ItemModules
 makeLenses ''ItemModule