diff --git a/lib/CheckMap.hs b/lib/CheckMap.hs index 53cd0c7e15f187972c109f8da53cb96951a9780d..30470719708e46afed591c76eef2ea639f76ca6e 100644 --- a/lib/CheckMap.hs +++ b/lib/CheckMap.hs @@ -10,6 +10,7 @@ module CheckMap (loadAndLintMap, MapResult(..)) where import Data.Aeson (ToJSON (toJSON)) import qualified Data.Aeson as A +import Data.Aeson.Types ((.=)) import Data.Map (Map, toList) import qualified Data.Map as M import Data.Maybe (mapMaybe) @@ -19,7 +20,6 @@ import qualified Data.Vector as V import GHC.Generics (Generic) -import Data.Aeson.Types ((.=)) import LintWriter (LintWriter, askContext, filterLintLevel, invertLintResult, lintToDep, resultToDeps, resultToLints, resultToOffers, runLintWriter) diff --git a/lib/Tiled2.hs b/lib/Tiled2.hs index 0f200611cb8ff1716cd1c6010c408db8d44c2230..a82de2c5c54a9b757798115b236f43dc890c09d4 100644 --- a/lib/Tiled2.hs +++ b/lib/Tiled2.hs @@ -227,8 +227,12 @@ instance ToJSON Frame where data Tile = Tile { tileId :: Int , tileProperties :: Maybe (Vector Value) , tileImage :: Maybe Value - , tileObjectGroup :: Maybe (Vector Object) + , tileObjectGroup :: Maybe Value , tileAnimation :: Maybe (Vector Frame) + , tileImageheight :: Maybe Int + , tileImagewidth :: Maybe Int + , tileProbability :: Maybe Float + , tileType :: Maybe Text } deriving (Eq, Generic, Show) instance FromJSON Tile where