From 84f32efad4ff6d358fdeb985b3b4ac408e753b78 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 3 Jan 2020 18:28:43 -0500 Subject: Track entity collision in the Entity class Rather than having a single function in the Game.Lenses module for determining what collision type if any an entity has, track it in the Entity typeclass itself. This is both more extensible and a better separation of concerns and gets rid of one of the two needs for a circular import. Yay! As part of this, I realized nothing was being done to prevent doors from being placed on tiles that already had walls (since now that was properly causing a collision!) so I've fixed that as well. --- src/Xanthous/Entities/Creature.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Xanthous/Entities/Creature.hs') diff --git a/src/Xanthous/Entities/Creature.hs b/src/Xanthous/Entities/Creature.hs index 6e955324a06a..a44b3b22813b 100644 --- a/src/Xanthous/Entities/Creature.hs +++ b/src/Xanthous/Entities/Creature.hs @@ -68,6 +68,7 @@ instance Entity Creature where blocksVision _ = False description = view $ creatureType . Raw.description entityChar = view $ creatureType . char + entityCollision = const $ Just Combat -------------------------------------------------------------------------------- -- cgit 1.4.1