diff --git a/appDodge/Main.hs b/appDodge/Main.hs index 142996c84..8759b7eca 100644 --- a/appDodge/Main.hs +++ b/appDodge/Main.hs @@ -2,6 +2,7 @@ module Main ( main, ) where +import Dodge.StartNewGame import Control.Lens import Control.Monad import Control.Parallel @@ -15,7 +16,7 @@ import Dodge.Data import Dodge.Event import Dodge.Initialisation import Dodge.LoadSeed -import Dodge.Menu +--import Dodge.Menu import Dodge.Render import Dodge.SoundLogic.LoadSound import Dodge.TestString @@ -100,7 +101,8 @@ firstWorldLoad theConfig = do , _uvDebugMessageOffset = 0 , _uvSoundQueue = mempty } - 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 diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index d1e9274d5..722eb2226 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -238,7 +238,7 @@ inventoryX c = case c of , rifle , shellMag ] - 'P' -> [burstRifle , tinMag, battery, bulletSynthesizer] + 'P' -> [burstRifle , tinMag, bulletSynthesizer, battery] 'T' -> testInventory 'U' -> [targetingScope tt | tt <- [minBound .. maxBound]] diff --git a/src/Dodge/Debug/Terminal.hs b/src/Dodge/Debug/Terminal.hs index d3b549dbb..3ac5b7ea3 100644 --- a/src/Dodge/Debug/Terminal.hs +++ b/src/Dodge/Debug/Terminal.hs @@ -28,7 +28,7 @@ applyTerminalString ss = case ss of applyTerminalCommand :: String -> Universe -> Universe applyTerminalCommand s = case s of "NOCLIP" -> uvConfig . debug_booleans . at Noclip %~ toggleJust - ['L', x] -> uvWorld %~ \w -> foldr createItemYou w (inventoryX x) + ['L', x] -> uvWorld %~ \w -> foldl' (flip createItemYou) w (inventoryX x) -- (uvWorld . cWorld . lWorld %~ initSpecificCrItemLocations 0) -- . (uvWorld . cWorld . lWorld . creatures . ix 0 . crInv .~ IM.fromList (zip [0 ..] $ inventoryX x)) -- . (uvWorld . cWorld . lWorld . creatures . ix 0 . crInvCapacity .~ 50) diff --git a/src/Dodge/Inventory/CheckSlots.hs b/src/Dodge/Inventory/CheckSlots.hs index ca38d81ee..54da60bf0 100644 --- a/src/Dodge/Inventory/CheckSlots.hs +++ b/src/Dodge/Inventory/CheckSlots.hs @@ -28,7 +28,7 @@ crNumFreeSlots m cr = maxInvSlots - invSize (fmap f (_crInv cr)) f i = m ^?! ix i maxInvSlots :: Int -maxInvSlots = 25 +maxInvSlots = 250 invSize :: NewIntMap InvInt Item -> Int invSize = alaf Sum foldMap itInvHeight