Start removing Reader monad from internal creature update

This commit is contained in:
2021-12-11 18:24:53 +00:00
parent cdeb3dfa67
commit 154abf0bad
4 changed files with 25 additions and 56 deletions
+4 -3
View File
@@ -1,13 +1,13 @@
module Dodge.Placement.Instance.Turret where
import Color
import Dodge.Data
import Dodge.Reloading
--import Dodge.Reloading
import Dodge.Creature.State
import Dodge.Creature.Impulse
import Dodge.Creature.Picture
import Dodge.LevelGen.Data
import Dodge.Default
import Dodge.Creature.Impulse.UseItem
--import Dodge.Creature.Impulse.UseItem
import Dodge.FloorItem
import Dodge.Wall.Delete
import Dodge.WorldEvent.Explosion
@@ -43,6 +43,7 @@ lasTurret = Turret
, _tuMCrID = Nothing
}
-- this needs a major cleanup
updateTurret :: Float -> Machine -> World -> World
updateTurret rotSpeed mc w
| _mcHP mc < 1 = w & machines %~ IM.delete mcid
@@ -72,7 +73,7 @@ updateTurret rotSpeed mc w
& crPict .~ (\cr _ _ -> drawCrEquipment cr)
-- & crPict .~ basicCrPict red
-- & crUpdate .~ (\cr -> crUpCrUp stepReloading cr . invSideEff cr)
& crUpdate .~ stateUpdate' (\cr w -> followImpulses w cr)
& crUpdate .~ stateUpdate' (\cr w'' -> followImpulses w'' cr)
& crStance . posture .~ Aiming
Just cid -> w'
& creatures . ix cid . crPos .~ mcpos