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

feat(gs/xanthous): Creatures use their weapons to attack

Browse source 
If a creature has a weapon wielded, then they now use that weapon to
attack the player *instead of* their natural attacks. This uses a new
`creatureAttackMessage` field on the Item raw for the message to use.

Change-Id: I73614f33dbf88dd4c68081f15710fa27b7b21ba2
This commit is contained in:
Griffin Smith 2021-11-25 09:53:56 -05:00 • committed by grfn
parent 4b11859d04
commit a3d220b631
5 changed files with 50 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
users/grfn/xanthous/src/Xanthous/AI/Gormlak.hs
View file

@ -26,8 +26,10 @@ import qualified Xanthous.Entities.Character as Character
import qualified Xanthous.Entities.RawTypes as Raw
import Xanthous.Entities.RawTypes
( CreatureType, HasLanguage(language), getLanguage
, HasAttacks (attacks)
, HasAttacks (attacks), creatureAttackMessage
)
import Xanthous.Entities.Common
( wielded, Inventory, wieldedItems, WieldedItem (WieldedItem) )
import Xanthous.Game.State
import Xanthous.Game.Lenses
( entitiesCollision, collisionAt
@ -36,7 +38,7 @@ import Xanthous.Game.Lenses
)
import Xanthous.Data.EntityMap.Graphics (linesOfSight, canSee)
import Xanthous.Random
import Xanthous.Monad (say)
import Xanthous.Monad (say, message)
import Xanthous.Generators.Speech (word)
import qualified Linear.Metric as Metric
import qualified Xanthous.Messages as Messages
@ -50,6 +52,7 @@ type IsCreature entity =
( HasVisionRadius entity
, HasField "_hippocampus" entity entity Hippocampus Hippocampus
, HasField "_creatureType" entity entity CreatureType CreatureType
, HasField "_inventory" entity entity Inventory Inventory
, A.ToJSON entity
)
@ -113,14 +116,26 @@ stepGormlak ticks pe@(Positioned pos creature) = do
where
vision = visionRadius creature
attackCharacter = do
attack <- choose $ creature ^. creatureType . attacks
attackDescription <- Messages.render (attack ^. Raw.description)
$ object []
say ["combat", "creatureAttack"]
$ object [ "creature" A..= creature
, "attackDescription" A..= attackDescription
]
character %= Character.damage (attack ^. Raw.damage)
dmg <- case creature ^? inventory . wielded . wieldedItems of
Just (WieldedItem item wi) -> do
let msg = fromMaybe
(Messages.lookup ["combat", "creatureAttack", "genericWeapon"])
$ wi ^. creatureAttackMessage
message msg $ object [ "creature" A..= creature
, "item" A..= item
]
pure $ wi ^. Raw.damage
Nothing -> do
attack <- choose $ creature ^. creatureType . attacks
attackDescription <- Messages.render (attack ^. Raw.description)
$ object []
say ["combat", "creatureAttack", "natural"]
$ object [ "creature" A..= creature
, "attackDescription" A..= attackDescription
]
pure $ attack ^. Raw.damage
character %= Character.damage dmg
yellAtCharacter = for_ (creature ^. creatureType . language)
$ \lang -> do
@ -171,6 +186,9 @@ hippocampus = field @"_hippocampus"
creatureType :: HasField "_creatureType" s t a b => Lens s t a b
creatureType = field @"_creatureType"
inventory :: HasField "_inventory" s t a b => Lens s t a b
inventory = field @"_inventory"
--------------------------------------------------------------------------------
-- instance Brain Creature where