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

Add sound, cleanup

Browse Source
This commit is contained in:
justin
2025-12-26 16:01:07 +00:00
parent 3f7eeb871c
commit 157d63a714
3 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sound/semitoneLoop1.DUHDEH.100.wav
BIN
View File
Binary file not shown.
src/Dodge/Placement/Instance/Sensor.hs
+5 -5
View File
@@ -1,4 +1,5 @@
{-# LANGUAGE LambdaCase #-} {-# LANGUAGE LambdaCase #-}
module Dodge.Placement.Instance.Sensor ( module Dodge.Placement.Instance.Sensor (
lightSensor, lightSensor,
damageSensor, damageSensor,
@@ -13,15 +14,14 @@ import Geometry
damageSensor :: SensorType -> Float -> Maybe Int -> PlacementSpot -> Placement damageSensor :: SensorType -> Float -> Maybe Int -> PlacementSpot -> Placement
damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $ damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $
\lsid -> psPtJpl ps \lsid ->
$ psPtJpl ps $
PutMachine PutMachine
(reverse $ square wdth) (reverse $ square wdth)
( defaultMachine ( defaultMachine
& mcMounts . at OTTrigger .~ mtrid & mcMounts . at OTTrigger .~ mtrid
& mcMounts . at OTLightSource ?~ lsid & mcMounts . at OTLightSource ?~ lsid
& mcType & mcType .~ McDamSensor (DamSensor 0 dt)
.~ McDamSensor ( DamSensor 0 dt)
) )
Nothing Nothing
tags
+26 -27
View File
@@ -836,7 +836,7 @@ NoFlare src/Dodge/Data/Muzzle.hs 29;" C
NoHoming src/Dodge/Data/Projectile.hs 40;" C NoHoming src/Dodge/Data/Projectile.hs 40;" C
NoItTargeting src/Dodge/Data/Item.hs 44;" C NoItTargeting src/Dodge/Data/Item.hs 44;" C
NoItemScroll src/Dodge/Data/Item.hs 39;" C NoItemScroll src/Dodge/Data/Item.hs 39;" C
NoItemZone src/Dodge/Data/Machine/Sensor.hs 32;" C NoItemZone src/Dodge/Data/Machine/Sensor.hs 31;" C
NoLightFlare src/Dodge/Data/Muzzle.hs 31;" C NoLightFlare src/Dodge/Data/Muzzle.hs 31;" C
NoLighting src/Dodge/Data/Config.hs 118;" C NoLighting src/Dodge/Data/Config.hs 118;" C
NoMouseContext src/Dodge/Data/Input.hs 14;" C NoMouseContext src/Dodge/Data/Input.hs 14;" C
@@ -1024,10 +1024,10 @@ ProjectileParams src/Dodge/Data/Item/Use.hs 51;" C
ProjectileStabiliserSF src/Dodge/Data/ComposedItem.hs 36;" C ProjectileStabiliserSF src/Dodge/Data/ComposedItem.hs 36;" C
ProjectileType src/Dodge/Data/Projectile.hs 30;" t ProjectileType src/Dodge/Data/Projectile.hs 30;" t
Prop src/Dodge/Data/Prop.hs 14;" t Prop src/Dodge/Data/Prop.hs 14;" t
ProxSensor src/Dodge/Data/Machine/Sensor.hs 25;" C ProxSensor src/Dodge/Data/Machine/Sensor.hs 24;" C
ProximityRequirement src/Dodge/Data/Machine/Sensor.hs 34;" t ProximityRequirement src/Dodge/Data/Machine/Sensor.hs 33;" t
ProximitySensor src/Dodge/Data/Machine/Sensor.hs 25;" t ProximitySensor src/Dodge/Data/Machine/Sensor.hs 24;" t
ProximitySensorType src/Dodge/Data/Machine/Sensor.hs 30;" t ProximitySensorType src/Dodge/Data/Machine/Sensor.hs 29;" t
Pulse src/Dodge/Data/Creature/Misc.hs 52;" t Pulse src/Dodge/Data/Creature/Misc.hs 52;" t
PulseBall src/Dodge/Data/PulseLaser.hs 20;" t PulseBall src/Dodge/Data/PulseLaser.hs 20;" t
PulseBallSF src/Dodge/Data/ComposedItem.hs 44;" C PulseBallSF src/Dodge/Data/ComposedItem.hs 44;" C
@@ -1097,9 +1097,9 @@ RemoveEquipment src/Dodge/Data/RightButtonOptions.hs 33;" C
Remove_LOS src/Dodge/Data/Config.hs 90;" C Remove_LOS src/Dodge/Data/Config.hs 90;" C
RenderData src/Data/Preload/Render.hs 13;" t RenderData src/Data/Preload/Render.hs 13;" t
ReplaceEquipment src/Dodge/Data/RightButtonOptions.hs 29;" C ReplaceEquipment src/Dodge/Data/RightButtonOptions.hs 29;" C
RequireDeadCreatures src/Dodge/Data/Machine/Sensor.hs 37;" C RequireDeadCreatures src/Dodge/Data/Machine/Sensor.hs 36;" C
RequireEquipment src/Dodge/Data/Machine/Sensor.hs 36;" C RequireEquipment src/Dodge/Data/Machine/Sensor.hs 35;" C
RequireHealth src/Dodge/Data/Machine/Sensor.hs 35;" C RequireHealth src/Dodge/Data/Machine/Sensor.hs 34;" C
ResFactor src/Dodge/Data/Config.hs 111;" t ResFactor src/Dodge/Data/Config.hs 111;" t
ResearchFacility src/Dodge/Data/Scenario.hs 62;" C ResearchFacility src/Dodge/Data/Scenario.hs 62;" C
ResourceFailure src/Dodge/Data/Scenario.hs 29;" C ResourceFailure src/Dodge/Data/Scenario.hs 29;" C
@@ -1173,7 +1173,7 @@ SelectionWidth src/Dodge/Data/SelectionList.hs 42;" t
SelfTree src/Dodge/Data/MetaTree.hs 20;" t SelfTree src/Dodge/Data/MetaTree.hs 20;" t
SemiAutoTrigger src/Dodge/Data/TriggerType.hs 9;" C SemiAutoTrigger src/Dodge/Data/TriggerType.hs 9;" C
SensorType src/Dodge/Data/Machine/Sensor.hs 12;" t SensorType src/Dodge/Data/Machine/Sensor.hs 12;" t
SensorWithRequirement src/Dodge/Data/Machine/Sensor.hs 31;" C SensorWithRequirement src/Dodge/Data/Machine/Sensor.hs 30;" C
SentinelAt src/Dodge/Data/ActionPlan.hs 152;" C SentinelAt src/Dodge/Data/ActionPlan.hs 152;" C
SetLSCol src/Dodge/Data/WorldEffect.hs 29;" C SetLSCol src/Dodge/Data/WorldEffect.hs 29;" C
SetTrigger src/Dodge/Data/WorldEffect.hs 27;" C SetTrigger src/Dodge/Data/WorldEffect.hs 27;" C
@@ -2118,11 +2118,11 @@ _preloadData src/Dodge/Data/Universe.hs 30;" f
_pressedKeys src/Dodge/Data/Input.hs 37;" f _pressedKeys src/Dodge/Data/Input.hs 37;" f
_projectiles src/Dodge/Data/LWorld.hs 102;" f _projectiles src/Dodge/Data/LWorld.hs 102;" f
_props src/Dodge/Data/LWorld.hs 100;" f _props src/Dodge/Data/LWorld.hs 100;" f
_proxReqDead src/Dodge/Data/Machine/Sensor.hs 37;" f _proxReqDead src/Dodge/Data/Machine/Sensor.hs 36;" f
_proxReqEquipment src/Dodge/Data/Machine/Sensor.hs 36;" f _proxReqEquipment src/Dodge/Data/Machine/Sensor.hs 35;" f
_proxReqMinHealth src/Dodge/Data/Machine/Sensor.hs 35;" f _proxReqMinHealth src/Dodge/Data/Machine/Sensor.hs 34;" f
_proxSensorType src/Dodge/Data/Machine/Sensor.hs 26;" f _proxSensorType src/Dodge/Data/Machine/Sensor.hs 25;" f
_proxToggle src/Dodge/Data/Machine/Sensor.hs 27;" f _proxToggle src/Dodge/Data/Machine/Sensor.hs 26;" f
_psFallback src/Dodge/Data/GenWorld.hs 96;" f _psFallback src/Dodge/Data/GenWorld.hs 96;" f
_psPos src/Dodge/Data/GenWorld.hs 91;" f _psPos src/Dodge/Data/GenWorld.hs 91;" f
_psRandShift src/Dodge/Data/GenWorld.hs 100;" f _psRandShift src/Dodge/Data/GenWorld.hs 100;" f
@@ -3049,7 +3049,7 @@ damageMetal src/Dodge/Material/Damage.hs 64;" f
damageSensor src/Dodge/Placement/Instance/Sensor.hs 14;" f damageSensor src/Dodge/Placement/Instance/Sensor.hs 14;" f
damageStone src/Dodge/Material/Damage.hs 33;" f damageStone src/Dodge/Material/Damage.hs 33;" f
damageThingHit src/Dodge/Bullet.hs 180;" f damageThingHit src/Dodge/Bullet.hs 180;" f
damageTypeThreshold src/Dodge/Machine/Update.hs 135;" f damageTypeThreshold src/Dodge/Machine/Update.hs 132;" f
damageWall src/Dodge/Wall/Damage.hs 29;" f damageWall src/Dodge/Wall/Damage.hs 29;" f
damsToExpBarrel src/Dodge/Barreloid.hs 50;" f damsToExpBarrel src/Dodge/Barreloid.hs 50;" f
dark src/Color.hs 135;" f dark src/Color.hs 135;" f
@@ -4135,23 +4135,22 @@ maybeOpenConsole src/Dodge/Update.hs 127;" f
maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f
maybeTakeOne src/RandomHelp.hs 116;" f maybeTakeOne src/RandomHelp.hs 116;" f
maybeWarmupStatus src/Dodge/Item/Display.hs 45;" f maybeWarmupStatus src/Dodge/Item/Display.hs 45;" f
mcApplyDamage src/Dodge/Machine/Update.hs 170;" f mcApplyDamage src/Dodge/Machine/Update.hs 167;" f
mcBackgroundSound src/Dodge/Machine/Update.hs 159;" f mcBackgroundSound src/Dodge/Machine/Update.hs 156;" f
mcColor src/Dodge/Machine/Draw.hs 82;" f mcColor src/Dodge/Machine/Draw.hs 82;" f
mcDamSensorTriggerUpdate src/Dodge/Machine/Update.hs 120;" f mcDamSensorTriggerUpdate src/Dodge/Machine/Update.hs 120;" f
mcDamSensorUpdate src/Dodge/Machine/Update.hs 177;" f mcDamSensorUpdate src/Dodge/Machine/Update.hs 174;" f
mcKillBut src/Dodge/Machine/Destroy.hs 38;" f mcKillBut src/Dodge/Machine/Destroy.hs 38;" f
mcKillTerm src/Dodge/Machine/Destroy.hs 30;" f mcKillTerm src/Dodge/Machine/Destroy.hs 30;" f
mcNoItemsTest src/Dodge/Machine/Update.hs 185;" f mcNoItemsTest src/Dodge/Machine/Update.hs 182;" f
mcPlaySound src/Dodge/Machine/Update.hs 143;" f mcPlaySound src/Dodge/Machine/Update.hs 140;" f
mcProxSensorTriggerUpdate src/Dodge/Machine/Update.hs 126;" f mcProxSensorTriggerUpdate src/Dodge/Machine/Update.hs 126;" f
mcProxSensorUpdate src/Dodge/Machine/Update.hs 180;" f mcProxSensorUpdate src/Dodge/Machine/Update.hs 177;" f
mcProxTest src/Dodge/Machine/Update.hs 261;" f mcProxTest src/Dodge/Machine/Update.hs 258;" f
mcProximitySensorUpdate src/Dodge/Machine/Update.hs 222;" f mcProximitySensorUpdate src/Dodge/Machine/Update.hs 219;" f
mcSPic src/Dodge/Render/ShapePicture.hs 134;" f mcSPic src/Dodge/Render/ShapePicture.hs 134;" f
mcShootAuto src/Dodge/HeldUse.hs 1161;" f mcShootAuto src/Dodge/HeldUse.hs 1161;" f
mcShootLaser src/Dodge/HeldUse.hs 1154;" f mcShootLaser src/Dodge/HeldUse.hs 1154;" f
mcTriggerVal src/Dodge/Machine/Update.hs 132;" f
mcTypeUpdate src/Dodge/Machine/Update.hs 33;" f mcTypeUpdate src/Dodge/Machine/Update.hs 33;" f
mcUseHeld src/Dodge/HeldUse.hs 1078;" f mcUseHeld src/Dodge/HeldUse.hs 1078;" f
mcUseItem src/Dodge/Machine/Update.hs 111;" f mcUseItem src/Dodge/Machine/Update.hs 111;" f
@@ -4821,13 +4820,13 @@ selSecYint src/Dodge/SelectionSections.hs 152;" f
selectedItemScroll src/Dodge/Update/Scroll.hs 51;" f selectedItemScroll src/Dodge/Update/Scroll.hs 51;" f
sensAboveDoor src/Dodge/Room/SensorDoor.hs 53;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 53;" f
sensInsideDoor src/Dodge/Room/SensorDoor.hs 59;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 59;" f
senseDamage src/Dodge/Machine/Update.hs 277;" f senseDamage src/Dodge/Machine/Update.hs 274;" f
sensorReqToString src/Dodge/Machine/Update.hs 255;" f sensorReqToString src/Dodge/Machine/Update.hs 252;" f
sensorRoom src/Dodge/Room/SensorDoor.hs 26;" f sensorRoom src/Dodge/Room/SensorDoor.hs 26;" f
sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 46;" f sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 46;" f
sensorSPic src/Dodge/Machine/Draw.hs 99;" f sensorSPic src/Dodge/Machine/Draw.hs 99;" f
sensorTut src/Dodge/Room/Tutorial.hs 358;" f sensorTut src/Dodge/Room/Tutorial.hs 358;" f
sensorTypeDamages src/Dodge/Machine/Update.hs 301;" f sensorTypeDamages src/Dodge/Machine/Update.hs 298;" f
sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f
sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 82;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 82;" f
sentinelFireType src/Dodge/Creature/SentinelAI.hs 49;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 49;" f