Cleanup damages further

2022-03-25 11:37:16 +00:00
parent af6cdfd048
commit cb9bdf9c55
8 changed files with 100 additions and 68 deletions
@@ -2,7 +2,6 @@
 module Dodge.Combine.Combinations where
 import Geometry
 import Dodge.Data
-import Dodge.WorldEvent.HitEffect
 import Dodge.WorldEvent.SpawnParticle
 import Dodge.Particle.Bullet.HitEffect
 import Dodge.Item.Equipment
@@ -115,8 +114,9 @@ moduleCombinations =
        )
    ,   ( ModBullet
        ,   bulletWeapons
-        ,   [amod [INCENDIARYMODULE] "+INCENDIARY" (f $ bulletDestroySpawn incBall)
-            ,amod [BOUNCEMODULE]     "+BOUNCE"     (f $ destroyOnImpact bulBounceArmCr bulBounceWall)
+--        ,   [amod [INCENDIARYMODULE] "+INCENDIARY" (f $ bulletDestroySpawn incBall)
+        ,   [amod [INCENDIARYMODULE] "+INCENDIARY" (f $ bulletDestroyDamage $ spawnBulDams incBall')
+            ,amod [BOUNCEMODULE]     "+BOUNCE"     (f $ bulletDestroyDamage bounceBulDams)
            ,amod [STATICMODULE]     "+STATIC"     (f $ bulletDestroySpawn aStaticBall)
            ,amod [CONCUSSMODULE]    "+CONCUSS"    (f $ bulletDestroySpawn concBall)
            ]