justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Start restructuring Item datatype

Browse Source
This commit is contained in:
justin
2021-11-27 12:48:23 +00:00
parent fe37f208da
commit bfdac2fad5
16 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Item/Weapon/AmmoParams.hs
+2 -2
View File
@@ -11,8 +11,8 @@ import Geometry
import Control.Lens
useAmmoParams :: Either a (Item -> Creature -> World -> World)
useAmmoParams = Right $ \it -> let b = _wpAmmo it
useAmmoParams :: ItemUse
useAmmoParams = RightUse $ \it -> let b = _wpAmmo it
in withVelWthHiteff (_amBulVel b) (_amBulWth b) (_amBulEff b)
useAmmoParamsVelMod :: Float -> Item -> Creature -> World -> World
src/Dodge/Item/Weapon/BatteryGuns.hs
+3 -3
View File
@@ -44,7 +44,7 @@ teslaGun = defaultGun
, _itUseRate = 0
, _itAimStance = TwoHandFlat
, _itUseTime = 0
, _itUse = Right $ const aTeslaArc
, _itUse = RightUse $ const aTeslaArc
, _itUseModifiers =
[ ammoCheckI
, useTimeCheckI
@@ -77,7 +77,7 @@ lasGun = defaultAutoGun
, _wpReloadState = 0
, _itUseRate = 0
, _itUseTime = 0
, _itUse = Right $ const aLaser
, _itUse = RightUse $ const aLaser
, _itUseModifiers =
[ ammoCheckI
, useTimeCheckI
@@ -117,7 +117,7 @@ tractorGun = defaultAutoGun
, _wpReloadState = 0
, _itUseRate = 0
, _itUseTime = 0
, _itUse = Right aTractorBeam
, _itUse = RightUse aTractorBeam
, _itUseModifiers =
[ ammoUseCheckI
]
src/Dodge/Item/Weapon/Bezier.hs
+1 -1
View File
@@ -23,7 +23,7 @@ import Control.Monad.State
bezierGun :: Item
bezierGun = defaultGun
{ _itName = "B-GUN"
, _itUse = Right $ \_ -> useTargetPos $ \p -> shootBezier $ fromJust p -- <- the start point
, _itUse = RightUse $ \_ -> useTargetPos $ \p -> shootBezier $ fromJust p -- <- the start point
, _itUseModifiers =
[ ammoCheckI
, useTimeCheckI
src/Dodge/Item/Weapon/Booster.hs
+1 -1
View File
@@ -119,7 +119,7 @@ boosterGun = defaultGun
, _wpReloadState = 0
, _itUseRate = 0
, _itUseTime = 0
, _itUse = Left $ boostSelfL 10
, _itUse = LeftUse $ boostSelfL 10
, _wpSpread = 0.05
, _wpRange = 20
, _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ polygon $ map toV2 [(-2,-2),(-2,2),(2,2),(2,0),(0,0),(0,-2)]
src/Dodge/Item/Weapon/Bullet.hs
+3 -3
View File
@@ -8,21 +8,21 @@ import Dodge.WorldEvent.HitEffect
import Dodge.Particle.Bullet.HitEffect
import Geometry.Data
basicBullet :: Ammo
basicBullet :: AmmoType
basicBullet = BulletAmmo
{ _amString = "BULLET"
, _amBulEff = destroyOnImpact bulHitCr bulHitWall
, _amBulWth = 2
, _amBulVel = V2 50 0
}
ltBullet :: Ammo
ltBullet :: AmmoType
ltBullet = BulletAmmo
{ _amString = "LTBULLET"
, _amBulEff = destroyOnImpact bulHitCr bulHitWall
, _amBulWth = 2
, _amBulVel = V2 40 0
}
hvBullet :: Ammo
hvBullet :: AmmoType
hvBullet = BulletAmmo
{ _amString = "HVBULLET"
, _amBulEff = penWalls hvBulHitCr hvBulHitWall
src/Dodge/Item/Weapon/BulletGuns.hs
+1 -1
View File
@@ -217,7 +217,7 @@ miniGun = defaultAutoGun
, _wpMaxWarmUp = 100
, _itUseRate = 0
, _itUseTime = 0
, _itUse = Right $ useAmmoParamsVelMod vm4
, _itUse = RightUse $ useAmmoParamsVelMod vm4
, _itUseModifiers =
[ ammoCheckI
, withWarmUpI crankSlowS
src/Dodge/Item/Weapon/Drone.hs
+1 -1
View File
@@ -28,7 +28,7 @@ lasDrones = defaultGun
, _wpReloadState = 0
, _itUseRate = 20
, _itUseTime = 0
, _itUse = Right aDroneWithItemParams
, _itUse = RightUse aDroneWithItemParams
, _itUseModifiers =
[ ammoCheckI
, useTimeCheckI
src/Dodge/Item/Weapon/Grenade.hs
+5 -5
View File
@@ -34,7 +34,7 @@ grenade = Throwable
, _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ polygon $ map toV2 [(-3,-3),(-3,3),(3,3),(3,-3)]
, _twMaxRange = 150
, _twAccuracy = 30
, _itUse = Right $ \_ -> throwGrenade makeExplosionAt
, _itUse = RightUse $ \_ -> throwGrenade makeExplosionAt
, _itUseModifiers =
[ useTimeCheckI
]
@@ -227,7 +227,7 @@ remoteBomb = defaultThrowable
[(-3,-3),(-3,3),(3,3),(3,-3)]
, _twMaxRange = 150
, _twAccuracy = 30
, _itUse = Right $ const throwRemoteBomb
, _itUse = RightUse $ const throwRemoteBomb
, _itUseModifiers =
[ hammerCheckI
]
@@ -260,7 +260,7 @@ throwRemoteBomb cr w = setLocation
resetName = set (creatures . ix cid . crInv . ix j . itName) "REMOTE"
removePict = set (creatures . ix cid . crInv . ix j . itEquipPict) $ \ _ _ -> emptyBlank
resetFire = set (creatures . ix cid . crInv . ix j . itUse)
$ Right $ \_ -> explodeRemoteBomb itid i
$ RightUse $ \_ -> explodeRemoteBomb itid i
p' = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr) 0)
p | circOnSomeWall p' 4 w = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr-4) 0)
| otherwise = p'
@@ -277,7 +277,7 @@ explodeRemoteBomb :: Int -> Int -> Creature -> World -> World
explodeRemoteBomb itid pjid cr w
= set (props . ix pjid . pjUpdate) (\_ -> retireRemoteBomb itid 30 pjid)
-- $ set (props . ix pjid . pjDraw) (\_ -> blank)
$ set (creatures . ix cid . crInv . ix j . itUse) (Right $ \_ -> const id)
$ set (creatures . ix cid . crInv . ix j . itUse) (RightUse $ \_ -> const id)
$ resetName
$ resetPict
-- $ resetScope
@@ -305,7 +305,7 @@ retireRemoteBomb itid 0 pjid w = w
& pointToItem (_itemPositions w IM.! itid) %~
( (itAttachment . scopePos .~ V2 0 0)
. (itZoom .~ defaultItZoom)
. (itUse .~ (Right $ const throwRemoteBomb))
. (itUse .~ (RightUse $ const throwRemoteBomb))
)
& props %~ IM.delete pjid
retireRemoteBomb itid t pjid w = setScope w
src/Dodge/Item/Weapon/Launcher.hs
+5 -5
View File
@@ -43,7 +43,7 @@ launcher = defaultGun
, _wpReloadState = 0
, _itUseRate = 20
, _itUseTime = 0
, _itUse = Right aRocketWithItemParams
, _itUse = RightUse aRocketWithItemParams
, _itUseModifiers =
[ ammoCheckI
, useTimeCheckI
@@ -244,7 +244,7 @@ remoteLauncher = defaultGun
, _wpReloadState = 0
, _itUseRate = 10
, _itUseTime = 0
, _itUse = Right $ const fireRemoteLauncher
, _itUse = RightUse $ const fireRemoteLauncher
, _itUseModifiers =
[ ammoCheckI
, hammerCheckI
@@ -287,7 +287,7 @@ fireRemoteLauncher cr w = setLocation
newitid = IM.newKey $ _itemPositions w
maybeitid = cr ^? crInv . ix j . itID . _Just
resetFire = set (creatures . ix cid . crInv . ix j . itUse)
$ Right $ \_ _ -> explodeRemoteRocket itid i
$ RightUse $ \_ _ -> explodeRemoteRocket itid i
resetName = set (creatures . ix cid . crInv . ix j . itName) "REMOTEROCKET"
setLocation :: World -> World
setLocation w' = case maybeitid of
@@ -347,7 +347,7 @@ explodeRemoteRocket
explodeRemoteRocket itid pjid w
= set (props . ix pjid . pjUpdate) (\_ -> retireRemoteRocket itid 30 pjid)
$ set (props . ix pjid . prDraw) (const mempty)
$ set (itPoint . itUse) (Right $ \_ _ -> id)
$ set (itPoint . itUse) (RightUse $ \_ _ -> id)
$ resetName
$ makeExplosionAt (_pjPos (_props w IM.! pjid)) w
where
@@ -379,7 +379,7 @@ remoteShellPic t
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) (Right $ const fireRemoteLauncher)
$ set (pointToItem (_itemPositions w IM.! itid) . itUse) (RightUse $ const fireRemoteLauncher)
(w & props %~ IM.delete pjid)
retireRemoteRocket itid t pjid w = setScope w
& props . ix pjid . pjUpdate .~ (\_ -> retireRemoteRocket itid (t-1) pjid)
src/Dodge/Item/Weapon/Radar.hs
+2 -2
View File
@@ -26,7 +26,7 @@ radar = defaultGun
, _wpReloadState = 0
, _itUseRate = 120
, _itUseTime = 0
, _itUse = Right $ const aRadarPulse
, _itUse = RightUse $ const aRadarPulse
, _itUseModifiers =
[ ammoUseCheckI
]
@@ -51,7 +51,7 @@ sonar = defaultGun
, _wpReloadState = 0
, _itUseRate = 120
, _itUseTime = 0
, _itUse = Right $ const aSonarPulse
, _itUse = RightUse $ const aSonarPulse
, _itUseModifiers =
[ ammoUseCheckI
]
src/Dodge/Item/Weapon/Spawn.hs
+1 -1
View File
@@ -21,7 +21,7 @@ spawnGun cr = defaultGun
, _wpReloadTime = 80
, _wpReloadState = 0
, _itUseRate = 100
, _itUse = Right $ \_ -> spawnCrNextTo cr
, _itUse = RightUse $ \_ -> spawnCrNextTo cr
, _itUseModifiers =
[ ammoCheckI
, hammerCheckI
src/Dodge/Item/Weapon/SprayGuns.hs
+2 -2
View File
@@ -40,7 +40,7 @@ poisonSprayer = defaultAutoGun
, _wpReloadState = 0
, _itUseRate = 0
, _itUseTime = 0
, _itUse = Right $ const aGasCloud
, _itUse = RightUse $ const aGasCloud
, _itUseModifiers =
[ ammoCheckI
, useTimeCheckI
@@ -66,7 +66,7 @@ flamer = defaultAutoGun
, _wpReloadState = 0
, _itUseRate = 0
, _itUseTime = 0
, _itUse = Right $ \_ -> randWalkAngle 0.2 0.01 aFlame
, _itUse = RightUse $ \_ -> randWalkAngle 0.2 0.01 aFlame
, _itUseModifiers =
[ ammoUseCheckI
, withSidePushI 5
src/Dodge/Item/Weapon/Utility.hs
+5 -5
View File
@@ -23,7 +23,7 @@ rewindGun = defaultGun
, _wpMaxAmmo = 0
, _wpLoadedAmmo = 0
, _itEffect = ItRewindEffect rewindEffect []
, _itUse = Left $ \cr invid -> useRewindGun (_crInv cr IM.! invid) cr
, _itUse = LeftUse $ \cr invid -> useRewindGun (_crInv cr IM.! invid) cr
}
rewindEffect :: ItEffect -> Creature -> Int -> World -> World
rewindEffect _ cr invid w
@@ -59,7 +59,7 @@ shrinkGun = defaultGun
, _itUseRate = 0
, _itUseTime = 0
, _itAimStance = TwoHandFlat
, _itUse = Left $ \cr invid -> useShrinkGun (_crInv cr IM.! invid) cr
, _itUse = LeftUse $ \cr invid -> useShrinkGun (_crInv cr IM.! invid) cr
, _itUseModifiers =
[ ammoCheckI
, hammerCheckI
@@ -96,7 +96,7 @@ blinkGun = defaultGun
, _wpReloadState = 0
, _itUseRate = 0
, _itUseTime = 0
, _itUse = Left $ hammerCheckL $ shootL aSelfL
, _itUse = LeftUse $ hammerCheckL $ shootL aSelfL
, _itUseModifiers =
[ ammoCheckI
, hammerCheckI
@@ -118,12 +118,12 @@ aSelfL cr _ = blinkAction cr
effectGun :: String -> (Creature -> World -> World) -> Item
effectGun name eff = defaultGun
{ _itName = name ++ "Gun"
, _itUse = Right $ const eff
, _itUse = RightUse $ const eff
}
autoEffectGun :: String -> (Creature -> World -> World) -> Item
autoEffectGun name eff = defaultAutoGun
{ _itName = name ++ "Gun"
, _itUse = Right $ const eff
, _itUse = RightUse $ const eff
}
forceFieldGun :: Item
forceFieldGun = defaultGun