Remove ptCrIgnore

src/Dodge/Item/Display.hs

@@ -16,13 +16,19 @@ import Data.Sequence
 itemString :: Item -> String
 itemString = head . itemDisplay
 
+itemBaseName :: Item -> String
+itemBaseName it = case  _iyBase $ _itType it of
+    CRAFT str -> show str
+    HELD str  -> show str
+    x -> show x
+
 itemDisplayWithNumber :: String -> Item -> [String]
 itemDisplayWithNumber numberstr it = Prelude.take (itSlotsTaken it) $
     (midPadL 15 ' ' thename (' ' : numberstr) ++ theparam)
     : catMaybes [maybeWarmupStatus it,maybeRateStatus it]
     ++ moduleStrings it ++ repeat "*"
   where 
-    thename  = show . _iyBase $ _itType it
+    thename  = itemBaseName it
     theparam = fromMaybe []
         . listToMaybe 
         $ mapMaybe ($ it) 

src/Dodge/Item/Weapon/AmmoParams.hs

@@ -40,15 +40,13 @@ useAmmoParams vfact it cr w = w & instantParticles .:~ aBulAt
     vfact 
     thetraj                     -- extra update
     Nothing                     -- color (default)
-    (Just cid)                  -- pass through creature
     sp
     (rotateV dir (muzvel *.* _amBulVel bultype))           -- vel
     (_rifling $ _itParams it)   -- drag
     (_amBulEff bultype) 
     (_amBulWth bultype) 
   where
-    sp = _crPos cr +.+ muzlength *.* unitVectorAtAngle dir
-    cid = _crID cr
+    sp = _crPos cr +.+ (muzlength + 10) *.* unitVectorAtAngle dir
     dir = _crDir cr
     bultype = _laAmmoType $ _itConsumption it
     muzvel = _muzVel $ _itParams it

src/Dodge/Item/Weapon/Launcher.hs

@@ -157,7 +157,7 @@ doThrust pj w = w
     & randGen .~ g
     & props . ix i . pjVel    %~ (\v -> accel +.+ frict *.* v)
     & soundContinue (ShellSound i) newPos missileLaunchS (Just 1)
-    & makeFlamelet (oldPos -.- vel) 0 (vel +.+ rotateV (pi+sparkD) accel) Nothing 3 10
+    & makeFlamelet (oldPos -.- vel) 0 (vel +.+ rotateV (pi+sparkD) accel) 3 10
     & shellTrailCloud (addZ 20 (oldPos +.+ r1 +.+ 30 *.* normalizeV (oldPos -.- newPos)))
   where
     accel = _pjAcc pj
@@ -302,7 +302,7 @@ moveRemoteShell cid itid pj w
                 )
             & soundContinue (ShellSound i) newPos missileLaunchS (Just 1)
             & smokeGen
-            & makeFlamelet oldPos 20 (0.5 *.* rotateV (pi+sparkD) accel) Nothing 3 10
+            & makeFlamelet oldPos 20 (0.5 *.* rotateV (pi+sparkD) accel) 3 10
     | time > -200 = w
     | otherwise = doExplosion
   where