summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorstuebinm2021-10-30 15:15:28 +0200
committerstuebinm2021-10-30 15:44:26 +0200
commit69484ee8d2114150b81109067428110e9a18c475 (patch)
tree33faf9e3c163a0df4fe21a588c696702fabf1528 /lib
parentedf0ac82fe262f36e25d322f09cbfaae6f2b5298 (diff)
yet more tiled properties
Diffstat (limited to '')
-rw-r--r--lib/CheckMap.hs2
-rw-r--r--lib/Tiled2.hs6
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/CheckMap.hs b/lib/CheckMap.hs
index 53cd0c7..3047071 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 0f20061..a82de2c 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