justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge in terminal changes

Browse Source
This commit is contained in:
justin
2022-03-20 17:23:27 +00:00
parent 5e897c6a6c
commit d19bd5c327
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Debug/Terminal.hs
-26
View File
@@ -1,12 +1,4 @@
module Dodge.Debug.Terminal module Dodge.Debug.Terminal
<<<<<<< HEAD
( applyTerminalString
) where
import Dodge.Data
import Dodge.Creature
import Dodge.Creature.YourControl
import Dodge.Creature.State
=======
where where
import Dodge.Creature import Dodge.Creature
import Dodge.Creature.State import Dodge.Creature.State
@@ -14,7 +6,6 @@ import Dodge.Creature.YourControl
import Dodge.Data import Dodge.Data
import Dodge.Menu.PushPop import Dodge.Menu.PushPop
import Control.Monad import Control.Monad
>>>>>>> ross/loop-master
import Control.Lens import Control.Lens
import Text.Read (readMaybe) import Text.Read (readMaybe)
@@ -26,22 +17,6 @@ import Graphics.Rendering.OpenGL.GL.Shaders (validateProgram)
import Dodge.Data (Universe(Universe)) import Dodge.Data (Universe(Universe))
applyTerminalString :: String -> Universe -> Universe applyTerminalString :: String -> Universe -> Universe
<<<<<<< HEAD
applyTerminalString str = case str of
"NOCLIP" -> config . debug_noclip %~ not
"LOADME" -> (uvWorld . creatures . ix 0 . crInv .~ stackedInventory)
. (uvWorld . creatures . ix 0 . crInvCapacity .~ 50)
"GODON" -> uvWorld . creatures . ix 0 . crUpdate .~ stateUpdateDamage clearDamage yourControl
"GODOFF" -> uvWorld . creatures . ix 0 . crUpdate .~ stateUpdate yourControl
"LOADTEST" -> (uvWorld . creatures . ix 0 . crInv .~ testInventory)
. (uvWorld . creatures . ix 0 . crInvCapacity .~ 50)
"LM" -> applyTerminalString "LOADME"
"LT" -> applyTerminalString "LOADTEST"
_ -> loadme
loadme :: a -> a
loadme = id
=======
applyTerminalString "NOCLIP" = config . debug_noclip %~ not applyTerminalString "NOCLIP" = config . debug_noclip %~ not
applyTerminalString "LOADME" = (uvWorld . creatures . ix 0 . crInv .~ stackedInventory) applyTerminalString "LOADME" = (uvWorld . creatures . ix 0 . crInv .~ stackedInventory)
. (uvWorld . creatures . ix 0 . crInvCapacity .~ 50) . (uvWorld . creatures . ix 0 . crInvCapacity .~ 50)
@@ -135,4 +110,3 @@ commonPrefix :: Eq a => [a] -> [a] -> [a]
commonPrefix (x:xs) (y:ys) commonPrefix (x:xs) (y:ys)
| x == y = x : commonPrefix xs ys | x == y = x : commonPrefix xs ys
commonPrefix _ _ = [] commonPrefix _ _ = []
>>>>>>> ross/loop-master