Refactor window block

This commit is contained in:
jgk
2021-03-23 03:25:35 +01:00
parent 257e60e4e8
commit afb3d8a712
16 changed files with 151 additions and 883 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ import Dodge.Base
import Dodge.SoundLogic
import Dodge.CreatureAction
import Dodge.RandomHelp
import Dodge.WorldActions
import Dodge.WorldEvent
import Dodge.Debug
import Dodge.WallCreatureCollisions
import Dodge.Prototypes
+1 -1
View File
@@ -2,7 +2,7 @@ module Dodge.Item.Weapon.Bullet
where
import Dodge.Data
import Dodge.Base
import Dodge.WorldActions
import Dodge.WorldEvent
import Dodge.SoundLogic
import Dodge.RandomHelp
+2 -2
View File
@@ -3,7 +3,7 @@ module Dodge.Item.Weapon.TriggerType
import Dodge.Data
import Dodge.SoundLogic
import Dodge.CreatureAction (reloadWeapon)
import Dodge.WorldActions (muzFlareAt,lowLightAt,tLightAt)
import Dodge.WorldEvent (muzFlareAt,lowLightAt,tempLightForAt)
import Dodge.RandomHelp
import Dodge.Item.Weapon.Bullet
@@ -94,7 +94,7 @@ shoot f cid w | fireCondition = over (pointerToItem . wpLoadedAmmo) (\ammo -> am
reloadCondition = _wpLoadedAmmo item == 0
withMuzFlare :: (Int -> World -> World) -> Int -> World -> World
withMuzFlare f cid w = over tempLightSources (tLightAt 3 pos :)
withMuzFlare f cid w = tempLightForAt 3 pos
. muzFlareAt pos2 $ f cid w
where cr = _creatures w IM.! cid
dir = _crDir cr