rename debug terminal to console

Have introduced quite a few unsafe functions

.ghci

@@ -0,0 +1 @@
+:set prompt ">"

.ghcid

@@ -0,0 +1 @@
+--command "stack ghci --main-is loop:exe:dodge"

appDodge/Main.hs

@@ -22,7 +22,6 @@ import Dodge.TestString
 import Dodge.Update
 --import qualified IntMapHelp as IM
 import Loop
-import Music
 --import Picture
 import Preload
 import Preload.Render
@@ -34,6 +33,7 @@ import qualified SDL
 import Sound
 import System.Directory
 
+
 main :: IO ()
 main = do
     -- load the config to get the window size and position
@@ -95,7 +95,10 @@ firstWorldLoad theConfig = do
                 , _uvFrameTicks = 0
                 , _uvRAMSave = Nothing
                 , _uvDebug = mempty
+                , _uvDebugFloat1 = 10
+                , _uvDebugFloat2 = 0
                 , _uvDebugMessageOffset = 0
+                , _uvSoundQueue = mempty
                 }
     return $ u & uvScreenLayers .~ [splashMenu u]
 
@@ -117,6 +120,7 @@ playSoundUnlessRewinding u = case w ^. timeFlow of
 doSideEffects :: Universe -> IO Universe
 doSideEffects u = do
     newPlayingSounds <- playSoundUnlessRewinding u
+    playSoundQueue (_soundData $ _preloadData u) (fmap _getSoundID $ u ^. uvSoundQueue)
     u' <- _uvIOEffects u u
     endTicks <- SDL.ticks
     return $
@@ -126,6 +130,7 @@ doSideEffects u = do
             & uvWorld . playingSounds .~ newPlayingSounds
             & uvWorld . toPlaySounds .~ M.empty
             & uvIOEffects .~ return
+            & uvSoundQueue .~ mempty
 
 doPreload :: IO PreloadData
 doPreload = do
@@ -140,7 +145,7 @@ doPreload = do
     return
         PreloadData
             { _renderData = rData
-            , _soundData = SoundData{_loadedChunks = lChunks}
+            , _soundData = lChunks
             --, _musicData = MusicData{_loadedMusic = lMusic}
-            , _musicData = MusicData{_loadedMusic = undefined}
+            , _musicData = mempty
             }

asdf

