Work on bullet module system

src/Dodge/Item/Craftable.hs

@@ -1,9 +1,13 @@
 module Dodge.Item.Craftable where
 import Dodge.Data
 import Dodge.Default.Weapon
+--import Dodge.Particle.Bullet.HitEffect
+--import Dodge.WorldEvent.HitEffect
+import Color
 --import Dodge.Picture.Layer
 --import Picture
 --import Geometry
+import Control.Lens
 
 makeTypeCraftNum :: Int -> CombineType -> Item
 makeTypeCraftNum i ct = defaultCraftable
@@ -16,6 +20,16 @@ makeTypeCraftNum i ct = defaultCraftable
 
 makeTypeCraft :: CombineType -> Item
 makeTypeCraft = makeTypeCraftNum 1
+
+incendiaryModule :: Item
+incendiaryModule = makeTypeCraft INCENDIARYMODULE
+    & itInvSize .~ 1
+    & itInvColor .~ chartreuse
+bounceModule :: Item
+bounceModule = makeTypeCraft BOUNCEMODULE
+    & itInvSize .~ 1
+    & itInvColor .~ chartreuse
+
 pipe :: Item
 pipe = makeTypeCraft PIPE
 

src/Dodge/Item/Weapon/BulletGun/Cane.hs

@@ -9,8 +9,8 @@ module Dodge.Item.Weapon.BulletGun.Cane
     , fastBurstRifle
     , miniGunX
     ) where
-import Dodge.Particle.Bullet.HitEffect
-import Dodge.WorldEvent.HitEffect
+--import Dodge.Particle.Bullet.HitEffect
+--import Dodge.WorldEvent.HitEffect
 import Dodge.Item.Weapon.BulletGun.Clip
 import Dodge.Data
 --import Dodge.ChainEffect
@@ -42,8 +42,6 @@ import Data.Maybe
 bangCane :: Item
 bangCane = defaultGun
     { _itName = "BANGCANE"
-    , _itModules = ItemModules
-        { _modHitEffect = ItemModule (destroyOnImpact bulIncCr bulIncWall) ["+INCENDIARY"] 1}
     , _itType = BANGCANE
     ,_itParams = BulletShooter
         { _muzVel = 0.8
@@ -147,6 +145,8 @@ rifle = bangCane
         , _dimSPic = \it -> noPic $ baseRifleShape
             <> makeSingleClipAt (V3 5 0 3) it
         }
+    , _itModules = ItemModules
+        { _modHitEffect = DefaultModule }
     }
     & itUse . useAim . aimStance .~ TwoHandTwist
     & itName .~ "RIFLE"