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

Work on crush rooms

Browse Source
This commit is contained in:
justin
2026-03-27 10:36:48 +00:00
parent ac09ed6629
commit da87e1bccd
2 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tags
+51 -46
View File
@@ -42,7 +42,7 @@ ActionUpdate src/Dodge/Creature/Action.hs 49;" t
AddGoal src/Dodge/Data/ActionPlan.hs 44;" C
AimAt src/Dodge/Data/ActionPlan.hs 66;" C
AimStance src/Dodge/Data/AimStance.hs 10;" t
Aiming src/Dodge/Data/Creature/Stance.hs 33;" C
Aiming src/Dodge/Data/Creature/Stance.hs 34;" C
AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C
AlienContact src/Dodge/Data/Scenario.hs 30;" C
AllRoomClipBoundaries src/Dodge/Data/Config.hs 123;" C
@@ -66,7 +66,7 @@ Arcing src/Dodge/Data/Item/Params.hs 15;" C
ArmourySS src/Dodge/Data/Scenario.hs 112;" C
Asleep src/Dodge/Data/Creature/Perception.hs 52;" C
AsteroidStrike src/Dodge/Data/Scenario.hs 33;" C
AtEase src/Dodge/Data/Creature/Stance.hs 34;" C
AtEase src/Dodge/Data/Creature/Stance.hs 35;" C
AtomicWaste src/Dodge/Data/Scenario.hs 26;" C
AttachParams src/Dodge/Data/Item/Use.hs 43;" t
AttachType src/Dodge/Data/Item/Combine.hs 91;" t
@@ -417,6 +417,7 @@ FacilityType src/Dodge/Data/Scenario.hs 55;" t
Faction src/Dodge/Data/Creature/State.hs 12;" t
Factory src/Dodge/Data/Scenario.hs 56;" C
FailedResource src/Dodge/Data/Scenario.hs 37;" t
Falling src/Dodge/Data/Creature/Stance.hs 27;" C
FetchItem src/Dodge/Data/Scenario.hs 11;" C
FilterBySoundOrigin src/Dodge/Data/WorldEffect.hs 22;" C
FireSpark src/Dodge/Data/Spark.hs 19;" C
@@ -454,7 +455,7 @@ Floor src/Data/Tile.hs 11;" t
FloorItem src/Dodge/Data/FloorItem.hs 11;" t
Flying src/Dodge/Data/Creature/Stance.hs 25;" C
FollowImpulses src/Dodge/Data/ActionPlan.hs 134;" C
FootForward src/Dodge/Data/Creature/Stance.hs 29;" t
FootForward src/Dodge/Data/Creature/Stance.hs 30;" t
FootstepSound src/Dodge/Data/SoundOrigin.hs 30;" C
ForceField src/Dodge/Data/Material.hs 19;" C
ForceFieldType src/Dodge/Data/Item/Use/Consumption/Ammo.hs 11;" t
@@ -656,7 +657,7 @@ LayVars src/Dodge/Data/MetaTree.hs 30;" C
Layer src/Picture/Data.hs 20;" t
LayoutVars src/Dodge/Data/MetaTree.hs 30;" t
LeadTarget src/Dodge/Data/ActionPlan.hs 115;" C
LeftForward src/Dodge/Data/Creature/Stance.hs 29;" C
LeftForward src/Dodge/Data/Creature/Stance.hs 30;" C
LeftwardDT src/Dodge/Data/DoubleTree.hs 27;" C
Lethargic src/Dodge/Data/Creature/Perception.hs 53;" C
LevelStartSlot src/Dodge/Data/SaveSlot.hs 9;" C
@@ -1020,7 +1021,7 @@ Polyhedra src/Polyhedra/Data.hs 13;" t
Polyhedron src/Polyhedra/Data.hs 13;" C
PosInf src/Dodge/Data/CardinalPoint.hs 44;" C
PosRooms src/Dodge/Tree/Shift.hs 29;" t
Posture src/Dodge/Data/Creature/Stance.hs 32;" t
Posture src/Dodge/Data/Creature/Stance.hs 33;" t
PreloadData src/Data/Preload.hs 10;" t
PrintMaterial src/Dodge/Data/AmmoType.hs 15;" C
Prison src/Dodge/Data/Scenario.hs 65;" C
@@ -1119,7 +1120,7 @@ Revenge src/Dodge/Data/Scenario.hs 6;" C
RewindLeftClick src/Dodge/Data/World.hs 78;" C
RezBaySS src/Dodge/Data/Scenario.hs 105;" C
RightButtonState src/Dodge/Data/RightButtonOptions.hs 13;" t
RightForward src/Dodge/Data/Creature/Stance.hs 29;" C
RightForward src/Dodge/Data/Creature/Stance.hs 30;" C
RightwardDT src/Dodge/Data/DoubleTree.hs 34;" C
Rocket src/Dodge/Data/Projectile.hs 32;" C
RocketHoming src/Dodge/Data/Projectile.hs 39;" t
@@ -1519,7 +1520,7 @@ YELLOW src/Color/Data.hs 15;" C
ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 92;" C
ZombieFaction src/Dodge/Data/Creature/State.hs 14;" C
__Just' src/MaybeHelp.hs 11;" f
_aimStance src/Dodge/Data/Creature/Stance.hs 33;" f
_aimStance src/Dodge/Data/Creature/Stance.hs 34;" f
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 19;" f
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 25;" f
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 30;" f
@@ -1798,6 +1799,8 @@ _ebType src/Dodge/Data/EnergyBall.hs 19;" f
_ebVel src/Dodge/Data/EnergyBall.hs 16;" f
_emoMenuOption src/Dodge/Data/Universe.hs 77;" f
_energyBalls src/Dodge/Data/LWorld.hs 108;" f
_fallFlail src/Dodge/Data/Creature/Stance.hs 27;" f
_fallFoot src/Dodge/Data/Creature/Stance.hs 27;" f
_fbSize src/Dodge/Data/EnergyBall/Type.hs 12;" f
_fboBase src/Data/Preload/Render.hs 35;" f
_fboBloom src/Data/Preload/Render.hs 38;" f
@@ -2665,7 +2668,7 @@ axisInt src/Geometry/Intersect.hs 246;" f
azure src/Color.hs 49;" f
bQuadToF src/Geometry/Bezier.hs 37;" f
bQuadToLine src/Geometry/Bezier.hs 30;" f
backPQ src/Dodge/Creature/HandPos.hs 128;" f
backPQ src/Dodge/Creature/HandPos.hs 136;" f
backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 729;" f
backpackCombinations src/Dodge/Combine/Combinations.hs 27;" f
backpackShape src/Dodge/Item/Draw/SPic.hs 188;" f
@@ -2796,10 +2799,10 @@ centerVaultRoom src/Dodge/Room/Procedural.hs 270;" f
centroid src/Geometry/Polygon.hs 192;" f
centroidNum src/Geometry/Polygon.hs 195;" f
chainPairs src/Geometry.hs 360;" f
changeSwapOther src/Dodge/Inventory.hs 239;" f
changeSwapSel src/Dodge/Inventory.hs 211;" f
changeSwapSelSet src/Dodge/Inventory.hs 148;" f
changeSwapWith src/Dodge/Inventory.hs 279;" f
changeSwapOther src/Dodge/Inventory.hs 243;" f
changeSwapSel src/Dodge/Inventory.hs 215;" f
changeSwapSelSet src/Dodge/Inventory.hs 152;" f
changeSwapWith src/Dodge/Inventory.hs 283;" f
charToTuple src/Picture/Base.hs 312;" f
charToTupleGrad src/Picture/Text.hs 18;" f
chartreuse src/Color.hs 51;" f
@@ -2809,10 +2812,10 @@ chaseCritInternal src/Dodge/Humanoid.hs 8;" f
chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 122;" f
chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 32;" f
chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 36;" f
chasmRotate src/Dodge/Creature/Update.hs 172;" f
chasmRotate src/Dodge/Creature/Update.hs 178;" f
chasmSimpleMaze src/Dodge/Room/Tutorial.hs 358;" f
chasmSpitTerminal src/Dodge/Room/Tutorial.hs 298;" f
chasmTestCorpse src/Dodge/Creature/Update.hs 155;" f
chasmTestCorpse src/Dodge/Creature/Update.hs 161;" f
chasmTestLiving src/Dodge/Creature/Update.hs 137;" f
chasmWallToSurface src/Dodge/Base/Collide.hs 120;" f
checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f
@@ -2830,7 +2833,7 @@ checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f
checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f
checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f
chemFuelPouch src/Dodge/Item/Ammo.hs 81;" f
chestPQ src/Dodge/Creature/HandPos.hs 125;" f
chestPQ src/Dodge/Creature/HandPos.hs 133;" f
chooseCursorBorders src/Dodge/Render/List.hs 141;" f
chooseEquipPosition src/Dodge/Inventory/RBList.hs 41;" f
chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 35;" f
@@ -2866,6 +2869,7 @@ clipV src/Geometry/Vector.hs 48;" f
clipZoom src/Dodge/Update/Camera.hs 234;" f
clockCycle src/Dodge/Clock.hs 7;" f
closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 221;" f
closeItemDist src/Dodge/Inventory.hs 149;" f
closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 205;" f
closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 244;" f
closeObjectInfo src/Dodge/Render/HUD.hs 228;" f
@@ -2881,7 +2885,7 @@ cogRaised src/Dodge/Creature/Perception.hs 101;" f
colCrWall src/Dodge/WallCreatureCollisions.hs 25;" f
colCrsWalls src/Dodge/WallCreatureCollisions.hs 17;" f
collectDamageTypes src/Dodge/Damage.hs 53;" f
collectInvItems src/Dodge/Inventory.hs 201;" f
collectInvItems src/Dodge/Inventory.hs 205;" f
collide3 src/Dodge/Base/Collide.hs 129;" f
collide3Chasm src/Dodge/Base/Collide.hs 113;" f
collide3Chasms src/Dodge/Base/Collide.hs 105;" f
@@ -2921,7 +2925,7 @@ composeTree src/Dodge/Tree/Compose.hs 48;" f
compressor src/Dodge/Item/Ammo.hs 74;" f
computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 665;" f
conEffects src/Dodge/Concurrent.hs 12;" f
concurrentIS src/Dodge/Inventory.hs 193;" f
concurrentIS src/Dodge/Inventory.hs 197;" f
connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 745;" f
constructEdges src/Polyhedra.hs 31;" f
constructEdgesList src/Polyhedra.hs 40;" f
@@ -3172,11 +3176,11 @@ deleteWallFromZones src/Dodge/Wall/Zone.hs 23;" f
deleteWallID src/Dodge/Wall/Delete.hs 13;" f
deleteWallIDs src/Dodge/Wall/Delete.hs 27;" f
denormalEdges src/Polyhedra.hs 128;" f
destroyAllInvItems src/Dodge/Inventory.hs 61;" f
destroyAllInvItems src/Dodge/Inventory.hs 62;" f
destroyBlock src/Dodge/Block.hs 17;" f
destroyDoor src/Dodge/Wall/Damage.hs 146;" f
destroyInvItem src/Dodge/Inventory.hs 48;" f
destroyItem src/Dodge/Inventory.hs 70;" f
destroyInvItem src/Dodge/Inventory.hs 49;" f
destroyItem src/Dodge/Inventory.hs 71;" f
destroyLSFlashAt src/Dodge/LightSource.hs 44;" f
destroyMachine src/Dodge/Machine/Destroy.hs 13;" f
destroyMachine' src/Dodge/Wall/Damage.hs 112;" f
@@ -3731,7 +3735,7 @@ head src/DoubleStack.hs 14;" f
headLamp src/Dodge/Item/Equipment.hs 68;" f
headLampShape src/Dodge/Item/Draw/SPic.hs 423;" f
headMap src/Dodge/DoubleTree.hs 118;" f
headPQ src/Dodge/Creature/HandPos.hs 116;" f
headPQ src/Dodge/Creature/HandPos.hs 124;" f
healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 627;" f
healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 108;" f
healthTest src/Dodge/Room/LasTurret.hs 130;" f
@@ -3844,8 +3848,8 @@ invItemEffs src/Dodge/Creature/State.hs 63;" f
invItemLocUpdate src/Dodge/Creature/State.hs 71;" f
invRootMap src/Dodge/Item/Grammar.hs 235;" f
invSelectionItem src/Dodge/Inventory/SelectionList.hs 32;" f
invSetSelection src/Dodge/Inventory.hs 284;" f
invSetSelectionPos src/Dodge/Inventory.hs 292;" f
invSetSelection src/Dodge/Inventory.hs 288;" f
invSetSelectionPos src/Dodge/Inventory.hs 296;" f
invShiftPointBy src/Dodge/ShiftPoint.hs 17;" f
invSize src/Dodge/Inventory/CheckSlots.hs 33;" f
inventoryX src/Dodge/Creature.hs 111;" f
@@ -3994,12 +3998,12 @@ leaveResetQuitTerminal src/Dodge/WorldEffect.hs 163;" f
led src/Dodge/Item/Held/Utility.hs 23;" f
left src/DoubleStack.hs 16;" f
leftChildList src/Dodge/Item/Grammar.hs 193;" f
leftHandPQ src/Dodge/Creature/HandPos.hs 61;" f
leftHandPQ src/Dodge/Creature/HandPos.hs 63;" f
leftIsParentCombine src/Dodge/Item/Grammar.hs 170;" f
leftLegPQ src/Dodge/Creature/HandPos.hs 85;" f
leftLegPQ src/Dodge/Creature/HandPos.hs 89;" f
leftPad src/Padding.hs 15;" f
leftRightCombine src/Dodge/Item/Grammar.hs 205;" f
leftWristPQ src/Dodge/Creature/HandPos.hs 82;" f
leftWristPQ src/Dodge/Creature/HandPos.hs 86;" f
legsSPic src/Dodge/Item/Draw/SPic.hs 448;" f
lerpP2A src/Dodge/ShiftPoint.hs 14;" f
liShape src/Dodge/Placement/Instance/LightSource.hs 84;" f
@@ -4261,8 +4265,8 @@ multGunCrit src/Dodge/Creature.hs 75;" f
multiArrow src/Picture/Composite.hs 11;" f
multiLookupTrie src/SimpleTrie.hs 57;" f
multiLookupTrieI src/SimpleTrie.hs 66;" f
multiSelScroll src/Dodge/Inventory.hs 218;" f
multiSelScroll' src/Dodge/Inventory.hs 225;" f
multiSelScroll src/Dodge/Inventory.hs 222;" f
multiSelScroll' src/Dodge/Inventory.hs 229;" f
muout src/Dodge/RoomLink.hs 144;" f
muzFlareAt src/Dodge/HeldUse.hs 702;" f
muzzlePos src/Dodge/HeldUse.hs 786;" f
@@ -4719,14 +4723,14 @@ right src/DoubleStack.hs 16;" f
rightChildList src/Dodge/Item/Grammar.hs 199;" f
rightHandPQ src/Dodge/Creature/HandPos.hs 40;" f
rightIsParentCombine src/Dodge/Item/Grammar.hs 181;" f
rightLegPQ src/Dodge/Creature/HandPos.hs 101;" f
rightLegPQ src/Dodge/Creature/HandPos.hs 107;" f
rightPad src/Padding.hs 19;" f
rightPadNoSquash src/Padding.hs 23;" f
rightWristPQ src/Dodge/Creature/HandPos.hs 58;" f
rightWristPQ src/Dodge/Creature/HandPos.hs 60;" f
rlPosDir src/Dodge/RoomLink.hs 112;" f
rlauncherPic src/Dodge/Item/Draw/SPic.hs 399;" f
rmInLinks src/Dodge/RoomLink.hs 153;" f
rmInvItem src/Dodge/Inventory.hs 83;" f
rmInvItem src/Dodge/Inventory.hs 84;" f
rmLinksOfType src/Dodge/RoomLink.hs 150;" f
rmOutLinks src/Dodge/RoomLink.hs 153;" f
roomC src/Dodge/Room/Room.hs 51;" f
@@ -4817,8 +4821,8 @@ screenPolygon src/Dodge/Base/Window.hs 18;" f
screenPolygonBord src/Dodge/Base/Window.hs 28;" f
screenPosAbs src/Dodge/ScreenPos.hs 15;" f
screenToWorldPos src/Dodge/Base/Coordinate.hs 45;" f
scrollAugInvSel src/Dodge/Inventory.hs 295;" f
scrollAugNextInSection src/Dodge/Inventory.hs 309;" f
scrollAugInvSel src/Dodge/Inventory.hs 299;" f
scrollAugNextInSection src/Dodge/Inventory.hs 313;" f
scrollRBOption src/Dodge/Update/Scroll.hs 139;" f
scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f
scrollTimeBack src/Dodge/Update.hs 243;" f
@@ -4926,8 +4930,8 @@ shiftChildren src/Dodge/Tree/Compose.hs 45;" f
shiftDraw src/Dodge/Render/ShapePicture.hs 130;" f
shiftInBy src/Dodge/PlacementSpot.hs 254;" f
shiftInvItems src/Dodge/Update/Input/InGame.hs 294;" f
shiftInvItemsDown src/Dodge/Inventory.hs 177;" f
shiftInvItemsUp src/Dodge/Inventory.hs 187;" f
shiftInvItemsDown src/Dodge/Inventory.hs 181;" f
shiftInvItemsUp src/Dodge/Inventory.hs 191;" f
shiftLinkBy src/Dodge/Room/Link.hs 87;" f
shiftPSBy src/Dodge/Placement/Shift.hs 12;" f
shiftPathBy src/Dodge/Room/Link.hs 92;" f
@@ -4939,8 +4943,8 @@ shiftRelativeToPS src/Dodge/Placement/Shift.hs 18;" f
shiftRoomBy src/Dodge/Room/Link.hs 37;" f
shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f
shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f
shiftSetDown src/Dodge/Inventory.hs 170;" f
shiftSetUp src/Dodge/Inventory.hs 164;" f
shiftSetDown src/Dodge/Inventory.hs 174;" f
shiftSetUp src/Dodge/Inventory.hs 168;" f
shineTargetLaser src/Dodge/Creature/State.hs 201;" f
shineTorch src/Dodge/Creature/State.hs 237;" f
shootBullet src/Dodge/HeldUse.hs 995;" f
@@ -5102,6 +5106,7 @@ stackedInventory src/Dodge/Creature.hs 326;" f
startCr src/Dodge/Creature.hs 90;" f
startCrafts src/Dodge/Room/Start.hs 94;" f
startDrag src/Dodge/Update/Input/InGame.hs 286;" f
startFalling src/Dodge/Creature/Update.hs 155;" f
startInvList src/Dodge/Creature.hs 105;" f
startInventory src/Dodge/Creature.hs 108;" f
startNewGameInSlot src/Dodge/StartNewGame.hs 16;" f
@@ -5139,8 +5144,8 @@ swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 57;" f
swapInOutLinks src/Dodge/RoomLink.hs 99;" f
swapIndices src/ListHelp.hs 50;" f
swapInvItems src/Dodge/Inventory/Swap.hs 22;" f
swapItemWith src/Dodge/Inventory.hs 268;" f
swapSelSet src/Dodge/Inventory.hs 153;" f
swapItemWith src/Dodge/Inventory.hs 272;" f
swapSelSet src/Dodge/Inventory.hs 157;" f
swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f
swarmUsingCenter src/Dodge/Creature/Boid.hs 174;" f
t src/ShortShow.hs 48;" f
@@ -5290,7 +5295,7 @@ translate3 src/Picture/Base.hs 112;" f
translateFloatingCamera src/Dodge/Update/Camera.hs 50;" f
translateFloatingCameraKeys src/Dodge/Update/Camera.hs 68;" f
translateH src/Picture/Base.hs 104;" f
translatePointToLeftHand src/Dodge/Creature/HandPos.hs 76;" f
translatePointToLeftHand src/Dodge/Creature/HandPos.hs 80;" f
translatePointToRightHand src/Dodge/Creature/HandPos.hs 37;" f
translateSH src/Shape.hs 242;" f
translateSHxy src/Shape.hs 246;" f
@@ -5300,10 +5305,10 @@ translateSPxy src/ShapePicture.hs 45;" f
translateSPz src/ShapePicture.hs 49;" f
translateScreenPos src/Dodge/ScreenPos.hs 12;" f
translateToES src/Dodge/Creature/HandPos.hs 24;" f
translateToLeftHand src/Dodge/Creature/HandPos.hs 79;" f
translateToLeftLeg src/Dodge/Creature/HandPos.hs 98;" f
translateToRightHand src/Dodge/Creature/HandPos.hs 55;" f
translateToRightLeg src/Dodge/Creature/HandPos.hs 113;" f
translateToLeftHand src/Dodge/Creature/HandPos.hs 83;" f
translateToLeftLeg src/Dodge/Creature/HandPos.hs 104;" f
translateToRightHand src/Dodge/Creature/HandPos.hs 57;" f
translateToRightLeg src/Dodge/Creature/HandPos.hs 121;" f
translateXY src/Polyhedra.hs 23;" f
trapTBH src/Geometry/Polygon.hs 22;" f
trapezionBWHW src/Geometry/Polygon.hs 34;" f
@@ -5390,7 +5395,7 @@ updateBulVel src/Dodge/Bullet.hs 57;" f
updateBullet src/Dodge/Bullet.hs 22;" f
updateBullets src/Dodge/Update.hs 641;" f
updateCamera src/Dodge/Update/Camera.hs 33;" f
updateCloseObjects src/Dodge/Inventory.hs 125;" f
updateCloseObjects src/Dodge/Inventory.hs 126;" f
updateCloud src/Dodge/Update.hs 883;" f
updateClouds src/Dodge/Update.hs 752;" f
updateCombinePositioning src/Dodge/DisplayInventory.hs 40;" f
@@ -5461,7 +5466,7 @@ updatePlasmaBall src/Dodge/Update.hs 507;" f
updatePlasmaBalls src/Dodge/Update.hs 648;" f
updatePreload src/Preload/Update.hs 21;" f
updateProjectile src/Dodge/Projectile/Update.hs 26;" f
updatePulse src/Dodge/Creature/Update.hs 179;" f
updatePulse src/Dodge/Creature/Update.hs 185;" f
updatePulseBall src/Dodge/Update.hs 527;" f
updatePulseLaser src/Dodge/Update.hs 695;" f
updatePulseLasers src/Dodge/Update.hs 502;" f