Implement remote screen for launcher projectiles

src/Dodge/HeldUse.hs

@@ -44,10 +44,9 @@ import Sound.Data
 heldEffect :: HeldMod -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
 heldEffect effecttype = case effecttype of
     PistolMod -> bulGunEffect
-    FireRemoteShellMod -> undefined
+--    FireRemoteShellMod -> undefined
     ExplodeRemoteShellMod -> undefined
     DoNothingMod -> const $ const id
-  where
 
 bulGunEffect :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
 bulGunEffect = hammerCheck $ useTimeCheck bulGunEffect'
@@ -131,7 +130,8 @@ applyTorqueCME itm cr w
 
 -- (Muzzle,Int,Int) = (muzzle, amountloaded, id of mag taken from)
 loadMuzzle :: LabelDoubleTree ComposeLinkType Item 
-    -> Muzzle -> (LabelDoubleTree ComposeLinkType Item,Maybe (Muzzle, Int,LabelDoubleTree ComposeLinkType Item))
+    -> Muzzle 
+    -> (LabelDoubleTree ComposeLinkType Item,Maybe (Muzzle, Int,LabelDoubleTree ComposeLinkType Item))
 loadMuzzle t@(LDT _ l _) mz = fromMaybe (t,Nothing) $ do
     let as = _mzAmmoSlot mz
         amamount = 1
@@ -313,7 +313,7 @@ useHeld hu = case hu of
 --    HeldOverNozzlesUseGasParams -> overNozzles useGasParams
 --    HeldPJCreation -> usePjCreation
 --    HeldPJCreationX _ -> usePjCreationX
-    HeldFireRemoteShell -> fireRemoteShell
+--    HeldFireRemoteShell -> fireRemoteShell
     HeldDetectorEffect dt -> detectorEffect dt . _ldtValue
 --    HeldTeslaArc -> shootTeslaArc . _ldtValue
 --    HeldLaser -> shootLaser . _ldtValue
@@ -322,7 +322,7 @@ useHeld hu = case hu of
 --    HeldTractor -> aTractorBeam . _ldtValue
     --    HeldSonicWave -> aSonicWave
     HeldForceField -> useForceFieldGun . _ldtValue
-    HeldShatter -> shootShatter . _ldtValue
+--    HeldShatter -> shootShatter . _ldtValue
     HeldExplodeRemoteShell itid pjid -> const $ const $ explodeRemoteRocket itid pjid
 
 --usePjCreation :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
@@ -402,18 +402,18 @@ useGasParams mmagid mz itm cr w =
     pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm)
     (a,g') = randomR (-inacc,inacc) g
     inacc = _mzInaccuracy mz
-    dir = _crDir cr + _mzRot mz + a + (_nzCurrentWalkAngle $ _mzEffect mz)
+    dir = _crDir cr + _mzRot mz + a + _nzCurrentWalkAngle (_mzEffect mz)
 
 gasCreate :: GasFuel -> GasCreate -> GasCreate
-gasCreate = flip const
+gasCreate = const id
 
 
 doGenFloat :: RandomGen g => GenFloat -> g -> (Float, g)
 doGenFloat (ConstFloat x) g = (x,g)
 doGenFloat (UniRandFloat x y) g = randomR (x,y) g
 
-fireRemoteShell :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
-fireRemoteShell = undefined
+--fireRemoteShell :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
+--fireRemoteShell = undefined
 --fireRemoteShell :: [Item] -> Item -> Creature -> World -> World
 --fireRemoteShell ams it cr w =
 --    set
@@ -497,24 +497,28 @@ useForceFieldGun itm cr w = fromMaybe w $ do
   where
     i = fromMaybe (IM.newKey (_walls (_lWorld (_cWorld w)))) $ itm ^? itParams . paramMID . _Just
 
-createProjectile :: LabelDoubleTree ComposeLinkType Item -> Muzzle -> Item -> Creature -> World -> World
-createProjectile mmagtree muz itm cr = fromMaybe failsound $ do
-    magid <- mmagtree ^? ldtValue . itLocation . ilInvID
+createProjectile 
+    :: LabelDoubleTree ComposeLinkType Item 
+    -> Muzzle -> Item -> Creature -> World -> World
+createProjectile magtree muz itm cr = fromMaybe failsound $ do
+    magid <- magtree ^? ldtValue . itLocation . ilInvID
     ammoitem <- cr ^? crInv . ix magid
---    let mremotescreen = magtree ^. 
+    let mscreen = lookup RemoteScreenLink (magtree ^. ldtLeft)
 --    matype <- ammoitem ^? itUse . amagType
 --    guard $ matype == ProjectileAmmo
     j <- ammoitem ^? itLocation . ilInvID
-    pt <- ammoitem ^? itUse . amagParams . ampPjCreation
-    return $ case pt of
-        CreateShell -> fireShell ammoitem muz itm cr . extrafuncs j
-        CreateTrackingShell -> fireTrackingShell ammoitem muz itm cr . extrafuncs j
+--    pt <- ammoitem ^? itUse . amagParams . ampPjCreation
+    return $ case mscreen of
+        Nothing -> fireShell ammoitem muz itm cr . extrafuncs j
+        Just stree -> fireTrackingShell 
+                (stree ^. ldtValue . itID)
+                (stree ^?! ldtValue . itLocation . ilInvID) ammoitem muz itm cr 
+            . extrafuncs j
   where
     --extrafuncs j = cancelanyreloading . startthesound . useammo j
     extrafuncs j = startthesound . useammo j
     useammo j = cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix j . itUse . amagLoadStatus . iaLoaded -~ 1
     
-    --cancelanyreloading = cWorld . lWorld . creatures . ix (_crID cr) %~ crCancelReloading
     -- the sound should be moved to the projectile firing
     startthesound = soundMultiFrom [CrWeaponSound (_crID cr) j | j <- [0..3]] (_crPos cr) tap4S Nothing 
     failsound w' = case w' ^? input . mouseButtons . ix SDL.ButtonLeft of