Tweak weapon pictures

2021-10-03 13:19:53 +01:00
parent 8c1496e140
commit 0c6fa80ce0
18 changed files with 358 additions and 287 deletions
@@ -49,5 +49,11 @@ withDelayedVelWthHiteff vfact vel width hiteff cr = over particles (newbul : )

 loadedAmmo :: Item -> Int
 loadedAmmo it
-    | _wpReloadState it == 0 = fromIntegral $ _wpLoadedAmmo it
+    | _wpReloadState it == 0 = _wpLoadedAmmo it
    | otherwise = 0
+
+fractionLoadedAmmo :: Item -> Float
+fractionLoadedAmmo it = fromIntegral (loadedAmmo it) / fromIntegral (_wpMaxAmmo it)
+
+fractionLoadedAmmo2 :: Item -> Float
+fractionLoadedAmmo2 it = 1 - (1 - fromIntegral (loadedAmmo it) / fromIntegral (_wpMaxAmmo it))**2
@@ -6,6 +6,7 @@ import Dodge.Default.Weapon
 import Dodge.Item.Data
 import Dodge.Item.Draw
 import Dodge.Item.Weapon.Targeting
+import Dodge.Item.Weapon.AutoGun
 import Dodge.Item.Weapon.TriggerType
 import Dodge.Item.Weapon.ExtraEffect
 import Dodge.Item.Attachment.Data
@@ -15,10 +16,10 @@ import Dodge.Particle.Bullet.HitEffect
 import Dodge.WorldEvent.HitEffect
 import Dodge.RandomHelp
 import Dodge.SoundLogic.LoadSound
-import Picture
+--import Picture
 import Geometry
 import ShapePicture
-import Shape
+--import Shape

 import Data.Maybe
 import Control.Lens
@@ -35,8 +36,8 @@ bezierGun = defaultGun
        . withRecoilI 40
        . torqueBefore 0.05
        ]
-    , _itFloorPict = \it -> bezierGunSPic
-    , _itEquipPict = pictureWeaponOnAim $ \it -> bezierGunSPic
+    , _itFloorPict = bezierGunSPic
+    , _itEquipPict = pictureWeaponOnAim bezierGunSPic
    , _itAttachment = NoItAttachment
    , _itScroll   = \_ _ -> removeItTarget
    , _itHammer = HammerUp
@@ -47,11 +48,8 @@ bezierGun = defaultGun
    , _itUseRate = 6
    , _itAimStance = TwoHandTwist
    }
-bezierGunSPic :: SPic
-bezierGunSPic = 
-    ( colorSH red $ upperPrismPoly 5 $ rectNESW 4 12 (-4) (-12)
-    , mempty
-    )
+bezierGunSPic :: Item -> SPic
+bezierGunSPic = autoGunPic

 shootBezier :: Point2 -> Creature -> World -> World
 shootBezier targetp cr w = w & particles %~ (theBullet :)
@@ -97,5 +97,5 @@ throwArmReset x = ItInvEffect {_itInvEffect = f ,_itEffectCounter = x }
    counterDown it 
        | _itEffectCounter (_itEffect it) == 0 = it 
            & itHammer .~ HammerUp 
-            & itEquipPict .~ pictureWeaponOnAim (\itp -> grenadePic 50)
+            & itEquipPict .~ pictureWeaponOnAim (\_ -> grenadePic 50)
        | otherwise = it & itEffect . itEffectCounter -~ 1
@@ -7,8 +7,10 @@ import Dodge.Default.Shell
 import Dodge.SoundLogic.LoadSound
 import Dodge.WorldEvent.Explosion
 import Dodge.Item.Data
+import Dodge.Item.Attachment.Data
 import Dodge.Item.Draw
 import Dodge.Item.Weapon.Shell
+import Dodge.Item.Weapon.Remote
 import Dodge.Item.Weapon.TriggerType
 import Dodge.Base
 import Dodge.Zone
@@ -16,6 +18,7 @@ import Dodge.SoundLogic
 import Dodge.WorldEvent.SpawnParticle
 import Dodge.WorldEvent.Cloud
 import Dodge.RandomHelp
+import Dodge.Picture.Layer
 import Geometry
 import Geometry.Vector3D
 import Picture
@@ -24,6 +27,8 @@ import Padding
 import ShapePicture
 import Shape

+import qualified Data.Set as S
+import qualified SDL
 import Data.Maybe
 import Control.Lens
 import Control.Applicative
@@ -49,10 +54,10 @@ launcher = defaultGun
        ]
    , _wpSpread = 0.02
    , _wpRange = 20
-    , _itFloorPict = \it -> launcherPic
+    , _itFloorPict = launcherPic
    , _itAimingSpeed = 0.2
    , _itAimingRange = 0.5
-    , _itEquipPict = pictureWeaponOnAim $ \it -> launcherPic
+    , _itEquipPict = pictureWeaponOnAim launcherPic
    , _itHammer = NoHammer
    , _itEffect = NoItEffect
    , _wpAmmo = defaultShellAmmo 
