Commit before changes to item grammar
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
All good (620 modules, at 22:28:14)
|
||||
All good (620 modules, at 10:54:07)
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -268,7 +268,10 @@ testInventory =
|
||||
|
||||
stackedInventory :: [Item]
|
||||
stackedInventory =
|
||||
[ targetingScope TARGETLASER
|
||||
[ launcher
|
||||
, remoteScreen
|
||||
, megaShellMag
|
||||
, targetingScope TARGETLASER
|
||||
, zoomScope
|
||||
, burstRifle
|
||||
, megaTinMag
|
||||
@@ -278,9 +281,6 @@ stackedInventory =
|
||||
, chemFuelPouch
|
||||
, bulletSynthesizer
|
||||
, drumMag
|
||||
, launcher
|
||||
, rocketRemoteScreen
|
||||
, megaShellMag
|
||||
, launcherX 3
|
||||
, megaShellMag
|
||||
, megaShellMag
|
||||
|
||||
@@ -15,7 +15,7 @@ data ComposeLinkType
|
||||
| AmmoModLink
|
||||
| WeaponScopeLink
|
||||
| WeaponTargetingLink
|
||||
| RocketRemoteScreenLink
|
||||
| RemoteScreenLink
|
||||
deriving (Eq,Ord,Show,Read)
|
||||
|
||||
data ComposedItem = WeaponCI
|
||||
|
||||
@@ -99,7 +99,7 @@ data AttachType
|
||||
| TARGETATTACH {_ibtAttachTarget :: TargetType}
|
||||
| BULLETSYNTHESIZER
|
||||
| ROCKETHOMER
|
||||
| ROCKETREMOTESCREEN
|
||||
| REMOTESCREEN
|
||||
-- | BULPAYLOADATTACH
|
||||
-- | BULTRAJECTORYATTACH
|
||||
deriving (Eq, Ord, Show, Read)
|
||||
|
||||
@@ -166,7 +166,7 @@ data Muzzle = Muzzle
|
||||
, _mzAmmoSlot :: Int
|
||||
, _mzFlareType :: FlareType
|
||||
, _mzEffect :: MuzzleEffect
|
||||
, _mzChargeRequirement :: Maybe Int
|
||||
-- , _mzChargeRequirement :: Maybe Int
|
||||
-- , _mzRecoil :: Float
|
||||
-- , _mzTorque :: Float
|
||||
-- , _mzSidePush :: Float
|
||||
|
||||
+12
-12
@@ -6,7 +6,7 @@ module Dodge.Default.Item (
|
||||
|
||||
import qualified Data.IntMap.Strict as IM
|
||||
import Control.Lens
|
||||
import qualified Data.Map.Strict as M
|
||||
--import qualified Data.Map.Strict as M
|
||||
import Dodge.Data.Item
|
||||
import Dodge.Default.Item.Effect
|
||||
import Dodge.Default.Item.Use
|
||||
@@ -46,24 +46,24 @@ singleAmmo x = IM.insert 0 x mempty
|
||||
|
||||
defaultBulletWeapon :: Item
|
||||
defaultBulletWeapon =
|
||||
defaultWeapon
|
||||
defaultHeldItem
|
||||
& itUse . heldMods .~ PistolMod
|
||||
& itUse . heldAmmoTypes .~ singleAmmo BulletAmmo
|
||||
-- & itUse . heldUse .~ HeldUseAmmoParams -- useAmmoParams
|
||||
& itType . iyModules . at ModBulletCollision ?~ EMPTYMODULE
|
||||
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 15 0) 0 0.01 0 PistolFlare MuzzleShootBullet Nothing]
|
||||
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 15 0) 0 0.01 0 PistolFlare MuzzleShootBullet]
|
||||
-- & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
|
||||
-- & itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE
|
||||
|
||||
defaultWeapon :: Item
|
||||
defaultWeapon =
|
||||
defaultHeldItem
|
||||
& itUse .~ defaultHeldUse
|
||||
& itType . iyModules
|
||||
.~ M.fromList
|
||||
[ (ModTarget, EMPTYMODULE)
|
||||
, (ModTeleport, EMPTYMODULE)
|
||||
]
|
||||
--defaultWeapon :: Item
|
||||
--defaultWeapon =
|
||||
-- defaultHeldItem
|
||||
-- & itUse .~ defaultHeldUse
|
||||
-- & itType . iyModules
|
||||
-- .~ M.fromList
|
||||
-- [ (ModTarget, EMPTYMODULE)
|
||||
-- , (ModTeleport, EMPTYMODULE)
|
||||
-- ]
|
||||
|
||||
defaultConsumable :: Item
|
||||
defaultConsumable = defaultHeldItem & itUse .~ ConsumeUse CDoNothing
|
||||
|
||||
@@ -11,24 +11,19 @@ defaultAimParams =
|
||||
, _aimRange = 0
|
||||
, _aimZoom = defaultItZoom
|
||||
, _aimStance = OneHand
|
||||
, --, _aimHandlePos = 10
|
||||
_aimHandlePos = V2 3 0
|
||||
, _aimMuzzles = [defaultMuzzle]
|
||||
-- , _aimMuzPos = 20
|
||||
, _aimHandlePos = V2 3 0
|
||||
, _aimMuzzles =
|
||||
[ Muzzle
|
||||
{ _mzPos = V2 20 0
|
||||
, _mzRot = 0
|
||||
, _mzInaccuracy = 0.05
|
||||
, _mzAmmoSlot = 0
|
||||
, _mzFlareType = DefaultFlareType
|
||||
, _mzEffect = MuzzleShootBullet
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
defaultMuzzle :: Muzzle
|
||||
defaultMuzzle = Muzzle
|
||||
{ _mzPos = V2 20 0
|
||||
, _mzRot = 0
|
||||
, _mzInaccuracy = 0.05
|
||||
, _mzAmmoSlot = 0
|
||||
, _mzFlareType = DefaultFlareType
|
||||
, _mzEffect = MuzzleShootBullet
|
||||
, _mzChargeRequirement = Nothing
|
||||
}
|
||||
|
||||
|
||||
defaultItZoom :: ItZoom
|
||||
defaultItZoom =
|
||||
ItZoom
|
||||
|
||||
+34
-7
@@ -131,15 +131,15 @@ applyTorqueCME itm cr w
|
||||
|
||||
-- (Muzzle,Int,Int) = (muzzle, amountloaded, id of mag taken from)
|
||||
loadMuzzle :: LabelDoubleTree ComposeLinkType Item
|
||||
-> Muzzle -> (LabelDoubleTree ComposeLinkType Item,(Muzzle, Int,Maybe Int))
|
||||
loadMuzzle t@(LDT _ l _) mz = fromMaybe (t,(mz, 0,Nothing)) $ do
|
||||
-> Muzzle -> (LabelDoubleTree ComposeLinkType Item,Maybe (Muzzle, Int,LabelDoubleTree ComposeLinkType Item))
|
||||
loadMuzzle t@(LDT _ l _) mz = fromMaybe (t,Nothing) $ do
|
||||
let as = _mzAmmoSlot mz
|
||||
amamount = 1
|
||||
(i,(_,mag)) <- findWithIx (isAmmoIntLink as . fst) l
|
||||
availableammo <- mag ^? ldtValue . itUse . amagLoadStatus . iaLoaded
|
||||
let usedammo = min amamount availableammo
|
||||
return (t & ldtLeft . ix i . _2 . ldtValue . itUse . amagLoadStatus . iaLoaded -~ usedammo
|
||||
, (mz, usedammo, mag ^? ldtValue . itLocation . ilInvID)
|
||||
, Just (mz, usedammo, mag)
|
||||
)
|
||||
|
||||
makeMuzzleFlare :: Muzzle -> Item -> Creature -> World -> World
|
||||
@@ -183,20 +183,23 @@ isAmmoIntLink :: Int -> ComposeLinkType -> Bool
|
||||
isAmmoIntLink i (AmmoInLink j _) = i == j
|
||||
isAmmoIntLink _ _ = False
|
||||
|
||||
useLoadedAmmo :: Item -> Creature -> (CumulativeMuzzleEffect,World) -> (Int,(Muzzle,Int,Maybe Int))
|
||||
useLoadedAmmo :: Item -> Creature -> (CumulativeMuzzleEffect,World)
|
||||
-> (Int,Maybe (Muzzle,Int,LabelDoubleTree ComposeLinkType Item))
|
||||
-> (CumulativeMuzzleEffect,World)
|
||||
useLoadedAmmo _ _ (cme,w) (_,(_,0,_)) = (cme, w)
|
||||
useLoadedAmmo itm cr (cme,w) (mzid,(mz,x,mid)) = (,) (cme & cmeSound .~ True) $
|
||||
useLoadedAmmo _ _ (cme,w) (_,Nothing) = (cme, w)
|
||||
useLoadedAmmo itm cr (cme,w) (mzid,Just (mz,x,magtree)) = (,) (cme & cmeSound .~ True) $
|
||||
removeAmmoFromMag x mid cr . makeMuzzleFlare mz itm cr $ case _mzEffect mz of
|
||||
MuzzleShootBullet -> shootBullet itm cr w (mz,x,mid)
|
||||
MuzzleLaser -> shootLaser' itm cr mz w
|
||||
MuzzleTesla -> shootTeslaArc itm cr mz w
|
||||
MuzzleTractor -> shootTractorBeam itm cr w
|
||||
MuzzleLauncher -> createProjectile mid mz itm cr w
|
||||
MuzzleLauncher -> createProjectile magtree mz itm cr w
|
||||
MuzzleNozzle {} -> useGasParams mid mz itm cr $ walkNozzle mzid mz itm cr w
|
||||
MuzzleShatter -> shootShatter itm cr w
|
||||
MuzzleForceField -> useForceFieldGun itm cr w
|
||||
MuzzleDetector -> itemDetectorEffect itm cr w
|
||||
where
|
||||
mid = magtree ^? ldtValue . itLocation . ilInvID
|
||||
|
||||
itemDetectorEffect :: Item -> Creature -> World -> World
|
||||
itemDetectorEffect itm cr w = fromMaybe w $ do
|
||||
@@ -493,3 +496,27 @@ useForceFieldGun itm cr w = fromMaybe w $ do
|
||||
& moveWallIDUnsafe i wlline
|
||||
where
|
||||
i = fromMaybe (IM.newKey (_walls (_lWorld (_cWorld w)))) $ itm ^? itParams . paramMID . _Just
|
||||
|
||||
createProjectile :: LabelDoubleTree ComposeLinkType Item -> Muzzle -> Item -> Creature -> World -> World
|
||||
createProjectile mmagtree muz itm cr = fromMaybe failsound $ do
|
||||
magid <- mmagtree ^? ldtValue . itLocation . ilInvID
|
||||
ammoitem <- cr ^? crInv . ix magid
|
||||
-- let mremotescreen = magtree ^.
|
||||
-- matype <- ammoitem ^? itUse . amagType
|
||||
-- guard $ matype == ProjectileAmmo
|
||||
j <- ammoitem ^? itLocation . ilInvID
|
||||
pt <- ammoitem ^? itUse . amagParams . ampPjCreation
|
||||
return $ case pt of
|
||||
CreateShell -> fireShell ammoitem muz itm cr . extrafuncs j
|
||||
CreateTrackingShell -> fireTrackingShell ammoitem muz itm cr . extrafuncs j
|
||||
where
|
||||
--extrafuncs j = cancelanyreloading . startthesound . useammo j
|
||||
extrafuncs j = startthesound . useammo j
|
||||
useammo j = cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix j . itUse . amagLoadStatus . iaLoaded -~ 1
|
||||
|
||||
--cancelanyreloading = cWorld . lWorld . creatures . ix (_crID cr) %~ crCancelReloading
|
||||
-- the sound should be moved to the projectile firing
|
||||
startthesound = soundMultiFrom [CrWeaponSound (_crID cr) j | j <- [0..3]] (_crPos cr) tap4S Nothing
|
||||
failsound w' = case w' ^? input . mouseButtons . ix SDL.ButtonLeft of
|
||||
Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
|
||||
_ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ itemFromAttachType at = case at of
|
||||
ZOOMSCOPE -> zoomScope
|
||||
TARGETATTACH tt -> targetingScope tt
|
||||
BULLETSYNTHESIZER -> bulletSynthesizer
|
||||
ROCKETREMOTESCREEN -> rocketRemoteScreen
|
||||
REMOTESCREEN -> remoteScreen
|
||||
ROCKETHOMER -> rocketHomer
|
||||
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ itemString :: Item -> String
|
||||
itemString = head . basicItemDisplay
|
||||
|
||||
itemBaseName :: Item -> String
|
||||
itemBaseName it = case _iyBase $ _itType it of
|
||||
itemBaseName itm = case _iyBase $ _itType itm of
|
||||
CRAFT str -> show str
|
||||
HELD hit -> case hit ^? xNum of
|
||||
Just i -> takeWhile (/= ' ') (show hit) ++ show i
|
||||
@@ -68,15 +68,15 @@ itemBaseName it = case _iyBase $ _itType it of
|
||||
LEFT lit -> show lit
|
||||
EQUIP eit -> showEquipItem eit
|
||||
CONSUMABLE cit -> show cit
|
||||
ATTACH ait -> showAttachItem ait
|
||||
ATTACH ait -> showAttachItem ait itm
|
||||
AMMOMAG ait -> show ait
|
||||
|
||||
showAttachItem :: AttachType -> String
|
||||
showAttachItem t = case t of
|
||||
showAttachItem :: AttachType -> Item -> String
|
||||
showAttachItem t itm = case t of
|
||||
ZOOMSCOPE -> "ZOOMSCOPE"
|
||||
TARGETATTACH x -> show x
|
||||
BULLETSYNTHESIZER -> "BSYNTH"
|
||||
ROCKETREMOTESCREEN -> "REMOTE SCREEN"
|
||||
REMOTESCREEN -> "REMOTE SCREEN " ++ show (itm ^? itUse . atLinkedProjectile . _Just)
|
||||
ROCKETHOMER -> "HOMING MOD"
|
||||
|
||||
showEquipItem :: EquipItemType -> String
|
||||
|
||||
@@ -32,7 +32,7 @@ baseComposedItem ibt itm = case ibt of
|
||||
ATTACH (TARGETATTACH{}) -> (WeaponTargetingCI, [], [])
|
||||
ATTACH ZOOMSCOPE -> (WeaponScopeCI, [], [])
|
||||
ATTACH ROCKETHOMER -> (AmmoModifierCI ProjectileAmmo, [], [])
|
||||
ATTACH ROCKETREMOTESCREEN -> (AmmoModifierCI ProjectileAmmo, [], [])
|
||||
ATTACH REMOTESCREEN -> (AmmoModifierCI ProjectileAmmo, [], [])
|
||||
_ -> (UncomposableCI, [], [])
|
||||
|
||||
heldComposedItem :: Item -> HeldItemType -> CIL
|
||||
|
||||
@@ -32,7 +32,10 @@ teslaGun =
|
||||
& itUse . heldAim . aimWeight .~ 6
|
||||
& itUse . heldAim . aimStance .~ TwoHandFlat
|
||||
-- & itUse . heldAim . aimMuzPos .~ 4
|
||||
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 4 0) 0 0 0 TeslaGunFlare MuzzleTesla Nothing]
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 4 0
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ TeslaGunFlare
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTesla
|
||||
& itType . iyBase .~ HELD TESLAGUN
|
||||
& itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
|
||||
& itUse . heldTriggerType .~ AutoTrigger
|
||||
@@ -46,7 +49,10 @@ lasGun =
|
||||
& itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
|
||||
& itUse . heldDelay .~ NoDelay
|
||||
& itUse . heldTriggerType .~ AutoTrigger
|
||||
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0 0 LasGunFlare MuzzleLaser Nothing]
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ LasGunFlare
|
||||
& itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleLaser
|
||||
& itParams
|
||||
.~ Refracting
|
||||
{ _phaseV = 1
|
||||
|
||||
@@ -42,7 +42,6 @@ volleyGun i =
|
||||
<*> ZipList [0..i-1]
|
||||
<*> pure PistolFlare
|
||||
<*> pure MuzzleShootBullet
|
||||
<*> pure Nothing
|
||||
)
|
||||
& itUse . heldParams . torqueAfter .~ 0.15 + 0.05 * fromIntegral i
|
||||
& itUse . heldParams . recoil .~ 20 + 10 * fromIntegral i
|
||||
@@ -97,7 +96,7 @@ miniGunX i =
|
||||
& 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 Nothing)
|
||||
.~ replicate i (Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet)
|
||||
& itUse . heldParams . recoil .~ 10 * fromIntegral i
|
||||
& itUse . heldParams . torqueAfter .~ 0.04 + 0.02 * fromIntegral i
|
||||
& itUse . heldParams . sidePush .~ 10 * fromIntegral i
|
||||
|
||||
@@ -17,7 +17,7 @@ bangCone =
|
||||
& itUse . heldMods .~ PistolMod
|
||||
-- & itUse . heldAim . aimHandlePos .~ 5
|
||||
& itUse . heldAim . aimMuzzles
|
||||
.~ replicate 15 (Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType MuzzleShootBullet Nothing)
|
||||
.~ replicate 15 (Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType MuzzleShootBullet)
|
||||
& itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8
|
||||
& itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8
|
||||
& itUse . heldParams . recoil .~ 150
|
||||
|
||||
@@ -56,7 +56,6 @@ launcherX i =
|
||||
<*> ZipList [0..]
|
||||
<*> pure DefaultFlareType
|
||||
<*> pure MuzzleLauncher
|
||||
<*> pure Nothing
|
||||
)
|
||||
& itUse . heldAmmoTypes .~ IM.fromList [(j,ProjectileAmmo) | j <- [0..i-1]]
|
||||
where
|
||||
|
||||
@@ -92,7 +92,6 @@ flameThrower =
|
||||
, _nzWalkSpeed = 0.01
|
||||
, _nzCurrentWalkAngle = 0
|
||||
}
|
||||
Nothing
|
||||
]
|
||||
& itUse . heldAmmoTypes .~ singleAmmo GasAmmo
|
||||
& itType . iyBase .~ HELD FLAMETHROWER
|
||||
|
||||
@@ -27,7 +27,7 @@ bangStick i =
|
||||
-- & itUse . heldMods .~ BangStickMod
|
||||
& itUse . heldMods .~ PistolMod
|
||||
& itUse . heldAim . aimMuzzles
|
||||
.~ [Muzzle (V2 10 0) a 0.01 0 DefaultFlareType MuzzleShootBullet Nothing | a <- spreadAroundCenter i baseStickSpread]
|
||||
.~ [Muzzle (V2 10 0) a 0.01 0 DefaultFlareType MuzzleShootBullet | a <- spreadAroundCenter i baseStickSpread]
|
||||
|
||||
baseStickSpread :: Float
|
||||
baseStickSpread = 0.2
|
||||
|
||||
@@ -33,7 +33,7 @@ torch =
|
||||
|
||||
forceFieldGun :: Item
|
||||
forceFieldGun =
|
||||
defaultWeapon
|
||||
defaultHeldItem
|
||||
-- & itUse . useTargeting ?~ TargetRBLine
|
||||
& itType . iyModules . at ModTarget ?~ TARGET TargetRBLine
|
||||
& itParams .~ ParamMID Nothing
|
||||
@@ -52,7 +52,7 @@ Sends out pulses that display walls.
|
||||
-}
|
||||
clickDetector :: Detector -> Item
|
||||
clickDetector dt =
|
||||
defaultWeapon
|
||||
defaultHeldItem
|
||||
& itUse . heldDelay . rateMax .~ 20
|
||||
-- & itUse . heldUse .~ HeldDetectorEffect dt --detectorEffect dt
|
||||
-- & itUse . heldMods .~ AmmoUseCheckMod
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
module Dodge.Item.Scope (
|
||||
zoomScope,
|
||||
targetingScope,
|
||||
rocketRemoteScreen,
|
||||
remoteScreen,
|
||||
) where
|
||||
|
||||
import Control.Lens
|
||||
@@ -21,8 +21,8 @@ targetingScope tt =
|
||||
& itType . iyBase .~ ATTACH (TARGETATTACH tt)
|
||||
& itUse .~ AttachUse Nothing
|
||||
|
||||
rocketRemoteScreen :: Item
|
||||
rocketRemoteScreen =
|
||||
remoteScreen :: Item
|
||||
remoteScreen =
|
||||
defaultHeldItem
|
||||
& itType . iyBase .~ ATTACH ROCKETREMOTESCREEN
|
||||
& itType . iyBase .~ ATTACH REMOTESCREEN
|
||||
& itUse .~ AttachUse Nothing
|
||||
|
||||
@@ -1,38 +1,17 @@
|
||||
module Dodge.Projectile.Create
|
||||
( createProjectile
|
||||
( fireShell
|
||||
, fireTrackingShell
|
||||
) where
|
||||
|
||||
import Dodge.SoundLogic
|
||||
import Control.Monad
|
||||
--import Dodge.SoundLogic
|
||||
--import Control.Monad
|
||||
import Data.Maybe
|
||||
import Dodge.Data.World
|
||||
import Geometry
|
||||
import qualified IntMapHelp as IM
|
||||
import LensHelp
|
||||
import qualified SDL
|
||||
--import qualified SDL
|
||||
|
||||
createProjectile :: Maybe Int -> Muzzle -> Item -> Creature -> World -> World
|
||||
createProjectile mmagid muz itm cr = fromMaybe failsound $ do
|
||||
magid <- mmagid
|
||||
ammoitem <- cr ^? crInv . ix magid
|
||||
matype <- ammoitem ^? itUse . amagType
|
||||
guard $ matype == ProjectileAmmo
|
||||
j <- ammoitem ^? itLocation . ilInvID
|
||||
pt <- ammoitem ^? itUse . amagParams . ampPjCreation
|
||||
return $ case pt of
|
||||
CreateShell -> fireShell ammoitem muz itm cr . extrafuncs j
|
||||
CreateTrackingShell -> fireTrackingShell ammoitem muz itm cr . extrafuncs j
|
||||
where
|
||||
--extrafuncs j = cancelanyreloading . startthesound . useammo j
|
||||
extrafuncs j = startthesound . useammo j
|
||||
useammo j = cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix j . itUse . amagLoadStatus . iaLoaded -~ 1
|
||||
|
||||
--cancelanyreloading = cWorld . lWorld . creatures . ix (_crID cr) %~ crCancelReloading
|
||||
-- the sound should be moved to the projectile firing
|
||||
startthesound = soundMultiFrom [CrWeaponSound (_crID cr) j | j <- [0..3]] (_crPos cr) tap4S Nothing
|
||||
failsound w' = case w' ^? input . mouseButtons . ix SDL.ButtonLeft of
|
||||
Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
|
||||
_ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
|
||||
|
||||
fireShell :: Item -> Muzzle -> Item -> Creature -> World -> World
|
||||
fireShell ammoitem muz it cr =
|
||||
|
||||
+10
-9
@@ -20,15 +20,16 @@ import Dodge.Data.Universe
|
||||
import qualified IntMapHelp as IM
|
||||
|
||||
testStringInit :: Universe -> [String]
|
||||
testStringInit u = (topTestPart u
|
||||
<>) $ map showh $
|
||||
-- (IM.toList . IM.filter (\itloc -> itloc ^? ilCrID == Just 0) $ (u ^. uvWorld . cWorld . lWorld . itemLocations)) <>
|
||||
( IM.elems $ fmap h (u ^?! uvWorld . cWorld . lWorld . creatures . ix 0 . crInv))
|
||||
where
|
||||
h itm = (_itID itm, _itLocation itm)
|
||||
showh (x,(InInv a b c d e)) = show x ++ "," ++ show a ++ "," ++ show b ++"," ++ show c ++"," ++ show d
|
||||
++ "," ++ show e
|
||||
showh _ = ""
|
||||
testStringInit = const mempty
|
||||
--testStringInit u = (topTestPart u
|
||||
-- <>) $ map showh $
|
||||
---- (IM.toList . IM.filter (\itloc -> itloc ^? ilCrID == Just 0) $ (u ^. uvWorld . cWorld . lWorld . itemLocations)) <>
|
||||
-- ( IM.elems $ fmap h (u ^?! uvWorld . cWorld . lWorld . creatures . ix 0 . crInv))
|
||||
-- where
|
||||
-- h itm = (_itID itm, _itLocation itm)
|
||||
-- showh (x,(InInv a b c d e)) = show x ++ "," ++ show a ++ "," ++ show b ++"," ++ show c ++"," ++ show d
|
||||
-- ++ "," ++ show e
|
||||
-- showh _ = ""
|
||||
|
||||
topTestPart :: Universe -> [String]
|
||||
topTestPart u = [show $ u ^? uvWorld . hud . hudElement . diSections . sssExtra . sssSelPos
|
||||
|
||||
@@ -2093,6 +2093,7 @@ RBranches src/TreeExtra.hs 48;" C
|
||||
RED src/Color/Data.hs 15;" C
|
||||
REMOTELAUNCHER src/Dodge/Combine/Data.hs 182;" C
|
||||
REMOTELAUNCHER src/Dodge/Data/Item/Combine.hs 194;" C
|
||||
REMOTESCREEN src/Dodge/Data/Item/Combine.hs 102;" C
|
||||
REPEATER src/Dodge/Combine/Data.hs 150;" C
|
||||
REVOLVEMAG src/Dodge/Data/Item/Combine.hs 108;" C
|
||||
REVOLVER src/Dodge/Combine/Data.hs 136;" C
|
||||
@@ -2104,7 +2105,6 @@ RIFLE src/Dodge/Combine/Data.hs 149;" C
|
||||
RIFLE src/Dodge/Data/Item/Combine.hs 170;" C
|
||||
RLeaf src/TreeExtra.hs 49;" C
|
||||
ROCKETHOMER src/Dodge/Data/Item/Combine.hs 101;" C
|
||||
ROCKETREMOTESCREEN src/Dodge/Data/Item/Combine.hs 102;" C
|
||||
ROSE src/Color/Data.hs 21;" C
|
||||
RPLinkStatus src/Dodge/Data/Room.hs 55;" t
|
||||
RProps src/Dodge/Layout/Generate.hs 13;" C
|
||||
@@ -3669,7 +3669,6 @@ _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 166;" f
|
||||
_mzChargeRequirement src/Dodge/Data/Item/Use.hs 169;" f
|
||||
_mzEffect src/Dodge/Data/Item/Use.hs 168;" f
|
||||
_mzFlareType src/Dodge/Data/Item/Use.hs 167;" f
|
||||
_mzInaccuracy src/Dodge/Data/Item/Use.hs 165;" f
|
||||
@@ -4501,7 +4500,7 @@ autoGunSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
|
||||
autoPistol src/Dodge/Item/Held/Stick.hs 53;" f
|
||||
autoPistol src/Dodge/Item/Weapon/BulletGun/Stick.hs 79;" f
|
||||
autoRadarEffect src/Dodge/Item/Weapon/ExtraEffect.hs 39;" f
|
||||
autoRifle src/Dodge/Item/Held/Cane.hs 69;" f
|
||||
autoRifle src/Dodge/Item/Held/Cane.hs 68;" f
|
||||
autoRifle src/Dodge/Item/Weapon/BulletGun/Cane.hs 97;" f
|
||||
autoSonarEffect src/Dodge/Item/Weapon/ExtraEffect.hs 43;" f
|
||||
autogunSpread src/Dodge/Item/Weapon/AutoGun.hs 78;" f
|
||||
@@ -4523,7 +4522,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 445;" f
|
||||
bangStickSoundChoice src/Dodge/HeldUse.hs 448;" 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
|
||||
@@ -4546,7 +4545,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 75;" f
|
||||
basicAmPjMoves src/Dodge/Item/Held/Launcher.hs 74;" 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
|
||||
@@ -4563,7 +4562,7 @@ basicMuzFlare src/Dodge/HeldUse.hs 161;" f
|
||||
basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f
|
||||
basicTerminal src/Dodge/Terminal.hs 32;" f
|
||||
battery src/Dodge/Item/Ammo.hs 76;" f
|
||||
batteryModules src/Dodge/Item/Held/BatteryGuns.hs 121;" f
|
||||
batteryModules src/Dodge/Item/Held/BatteryGuns.hs 127;" f
|
||||
batteryPack src/Dodge/Item/Equipment.hs 58;" f
|
||||
belowNumX src/Dodge/Combine/Graph.hs 77;" f
|
||||
beltMag src/Dodge/Item/Ammo.hs 42;" f
|
||||
@@ -4648,7 +4647,7 @@ bulletSpawn src/Dodge/Bullet.hs 105;" f
|
||||
bulletSynthesizer src/Dodge/Item/Ammo.hs 104;" f
|
||||
bulletTypes src/Dodge/TweakBullet.hs 26;" f
|
||||
bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f
|
||||
burstRifle src/Dodge/Item/Held/Cane.hs 78;" f
|
||||
burstRifle src/Dodge/Item/Held/Cane.hs 77;" f
|
||||
burstRifle src/Dodge/Item/Weapon/BulletGun/Cane.hs 105;" f
|
||||
buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f
|
||||
buzzSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
|
||||
@@ -4657,7 +4656,7 @@ calcTexCoord src/Tile.hs 17;" f
|
||||
canAttachTargeting src/Dodge/Item/Display.hs 19;" f
|
||||
canSee src/Dodge/Base/Collide.hs 228;" f
|
||||
canSeeIndirect src/Dodge/Base/Collide.hs 235;" f
|
||||
caneStickSoundChoice src/Dodge/HeldUse.hs 440;" f
|
||||
caneStickSoundChoice src/Dodge/HeldUse.hs 443;" f
|
||||
cardList src/Dodge/Base/CardinalPoint.hs 6;" f
|
||||
cardVec src/Dodge/Base/CardinalPoint.hs 9;" f
|
||||
cardinalVectors src/Dodge/FloorItem.hs 39;" f
|
||||
@@ -4889,7 +4888,7 @@ createItemYou src/Dodge/Inventory/Add.hs 77;" f
|
||||
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 14;" f
|
||||
createProjectile src/Dodge/HeldUse.hs 500;" f
|
||||
createShieldWall src/Dodge/Euse.hs 134;" f
|
||||
createTorchLightOffset src/Dodge/LightSource/Torch.hs 9;" f
|
||||
createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f
|
||||
@@ -5027,7 +5026,7 @@ defaultAudition src/Dodge/Default/Creature.hs 99;" f
|
||||
defaultAutoWall src/Dodge/Default/Door.hs 15;" f
|
||||
defaultBangCane src/Dodge/Item/Held/Cane.hs 19;" f
|
||||
defaultBangCane src/Dodge/Item/Weapon/BulletGun/Cane.hs 16;" f
|
||||
defaultBatteryGun src/Dodge/Item/Held/BatteryGuns.hs 116;" f
|
||||
defaultBatteryGun src/Dodge/Item/Held/BatteryGuns.hs 122;" f
|
||||
defaultBlock src/Dodge/Default/Block.hs 5;" f
|
||||
defaultBounds src/Dodge/Bounds.hs 13;" f
|
||||
defaultBounds src/Dodge/Data/Bounds.hs 20;" f
|
||||
@@ -5078,7 +5077,7 @@ defaultInvSection src/Dodge/Default/World.hs 217;" f
|
||||
defaultInvSections src/Dodge/Default/World.hs 175;" f
|
||||
defaultInvSize src/Dodge/Default/Creature.hs 79;" f
|
||||
defaultItEffect src/Dodge/Default/Item/Effect.hs 5;" f
|
||||
defaultItZoom src/Dodge/Default/Item/Use/AimParams.hs 32;" f
|
||||
defaultItZoom src/Dodge/Default/Item/Use/AimParams.hs 27;" f
|
||||
defaultItemDimension src/Dodge/Default/Item.hs 15;" f
|
||||
defaultKeyConfigSDL src/Dodge/Config/KeyConfig.hs 38;" f
|
||||
defaultLS src/Dodge/Default/LightSource.hs 6;" f
|
||||
@@ -5090,7 +5089,6 @@ defaultListDisplayParams src/Dodge/ListDisplayParams.hs 18;" f
|
||||
defaultLoadable src/Dodge/Default/Item/Held/Consumption.hs 7;" f
|
||||
defaultMachine src/Dodge/Default.hs 33;" f
|
||||
defaultMachineWall src/Dodge/Default/Wall.hs 48;" f
|
||||
defaultMuzzle src/Dodge/Default/Item/Use/AimParams.hs 20;" f
|
||||
defaultPP src/Dodge/Default.hs 66;" f
|
||||
defaultPerceptionState src/Dodge/Default/Creature.hs 82;" f
|
||||
defaultPreload src/Preload/Default.hs 6;" f
|
||||
@@ -5111,7 +5109,6 @@ defaultTerminal src/Dodge/Default/Terminal.hs 8;" f
|
||||
defaultTerminalInput src/Dodge/Default/Terminal.hs 30;" f
|
||||
defaultVision src/Dodge/Default/Creature.hs 92;" f
|
||||
defaultWall src/Dodge/Default/Wall.hs 10;" f
|
||||
defaultWeapon src/Dodge/Default/Item.hs 58;" f
|
||||
defaultWindow src/Dodge/Default/Wall.hs 74;" f
|
||||
defaultWorld src/Dodge/Default/World.hs 32;" f
|
||||
defaultWorldHammers src/Dodge/Default/Input.hs 28;" f
|
||||
@@ -5199,7 +5196,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 408;" f
|
||||
doGenFloat src/Dodge/HeldUse.hs 411;" f
|
||||
doInPlacements src/Dodge/Layout.hs 92;" f
|
||||
doIndividualPlacements src/Dodge/Layout.hs 117;" f
|
||||
doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 25;" f
|
||||
@@ -5484,11 +5481,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 412;" f
|
||||
fireRemoteShell src/Dodge/HeldUse.hs 415;" f
|
||||
fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 332;" f
|
||||
fireShell src/Dodge/Projectile/Create.hs 37;" f
|
||||
fireShell src/Dodge/Projectile/Create.hs 16;" f
|
||||
fireSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
|
||||
fireTrackingShell src/Dodge/Projectile/Create.hs 83;" f
|
||||
fireTrackingShell src/Dodge/Projectile/Create.hs 62;" f
|
||||
firstBreather src/Dodge/Room/Breather.hs 9;" f
|
||||
firstWorldLoad appDodge/Main.hs 77;" f
|
||||
fixedCoordPictures src/Dodge/Render/Picture.hs 17;" f
|
||||
@@ -5587,7 +5584,7 @@ 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
|
||||
gasCreate src/Dodge/HeldUse.hs 404;" f
|
||||
gasCreate src/Dodge/HeldUse.hs 407;" f
|
||||
generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f
|
||||
generateGraphs src/Dodge/LevelGen.hs 39;" f
|
||||
generateLayout src/Dodge/Layout/Generate.hs 10;" f
|
||||
@@ -5887,7 +5884,7 @@ itemBlips src/Dodge/Item/Weapon/UseEffect.hs 38;" f
|
||||
itemBlips src/Dodge/RadarSweep.hs 75;" f
|
||||
itemCombinations src/Dodge/Combine/Combinations.hs 54;" f
|
||||
itemCombinationsEdges src/Dodge/Combine/Graph.hs 55;" f
|
||||
itemDetectorEffect src/Dodge/HeldUse.hs 201;" f
|
||||
itemDetectorEffect src/Dodge/HeldUse.hs 204;" f
|
||||
itemDisplay src/Dodge/Item/Display.hs 33;" f
|
||||
itemDisplayPad src/Dodge/Item/Display.hs 45;" f
|
||||
itemEffect src/Dodge/Creature/Action/UseItem.hs 28;" f
|
||||
@@ -5960,9 +5957,9 @@ lampCrSPic src/Dodge/Render/ShapePicture.hs 94;" f
|
||||
lasBeamCombine src/Dodge/Beam.hs 31;" f
|
||||
lasCenSensEdge src/Dodge/Room/LasTurret.hs 112;" f
|
||||
lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f
|
||||
lasGun src/Dodge/Item/Held/BatteryGuns.hs 40;" f
|
||||
lasGun src/Dodge/Item/Held/BatteryGuns.hs 43;" f
|
||||
lasGunPic src/Dodge/Item/Draw/SPic.hs 457;" f
|
||||
lasGunTweak src/Dodge/Item/Held/BatteryGuns.hs 72;" f
|
||||
lasGunTweak src/Dodge/Item/Held/BatteryGuns.hs 78;" f
|
||||
lasRayAt src/Dodge/Beam.hs 62;" f
|
||||
lasSensorTurretTest src/Dodge/Room/LasTurret.hs 105;" f
|
||||
lasTunnel src/Dodge/Room/LasTurret.hs 124;" f
|
||||
@@ -6091,7 +6088,7 @@ makeArc src/Picture/Base.hs 157;" f
|
||||
makeBlip src/Dodge/RadarSweep.hs 51;" f
|
||||
makeBlockDebris src/Dodge/Block/Debris.hs 28;" f
|
||||
makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f
|
||||
makeBullet src/Dodge/HeldUse.hs 276;" f
|
||||
makeBullet src/Dodge/HeldUse.hs 279;" f
|
||||
makeButton src/Dodge/LevelGen/Switch.hs 16;" f
|
||||
makeByteStringShaderUsingVAO src/Shader/Compile.hs 137;" f
|
||||
makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f
|
||||
@@ -6134,7 +6131,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 56;" f
|
||||
makeShell src/Dodge/Projectile/Create.hs 35;" f
|
||||
makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 12;" f
|
||||
makeSourcedShader src/Shader/Compile.hs 203;" f
|
||||
makeStartCloudAt src/Dodge/WorldEvent/Cloud.hs 60;" f
|
||||
@@ -6184,10 +6181,10 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 104;" f
|
||||
mcSPic src/Dodge/Render/ShapePicture.hs 170;" f
|
||||
mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 69;" f
|
||||
mcSensorUpdate src/Dodge/Machine/Update.hs 99;" f
|
||||
mcShootLaser src/Dodge/HeldUse.hs 460;" f
|
||||
mcShootLaser src/Dodge/HeldUse.hs 463;" f
|
||||
mcTriggerVal src/Dodge/Machine/Update.hs 75;" f
|
||||
mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f
|
||||
mcUseHeld src/Dodge/HeldUse.hs 301;" f
|
||||
mcUseHeld src/Dodge/HeldUse.hs 304;" f
|
||||
mcUseItem src/Dodge/Machine/Update.hs 61;" f
|
||||
medkit src/Dodge/Item/Consumable.hs 8;" f
|
||||
megaBattery src/Dodge/Item/Ammo.hs 71;" f
|
||||
@@ -6233,7 +6230,7 @@ minStreamOn src/StreamingHelp.hs 14;" f
|
||||
mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 322;" f
|
||||
miniGunCrit src/Dodge/Creature.hs 62;" f
|
||||
miniGunUse src/Dodge/Item/Weapon/BulletGun/Cane.hs 113;" f
|
||||
miniGunX src/Dodge/Item/Held/Cane.hs 89;" f
|
||||
miniGunX src/Dodge/Item/Held/Cane.hs 88;" f
|
||||
miniGunX src/Dodge/Item/Weapon/BulletGun/Cane.hs 120;" f
|
||||
miniGunXPict src/Dodge/Item/Draw/SPic.hs 391;" f
|
||||
miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 385;" f
|
||||
@@ -6821,10 +6818,11 @@ 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 66;" f
|
||||
remoteLauncher src/Dodge/Item/Held/Launcher.hs 65;" f
|
||||
remoteScreen src/Dodge/Item/Scope.hs 24;" f
|
||||
remoteShellCollisionCheck src/Dodge/Projectile/Update.hs 42;" f
|
||||
remoteShellShape src/Dodge/Projectile/Draw.hs 39;" f
|
||||
removeAmmoFromMag src/Dodge/HeldUse.hs 259;" f
|
||||
removeAmmoFromMag src/Dodge/HeldUse.hs 262;" 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
|
||||
@@ -6878,7 +6876,7 @@ rezInvBox src/Dodge/Room/RezBox.hs 131;" f
|
||||
rezText src/Dodge/Story.hs 4;" f
|
||||
rezText' src/Dodge/Story.hs 17;" f
|
||||
rhombus src/Polyhedra.hs 71;" f
|
||||
rifle src/Dodge/Item/Held/Cane.hs 52;" f
|
||||
rifle src/Dodge/Item/Held/Cane.hs 51;" f
|
||||
rifle src/Dodge/Item/Weapon/BulletGun/Cane.hs 77;" f
|
||||
right src/DoubleStack.hs 16;" f
|
||||
rightIsParentCombine src/Dodge/Item/Grammar.hs 65;" f
|
||||
@@ -6891,7 +6889,6 @@ rmLinksOfType src/Dodge/RoomLink.hs 135;" f
|
||||
rmOutLinks src/Dodge/RoomLink.hs 138;" f
|
||||
rmSelectedInvItem src/Dodge/Inventory.hs 187;" f
|
||||
rocketHomer src/Dodge/Item/Ammo.hs 109;" f
|
||||
rocketRemoteScreen src/Dodge/Item/Scope.hs 24;" f
|
||||
roomC src/Dodge/Room/Room.hs 39;" f
|
||||
roomCCrits src/Dodge/Room/Room.hs 262;" f
|
||||
roomCenterPillar src/Dodge/Room/Room.hs 121;" f
|
||||
@@ -7139,7 +7136,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 264;" f
|
||||
shootBullet src/Dodge/HeldUse.hs 267;" f
|
||||
shootBurstRifle src/Dodge/HeldUse/BulletWeapon.hs 164;" f
|
||||
shootBurstRifleRepeat src/Dodge/HeldUse/BulletWeapon.hs 176;" f
|
||||
shootElephantGun src/Dodge/HeldUse/BulletWeapon.hs 196;" f
|
||||
@@ -7149,7 +7146,7 @@ shootFlameSpitterRepeat src/Dodge/HeldUse/SprayWeapon.hs 19;" f
|
||||
shootFlameThrower src/Dodge/HeldUse/SprayWeapon.hs 26;" f
|
||||
shootL src/Dodge/Item/Weapon/TriggerType.hs 298;" f
|
||||
shootLaser src/Dodge/Item/Weapon/BatteryGuns.hs 77;" f
|
||||
shootLaser' src/Dodge/HeldUse.hs 242;" f
|
||||
shootLaser' src/Dodge/HeldUse.hs 245;" 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
|
||||
@@ -7160,9 +7157,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 469;" f
|
||||
shootTeslaArc src/Dodge/HeldUse.hs 472;" f
|
||||
shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f
|
||||
shootTractorBeam src/Dodge/HeldUse.hs 221;" f
|
||||
shootTractorBeam src/Dodge/HeldUse.hs 224;" 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
|
||||
@@ -7172,7 +7169,7 @@ shortPoint2 src/Dodge/ShortShow.hs 4;" f
|
||||
shortShow src/ShortShow.hs 8;" f
|
||||
shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 508;" f
|
||||
shotgunSound src/Dodge/SoundLogic/Synonyms.hs 4;" f
|
||||
shoulderHeight src/Dodge/Item/HeldOffset.hs 60;" f
|
||||
shoulderHeight src/Dodge/Item/HeldOffset.hs 57;" f
|
||||
shoulderSH src/Dodge/Creature/Picture.hs 170;" f
|
||||
shoulderSP src/Dodge/Creature/HandPos.hs 196;" f
|
||||
showAttachItem src/Dodge/Item/Display.hs 74;" f
|
||||
@@ -7184,10 +7181,10 @@ showIntKMG src/Dodge/Item/Info.hs 47;" f
|
||||
showIntKMG' src/Dodge/Item/Info.hs 54;" f
|
||||
showIntsString src/Dodge/Tree/Compose.hs 129;" f
|
||||
showLoadedAmount src/Dodge/Item/Display.hs 147;" f
|
||||
showManObj src/Dodge/TestString.hs 38;" f
|
||||
showManObj src/Dodge/TestString.hs 39;" f
|
||||
showPhaseV src/Dodge/Tweak/Show.hs 16;" f
|
||||
showTerminalError src/Dodge/Debug/Terminal.hs 75;" f
|
||||
showTimeFlow src/Dodge/TestString.hs 85;" f
|
||||
showTimeFlow src/Dodge/TestString.hs 86;" f
|
||||
showTractionPower src/Dodge/Tweak/Show.hs 22;" f
|
||||
showTweak src/Dodge/Tweak/Show.hs 5;" f
|
||||
shrinkGun src/Dodge/Item/Weapon/Utility.hs 44;" f
|
||||
@@ -7281,8 +7278,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 83;" f
|
||||
spinStart src/Dodge/Item/Held/Launcher.hs 91;" f
|
||||
spinDrag src/Dodge/Item/Held/Launcher.hs 82;" f
|
||||
spinStart src/Dodge/Item/Held/Launcher.hs 90;" f
|
||||
splashMenu src/Dodge/Menu.hs 27;" f
|
||||
splashMenuOptions src/Dodge/Menu.hs 32;" f
|
||||
splashScreen src/Dodge/Initialisation.hs 11;" f
|
||||
@@ -7356,7 +7353,7 @@ strFromHeldItem src/Dodge/Creature/Statistics.hs 37;" f
|
||||
streamFromZone src/Dodge/Zone.hs 39;" f
|
||||
strengthFactor src/Dodge/Creature/Impulse/Movement.hs 32;" f
|
||||
strictify src/MaybeHelp.hs 37;" f
|
||||
strideRot src/Dodge/Item/HeldOffset.hs 63;" f
|
||||
strideRot src/Dodge/Item/HeldOffset.hs 60;" f
|
||||
stringToList src/Picture/Base.hs 313;" f
|
||||
stringToListGrad src/Picture/Text.hs 12;" f
|
||||
stripZ src/Geometry/Vector3D.hs 97;" f
|
||||
@@ -7468,7 +7465,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 99;" f
|
||||
thrustParam src/Dodge/Item/Held/Launcher.hs 98;" f
|
||||
tileTexCoords src/Tile.hs 10;" f
|
||||
tilesFromRooms src/Dodge/Layout.hs 205;" f
|
||||
tilesToLine src/Shader/AuxAddition.hs 66;" f
|
||||
@@ -7511,17 +7508,17 @@ tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 320;" f
|
||||
topInvW src/Dodge/ListDisplayParams.hs 51;" f
|
||||
topPrismEdgeIndices src/Shader/Poke.hs 327;" f
|
||||
topPrismIndices src/Shader/Poke.hs 402;" f
|
||||
topTestPart src/Dodge/TestString.hs 33;" f
|
||||
topTestPart src/Dodge/TestString.hs 34;" f
|
||||
torch src/Dodge/Item/Held/Utility.hs 26;" f
|
||||
torchShape src/Dodge/Item/Draw/SPic.hs 203;" f
|
||||
torqueCr src/Dodge/WorldEffect.hs 70;" f
|
||||
torso src/Dodge/Creature/Picture.hs 132;" f
|
||||
tractCr src/Dodge/TractorBeam/Update.hs 28;" f
|
||||
tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f
|
||||
tractorBeamAt src/Dodge/HeldUse.hs 231;" f
|
||||
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 80;" f
|
||||
tractorBeamAt src/Dodge/HeldUse.hs 234;" f
|
||||
tractorGun src/Dodge/Item/Held/BatteryGuns.hs 86;" f
|
||||
tractorGunPic src/Dodge/Item/Draw/SPic.hs 485;" f
|
||||
tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 98;" f
|
||||
tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 104;" f
|
||||
tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f
|
||||
tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f
|
||||
tranRot src/Picture/Base.hs 124;" f
|
||||
@@ -7626,7 +7623,7 @@ twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 78;" f
|
||||
twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 27;" f
|
||||
twists src/Dodge/Creature/Test.hs 103;" f
|
||||
twoFlat src/Dodge/Creature/Test.hs 100;" f
|
||||
twoFlatHRot src/Dodge/Item/HeldOffset.hs 72;" f
|
||||
twoFlatHRot src/Dodge/Item/HeldOffset.hs 69;" f
|
||||
twoRoomPoss src/Dodge/PlacementSpot.hs 147;" f
|
||||
twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 388;" f
|
||||
twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 424;" f
|
||||
@@ -7795,9 +7792,9 @@ useC src/Dodge/Cuse.hs 8;" f
|
||||
useC' src/Dodge/Cuse.hs 13;" f
|
||||
useE src/Dodge/Euse.hs 24;" f
|
||||
useEquipment src/Dodge/Creature/State.hs 222;" f
|
||||
useForceFieldGun src/Dodge/HeldUse.hs 483;" f
|
||||
useGasParams src/Dodge/HeldUse.hs 383;" f
|
||||
useHeld src/Dodge/HeldUse.hs 306;" f
|
||||
useForceFieldGun src/Dodge/HeldUse.hs 486;" f
|
||||
useGasParams src/Dodge/HeldUse.hs 386;" f
|
||||
useHeld src/Dodge/HeldUse.hs 309;" 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 126;" f
|
||||
@@ -7855,7 +7852,7 @@ volleyGun src/Dodge/Item/Held/Cane.hs 32;" 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 206;" f
|
||||
walkNozzle src/Dodge/HeldUse.hs 209;" f
|
||||
walkableNodeNear src/Dodge/Path.hs 48;" f
|
||||
wallBlips src/Dodge/Item/Weapon/UseEffect.hs 43;" f
|
||||
wallBlips src/Dodge/RadarSweep.hs 80;" f
|
||||
|
||||
Reference in New Issue
Block a user