swarm-game/swarm
1
1
Fork 0
mirror of https://github.com/swarm-game/swarm.git synced 2024-09-11 14:46:33 +03:00
Code Issues Projects Releases Wiki Activity

simplify infinite entity grabbing logic (#1737)

Browse Source 
Refactoring towards #1598
This commit is contained in:
Karl Ostmo 2024-01-23 20:53:05 -08:00 committed by GitHub
parent 9320a985e4
commit d1a41de8ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/swarm-engine/Swarm/Game/Step/Const.hs
View File

@ -1688,13 +1688,11 @@ execConst runChildProg c vs s k = do
(omni || e `hasProperty` Pickable)
`holdsOrFail` ["The", e ^. entityName, "here can't be", verbed <> "."]
-- Remove the entity from the world.
updateEntityAt loc (const Nothing)
flagRedraw
-- Immediately regenerate entities with 'infinite' property.
when (e `hasProperty` Infinite) $
updateEntityAt loc (const (Just e))
-- Entities with 'infinite' property are not removed
unless (e `hasProperty` Infinite) $ do
-- Remove the entity from the world.
updateEntityAt loc (const Nothing)
flagRedraw
-- Possibly regrow the entity, if it is growable and the 'harvest'
-- command was used.