maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(gs/xanthous): Creatures drop their items when they die

Browse source 
When a creature is killed, it now drops all the contents of its
inventory on the ground.

Change-Id: Ie95c397308ba2c9861f10e58b99c91c9cc759c56
This commit is contained in:
Griffin Smith 2021-11-25 10:14:00 -05:00 • committed by grfn
parent a3d220b631
commit 604319850c
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
users/grfn/xanthous/src/Xanthous/App.hs
View file

@ -48,17 +48,18 @@ import Xanthous.Game.Draw (drawGame)
import Xanthous.Game.Prompt hiding (Fire)
import qualified Xanthous.Messages as Messages
import Xanthous.Random
import Xanthous.Util (removeVectorIndex)
import Xanthous.Util (removeVectorIndex, useListOf)
import Xanthous.Util.Inflection (toSentence)
import Xanthous.Physics (throwDistance, bluntThrowDamage)
import Xanthous.Data.EntityMap.Graphics (lineOfSight)
import Xanthous.Data.EntityMap (EntityID)
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
import Xanthous.Entities.Common
( InventoryPosition, describeInventoryPosition, backpack
, wieldableItem, wieldedItems, wielded, itemsWithPosition
, removeItemFromPosition, asWieldedItem, inRightHand
, wieldedItem
, wieldedItem, items
)
import qualified Xanthous.Entities.Character as Character
import Xanthous.Entities.Character hiding (pickUpItem)
@ -462,7 +463,18 @@ damageCreature (creatureID, creature) dam = do
if Creature.isDead creature'
then do
say ["combat", "killed"] msgParams
floorItems <- useListOf
$ entities
. ix creatureID
. positioned
. _SomeEntity @Creature
. inventory
. items
mCreaturePos <- preuse $ entities . ix creatureID . position
entities . at creatureID .= Nothing
for_ mCreaturePos $ \creaturePos ->
entities . EntityMap.atPosition creaturePos
%= (<> fromList (SomeEntity <$> floorItems))
else entities . ix creatureID . positioned .= SomeEntity creature'
pure creature'