justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
justin
2024-11-07 19:45:53 +00:00
parent efcd3bd84a
commit 216d55865f
3 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ghcidOutput
+1 -1
View File
@@ -1 +1 @@
All good (594 modules, at 19:17:30)
All good (594 modules, at 19:45:49)
src/Dodge/Machine/Update.hs
+14 -9
View File
@@ -1,4 +1,6 @@
module Dodge.Machine.Update where
module Dodge.Machine.Update (
updateMachine,
) where
import Control.Monad
import Data.List (partition)
@@ -34,13 +36,14 @@ terminalScreenGlow mc w = fromMaybe w $ do
term <- w ^? cWorld . lWorld . terminals . ix tid
guard (_tmStatus term /= TerminalOff)
let V4 x y z _ = _tmScreenColor term
return $ w & cWorld . lWorld . tempLightSources .:~ TLS
return $
w & cWorld . lWorld . tempLightSources
.:~ TLS
{ _tlsParam = LSParam (_mcPos mc `v2z` 20) 30 (V3 x y z)
, _tlsUpdate = TimerTLS
, _tlsTime = 1
}
updateTurret :: Float -> Machine -> World -> World
updateTurret rotSpeed mc w =
w
@@ -102,9 +105,11 @@ mcPlaySound mc w = case _mcCloseSound mc of
mcApplyDamage :: [Damage] -> Machine -> World -> World
mcApplyDamage ds mc = case mc ^? mcType . _McSensor of
Nothing -> mcpointer
Nothing ->
mcpointer
%~ ((mcDamage .~ []) . (mcHP -~ sum (map _dmAmount ds)))
_ -> mcpointer
_ ->
mcpointer
%~ (mcDamage .~ [])
where
mcpointer = cWorld . lWorld . machines . ix (_mcID mc)
@@ -161,7 +166,7 @@ senseDamage threshold dt mc =
lsid <- mc ^? mcMounts . ix ObLightSource
return $ cWorld . lWorld . lightSources . ix lsid . lsParam . lsCol .~ V3 ni ni ni
damageUsing :: DamageType -> Damage -> Either Int Int
damageUsing dt dm
| _dmType dm == dt = Left $ _dmAmount dm
| otherwise = Right 0
--damageUsing :: DamageType -> Damage -> Either Int Int
--damageUsing dt dm
-- | _dmType dm == dt = Left $ _dmAmount dm
-- | otherwise = Right 0
tags
+11 -11
View File
@@ -3805,7 +3805,7 @@ damageSensor src/Dodge/Placement/Instance/Sensor.hs 15;" f
damageStone src/Dodge/Material/Damage.hs 20;" f
damageThingHit src/Dodge/Bullet.hs 176;" f
damageTypeThreshold src/Dodge/Placement/Instance/Sensor.hs 45;" f
damageUsing src/Dodge/Machine/Update.hs 163;" f
damageUsing src/Dodge/Machine/Update.hs 164;" f
damageWall src/Dodge/Wall/Damage.hs 15;" f
damageWallEffect src/Dodge/Wall/DamageEffect.hs 11;" f
damageWlCircle src/Dodge/DamageCircle.hs 26;" f
@@ -4893,20 +4893,20 @@ maybeOpenTerminal src/Dodge/Update.hs 120;" f
maybeReadFile src/Dodge/LoadSeed.hs 10;" f
maybeTakeOne src/RandomHelp.hs 111;" f
maybeWarmupStatus src/Dodge/Item/Display.hs 119;" f
mcApplyDamage src/Dodge/Machine/Update.hs 102;" f
mcApplyDamage src/Dodge/Machine/Update.hs 103;" f
mcKillBut src/Dodge/Machine/Destroy.hs 34;" f
mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f
mcPlaySound src/Dodge/Machine/Update.hs 92;" f
mcProxTest src/Dodge/Machine/Update.hs 138;" f
mcProximitySensorUpdate src/Dodge/Machine/Update.hs 116;" f
mcPlaySound src/Dodge/Machine/Update.hs 93;" f
mcProxTest src/Dodge/Machine/Update.hs 139;" f
mcProximitySensorUpdate src/Dodge/Machine/Update.hs 117;" f
mcSPic src/Dodge/Render/ShapePicture.hs 131;" f
mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 81;" f
mcSensorUpdate src/Dodge/Machine/Update.hs 111;" f
mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 82;" f
mcSensorUpdate src/Dodge/Machine/Update.hs 112;" f
mcShootLaser src/Dodge/HeldUse.hs 465;" f
mcTriggerVal src/Dodge/Machine/Update.hs 87;" f
mcTriggerVal src/Dodge/Machine/Update.hs 88;" f
mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f
mcUseHeld src/Dodge/HeldUse.hs 404;" f
mcUseItem src/Dodge/Machine/Update.hs 73;" f
mcUseItem src/Dodge/Machine/Update.hs 74;" f
medkit src/Dodge/Item/Consumable.hs 8;" f
megaBattery src/Dodge/Item/Ammo.hs 84;" f
megaShellMag src/Dodge/Item/Ammo.hs 61;" f
@@ -5590,7 +5590,7 @@ selectUse src/Dodge/SelectUse.hs 11;" f
selectedCloseObject src/Dodge/Inventory.hs 287;" f
sensAboveDoor src/Dodge/Room/SensorDoor.hs 63;" f
sensInsideDoor src/Dodge/Room/SensorDoor.hs 69;" f
senseDamage src/Dodge/Machine/Update.hs 146;" f
senseDamage src/Dodge/Machine/Update.hs 147;" f
sensorCommand src/Dodge/Terminal.hs 209;" f
sensorInfoMap src/Dodge/Terminal.hs 181;" f
sensorRoom src/Dodge/Room/SensorDoor.hs 27;" f
@@ -6183,7 +6183,7 @@ updateTeslaArc src/Dodge/Tesla/Arc.hs 29;" f
updateTeslaArcs src/Dodge/Update.hs 547;" f
updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f
updateTractorBeams src/Dodge/Update.hs 550;" f
updateTurret src/Dodge/Machine/Update.hs 43;" f
updateTurret src/Dodge/Machine/Update.hs 44;" f
updateUniverse src/Dodge/Update.hs 69;" f
updateUniverseFirst src/Dodge/Update.hs 80;" f
updateUniverseLast src/Dodge/Update.hs 130;" f