Simplify buttons

This commit is contained in:
2025-06-25 21:37:32 +01:00
parent 6e9d4918a1
commit a9cae4d409
13 changed files with 130 additions and 140 deletions
+43 -46
View File
@@ -215,9 +215,9 @@ Branch src/Dodge/Room/Branch.hs 4;" m
Breather src/Dodge/Room/Breather.hs 1;" m
BrigSS src/Dodge/Data/Scenario.hs 102;" C
Brute src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 17;" C
BtInactive src/Dodge/Data/Button.hs 63;" C
BtOff src/Dodge/Data/Button.hs 63;" C
BtOn src/Dodge/Data/Button.hs 63;" C
BtInactive src/Dodge/Data/Button.hs 51;" C
BtOff src/Dodge/Data/Button.hs 51;" C
BtOn src/Dodge/Data/Button.hs 51;" C
BulBall src/Dodge/Data/Bullet.hs 37;" C
BulFlak src/Dodge/Data/Bullet.hs 39;" C
BulFrag src/Dodge/Data/Bullet.hs 40;" C
@@ -239,16 +239,15 @@ BulletPayload src/Dodge/Data/Bullet.hs 36;" t
BulletTrajectory src/Dodge/Data/Bullet.hs 44;" t
BulletTrajectoryType src/Dodge/Data/Bullet.hs 51;" t
BurstTrigger src/Dodge/Data/TriggerType.hs 14;" C
Button src/Dodge/Data/Button.hs 48;" t
Button src/Dodge/Data/Button.hs 35;" t
Button src/Dodge/Data/Button.hs 6;" m
Button src/Dodge/Placement/Instance/Button.hs 1;" m
ButtonAccessTerminal src/Dodge/Data/Button.hs 44;" C
ButtonDoNothing src/Dodge/Data/Button.hs 23;" C
ButtonDraw src/Dodge/Data/Button.hs 16;" t
ButtonEvent src/Dodge/Data/Button.hs 22;" t
ButtonPress src/Dodge/Data/Button.hs 24;" C
ButtonSimpleSwith src/Dodge/Data/Button.hs 40;" C
ButtonState src/Dodge/Data/Button.hs 63;" t
ButtonAccessTerminal src/Dodge/Data/Button.hs 31;" C
ButtonDoNothing src/Dodge/Data/Button.hs 17;" C
ButtonEvent src/Dodge/Data/Button.hs 16;" t
ButtonPress src/Dodge/Data/Button.hs 18;" C
ButtonSimpleSwith src/Dodge/Data/Button.hs 25;" C
ButtonState src/Dodge/Data/Button.hs 51;" t
CAMERA src/Dodge/Data/Item/Combine.hs 75;" C
CAN src/Dodge/Data/Item/Combine.hs 56;" C
CDoNothing src/Dodge/Data/Item/HeldUse.hs 15;" C
@@ -493,8 +492,6 @@ DecorationShape src/Dodge/Data/GenParams.hs 20;" t
Default src/Dodge/Default.hs 7;" m
Default src/Dodge/Tesla/Arc/Default.hs 1;" m
DefaultCrGroupUpdate src/Dodge/Data/CrGroupParams.hs 22;" C
DefaultDrawButton src/Dodge/Data/Button.hs 17;" C
DefaultDrawSwitch src/Dodge/Data/Button.hs 18;" C
DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 11;" C
DefaultLightSourceDraw src/Dodge/Data/LightSource.hs 13;" C
DefaultRoomType src/Dodge/Data/Room.hs 31;" C
@@ -579,7 +576,6 @@ Draw src/Dodge/Tesla/Draw.hs 1;" m
Draw src/Dodge/TractorBeam/Draw.hs 1;" m
Draw src/Dodge/Wall/Draw.hs 1;" m
DrawForceField src/Dodge/Data/Wall.hs 47;" C
DrawNoButton src/Dodge/Data/Button.hs 19;" C
DrawnWall src/Dodge/Data/Wall.hs 43;" C
Drone src/Dodge/Item/Weapon/Drone.hs 1;" m
DroneAmmo src/Dodge/Data/AmmoType.hs 10;" C
@@ -2313,23 +2309,23 @@ _bmPoints src/Dodge/Data/Beam.hs 24;" f
_bmPos src/Dodge/Data/Beam.hs 20;" f
_bmRange src/Dodge/Data/Beam.hs 26;" f
_bmType src/Dodge/Data/Beam.hs 29;" f
_boffEff src/Dodge/Data/Button.hs 42;" f
_bonEff src/Dodge/Data/Button.hs 41;" f
_boffEff src/Dodge/Data/Button.hs 27;" f
_bonEff src/Dodge/Data/Button.hs 26;" f
_bounceTolerance src/Dodge/Data/Projectile.hs 57;" f
_bpEff src/Dodge/Data/Button.hs 28;" f
_bpEvent src/Dodge/Data/Button.hs 26;" f
_bpSound src/Dodge/Data/Button.hs 27;" f
_bpState src/Dodge/Data/Button.hs 25;" f
_btColor src/Dodge/Data/Button.hs 58;" f
_btEvent src/Dodge/Data/Button.hs 52;" f
_btID src/Dodge/Data/Button.hs 53;" f
_btName src/Dodge/Data/Button.hs 57;" f
_btPict src/Dodge/Data/Button.hs 49;" f
_btPos src/Dodge/Data/Button.hs 50;" f
_btRot src/Dodge/Data/Button.hs 51;" f
_btState src/Dodge/Data/Button.hs 55;" f
_btTermMID src/Dodge/Data/Button.hs 56;" f
_btText src/Dodge/Data/Button.hs 54;" f
_bpColor src/Dodge/Data/Button.hs 23;" f
_bpEff src/Dodge/Data/Button.hs 22;" f
_bpSound src/Dodge/Data/Button.hs 21;" f
_bpState src/Dodge/Data/Button.hs 19;" f
_bssColor1 src/Dodge/Data/Button.hs 28;" f
_bssColor2 src/Dodge/Data/Button.hs 29;" f
_btColor src/Dodge/Data/Button.hs 46;" f
_btEvent src/Dodge/Data/Button.hs 40;" f
_btID src/Dodge/Data/Button.hs 41;" f
_btName src/Dodge/Data/Button.hs 45;" f
_btPos src/Dodge/Data/Button.hs 38;" f
_btRot src/Dodge/Data/Button.hs 39;" f
_btState src/Dodge/Data/Button.hs 43;" f
_btTermMID src/Dodge/Data/Button.hs 44;" f
_buDam src/Dodge/Data/Bullet.hs 38;" f
_buDrag src/Dodge/Data/Bullet.hs 23;" f
_buEffect src/Dodge/Data/Bullet.hs 19;" f
@@ -3553,6 +3549,7 @@ branchWith src/Dodge/Room/Room.hs 67;" f
bright src/Color.hs 120;" f
brightX src/Color.hs 116;" f
btSPic src/Dodge/Render/ShapePicture.hs 106;" f
btText src/Dodge/Inventory/SelectionList.hs 233;" f
bufferEBO src/Shader/Bind.hs 28;" f
bufferPokedVBO src/Shader/Bind.hs 19;" f
bufferShaderLayers src/Shader/Bind.hs 36;" f
@@ -3630,7 +3627,7 @@ circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f
circleSolid src/Picture/Base.hs 164;" f
circleSolidCol src/Picture/Base.hs 168;" f
clAlt src/Dodge/Cloud.hs 5;" f
clClSpringVel src/Dodge/Update.hs 788;" f
clClSpringVel src/Dodge/Update.hs 786;" f
clColor src/Shader/Poke/Cloud.hs 35;" f
clZoneSize src/Dodge/Zone/Size.hs 3;" f
clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f
@@ -3654,7 +3651,7 @@ clipZoom src/Dodge/Update/Camera.hs 222;" f
clockCycle src/Dodge/Clock.hs 9;" f
closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 219;" f
closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 204;" f
closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 233;" f
closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 243;" f
closeObjectInfo src/Dodge/Render/HUD.hs 224;" f
closestCreatureID src/Dodge/Debug.hs 116;" f
closestPointOnLine src/Geometry/Intersect.hs 251;" f
@@ -3732,7 +3729,7 @@ crAwayFromPost src/Dodge/Creature/Test.hs 81;" f
crBlips src/Dodge/RadarSweep.hs 87;" f
crCamouflage src/Dodge/Creature/Picture.hs 31;" f
crCanSeeCr src/Dodge/Creature/Test.hs 50;" f
crCrSpring src/Dodge/Update.hs 816;" f
crCrSpring src/Dodge/Update.hs 814;" f
crCurrentEquipment src/Dodge/Creature/Statistics.hs 57;" f
crDexterity src/Dodge/Creature/Statistics.hs 14;" f
crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f
@@ -3760,7 +3757,7 @@ crRad src/Dodge/Creature/Radius.hs 7;" f
crSafeDistFromTarg src/Dodge/Creature/Test.hs 71;" f
crSetRoots src/Dodge/Inventory/Location.hs 48;" f
crShape src/Dodge/Creature/Shape.hs 8;" f
crSpring src/Dodge/Update.hs 811;" f
crSpring src/Dodge/Update.hs 809;" f
crStratConMatches src/Dodge/Creature/Test.hs 76;" f
crStrength src/Dodge/Creature/Statistics.hs 24;" f
crUpdate src/Dodge/Creature/State.hs 62;" f
@@ -3921,7 +3918,7 @@ defaultDirtWall src/Dodge/Default/Wall.hs 61;" f
defaultDisplayInventory src/Dodge/Default/World.hs 167;" f
defaultDoor src/Dodge/Default/Door.hs 29;" f
defaultDoorWall src/Dodge/Default/Wall.hs 32;" f
defaultDrawButton src/Dodge/Button/Draw.hs 28;" f
defaultDrawButton src/Dodge/Button/Draw.hs 29;" f
defaultEquip src/Dodge/Default/Item/Use/Equipment.hs 6;" f
defaultEquipUse src/Dodge/Default/Item/Use.hs 7;" f
defaultEquipment src/Dodge/Default.hs 25;" f
@@ -3941,10 +3938,10 @@ defaultListDisplayParams src/Dodge/ListDisplayParams.hs 18;" f
defaultMachine src/Dodge/Default.hs 31;" f
defaultMachineWall src/Dodge/Default/Wall.hs 48;" f
defaultMuzzles src/Dodge/Default/Item/Use/AimParams.hs 8;" f
defaultPP src/Dodge/Default.hs 64;" f
defaultPP src/Dodge/Default.hs 63;" f
defaultPerceptionState src/Dodge/Default/Creature.hs 73;" f
defaultProp src/Dodge/Default/Prop.hs 6;" f
defaultProximitySensor src/Dodge/Default.hs 75;" f
defaultProximitySensor src/Dodge/Default.hs 74;" f
defaultRoom src/Dodge/Default/Room.hs 9;" f
defaultSensorWall src/Dodge/Default/Wall.hs 58;" f
defaultSwitchWall src/Dodge/Default/Door.hs 22;" f
@@ -4116,7 +4113,7 @@ drawBlip src/Dodge/RadarBlip.hs 16;" f
drawBlock src/Dodge/Block/Draw.hs 7;" f
drawBoundingBox src/Dodge/Debug/Picture.hs 331;" f
drawBul src/Dodge/Bullet/Draw.hs 9;" f
drawButton src/Dodge/Button/Draw.hs 9;" f
drawButton src/Dodge/Button/Draw.hs 10;" f
drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f
drawCircCollisionTest src/Dodge/Debug/Picture.hs 111;" f
drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f
@@ -4210,8 +4207,8 @@ drawShockwave src/Dodge/Shockwave/Draw.hs 7;" f
drawSpark src/Dodge/Spark/Draw.hs 7;" f
drawStaticBall src/Dodge/EnergyBall/Draw.hs 27;" f
drawSubInventory src/Dodge/Render/HUD.hs 161;" f
drawSwitch src/Dodge/Button/Draw.hs 15;" f
drawSwitchWire src/Dodge/LevelGen/Switch.hs 28;" f
drawSwitch src/Dodge/Button/Draw.hs 16;" f
drawSwitchWire src/Dodge/LevelGen/Switch.hs 27;" f
drawTargetingAR src/Dodge/Targeting/Draw.hs 20;" f
drawTerminalDisplay src/Dodge/Render/HUD.hs 364;" f
drawTeslaArc src/Dodge/Tesla/Arc/Draw.hs 7;" f
@@ -4256,7 +4253,7 @@ dtToRootIntMap' src/Dodge/DoubleTree.hs 92;" f
dtToUpDownAdj src/Dodge/DoubleTree.hs 96;" f
dummyMenuOption src/Dodge/Menu/Option.hs 74;" f
dustColor src/Shader/Poke/Cloud.hs 71;" f
dustSpringVel src/Dodge/Update.hs 798;" f
dustSpringVel src/Dodge/Update.hs 796;" f
ebColor src/Dodge/EnergyBall.hs 94;" f
ebDamage src/Dodge/EnergyBall.hs 102;" f
ebEffect src/Dodge/EnergyBall.hs 49;" f
@@ -4947,8 +4944,8 @@ makeShrapnelAt src/Dodge/Payload.hs 24;" f
makeSourcedShader src/Shader/Compile.hs 167;" f
makeSpark src/Dodge/Spark.hs 45;" f
makeSubmenuOption src/Dodge/Menu/OptionType.hs 19;" f
makeSwitch src/Dodge/LevelGen/Switch.hs 52;" f
makeSwitchSPic src/Dodge/LevelGen/Switch.hs 40;" f
makeSwitch src/Dodge/LevelGen/Switch.hs 50;" f
makeSwitchSPic src/Dodge/LevelGen/Switch.hs 39;" f
makeTermLine src/Dodge/Terminal.hs 120;" f
makeTermPara src/Dodge/Terminal.hs 123;" f
makeTeslaArc src/Dodge/Tesla.hs 29;" f
@@ -5815,7 +5812,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f
shuffleRoomPos src/Dodge/Layout.hs 78;" f
shuffleTail src/RandomHelp.hs 59;" f
sigmoid src/Dodge/Base.hs 151;" f
simpleCrSprings src/Dodge/Update.hs 807;" f
simpleCrSprings src/Dodge/Update.hs 805;" f
simpleTermMessage src/Dodge/Terminal.hs 253;" f
sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f
sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f
@@ -6000,7 +5997,7 @@ termButton src/Dodge/Placement/Instance/Terminal.hs 51;" f
termScreenColor src/Dodge/Terminal/Color.hs 9;" f
termSoundLine src/Dodge/Terminal.hs 111;" f
termTextColor src/Dodge/Terminal.hs 114;" f
terminalColor src/Dodge/Placement/Instance/Terminal.hs 66;" f
terminalColor src/Dodge/Placement/Instance/Terminal.hs 64;" f
terminalReturnEffect src/Dodge/Terminal.hs 276;" f
terminalSPic src/Dodge/Machine/Draw.hs 29;" f
terminalScreenGlow src/Dodge/Machine/Update.hs 35;" f
@@ -6224,7 +6221,7 @@ updateCreature src/Dodge/Creature/Update.hs 13;" f
updateCreatureGroups src/Dodge/Update.hs 520;" f
updateCreatureSoundPositions src/Dodge/Update.hs 496;" f
updateDebugMessageOffset src/Dodge/Update.hs 95;" f
updateDelayedEvents src/Dodge/Update.hs 836;" f
updateDelayedEvents src/Dodge/Update.hs 834;" f
updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f
updateDistortion src/Dodge/Distortion.hs 5;" f
updateDistortions src/Dodge/Update.hs 541;" f