#10 #18 Fix parsing

lib/RPGEngine/Parse/StructureToGame.hs

@@ -10,26 +10,25 @@ import RPGEngine.Data
              entityActions, entityValue, entityHp, direction),
       Item(itemId, itemX, itemY, itemName, itemDescription, itemValue,
            itemActions, useTimes),
-      Level(layout, items, entities),
+      Level(layout, items, entities, index),
       Game (..), State (..) )
 import RPGEngine.Parse.TextToStructure
     ( Value(Infinite, Action, Layout, String, Direction, Integer),
       Key(Tag, ConditionList),
       Structure(..) )
 import RPGEngine.Data.Default (defaultPlayer, defaultLevel, defaultItem, defaultEntity)
+import RPGEngine.Input.Playing (putCoords, spawnPlayer)
 
 ------------------------------ Exported ------------------------------
 
-structureToGame :: Structure -> Game
--- structureToGame [Entry(Tag "player") playerBlock, Entry(Tag "levels") levelsBlock] = game
-structureToGame (Entry (Tag "player") playerBlock) = game
-    where game         = Game{ state = newState }
-          newState     = Playing{ levels = newLevels, level = currentLevel, player = newPlayer, restart = newState }
-          -- newLevels    = structureToLevels levelsBlock
-          -- currentLevel = head newLevels
-          newLevels    = [defaultLevel]
-          currentLevel = defaultLevel
-          newPlayer    = structureToPlayer playerBlock
+structureToGame :: [Structure] -> Game
+structureToGame [Entry (Tag "player") playerBlock, Entry (Tag "levels") levelsBlock] = game
+    where game         = Game newState
+          newState     = Playing newLevels 0 currentLevel newPlayer newState
+          newLevels    = structureToLevels levelsBlock
+          currentLevel = head newLevels
+          newPlayer    = spawnPlayer currentLevel $ structureToPlayer playerBlock
+structureToGame _ = Game Menu
 
 ------------------------------- Player -------------------------------
 
@@ -60,7 +59,9 @@ structureToLevels (Block struct) = structureToLevel <$> struct
 structureToLevels _              = [defaultLevel]
 
 structureToLevel :: Structure -> Level
-structureToLevel (Block entries) = structureToLevel' entries defaultLevel
+structureToLevel (Block entries) = indexIsSet
+  where indexIsSet = level{ index = putCoords level }
+        level      = structureToLevel' entries defaultLevel
 structureToLevel _               = defaultLevel
 
 structureToLevel' :: [Structure] -> Level -> Level

lib/RPGEngine/Parse/TextToStructure.hs

@@ -18,9 +18,13 @@ import Text.Parsec
       notFollowedBy,
       sepBy,
       many,
-      try )
+      try, spaces, endOfLine )
 import qualified Text.Parsec as P ( string )
 import Text.Parsec.String ( Parser )
+import Text.Parsec.Combinator (lookAhead)
+
+gameFile :: Parser [Structure]
+gameFile = try $ do many1 $ ignoreWS structure
 
 -------------------------- StructureElement --------------------------
 
@@ -111,7 +115,7 @@ data Value = String String
 ----------------------------------------------------------------------
 
 value :: Parser Value
-value = choice [layout, string, integer, infinite, action, direction]
+value = choice [layout, string, integer, infinite, direction, action]
 
 string :: Parser Value
 string = try $ String <$> between (char '\"') (char '\"') reading
@@ -149,7 +153,7 @@ direction = try $ do
         ignoreWS $ P.string "left",
         ignoreWS $ P.string "right"
         ]
-    notFollowedBy alphaNum
+    -- lookAhead $ char ','
     return $ Direction $ make value
     where make "up"    = North
           make "right" = East
@@ -160,15 +164,12 @@ direction = try $ do
 layout :: Parser Value
 layout = try $ do
     open <- ignoreWS $ oneOf openingBrackets
-    ignoreWS $ char '|'
-    list <- ignoreWS $ ignoreWS strip `sepBy` ignoreWS (char '|')
     let closing = getMatchingClosingBracket open
-    ignoreWS $ char closing
-    return $ Layout list
+    value <- many1 strip <* ignoreWS (char closing)
+    return $ Layout value
 
 strip :: Parser Strip
-strip = try $ do
-    physical `sepBy` char ' '
+strip = try $ do ignoreWS (char '|') *> ignoreWS (physical `sepBy` char ' ')
 
 physical :: Parser Physical
 physical = try $ do