diff options
Diffstat (limited to 'users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs')
| -rw-r--r-- | users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs b/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs index 62e6e15c98..a0c037a1b4 100644 --- a/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs +++ b/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs @@ -13,6 +13,7 @@ import Xanthous.Entities.Character import Xanthous.Entities.Item import Xanthous.Entities.Creature import Xanthous.Entities.Environment +import Xanthous.Entities.Marker import Xanthous.Game.State import Xanthous.Util.QuickCheck import Data.Aeson.Generic.DerivingVia @@ -27,6 +28,7 @@ instance Arbitrary SomeEntity where , SomeEntity <$> arbitrary @Door , SomeEntity <$> arbitrary @GroundMessage , SomeEntity <$> arbitrary @Staircase + , SomeEntity <$> arbitrary @Marker ] instance FromJSON SomeEntity where @@ -40,6 +42,7 @@ instance FromJSON SomeEntity where "Door" -> SomeEntity @Door <$> obj .: "data" "GroundMessage" -> SomeEntity @GroundMessage <$> obj .: "data" "Staircase" -> SomeEntity @Staircase <$> obj .: "data" + "Marker" -> SomeEntity @Marker <$> obj .: "data" _ -> fail . unpack $ "Invalid entity type \"" <> entityType <> "\"" deriving via WithOptions '[ FieldLabelModifier '[Drop 1] ] GameLevel |