Cleanup

More tweaking needs to be done, after deciding a max width for selection
items.

.ghci

@@ -0,0 +1,2 @@
+:set prompt ">"
+:load test/Spec.hs

.ghcid

@@ -0,0 +1 @@
+--command "stack ghci --test --main-is loop:test:loop-test --ghci-options=-fobject-code"

.gitignore

@@ -4,3 +4,9 @@
 loop.cabal
 *.lock
 keys.json
+log/*
+generated/*
+UntrackedMisc/*
+tags
+ghcidOutput
+.ghcid.bak

.hlint.yaml

@@ -0,0 +1,71 @@
+# HLint configuration file
+# https://github.com/ndmitchell/hlint
+##########################
+
+# This file contains a template configuration file, which is typically
+# placed as .hlint.yaml in the root of your project
+
+
+# Specify additional command line arguments
+#
+# - arguments: [--color, --cpp-simple, -XQuasiQuotes]
+
+
+# Control which extensions/flags/modules/functions can be used
+#
+# - extensions:
+#   - default: false # all extension are banned by default
+#   - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used
+#   - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module
+#
+# - flags:
+#   - {name: -w, within: []} # -w is allowed nowhere
+#
+# - modules:
+#   - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'
+#   - {name: Control.Arrow, within: []} # Certain modules are banned entirely
+#
+# - functions:
+#   - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules
+
+
+# Add custom hints for this project
+#
+# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"
+# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}
+
+# The hints are named by the string they display in warning messages.
+# For example, if you see a warning starting like
+#
+# Main.hs:116:51: Warning: Redundant ==
+#
+# You can refer to that hint with `{name: Redundant ==}` (see below).
+
+# Turn on hints that are off by default
+#
+# Ban "module X(module X) where", to require a real export list
+#- warn: {name: Use explicit module export list} # TODO uncomment
+#
+# Replace a $ b $ c with a . b $ c
+#- group: {name: dollar, enabled: true} # TODO uncomment
+#
+# Generalise map to fmap, ++ to <>
+#- group: {name: generalise, enabled: true} # TODO uncomment
+#
+# Warn on use of partial functions
+# - group: {name: partial, enabled: true} # possibly uncomment
+
+- group: {name: use-lens, enabled: true}
+
+# Ignore some builtin hints
+# - ignore: {name: Use let}
+# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
+
+- ignore: {name: Functor law}
+
+# Define some custom infix operators
+# - fixity: infixr 3 ~^#^~
+
+
+# To generate a suitable file for HLint do:
+# $ hlint --default > .hlint.yaml

ChangeLog.md

@@ -1,3 +0,0 @@
-# Changelog for loop
-
-## Unreleased changes

README.md

@@ -1 +0,0 @@
-# loop

appDodge/Main.hs

@@ -1,36 +1,27 @@
-module Main (
-    main,
-) where
+module Main (main) where
 
+import Dodge.SoundSelection
 import Control.Lens
 import Control.Monad
 import Control.Parallel
 import qualified Data.Map.Strict as M
---import Data.Preload.Render
 import qualified Data.Text as T
 import Dodge.Concurrent
-import Dodge.Config.Load
-import Dodge.Config.Update
+import Dodge.Config
 import Dodge.Data
 import Dodge.Event
 import Dodge.Initialisation
 import Dodge.LoadSeed
-import Dodge.Menu
 import Dodge.Render
 import Dodge.SoundLogic.LoadSound
+import Dodge.StartNewGame
 import Dodge.TestString
 import Dodge.Update
---import qualified IntMapHelp as IM
 import Loop
-import Music
---import Picture
 import Preload
 import Preload.Render
---import Render
-
 import SDL (($=))
 import qualified SDL
---import qualified SDL.Mixer as Mix
 import Sound
 import System.Directory
 
@@ -74,7 +65,7 @@ winConfig x y winpos =
 theCleanup :: Universe -> IO ()
 theCleanup uv = SDL.cursorVisible $= True >> cleanUpPreload (_preloadData uv)
 
-firstWorldLoad :: Configuration -> IO Universe
+firstWorldLoad :: Config -> IO Universe
 firstWorldLoad theConfig = do
     SDL.cursorVisible $= False
     pdata <- doPreload >>= applyWorldConfig theConfig
@@ -95,21 +86,31 @@ firstWorldLoad theConfig = do
                 , _uvFrameTicks = 0
                 , _uvRAMSave = Nothing
                 , _uvDebug = mempty
+                , _uvDebugFloat1 = 10
+                , _uvDebugFloat2 = 0
+                , _uvDebugV2_1 = 0
+                , _uvDebugV2_2 = 1
+                , _uvDebugPut = mempty
                 , _uvDebugMessageOffset = 0
+                , _uvSoundQueue = mempty
+                , _uvDebugPathShowType = PathBetweenDebugV2s
                 }
-    return $ u & uvScreenLayers .~ [splashMenu u]
+    --return $ u & uvScreenLayers .~ [splashMenu u]
+    return $ startNewGameInSlot 0 u
 
 theUpdateStep :: SDL.Window -> Universe -> IO Universe
 theUpdateStep win = doSideEffects <=< updateRenderSplit win
 
 updateRenderSplit :: SDL.Window -> Universe -> IO Universe
 updateRenderSplit win u = do
-    updateUniverse u `par` void (doDrawing win u)
+    --updateUniverse u `par` void (doDrawing win u)
+    updateUniverse u `par` doDrawing win u
     return $! updateUniverse u
 
 playSoundUnlessRewinding :: Universe -> IO (M.Map SoundOrigin Sound)
 playSoundUnlessRewinding u = case w ^. timeFlow of
-    NormalTimeFlow -> playSoundAndUpdate (_soundData $ _preloadData u) (_playingSounds w) (_toPlaySounds w)
+    NormalTimeFlow -> playSoundAndUpdate (_soundData $ _preloadData u) (_playingSounds w) (newSoundsToPlay u)
+    RespawnDelay{} -> playSoundAndUpdate (_soundData $ _preloadData u) (_playingSounds w) (newSoundsToPlay u)
     _ -> stopAllSounds >> return M.empty
   where
     w = _uvWorld u
@@ -117,6 +118,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 +128,7 @@ doSideEffects u = do
             & uvWorld . playingSounds .~ newPlayingSounds
             & uvWorld . toPlaySounds .~ M.empty
             & uvIOEffects .~ return
+            & uvSoundQueue .~ mempty
 
 doPreload :: IO PreloadData
 doPreload = do
@@ -134,13 +137,13 @@ doPreload = do
     putStrLn "Start sound preload"
     lChunks <- loadSounds
     putStrLn "Skip music preload!"
---    lMusic <- loadMusic
---    Mix.playMusic Mix.Forever (lMusic IM.! 0)
+    --    lMusic <- loadMusic
+    --    Mix.playMusic Mix.Forever (lMusic IM.! 0)
     putStrLn "Return PreloadData"
     return
         PreloadData
             { _renderData = rData
-            , _soundData = SoundData{_loadedChunks = lChunks}
-            --, _musicData = MusicData{_loadedMusic = lMusic}
-            , _musicData = MusicData{_loadedMusic = undefined}
+            , _soundData = lChunks
+            , --, _musicData = MusicData{_loadedMusic = lMusic}
+              _musicData = mempty
             }

data/dodge.config.json

@@ -0,0 +1,24 @@
+{
+  "_debug_booleans": [
+    "Show_ms_frame",
+    "Pathing"
+  ],
+  "_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>