Remove (by commenting out) module item-type system

src/Dodge/Data/Bullet.hs

@@ -17,7 +17,7 @@ import Geometry.Data
 data Bullet = Bullet
     { _buDelayFraction :: Float
     , _buEffect :: BulletEffect
-    , _buSpawn :: BulletSpawn
+    , _buPayload :: BulletPayload
     , _buTrajectory :: BulletTrajectory
     , _buVel :: Point2
     , _buDrag :: Float
@@ -39,7 +39,7 @@ data BulletEffect
     | PenetrateBullet
     deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
 
-data BulletSpawn 
+data BulletPayload 
     = BulBall {_spawnEBT :: EnergyBallType} 
     | BulSpark
     | BulFlak
@@ -62,10 +62,10 @@ data BulletTrajectoryType
     deriving (Show, Eq, Ord, Read, Enum, Bounded) --Generic, Flat)
 
 makeLenses ''Bullet
-makeLenses ''BulletSpawn
+makeLenses ''BulletPayload
 deriveJSON defaultOptions ''EnergyBallType
 deriveJSON defaultOptions ''BulletEffect
-deriveJSON defaultOptions ''BulletSpawn
+deriveJSON defaultOptions ''BulletPayload
 deriveJSON defaultOptions ''BulletTrajectory
 deriveJSON defaultOptions ''BulletTrajectoryType
 deriveJSON defaultOptions ''Bullet

src/Dodge/Data/ComposedItem.hs

@@ -16,20 +16,26 @@ data ComposeLinkType
     = AmmoInLink Int AmmoType
     | AmmoModLink
     | AmmoTargetingLink
+    | AmmoPayloadLink
+    | AmmoEffectLink
     | WeaponScopeLink 
     | WeaponTargetingLink 
     | RemoteScreenLink
+    | AugmentedHUDLink
     deriving (Eq,Ord,Show,Read)
 
 data ItemStructuralFunction
     = WeaponPlatformSF
     | WeaponScopeSF
     | WeaponTargetingSF
+    | AugmentedHUDSF
     | AmmoMagSF AmmoType
     | RemoteScreenSF
     | UncomposableIsolateSF
     | AmmoModifierSF AmmoType
     | AmmoTargetingSF AmmoType
+    | AmmoPayloadSF AmmoType
+    | AmmoEffectSF AmmoType
     deriving (Eq,Ord,Show,Read)
 
 type PartiallyComposedItem = (Item, ItemStructuralFunction, LinkTest)

src/Dodge/Data/Item/Combine.hs

@@ -5,6 +5,7 @@
 
 module Dodge.Data.Item.Combine where
 
+import Dodge.Data.Item.BulletMod
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -15,7 +16,7 @@ import Dodge.Data.Item.Use.Consumption
 
 data ItemType = ItemType
     { _iyBase :: ItemBaseType
-    , _iyModules :: M.Map ModuleSlot ItemModuleType
+--    , _iyModules :: M.Map ModuleSlot ItemModuleType
     }
     deriving (Eq, Ord, Show, Read)
 
@@ -91,7 +92,7 @@ data ItemBaseType
     | ATTACH {_ibtAttach :: AttachType}
     | AMMOMAG {_ibtAmmoMag :: AmmoMagType}
     | TARGETING {_ibtTargeting :: TargetingType}
-    | HOMING {_ibtHoming :: BulletTrajectoryType}
+    | BULLETMOD {_ibtBulletMod :: BulletMod}
     deriving (Eq, Ord, Show, Read)
 
 --deriving (Eq, Ord, Show, Read) --Generic, Flat)
@@ -101,6 +102,7 @@ data AttachType
     | BULLETSYNTHESIZER
     | REMOTESCREEN
     | HOMINGMODULE
+    | AUGMENTEDHUD
 --    | FLETCHINGMODULE
 --    | BULPAYLOADATTACH
 --    | BULTRAJECTORYATTACH
@@ -204,20 +206,20 @@ data HeldItemType
     | KEYCARD Int
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data ItemModuleType
-    = EMPTYMODULE
-    | MAGNETMAG
-    | BULPAY BulletSpawn
-    | BULBODY BulletEffect
-    | BULTRAJ {_imtBulletTrajectoryType :: BulletTrajectoryType}
-    | TARGET {_imtTargetType :: TargetingType}
-    | INCENDLAS
-    | SPLITLAS
-    | STATICLAS
---    | WEPTELE
-    | LAUNCHHOME
-    | ATTACHTORCH
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--data ItemModuleType
+--    = EMPTYMODULE
+--    | MAGNETMAG
+--    | BULPAY BulletPayload
+--    | BULBODY BulletEffect
+--    | BULTRAJ {_imtBulletTrajectoryType :: BulletTrajectoryType}
+--    | TARGET {_imtTargetType :: TargetingType}
+--    | INCENDLAS
+--    | SPLITLAS
+--    | STATICLAS
+----    | WEPTELE
+--    | LAUNCHHOME
+--    | ATTACHTORCH
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Detector
     = ITEMDETECTOR
@@ -242,7 +244,7 @@ data ModuleSlot
 makeLenses ''ItemType
 makeLenses ''ItemBaseType
 makeLenses ''HeldItemType
-makeLenses ''ItemModuleType
+--makeLenses ''ItemModuleType
 makeLenses ''AttachType
 deriveJSON defaultOptions ''Stack
 deriveJSON defaultOptions ''CraftType
@@ -253,7 +255,7 @@ deriveJSON defaultOptions ''Detector
 deriveJSON defaultOptions ''EquipItemType
 deriveJSON defaultOptions ''LeftItemType
 deriveJSON defaultOptions ''HeldItemType
-deriveJSON defaultOptions ''ItemModuleType
+--deriveJSON defaultOptions ''ItemModuleType
 deriveJSON defaultOptions ''ModuleSlot
 deriveJSON defaultOptions ''ItemBaseType
 deriveJSON defaultOptions ''ItemType

src/Dodge/Data/Item/Use.hs

@@ -12,9 +12,11 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Hammer,
     module Dodge.Data.Item.Targeting,
     module Dodge.Data.GenFloat,
-    module Dodge.Data.Item.Scope
+    module Dodge.Data.Item.Scope,
+    module Dodge.Data.Item.BulletMod
 ) where
 
+import Dodge.Data.Item.BulletMod
 import Dodge.Data.Item.Scope
 import Control.Lens
 import Data.Aeson
@@ -78,8 +80,8 @@ data ItemUse
         , _tgID :: Maybe Int
         , _tgActive :: Bool
         }
-    | BulletTrajectoryUse
-        { _btuBulletTrajectory :: BulletTrajectoryType
+    | BulletModUse
+        { _buMod :: BulletMod
         }
     deriving (Eq, Show, Read) --Generic, Flat)