From 5280d428a9d2a4eaad1988df71033a4cfde56785 Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 27 Aug 2025 11:17:37 +0100 Subject: [PATCH] Commit before adding AimStance to Aiming Posture AMEND: AimStance is also used when AtEase, so this is not a good solution --- tags | 70 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/tags b/tags index 270ddde1b..6fa266fb9 100644 --- a/tags +++ b/tags @@ -355,7 +355,7 @@ DoActionWhilePartial src/Dodge/Data/ActionPlan.hs 111;" C DoActions src/Dodge/Data/ActionPlan.hs 130;" C DoImpulses src/Dodge/Data/ActionPlan.hs 100;" C DoImpulsesAlongside src/Dodge/Data/ActionPlan.hs 169;" C -DoNotMoveEquipment src/Dodge/Data/RightButtonOptions.hs 22;" C +DoNotMoveEquipment src/Dodge/Data/RightButtonOptions.hs 20;" C DoReplicate src/Dodge/Data/ActionPlan.hs 140;" C DoReplicatePartial src/Dodge/Data/ActionPlan.hs 144;" C DockingBaySS src/Dodge/Data/Scenario.hs 92;" C @@ -411,7 +411,7 @@ EquipItemType src/Dodge/Data/Item/Combine.hs 121;" t EquipOptions src/Dodge/Data/RightButtonOptions.hs 17;" C EquipSite src/Dodge/Data/Equipment/Misc.hs 21;" t EquipType src/Dodge/Data/Equipment/Misc.hs 11;" t -EquipmentAllocation src/Dodge/Data/RightButtonOptions.hs 21;" t +EquipmentAllocation src/Dodge/Data/RightButtonOptions.hs 19;" t EquipmentPlatformSF src/Dodge/Data/ComposedItem.hs 17;" C Escape src/Dodge/Data/Scenario.hs 10;" C EscapeMenuOption src/Dodge/Data/Universe.hs 76;" t @@ -797,7 +797,7 @@ MouseMenuClick src/Dodge/Data/Input.hs 18;" C MouseMenuCursor src/Dodge/Data/Input.hs 19;" C Mouse_position src/Dodge/Data/Config.hs 73;" C Move src/Dodge/Data/ActionPlan.hs 28;" C -MoveEquipment src/Dodge/Data/RightButtonOptions.hs 24;" C +MoveEquipment src/Dodge/Data/RightButtonOptions.hs 22;" C MoveForward src/Dodge/Data/ActionPlan.hs 29;" C MultGunAI src/Dodge/Data/Creature/Misc.hs 51;" C Mute src/Dodge/Data/Creature/Misc.hs 21;" C @@ -1087,7 +1087,7 @@ PutLineBlock src/Dodge/Data/GenWorld.hs 48;" C PutMachine src/Dodge/Data/GenWorld.hs 32;" C PutMod src/Dodge/Data/GenWorld.hs 46;" C PutNothing src/Dodge/Data/GenWorld.hs 60;" C -PutOnEquipment src/Dodge/Data/RightButtonOptions.hs 23;" C +PutOnEquipment src/Dodge/Data/RightButtonOptions.hs 21;" C PutPPlate src/Dodge/Data/GenWorld.hs 43;" C PutProp src/Dodge/Data/GenWorld.hs 40;" C PutSlideDr src/Dodge/Data/GenWorld.hs 55;" C @@ -1132,10 +1132,10 @@ Religion src/Dodge/Data/Scenario.hs 47;" C Reload src/Dodge/Data/ActionPlan.hs 190;" C RemoteDetonatorSF src/Dodge/Data/ComposedItem.hs 27;" C RemoteScreenSF src/Dodge/Data/ComposedItem.hs 25;" C -RemoveEquipment src/Dodge/Data/RightButtonOptions.hs 37;" C +RemoveEquipment src/Dodge/Data/RightButtonOptions.hs 35;" C Remove_LOS src/Dodge/Data/Config.hs 77;" C RenderData src/Data/Preload/Render.hs 13;" t -ReplaceEquipment src/Dodge/Data/RightButtonOptions.hs 33;" C +ReplaceEquipment src/Dodge/Data/RightButtonOptions.hs 31;" C RequireEquipment src/Dodge/Data/Machine/Sensor.hs 38;" C RequireHealth src/Dodge/Data/Machine/Sensor.hs 37;" C ResFactor src/Dodge/Data/Config.hs 97;" t @@ -1300,7 +1300,7 @@ Superfluous src/Shape/Data.hs 38;" C Surface src/Shape/Data.hs 41;" t Survive src/Dodge/Data/Scenario.hs 5;" C Suspicious src/Dodge/Data/Creature/Perception.hs 66;" C -SwapEquipment src/Dodge/Data/RightButtonOptions.hs 28;" C +SwapEquipment src/Dodge/Data/RightButtonOptions.hs 26;" C Swarm src/Dodge/Data/Creature/State.hs 27;" C SwarmAI src/Dodge/Data/Creature/Misc.hs 46;" C SwarmCrit src/Dodge/Data/Creature/Misc.hs 71;" C @@ -1528,14 +1528,14 @@ ZombieFaction src/Dodge/Data/Creature/State.hs 16;" C __Just' src/MaybeHelp.hs 13;" f _actAction src/Dodge/Data/ActionPlan.hs 81;" f _actLabel src/Dodge/Data/ActionPlan.hs 80;" f -_allocNewPos src/Dodge/Data/RightButtonOptions.hs 23;" f -_allocNewPos src/Dodge/Data/RightButtonOptions.hs 29;" f -_allocNewPos src/Dodge/Data/RightButtonOptions.hs 34;" f -_allocOldPos src/Dodge/Data/RightButtonOptions.hs 26;" f -_allocOldPos src/Dodge/Data/RightButtonOptions.hs 30;" f -_allocOldPos src/Dodge/Data/RightButtonOptions.hs 37;" f -_allocRemoveID src/Dodge/Data/RightButtonOptions.hs 35;" f -_allocSwapID src/Dodge/Data/RightButtonOptions.hs 31;" f +_allocNewPos src/Dodge/Data/RightButtonOptions.hs 21;" f +_allocNewPos src/Dodge/Data/RightButtonOptions.hs 27;" f +_allocNewPos src/Dodge/Data/RightButtonOptions.hs 32;" f +_allocOldPos src/Dodge/Data/RightButtonOptions.hs 24;" f +_allocOldPos src/Dodge/Data/RightButtonOptions.hs 28;" f +_allocOldPos src/Dodge/Data/RightButtonOptions.hs 35;" f +_allocRemoveID src/Dodge/Data/RightButtonOptions.hs 33;" f +_allocSwapID src/Dodge/Data/RightButtonOptions.hs 29;" f _alphaDivideShader src/Data/Preload/Render.hs 18;" f _alteRifleSwitch src/Dodge/Data/Item/Params.hs 20;" f _ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f @@ -2615,7 +2615,7 @@ advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/Picture.hs 288;" f aimStance src/Dodge/Item/AimStance.hs 10;" f aimStanceInfo src/Dodge/Item/Info.hs 244;" f -aimTurn src/Dodge/Creature/YourControl.hs 169;" f +aimTurn src/Dodge/Creature/YourControl.hs 174;" f airlock src/Dodge/Room/Airlock.hs 21;" f airlock0 src/Dodge/Room/Airlock.hs 50;" f airlock90 src/Dodge/Room/Airlock.hs 147;" f @@ -2682,7 +2682,7 @@ armouredCorridor src/Dodge/Room/RoadBlock.hs 20;" f arms src/Dodge/Creature/Picture.hs 71;" f arrow src/Picture/Composite.hs 19;" f arrowPath src/Picture/Composite.hs 8;" f -assignHotkey src/Dodge/AssignHotkey.hs 11;" f +assignHotkey src/Dodge/AssignHotkey.hs 9;" f assignPushDoors src/Dodge/LevelGen.hs 43;" f atFstLnkOut src/Dodge/PlacementSpot.hs 222;" f atFstLnkOutShiftBy src/Dodge/PlacementSpot.hs 241;" f @@ -3258,7 +3258,7 @@ divideLineOddNumPoints src/Geometry.hs 264;" f dmType src/Dodge/Damage.hs 38;" f doAfterPlacement src/Dodge/Layout.hs 86;" f doAfterPlacements src/Dodge/Layout.hs 83;" f -doAimTwist src/Dodge/Creature/YourControl.hs 143;" f +doAimTwist src/Dodge/Creature/YourControl.hs 148;" f doAnyEquipmentEffect src/Dodge/Creature/State.hs 140;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f doBarrelSpin src/Dodge/Projectile/Update.hs 214;" f @@ -3768,7 +3768,7 @@ hammerCheck src/Dodge/HeldUse.hs 62;" f handHandleOrient src/Dodge/Item/HeldOffset.hs 61;" f handOrient src/Dodge/Item/HeldOffset.hs 37;" f handleEvent src/Dodge/Event.hs 27;" f -handleHotkeys src/Dodge/Creature/YourControl.hs 46;" f +handleHotkeys src/Dodge/Creature/YourControl.hs 45;" f handleKeyboardEvent src/Dodge/Event/Input.hs 23;" f handleMouseButtonEvent src/Dodge/Event/Input.hs 61;" f handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f @@ -3800,7 +3800,7 @@ heldEffectMuzzles src/Dodge/HeldUse.hs 130;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 89;" f heldInfo src/Dodge/Item/Info.hs 92;" f heldItemAmmoSlots src/Dodge/Item/AmmoSlots.hs 19;" f -heldItemBulkiness src/Dodge/Creature/YourControl.hs 182;" f +heldItemBulkiness src/Dodge/Creature/YourControl.hs 187;" f heldItemInvLock src/Dodge/HeldUse.hs 434;" f heldItemMuzVel src/Dodge/HeldUse.hs 1030;" f heldItemMuzzles src/Dodge/HeldUse.hs 182;" f @@ -3825,7 +3825,7 @@ holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 48;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 188;" f -hotkeyToScancode src/Dodge/Creature/YourControl.hs 76;" f +hotkeyToScancode src/Dodge/Creature/YourControl.hs 81;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 185;" f humanoidAIList src/Dodge/Humanoid.hs 182;" f iShape src/Dodge/Placement/Instance/LightSource.hs 73;" f @@ -3957,7 +3957,7 @@ itemBaseName src/Dodge/Item/Display.hs 60;" f itemBaseStance src/Dodge/Item/AimStance.hs 18;" f itemBelowAttachables src/Dodge/Item/Grammar.hs 50;" f itemBlips src/Dodge/RadarSweep.hs 93;" f -itemBulkiness src/Dodge/Creature/YourControl.hs 176;" f +itemBulkiness src/Dodge/Creature/YourControl.hs 181;" f itemCombinations src/Dodge/Combine/Combinations.hs 56;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 61;" f itemDetectorEffect src/Dodge/HeldUse.hs 764;" f @@ -4747,7 +4747,7 @@ reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f rememberSounds src/Dodge/Creature/Perception.hs 178;" f remoteDetonator src/Dodge/Item/Scope.hs 144;" f remoteScreen src/Dodge/Item/Scope.hs 139;" f -removeAimPosture src/Dodge/Creature/YourControl.hs 151;" f +removeAimPosture src/Dodge/Creature/YourControl.hs 156;" f removeAmmoFromMag src/Dodge/HeldUse.hs 922;" f removeDot src/ShortShow.hs 40;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f @@ -4887,7 +4887,7 @@ scaleMat src/MatrixHelper.hs 59;" f scaleMatrix src/MatrixHelper.hs 56;" f scaleSH src/Shape.hs 269;" f scalp src/Dodge/Creature/Picture.hs 92;" f -scancodeToHotkey src/Dodge/Creature/YourControl.hs 96;" f +scancodeToHotkey src/Dodge/Creature/YourControl.hs 101;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f scorchSPic src/Dodge/Creature/Update.hs 112;" f screenBox src/Dodge/Base/Window.hs 53;" f @@ -4939,7 +4939,7 @@ sensorTypeDamages src/Dodge/Machine/Update.hs 180;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f -setAimPosture src/Dodge/Creature/YourControl.hs 140;" f +setAimPosture src/Dodge/Creature/YourControl.hs 145;" f setChannelPos src/Sound.hs 150;" f setClickWorldPos src/Dodge/Update.hs 106;" f setClusterID src/Dodge/Combine/Graph.hs 116;" f @@ -5055,9 +5055,9 @@ showEquipItem src/Dodge/Item/Display.hs 107;" f showInt src/Dodge/Item/Info.hs 75;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f showInventoryPathing src/Dodge/Item/Display.hs 86;" f -showManObj src/Dodge/TestString.hs 79;" f +showManObj src/Dodge/TestString.hs 75;" f showTerminalError src/Dodge/Debug/Terminal.hs 78;" f -showTimeFlow src/Dodge/TestString.hs 102;" f +showTimeFlow src/Dodge/TestString.hs 98;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 142;" f shrinkVert src/Geometry/Polygon.hs 146;" f shuffle src/RandomHelp.hs 49;" f @@ -5328,7 +5328,7 @@ tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 448;" f topInvW src/Dodge/ListDisplayParams.hs 51;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f -topTestPart src/Dodge/TestString.hs 75;" f +topTestPart src/Dodge/TestString.hs 71;" f torch src/Dodge/Item/Held/Utility.hs 23;" f torchShape src/Dodge/Item/Draw/SPic.hs 290;" f torqueAmount src/Dodge/HeldUse.hs 573;" f @@ -5387,7 +5387,7 @@ truncFaces src/Polyhedra/Geodesic.hs 53;" f truncate src/Polyhedra/Geodesic.hs 38;" f trunkDepth src/TreeHelp.hs 161;" f tryAttachItems src/Dodge/Item/Grammar.hs 34;" f -tryClickUse src/Dodge/Creature/YourControl.hs 225;" f +tryClickUse src/Dodge/Creature/YourControl.hs 230;" f tryCombine src/Dodge/Update/Input/InGame.hs 542;" f tryDrawToCapacitor src/Dodge/Creature/State.hs 150;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 137;" f @@ -5418,7 +5418,7 @@ twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 28;" f twists src/Dodge/Creature/Test.hs 111;" f twoFlat src/Dodge/Creature/Test.hs 108;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 80;" f -twoHandTwistAmount src/Dodge/Creature/YourControl.hs 154;" f +twoHandTwistAmount src/Dodge/Creature/YourControl.hs 159;" f twoRoomPoss src/Dodge/PlacementSpot.hs 154;" f twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f @@ -5578,7 +5578,7 @@ upperPrismPolyTS src/Shape.hs 120;" f upperRounded src/Shape.hs 185;" f useBulletPayload src/Dodge/Bullet.hs 114;" f useGasParams src/Dodge/HeldUse.hs 1121;" f -useHotkey src/Dodge/Creature/YourControl.hs 71;" f +useHotkey src/Dodge/Creature/YourControl.hs 76;" f useInventoryPath src/Dodge/HeldUse.hs 1440;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 19;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 25;" f @@ -5636,11 +5636,11 @@ wallsFromRooms src/Dodge/Layout.hs 146;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f warmupSound src/Dodge/HeldUse.hs 1434;" f warningRooms src/Dodge/Room/Warning.hs 26;" f -wasdAim src/Dodge/Creature/YourControl.hs 127;" f +wasdAim src/Dodge/Creature/YourControl.hs 132;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f -wasdMovement src/Dodge/Creature/YourControl.hs 157;" f -wasdWithAiming src/Dodge/Creature/YourControl.hs 120;" f +wasdMovement src/Dodge/Creature/YourControl.hs 162;" f +wasdWithAiming src/Dodge/Creature/YourControl.hs 125;" f watchCombinations src/Dodge/Combine/Combinations.hs 16;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 179;" f weakenMatS src/Dodge/Material/Sound.hs 18;" f @@ -5714,7 +5714,7 @@ yellow src/Color.hs 17;" f you src/Dodge/Base/You.hs 13;" f youDropItem src/Dodge/Creature/Action.hs 196;" f yourAugmentedItem src/Dodge/Render/HUD.hs 234;" f -yourControl src/Dodge/Creature/YourControl.hs 29;" f +yourControl src/Dodge/Creature/YourControl.hs 27;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 110;" f yourInfo src/Dodge/Creature/Info.hs 10;" f yourInv src/Dodge/Base/You.hs 28;" f