From 34488ce52bca4031a81c57b9b1ee79ce5c4858c6 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Tue, 14 Dec 2021 00:14:12 +0100
Subject: audioVolumne is of type float, not int

also, float properties exist, apparently
---
 lib/Tiled.hs | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'lib/Tiled.hs')

diff --git a/lib/Tiled.hs b/lib/Tiled.hs
index f1d7ec6..a092b67 100644
--- a/lib/Tiled.hs
+++ b/lib/Tiled.hs
@@ -62,7 +62,7 @@ data Property = Property Text PropertyValue
 -- | The value of a custom tiled property.
 -- It is strongly typed via a tag in the json representation,
 -- and needs a custom ToJSON and FromJSON instance because of that.
-data PropertyValue = StrProp Text | BoolProp Bool | IntProp Int
+data PropertyValue = StrProp Text | BoolProp Bool | IntProp Int | FloatProp Float
   deriving (Eq, Generic, Show)
 
 instance IsString PropertyValue where
@@ -81,22 +81,34 @@ instance FromJSON Property where
       A.String "int" -> do
         val <- o .: "value"
         pure $ Property name (IntProp val)
+      A.String "float" -> do
+        val <- o .: "value"
+        pure $ Property name (FloatProp val)
       ty -> fail $ "properties can only have types string, int, bool, but encountered type" <> show ty
   parseJSON invalid = typeMismatch "Property" invalid
 
 instance ToJSON Property where
   toJSON (Property name val) = case val of
-    StrProp str -> object [ "type" .= A.String "string"
-                          , "name" .= name
-                          , "value" .= str
-                          ]
-    BoolProp bool -> object [ "type" .= A.String "bool"
-                            , "name" .= name
-                            , "value" .= bool
-                            ]
-    IntProp int -> object [ "type" .= A.String "int"
-                          , "name" .= name
-                          , "value" .= int]
+    StrProp str -> object
+      [ "type" .= A.String "string"
+      , "name" .= name
+      , "value" .= str
+      ]
+    BoolProp bool -> object
+      [ "type" .= A.String "bool"
+      , "name" .= name
+      , "value" .= bool
+      ]
+    IntProp int -> object
+      [ "type" .= A.String "int"
+      , "name" .= name
+      , "value" .= int
+      ]
+    FloatProp float -> object
+      [ "type" .= A.String "float"
+      , "name" .= name
+      , "value" .= float
+      ]
 
 data Point = Point { pointX :: Double
                    , pointY :: Double
-- 
cgit v1.2.3