Fix aiming with no weapon crash

2022-02-08 12:47:58 +00:00
parent 9ead5b3979
commit 0a860e6f68
39 changed files with 317 additions and 244 deletions
@@ -23,10 +23,10 @@ createBarrelSpark pos dir maycid time colid = instantParticles .:~ BulletPt
    , _btDrag = 0.9
    , _ptColor = numColor colid
    , _ptTrail = [pos]
-    , _btPassThrough' = maycid
-    , _btWidth' = 1
-    , _btTimer' = time
-    , _btHitEffect' = destroyOnImpact sparkEff noEff
+    , _ptCrIgnore = maycid
+    , _ptWidth = 1
+    , _ptTimer = time
+    , _ptHitEff = destroyOnImpact sparkEff noEff
    }
  where 
    sparkEff bt p cr = creatures . ix (_crID cr) . crState . crDamage .:~ SparkDam 1 sp p ep
@@ -49,10 +49,10 @@ colSparkRandDir randDir time col pos baseDir w = w
        , _ptVel = rotateV dir (V2 5 0)
        , _ptColor = col
        , _ptTrail = [pos]
-        , _btPassThrough' = Nothing
-        , _btWidth' = 1
-        , _btTimer' = time
-        , _btHitEffect' = destroyOnImpact sparkEff noEff
+        , _ptCrIgnore = Nothing
+        , _ptWidth = 1
+        , _ptTimer = time
+        , _ptHitEff = destroyOnImpact sparkEff noEff
        }
    sparkEff bt p cr = creatures . ix (_crID cr) . crState . crDamage .:~ SparkDam 1 sp p ep
      where