@@ -0,0 +1,483 @@
+{- |
+Weapon effects when pulling the trigger.  -}
+module Dodge.Item.Weapon.TriggerType
+    where
+import Dodge.Data
+import Dodge.SoundLogic
+import Dodge.Creature.Action (startReloadingWeapon)
+import Dodge.WorldEvent (muzzleFlashAt,tempLightForAt)
+import Dodge.WorldEvent.Cloud
+import Dodge.RandomHelp
+import Dodge.Particle.Bullet.Spawn
+import Dodge.Item.Attachment.Data
+import Dodge.Item.Data
+import Geometry
+
+import System.Random
+import Control.Lens
+import Control.Monad.State
+import Data.Maybe
+import qualified Data.IntMap.Strict as IM
+import Data.Foldable
+
+withThinSmoke 
+    :: (Creature -> World -> World) -- ^ Underlying effect
+    -> Creature   
+    -> World 
+    -> World
+withThinSmoke eff cr w = eff cr $ foldl' (flip $ makeThinSmokeAt . (+.+ pos)) w ps
+  where
+    dir = _crDir cr
+    pos = _crPos cr +.+ (_crRad cr +0.5) *.* unitVectorAtAngle dir
+    ps = (replicateM 5 . randInCirc) 8 & evalState $ _randGen w
+
+withThickSmoke 
+    :: (Creature -> World -> World) -- ^ Underlying effect
+    -> Creature  
+    -> World 
+    -> World
+withThickSmoke eff cr w = eff cr $ foldl' (flip $ makeThickSmokeAt . (+.+ pos)) w ps
+  where
+    dir = _crDir cr
+    pos = _crPos cr +.+ (_crRad cr + 15) *.* unitVectorAtAngle dir
+    ps = (replicateM 20 . randInCirc) 8 & evalState $ _randGen w
+{- |
+Fires at an increasing rate.
+Has different effect after first fire.
+Applies ammo check and use cooldown check.  -}
+rateIncAB 
+    :: Int  -- ^ Start rate
+    -> Int  -- ^ End rate
+    -> (Creature -> World -> World)  -- ^ Effect on first fire
+    -> (Creature -> World -> World)  -- ^ Effect on continued fire
+    -> Creature  -- ^ Creature id
+    -> World 
+    -> World
+rateIncAB startRate fastRate shooteff1 shooteff2 cr w
+    | repeatFire = w
+        & pointItem %~ ( (itUseRate .~ max fastRate (currentRate - 1))
+            . (wpLoadedAmmo -~ 1)
+            . (itUseTime .~ currentRate) )
+        & shooteff2 cr
+    | firstFire = w
+        & pointItem %~ ( (itUseRate .~ startRate - 1)
+            . (wpLoadedAmmo -~ 1)
+            . (itUseTime .~ startRate) )
+        & shooteff1 cr
+    | reloadCondition = fromMaybe w $ startReloadingWeapon cr w
+    | otherwise = w
+  where 
+    cid = _crID cr
+    itRef = _crInvSel cr
+    item = _crInv cr IM.! itRef
+    pointItem = creatures . ix cid . crInv . ix itRef
+    currentRate = _itUseRate item
+    repeatFire = _wpReloadState item == 0 
+        && _itUseTime item == 1 
+        && _wpLoadedAmmo item > 0
+    firstFire = _wpReloadState item == 0 
+        && _itUseTime item == 0 
+        && _wpLoadedAmmo item > 0
+    reloadCondition = _wpLoadedAmmo item == 0
+{- |
+Shoot a weapon rapidly after a warm up.
+Applies ammo check as well.  -}
+withWarmUp 
+    :: Int  -- ^ Warm up time (in frames)
+    -> (Creature -> World -> World) 
+            -- ^ Shoot effect
+    -> Creature
+    -> World 
+    -> World
+withWarmUp t f cr w 
+    | reloadCondition = fromMaybe w $ startReloadingWeapon cr w
+    | _wpReloadState item /= 0 = w
+    | fState == 0 = w
+        & pointerToItem %~ ( (itUse .~ (\_ -> withWarmUp 100 f)) . (itUseTime .~ 2) )
+    | t > 2 = w 
+        & pointerToItem %~ ( (itUse .~ (\_ -> withWarmUp (t-1) f)) . (itUseTime .~ 2) )
+        & soundFrom (CrWeaponSound cid) 26 2 0
+    | t > 0 = w 
+        & pointerToItem %~ ( (itUse .~ (\_ -> withWarmUp (t-1) f)) . (itUseTime .~ 2) )
+    | otherwise = w 
+        & pointerToItem %~ ( (itUse .~ (\_ -> withWarmUp 1 f)) . (wpLoadedAmmo -~ 1) . (itUseTime .~ 2) )
+        & f cr
+        & soundFrom (CrWeaponSound cid) 28 2 0
+  where 
+    cid = _crID cr
+    itRef = _crInvSel cr
+    item = _crInv cr IM.! itRef
+    pointerToItem = creatures . ix cid . crInv . ix itRef
+    fState = _itUseTime item
+    reloadCondition = _wpLoadedAmmo item == 0
+{- | Adds a sound to a creature based world effect. 
+The sound is emitted from the creature's position. -}
+withSound 
+    :: Int -- ^ Sound id
+    -> (Creature -> World -> World) -- ^ Underlying effect
+    -> Creature 
+    -> World -> World
+withSound soundid f cr = soundOncePos soundid (_crPos cr) . f cr
+
+withRecoil 
+    :: Float    -- ^ Recoil amount
+    -> (Creature -> World -> World) 
+                -- ^ Underlying world effect, takes creature id as input
+    -> Creature 
+    -> World -> World
+withRecoil recoilAmount eff cr = eff cr . over (creatures . ix cid) pushback
+  where 
+    cid = _crID cr
+    pushback = over crPos (+.+ rotateV (_crDir cr) (V2 ((-recoilAmount) / _crMass cr ) 0))
+{- | Pushes a creature sideways by a random amount.
+Applied before the underlying effect.  -}
+withSidePush 
+    :: Float    -- ^ Maximal possible side push amount
+    -> (Creature -> World -> World)  
+                -- ^ Underlying world effect, takes creature id as input
+    -> Creature 
+    -> World -> World
+withSidePush maxSide eff cr w = eff cr . over (creatures . ix cid) push $ w
+  where 
+    cid = _crID cr
+    push = over crPos (+.+ rotateV (_crDir cr) (V2 0 (pushAmount / _crMass cr)))
+    (pushAmount, _) = randomR (-maxSide,maxSide) $ _randGen w
+-- consider unifying the pushes using a direction vector
+{- | Pushes a creature sideways by a random amount.
+Applied after the underlying effect.  -}
+withSidePushAfter
+    :: Float    -- ^ Maximal possible side push amount
+    -> (Creature -> World -> World)  
+                -- ^ Underlying world effect, takes creature id as input
+    -> Creature      -- ^ Creature id
+    -> World -> World
+withSidePushAfter maxSide eff cr w = over (creatures . ix cid) push . eff cr $ w
+  where 
+    cid = _crID cr
+    push = over crPos (+.+ rotateV (_crDir cr) (V2 0 (pushAmount / _crMass cr)))
+    (pushAmount, _) = randomR (-maxSide,maxSide) $ _randGen w
+{- | Applies a world effect and sound effect after an ammo check. -}
+shootWithSound 
+    :: Int  -- ^ Sound identifier
+    -> (Creature -> World -> World) 
+            -- ^ Shoot effect, takes creature id as input
+    -> Creature 
+    -> World 
+    -> World
+shootWithSound soundid f cr w
+    | fireCondition = over (pointerToItem . wpLoadedAmmo) (\ammo -> ammo-1) 
+        $ soundOncePos soundid (_crPos cr)
+        $ set (pointerToItem . itUseTime) (_itUseRate item)
+        $ f cr w
+    | reloadCondition = fromMaybe w $ startReloadingWeapon cr w
+    | otherwise = w
+  where 
+    cid = _crID cr
+    itRef = _crInvSel cr
+    item = _crInv cr IM.! itRef
+    pointerToItem = creatures . ix cid . crInv . ix itRef
+    fireCondition = _wpReloadState item == 0
+                      && _itUseTime item == 0
+                      && _wpLoadedAmmo item > 0
+    reloadCondition = _wpLoadedAmmo item == 0
+{- | Applies a world effect and sound effect after an ammo check. -}
+shootWithSoundI
+    :: Int  -- ^ Sound identifier
+    -> (Item -> Creature -> World -> World) 
+            -- ^ Shoot effect, takes creature id as input
+    -> Item 
+    -> Creature 
+    -> World 
+    -> World
+shootWithSoundI soundid f item cr w
+    | fireCondition = over (pointerToItem . wpLoadedAmmo) (\ammo -> ammo-1) 
+        $ soundOncePos soundid (_crPos cr)
+        $ set (pointerToItem . itUseTime) (_itUseRate item)
+        $ f item cr w
+    | reloadCondition = fromMaybe w $ startReloadingWeapon cr w
+    | otherwise = w
+  where 
+    cid = _crID cr
+    itRef = _crInvSel cr
+    pointerToItem = creatures . ix cid . crInv . ix itRef
+    fireCondition = _wpReloadState item == 0
+        && _itUseTime item == 0
+        && _wpLoadedAmmo item > 0
+    reloadCondition = _wpLoadedAmmo item == 0
+{- | 
+Applies a world effect after an item use cooldown check. -}
+useTimeCheck
+    :: (Creature -> World -> World)  -- ^ Underlying effect
+    -> Creature 
+    -> World
+    -> World
+useTimeCheck f cr w = case theItem ^? itUseTime of
+    Just 0 -> f cr $ setUseTime w
+    _             -> w
+  where 
+    cid = _crID cr
+    setUseTime = creatures . ix cid . crInv . ix (_crInvSel cr) . itUseTime +~ useRate
+    theItem = _crInv cr IM.! _crInvSel cr
+    useRate = fromMaybe 0 $ theItem ^? itUseRate
+{- | Applies a world effect after a hammer position check. -}
+hammerCheck
+    :: (Creature -> World -> World)  -- ^ Underlying effect
+    -> Creature 
+    -> World
+    -> World
+hammerCheck f cr w = case (_crInv cr IM.! _crInvSel cr) ^? itHammer of
+    Just HammerUp -> f cr $ setHammerDown w
+    _             -> setHammerDown w
+  where 
+    cid = _crID cr
+    setHammerDown = creatures . ix cid . crInv . ix (_crInvSel cr) . itHammer .~ HammerDown
+{- | Applies a world effect after a hammer position check. -}
+hammerCheckI
+    :: (Item -> Creature -> World -> World)  -- ^ Underlying effect
+    -> Item
+    -> Creature 
+    -> World
+    -> World
+hammerCheckI f it cr w = case it ^? itHammer of
+    Just HammerUp -> f it cr $ setHammerDown w
+    _             -> setHammerDown w
+  where 
+    cid = _crID cr
+    setHammerDown = creatures . ix cid . crInv . ix (_crInvSel cr) . itHammer .~ HammerDown
+{- | Applies a world effect after an ammo check. -}
+shoot 
+    :: (Creature -> World -> World) 
+            -- ^ Underlying effect
+    -> Creature
+    -> World
+    -> World
+shoot f cr w 
+    | fireCondition = f cr w & pointerToItem %~
+        ( (wpLoadedAmmo -~ 1) . (itUseTime .~ _itUseRate item) )
+    | reloadCondition = fromMaybe w $ startReloadingWeapon cr w
+    | otherwise = w
+  where 
+    cid = _crID cr
+    itRef = _crInvSel cr
+    item = _crInv cr IM.! itRef
+    pointerToItem = creatures . ix cid . crInv . ix itRef
+    fireCondition = _wpReloadState item == 0
+        && _itUseTime item == 0
+        && _wpLoadedAmmo item > 0
+    reloadCondition = _wpLoadedAmmo item == 0
+{- | Applies a world effect after a hammer position check.
+Arbitrary inventory position. -}
+hammerCheckL
+    :: (Creature -> Int -> World -> World)  -- ^ Underlying effect
+    -> Creature 
+    -> Int
+    -> World
+    -> World
+hammerCheckL f cr invid w = case (_crInv cr IM.! invid) ^? itHammer of
+    Just HammerUp -> f cr invid $ setHammerDown w
+    _             -> setHammerDown w
+  where 
+    cid = _crID cr
+    setHammerDown = creatures . ix cid . crInv . ix invid . itHammer .~ HammerDown
+{- | Applies a world effect after an ammo check. 
+Arbitrary inventory position. -}
+shootL 
+    :: (Creature -> Int -> World -> World) 
+            -- ^ Underlying effect
+    -> Creature
+    -> Int -- ^ Inventory position
+    -> World
+    -> World
+shootL f cr invid w 
+    | fireCondition = f cr invid w & pointerToItem %~
+        ( (wpLoadedAmmo -~ 1) . (itUseTime .~ _itUseRate item) )
+    | reloadCondition = fromMaybe w $ startReloadingWeapon cr w
+    | otherwise = w
+  where 
+    cid = _crID cr
+    item = _crInv cr IM.! invid
+    pointerToItem = creatures . ix cid . crInv . ix invid
+    fireCondition = _wpReloadState item == 0
+        && _itUseTime item == 0
+        && _wpLoadedAmmo item > 0
+    reloadCondition = _wpLoadedAmmo item == 0
+
+withMuzFlare 
+    :: (Creature -> World -> World)  -- ^ Underlying effect
+    -> Creature
+    -> World 
+    -> World
+withMuzFlare f cr w = tempLightForAt 3 pos . muzzleFlashAt pos2 $ f cr w
+  where 
+    pos = _crPos cr +.+ _crRad cr *.* unitVectorAtAngle (_crDir cr)
+    pos2 = _crPos cr +.+ (2 * _crRad cr) *.* unitVectorAtAngle (_crDir cr)
+
+withMuzFlareI
+    :: (Item -> Creature -> World -> World)  -- ^ Underlying effect
+    -> Item
+    -> Creature
+    -> World 
+    -> World
+withMuzFlareI f it cr w = tempLightForAt 3 pos . muzzleFlashAt pos2 $ f it cr w
+  where 
+    pos = _crPos cr +.+ _crRad cr *.* unitVectorAtAngle (_crDir cr)
+    pos2 = _crPos cr +.+ (2 * _crRad cr) *.* unitVectorAtAngle (_crDir cr)
+{- | Applies the effect to a randomly rotated creature.  -}
+withRandomDir 
+    :: Float    -- ^ Max possible rotation
+    -> (Creature -> World -> World) 
+                -- ^ Underlying effect
+    -> Creature
+    -> World 
+    -> World
+withRandomDir acc f cr w = f (cr & crDir +~ a) $ set randGen g w
+  where 
+    (a, g) = randomR (-acc,acc) $ _randGen w
+{- | Applies the effect to a randomly rotated creature.  -}
+withRandomDirI
+    :: Float    -- ^ Max possible rotation
+    -> (Item -> Creature -> World -> World) 
+                -- ^ Underlying effect
+    -> Item
+    -> Creature
+    -> World 
+    -> World
+withRandomDirI acc f it cr w = f it (cr & crDir +~ a) $ set randGen g w
+  where 
+    (a, g) = randomR (-acc,acc) $ _randGen w
+{- | Creates a bullet with a given velocity, width, and 'HitEffect' -}
+withVelWthHiteff 
+    :: Point2       -- ^ Velocity, x direction is forward with respect to the creature
+    -> Float        -- ^ Bullet width
+    -> HitEffect    -- ^ Bullet effect when hitting creature, wall etc
+    -> Creature          -- ^ Creature id
+    -> World 
+    -> World
+withVelWthHiteff vel width hiteff cr = over particles (newbul : ) 
+  where 
+    cid = _crID cr
+    newbul = aGenBulAt (Just cid) pos (rotateV dir vel) hiteff width
+    dir = _crDir cr
+    pos = _crPos cr +.+ _crRad cr *.* unitVectorAtAngle (_crDir cr)
+{- | Apply the effect to a translated creature. -}
+withRandomOffset 
+    :: Float    -- ^ Max possible translate
+    -> (Creature -> World -> World)
+                -- ^ Underlying effect
+    -> Creature 
+    -> World 
+    -> World
+withRandomOffset offsetAmount f cr w = f (cr & crPos %~ (+.+ offV)) $ set randGen g w
+  where 
+    (offsetVal , g) = randomR (-offsetAmount,offsetAmount) $ _randGen w
+    offV = rotateV (_crDir cr) (V2 0 offsetVal)
+-- | Rotates a creature with minimum rotation at least 0.1.
+-- Rotates the player creature before applying the effect, other creatures after.
+torqueBeforeForced 
+    :: Float    -- ^ Max possible rotation (less the 0.1 forced rotation)
+    -> (Creature -> World -> World) 
+                -- ^ Underlying effect
+    -> Creature
+    -> World 
+    -> World
+torqueBeforeForced torque feff cr w 
+    | cid == 0  = feff (cr & crDir +~ rot') $ w
+        & randGen                    .~ g 
+        & creatures . ix cid . crDir +~ rot'
+        & cameraRot                  +~ rot'
+    | otherwise = feff cr $ set randGen g $ over (creatures . ix cid . crDir) (+rot') w
+  where 
+    cid = _crID cr
+    (rot, g) = randomR (-torque,torque) $ _randGen w
+    rot' | rot < 0   = rot - 0.1
+         | otherwise = rot + 0.1
+-- | Rotates the player creature before applying an effect.
+-- Note this currently (29/4/2021) rotates other creatures /after/ applying the effect.
+torqueBefore 
+    :: Float                     -- ^ Max possible rotation
+    -> (Creature -> World -> World)  -- ^ Underlying effect
+    -> Creature                      -- ^ Creature id
+    -> World 
+    -> World
+torqueBefore torque feff cr w 
+    | cid == 0  = feff (cr & crDir +~ rot) $ w
+        & randGen                    .~ g 
+        & creatures . ix cid . crDir +~ rot
+        & cameraRot                  +~ rot
+    | otherwise = set randGen g $ over (creatures . ix cid . crDir) (+rot) $ feff cr w
+  where 
+    cid = _crID cr
+    (rot, g) = randomR (-torque,torque) $ _randGen w
+-- | Rotate a randomly creature after applying an effect.
+torqueAfter
+    :: Float                    -- ^ Max possible rotation
+    -> (Creature -> World -> World)  -- ^ Underlying effect
+    -> Creature                      -- ^ Creature id
+    -> World 
+    -> World
+torqueAfter torque feff cr w 
+    | cid == 0  = rotateScope $ set randGen g $ over cameraRot (+rot) $ feff cr w
+    | otherwise = set randGen g $ over (creatures . ix cid . crDir) (+rot) $ feff cr w
+  where 
+    cid = _crID cr
+    (rot, g) = randomR (-torque,torque) $ _randGen w
+    rotateScope = creatures . ix 0 . crInv . ix (_crInvSel (_creatures w IM.! 0))
+                          . itAttachment . _Just . scopePos %~ rotateV rot 
+{- | Create multiple bullets with a given spread, a given amount, given velocity,
+given width and given 'HitEffect'.  -}
+spreadNumVelWthHiteff 
+    :: Float    -- ^ Spread
+    -> Int      -- ^ Number of bullets
+    -> Point2   -- ^ Velocity, x is direction of creature
+    -> Float    -- ^ Bullet width
+    -> HitEffect -- ^ Effect when hitting creature, wall etc
+    -> Creature      -- ^ Creature id
+    -> World 
+    -> World
+spreadNumVelWthHiteff spread num vel wth eff cr w = over particles (newbuls ++) w
+  where 
+    cid = _crID cr
+    newbuls = zipWith
+        (\pos d -> aGenBulAt (Just cid) pos (rotateV d vel) eff wth) 
+        poss dirs
+    poss = map ((+.+) $ _crPos cr +.+ _crRad cr *.* unitVectorAtAngle (_crDir cr))
+        $ (replicateM num . randInCirc) 5 & evalState $ _randGen w
+    dirs = map (_crDir cr +) $ zipWith (+) 
+        [-spread,-spread+(2*spread/fromIntegral num)..]
+        (randomRs (0,spread/5) (_randGen w))
+{- | Create a number of bullets side by side with a given velocity,
+given width and given 'HitEffect'.  -}
+numVelWthHitEff 
+    :: Int      -- ^ Amount of bullets
+    -> Point2   -- ^ Velocity, x axis is direction of creature
+    -> Float    -- ^ Bullet width
+    -> HitEffect -- ^ Effect when hitting creature, wall etc
+    -> Creature  
+    -> World 
+    -> World
+numVelWthHitEff num vel wth eff cr = over particles (newbuls ++)
+  where 
+    cid = _crID cr
+    newbuls = map (\p -> aGenBulAt (Just cid) p (rotateV d vel) eff wth) poss 
+    d = _crDir cr
+    poss = map (+.+ pos) $ take num offsets
+    maxOffset = fromIntegral num * 2.5 - 2.5
+    offsets = map (rotateV d . V2 0) [-maxOffset,5-maxOffset..]
+    pos = _crPos cr +.+ _crRad cr *.* unitVectorAtAngle d
+{- | Uses '_wpSpread' as a parameter for the current offset angle. -}
+randWalkAngle 
+    :: Float    -- ^ Max offset angle
+    -> Float    -- ^ Walk speed
+    -> (Creature -> World -> World)  -- ^ Underlying effect
+    -> Creature      -- ^ Creature id
+    -> World 
+    -> World
+randWalkAngle ma aspeed f cr w = w
+    & f (cr & crDir +~ a)
+    & creatures . ix cid . crInv . ix i . wpSpread .~ newa
+  where
+    cid = _crID cr
+    a = _wpSpread $ _crInv (_creatures w IM.! cid) IM.! i
+    (walka, _) = randomR (-aspeed,aspeed) (_randGen w)
+    newa = min ma $ max (negate ma) (a + walka)
+    i = _crInvSel $ _creatures w IM.! cid

data/dodge.config.json

@@ -0,0 +1,25 @@
+{
+  "_debug_booleans": [
+    "Show_ms_frame",
+    "Mouse_position",
+    "Collision_test"
+  ],
+  "_debug_view_clip_bounds": "NoRoomClipBoundaries",
+  "_gameplay_rotate_to_wall": true,
+  "_graphics_bloom": true,
+  "_graphics_cloud_shadows": true,
+  "_graphics_distortion_resolution": "FullRes",
+  "_graphics_distortions": true,
+  "_graphics_downsize_resolution": "EighthRes",
+  "_graphics_num_shadow_casters": "NumShadowCasters20",
+  "_graphics_shadow_rendering": "GeoObjShads",
+  "_graphics_shadow_size": "Typical",
+  "_graphics_world_resolution": "QuarterRes",
+  "_volume_master": 1,
+  "_volume_music": 0,
+  "_volume_sound": 1,
+  "_windowPosX": 0,
+  "_windowPosY": 29,
+  "_windowX": 800,
+  "_windowY": 835
+}

data/nondata/reload.aup

@@ -0,0 +1,26 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="reload_data" version="1.3.0" audacityversion="2.2.1" sel0="1.0000000000" sel1="1.0000000000" vpos="80" h="0.0000000000" zoom="619.9769053118" rate="44100.0" snapto="on" selectionformat="hh:mm:ss + milliseconds" frequencyformat="Hz" bandwidthformat="octaves">
+	<tags/>
+	<wavetrack name="Audio Track" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="0" rate="44100" gain="1.0" pan="0.0" colorindex="0"/>
+	<wavetrack name="Audio Track" channel="0" linked="1" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0" colorindex="0">
+		<waveclip offset="0.00000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="44100">
+				<waveblock start="0">
+					<simpleblockfile filename="e0002ad8.au" len="44100" min="-0.626438" max="0.756957" rms="0.050527"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+	</wavetrack>
+	<wavetrack name="Audio Track" channel="1" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0" colorindex="0">
+		<waveclip offset="0.00000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="44100">
+				<waveblock start="0">
+					<simpleblockfile filename="e0002124.au" len="44100" min="-0.626438" max="0.756957" rms="0.050527"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+	</wavetrack>
+</project>

data/nondata/tap.aup

@@ -0,0 +1,25 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="tap_data" version="1.3.0" audacityversion="2.2.1" sel0="0.0000000000" sel1="0.2786394558" vpos="0" h="0.0000000000" zoom="86.1328125000" rate="44100.0" snapto="off" selectionformat="hh:mm:ss + milliseconds" frequencyformat="Hz" bandwidthformat="octaves">
+	<tags/>
+	<wavetrack name="Audio Track" channel="0" linked="1" mute="0" solo="0" height="161" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0" colorindex="0">
+		<waveclip offset="0.00000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="12288">
+				<waveblock start="0">
+					<simpleblockfile filename="e000077f.au" len="12288" min="-10.632122" max="11.905688" rms="0.574985"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+	</wavetrack>
+	<wavetrack name="Audio Track" channel="1" linked="0" mute="0" solo="0" height="139" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0" colorindex="0">
+		<waveclip offset="0.00000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="12288">
+				<waveblock start="0">
+					<simpleblockfile filename="e0000254.au" len="12288" min="-11.171772" max="11.837081" rms="0.58168"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+	</wavetrack>
+</project>

data/nondata/twoStep.aup

@@ -0,0 +1,73 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="twoStep_data" version="1.3.0" audacityversion="2.2.1" sel0="0.0000000000" sel1="0.7800000000" vpos="0" h="0.2878780178" zoom="1639.5833333333" rate="44100.0" snapto="on" selectionformat="hh:mm:ss + milliseconds" frequencyformat="Hz" bandwidthformat="octaves">
+	<tags/>
+	<wavetrack name="twoStep" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0" colorindex="0">
+		<waveclip offset="0.15000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="13892">
+				<waveblock start="0">
+					<simpleblockfile filename="e00004be.au" len="13892" min="-0.124176" max="0.095367" rms="0.007066"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+		<waveclip offset="0.61501134" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="7276">
+				<waveblock start="0">
+					<simpleblockfile filename="e00007db.au" len="7276" min="-0.186249" max="0.163513" rms="0.017523"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+	</wavetrack>
+	<wavetrack name="Audio Track" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0" colorindex="0">
+		<waveclip offset="0.56501134" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="2205">
+				<waveblock start="0">
+					<silentblockfile len="2205"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+		<waveclip offset="0.00000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="2205">
+				<waveblock start="0">
+					<silentblockfile len="2205"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+		<waveclip offset="0.05000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="2205">
+				<waveblock start="0">
+					<silentblockfile len="2205"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+		<waveclip offset="0.51501134" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="2205">
+				<waveblock start="0">
+					<silentblockfile len="2205"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+		<waveclip offset="0.10000000" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="2205">
+				<waveblock start="0">
+					<silentblockfile len="2205"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+		<waveclip offset="0.46501134" colorindex="0">
+			<sequence maxsamples="262144" sampleformat="262159" numsamples="2205">
+				<waveblock start="0">
+					<silentblockfile len="2205"/>
+				</waveblock>
+			</sequence>
+			<envelope numpoints="0"/>
+		</waveclip>
+	</wavetrack>
+</project>

dodge.aux

@@ -0,0 +1,42 @@
+X_RANGE 38.37
+Y_RANGE 9447512.00
+ORDER OTHER 1
+ORDER (157697)#..\/#./targetYouWhenCognizant/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/fu... 2
+ORDER (165654)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 3
+ORDER (165606)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 4
+ORDER (155261)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 5
+ORDER (157606)#..\/#./performActions/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functional... 6
+ORDER (157522)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 7
+ORDER (144146)ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExists/updateI... 8
+ORDER (157678)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 9
+ORDER (159529)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 10
+ORDER (165621)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 11
+ORDER (181320)#..\/#./crSetRoots.f/ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySe... 12
+ORDER (152512)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 13
+ORDER (158152)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 14
+ORDER (162804)listSelectionColorPicture.g/listSelectionColorPicture/updateSection.(...)/updateSection/updateSe... 15
+ORDER (181178)crUpdateInvidLocations/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExist... 16
+ORDER (159623)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 17
+ORDER (159633)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 18
+ORDER (163282)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 19
+ORDER (157730)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 20
+SHADE OTHER 0.00
+SHADE (157697)#..\/#./targetYouWhenCognizant/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/fu... 0.00
+SHADE (165654)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.00
+SHADE (165606)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.00
+SHADE (155261)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 0.10
+SHADE (157606)#..\/#./performActions/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functional... 0.10
+SHADE (157522)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 0.10
+SHADE (144146)ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExists/updateI... 0.10
+SHADE (157678)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 0.00
+SHADE (159529)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 0.00
+SHADE (165621)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 0.00
+SHADE (181320)#..\/#./crSetRoots.f/ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySe... 0.00
+SHADE (152512)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.05
+SHADE (158152)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 0.05
+SHADE (162804)listSelectionColorPicture.g/listSelectionColorPicture/updateSection.(...)/updateSection/updateSe... 0.05
+SHADE (181178)crUpdateInvidLocations/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExist... 0.05
+SHADE (159623)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 0.10
+SHADE (159633)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 0.10
+SHADE (163282)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 0.10
+SHADE (157730)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 0.10

fourmolu.yaml

@@ -0,0 +1,10 @@
+indentation: 4
+comma-style: leading
+import-export-comma-style: leading
+indent-wheres: false
+record-brace-space: false
+diff-friendly-import-export: true
+respectful: false
+haddock-style: multi-line
+newlines-between-decls: 0
+fixities: []

graph/itemCombinations.gv

@@ -0,0 +1,281 @@
+digraph {
+    graph [rankdir=LR];
+    subgraph 1 {
+        1 [shape=box
+          ,label="EQUIP {_ibtEquip = FUELPACK}"];
+        5 [shape=box
+          ,label="AMMOMAG {_ibtAmmoMag = TINMAG}"];
+        9 [shape=box
+          ,label="HELD {_ibtHeld = BANGSTICK {_xNum = 1}}"];
+        13 [shape=box
+           ,label="HELD {_ibtHeld = PISTOL}"];
+        15 [shape=box
+           ,label="HELD {_ibtHeld = AUTOPISTOL}"];
+        17 [shape=box
+           ,label="HELD {_ibtHeld = SMG}"];
+        20 [shape=box
+           ,label="HELD {_ibtHeld = MACHINEPISTOL}"];
+        22 [shape=box
+           ,label="HELD {_ibtHeld = BANGCONE}"];
+        25 [shape=box
+           ,label="HELD {_ibtHeld = BLUNDERBUSS}"];
+        27 [shape=box
+           ,label="HELD {_ibtHeld = GRAPECANNON {_xNum = 1}}"];
+        29 [shape=box
+           ,label="HELD {_ibtHeld = RIFLE}"];
+        31 [shape=box
+           ,label="HELD {_ibtHeld = VOLLEYGUN {_xNum = 3}}"];
+        33 [shape=box
+           ,label="HELD {_ibtHeld = AUTORIFLE}"];
+        35 [shape=box
+           ,label="HELD {_ibtHeld = BURSTRIFLE}"];
+        37 [shape=box
+           ,label="HELD {_ibtHeld = MINIGUNX {_xNum = 3}}"];
+        40 [shape=box
+           ,label="HELD {_ibtHeld = SNIPERRIFLE}"];
+        41 [shape=box
+           ,label="HELD {_ibtHeld = AMR}"];
+        44 [shape=box
+           ,label="HELD {_ibtHeld = AUTOAMR}"];
+        46 [shape=box
+           ,label="HELD {_ibtHeld = RLAUNCHER}"];
+        49 [shape=box
+           ,label="HELD {_ibtHeld = RLAUNCHERX {_xNum = 2}}"];
+        53 [shape=box
+           ,label="HELD {_ibtHeld = FLAMESPITTER}"];
+        57 [shape=box
+           ,label="HELD {_ibtHeld = BLOWTORCH}"];
+        59 [shape=box
+           ,label="HELD {_ibtHeld = FLAMETHROWER}"];
+        61 [shape=box
+           ,label="HELD {_ibtHeld = FLAMEWALL}"];
+        63 [shape=box
+           ,label="HELD {_ibtHeld = FLAMETORRENT}"];
+        65 [shape=box,label=LASER];
+        69 [shape=box
+           ,label="HELD {_ibtHeld = SPARKGUN}"];
+        71 [shape=box
+           ,label="HELD {_ibtHeld = TESLAGUN}"];
+        73 [shape=box
+           ,label="HELD {_ibtHeld = BLINKERUNSAFE}"];
+        74 [shape=box
+           ,label="HELD {_ibtHeld = BLINKER}"];
+        77 [shape=box
+           ,label="EQUIP {_ibtEquip = MAGSHIELD MagnetRepulse}"];
+        80 [shape=box
+           ,label="EQUIP {_ibtEquip = POWERLEGS}"];
+        86 [shape=box
+           ,label="HELD {_ibtHeld = FLATSHIELD}"];
+        96 [shape=box
+           ,label="DETECTOR {_ibtDetector = ITEMDETECTOR}"];
+        99 [shape=box
+           ,label="DETECTOR {_ibtDetector = WALLDETECTOR}"];
+        101 [shape=box
+            ,label="DETECTOR {_ibtDetector = CREATUREDETECTOR}"];
+        103 [shape=box
+            ,label="HELD {_ibtHeld = TORCH}"];
+        104 [shape=box
+            ,label="AMMOMAG {_ibtAmmoMag = BATTERY}"];
+        107 [shape=box
+            ,label="EQUIP {_ibtEquip = HEADLAMP}"];
+        108 [shape=box
+            ,label="EQUIP {_ibtEquip = HAT}"];
+        110 [shape=box
+            ,label="HELD {_ibtHeld = BANGSTICK {_xNum = 2}}"];
+    }
+    subgraph 2 {
+        0 [shape=point];
+        4 [shape=point];
+        8 [shape=point];
+        12 [shape=point];
+        14 [shape=point];
+        16 [shape=point];
+        19 [shape=point];
+        21 [shape=point];
+        24 [shape=point];
+        26 [shape=point];
+        28 [shape=point];
+        30 [shape=point];
+        32 [shape=point];
+        34 [shape=point];
+        36 [shape=point];
+        39 [shape=point];
+        42 [shape=point];
+        43 [shape=point];
+        45 [shape=point];
+        48 [shape=point];
+        50 [shape=point];
+        52 [shape=point];
+        56 [shape=point];
+        58 [shape=point];
+        60 [shape=point];
+        62 [shape=point];
+        64 [shape=point];
+        68 [shape=point];
+        70 [shape=point];
+        72 [shape=point];
+        76 [shape=point];
+        79 [shape=point];
+        82 [shape=point];
+        83 [shape=point];
+        84 [shape=point];
+        85 [shape=point];
+        87 [shape=point];
+        89 [shape=point];
+        92 [shape=point];
+        95 [shape=point];
+        98 [shape=point];
+        100 [shape=point];
+        102 [shape=point];
+        106 [shape=point];
+        109 [shape=point];
+        111 [shape=point];
+        113 [shape=point];
+        115 [shape=point];
+        117 [shape=point];
+    }
+    0 -> 1 [xlabel="",tailport=e];
+    4 -> 5 [xlabel="",tailport=e];
+    8 -> 9 [xlabel="",tailport=e];
+    9 -> 12 [xlabel=1
+            ,arrowhead=onone
+            ,headport=w];
+    9 -> 28 [xlabel=1
+            ,arrowhead=onone
+            ,headport=w];
+    9 -> 30 [xlabel=1
+            ,arrowhead=onone
+            ,headport=w];
+    9 -> 30 [xlabel=1
+            ,arrowhead=onone
+            ,headport=w];
+    9 -> 30 [xlabel=1
+            ,arrowhead=onone
+            ,headport=w];
+    9 -> 109 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    9 -> 113 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    9 -> 115 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    12 -> 13 [xlabel="",tailport=e];
+    13 -> 14 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    14 -> 15 [xlabel="",tailport=e];
+    15 -> 16 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    15 -> 19 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    16 -> 17 [xlabel="",tailport=e];
+    19 -> 20 [xlabel="",tailport=e];
+    21 -> 22 [xlabel="",tailport=e];
+    22 -> 24 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    24 -> 25 [xlabel="",tailport=e];
+    25 -> 26 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    26 -> 27 [xlabel="",tailport=e];
+    27 -> 117 [xlabel=1
+              ,arrowhead=onone
+              ,headport=w];
+    28 -> 29 [xlabel="",tailport=e];
+    29 -> 32 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    29 -> 34 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    29 -> 42 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    30 -> 31 [xlabel="",tailport=e];
+    31 -> 36 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    31 -> 113 [xlabel=1
+              ,arrowhead=onone
+              ,headport=w];
+    32 -> 33 [xlabel="",tailport=e];
+    34 -> 35 [xlabel="",tailport=e];
+    36 -> 37 [xlabel="",tailport=e];
+    37 -> 115 [xlabel=1
+              ,arrowhead=onone
+              ,headport=w];
+    39 -> 40 [xlabel="",tailport=e];
+    41 -> 39 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    41 -> 43 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    42 -> 41 [xlabel="",tailport=e];
+    43 -> 44 [xlabel="",tailport=e];
+    45 -> 46 [xlabel="",tailport=e];
+    46 -> 48 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    48 -> 49 [xlabel="",tailport=e];
+    49 -> 50 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    52 -> 53 [xlabel="",tailport=e];
+    53 -> 56 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    53 -> 58 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    56 -> 57 [xlabel="",tailport=e];
+    58 -> 59 [xlabel="",tailport=e];
+    59 -> 60 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    59 -> 62 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    60 -> 61 [xlabel="",tailport=e];
+    62 -> 63 [xlabel="",tailport=e];
+    64 -> 65 [xlabel="",tailport=e];
+    68 -> 69 [xlabel="",tailport=e];
+    69 -> 70 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    70 -> 71 [xlabel="",tailport=e];
+    72 -> 73 [xlabel="",tailport=e];
+    74 -> 72 [xlabel=1
+             ,arrowhead=onone
+             ,headport=w];
+    76 -> 77 [xlabel="",tailport=e];
+    79 -> 80 [xlabel="",tailport=e];
+    85 -> 86 [xlabel="",tailport=e];
+    95 -> 96 [xlabel="",tailport=e];
+    98 -> 99 [xlabel="",tailport=e];
+    100 -> 101 [xlabel=""
+               ,tailport=e];
+    102 -> 103 [xlabel=""
+               ,tailport=e];
+    103 -> 106 [xlabel=1
+               ,arrowhead=onone
+               ,headport=w];
+    104 -> 102 [xlabel=1
+               ,arrowhead=onone
+               ,headport=w];
+    106 -> 107 [xlabel=""
+               ,tailport=e];
+    108 -> 106 [xlabel=1
+               ,arrowhead=onone
+               ,headport=w];
+    109 -> 110 [xlabel=""
+               ,tailport=e];
+    110 -> 111 [xlabel=1
+               ,arrowhead=onone
+               ,headport=w];
+}

log/aGeneratedRoomLayout

@@ -0,0 +1,145 @@
+Seed: 7114951007332849727Layout with room names:
+rezBox-0
+|
+autoDoor-1
+|
+rectPillars-2
+|
+autoDoor-3
+|
+Corridor-4
+|
+autoDoor-5
+|
+ElecautoRect-6
+|
++- triggerDoorRoom-7
+|  |
+|  autoDoor-8
+|  |
+|  autoDoor-9
+|  |
+|  Corridor-10
+|  |
+|  autoDoor-11
+|  |
+|  8gon-12
+|  |
+|  triggerDoorRoom-13
+|  |
+|  autoDoor-14
+|  |
+|  autoDoor-15
+|  |
+|  Corridor-16
+|  |
+|  autoRect-17
+|  |
+|  autoDoor-18
+|  |
+|  Corridor-19
+|  |
+|  autoDoor-20
+|  |
+|  6gon-21
+|  |
+|  +- triggerDoorRoom-22
+|  |  |
+|  |  autoDoor-23
+|  |  |
+|  |  autoDoor-24
+|  |  |
+|  |  Corridor-25
+|  |  |
+|  |  autoDoor-26
+|  |  |
+|  |  warningTerm-8gon-27
+|  |  |
+|  |  triggerDoorRoom-28
+|  |  |
+|  |  autoDoor-29
+|  |  |
+|  |  autoDoor-30
+|  |  |
+|  |  Corridor-31
+|  |  |
+|  |  autoRect-32
+|  |  |
+|  |  autoDoor-33
+|  |  |
+|  |  Corridor-34
+|  |  |
+|  |  autoDoor-35
+|  |  |
+|  |  Corridor-36
+|  |  |
+|  |  8gon-37
+|  |  |
+|  |  triggerDoorRoom-38
+|  |  |
+|  |  autoDoor-39
+|  |  |
+|  |  autoDoor-40
+|  |  |
+|  |  Corridor-41
+|  |  |
+|  |  tanksRoom-42
+|  |  |
+|  |  autoDoor-43
+|  |  |
+|  |  Corridor-44
+|  |  |
+|  |  autoDoor-45
+|  |  |
+|  |  rect-46
+|  |  |
+|  |  +- autoDoor-47
+|  |  |  |
+|  |  |  autoDoor-48
+|  |  |  |
+|  |  |  Corridor-49
+|  |  |  |
+|  |  |  autoRect-50
+|  |  |  |
+|  |  |  defaultRoom-51
+|  |  |  |
+|  |  |  autoRect-52
+|  |  |  |
+|  |  |  defaultRoom-53
+|  |  |  |
+|  |  |  autoRect-54
+|  |  |  |
+|  |  |  autoDoor-55
+|  |  |  |
+|  |  |  Corridor-56
+|  |  |  |
+|  |  |  autoDoor-57
+|  |  |  |
+|  |  |  8gon-58
+|  |  |  |
+|  |  |  triggerDoorRoom-59
+|  |  |  |
+|  |  |  autoDoor-60
+|  |  |  |
+|  |  |  autoDoor-61
+|  |  |  |
+|  |  |  Corridor-62
+|  |  |  |
+|  |  |  defaultRoom-63
+|  |  |
+|  |  Corridor-64
+|  |  |
+|  |  autoDoor-65
+|  |
+|  autoDoor-66
+|  |
+|  Corridor-67
+|  |
+|  autoRect-68
+|
+autoDoor-69
+|
+Corridor-70
+|
+autoRect-71
+

log/attemptedSeeds

@@ -0,0 +1,4 @@
+Generating level with seed 7114951007332849727
+
+After 1 attempt(s), Successful generation of level with seed 7114951007332849727
+72 rooms in total

log/treeCluster

@@ -0,0 +1,267 @@
+Seed: 7114951007332849727
+0:startThenWeaponRoom
+|
+1:corDoor
+|
+2:PassthroughLockKeyLists-HELD {_ibtHeld = SPARKGUN}
+|
+3:corDoor
+|
+4:lasSensorTurretTest
+|
+5:corDoor
+|
+6:SingleRoom
+|
+7:corDoor
+|
+8:PassthroughLockKeyLists-HELD {_ibtHeld = KEYCARD 0}
+|
+9:corDoor
+|
+10:warningRooms
+|
+11:corDoor
+|
+12:chaseCrit+armourChaseCrit rectRoom
+|
+13:corDoor
+|
+14:healthTest
+|
+15:corDoor
+|
+16:empty tanksRoom
+|
+17:corDoor
+|
+18:PassthroughLockKeyLists-HELD {_ibtHeld = SNIPERRIFLE}
+|
+19:corDoor
+|
+20:shootingRange
+|
+21:corDoor
+|
+22:lasSensorTurretTest
+|
+23:corDoor
+|
+24:randomFourCornerRoom
+
+0:0:startThenWeaponRoom
+|
+0:1:weaponBetweenPillars_BANGSTICK4
+
+0:0:0:rezBox'
+
+0:0:0:0:rezBox
+|
+0:0:0:1:autoDoor
+
+0:1:0:rectPillars
+
+1:0:corDoor
+
+1:0:0:autoDoor
+|
+1:0:1:Corridor
+
+2:0:PassthroughLockKeyLists-HELD {_ibtHeld = SPARKGUN}
+
+2:0:0:RassThroughLockKeyLists
+|
+2:0:1:roomsContaining chaseCritchaseCritTRANSFORMERCANCAN
+
+2:0:0:0:sensorRoomRunPast
+
+2:0:0:0:0:autoDoor
+|
+2:0:0:0:1:ElecautoRect
+|
++- 2:0:0:0:2:triggerDoorRoom
+|  |
+|  2:0:0:0:3:autoDoor
+|
+2:0:0:0:4:autoDoor
+|
+2:0:0:0:5:Corridor
+
+2:0:1:0:autoRect
+
+3:0:corDoor
+
+3:0:0:autoDoor
+|
+3:0:1:Corridor
+
+4:0:lasSensorTurretTest
+
+4:0:0:autoDoor
+|
+4:0:1:8gon
+|
+4:0:2:triggerDoorRoom
+|
+4:0:3:autoDoor
+
+5:0:corDoor
+
+5:0:0:autoDoor
+|
+5:0:1:Corridor
+
+6:0:SingleRoom
+
+6:0:0:autoRect
+
+7:0:corDoor
+
+7:0:0:autoDoor
+|
+7:0:1:Corridor
+
+8:0:PassthroughLockKeyLists-HELD {_ibtHeld = KEYCARD 0}
+
+8:0:0:RassThroughLockKeyLists
+|
+8:0:1:roomsContaining chaseCritchaseCritchaseCritKEYCARD 0
+
+8:0:0:0:keyCardRoomRunPast
+
+8:0:0:0:0:autoDoor
+|
+8:0:0:0:1:6gon
+|
++- 8:0:0:0:2:triggerDoorRoom
+|  |
+|  8:0:0:0:3:autoDoor
+|
+8:0:0:0:4:autoDoor
+|
+8:0:0:0:5:Corridor
+
+8:0:1:0:autoRect
+
+9:0:corDoor
+
+9:0:0:autoDoor
+|
+9:0:1:Corridor
+
+10:0:warningRooms
+
+10:0:0:autoDoor
+|
+10:0:1:warningTerm-8gon
+|
+10:0:2:triggerDoorRoom
+|
+10:0:3:autoDoor
+
+11:0:corDoor
+
+11:0:0:autoDoor
+|
+11:0:1:Corridor
+
+12:0:chaseCrit+armourChaseCrit rectRoom
+
+12:0:0:autoRect
+
+13:0:corDoor
+
+13:0:0:autoDoor
+|
+13:0:1:Corridor
+
+14:0:healthTest
+
+14:0:0:autoDoor
+|
+14:0:1:Corridor
+|
+14:0:2:8gon
+|
+14:0:3:triggerDoorRoom
+|
+14:0:4:autoDoor
+
+15:0:corDoor
+
+15:0:0:autoDoor
+|
+15:0:1:Corridor
+
+16:0:empty tanksRoom
+
+16:0:0:tanksRoom
+
+17:0:corDoor
+
+17:0:0:autoDoor
+|
+17:0:1:Corridor
+
+18:0:PassthroughLockKeyLists-HELD {_ibtHeld = SNIPERRIFLE}
+
+18:0:0:RassThroughLockKeyLists
+|
+18:0:1:roomsContaining chaseCritchaseCritSNIPERRIFLE
+
+18:0:0:0:longRoomRunPast
+
+18:0:0:0:0:autoDoor
+|
+18:0:0:0:1:rect
+|
++- 18:0:0:0:2:autoDoor
+|
+18:0:0:0:3:Corridor
+|
+18:0:0:0:4:autoDoor
+
+18:0:1:0:rectPillars
+
+19:0:corDoor
+
+19:0:0:autoDoor
+|
+19:0:1:Corridor
+
+20:0:shootingRange
+
+20:0:0:autoRect
+|
+20:0:1:defaultRoom
+|
+20:0:2:autoRect
+|
+20:0:3:defaultRoom
+|
+20:0:4:autoRect
+
+21:0:corDoor
+
+21:0:0:autoDoor
+|
+21:0:1:Corridor
+
+22:0:lasSensorTurretTest
+
+22:0:0:autoDoor
+|
+22:0:1:8gon
+|
+22:0:2:triggerDoorRoom
+|
+22:0:3:autoDoor
+
+23:0:corDoor
+
+23:0:0:autoDoor
+|
+23:0:1:Corridor
+
+24:0:defaultRoom
+

makehp.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+stack exec -- hp2ps -e8in -c -M dodge.hp
+ps2pdf dodge.ps
+rm dodge.ps
+okular dodge.pdf

package.yaml

@@ -40,6 +40,7 @@ dependencies:
 - random
 - sdl2
 - sdl2-mixer
+- strict
 - template-haskell
 - transformers
 - unordered-containers
@@ -53,6 +54,7 @@ dependencies:
 - tasty
 - tasty-hunit
 - tasty-quickcheck
+- list-tries
 
 library:
   source-dirs: src

saveSlot/seed

@@ -0,0 +1 @@
+7114951007332849727

shader/lighting/texture.frag

@@ -22,7 +22,13 @@ void main() {
   //float y3 = clamp(0.5 * (y1 + 2),0,1) ;
   //float y = float(normbit.w == 0 ? y3 : y2);
   float y = y2;
-  float x = 1 - dist / rad;
-  vec3 c = y* (x * x * x) * lumRad.rgb;
+  //float x = 1 - dist / rad;
+  float x = 1 - (pow(dist / rad,4));
+  //float x = 1 ;
+  //float x = 1;
+  //float x = 1 - max(0, ((dist + 10000) - rad) * 0.0001) ;
+  //vec3 c = y* (x * x * x) * lumRad.rgb;
+  vec3 c = y* x * lumRad.rgb;
+  //vec3 c =  x * lumRad.rgb;
   fColor = vec4(c, 0);
 }

shader/lighting/wallShadow.frag

@@ -1,6 +0,0 @@
-#version 450 core
-out vec4 fColor;
-void main()
-{
-  fColor = vec4 (0,0,0,1);
-}

shader/lighting/wallShadow.geom

@@ -36,8 +36,8 @@ void main() {
     vec2 p2cs = p2 + closeshift;
     vec2 p2o = vec2( distance(p2,lightPos.xy) > rad2 ? p2cs : shift(p2) );
 
-    gl_Position = theMat * vec4(p1o,0,1); EmitVertex();
-    gl_Position = theMat * vec4(p1,0,1); EmitVertex();
+    gl_Position = theMat * vec4(p1o,-500,1); EmitVertex();
+    gl_Position = theMat * vec4(p1,-500,1); EmitVertex();
     gl_Position = theMat * vec4(p1o,100,1); EmitVertex();
     gl_Position = theMat * vec4(p1,100,1); EmitVertex();
     gl_Position = theMat * vec4(p1cs,100,1); EmitVertex();
@@ -52,15 +52,15 @@ void main() {
 //    gl_Position = theMat * vec4(p2,0,1); EmitVertex();
     
     gl_Position = theMat * vec4(p2,100,1); EmitVertex();
-    gl_Position = theMat * vec4(p2,0,1); EmitVertex();
+    gl_Position = theMat * vec4(p2,-500,1); EmitVertex();
     gl_Position = theMat * vec4(p2o,100,1); EmitVertex();
-    gl_Position = theMat * vec4(p2o,0,1); EmitVertex();
+    gl_Position = theMat * vec4(p2o,-500,1); EmitVertex();
     gl_Position = theMat * vec4(p2cs,100,1); EmitVertex();
-    gl_Position = theMat * vec4(p2cs,0,1); EmitVertex();
+    gl_Position = theMat * vec4(p2cs,-500,1); EmitVertex();
     gl_Position = theMat * vec4(p1cs,100,1); EmitVertex();
-    gl_Position = theMat * vec4(p1cs,0,1); EmitVertex();
+    gl_Position = theMat * vec4(p1cs,-500,1); EmitVertex();
     gl_Position = theMat * vec4(p1o,100,1); EmitVertex();
-    gl_Position = theMat * vec4(p1o,0,1); EmitVertex();
+    gl_Position = theMat * vec4(p1o,-500,1); EmitVertex();
     
     EndPrimitive();
   } else {

shader/positional/blank.frag

@@ -2,5 +2,5 @@
 out vec4 fColor;
 void main()
 {
-  fColor = vec4 (0,0,0,0);
+  fColor = vec4 (0,0,0,1);
 }

shader/wall/basic.frag

@@ -2,18 +2,13 @@
 layout (location=0) out vec4 fCol;
 layout (location=1) out vec4 fPos;
 layout (location=2) out vec4 fNorm;
-in vec2 tPos;
 in vec3 gTexCoords;
 in vec4 gPos;
-in vec4 gNorm;
-in vec4 gColor;
 in float gAng;
 layout (binding=40) uniform sampler2DArray diffuseSampler;
 layout (binding=41) uniform sampler2DArray normalSampler;
 vec2 rotateV2 (float a, vec2 v)
-{
-    return vec2(v.x*cos(a) - v.y*sin(a), v.x*sin(a) + v.y*cos(a));
-}
+{ return vec2(v.x*cos(a) - v.y*sin(a), v.x*sin(a) + v.y*cos(a)); }
 void main()
 {
   fCol = texture(diffuseSampler,gTexCoords);

shader/wall/basic.geom

@@ -4,16 +4,13 @@ layout (triangle_strip, max_vertices = 4) out;
 layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
 in vec2 vTexAng[];
 out float gAng;
-out vec2 tPos;
 out vec4 gPos;
-out vec4 gNorm;
 out vec3 gTexCoords;
 // consider using isLHS to check if the wall is facing the center
 float isLHS (vec2 startV, vec2 testV)
 { return sign( -startV.x * testV.y + startV.y * testV.x); }
 void main()
-{ gAng = vTexAng[0].y;
-  float tcoordz = vTexAng[0].x;
+{ float tcoordz = vTexAng[0].x;
   vec2 p1xy = gl_in[0].gl_Position.xy;
   vec2 p2xy = gl_in[0].gl_Position.zw;
   vec4 p1 = vec4 (gl_in[0].gl_Position.xy,0,1);
@@ -24,21 +21,25 @@ void main()
   float dist = distance(p1xy,p2xy);
   float tcoordx = dist / 50;
   vec4 norm = vec4( d.y, -d.x, 0, 0);
-  gPos = p1; tPos = vec2 ( 1,-1) ; gl_Position = vec4(theMat * p1); 
-  gNorm = gPos - norm;
+  gPos = p1; 
+  gl_Position = vec4(theMat * p1); 
   gTexCoords = vec3 (0,0,tcoordz);
+  gAng = vTexAng[0].y;
   EmitVertex();
-  gPos = p3; tPos = vec2 ( 1, 1) ; gl_Position = vec4(theMat * p3); 
-  gNorm = gPos - norm;
+  gPos = p3; 
+  gl_Position = vec4(theMat * p3); 
   gTexCoords = vec3 (0,2,tcoordz);
+  gAng = vTexAng[0].y;
   EmitVertex();
-  gPos = p2; tPos = vec2 (-1,-1) ; gl_Position = vec4(theMat * p2); 
-  gNorm = gPos - norm;
+  gPos = p2; 
+  gl_Position = vec4(theMat * p2); 
   gTexCoords = vec3 (tcoordx,0,tcoordz);
+  gAng = vTexAng[0].y;
   EmitVertex();
-  gPos = p4; tPos = vec2 (-1, 1) ; gl_Position = vec4(theMat * p4); 
-  gNorm = gPos - norm;
+  gPos = p4;
+  gl_Position = vec4(theMat * p4); 
   gTexCoords = vec3 (tcoordx,2,tcoordz);
+  gAng = vTexAng[0].y;
   EmitVertex();
   EndPrimitive();
 }

src/AesonHelp.hs

@@ -0,0 +1,24 @@
+module AesonHelp where
+
+import Data.Aeson (ToJSON)
+import qualified Data.Aeson.Encode.Pretty as AEP
+import Data.ByteString.Lazy.Char8 (unpack)
+import Data.Maybe
+
+getPretty :: ToJSON a => a -> [String]
+getPretty = lines . unpack . AEP.encodePretty' (AEP.Config (AEP.Spaces 2) compare AEP.Generic False)
+
+prettyShort :: ToJSON a => a -> [String]
+prettyShort = mapMaybe cullPretty . getPretty
+
+cullPretty :: String -> Maybe String
+cullPretty s = case dropWhile (== ' ') s of
+    ']' : _ -> Nothing
+    '[' : _ -> Nothing
+    '}' : _ -> Nothing
+    '{' : _ -> Nothing
+    _ -> Just $ filter f s
+  where
+    f '_' = False
+    f '"' = False
+    f _ = True

src/Color.hs

@@ -79,6 +79,10 @@ normalizeColor (V4 r g b a) = V4 (f r) (f g) (f b) (f a)
   where
     f = min 1 . max 0
 
+mixColorsFrac :: Color -> Color -> Float -> Color
+{-# INLINE mixColorsFrac #-}
+mixColorsFrac c1 c2 x = mixColors x (1-x) c1 c2
+
 mixColors :: Float -> Float -> Color -> Color -> Color
 {-# INLINE mixColors #-}
 mixColors rata ratb (V4 r0 g0 b0 a0) (V4 r2 g2 b2 a2) =

src/Data/Preload.hs

@@ -3,14 +3,14 @@
 module Data.Preload where
 
 import Control.Lens
+import Data.IntMap.Strict
 import Data.Preload.Render
-import Music
-import Sound.Data
+import SDL.Mixer
 
 data PreloadData = PreloadData
     { _renderData :: RenderData
-    , _soundData :: SoundData
-    , _musicData :: MusicData
+    , _soundData :: IntMap Chunk
+    , _musicData :: IntMap Chunk
     }
 
 makeLenses ''PreloadData

src/Data/Preload/Render.hs

@@ -42,6 +42,8 @@ data RenderData = RenderData
     , _vboShapes :: VBO
     , _floorVBO :: VBO
     , _floorShader :: Shader
+    , _chasmVBO :: VBO
+    , _chasmShader :: Shader
     , _wallVBO :: VBO
     , _wallShader :: Shader
     , _cloudVBO :: VBO

src/Data/Tile.hs

@@ -1,26 +1,30 @@
 {-# LANGUAGE TemplateHaskell #-}
+
 --{-# LANGUAGE StrictData #-}
 module Data.Tile where
-import Geometry.Data
-import Data.Aeson
-import Data.Aeson.TH
 
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry.Data
 
-data Floor 
+data Floor
     = InheritFloor
---    | TileWith Float
-    | Tiled { _tiles :: [Tile]}
+    | --    | TileWith Float
+      Tiled {_tiles :: [Tile]}
+
 data Tile = Tile
     { _tilePoly :: [Point2]
-    , _tileZero :: Point2   -- ^ point in the world where tile texture is 0,0
-    , _tileTangentPos :: Point2   
-        -- ^ world position one along in the X direction, note this also set the scale of the
-        -- texture
-        -- this has to be a position because it is shifted
-    , _tileArrayZ    :: Float
+    , -- | point in the world where tile texture is 0,0
+      _tileZero :: Point2
+    , -- | world position one along in the X direction, note this also set the scale of the
+      -- texture
+      -- this has to be a position because it is shifted
+      _tileTangentPos :: Point2
+    , _tileArrayZ :: Float
     }
-  deriving (Eq, Ord, Show)
+    deriving (Eq, Ord, Show)
+
 makeLenses ''Floor
 makeLenses ''Tile
 deriveJSON defaultOptions ''Tile

src/Dodge/Annotation/Data.hs

@@ -1,11 +1,12 @@
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Annotation.Data where
-import Dodge.Data.GenWorld
-import Dodge.Tree.Compose.Data
 
-import Control.Monad.State
 import Control.Lens
+import Control.Monad.State
+import Dodge.Data.GenWorld
+import Dodge.Data.MetaTree
 import System.Random
 
 type MTRS = MetaTree Room String
@@ -17,8 +18,8 @@ data Annotation
     | AnRoom (State StdGen Room)
     | AnTree (State StdGen (MetaTree Room String))
     | PassthroughLockKeyLists
-        [(Int -> State StdGen (MetaTree Room String), State StdGen ItemBaseType)]
-        [(ItemBaseType, State StdGen (MetaTree Room String))]
-         Int 
+        [(Int -> State StdGen (MetaTree Room String), State StdGen ItemType)]
+        [(ItemType, State StdGen (MetaTree Room String))]
+        Int
 
 makeLenses ''Annotation

src/Dodge/ArcStep.hs

@@ -1,12 +0,0 @@
-module Dodge.ArcStep where
-
-import Control.Monad.State
-import Dodge.Data.ArcStep
-import Dodge.Data.World
-import Dodge.Tesla.Arc.Default
-import System.Random
-
-doStep :: NextArcStep -> ItemParams -> World -> ArcStep -> State StdGen (Maybe ArcStep)
-doStep nas = case nas of
-    DefaultArcStep -> defaultArcStep
-    EndArc -> const $ const $ const $ return Nothing