@@ -64,9 +69,11 @@ launcher = defaultGun
    , _itAimStance = TwoHandTwist
    }

-launcherPic :: SPic
-launcherPic = 
-    ( colorSH cyan $ upperPrismPoly 7 $ rectNESW 5 10 (-5) (-10)
+launcherPic :: Item -> SPic
+launcherPic _ = 
+    ( colorSH cyan $ prismPoly
+        (map (+.+.+ V3 10 0 4.5) $ polyCircx 4 5)
+        (map (+.+.+ V3 (-10) 0 4.5) $ polyCircx 4 5)
    , mempty
    )

@@ -228,3 +235,169 @@ trySpinByCID cid i pj w = w & props . ix pjid . pjSpin .~ newSpin
        Just cr -> negate $ min 0.2 $ max (-0.2) $ normalizeAnglePi (dir - _crDir cr) / spinFactor
        _ -> 0
    spinFactor = 5 * (6 - fromIntegral i)
+
+
+remoteLauncher :: Item
+remoteLauncher = defaultGun 
+    { _itName = "ROCKO-REM"
+    , _itIdentity = RemoteLauncher
+    , _wpMaxAmmo = 1
+    , _wpLoadedAmmo = 1
+    , _wpReloadTime = 80
+    , _wpReloadState = 0
+    , _itUseRate = 10
+    , _itUseTime = 0
+    , _itUse =  const fireRemoteLauncher
+    , _itUseModifiers =
+        [ ammoCheckI
+        , hammerCheckI
+        ]
+    , _wpSpread = 0.02
+    , _wpRange = 20
+    , _itFloorPict = launcherPic
+    , _itAimingSpeed = 0.2
+    , _itAimingRange = 0.5
+    , _itEquipPict = pictureWeaponOnAim launcherPic
+    , _itAttachment = ItScope (V2 0 0) 0 1 True
+    , _itAimStance = TwoHandTwist
+    }
+
+fireRemoteLauncher :: Creature -> World -> World
+fireRemoteLauncher cr w = setLocation 
+    $ resetFire 
+    $ resetName 
+    $ soundStart (CrWeaponSound cid 0) pos tap4S Nothing
+    $ over props addRemRocket w
+  where
+    i = IM.newKey $ _props w
+    cid = _crID cr
+    dir = _crDir cr
+    pos = _crPos cr +.+ rotateV dir (V2 (_crRad cr + 1) 0)
+    addRemRocket = IM.insert i $ Shell 
+        { _pjPos = pos
+        , _pjZ   = 20
+        , _pjStartPos = pos
+        , _pjVel = rotateV dir (V2 1 0)
+        , _prDraw = remoteShellDraw
+        , _pjID = i
+        , _pjUpdate = \pj -> decTimMvVel pj . setRemoteScope itid pj . moveRemoteShell cid itid pj
+        , _pjAcc = V2 0 0
+        , _pjDir = dir
+        , _pjSpin = 0
+        , _pjPayload = makeExplosionAt
+        , _pjTimer = 50
+        }
+    j = _crInvSel cr
+    newitid = IM.newKey $ _itemPositions w
+    maybeitid = cr ^? crInv . ix j . itID . _Just
+    resetFire = set (creatures . ix cid . crInv . ix j . itUse) 
+        $ \_ _ -> explodeRemoteRocket itid i
+    resetName = set (creatures . ix cid . crInv . ix j . itName) "REMOTEROCKET"
+    setLocation :: World -> World
+    setLocation w' = case maybeitid of
+        Nothing -> w' & creatures . ix cid . crInv . ix j . itID ?~ newitid
+                      & itemPositions %~ IM.insert newitid (InInv cid j)
+        _ -> w'
+    itid = fromMaybe newitid maybeitid
+
+moveRemoteShell :: Int -> Int -> Prop -> World -> World
+moveRemoteShell cid itid pj w 
+    | time > 40 = if circOnSomeWall oldPos 4 w
+        then doExplosion w
+        else w
+    | time >= 20 = case thingHit of
+        Just _  -> doExplosion w
+        Nothing -> w & props . ix i . pjDir .~ newdir
+    | time > -99 = case thingHit of
+        Just _  -> doExplosion $ stopSoundFrom (ShellSound i) w
+        Nothing -> w & set randGen g
+            & props . ix i %~ 
+                ( ( pjVel %~ ( (accel +.+) . (frict *.*) ) )
+                . ( pjDir .~ newdir )
+                )
+            & soundContinue (ShellSound i) newPos missileLaunchS (Just 1)
+            & smokeGen
+            & makeFlameletTimed oldPos 20 (0.5 *.* rotateV (pi+sparkD) accel) Nothing 3 10
+    | time > -200 = case thingHit of
+        Just _  -> doExplosion $ stopSoundFrom (ShellSound i) w
+        Nothing -> w
+    | otherwise = doExplosion $ stopSoundFrom (ShellSound i) w
+  where 
+    time = _pjTimer pj
+    i = _pjID pj
+    oldPos = _pjPos pj
+    vel    = _pjVel pj
+    newPos = oldPos +.+ vel
+    newdir 
+        | SDL.ButtonRight `S.member` _mouseButtons w
+            && w ^? creatures . ix cid . crInvSel == w ^? itemPositions . ix itid . itInvId
+                  = _cameraRot w + argV (_mousePos w)
+        | otherwise = _pjDir pj
+    accel    = rotateV newdir (V2 2 0)
+    (frict,g)  = randomR (0.6,0.9) $ _randGen w
+    (sparkD,_) = randomR (-0.5,0.5) $ _randGen w
+    hitCr    = fst <$> collideCircCrsPoint oldPos newPos 4 w
+    hitWl    = fst <$> collideCircWalls oldPos newPos 2 (wallsNearPoint newPos w)
+    thingHit = hitCr <|> hitWl
+    r1 = _randGen w & evalState (randInCirc 10)
+    smokeGen = shellTrailCloud $ addZ 20 $ oldPos +.+ r1 +.+ 30 *.* normalizeV (oldPos -.- newPos)
+    doExplosion = explodeRemoteRocket itid i
+
+explodeRemoteRocket 
+    :: Int  -- ^ Item id
+    -> Int  -- ^ Projectile id
+    -> World 
+    -> World
+explodeRemoteRocket itid pjid w
+    = set (props . ix pjid . pjUpdate) (\_ -> retireRemoteRocket itid 30 pjid)
+    $ set (props . ix pjid . prDraw) (const mempty)
+    $ set (itPoint . itUse) (\_ _ -> id)
+    $ resetName
+    $ makeExplosionAt (_pjPos (_props w IM.! pjid)) w
+  where 
+    resetName = set (itPoint . itName) "REMOTELAUNCHER"
+    itPoint = pointToItem $ _itemPositions w IM.! itid
+
+remoteShellDraw :: Prop -> SPic
+remoteShellDraw pj
+    | t > 40 = (,) mempty $ onLayerL [levLayer CrLayer - 2] 
+                        $ uncurryV translate pos $ rotate dir $ remoteShellPic t
+    | otherwise = (,) mempty $ uncurryV translate pos $ rotate dir $ remoteShellPic t
+  where
+    t = _pjTimer pj
+    pos = _pjPos pj
+    dir = _pjDir pj
+
+remoteShellPic 
+    :: Int -- ^ Timer
+    -> Picture
+remoteShellPic t 
+    | rem (t+200) 20 < 9 = setDepth 20 $ polygon $ map toV2 [(-6,4),(-6,-4),(6,-4),(8,0),(6,4)]
+    | otherwise = pictures 
+        [ setDepth 20 $ polygon $ map toV2 [(-6,4),(-6,-4),(6,-4),(8,0),(6,4)]
+        , setLayer 1 . setDepth 20.5 . color col $ circleSolid 3
+        ]
+  where 
+    col | t > (-99) = green
+        | otherwise  = red
+retireRemoteRocket :: Int -> Int -> Int -> World -> World
+retireRemoteRocket itid 0 pjid w = 
+    set (pointToItem (_itemPositions w IM.! itid) . itAttachment . scopePos) (V2 0 0)
+    $ set (pointToItem (_itemPositions w IM.! itid) . itUse) (const fireRemoteLauncher)
+    (w & props %~ IM.delete pjid)
+retireRemoteRocket itid t pjid w = setScope w 
+    & props . ix pjid . pjUpdate .~ (\_ -> retireRemoteRocket itid (t-1) pjid)
+  where
+    setScope w' = case _itemPositions w' IM.! itid of
+        InInv cid invid -> w' 
+            & creatures . ix cid . crInv . ix invid . itAttachment 
+                    . scopePos .~ (pos -.- _crPos (_creatures w' IM.! cid))
+        _   -> w'
+    pos = fromMaybe (V2 0 0) $ w ^? props . ix pjid . pjPos
+
+setRemoteScope :: Int -> Prop -> World -> World
+setRemoteScope itid pj w' = case w' ^? itemPositions . ix itid of
+    Just (InInv cid' invid )
+        -> w' & creatures . ix cid' . crInv . ix invid . itAttachment 
+                . scopePos .~ (_pjPos pj -.- _crPos (_creatures w' IM.! cid'))
+    _   -> w'
@@ -0,0 +1,10 @@
+module Dodge.Item.Weapon.Remote
+    where
+import Dodge.Data
+
+import Control.Lens
+
+pointToItem :: Applicative f =>
+                     ItemPos -> (Item -> f Item) -> World -> f World
+pointToItem (InInv cid invid) = creatures . ix cid . crInv . ix invid
+pointToItem (OnFloor flid) = floorItems . ix flid . flIt