Cleanup

src/Dodge/HeldUse.hs

@@ -299,8 +299,8 @@ useLoadedAmmo itmtree cr (cme, w) (mzid, Just (mz, x, magtree)) = (,) (cme & cme
         MuzzleLaser -> shootLaser itmtree cr mz w
         MuzzleTesla -> shootTeslaArc itm cr mz w
         MuzzleTractor -> shootTractorBeam cr w
-        MuzzleRLauncher -> createProjectileR magtree mz itmtree cr w
-        MuzzleGLauncher -> createProjectile Grenade magtree mz itmtree cr w
+        MuzzleRLauncher -> createProjectileR itmtree magtree mz cr w
+        MuzzleGLauncher -> createProjectile Grenade magtree mz cr w
         MuzzleNozzle{} -> useGasParams mid mz itm cr $ walkNozzle mzid mz itm cr w
         MuzzleShatter -> shootShatter itm cr w
         MuzzleDetector -> itemDetectorEffect itm cr w
@@ -608,17 +608,17 @@ determineProjectileTracking magtree itmtree = fromMaybe NoHoming $
 
 createProjectileR ::
     LabelDoubleTree ComposeLinkType Item ->
-    Muzzle ->
     LabelDoubleTree ComposeLinkType Item ->
+    Muzzle ->
     Creature ->
     World ->
     World
-createProjectileR magtree muz itmtree =
+createProjectileR itmtree magtree =
     createProjectile 
         (Rocket 
             (determineProjectileTracking magtree itmtree)
             smoke
-        ) magtree muz itmtree
+        ) magtree
   where
     smoke 
         | isJust $ lookup SmokeReducerLink (magtree ^. ldtLeft) = Just ReducedRocketSmoke
@@ -628,23 +628,20 @@ createProjectile ::
     ProjectileType ->
     LabelDoubleTree ComposeLinkType Item ->
     Muzzle ->
-    LabelDoubleTree ComposeLinkType Item ->
     Creature ->
     World ->
     World
-createProjectile pjtype magtree muz itmtree cr = fromMaybe failsound $ do
+createProjectile pjtype magtree muz cr = fromMaybe failsound $ do
     magid <- magtree ^? ldtValue . itLocation . ilInvID
     ammoitem <- cr ^? crInv . ix magid
-    let homing = determineProjectileTracking magtree itmtree
-        rdetonate = (^. ldtValue . itID) <$>
+    let rdetonate = (^. ldtValue . itID) <$>
             lookup RemoteDetonatorLink (magtree ^. ldtLeft)
         rscreen = (^. ldtValue . itID) <$>
             lookup RemoteScreenLink (magtree ^. ldtLeft)
     aparams <- ((magtree ^? ldtLeft) >>= lookup AmmoPayloadLink >>= (^? ldtValue . itType . ibtAttach . shellPayload))
         <|> ammoitem ^? itConsumables . magParams . ampPayload
     return $
-        --createShell homing rdetonate rscreen issmokeless pjtype aparams muz cr
-        createShell homing rdetonate rscreen pjtype aparams muz cr
+        createShell rdetonate rscreen pjtype aparams muz cr
             . startthesound
   where
     -- the sound should be moved to the projectile firing