Split bullet spawning and bouncing/penetration

2022-07-19 15:33:49 +01:00
parent 8ee4d2e0f2
commit 3031f2478c
12 changed files with 32 additions and 25 deletions
@@ -100,9 +100,7 @@ defaultWeapon = defaultItem
    & itUse .~ defaultrUse
    & itInvColor .~ white
    & itType . iyModules .~ M.fromList 
-        [(ModBullet, EMPTYMODULE)
-        ,(ModTarget, EMPTYMODULE)
-        ,(ModBulletTrajectory, EMPTYMODULE)
+        [(ModTarget, EMPTYMODULE)
        ,(ModTeleport, EMPTYMODULE)
        ]

@@ -110,6 +108,9 @@ defaultBulletWeapon :: Item
 defaultBulletWeapon = defaultWeapon 
    & itConsumption .~ defaultBulletLoadable 
    & itUse . rUse .~ useAmmoParams
+    & itType . iyModules . at ModBullet ?~ EMPTYMODULE
+    & itType . iyModules . at ModBulletSpawn ?~ EMPTYMODULE
+    & itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE

 defaultItemValue :: ItemValue
 defaultItemValue = ItemValue 10 MundaneItem