From 2d182c1f9c80a1e1ffb232bc6e17980cb3a64cf5 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Mon, 13 Feb 2023 21:58:24 +0000 Subject: Pickups WIP TODO: collision --- src/Game/Map.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Game/Map.hs') diff --git a/src/Game/Map.hs b/src/Game/Map.hs index b79ba14..3855d16 100644 --- a/src/Game/Map.hs +++ b/src/Game/Map.hs @@ -31,7 +31,10 @@ data Layer deriving (Show) -- | The object types in the map. -data Object = PlayerEntity Int Int deriving (Show) +data Object + = PlayerEntity Int Int + | BatteryEntity Int Int + deriving (Show) data JsonMapData = JsonMapData { width :: Int, @@ -68,6 +71,8 @@ instance JSON Object where case get_field obj "name" of Just "Player" -> PlayerEntity <$> valFromObj "x" obj <*> valFromObj "y" obj + Just "Battery" -> + BatteryEntity <$> valFromObj "x" obj <*> valFromObj "y" obj Just (JSString (JSONString s)) -> Error $ "unsupported entity " ++ show s e -> Error $ "unsupported entity in " ++ show e readJSON _ = mzero -- cgit v1.2.3