Continue weapon refactor, gas combinations
This commit is contained in:
+61
-14
@@ -1,31 +1,78 @@
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(493,66)-(498,55): warning: [-Wincomplete-patterns]
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(45,25)-(323,30): warning: [-Wincomplete-patterns]
|
||||
Pattern match(es) are non-exhaustive
|
||||
In a case alternative:
|
||||
Patterns not matched:
|
||||
MuzzleFlame
|
||||
MuzzleGas
|
||||
FlameSpitterMod
|
||||
FlameSpitterRepeatMod
|
||||
|
|
||||
45 | heldEffect effecttype = case effecttype of
|
||||
| ^^^^^^^^^^^^^^^^^^...
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:503:1-10: warning: [-Wmissing-signatures]
|
||||
Top-level binding with no type signature:
|
||||
walkNozzle :: Muzzle -> p1 -> p2 -> World -> World
|
||||
|
|
||||
493 | removeAmmoFromMag x mid cr . makeMuzzleFlare mz itm cr $ case _mzEffect mz of
|
||||
| ^^^^^^^^^^^^^^^^^^^^...
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:539:1-17: warning: [-Wmissing-signatures]
|
||||
503 | walkNozzle mz itm cr w = w
|
||||
| ^^^^^^^^^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:503:15-17: warning: [-Wunused-matches]
|
||||
Defined but not used: ‘itm’
|
||||
|
|
||||
503 | walkNozzle mz itm cr w = w
|
||||
| ^^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:503:19-20: warning: [-Wunused-matches]
|
||||
Defined but not used: ‘cr’
|
||||
|
|
||||
503 | walkNozzle mz itm cr w = w
|
||||
| ^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:507:6-15: warning: [-Wunused-local-binds]
|
||||
Defined but not used: ‘walkamount’
|
||||
|
|
||||
507 | (walkamount, g) = randomR (- aspeed, aspeed) (_randGen w)
|
||||
| ^^^^^^^^^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:509:5-8: warning: [-Wunused-local-binds]
|
||||
Defined but not used: ‘maxa’
|
||||
|
|
||||
509 | maxa = _nzMaxWalkAngle nz
|
||||
| ^^^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:510:5-6: warning: [-Wunused-local-binds]
|
||||
Defined but not used: ‘wa’
|
||||
|
|
||||
510 | wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount)
|
||||
| ^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:552:1-17: warning: [-Wmissing-signatures]
|
||||
Top-level binding with no type signature:
|
||||
removeAmmoFromMag :: Int -> Maybe Int -> Creature -> World -> World
|
||||
|
|
||||
539 | removeAmmoFromMag x mid cr = fromMaybe id $ do
|
||||
552 | removeAmmoFromMag x mid cr = fromMaybe id $ do
|
||||
| ^^^^^^^^^^^^^^^^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:552:5-7: warning: [-Wunused-local-binds]
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:565:5-7: warning: [-Wunused-local-binds]
|
||||
Defined but not used: ‘cid’
|
||||
|
|
||||
552 | cid = _crID cr
|
||||
565 | cid = _crID cr
|
||||
| ^^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(595,13)-(817,9): warning: [-Wincomplete-patterns]
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(608,13)-(830,9): warning: [-Wincomplete-patterns]
|
||||
Pattern match(es) are non-exhaustive
|
||||
In a case alternative: Patterns not matched: TractorMod
|
||||
In a case alternative:
|
||||
Patterns not matched:
|
||||
FlameSpitterMod
|
||||
FlameSpitterRepeatMod
|
||||
|
|
||||
595 | useMod hm = case hm of
|
||||
608 | useMod hm = case hm of
|
||||
| ^^^^^^^^^^...
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:1083:21-22: warning: [-Wunused-matches]
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(936,14)-(952,85): warning: [-Wincomplete-patterns]
|
||||
Pattern match(es) are non-exhaustive
|
||||
In a case alternative:
|
||||
Patterns not matched: HeldOverNozzlesUseGasParams
|
||||
|
|
||||
936 | useHeld hu = case hu of
|
||||
| ^^^^^^^^^^...
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:1045:1-10: warning: [-Wmissing-signatures]
|
||||
Top-level binding with no type signature:
|
||||
doGenFloat :: RandomGen g => GenFloat -> g -> (Float, g)
|
||||
|
|
||||
1045 | doGenFloat (ConstFloat x) g = (x,g)
|
||||
| ^^^^^^^^^^
|
||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:1106:21-22: warning: [-Wunused-matches]
|
||||
Defined but not used: ‘mz’
|
||||
|
|
||||
1083 | shootTeslaArc it cr mz w =
|
||||
1106 | shootTeslaArc it cr mz w =
|
||||
| ^^
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -269,9 +269,12 @@ testInventory =
|
||||
stackedInventory :: [Item]
|
||||
stackedInventory =
|
||||
[ burstRifle
|
||||
, poisonSprayer
|
||||
, chemFuelPouch
|
||||
, megaTinMag
|
||||
, teslaGun
|
||||
, lasGun
|
||||
, tractorGun
|
||||
, megaBattery
|
||||
, bulletSynthesizer
|
||||
, drumMag
|
||||
@@ -299,7 +302,6 @@ stackedInventory =
|
||||
, spawnGun (lamp 5)
|
||||
, lasGun
|
||||
, lasWide 20
|
||||
, flameThrower
|
||||
, poisonSprayer
|
||||
, bulletBeltPack
|
||||
, bulletBeltBracer
|
||||
|
||||
@@ -10,7 +10,7 @@ import Data.Aeson.TH
|
||||
|
||||
data GenFloat = ConstFloat {_gfConstant :: Float}
|
||||
| UniRandFloat {_gfMin :: Float, _gfMax :: Float}
|
||||
deriving (Eq, Show, Read) --Generic, Flat)
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
makeLenses ''GenFloat
|
||||
deriveJSON defaultOptions ''GenFloat
|
||||
|
||||
@@ -113,6 +113,7 @@ data AmmoMagType
|
||||
| BELTMAG
|
||||
| SHELLMAG
|
||||
| BATTERY
|
||||
| CHEMFUELPOUCH
|
||||
deriving (Eq, Ord, Show, Read)
|
||||
|
||||
|
||||
|
||||
@@ -66,17 +66,18 @@ data Luse
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data HeldMod
|
||||
= PoisonSprayerMod
|
||||
= PistolMod
|
||||
-- | PoisonSprayerMod
|
||||
| FlameSpitterMod
|
||||
| FlameSpitterRepeatMod
|
||||
| FlameThrowerMod
|
||||
| LauncherMod
|
||||
-- | FlameThrowerMod
|
||||
-- | LauncherMod
|
||||
-- | TeslaMod
|
||||
-- | CircleLaserMod
|
||||
| LasWideMod Int
|
||||
| DualBeamMod
|
||||
| LasMod
|
||||
| LauncherXMod Int
|
||||
-- | LasMod
|
||||
-- | LauncherXMod Int
|
||||
| ShatterMod
|
||||
-- | AmmoCheckMod
|
||||
-- | AmmoUseCheckMod
|
||||
@@ -91,7 +92,6 @@ data HeldMod
|
||||
-- | MachineGunMod
|
||||
-- | ModWithDirectedTeleport HeldMod
|
||||
-- | BangStickMod
|
||||
| PistolMod
|
||||
-- | AutoPistolMod
|
||||
-- | MachinePistolMod
|
||||
-- | BurstRifleMod
|
||||
@@ -99,7 +99,7 @@ data HeldMod
|
||||
-- | MiniGunMod Int
|
||||
-- | SmgMod
|
||||
-- | BangConeMod
|
||||
| TractorMod --apply with AmmoCheckMod
|
||||
-- | TractorMod --apply with AmmoCheckMod
|
||||
| FireRemoteShellMod
|
||||
| ExplodeRemoteShellMod
|
||||
| DoNothingMod
|
||||
|
||||
@@ -44,7 +44,6 @@ data ItemParams
|
||||
, _dbGap :: Float
|
||||
}
|
||||
| Attracting {_attractionPower :: Point2}
|
||||
| Sprayer {_sprayNozzles :: [Nozzle]}
|
||||
| AngleWalk
|
||||
{ _maxWalkAngle :: Float
|
||||
, _currentWalkAngle :: Float
|
||||
@@ -79,13 +78,6 @@ data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data Nozzle = Nozzle
|
||||
{ _nzPressure :: Float
|
||||
, _nzDir :: Float
|
||||
, _nzMaxWalkAngle :: Float
|
||||
, _nzCurrentWalkAngle :: Float
|
||||
, _nzWalkSpeed :: Float
|
||||
, _nzLength :: Float
|
||||
}
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
makeLenses ''ItemParams
|
||||
|
||||
@@ -74,9 +74,19 @@ data TriggerType = AutoTrigger
|
||||
data HeldParams
|
||||
= DefaultHeldParams
|
||||
| GasSprayParams
|
||||
{_gasCreation :: GasCreate}
|
||||
{_gasCreation :: GasCreate
|
||||
, _recoil :: Float
|
||||
, _torqueAfter :: Float
|
||||
, _randomOffset :: Float
|
||||
, _sidePush :: Float
|
||||
, _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel
|
||||
-- if >0, continue playing sound for
|
||||
-- given time
|
||||
, _weaponInvLock :: Int
|
||||
, _weaponRepeat :: [Int]
|
||||
}
|
||||
| BeamShooterParams
|
||||
{ _bulGunSound :: (SoundID, Int) -- if the int is 0, play sound on new channel
|
||||
{ _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel
|
||||
-- TODO remove duplicate
|
||||
}
|
||||
| BulletShooterParams
|
||||
@@ -86,7 +96,7 @@ data HeldParams
|
||||
, _torqueAfter :: Float
|
||||
, _randomOffset :: Float
|
||||
, _sidePush :: Float
|
||||
, _bulGunSound :: (SoundID, Int) -- if the int is 0, play sound on new channel
|
||||
, _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel
|
||||
-- if >0, continue playing sound for
|
||||
-- given time
|
||||
, _weaponInvLock :: Int
|
||||
@@ -106,7 +116,7 @@ data AmmoParams = BulletParams {_ampBullet :: Bullet}
|
||||
, _ampPjDraw :: ProjectileDraw
|
||||
, _ampPjCreation :: ProjectileCreate
|
||||
}
|
||||
| GasParams {_ampCreateGas :: GasCreate}
|
||||
| GasParams {_ampCreateGas :: GasFuel}
|
||||
deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
data ScrollAttachParams
|
||||
@@ -147,8 +157,12 @@ data MuzzleEffect
|
||||
| MuzzleTesla
|
||||
| MuzzleTractor
|
||||
| MuzzleLauncher
|
||||
| MuzzleFlame
|
||||
| MuzzleGas
|
||||
| MuzzleNozzle
|
||||
{ _nzPressure :: GenFloat
|
||||
, _nzMaxWalkAngle :: Float
|
||||
, _nzCurrentWalkAngle :: Float
|
||||
, _nzWalkSpeed :: Float
|
||||
}
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data Muzzle = Muzzle
|
||||
|
||||
@@ -46,11 +46,15 @@ data AmmoType
|
||||
data ForceFieldType = DefaultForceField
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data GasFuel = ChemFuel
|
||||
deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
|
||||
|
||||
data GasCreate = CreatePoisonGas | CreateFlame
|
||||
deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
|
||||
|
||||
makeLenses ''ProjectileUpdate
|
||||
makeLenses ''AmmoType
|
||||
deriveJSON defaultOptions ''GasFuel
|
||||
deriveJSON defaultOptions ''ProjectileDraw
|
||||
deriveJSON defaultOptions ''ProjectileCreate
|
||||
deriveJSON defaultOptions ''ProjectileUpdate
|
||||
|
||||
@@ -42,7 +42,7 @@ defaultHeldUse =
|
||||
, _torqueAfter = 0.2
|
||||
, _randomOffset = 0
|
||||
, _sidePush = 0
|
||||
, _bulGunSound = (tap3S, 0)
|
||||
, _bulGunSound = Just (tap3S, 0)
|
||||
, _weaponInvLock = 0
|
||||
, _weaponRepeat = []
|
||||
}
|
||||
|
||||
+189
-166
@@ -44,42 +44,42 @@ import Sound.Data
|
||||
heldEffect :: HeldMod -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
|
||||
heldEffect effecttype = case effecttype of
|
||||
-- HeldModNothing -> const $ const id
|
||||
PoisonSprayerMod -> gasEffect
|
||||
[ useAmmoAmount 1
|
||||
, withSoundForI foamSprayLoopS 5
|
||||
, ammoCheckI
|
||||
]
|
||||
FlameSpitterMod -> gasEffect
|
||||
[ withSidePushAfterI 20
|
||||
, withSidePushI 5
|
||||
, useAmmoAmount 1
|
||||
, withRandomItemParams f
|
||||
, repeatOnFrames [1 .. 9] FlameSpitterRepeatMod
|
||||
, lockInvFor 10
|
||||
, useTimeCheck
|
||||
, ammoCheckI
|
||||
]
|
||||
FlameSpitterRepeatMod -> gasEffect
|
||||
[ withSidePushAfterI 20
|
||||
, withSidePushI 5
|
||||
, useAmmoAmount 1
|
||||
, withRandomItemParams f
|
||||
, ammoCheckI
|
||||
]
|
||||
FlameThrowerMod -> gasEffect
|
||||
[ withSidePushAfterI 20
|
||||
, --, withTempLight 1 100 (V3 1 0 0)
|
||||
withSidePushI 5
|
||||
, useAmmoAmount 1
|
||||
, ammoCheckI
|
||||
]
|
||||
LauncherMod -> foldl' (&) usePjCreation
|
||||
--[ useAmmoAmount 1
|
||||
-- , withSoundStart tap4S
|
||||
[ useTimeCheck
|
||||
-- PoisonSprayerMod -> gasEffect
|
||||
-- [ useAmmoAmount 1
|
||||
-- , withSoundForI foamSprayLoopS 5
|
||||
-- , ammoCheckI
|
||||
, blCheck
|
||||
]
|
||||
-- ]
|
||||
-- FlameSpitterMod -> gasEffect
|
||||
-- [ withSidePushAfterI 20
|
||||
-- , withSidePushI 5
|
||||
-- , useAmmoAmount 1
|
||||
-- , withRandomItemParams f
|
||||
-- , repeatOnFrames [1 .. 9] FlameSpitterRepeatMod
|
||||
-- , lockInvFor 10
|
||||
-- , useTimeCheck
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- FlameSpitterRepeatMod -> gasEffect
|
||||
-- [ withSidePushAfterI 20
|
||||
-- , withSidePushI 5
|
||||
-- , useAmmoAmount 1
|
||||
-- , withRandomItemParams f
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- FlameThrowerMod -> gasEffect
|
||||
-- [ withSidePushAfterI 20
|
||||
-- , --, withTempLight 1 100 (V3 1 0 0)
|
||||
-- withSidePushI 5
|
||||
-- , useAmmoAmount 1
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- LauncherMod -> foldl' (&) usePjCreation
|
||||
-- --[ useAmmoAmount 1
|
||||
---- , withSoundStart tap4S
|
||||
-- [ useTimeCheck
|
||||
---- , ammoCheckI
|
||||
-- , blCheck
|
||||
-- ]
|
||||
-- TeslaMod -> foldl' (&) (shootTeslaArc . _ldtValue)
|
||||
-- [ useAmmoAmount 1
|
||||
-- , withSoundForI elecCrackleS 1
|
||||
@@ -107,21 +107,21 @@ heldEffect effecttype = case effecttype of
|
||||
, withItem $ \it -> withCrPosShift (V2 0 (thegapDualBeam it)) $ flareCircleAt (_lasColor $ _itParams it) 0.8
|
||||
, ammoCheckI
|
||||
]
|
||||
LasMod -> foldl' (&) (shootLaser . _ldtValue)
|
||||
[ useAmmoAmount 1
|
||||
, withItem $ \it -> withCrPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
|
||||
, withSoundForI tone440sawtoothquietS 2
|
||||
, withItem $ \it -> withTempLight 1 100 (xyzV4 (_lasColor $ _itParams it))
|
||||
, duplicateLoadedBarrels
|
||||
, ammoCheckI
|
||||
]
|
||||
LauncherXMod _ -> foldl' (&) usePjCreationX
|
||||
--[ useAmmoAmount i
|
||||
--, withSoundStart tap4S
|
||||
[ useTimeCheck
|
||||
--, ammoCheckI
|
||||
, blCheck
|
||||
]
|
||||
-- LasMod -> foldl' (&) (shootLaser . _ldtValue)
|
||||
-- [ useAmmoAmount 1
|
||||
-- , withItem $ \it -> withCrPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
|
||||
-- , withSoundForI tone440sawtoothquietS 2
|
||||
-- , withItem $ \it -> withTempLight 1 100 (xyzV4 (_lasColor $ _itParams it))
|
||||
-- , duplicateLoadedBarrels
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- LauncherXMod _ -> foldl' (&) usePjCreationX
|
||||
-- --[ useAmmoAmount i
|
||||
-- --, withSoundStart tap4S
|
||||
-- [ useTimeCheck
|
||||
-- --, ammoCheckI
|
||||
-- , blCheck
|
||||
-- ]
|
||||
ShatterMod -> foldl' (&) (shootShatter . _ldtValue)
|
||||
[ useAmmoAmount 1
|
||||
, -- , withSoundStart tap3S
|
||||
@@ -315,16 +315,16 @@ heldEffect effecttype = case effecttype of
|
||||
-- , ammoCheckI
|
||||
-- , blCheck
|
||||
-- ]
|
||||
TractorMod -> foldl' (&) (aTractorBeam . _ldtValue) [ammoCheckI]
|
||||
-- TractorMod -> foldl' (&) (aTractorBeam . _ldtValue) [ammoCheckI]
|
||||
FireRemoteShellMod -> undefined
|
||||
ExplodeRemoteShellMod -> undefined
|
||||
DoNothingMod -> const $ const id
|
||||
ForceFieldMod -> undefined
|
||||
DetectorMod _ -> undefined
|
||||
where
|
||||
f = do
|
||||
nzpres <- state $ randomR (3, 4)
|
||||
return $ sprayNozzles . ix 0 . nzPressure .~ nzpres
|
||||
-- f = do
|
||||
-- nzpres <- state $ randomR (3, 4)
|
||||
-- return $ sprayNozzles . ix 0 . nzPressure .~ nzpres
|
||||
increasecycleLasWide n it = case _heldHammer (_itUse it) of
|
||||
HammerUp -> it & itParams . lasCycle .~ 1
|
||||
_ -> it & itParams . lasCycle %~ (min (n * lasWideRate) . (+ 1))
|
||||
@@ -339,17 +339,17 @@ heldEffect effecttype = case effecttype of
|
||||
-- & crPos %~ alongSegBy x (_crOldPos cr)
|
||||
-- & crInv . ix (invid + 1) . itUse . amagParams . ampBullet . buDelayFraction .~ x
|
||||
|
||||
gasEffect :: [(LabelDoubleTree ComposeLinkType Item
|
||||
-> Creature -> World -> World)
|
||||
-> LabelDoubleTree ComposeLinkType Item
|
||||
-> Creature
|
||||
-> World
|
||||
-> World]
|
||||
-> LabelDoubleTree ComposeLinkType Item
|
||||
-> Creature
|
||||
-> World
|
||||
-> World
|
||||
gasEffect = foldl' (&) (overNozzles useGasParams)
|
||||
--gasEffect :: [(LabelDoubleTree ComposeLinkType Item
|
||||
-- -> Creature -> World -> World)
|
||||
-- -> LabelDoubleTree ComposeLinkType Item
|
||||
-- -> Creature
|
||||
-- -> World
|
||||
-- -> World]
|
||||
-- -> LabelDoubleTree ComposeLinkType Item
|
||||
-- -> Creature
|
||||
-- -> World
|
||||
-- -> World
|
||||
--gasEffect = foldl' (&) (overNozzles useGasParams)
|
||||
|
||||
bulGunEffect :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
|
||||
bulGunEffect = hammerCheck $ useTimeCheck bulGunEffect'
|
||||
@@ -392,7 +392,7 @@ applyInvLock itm cr = case itm ^? itUse . heldParams . weaponInvLock of
|
||||
|
||||
applySoundCME :: Item -> Creature -> World -> World
|
||||
applySoundCME itm cr = fromMaybe id $ do
|
||||
(soundid,x) <- itm ^? itUse . heldParams . bulGunSound
|
||||
(soundid,x) <- itm ^? itUse . heldParams . bulGunSound . _Just
|
||||
if x > 0
|
||||
then return $ soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) soundid (Just x)
|
||||
else return $ soundMultiFrom [CrWeaponSound cid j | j <- [0..5]] (_crPos cr) soundid Nothing
|
||||
@@ -455,6 +455,8 @@ makeMuzzleFlare mz itm cr = case mz ^. mzFlareType of
|
||||
. muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
|
||||
HeavySmokeFlare -> basicMuzFlare pos dir
|
||||
LasGunFlare -> flareCircleAt (_lasColor $ _itParams itm) 0.8 (pos `v2z` 20)
|
||||
. (cWorld . lWorld . tempLightSources .:~
|
||||
tlsTimeRadColPos 1 100 (xyzV4 . _lasColor $ _itParams itm) (pos `v2z` 10))
|
||||
TeslaGunFlare -> cWorld . lWorld . tempLightSources .:~
|
||||
tlsTimeRadColPos 1 100 (V3 0 0 1) (pos `v2z` 10)
|
||||
where
|
||||
@@ -496,6 +498,17 @@ useLoadedAmmo itm cr (cme,w) (mz,x,mid) = (,) (cme & cmeSound .~ True) $
|
||||
MuzzleTesla -> shootTeslaArc itm cr mz w
|
||||
MuzzleTractor -> shootTractorBeam itm cr w
|
||||
MuzzleLauncher -> createProjectile' mid mz itm cr w
|
||||
MuzzleNozzle {} -> useGasParams mid mz itm cr $ walkNozzle mz itm cr w
|
||||
|
||||
walkNozzle mz itm cr w = w
|
||||
& randGen .~ g
|
||||
where
|
||||
nz = _mzEffect mz
|
||||
(walkamount, g) = randomR (- aspeed, aspeed) (_randGen w)
|
||||
aspeed = _nzWalkSpeed nz
|
||||
maxa = _nzMaxWalkAngle nz
|
||||
wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount)
|
||||
|
||||
|
||||
shootTractorBeam :: Item -> Creature -> World -> World
|
||||
shootTractorBeam _ cr w = w & cWorld . lWorld . tractorBeams .:~ tractorBeamAt' spos outpos dir power
|
||||
@@ -600,42 +613,42 @@ useMod hm = case hm of
|
||||
ForceFieldMod -> undefined
|
||||
DetectorMod _ -> undefined
|
||||
-- HeldModNothing -> []
|
||||
PoisonSprayerMod ->
|
||||
[ useAmmoAmount 1
|
||||
, withSoundForI foamSprayLoopS 5
|
||||
, ammoCheckI
|
||||
]
|
||||
FlameSpitterMod ->
|
||||
[ withSidePushAfterI 20
|
||||
, withSidePushI 5
|
||||
, useAmmoAmount 1
|
||||
, withRandomItemParams f
|
||||
, repeatOnFrames [1 .. 9] FlameSpitterRepeatMod
|
||||
, lockInvFor 10
|
||||
, useTimeCheck
|
||||
, ammoCheckI
|
||||
]
|
||||
FlameSpitterRepeatMod ->
|
||||
[ withSidePushAfterI 20
|
||||
, withSidePushI 5
|
||||
, useAmmoAmount 1
|
||||
, withRandomItemParams f
|
||||
, ammoCheckI
|
||||
]
|
||||
FlameThrowerMod ->
|
||||
[ withSidePushAfterI 20
|
||||
, --, withTempLight 1 100 (V3 1 0 0)
|
||||
withSidePushI 5
|
||||
, useAmmoAmount 1
|
||||
, ammoCheckI
|
||||
]
|
||||
LauncherMod ->
|
||||
--[ useAmmoAmount 1
|
||||
-- , withSoundStart tap4S
|
||||
[ useTimeCheck
|
||||
-- PoisonSprayerMod ->
|
||||
-- [ useAmmoAmount 1
|
||||
-- , withSoundForI foamSprayLoopS 5
|
||||
-- , ammoCheckI
|
||||
, blCheck
|
||||
]
|
||||
-- ]
|
||||
-- FlameSpitterMod ->
|
||||
-- [ withSidePushAfterI 20
|
||||
-- , withSidePushI 5
|
||||
-- , useAmmoAmount 1
|
||||
-- , withRandomItemParams f
|
||||
-- , repeatOnFrames [1 .. 9] FlameSpitterRepeatMod
|
||||
-- , lockInvFor 10
|
||||
-- , useTimeCheck
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- FlameSpitterRepeatMod ->
|
||||
-- [ withSidePushAfterI 20
|
||||
-- , withSidePushI 5
|
||||
-- , useAmmoAmount 1
|
||||
-- , withRandomItemParams f
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- FlameThrowerMod ->
|
||||
-- [ withSidePushAfterI 20
|
||||
-- , --, withTempLight 1 100 (V3 1 0 0)
|
||||
-- withSidePushI 5
|
||||
-- , useAmmoAmount 1
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- LauncherMod ->
|
||||
-- --[ useAmmoAmount 1
|
||||
---- , withSoundStart tap4S
|
||||
-- [ useTimeCheck
|
||||
---- , ammoCheckI
|
||||
-- , blCheck
|
||||
-- ]
|
||||
-- TeslaMod ->
|
||||
-- [ useAmmoAmount 1
|
||||
-- , withSoundForI elecCrackleS 1
|
||||
@@ -672,21 +685,21 @@ useMod hm = case hm of
|
||||
, withItem $ \it -> withCrPosShift (V2 0 (thegapDualBeam it)) $ flareCircleAt (_lasColor $ _itParams it) 0.8
|
||||
, ammoCheckI
|
||||
]
|
||||
LasMod ->
|
||||
[ useAmmoAmount 1
|
||||
, withItem $ \it -> withCrPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
|
||||
, withSoundForI tone440sawtoothquietS 2
|
||||
, withItem $ \it -> withTempLight 1 100 (xyzV4 (_lasColor $ _itParams it))
|
||||
, duplicateLoadedBarrels
|
||||
, ammoCheckI
|
||||
]
|
||||
LauncherXMod _ ->
|
||||
--[ useAmmoAmount i
|
||||
--, withSoundStart tap4S
|
||||
[ useTimeCheck
|
||||
--, ammoCheckI
|
||||
, blCheck
|
||||
]
|
||||
-- LasMod ->
|
||||
-- [ useAmmoAmount 1
|
||||
-- , withItem $ \it -> withCrPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
|
||||
-- , withSoundForI tone440sawtoothquietS 2
|
||||
-- , withItem $ \it -> withTempLight 1 100 (xyzV4 (_lasColor $ _itParams it))
|
||||
-- , duplicateLoadedBarrels
|
||||
-- , ammoCheckI
|
||||
-- ]
|
||||
-- LauncherXMod _ ->
|
||||
-- --[ useAmmoAmount i
|
||||
-- --, withSoundStart tap4S
|
||||
-- [ useTimeCheck
|
||||
-- --, ammoCheckI
|
||||
-- , blCheck
|
||||
-- ]
|
||||
ShatterMod ->
|
||||
[ useAmmoAmount 1
|
||||
, -- , withSoundStart tap3S
|
||||
@@ -891,9 +904,9 @@ useMod hm = case hm of
|
||||
-- , blCheck
|
||||
-- ]
|
||||
where
|
||||
f = do
|
||||
nzpres <- state $ randomR (3, 4)
|
||||
return $ sprayNozzles . ix 0 . nzPressure .~ nzpres
|
||||
-- f = do
|
||||
-- nzpres <- state $ randomR (3, 4)
|
||||
-- return $ sprayNozzles . ix 0 . nzPressure .~ nzpres
|
||||
--increasecycleLasCircle it = it & itParams . lasCycle %~ (flip mod 2000 . (+ 1))
|
||||
----f it = [it & itParams . lasCycle +~ x | x <- [0,100 .. 1900] ]
|
||||
--fLasCircle it = [it & itParams . lasCycle +~ x | x <- [0, 50 .. 1999]]
|
||||
@@ -923,7 +936,7 @@ useHeld :: Huse -> LabelDoubleTree ComposeLinkType Item -> Creature -> World ->
|
||||
useHeld hu = case hu of
|
||||
HeldDoNothing -> const $ const id
|
||||
-- HeldUseAmmoParams -> shootBullet
|
||||
HeldOverNozzlesUseGasParams -> overNozzles useGasParams
|
||||
-- HeldOverNozzlesUseGasParams -> overNozzles useGasParams
|
||||
HeldPJCreation -> usePjCreation
|
||||
HeldPJCreationX _ -> usePjCreationX
|
||||
HeldFireRemoteShell -> fireRemoteShell
|
||||
@@ -956,45 +969,45 @@ usePjCreationX = undefined
|
||||
-- where
|
||||
-- f (muz,am) = (createProjectile am muz itm cr .)
|
||||
|
||||
overNozzles ::
|
||||
(Nozzle -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World) ->
|
||||
LabelDoubleTree ComposeLinkType Item ->
|
||||
Creature ->
|
||||
World ->
|
||||
World
|
||||
overNozzles = overNozzles' . overNozzle
|
||||
--overNozzles ::
|
||||
-- (Nozzle -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World) ->
|
||||
-- LabelDoubleTree ComposeLinkType Item ->
|
||||
-- Creature ->
|
||||
-- World ->
|
||||
-- World
|
||||
--overNozzles = overNozzles' . overNozzle
|
||||
|
||||
overNozzles' ::
|
||||
(LabelDoubleTree ComposeLinkType Item -> Creature -> World -> Nozzle -> (World, Nozzle)) ->
|
||||
LabelDoubleTree ComposeLinkType Item ->
|
||||
Creature ->
|
||||
World ->
|
||||
World
|
||||
overNozzles' eff itm cr w = neww
|
||||
& cWorld . lWorld . creatures . ix cid . crInv . ix i . itParams . sprayNozzles .~ newNozzles
|
||||
where
|
||||
it = itm ^. ldtValue
|
||||
cid = _crID cr
|
||||
i = w ^?! cWorld . lWorld . creatures . ix cid . crManipulation . manObject . inInventory . ispItem
|
||||
(neww, newNozzles) = mapAccumR (eff itm cr) w $ _sprayNozzles (_itParams it)
|
||||
--overNozzles' ::
|
||||
-- (LabelDoubleTree ComposeLinkType Item -> Creature -> World -> Nozzle -> (World, Nozzle)) ->
|
||||
-- LabelDoubleTree ComposeLinkType Item ->
|
||||
-- Creature ->
|
||||
-- World ->
|
||||
-- World
|
||||
--overNozzles' eff itm cr w = neww
|
||||
-- & cWorld . lWorld . creatures . ix cid . crInv . ix i . itParams . sprayNozzles .~ newNozzles
|
||||
-- where
|
||||
-- it = itm ^. ldtValue
|
||||
-- cid = _crID cr
|
||||
-- i = w ^?! cWorld . lWorld . creatures . ix cid . crManipulation . manObject . inInventory . ispItem
|
||||
-- (neww, newNozzles) = mapAccumR (eff itm cr) w $ _sprayNozzles (_itParams it)
|
||||
|
||||
overNozzle ::
|
||||
(Nozzle -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World) ->
|
||||
LabelDoubleTree ComposeLinkType Item ->
|
||||
Creature ->
|
||||
World ->
|
||||
Nozzle ->
|
||||
(World, Nozzle)
|
||||
overNozzle eff itm cr w nz =
|
||||
( eff nz itm (cr & crDir +~ wa + na) w & randGen .~ g
|
||||
, nz & nzCurrentWalkAngle .~ wa
|
||||
)
|
||||
where
|
||||
na = _nzDir nz
|
||||
(walkamount, g) = randomR (- aspeed, aspeed) (_randGen w)
|
||||
aspeed = _nzWalkSpeed nz
|
||||
maxa = _nzMaxWalkAngle nz
|
||||
wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount)
|
||||
--overNozzle ::
|
||||
-- (Nozzle -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World) ->
|
||||
-- LabelDoubleTree ComposeLinkType Item ->
|
||||
-- Creature ->
|
||||
-- World ->
|
||||
-- Nozzle ->
|
||||
-- (World, Nozzle)
|
||||
--overNozzle eff itm cr w nz =
|
||||
-- ( eff nz itm (cr & crDir +~ wa + na) w & randGen .~ g
|
||||
-- , nz & nzCurrentWalkAngle .~ wa
|
||||
-- )
|
||||
-- where
|
||||
-- na = _nzDir nz
|
||||
-- (walkamount, g) = randomR (- aspeed, aspeed) (_randGen w)
|
||||
-- aspeed = _nzWalkSpeed nz
|
||||
-- maxa = _nzMaxWalkAngle nz
|
||||
-- wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount)
|
||||
|
||||
getAmmoMagazine :: Item -> Creature -> Maybe ItemUse
|
||||
getAmmoMagazine itm cr = do
|
||||
@@ -1005,22 +1018,32 @@ getAmmoMagazine itm cr = do
|
||||
guard $ amtype == magtype
|
||||
return mag
|
||||
|
||||
useGasParams :: Nozzle -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
|
||||
useGasParams nz itm cr =
|
||||
useGasParams :: Maybe Int -> Muzzle -> Item -> Creature -> World -> World
|
||||
useGasParams mmagid mz itm cr w =
|
||||
createGas
|
||||
gastype
|
||||
(_nzPressure nz)
|
||||
pressure
|
||||
pos
|
||||
dir
|
||||
cr
|
||||
w & randGen .~ g'
|
||||
where
|
||||
(pressure,g) = doGenFloat (_nzPressure $ _mzEffect mz) (_randGen w)
|
||||
gastype = fromMaybe (error "cannot find gas ammo") $ do
|
||||
atype <- itm ^? ldtValue . itUse . heldAmmoTypes . ix 0
|
||||
leftitms <- itm ^? ldtLeft
|
||||
mag <- lookup (AmmoInLink 0 atype) leftitms
|
||||
mag ^? ldtValue . itUse . amagParams . ampCreateGas
|
||||
dir = _crDir cr
|
||||
pos = _crPos cr +.+ (_nzLength nz *.* unitVectorAtAngle (_crDir cr))
|
||||
magid <- mmagid
|
||||
fueltype <- cr ^? crInv . ix magid . itUse . amagParams . ampCreateGas
|
||||
gc <- itm ^? itUse . heldParams . gasCreation
|
||||
return $ gasCreate fueltype gc
|
||||
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
|
||||
|
||||
gasCreate :: GasFuel -> GasCreate -> GasCreate
|
||||
gasCreate = flip const
|
||||
|
||||
doGenFloat (ConstFloat x) g = (x,g)
|
||||
doGenFloat (UniRandFloat x y) g = randomR (x,y) g
|
||||
|
||||
fireRemoteShell :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
|
||||
fireRemoteShell = undefined
|
||||
|
||||
@@ -34,6 +34,7 @@ itemFromAmmoMag at = case at of
|
||||
BELTMAG -> beltMag
|
||||
SHELLMAG -> shellMag
|
||||
BATTERY -> battery
|
||||
CHEMFUELPOUCH -> chemFuelPouch
|
||||
|
||||
itemFromAttachType :: AttachType -> Item
|
||||
itemFromAttachType at = case at of
|
||||
|
||||
@@ -87,6 +87,20 @@ battery =
|
||||
}
|
||||
}
|
||||
|
||||
chemFuelPouch :: Item
|
||||
chemFuelPouch =
|
||||
defaultHeldItem & itType . iyBase .~ AMMOMAG CHEMFUELPOUCH
|
||||
& itUse
|
||||
.~ AmmoMagUse
|
||||
{ _amagParams = GasParams ChemFuel
|
||||
, _amagType = GasAmmo
|
||||
, _amagLoadStatus =
|
||||
ReloadStatus
|
||||
{ _iaMax = 1000
|
||||
, _iaLoaded = 1000
|
||||
}
|
||||
}
|
||||
|
||||
bulletSynthesizer :: Item
|
||||
bulletSynthesizer = defaultHeldItem
|
||||
& itType . iyBase .~ ATTACH BULLETSYNTHESIZER
|
||||
|
||||
@@ -22,7 +22,7 @@ sparkGun =
|
||||
teslaGun :: Item
|
||||
teslaGun =
|
||||
defaultBatteryGun
|
||||
& itUse . heldParams .~ BeamShooterParams (elecCrackleS,2)
|
||||
& itUse . heldParams .~ BeamShooterParams (Just (elecCrackleS,2))
|
||||
& itDimension . dimRad .~ 9
|
||||
& itDimension . dimCenter .~ V3 4 0 0
|
||||
& itParams .~ teslaParams
|
||||
@@ -42,7 +42,7 @@ lasGun =
|
||||
defaultHeldItem
|
||||
& itType . iyModules .~ batteryModules
|
||||
& itUse . heldMods .~ PistolMod
|
||||
& itUse . heldParams .~ BeamShooterParams (tone440sawtoothquietS,2)
|
||||
& itUse . heldParams .~ BeamShooterParams (Just (tone440sawtoothquietS,2))
|
||||
& itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
|
||||
& itUse . heldDelay .~ NoDelay
|
||||
& itUse . heldTriggerType .~ AutoTrigger
|
||||
@@ -88,7 +88,7 @@ tractorGun =
|
||||
-- & itUse . heldUse .~ HeldTractor --aTractorBeam
|
||||
& itUse . heldDelay .~ NoDelay
|
||||
-- & itUse . heldMods .~ AmmoCheckMod
|
||||
& itUse . heldMods .~ TractorMod
|
||||
-- & itUse . heldMods .~ TractorMod
|
||||
& itUse . heldAim . aimWeight .~ 6
|
||||
& itUse . heldAim . aimRange .~ 1
|
||||
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0 0 DefaultFlareType MuzzleTractor]
|
||||
|
||||
@@ -94,7 +94,7 @@ miniGunX i =
|
||||
& itUse . heldAim . aimRange .~ 1
|
||||
& itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
|
||||
& itUse . heldAmmoTypes .~ singleAmmo BeltBulletAmmo
|
||||
& itUse . heldParams . bulGunSound .~ (mini1S,2)
|
||||
& itUse . heldParams . bulGunSound ?~ (mini1S,2)
|
||||
& itUse . heldAim . aimTurnSpeed .~ 0.5
|
||||
& itUse . heldAim . aimMuzzles
|
||||
.~ replicate i (Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet)
|
||||
|
||||
@@ -23,7 +23,7 @@ bangCone =
|
||||
& itUse . heldParams . recoil .~ 150
|
||||
& itUse . heldParams . torqueAfter .~ 0.1
|
||||
& itUse . heldParams . randomOffset .~ 12
|
||||
& itUse . heldParams . bulGunSound .~ (bangEchoS,0)
|
||||
& itUse . heldParams . bulGunSound ?~ (bangEchoS,0)
|
||||
& itType . iyBase .~ HELD BANGCONE
|
||||
|
||||
blunderbuss :: Item
|
||||
|
||||
@@ -42,7 +42,7 @@ launcher =
|
||||
& itUse . heldParams . rifling .~ ConstFloat 0
|
||||
& itUse . heldParams . recoil .~ 0
|
||||
& itUse . heldParams . torqueAfter .~ 0
|
||||
& itUse . heldParams . bulGunSound .~ (tap4S, 0)
|
||||
& itUse . heldParams . bulGunSound ?~ (tap4S, 0)
|
||||
|
||||
launcherX :: Int -> Item
|
||||
launcherX i =
|
||||
|
||||
@@ -21,7 +21,7 @@ bangRod =
|
||||
& itUse . heldParams . rifling .~ ConstFloat 1
|
||||
& itUse . heldParams . recoil .~ 50
|
||||
& itUse . heldParams . torqueAfter .~ 0.3
|
||||
& itUse . heldParams . bulGunSound .~ (bangEchoS,0)
|
||||
& itUse . heldParams . bulGunSound ?~ (bangEchoS,0)
|
||||
& itUse . heldDelay . rateMax .~ 12
|
||||
& itDimension . dimRad .~ 12
|
||||
& itDimension . dimCenter .~ V3 5 0 0
|
||||
|
||||
@@ -7,6 +7,7 @@ module Dodge.Item.Held.SprayGuns (
|
||||
flameWall,
|
||||
) where
|
||||
|
||||
import Dodge.SoundLogic.ExternallyGeneratedSounds
|
||||
import Dodge.Data.Item
|
||||
import Dodge.Default.Item
|
||||
--import Dodge.Reloading.Action
|
||||
@@ -18,14 +19,19 @@ poisonSprayer =
|
||||
flameThrower
|
||||
& itType . iyBase .~ HELD POISONSPRAYER
|
||||
& itUse . heldAmmoTypes .~ singleAmmo GasAmmo
|
||||
& itUse . heldParams .~ GasSprayParams CreatePoisonGas --aGasCloud
|
||||
& itUse . heldMods .~ PoisonSprayerMod
|
||||
-- & itUse . heldMods .~ PoisonSprayerMod
|
||||
& itUse . heldParams . gasCreation .~ CreatePoisonGas --aGasCloud
|
||||
& itUse . heldParams . recoil .~ 0
|
||||
& itUse . heldParams . torqueAfter .~ 0
|
||||
& itUse . heldParams . randomOffset .~ 0
|
||||
& itUse . heldParams . sidePush .~ 0
|
||||
& itUse . heldParams . bulGunSound ?~ (foamSprayLoopS,5)
|
||||
|
||||
flameSpitter :: Item
|
||||
flameSpitter =
|
||||
flameThrower
|
||||
& itType . iyBase .~ HELD FLAMESPITTER
|
||||
& itParams . sprayNozzles . ix 0 . nzPressure .~ 4
|
||||
-- & itParams . sprayNozzles . ix 0 . nzPressure .~ 4
|
||||
& itUse . heldAim . aimStance .~ OneHand
|
||||
& itUse . heldDelay .~ FixedRate{_rateMax = 12, _rateTime = 0}
|
||||
& itUse . heldMods .~ FlameSpitterMod
|
||||
@@ -35,11 +41,11 @@ flameTorrent =
|
||||
flameThrower
|
||||
& itType . iyBase .~ HELD FLAMETORRENT
|
||||
& itUse . heldAim . aimZoom .~ defaultItZoom
|
||||
& itParams . sprayNozzles . ix 0
|
||||
%~ ( (nzPressure .~ 10)
|
||||
. (nzMaxWalkAngle .~ 1.5)
|
||||
. (nzWalkSpeed .~ 0.05)
|
||||
)
|
||||
-- & itParams . sprayNozzles . ix 0
|
||||
-- %~ ( (nzPressure .~ 10)
|
||||
-- . (nzMaxWalkAngle .~ 1.5)
|
||||
-- . (nzWalkSpeed .~ 0.05)
|
||||
-- )
|
||||
|
||||
blowTorch :: Item
|
||||
blowTorch =
|
||||
@@ -50,45 +56,49 @@ flameWall :: Item
|
||||
flameWall =
|
||||
flameThrower
|
||||
& itType . iyBase .~ HELD FLAMEWALL
|
||||
& itParams . sprayNozzles .~ zipWith makeNozzle [0, 0.6, -0.6] [2, 2.5, 2.5]
|
||||
where
|
||||
makeNozzle dir pres =
|
||||
Nozzle
|
||||
{ _nzPressure = pres
|
||||
, _nzDir = dir
|
||||
, _nzMaxWalkAngle = 0
|
||||
, _nzWalkSpeed = 0
|
||||
, _nzCurrentWalkAngle = 0
|
||||
, _nzLength = 20
|
||||
}
|
||||
-- & itParams . sprayNozzles .~ zipWith makeNozzle [0, 0.6, -0.6] [2, 2.5, 2.5]
|
||||
-- where
|
||||
-- makeNozzle dir pres =
|
||||
-- Nozzle
|
||||
-- { _nzPressure = pres
|
||||
-- , _nzDir = dir
|
||||
-- , _nzMaxWalkAngle = 0
|
||||
-- , _nzWalkSpeed = 0
|
||||
-- , _nzCurrentWalkAngle = 0
|
||||
-- , _nzLength = 20
|
||||
-- }
|
||||
|
||||
flameThrower :: Item
|
||||
flameThrower =
|
||||
defaultHeldItem
|
||||
{ _itParams =
|
||||
Sprayer
|
||||
{ _sprayNozzles =
|
||||
[ Nozzle
|
||||
{ _nzPressure = 4
|
||||
, _nzDir = 0
|
||||
, _nzMaxWalkAngle = 0.2
|
||||
, _nzWalkSpeed = 0.01
|
||||
, _nzCurrentWalkAngle = 0
|
||||
, _nzLength = 10
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
& itParams .~ NoParams
|
||||
& itDimension . dimRad .~ 7
|
||||
& itDimension . dimCenter .~ V3 9 0 0
|
||||
-- & itUse . heldUse .~ HeldOverNozzlesUseGasParams -- overNozzles useGasParams
|
||||
& itUse . heldDelay .~ NoDelay
|
||||
& itUse . heldMods .~ FlameThrowerMod
|
||||
-- & itUse . heldMods .~ FlameThrowerMod
|
||||
& itUse . heldMods .~ PistolMod
|
||||
& itUse . heldAim . aimWeight .~ 5
|
||||
& itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5}
|
||||
& itUse . heldAim . aimStance .~ TwoHandUnder
|
||||
-- & itUse . heldAim . aimHandlePos .~ 0
|
||||
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0 0 DefaultFlareType MuzzleFlame]
|
||||
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0 0 DefaultFlareType
|
||||
MuzzleNozzle
|
||||
{ _nzPressure = ConstFloat 4
|
||||
, _nzMaxWalkAngle = 0.2
|
||||
, _nzWalkSpeed = 0.01
|
||||
, _nzCurrentWalkAngle = 0
|
||||
}
|
||||
]
|
||||
& itUse . heldAmmoTypes .~ singleAmmo GasAmmo
|
||||
& itType . iyBase .~ HELD FLAMETHROWER
|
||||
& itUse . heldParams .~ GasSprayParams CreateFlame --aGasCloud
|
||||
& itUse . heldParams .~ GasSprayParams
|
||||
{_gasCreation = CreateFlame
|
||||
, _recoil = 0
|
||||
, _torqueAfter = 0
|
||||
, _randomOffset = 0
|
||||
, _sidePush = 25
|
||||
, _bulGunSound = Nothing
|
||||
, _weaponInvLock = 0
|
||||
, _weaponRepeat = mempty
|
||||
}
|
||||
& itUse . heldTriggerType .~ AutoTrigger
|
||||
|
||||
@@ -55,7 +55,7 @@ autoPistol =
|
||||
pistol
|
||||
& itUse . heldMods .~ PistolMod
|
||||
& itUse . heldTriggerType .~ AutoTrigger
|
||||
& itUse . heldParams . bulGunSound .~ (tap1S,0)
|
||||
& itUse . heldParams . bulGunSound ?~ (tap1S,0)
|
||||
& itType . iyBase .~ HELD AUTOPISTOL
|
||||
& itType . iyModules . at ModAutoMag ?~ EMPTYMODULE
|
||||
|
||||
|
||||
@@ -54,11 +54,11 @@ AddGoal src/Dodge/Data/ActionPlan.hs 45;" C
|
||||
AddTile src/Dodge/Room/AddTile.hs 1;" m
|
||||
AesonHelp src/AesonHelp.hs 1;" m
|
||||
AimAt src/Dodge/Data/ActionPlan.hs 84;" C
|
||||
AimParams src/Dodge/Data/Item/Use.hs 125;" t
|
||||
AimParams src/Dodge/Data/Item/Use.hs 135;" t
|
||||
AimParams src/Dodge/Default/AimParams.hs 1;" m
|
||||
AimParams src/Dodge/Default/Item/Held/AimParams.hs 1;" m
|
||||
AimParams src/Dodge/Default/Item/Use/AimParams.hs 1;" m
|
||||
AimStance src/Dodge/Data/Item/Use.hs 173;" t
|
||||
AimStance src/Dodge/Data/Item/Use.hs 189;" t
|
||||
Aiming src/Dodge/Creature/Stance/Data.hs 42;" C
|
||||
Aiming src/Dodge/Data/Creature/Stance.hs 39;" C
|
||||
AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C
|
||||
@@ -78,7 +78,7 @@ AmmoMagType src/Dodge/Data/Item/Combine.hs 109;" t
|
||||
AmmoMagUse src/Dodge/Data/Item/Use.hs 63;" C
|
||||
AmmoModLink src/Dodge/Data/ComposedItem.hs 15;" C
|
||||
AmmoModifierCI src/Dodge/Data/ComposedItem.hs 20;" C
|
||||
AmmoParams src/Dodge/Data/Item/Use.hs 103;" t
|
||||
AmmoParams src/Dodge/Data/Item/Use.hs 113;" t
|
||||
AmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 1;" m
|
||||
AmmoPosition src/Dodge/Item/AmmoPosition.hs 8;" t
|
||||
AmmoPosition src/Dodge/Item/AmmoPosition.hs 2;" m
|
||||
@@ -126,7 +126,7 @@ AttachInt src/Dodge/Item/Attachment/Data.hs 16;" C
|
||||
AttachMInt src/Dodge/Data/Item/Attachment.hs 15;" C
|
||||
AttachMInt src/Dodge/Item/Attachment/Data.hs 17;" C
|
||||
AttachMode src/Dodge/Item/Attachment/Data.hs 13;" C
|
||||
AttachParams src/Dodge/Data/Item/Use.hs 97;" t
|
||||
AttachParams src/Dodge/Data/Item/Use.hs 107;" t
|
||||
AttachTargetPos src/Dodge/Data/Item/Attachment.hs 13;" C
|
||||
AttachTargetPos src/Dodge/Item/Attachment/Data.hs 15;" C
|
||||
AttachType src/Dodge/Data/Item/Combine.hs 97;" t
|
||||
@@ -222,7 +222,7 @@ BeamCombine src/Dodge/Data/Beam.hs 47;" C
|
||||
BeamCombineType src/Dodge/Data/Beam.hs 38;" t
|
||||
BeamDraw src/Dodge/Data/Beam.hs 33;" t
|
||||
BeamDrawColor src/Dodge/Data/Beam.hs 35;" C
|
||||
BeamShooterParams src/Dodge/Data/Item/Use.hs 78;" C
|
||||
BeamShooterParams src/Dodge/Data/Item/Use.hs 88;" C
|
||||
BeamSimple src/Dodge/Data/Beam.hs 50;" C
|
||||
BeamType src/Dodge/Data/Beam.hs 46;" t
|
||||
BecomePowerful src/Dodge/Data/Scenario.hs 9;" C
|
||||
@@ -304,8 +304,8 @@ BulletClipAttachment src/Dodge/Data/Item.hs 51;" C
|
||||
BulletEffect src/Dodge/Data/Bullet.hs 36;" t
|
||||
BulletGun src/Dodge/Item/Held/BulletGun.hs 1;" m
|
||||
BulletGuns src/Dodge/Item/Weapon/BulletGuns.hs 1;" m
|
||||
BulletParams src/Dodge/Data/Item/Use.hs 103;" C
|
||||
BulletShooterParams src/Dodge/Data/Item/Use.hs 82;" C
|
||||
BulletParams src/Dodge/Data/Item/Use.hs 113;" C
|
||||
BulletShooterParams src/Dodge/Data/Item/Use.hs 92;" C
|
||||
BulletSpawn src/Dodge/Data/Bullet.hs 42;" t
|
||||
BulletTrajectory src/Dodge/Data/Bullet.hs 50;" t
|
||||
BulletTrajectoryType src/Dodge/Data/Bullet.hs 57;" t
|
||||
@@ -379,7 +379,7 @@ ChainEffect src/Dodge/ChainEffect.hs 1;" m
|
||||
ChainUpdates src/Dodge/Creature/ChainUpdates.hs 1;" m
|
||||
ChangePosture src/Dodge/Data/ActionPlan.hs 42;" C
|
||||
ChangeStrategy src/Dodge/Data/ActionPlan.hs 44;" C
|
||||
CharScrollParams src/Dodge/Data/Item/Use.hs 121;" C
|
||||
CharScrollParams src/Dodge/Data/Item/Use.hs 131;" C
|
||||
ChargeIfEquipped src/Dodge/Data/Item/Effect.hs 22;" C
|
||||
ChargeIfInInventory src/Dodge/Data/Item/Effect.hs 23;" C
|
||||
ChargeableAmmo src/Dodge/Data/Item/Consumption.hs 29;" C
|
||||
@@ -669,7 +669,7 @@ DefaultArcStep src/Dodge/Data/ArcStep.hs 23;" C
|
||||
DefaultCrGroupUpdate src/Dodge/Data/CrGroupParams.hs 22;" C
|
||||
DefaultDrawButton src/Dodge/Data/Button.hs 17;" C
|
||||
DefaultDrawSwitch src/Dodge/Data/Button.hs 18;" C
|
||||
DefaultFlareType src/Dodge/Data/Item/Use.hs 137;" C
|
||||
DefaultFlareType src/Dodge/Data/Item/Use.hs 147;" C
|
||||
DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 46;" C
|
||||
DefaultHeldParams src/Dodge/Data/Item/Use.hs 75;" C
|
||||
DefaultLightSourceDraw src/Dodge/Data/LightSource.hs 13;" C
|
||||
@@ -949,13 +949,12 @@ FlameBeamCombine src/Dodge/Data/Beam.hs 39;" C
|
||||
FlameSound src/Dodge/Data/SoundOrigin.hs 25;" C
|
||||
FlameSpitterMod src/Dodge/Data/Item/HeldUse.hs 70;" C
|
||||
FlameSpitterRepeatMod src/Dodge/Data/Item/HeldUse.hs 71;" C
|
||||
FlameThrowerMod src/Dodge/Data/Item/HeldUse.hs 72;" C
|
||||
Flamer src/Dodge/Data/SoundOrigin.hs 23;" C
|
||||
Flank src/Dodge/Data/ActionPlan.hs 177;" C
|
||||
Flare src/Dodge/Data/Flare.hs 14;" t
|
||||
Flare src/Dodge/Data/Flare.hs 6;" m
|
||||
Flare src/Dodge/Flare.hs 1;" m
|
||||
FlareType src/Dodge/Data/Item/Use.hs 137;" t
|
||||
FlareType src/Dodge/Data/Item/Use.hs 147;" t
|
||||
Flash src/Dodge/WorldEvent/Flash.hs 11;" m
|
||||
FlashBall src/Dodge/Data/Bullet.hs 33;" C
|
||||
FlatFaces src/Shape/Data.hs 17;" C
|
||||
@@ -1031,7 +1030,7 @@ GasAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 43;" C
|
||||
GasCloud src/Dodge/Data/Cloud.hs 31;" C
|
||||
GasCreate src/Dodge/Data/Gas.hs 6;" t
|
||||
GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 49;" t
|
||||
GasParams src/Dodge/Data/Item/Use.hs 109;" C
|
||||
GasParams src/Dodge/Data/Item/Use.hs 119;" C
|
||||
GasSprayParams src/Dodge/Data/Item/Use.hs 76;" C
|
||||
GenCr src/Dodge/Creature/State/Data.hs 24;" C
|
||||
GenCr src/Dodge/Data/Creature/State.hs 31;" C
|
||||
@@ -1116,7 +1115,7 @@ HammerUp src/Dodge/Data/Hammer.hs 20;" C
|
||||
HandPos src/Dodge/Creature/HandPos.hs 1;" m
|
||||
HardQuit src/Dodge/Data/Universe.hs 66;" C
|
||||
HasHammer src/Dodge/Data/Hammer.hs 14;" C
|
||||
HeavySmokeFlare src/Dodge/Data/Item/Use.hs 140;" C
|
||||
HeavySmokeFlare src/Dodge/Data/Item/Use.hs 150;" C
|
||||
Held src/Dodge/Default/Held.hs 1;" m
|
||||
Held src/Dodge/Default/Item/Held.hs 1;" m
|
||||
Held src/Dodge/Item/Held.hs 1;" m
|
||||
@@ -1293,7 +1292,7 @@ ItInvEffect src/Dodge/Data/ItEffect.hs 13;" C
|
||||
ItInvEffectDrop src/Dodge/Data/ItEffect.hs 29;" C
|
||||
ItInvEffectID src/Dodge/Data/ItEffect.hs 25;" C
|
||||
ItRewindEffect src/Dodge/Data/ItEffect.hs 17;" C
|
||||
ItZoom src/Dodge/Data/Item/Use.hs 182;" t
|
||||
ItZoom src/Dodge/Data/Item/Use.hs 198;" t
|
||||
Item src/Dodge/Data/Item.hs 33;" t
|
||||
Item src/Dodge/Base/Item.hs 1;" m
|
||||
Item src/Dodge/Data/Item.hs 6;" m
|
||||
@@ -1398,8 +1397,7 @@ Lampoid src/Dodge/Data/Creature/Misc.hs 72;" C
|
||||
Lampoid src/Dodge/Lampoid.hs 1;" m
|
||||
Large src/Shape/Data.hs 29;" C
|
||||
LasBeamCombine src/Dodge/Data/Beam.hs 40;" C
|
||||
LasGunFlare src/Dodge/Data/Item/Use.hs 141;" C
|
||||
LasMod src/Dodge/Data/Item/HeldUse.hs 78;" C
|
||||
LasGunFlare src/Dodge/Data/Item/Use.hs 151;" C
|
||||
LasSound src/Dodge/Data/SoundOrigin.hs 26;" C
|
||||
LasTurret src/Dodge/Room/LasTurret.hs 1;" m
|
||||
LasWideMod src/Dodge/Data/Item/HeldUse.hs 76;" C
|
||||
@@ -1413,8 +1411,6 @@ Launcher src/Dodge/Item/Held/Launcher.hs 1;" m
|
||||
Launcher src/Dodge/Item/Weapon/Launcher.hs 1;" m
|
||||
LauncherAI src/Dodge/Data/Creature/Misc.hs 55;" C
|
||||
LauncherCrit src/Dodge/Creature/LauncherCrit.hs 1;" m
|
||||
LauncherMod src/Dodge/Data/Item/HeldUse.hs 73;" C
|
||||
LauncherXMod src/Dodge/Data/Item/HeldUse.hs 79;" C
|
||||
LaundrySS src/Dodge/Data/Scenario.hs 115;" C
|
||||
Layer src/Picture/Data.hs 22;" t
|
||||
Layer src/Dodge/Picture/Layer.hs 3;" m
|
||||
@@ -1609,7 +1605,7 @@ MidLayer src/Picture/Data.hs 24;" C
|
||||
Military src/Dodge/Data/Scenario.hs 45;" C
|
||||
Mine src/Dodge/Data/Scenario.hs 64;" C
|
||||
MiniGunAI src/Dodge/Data/Creature/Misc.hs 59;" C
|
||||
MiniGunFlare src/Dodge/Data/Item/Use.hs 139;" C
|
||||
MiniGunFlare src/Dodge/Data/Item/Use.hs 149;" C
|
||||
Misc src/Dodge/Data/Creature/Misc.hs 6;" m
|
||||
Misc src/Dodge/Data/Equipment/Misc.hs 6;" m
|
||||
Misc src/Dodge/Data/Item/Misc.hs 6;" m
|
||||
@@ -1669,16 +1665,15 @@ Music src/Music.hs 1;" m
|
||||
MusicData src/Music.hs 7;" t
|
||||
Mute src/Dodge/Data/Creature/Misc.hs 28;" C
|
||||
MuzFlare src/Dodge/Data/Flare.hs 15;" C
|
||||
Muzzle src/Dodge/Data/Item/Use.hs 154;" t
|
||||
MuzzleEffect src/Dodge/Data/Item/Use.hs 144;" t
|
||||
Muzzle src/Dodge/Data/Item/Use.hs 170;" t
|
||||
MuzzleEffect src/Dodge/Data/Item/Use.hs 154;" t
|
||||
MuzzleEffect src/Dodge/Data/MuzzleEffect.hs 5;" m
|
||||
MuzzleFlame src/Dodge/Data/Item/Use.hs 150;" C
|
||||
MuzzleGas src/Dodge/Data/Item/Use.hs 151;" C
|
||||
MuzzleLaser src/Dodge/Data/Item/Use.hs 146;" C
|
||||
MuzzleLauncher src/Dodge/Data/Item/Use.hs 149;" C
|
||||
MuzzleShootBullet src/Dodge/Data/Item/Use.hs 145;" C
|
||||
MuzzleTesla src/Dodge/Data/Item/Use.hs 147;" C
|
||||
MuzzleTractor src/Dodge/Data/Item/Use.hs 148;" C
|
||||
MuzzleLaser src/Dodge/Data/Item/Use.hs 156;" C
|
||||
MuzzleLauncher src/Dodge/Data/Item/Use.hs 159;" C
|
||||
MuzzleNozzle src/Dodge/Data/Item/Use.hs 160;" C
|
||||
MuzzleShootBullet src/Dodge/Data/Item/Use.hs 155;" C
|
||||
MuzzleTesla src/Dodge/Data/Item/Use.hs 157;" C
|
||||
MuzzleTractor src/Dodge/Data/Item/Use.hs 158;" C
|
||||
MvForward src/Dodge/Data/ActionPlan.hs 35;" C
|
||||
MvPt src/Dodge/MvPt.hs 1;" m
|
||||
MvTurnToward src/Dodge/Data/ActionPlan.hs 34;" C
|
||||
@@ -1702,7 +1697,7 @@ Ngon src/Dodge/Room/Ngon.hs 1;" m
|
||||
NoAction src/Dodge/Data/ActionPlan.hs 152;" C
|
||||
NoAmmoPosition src/Dodge/Item/AmmoPosition.hs 11;" C
|
||||
NoArguments src/Dodge/Data/Terminal.hs 93;" C
|
||||
NoAttachParams src/Dodge/Data/Item/Use.hs 100;" C
|
||||
NoAttachParams src/Dodge/Data/Item/Use.hs 110;" C
|
||||
NoBeamCombine src/Dodge/Data/Beam.hs 43;" C
|
||||
NoConcurrentEffect src/Loop/Data.hs 7;" C
|
||||
NoConsumption src/Dodge/Data/Item/Consumption.hs 33;" C
|
||||
@@ -1842,7 +1837,7 @@ OnSpecial src/Dodge/Equipment/Data.hs 24;" C
|
||||
OnTurret src/Dodge/Data/Item/Location.hs 13;" C
|
||||
OnceSound src/Dodge/Data/SoundOrigin.hs 15;" C
|
||||
OneArgument src/Dodge/Data/Terminal.hs 94;" C
|
||||
OneHand src/Dodge/Data/Item/Use.hs 177;" C
|
||||
OneHand src/Dodge/Data/Item/Use.hs 193;" C
|
||||
OnwardCluster src/Dodge/Data/RoomCluster.hs 14;" C
|
||||
OnwardCluster src/Dodge/RoomCluster/Data.hs 12;" C
|
||||
OnwardList src/Dodge/Annotation/Data.hs 15;" C
|
||||
@@ -1963,7 +1958,7 @@ Pillar src/Dodge/Room/Pillar.hs 1;" m
|
||||
Pipe src/Dodge/Placement/Instance/Pipe.hs 1;" m
|
||||
PistolAI src/Dodge/Data/Creature/Misc.hs 53;" C
|
||||
PistolCrit src/Dodge/Creature/PistolCrit.hs 1;" m
|
||||
PistolFlare src/Dodge/Data/Item/Use.hs 138;" C
|
||||
PistolFlare src/Dodge/Data/Item/Use.hs 148;" C
|
||||
PistolMod src/Dodge/Data/Item/HeldUse.hs 94;" C
|
||||
PlaceSpot src/Dodge/Placement/PlaceSpot.hs 4;" m
|
||||
Placement src/Dodge/Data/GenWorld.hs 77;" t
|
||||
@@ -2032,7 +2027,7 @@ ProjectileCreate src/Dodge/Data/Ammo.hs 17;" t
|
||||
ProjectileCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 21;" t
|
||||
ProjectileDraw src/Dodge/Data/Ammo.hs 14;" t
|
||||
ProjectileDraw src/Dodge/Data/Item/Use/Consumption/Ammo.hs 18;" t
|
||||
ProjectileParams src/Dodge/Data/Item/Use.hs 104;" C
|
||||
ProjectileParams src/Dodge/Data/Item/Use.hs 114;" C
|
||||
ProjectileUpdate src/Dodge/Data/Ammo.hs 20;" t
|
||||
ProjectileUpdate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 24;" t
|
||||
Prop src/Dodge/Data/Prop.hs 18;" t
|
||||
@@ -2295,8 +2290,8 @@ ScreenPos src/Dodge/Data/ScreenPos.hs 9;" t
|
||||
ScreenPos src/Dodge/Data/ScreenPos.hs 3;" m
|
||||
ScreenPos src/Dodge/ScreenPos.hs 1;" m
|
||||
Scroll src/Dodge/Update/Scroll.hs 1;" m
|
||||
ScrollAttachParams src/Dodge/Data/Item/Use.hs 112;" t
|
||||
ScrollAttachParams src/Dodge/Data/Item/Use.hs 98;" C
|
||||
ScrollAttachParams src/Dodge/Data/Item/Use.hs 122;" t
|
||||
ScrollAttachParams src/Dodge/Data/Item/Use.hs 108;" C
|
||||
ScrollAttachType src/Dodge/Data/Item/Combine.hs 105;" t
|
||||
ScrollValue src/Dodge/ScrollValue.hs 1;" m
|
||||
SecretCabal src/Dodge/Data/Scenario.hs 44;" C
|
||||
@@ -2567,7 +2562,7 @@ TUBE src/Dodge/Data/Item/Combine.hs 31;" C
|
||||
Tank src/Dodge/Placement/Instance/Tank.hs 1;" m
|
||||
Tanks src/Dodge/Room/Tanks.hs 1;" m
|
||||
Tap src/Dodge/Data/SoundOrigin.hs 36;" C
|
||||
TargetAttachParams src/Dodge/Data/Item/Use.hs 99;" C
|
||||
TargetAttachParams src/Dodge/Data/Item/Use.hs 109;" C
|
||||
TargetCursor src/Dodge/Data/Item/Targeting.hs 16;" C
|
||||
TargetCursorUpdate src/Dodge/Data/Targeting.hs 26;" C
|
||||
TargetDistanceDraw src/Dodge/Data/Targeting.hs 32;" C
|
||||
@@ -2639,7 +2634,7 @@ TeslaArc src/Dodge/Data/TeslaArc.hs 6;" m
|
||||
TeslaArc src/Dodge/Particle/TeslaArc.hs 1;" m
|
||||
TeslaBall src/Dodge/Data/Bullet.hs 32;" C
|
||||
TeslaBeamCombine src/Dodge/Data/Beam.hs 41;" C
|
||||
TeslaGunFlare src/Dodge/Data/Item/Use.hs 142;" C
|
||||
TeslaGunFlare src/Dodge/Data/Item/Use.hs 152;" C
|
||||
Test src/Dodge/Creature/Test.hs 8;" m
|
||||
Test src/Dodge/Event/Test.hs 1;" m
|
||||
Test src/Picture/Test.hs 1;" m
|
||||
@@ -2730,9 +2725,9 @@ TweakTractionPower src/Dodge/Data/Item/Tweak.hs 22;" C
|
||||
TweakType src/Dodge/Data/Item/Tweak.hs 20;" t
|
||||
Tweakable src/Dodge/Data/Item/Tweak.hs 15;" C
|
||||
TwistGoal src/Dodge/Data/Scenario.hs 15;" C
|
||||
TwoHandFlat src/Dodge/Data/Item/Use.hs 176;" C
|
||||
TwoHandOver src/Dodge/Data/Item/Use.hs 175;" C
|
||||
TwoHandUnder src/Dodge/Data/Item/Use.hs 174;" C
|
||||
TwoHandFlat src/Dodge/Data/Item/Use.hs 192;" C
|
||||
TwoHandOver src/Dodge/Data/Item/Use.hs 191;" C
|
||||
TwoHandUnder src/Dodge/Data/Item/Use.hs 190;" C
|
||||
Type src/Dodge/Data/Damage/Type.hs 6;" m
|
||||
Typical src/Shape/Data.hs 36;" C
|
||||
UPtLayer src/Dodge/Picture/Layer/Data.hs 16;" C
|
||||
@@ -2946,7 +2941,7 @@ Zoning src/Dodge/Zoning.hs 1;" m
|
||||
ZoomScope src/Dodge/Data/Item/Attachment.hs 30;" C
|
||||
ZoomScope src/Dodge/Item/Attachment/Data.hs 31;" C
|
||||
ZoomScope src/Dodge/Item/Weapon/ZoomScope.hs 1;" m
|
||||
ZoomScrollParams src/Dodge/Data/Item/Use.hs 113;" C
|
||||
ZoomScrollParams src/Dodge/Data/Item/Use.hs 123;" C
|
||||
__Just' src/MaybeHelp.hs 13;" f
|
||||
_actAction src/Dodge/Data/ActionPlan.hs 81;" f
|
||||
_actLabel src/Dodge/Data/ActionPlan.hs 80;" f
|
||||
@@ -2956,13 +2951,13 @@ _actionSound src/Dodge/Data/LoadAction.hs 11;" f
|
||||
_actionSound src/Dodge/Data/LoadAction.hs 14;" f
|
||||
_actionTime src/Dodge/Data/LoadAction.hs 11;" f
|
||||
_actionTime src/Dodge/Data/LoadAction.hs 14;" f
|
||||
_aimHandlePos src/Dodge/Data/Item/Use.hs 131;" f
|
||||
_aimMuzzles src/Dodge/Data/Item/Use.hs 132;" f
|
||||
_aimRange src/Dodge/Data/Item/Use.hs 128;" f
|
||||
_aimStance src/Dodge/Data/Item/Use.hs 130;" f
|
||||
_aimTurnSpeed src/Dodge/Data/Item/Use.hs 127;" f
|
||||
_aimWeight src/Dodge/Data/Item/Use.hs 126;" f
|
||||
_aimZoom src/Dodge/Data/Item/Use.hs 129;" f
|
||||
_aimHandlePos src/Dodge/Data/Item/Use.hs 141;" f
|
||||
_aimMuzzles src/Dodge/Data/Item/Use.hs 142;" f
|
||||
_aimRange src/Dodge/Data/Item/Use.hs 138;" f
|
||||
_aimStance src/Dodge/Data/Item/Use.hs 140;" f
|
||||
_aimTurnSpeed src/Dodge/Data/Item/Use.hs 137;" f
|
||||
_aimWeight src/Dodge/Data/Item/Use.hs 136;" f
|
||||
_aimZoom src/Dodge/Data/Item/Use.hs 139;" f
|
||||
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 21;" f
|
||||
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 24;" f
|
||||
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 28;" f
|
||||
@@ -2987,11 +2982,11 @@ _amagLoadStatus src/Dodge/Data/Item/Use.hs 64;" f
|
||||
_amagParams src/Dodge/Data/Item/Use.hs 65;" f
|
||||
_amagType src/Dodge/Data/Item/Use.hs 66;" f
|
||||
_ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f
|
||||
_ampBullet src/Dodge/Data/Item/Use.hs 103;" f
|
||||
_ampCreateGas src/Dodge/Data/Item/Use.hs 109;" f
|
||||
_ampPayload src/Dodge/Data/Item/Use.hs 105;" f
|
||||
_ampPjCreation src/Dodge/Data/Item/Use.hs 107;" f
|
||||
_ampPjDraw src/Dodge/Data/Item/Use.hs 106;" f
|
||||
_ampBullet src/Dodge/Data/Item/Use.hs 113;" f
|
||||
_ampCreateGas src/Dodge/Data/Item/Use.hs 119;" f
|
||||
_ampPayload src/Dodge/Data/Item/Use.hs 115;" f
|
||||
_ampPjCreation src/Dodge/Data/Item/Use.hs 117;" f
|
||||
_ampPjDraw src/Dodge/Data/Item/Use.hs 116;" f
|
||||
_amposDir src/Dodge/Item/AmmoPosition.hs 9;" f
|
||||
_amposPos src/Dodge/Item/AmmoPosition.hs 9;" f
|
||||
_apAction src/Dodge/Data/ActionPlan.hs 20;" f
|
||||
@@ -3097,8 +3092,9 @@ _buTimer src/Dodge/Data/Bullet.hs 27;" f
|
||||
_buTrajectory src/Dodge/Data/Bullet.hs 21;" f
|
||||
_buVel src/Dodge/Data/Bullet.hs 22;" f
|
||||
_buWidth src/Dodge/Data/Bullet.hs 26;" f
|
||||
_bulGunSound src/Dodge/Data/Item/Use.hs 79;" f
|
||||
_bulGunSound src/Dodge/Data/Item/Use.hs 82;" f
|
||||
_bulGunSound src/Dodge/Data/Item/Use.hs 89;" f
|
||||
_bulGunSound src/Dodge/Data/Item/Use.hs 99;" f
|
||||
_bullets src/Dodge/Data/LWorld.hs 106;" f
|
||||
_buttons src/Dodge/Data/LWorld.hs 136;" f
|
||||
_cClock src/Dodge/Data/CWorld.hs 28;" f
|
||||
@@ -3554,9 +3550,9 @@ _iyBase src/Dodge/Data/Item/Combine.hs 17;" f
|
||||
_iyModules src/Dodge/Combine/Data.hs 14;" f
|
||||
_iyModules src/Dodge/Data/Item/Combine.hs 18;" f
|
||||
_iyStack src/Dodge/Combine/Data.hs 15;" f
|
||||
_izFac src/Dodge/Data/Item/Use.hs 185;" f
|
||||
_izMax src/Dodge/Data/Item/Use.hs 183;" f
|
||||
_izMin src/Dodge/Data/Item/Use.hs 184;" f
|
||||
_izFac src/Dodge/Data/Item/Use.hs 201;" f
|
||||
_izMax src/Dodge/Data/Item/Use.hs 199;" f
|
||||
_izMin src/Dodge/Data/Item/Use.hs 200;" f
|
||||
_killTarget src/Dodge/Data/ActionPlan.hs 198;" f
|
||||
_lClock src/Dodge/Data/LWorld.hs 145;" f
|
||||
_lTestInt src/Dodge/Data/LWorld.hs 147;" f
|
||||
@@ -3680,18 +3676,18 @@ _mtBranches src/Dodge/Tree/Compose/Data.hs 8;" f
|
||||
_mtLabel src/Dodge/Tree/Compose/Data.hs 8;" f
|
||||
_mtTree src/Dodge/Tree/Compose/Data.hs 8;" f
|
||||
_musicData src/Data/Preload.hs 13;" f
|
||||
_muzVel src/Dodge/Data/Item/Use.hs 83;" f
|
||||
_muzVel src/Dodge/Data/Item/Use.hs 93;" f
|
||||
_mvAimSpeed src/Dodge/Data/Creature/Misc.hs 44;" f
|
||||
_mvSpeed src/Dodge/Data/Creature/Misc.hs 39;" f
|
||||
_mvToPoint src/Dodge/Data/Creature.hs 98;" f
|
||||
_mvTurnJit src/Dodge/Data/Creature/Misc.hs 43;" f
|
||||
_mvTurnRad src/Dodge/Data/Creature/Misc.hs 42;" f
|
||||
_mzAmmoSlot src/Dodge/Data/Item/Use.hs 158;" f
|
||||
_mzEffect src/Dodge/Data/Item/Use.hs 160;" f
|
||||
_mzFlareType src/Dodge/Data/Item/Use.hs 159;" f
|
||||
_mzInaccuracy src/Dodge/Data/Item/Use.hs 157;" f
|
||||
_mzPos src/Dodge/Data/Item/Use.hs 155;" f
|
||||
_mzRot src/Dodge/Data/Item/Use.hs 156;" f
|
||||
_mzAmmoSlot src/Dodge/Data/Item/Use.hs 174;" f
|
||||
_mzEffect src/Dodge/Data/Item/Use.hs 176;" f
|
||||
_mzFlareType src/Dodge/Data/Item/Use.hs 175;" f
|
||||
_mzInaccuracy src/Dodge/Data/Item/Use.hs 173;" f
|
||||
_mzPos src/Dodge/Data/Item/Use.hs 171;" f
|
||||
_mzRot src/Dodge/Data/Item/Use.hs 172;" f
|
||||
_newArcStep src/Dodge/Data/Item/Params.hs 57;" f
|
||||
_newBeams src/Dodge/Data/LWorld.hs 114;" f
|
||||
_noClip src/Dodge/Debug/Flag/Data.hs 7;" f
|
||||
@@ -3702,12 +3698,12 @@ _nodesSearched src/Dodge/Data/Creature/Memory.hs 15;" f
|
||||
_numLinkEW src/Dodge/Data/Room.hs 33;" f
|
||||
_numLinkNS src/Dodge/Data/Room.hs 34;" f
|
||||
_numberFloorVerxs src/Dodge/Data/CWorld.hs 32;" f
|
||||
_nzCurrentWalkAngle src/Dodge/Data/Item/Params.hs 85;" f
|
||||
_nzDir src/Dodge/Data/Item/Params.hs 83;" f
|
||||
_nzLength src/Dodge/Data/Item/Params.hs 87;" f
|
||||
_nzMaxWalkAngle src/Dodge/Data/Item/Params.hs 84;" f
|
||||
_nzPressure src/Dodge/Data/Item/Params.hs 82;" f
|
||||
_nzWalkSpeed src/Dodge/Data/Item/Params.hs 86;" f
|
||||
_nzCurrentWalkAngle src/Dodge/Data/Item/Use.hs 164;" f
|
||||
_nzDir src/Dodge/Data/Item/Use.hs 162;" f
|
||||
_nzLength src/Dodge/Data/Item/Use.hs 166;" f
|
||||
_nzMaxWalkAngle src/Dodge/Data/Item/Use.hs 163;" f
|
||||
_nzPressure src/Dodge/Data/Item/Use.hs 161;" f
|
||||
_nzWalkSpeed src/Dodge/Data/Item/Use.hs 165;" f
|
||||
_offPathFromEdges src/Dodge/Data/Room.hs 74;" f
|
||||
_onPathFromEdges src/Dodge/Data/Room.hs 73;" f
|
||||
_opDraw src/Dodge/Data/Wall.hs 41;" f
|
||||
@@ -3715,9 +3711,9 @@ _opPlacement src/Dodge/Data/GenWorld.hs 129;" f
|
||||
_opPlacementID src/Dodge/Data/GenWorld.hs 130;" f
|
||||
_opSel src/Dodge/Data/RightButtonOptions.hs 15;" f
|
||||
_opTexture src/Dodge/Data/Wall.hs 42;" f
|
||||
_opticDefaultZoom src/Dodge/Data/Item/Use.hs 119;" f
|
||||
_opticPos src/Dodge/Data/Item/Use.hs 115;" f
|
||||
_opticZoom src/Dodge/Data/Item/Use.hs 118;" f
|
||||
_opticDefaultZoom src/Dodge/Data/Item/Use.hs 129;" f
|
||||
_opticPos src/Dodge/Data/Item/Use.hs 125;" f
|
||||
_opticZoom src/Dodge/Data/Item/Use.hs 128;" f
|
||||
_paramMID src/Dodge/Data/Item/Params.hs 60;" f
|
||||
_partialAction src/Dodge/Data/ActionPlan.hs 145;" f
|
||||
_pastWorlds src/Dodge/Data/World.hs 38;" f
|
||||
@@ -3866,7 +3862,8 @@ _pyFaces src/Polyhedra/Data.hs 14;" f
|
||||
_radarBlips src/Dodge/Data/LWorld.hs 112;" f
|
||||
_radarSweeps src/Dodge/Data/LWorld.hs 107;" f
|
||||
_randGen src/Dodge/Data/World.hs 40;" f
|
||||
_randomOffset src/Dodge/Data/Item/Use.hs 87;" f
|
||||
_randomOffset src/Dodge/Data/Item/Use.hs 80;" f
|
||||
_randomOffset src/Dodge/Data/Item/Use.hs 97;" f
|
||||
_rateMax src/Dodge/Data/Item/HeldDelay.hs 16;" f
|
||||
_rateMax src/Dodge/Data/Item/HeldDelay.hs 20;" f
|
||||
_rateMax src/Dodge/Data/Item/Use/Delay.hs 13;" f
|
||||
@@ -3892,7 +3889,8 @@ _rbPos src/Dodge/Data/RadarBlip.hs 19;" f
|
||||
_rbRad src/Dodge/Data/RadarBlip.hs 18;" f
|
||||
_rbTime src/Dodge/Data/RadarBlip.hs 16;" f
|
||||
_rboBaseBloom src/Data/Preload/Render.hs 38;" f
|
||||
_recoil src/Dodge/Data/Item/Use.hs 85;" f
|
||||
_recoil src/Dodge/Data/Item/Use.hs 78;" f
|
||||
_recoil src/Dodge/Data/Item/Use.hs 95;" f
|
||||
_reloadAction src/Dodge/Data/LoadAction.hs 26;" f
|
||||
_remotePos src/Dodge/Data/Item/Scope.hs 17;" f
|
||||
_remoteZoom src/Dodge/Data/Item/Scope.hs 18;" f
|
||||
@@ -3900,7 +3898,7 @@ _renderData src/Data/Preload.hs 11;" f
|
||||
_reverseAmount src/Dodge/Data/World.hs 63;" f
|
||||
_reverseAmount src/Dodge/Data/World.hs 69;" f
|
||||
_reverseAmount src/Dodge/Data/World.hs 73;" f
|
||||
_rifling src/Dodge/Data/Item/Use.hs 84;" f
|
||||
_rifling src/Dodge/Data/Item/Use.hs 94;" f
|
||||
_rlDir src/Dodge/Data/Room.hs 26;" f
|
||||
_rlPos src/Dodge/Data/Room.hs 25;" f
|
||||
_rlType src/Dodge/Data/Room.hs 24;" f
|
||||
@@ -3988,8 +3986,8 @@ _scopeZoomChange src/Dodge/Data/Item/Attachment.hs 33;" f
|
||||
_scopeZoomChange src/Dodge/Item/Attachment/Data.hs 33;" f
|
||||
_screenTextureVAO src/Data/Preload/Render.hs 50;" f
|
||||
_scrollAmount src/Dodge/Data/Input.hs 24;" f
|
||||
_scrollAttachParams src/Dodge/Data/Item/Use.hs 98;" f
|
||||
_scrollChar src/Dodge/Data/Item/Use.hs 122;" f
|
||||
_scrollAttachParams src/Dodge/Data/Item/Use.hs 108;" f
|
||||
_scrollChar src/Dodge/Data/Item/Use.hs 132;" f
|
||||
_scrollItemLocation src/Dodge/Data/World.hs 65;" f
|
||||
_scrollItemLocation src/Dodge/Data/World.hs 74;" f
|
||||
_scrollItemLocation src/Dodge/Data/World.hs 78;" f
|
||||
@@ -4045,7 +4043,8 @@ _siPictures src/Dodge/Data/SelectionList.hs 77;" f
|
||||
_siPictures src/Dodge/Data/SelectionList.hs 85;" f
|
||||
_sideEffect src/Loop/Data.hs 13;" f
|
||||
_sideImpulses src/Dodge/Data/ActionPlan.hs 170;" f
|
||||
_sidePush src/Dodge/Data/Item/Use.hs 88;" f
|
||||
_sidePush src/Dodge/Data/Item/Use.hs 81;" f
|
||||
_sidePush src/Dodge/Data/Item/Use.hs 98;" f
|
||||
_silhouetteEBO src/Data/Preload/Render.hs 27;" f
|
||||
_skColor src/Dodge/Data/Spark.hs 17;" f
|
||||
_skDamageType src/Dodge/Data/Spark.hs 21;" f
|
||||
@@ -4185,7 +4184,8 @@ _toPlaySoundVolume src/Sound/Data.hs 43;" f
|
||||
_toPlaySoundVolumeFraction src/Sound/Data.hs 44;" f
|
||||
_toPlaySounds src/Dodge/Data/World.hs 41;" f
|
||||
_topBoxSize src/Shape/Data.hs 17;" f
|
||||
_torqueAfter src/Dodge/Data/Item/Use.hs 86;" f
|
||||
_torqueAfter src/Dodge/Data/Item/Use.hs 79;" f
|
||||
_torqueAfter src/Dodge/Data/Item/Use.hs 96;" f
|
||||
_tractorBeams src/Dodge/Data/LWorld.hs 121;" f
|
||||
_trieChildren src/SimpleTrie.hs 7;" f
|
||||
_trieMVal src/SimpleTrie.hs 6;" f
|
||||
@@ -4276,8 +4276,10 @@ _warmSound src/Dodge/Data/Item/HeldDelay.hs 28;" f
|
||||
_warmTime src/Dodge/Data/Item/HeldDelay.hs 26;" f
|
||||
_warmTime src/Dodge/Data/Item/Use/Delay.hs 23;" f
|
||||
_warmTime src/Dodge/Data/Item/UseDelay.hs 23;" f
|
||||
_weaponInvLock src/Dodge/Data/Item/Use.hs 92;" f
|
||||
_weaponRepeat src/Dodge/Data/Item/Use.hs 93;" f
|
||||
_weaponInvLock src/Dodge/Data/Item/Use.hs 85;" f
|
||||
_weaponInvLock src/Dodge/Data/Item/Use.hs 102;" f
|
||||
_weaponRepeat src/Dodge/Data/Item/Use.hs 86;" f
|
||||
_weaponRepeat src/Dodge/Data/Item/Use.hs 103;" f
|
||||
_windowPosX src/Dodge/Config/Data.hs 23;" f
|
||||
_windowPosX src/Dodge/Data/Config.hs 53;" f
|
||||
_windowPosY src/Dodge/Config/Data.hs 24;" f
|
||||
@@ -4545,7 +4547,7 @@ bangRod src/Dodge/Item/Weapon/BulletGun/Rod.hs 18;" f
|
||||
bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 478;" f
|
||||
bangStick src/Dodge/Item/Held/Stick.hs 17;" f
|
||||
bangStick src/Dodge/Item/Weapon/BulletGun/Stick.hs 17;" f
|
||||
bangStickSoundChoice src/Dodge/HeldUse.hs 1057;" f
|
||||
bangStickSoundChoice src/Dodge/HeldUse.hs 1074;" f
|
||||
bangStickSoundChoice src/Dodge/HeldUse/BulletWeapon.hs 226;" f
|
||||
barPP src/Dodge/Room/Foreground.hs 236;" f
|
||||
barrel src/Dodge/Creature/Inanimate.hs 17;" f
|
||||
@@ -4568,7 +4570,7 @@ baseStickSpread src/Dodge/Item/Held/Stick.hs 32;" f
|
||||
baseStickSpread src/Dodge/Item/Weapon/BulletGun/Stick.hs 46;" f
|
||||
baseWindowPane src/Dodge/Placements/Wall.hs 73;" f
|
||||
baseWindowPane src/Dodge/Room/Placement.hs 103;" f
|
||||
basicAmPjMoves src/Dodge/Item/Held/Launcher.hs 65;" f
|
||||
basicAmPjMoves src/Dodge/Item/Held/Launcher.hs 73;" f
|
||||
basicAttentionUpdate src/Dodge/Creature/AlertLevel.hs 50;" f
|
||||
basicAttentionUpdate src/Dodge/Creature/Perception.hs 127;" f
|
||||
basicAwarenessUpdate src/Dodge/Creature/AlertLevel.hs 25;" f
|
||||
@@ -4582,10 +4584,10 @@ basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f
|
||||
basicItemDisplay src/Dodge/Item/Display.hs 50;" f
|
||||
basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f
|
||||
basicMachineUpdate src/Dodge/Machine.hs 13;" f
|
||||
basicMuzFlare src/Dodge/HeldUse.hs 464;" f
|
||||
basicMuzFlare src/Dodge/HeldUse.hs 466;" f
|
||||
basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f
|
||||
basicTerminal src/Dodge/Terminal.hs 32;" f
|
||||
battery src/Dodge/Item/Ammo.hs 71;" f
|
||||
battery src/Dodge/Item/Ammo.hs 76;" f
|
||||
batteryModules src/Dodge/Item/Held/BatteryGuns.hs 120;" f
|
||||
batteryPack src/Dodge/Item/Equipment.hs 58;" f
|
||||
belowNumX src/Dodge/Combine/Graph.hs 77;" f
|
||||
@@ -4621,7 +4623,7 @@ blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f
|
||||
blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 342;" f
|
||||
blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 330;" f
|
||||
bloodPuddleAt src/Dodge/Creature/State.hs 132;" f
|
||||
blowTorch src/Dodge/Item/Held/SprayGuns.hs 44;" f
|
||||
blowTorch src/Dodge/Item/Held/SprayGuns.hs 50;" f
|
||||
blowTorch src/Dodge/Item/Weapon/SprayGuns.hs 49;" f
|
||||
blue src/Color.hs 16;" f
|
||||
blunderbuss src/Dodge/Item/Held/Cone.hs 29;" f
|
||||
@@ -4668,7 +4670,7 @@ bulletBodyCraft src/Dodge/Item/Craftable.hs 24;" f
|
||||
bulletCombinations src/Dodge/Combine/Graph.hs 35;" f
|
||||
bulletMagazines src/Dodge/Combine/Combinations.hs 239;" f
|
||||
bulletSpawn src/Dodge/Bullet.hs 105;" f
|
||||
bulletSynthesizer src/Dodge/Item/Ammo.hs 85;" f
|
||||
bulletSynthesizer src/Dodge/Item/Ammo.hs 90;" f
|
||||
bulletTypes src/Dodge/TweakBullet.hs 26;" f
|
||||
bulletWeapons src/Dodge/Combine/Combinations.hs 247;" f
|
||||
burstRifle src/Dodge/Item/Held/Cane.hs 78;" f
|
||||
@@ -4681,7 +4683,7 @@ canAttachTargeting src/Dodge/Item/Display.hs 19;" f
|
||||
canHeldScrollAttach src/Dodge/HeldScroll.hs 75;" f
|
||||
canSee src/Dodge/Base/Collide.hs 228;" f
|
||||
canSeeIndirect src/Dodge/Base/Collide.hs 235;" f
|
||||
caneStickSoundChoice src/Dodge/HeldUse.hs 1052;" f
|
||||
caneStickSoundChoice src/Dodge/HeldUse.hs 1069;" f
|
||||
cardList src/Dodge/Base/CardinalPoint.hs 6;" f
|
||||
cardVec src/Dodge/Base/CardinalPoint.hs 9;" f
|
||||
cardinalVectors src/Dodge/FloorItem.hs 39;" f
|
||||
@@ -4914,6 +4916,7 @@ createLightMap src/Render.hs 26;" f
|
||||
createNewArc src/Dodge/Tesla/Arc.hs 76;" f
|
||||
createPathGrid src/Dodge/Room/Path.hs 21;" f
|
||||
createProjectile src/Dodge/Projectile/Create.hs 12;" f
|
||||
createProjectile' src/Dodge/Projectile/Create.hs 35;" f
|
||||
createPutItem src/Dodge/Inventory/Add.hs 53;" f
|
||||
createShieldWall src/Dodge/Euse.hs 134;" f
|
||||
createTorchLightOffset src/Dodge/LightSource/Torch.hs 9;" f
|
||||
@@ -5223,6 +5226,7 @@ doDrawing src/Dodge/Render.hs 35;" f
|
||||
doDrawing' src/Dodge/Render.hs 46;" f
|
||||
doFloatFloat src/Dodge/FloatFunction.hs 5;" f
|
||||
doFloorEffect src/Dodge/ItEffect.hs 21;" f
|
||||
doGenFloat src/Dodge/HeldUse.hs 1038;" f
|
||||
doHeldScroll src/Dodge/HeldScroll.hs 17;" f
|
||||
doInPlacements src/Dodge/Layout.hs 92;" f
|
||||
doIndividualPlacements src/Dodge/Layout.hs 117;" f
|
||||
@@ -5511,11 +5515,11 @@ findWallFreeDropPoint src/Dodge/FloorItem.hs 47;" f
|
||||
findWallsInPolygon src/Dodge/LevelGen/StaticWalls/Deprecated.hs 78;" f
|
||||
findWithIx src/ListHelp.hs 123;" f
|
||||
fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f
|
||||
fireRemoteShell src/Dodge/HeldUse.hs 1024;" f
|
||||
fireRemoteShell src/Dodge/HeldUse.hs 1041;" f
|
||||
fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 332;" f
|
||||
fireShell src/Dodge/Projectile/Create.hs 35;" f
|
||||
fireShell src/Dodge/Projectile/Create.hs 58;" f
|
||||
fireSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
|
||||
fireTrackingShell src/Dodge/Projectile/Create.hs 81;" f
|
||||
fireTrackingShell src/Dodge/Projectile/Create.hs 104;" f
|
||||
firstBreather src/Dodge/Room/Breather.hs 9;" f
|
||||
firstWorldLoad appDodge/Main.hs 77;" f
|
||||
fixedCoordPictures src/Dodge/Render/Picture.hs 17;" f
|
||||
@@ -5524,13 +5528,13 @@ flDamageInArea src/Dodge/Flame.hs 110;" f
|
||||
flFlicker src/Dodge/Flame.hs 124;" f
|
||||
flameBeamCombine src/Dodge/Beam.hs 24;" f
|
||||
flameShield src/Dodge/Item/Equipment.hs 37;" f
|
||||
flameSpitter src/Dodge/Item/Held/SprayGuns.hs 24;" f
|
||||
flameSpitter src/Dodge/Item/Held/SprayGuns.hs 30;" f
|
||||
flameSpitter src/Dodge/Item/Weapon/SprayGuns.hs 27;" f
|
||||
flameThrower src/Dodge/Item/Held/SprayGuns.hs 65;" f
|
||||
flameThrower src/Dodge/Item/Held/SprayGuns.hs 71;" f
|
||||
flameThrower src/Dodge/Item/Weapon/SprayGuns.hs 70;" f
|
||||
flameTorrent src/Dodge/Item/Held/SprayGuns.hs 33;" f
|
||||
flameTorrent src/Dodge/Item/Held/SprayGuns.hs 39;" f
|
||||
flameTorrent src/Dodge/Item/Weapon/SprayGuns.hs 38;" f
|
||||
flameWall src/Dodge/Item/Held/SprayGuns.hs 49;" f
|
||||
flameWall src/Dodge/Item/Held/SprayGuns.hs 55;" f
|
||||
flameWall src/Dodge/Item/Weapon/SprayGuns.hs 54;" f
|
||||
flamerPic src/Dodge/Item/Draw/SPic.hs 415;" f
|
||||
flareCircleAt src/Dodge/WorldEvent/Flash.hs 46;" f
|
||||
@@ -5614,7 +5618,6 @@ gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f
|
||||
gameRoomsFromRooms src/Dodge/Layout.hs 158;" f
|
||||
gameplayMenu src/Dodge/Menu.hs 131;" f
|
||||
gameplayMenuOptions src/Dodge/Menu.hs 134;" f
|
||||
gasEffect src/Dodge/HeldUse.hs 342;" f
|
||||
generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f
|
||||
generateGraphs src/Dodge/LevelGen.hs 39;" f
|
||||
generateLayout src/Dodge/Layout/Generate.hs 10;" f
|
||||
@@ -5625,7 +5628,7 @@ geometryQuickCheckTests test/Spec.hs 55;" f
|
||||
geometryTests test/Spec.hs 17;" f
|
||||
geometryUnitTests test/Spec.hs 22;" f
|
||||
geqConstr src/SameConstr.hs 21;" f
|
||||
getAmmoMagazine src/Dodge/HeldUse.hs 998;" f
|
||||
getAmmoMagazine src/Dodge/HeldUse.hs 1012;" f
|
||||
getArguments src/Dodge/Update/Scroll.hs 147;" f
|
||||
getArguments' src/Dodge/Update/Scroll.hs 135;" f
|
||||
getAvailableListLines src/Dodge/SelectionList.hs 11;" f
|
||||
@@ -5877,7 +5880,7 @@ invertIntMap src/Multiset.hs 61;" f
|
||||
invertInventoryToMap src/Dodge/Combine.hs 25;" f
|
||||
invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 25;" f
|
||||
invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f
|
||||
isAmmoIntLink src/Dodge/HeldUse.hs 485;" f
|
||||
isAmmoIntLink src/Dodge/HeldUse.hs 487;" f
|
||||
isAnimate src/Dodge/Creature/Test.hs 138;" f
|
||||
isCognizant src/Dodge/Creature/Perception.hs 105;" f
|
||||
isElectrical src/Dodge/Data/Damage.hs 42;" f
|
||||
@@ -5997,15 +6000,15 @@ lasTunnelRunPast src/Dodge/Room/LasTurret.hs 165;" f
|
||||
lasTurret src/Dodge/Placement/Instance/Turret.hs 23;" f
|
||||
lasTurret src/Dodge/Placements/Turret.hs 29;" f
|
||||
lasWide src/Dodge/Item/Held/BatteryGuns.hs 105;" f
|
||||
lasWideRate src/Dodge/HeldUse.hs 913;" f
|
||||
lasWideRate src/Dodge/HeldUse.hs 927;" f
|
||||
lastMap src/Dodge/DoubleTree.hs 65;" f
|
||||
latchkey src/Dodge/Item/Held/Utility.hs 23;" f
|
||||
latchkey src/Dodge/Item/PassKey.hs 14;" f
|
||||
launcher src/Dodge/Item/Held/Launcher.hs 11;" f
|
||||
launcher src/Dodge/Item/Held/Launcher.hs 12;" f
|
||||
launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f
|
||||
launcherPic src/Dodge/Item/Draw/SPic.hs 431;" f
|
||||
launcherSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
|
||||
launcherX src/Dodge/Item/Held/Launcher.hs 40;" f
|
||||
launcherX src/Dodge/Item/Held/Launcher.hs 47;" f
|
||||
layerNum src/Picture/Data.hs 31;" f
|
||||
layoutLevelFromSeed src/Dodge/LevelGen.hs 47;" f
|
||||
ldpVerticalSelection src/Dodge/Update/Input/ScreenLayer.hs 90;" f
|
||||
@@ -6121,7 +6124,7 @@ makeArc src/Picture/Base.hs 157;" f
|
||||
makeBlip src/Dodge/RadarSweep.hs 50;" f
|
||||
makeBlockDebris src/Dodge/Block/Debris.hs 28;" f
|
||||
makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f
|
||||
makeBullet src/Dodge/HeldUse.hs 554;" f
|
||||
makeBullet src/Dodge/HeldUse.hs 568;" f
|
||||
makeButton src/Dodge/LevelGen/Switch.hs 16;" f
|
||||
makeByteStringShaderUsingVAO src/Shader/Compile.hs 137;" f
|
||||
makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f
|
||||
@@ -6152,7 +6155,7 @@ makeIntInterval src/Dodge/Zoning/Base.hs 33;" f
|
||||
makeLaserAt src/Dodge/Item/Weapon/Laser.hs 42;" f
|
||||
makeLaserScope src/Dodge/Item/Weapon/Decoration.hs 12;" f
|
||||
makeMuzzleFlare src/Dodge/HeldUse.hs 450;" f
|
||||
makeMuzzleSmoke src/Dodge/HeldUse.hs 471;" f
|
||||
makeMuzzleSmoke src/Dodge/HeldUse.hs 473;" f
|
||||
makeOptionsSelectionList src/Dodge/Menu/Option.hs 46;" f
|
||||
makeParagraph src/Justify.hs 6;" f
|
||||
makePathBetween src/Dodge/Path.hs 35;" f
|
||||
@@ -6165,7 +6168,7 @@ makeShaderProgram src/Shader/Compile.hs 287;" f
|
||||
makeShaderUsingVAO src/Shader/Compile.hs 155;" f
|
||||
makeShaderUsingVBO src/Shader/Compile.hs 78;" f
|
||||
makeShaderVBO src/Shader/Compile.hs 38;" f
|
||||
makeShell src/Dodge/Projectile/Create.hs 54;" f
|
||||
makeShell src/Dodge/Projectile/Create.hs 77;" f
|
||||
makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 12;" f
|
||||
makeSourcedShader src/Shader/Compile.hs 203;" f
|
||||
makeStartCloudAt src/Dodge/WorldEvent/Cloud.hs 60;" f
|
||||
@@ -6216,13 +6219,14 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 104;" f
|
||||
mcSPic src/Dodge/Render/ShapePicture.hs 169;" f
|
||||
mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 69;" f
|
||||
mcSensorUpdate src/Dodge/Machine/Update.hs 99;" f
|
||||
mcShootLaser src/Dodge/HeldUse.hs 1072;" f
|
||||
mcShootLaser src/Dodge/HeldUse.hs 1089;" f
|
||||
mcTriggerVal src/Dodge/Machine/Update.hs 75;" f
|
||||
mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f
|
||||
mcUseHeld src/Dodge/HeldUse.hs 916;" f
|
||||
mcUseHeld src/Dodge/HeldUse.hs 930;" f
|
||||
mcUseItem src/Dodge/Machine/Update.hs 61;" f
|
||||
medkit src/Dodge/Item/Consumable.hs 8;" f
|
||||
megaBattery src/Dodge/Item/Ammo.hs 66;" f
|
||||
megaBattery src/Dodge/Item/Ammo.hs 71;" f
|
||||
megaShellMag src/Dodge/Item/Ammo.hs 49;" f
|
||||
megaTinMag src/Dodge/Item/Ammo.hs 8;" f
|
||||
meleeHeadingMove src/Dodge/Creature/Boid.hs 281;" f
|
||||
meleeHeadingMove src/Dodge/Creature/ImpulseRat.hs 10;" f
|
||||
@@ -6456,9 +6460,6 @@ overColObj src/Shape.hs 269;" f
|
||||
overColSH src/Shape.hs 237;" f
|
||||
overLnkPosDir src/Dodge/RoomLink.hs 100;" f
|
||||
overLnkType src/Dodge/RoomLink.hs 87;" f
|
||||
overNozzle src/Dodge/HeldUse.hs 980;" f
|
||||
overNozzles src/Dodge/HeldUse.hs 958;" f
|
||||
overNozzles' src/Dodge/HeldUse.hs 966;" f
|
||||
overPos src/Picture/Base.hs 303;" f
|
||||
overPosObj src/Shape.hs 273;" f
|
||||
overPosSH src/Shape.hs 257;" f
|
||||
@@ -6597,7 +6598,7 @@ pointerToItemLocation src/Dodge/Item/Location.hs 21;" f
|
||||
pointerYourItem src/Dodge/Item/Location.hs 31;" f
|
||||
pointsToPoly src/Geometry/ConvexPoly.hs 39;" f
|
||||
poisonSPic src/Dodge/Creature/State.hs 120;" f
|
||||
poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 16;" f
|
||||
poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f
|
||||
poisonSprayer src/Dodge/Item/Weapon/SprayGuns.hs 16;" f
|
||||
poke34 src/Shader/Poke.hs 516;" f
|
||||
pokeArrayOff src/Shader/Poke.hs 527;" f
|
||||
@@ -6859,10 +6860,10 @@ reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 426;" f
|
||||
reloadSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
|
||||
rememberSounds src/Dodge/Creature/Perception.hs 177;" f
|
||||
remoteBombUnarmedPic src/Dodge/Item/Weapon/Grenade.hs 268;" f
|
||||
remoteLauncher src/Dodge/Item/Held/Launcher.hs 56;" f
|
||||
remoteLauncher src/Dodge/Item/Held/Launcher.hs 64;" f
|
||||
remoteShellCollisionCheck src/Dodge/Projectile/Update.hs 42;" f
|
||||
remoteShellShape src/Dodge/Projectile/Draw.hs 39;" f
|
||||
removeAmmoFromMag src/Dodge/HeldUse.hs 538;" f
|
||||
removeAmmoFromMag src/Dodge/HeldUse.hs 552;" f
|
||||
removeEither src/Dodge/Layout/Tree/Either.hs 41;" f
|
||||
removeHotkey src/Dodge/Hotkey.hs 41;" f
|
||||
removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f
|
||||
@@ -7145,7 +7146,7 @@ shatterGun src/Dodge/Item/Held/Weapons.hs 7;" f
|
||||
shatterGunSPic src/Dodge/Item/Draw/SPic.hs 239;" f
|
||||
shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f
|
||||
shellCollisionCheck src/Dodge/Projectile/Update.hs 30;" f
|
||||
shellMag src/Dodge/Item/Ammo.hs 49;" f
|
||||
shellMag src/Dodge/Item/Ammo.hs 54;" f
|
||||
shellShape src/Dodge/Projectile/Draw.hs 24;" f
|
||||
shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f
|
||||
shieldWall src/Dodge/Euse.hs 114;" f
|
||||
@@ -7174,7 +7175,7 @@ shootBangCone src/Dodge/HeldUse/BulletWeapon.hs 98;" f
|
||||
shootBangRod src/Dodge/HeldUse/BulletWeapon.hs 185;" f
|
||||
shootBangstick src/Dodge/HeldUse/BulletWeapon.hs 9;" f
|
||||
shootBezier src/Dodge/Item/Weapon/Bezier.hs 51;" f
|
||||
shootBullet src/Dodge/HeldUse.hs 542;" f
|
||||
shootBullet src/Dodge/HeldUse.hs 556;" f
|
||||
shootBurstRifle src/Dodge/HeldUse/BulletWeapon.hs 164;" f
|
||||
shootBurstRifleRepeat src/Dodge/HeldUse/BulletWeapon.hs 176;" f
|
||||
shootDualLaser src/Dodge/Item/Weapon/BatteryGuns.hs 103;" f
|
||||
@@ -7185,7 +7186,7 @@ shootFlameSpitterRepeat src/Dodge/HeldUse/SprayWeapon.hs 19;" f
|
||||
shootFlameThrower src/Dodge/HeldUse/SprayWeapon.hs 26;" f
|
||||
shootL src/Dodge/Item/Weapon/TriggerType.hs 427;" f
|
||||
shootLaser src/Dodge/Item/Weapon/BatteryGuns.hs 77;" f
|
||||
shootLaser' src/Dodge/HeldUse.hs 521;" f
|
||||
shootLaser' src/Dodge/HeldUse.hs 535;" f
|
||||
shootMachineGun src/Dodge/HeldUse/BulletWeapon.hs 218;" f
|
||||
shootMachinePistol src/Dodge/HeldUse/BulletWeapon.hs 62;" f
|
||||
shootMiniGun src/Dodge/HeldUse/BulletWeapon.hs 113;" f
|
||||
@@ -7196,9 +7197,9 @@ shootRevolverXRepeat src/Dodge/HeldUse/BulletWeapon.hs 49;" f
|
||||
shootRifle src/Dodge/HeldUse/BulletWeapon.hs 140;" f
|
||||
shootShatter src/Dodge/Item/Weapon/Shatter.hs 12;" f
|
||||
shootSmgMod src/Dodge/HeldUse/BulletWeapon.hs 86;" f
|
||||
shootTeslaArc src/Dodge/HeldUse.hs 1081;" f
|
||||
shootTeslaArc src/Dodge/HeldUse.hs 1098;" f
|
||||
shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f
|
||||
shootTractorBeam src/Dodge/HeldUse.hs 499;" f
|
||||
shootTractorBeam src/Dodge/HeldUse.hs 513;" f
|
||||
shootVolleyGun src/Dodge/HeldUse/BulletWeapon.hs 128;" f
|
||||
shootersRoom src/Dodge/Room/Room.hs 317;" f
|
||||
shootersRoom' src/Dodge/Room/Room.hs 282;" f
|
||||
@@ -7317,8 +7318,8 @@ spawnSmokeAtCursor src/Dodge/WorldEvent/Cloud.hs 73;" f
|
||||
spawnerCrit src/Dodge/Creature.hs 55;" f
|
||||
spawnerRoom src/Dodge/Room/Room.hs 362;" f
|
||||
speedLegs src/Dodge/Item/Equipment.hs 131;" f
|
||||
spinDrag src/Dodge/Item/Held/Launcher.hs 73;" f
|
||||
spinStart src/Dodge/Item/Held/Launcher.hs 81;" f
|
||||
spinDrag src/Dodge/Item/Held/Launcher.hs 81;" f
|
||||
spinStart src/Dodge/Item/Held/Launcher.hs 89;" f
|
||||
splashMenu src/Dodge/Menu.hs 27;" f
|
||||
splashMenuOptions src/Dodge/Menu.hs 32;" f
|
||||
splashScreen src/Dodge/Initialisation.hs 11;" f
|
||||
@@ -7504,7 +7505,7 @@ thingsHit src/Dodge/WorldEvent/ThingsHit.hs 29;" f
|
||||
thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 73;" f
|
||||
threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f
|
||||
throwRemoteBomb src/Dodge/Item/Weapon/Grenade.hs 205;" f
|
||||
thrustParam src/Dodge/Item/Held/Launcher.hs 89;" f
|
||||
thrustParam src/Dodge/Item/Held/Launcher.hs 97;" f
|
||||
tileTexCoords src/Tile.hs 10;" f
|
||||
tilesFromRooms src/Dodge/Layout.hs 205;" f
|
||||
tilesToLine src/Shader/AuxAddition.hs 66;" f
|
||||
@@ -7557,7 +7558,7 @@ torso src/Dodge/Creature/Picture.hs 132;" f
|
||||
tractCr src/Dodge/TractorBeam/Update.hs 27;" f
|
||||
tractFlIt src/Dodge/TractorBeam/Update.hs 22;" f
|
||||
tractorBeamAt src/Dodge/Item/Weapon/BatteryGuns.hs 160;" f
|
||||
tractorBeamAt' src/Dodge/HeldUse.hs 510;" f
|
||||
tractorBeamAt' src/Dodge/HeldUse.hs 524;" f
|
||||
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 80;" f
|
||||
tractorGunPic src/Dodge/Item/Draw/SPic.hs 485;" f
|
||||
tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 97;" f
|
||||
@@ -7829,9 +7830,9 @@ useAmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 17;" f
|
||||
useC src/Dodge/Cuse.hs 6;" f
|
||||
useE src/Dodge/Euse.hs 24;" f
|
||||
useEquipment src/Dodge/Creature/State.hs 218;" f
|
||||
useForceFieldGun src/Dodge/HeldUse.hs 1094;" f
|
||||
useGasParams src/Dodge/HeldUse.hs 1007;" f
|
||||
useHeld src/Dodge/HeldUse.hs 921;" f
|
||||
useForceFieldGun src/Dodge/HeldUse.hs 1111;" f
|
||||
useGasParams src/Dodge/HeldUse.hs 1021;" f
|
||||
useHeld src/Dodge/HeldUse.hs 935;" f
|
||||
useHotKey src/Dodge/Creature/YourControl.hs 49;" f
|
||||
useItem src/Dodge/Creature/Action/UseItem.hs 14;" f
|
||||
useItemHotkey src/Dodge/Creature/Impulse/UseItem.hs 124;" f
|
||||
@@ -7840,13 +7841,13 @@ useItemRightClick src/Dodge/Creature/Impulse/UseItem.hs 25;" f
|
||||
useL src/Dodge/Luse.hs 13;" f
|
||||
useLeftItem src/Dodge/Creature/Action/UseItem.hs 38;" f
|
||||
useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f
|
||||
useLoadedAmmo src/Dodge/HeldUse.hs 489;" f
|
||||
useLoadedAmmo src/Dodge/HeldUse.hs 491;" f
|
||||
useMagShield src/Dodge/Euse.hs 69;" f
|
||||
useMod src/Dodge/HeldUse.hs 591;" f
|
||||
useMod src/Dodge/HeldUse.hs 605;" f
|
||||
useNormalCamera src/Dodge/Camera.hs 6;" f
|
||||
usePayload src/Dodge/Payload.hs 7;" f
|
||||
usePjCreation src/Dodge/HeldUse.hs 940;" f
|
||||
usePjCreationX src/Dodge/HeldUse.hs 949;" f
|
||||
usePjCreation src/Dodge/HeldUse.hs 954;" f
|
||||
usePjCreationX src/Dodge/HeldUse.hs 963;" f
|
||||
useRewindGun src/Dodge/Luse.hs 41;" f
|
||||
useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f
|
||||
useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f
|
||||
@@ -7891,6 +7892,7 @@ volleyGun src/Dodge/Item/Held/Cane.hs 33;" f
|
||||
volleyGun src/Dodge/Item/Weapon/BulletGun/Cane.hs 43;" f
|
||||
volleyGunShape src/Dodge/Item/Draw/SPic.hs 373;" f
|
||||
waistSP src/Dodge/Creature/HandPos.hs 199;" f
|
||||
walkNozzle src/Dodge/HeldUse.hs 503;" f
|
||||
walkableNodeNear src/Dodge/Path.hs 48;" f
|
||||
wallBlips src/Dodge/Item/Weapon/UseEffect.hs 43;" f
|
||||
wallBlips src/Dodge/RadarSweep.hs 79;" f
|
||||
|
||||
Reference in New Issue
Block a user