From 17cb1d8ff8f5610b78a2d0035fe1038b2f90fe66 Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 21 Dec 2024 17:16:40 +0000 Subject: [PATCH] Add shapes for craft items --- src/Dodge/Data/Item/Combine.hs | 10 +-- src/Dodge/Item/Draw/SPic.hs | 62 +++++++++------ src/Dodge/Item/Info.hs | 10 +-- tags | 133 ++++++++++++++++----------------- 4 files changed, 114 insertions(+), 101 deletions(-) diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs index a0fb1def4..815e1f1fa 100644 --- a/src/Dodge/Data/Item/Combine.hs +++ b/src/Dodge/Data/Item/Combine.hs @@ -63,11 +63,11 @@ data CraftType | WIRE | FUELCELL | PORTABLEFUSION - | FRAGMODULE - | FLASHMODULE - | GASINJECTOR - | FLAKCRAFT - | FRAGCRAFT +-- | FRAGMODULE +-- | FLASHMODULE +-- | GASINJECTOR +-- | FLAKCRAFT +-- | FRAGCRAFT deriving (Eq, Ord, Show, Read, Enum, Bounded) data AttachType diff --git a/src/Dodge/Item/Draw/SPic.hs b/src/Dodge/Item/Draw/SPic.hs index c627e7fa9..a80cbe27d 100644 --- a/src/Dodge/Item/Draw/SPic.hs +++ b/src/Dodge/Item/Draw/SPic.hs @@ -59,41 +59,55 @@ craftItemSPic = \case GLASSSHARD -> colorSH azure $ upperPrismPolyST 1 $ [V2 0 (-1), V2 4 (-0.5), V2 0 1] SCRAPMETAL -> colorSH (greyN 0.3) $ upperPrismPolyST 3 $ square 4 PUMP -> colorSH yellow . translateSH (V3 4 0 0) $ - (upperCylinder Small Typical 1 $ polyCirc 3 4) + (upperCylinder Small Typical 1 $ polyCirc 4 4) <> upperPrismPolyST 1 (rectNSWE (-2) (-4) 4 0) <> upperPrismPolyST 1 (rectNSWE 4 2 0 (-4)) MOTOR -> colorSH orange $ xCylinderST 5 3 <> xCylinderST 3 5 TRANSFORMER -> colorSH blue $ upperPrismPolyST 3 $ square 4 PRISM -> colorSH azure $ upperPrismPolyST 1 $ [V2 0 (-3), V2 4 0, V2 0 3] LIGHTER -> colorSH yellow . upperPrismPolyST 3 $ rectXH 2 2 --- MAGNET --- ANTIMATTER --- PLATE --- TRANSMITTER --- MICROCHIP --- HARDDRIVE --- RAM --- AIUNIT --- CAMERA --- MINIDISPLAY -- visual display unit --- LED --- NAILBOX --- IRONBAR --- LIGHTSENSOR --- SOUNDSENSOR --- HEATSENSOR --- MICROPHONE --- THERMOMETER --- CREATURESENSOR --- WIRE --- FUELCELL --- PORTABLEFUSION + MAGNET -> colorSH red (upperPrismPolyST 1 (rectNSWE (2) (-2) 2 0)) + <> colorSH (greyN 0.5) (upperPrismPolyST 1 (rectNSWE (2) (-2) 4 2)) + <> colorSH blue (upperPrismPolyST 1 (rectNSWE (2) (-2) 6 4)) + ANTIMATTER -> colorSH violet $ upperPrismPolyST 3 $ square 4 + PLATE -> colorSH green $ upperPrismPolyST 8 $ rectXH 2 5 + TRANSMITTER -> colorSH green $ + xCylinderST 1 5 <> translateSH (V3 5 0 0) (upperPrismPolyHalfST 3 $ polyCirc 4 3) + MICROCHIP -> colorSH yellow $ upperPrismPolyST 1 $ square 4 + HARDDRIVE -> colorSH green $ upperPrismPolyST 1 $ square 4 + RAM -> colorSH orange $ upperPrismPolyST 1 $ square 4 + AIUNIT -> colorSH blue $ upperPrismPolyST 1 $ square 4 + CAMERA -> colorSH yellow $ xCylinderST 5 3 <> xCylinderST 3 5 + MINIDISPLAY -> colorSH green $ upperPrismPolyST 1 (square 4) + <> upperPrismPolyST 2 (rectNSWE 4 (-4) 3 4) + LED -> colorSH yellow $ upperPrismPolyST 1 (square 2) + NAILBOX -> colorSH green $ upperPrismPolyST 3 (rectXH 4 3) + IRONBAR -> colorSH (greyN 0.5) $ upperPrismPolyST 3 $ rectXH 8 2 + LIGHTSENSOR -> colorSH green (upperPrismPolyST 1 $ square 3) + <> colorSH yellow (upperPrismPolyHalfST 3 $ polyCirc 4 3) + SOUNDSENSOR -> colorSH yellow (upperPrismPolyST 1 $ rectXH 4 1) + <> translateSH (V3 4 1 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + <> translateSH (V3 4 (-1) 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + MICROPHONE -> colorSH yellow (upperPrismPolyST 1 $ rectXH 3 1) + <> translateSH (V3 3 0 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + HEATSENSOR -> colorSH red (upperPrismPolyST 1 $ rectXH 4 1) + <> translateSH (V3 4 1 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + <> translateSH (V3 4 (-1) 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + THERMOMETER -> colorSH green (upperPrismPolyST 1 $ rectXH 3 1) + <> translateSH (V3 3 0 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + CREATURESENSOR -> colorSH azure (upperPrismPolyST 1 $ rectXH 4 1) + <> translateSH (V3 4 1 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + <> translateSH (V3 4 (-1) 0) (colorSH yellow (upperPrismPolyHalfST 2 $ polyCirc 4 2)) + WIRE -> colorSH blue $ xCylinderST 1 5 + FUELCELL -> colorSH blue + . translateSH (V3 4 0 0) . upperCylinder Small Typical 1 $ polyCirc 3 4 + PORTABLEFUSION -> colorSH azure + . translateSH (V3 4 0 0) . upperCylinder Small Typical 1 $ polyCirc 3 4 -- FRAGMODULE -- FLASHMODULE -- GASINJECTOR -- FLAKCRAFT -- FRAGCRAFT - _ -> mempty ammoMagSPic :: Item -> AmmoMagType -> SPic ammoMagSPic it = \case diff --git a/src/Dodge/Item/Info.hs b/src/Dodge/Item/Info.hs index 0bebe753b..7d099f85c 100644 --- a/src/Dodge/Item/Info.hs +++ b/src/Dodge/Item/Info.hs @@ -162,18 +162,18 @@ craftInfo fit = case fit of -- BATTERY -> "A store of electical potential energy." FUELCELL -> "A devices that converts chemical energy into electricity." PORTABLEFUSION -> "A miniature nuclear reactor." - GASINJECTOR -> "A device that can inject small quantities of gas into objects." +-- GASINJECTOR -> "A device that can inject small quantities of gas into objects." -- ENERGYBALLCRAFT ebt -> "A device that can create " ++ addIndefiniteArticle (displayEnergyBallType ebt) ++ " effect." - FRAGMODULE -> "A device that converts projectiles into fragmentation projectiles." - FLASHMODULE -> "A device that converts projectiles into flashbang projectiles." +-- FRAGMODULE -> "A device that converts projectiles into fragmentation projectiles." +-- FLASHMODULE -> "A device that converts projectiles into flashbang projectiles." -- BULBODYCRAFT be -> "A device that converts bullets into " ++ displayBulletBody be ++ " projectiles." -- TELEPORTMODULE -> "A device that allows for near-instant translocation across space." -- TIMEMODULE -> "A device that can affect temporality." -- SIZEMODULE -> "A device that can affect physical size." -- GRAVITYMODULE -> "A device that can affect gravitational fields." -- TARGETMODULE _ -> "A targeting module." - FLAKCRAFT -> "Creates flak bullets." - FRAGCRAFT -> "Creates fragmentation bullets." +-- FLAKCRAFT -> "Creates flak bullets." +-- FRAGCRAFT -> "Creates fragmentation bullets." detectorInfo :: Detector -> String detectorInfo d = case d of diff --git a/tags b/tags index a30ce4df0..45fe4b790 100644 --- a/tags +++ b/tags @@ -3320,7 +3320,7 @@ allHotkeys src/Dodge/Creature/YourControl.hs 60;" f allInvLocs src/Dodge/Item/Grammar.hs 225;" f allVisibleWalls src/Dodge/Base/Collide.hs 131;" f alongSegBy src/Geometry.hs 43;" f -ammoMagSPic src/Dodge/Item/Draw/SPic.hs 98;" f +ammoMagSPic src/Dodge/Item/Draw/SPic.hs 101;" f amr src/Dodge/Item/Held/Rod.hs 44;" f analyser src/Dodge/Placement/Instance/Analyser.hs 12;" f analyserByDoor src/Dodge/Room/LasTurret.hs 74;" f @@ -3405,28 +3405,28 @@ azure src/Color.hs 22;" f bQuadToF src/Geometry/Bezier.hs 37;" f bQuadToLine src/Geometry/Bezier.hs 30;" f backpackCombinations src/Dodge/Combine/Combinations.hs 26;" f -backpackShape src/Dodge/Item/Draw/SPic.hs 147;" f +backpackShape src/Dodge/Item/Draw/SPic.hs 150;" f backspaceInputted src/Dodge/Update/Input/Text.hs 25;" f bangCone src/Dodge/Item/Held/Cone.hs 11;" f -bangConeShape src/Dodge/Item/Draw/SPic.hs 259;" f +bangConeShape src/Dodge/Item/Draw/SPic.hs 262;" f bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 382;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f bangStick src/Dodge/Item/Held/Stick.hs 17;" f barPP src/Dodge/Room/Foreground.hs 236;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f -baseAMRShape src/Dodge/Item/Draw/SPic.hs 369;" f +baseAMRShape src/Dodge/Item/Draw/SPic.hs 372;" f baseBlockPane src/Dodge/Placement/Instance/Wall.hs 86;" f -baseCaneShape src/Dodge/Item/Draw/SPic.hs 279;" f +baseCaneShape src/Dodge/Item/Draw/SPic.hs 282;" f baseDebris src/Dodge/Block/Debris.hs 122;" f baseFloorTileSize src/Tile.hs 45;" f basePCI src/Dodge/Item/Grammar.hs 110;" f -baseRifleShape src/Dodge/Item/Draw/SPic.hs 282;" f -baseRodShape src/Dodge/Item/Draw/SPic.hs 366;" f -baseSMGShape src/Dodge/Item/Draw/SPic.hs 349;" f +baseRifleShape src/Dodge/Item/Draw/SPic.hs 285;" f +baseRodShape src/Dodge/Item/Draw/SPic.hs 369;" f +baseSMGShape src/Dodge/Item/Draw/SPic.hs 352;" f baseShoulder src/Dodge/Creature/Picture.hs 131;" f -baseStickShape src/Dodge/Item/Draw/SPic.hs 256;" f -baseStickShapeX src/Dodge/Item/Draw/SPic.hs 251;" f +baseStickShape src/Dodge/Item/Draw/SPic.hs 259;" f +baseStickShapeX src/Dodge/Item/Draw/SPic.hs 254;" f baseStickSpread src/Dodge/Item/Held/Stick.hs 28;" f basicAttentionUpdate src/Dodge/Creature/Perception.hs 127;" f basicAwarenessUpdate src/Dodge/Creature/Perception.hs 37;" f @@ -3612,7 +3612,7 @@ collidePointWallsFilter src/Dodge/Base/Collide.hs 107;" f collisionDebugItem src/Dodge/Debug.hs 31;" f color src/Picture/Base.hs 108;" f colorLamp src/Dodge/Creature/Lamp.hs 10;" f -colorSH src/Shape.hs 234;" f +colorSH src/Shape.hs 236;" f combinationsDotGraph src/Dodge/Combine/Graph.hs 94;" f combinationsGraph src/Dodge/Combine/Graph.hs 73;" f combinationsOf src/Multiset.hs 46;" f @@ -3811,7 +3811,7 @@ dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 462;" f dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 328;" f defDamageMaterial src/Dodge/Material/Damage.hs 17;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f -defSPic src/Dodge/Item/Draw/SPic.hs 265;" f +defSPic src/Dodge/Item/Draw/SPic.hs 268;" f defaultAimMvType src/Dodge/Default/Creature.hs 116;" f defaultAimParams src/Dodge/Default/Item/Use/AimParams.hs 9;" f defaultAimingCrit src/Dodge/Default/Creature.hs 125;" f @@ -3899,7 +3899,7 @@ destroyMounts src/Dodge/Block.hs 101;" f destroyProjectile src/Dodge/Projectile/Update.hs 63;" f detV src/Geometry/Vector.hs 93;" f detector src/Dodge/Item/Held/Utility.hs 41;" f -detectorColor src/Dodge/Item/Draw/SPic.hs 415;" f +detectorColor src/Dodge/Item/Draw/SPic.hs 418;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 20;" f detectorInfo src/Dodge/Item/Info.hs 178;" f determineProjectileTracking src/Dodge/HeldUse.hs 552;" f @@ -4179,7 +4179,7 @@ eqPosText src/Dodge/Equipment/Text.hs 5;" f eqSiteToPositions src/Dodge/Inventory/RBList.hs 76;" f equipAllocString src/Dodge/Render/HUD.hs 295;" f equipInfo src/Dodge/Item/Info.hs 96;" f -equipItemSPic src/Dodge/Item/Draw/SPic.hs 118;" f +equipItemSPic src/Dodge/Item/Draw/SPic.hs 121;" f equipPosition src/Dodge/Item/Draw.hs 28;" f equipSiteInfo src/Dodge/Item/Info.hs 207;" f equipSpeed src/Dodge/Creature/Impulse/Movement.hs 99;" f @@ -4244,12 +4244,12 @@ flameSpitter src/Dodge/Item/Held/SprayGuns.hs 29;" f flameThrower src/Dodge/Item/Held/SprayGuns.hs 72;" f flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f flameWall src/Dodge/Item/Held/SprayGuns.hs 56;" f -flamerPic src/Dodge/Item/Draw/SPic.hs 352;" f +flamerPic src/Dodge/Item/Draw/SPic.hs 355;" f flareCircleAt src/Dodge/HeldUse.hs 238;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 50;" f flatLookupItems src/Dodge/Combine.hs 38;" f flatShield src/Dodge/Item/Held/Utility.hs 20;" f -flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 402;" f +flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 405;" f fleeFrom src/Dodge/CreatureEffect.hs 120;" f fleeFromTarget src/Dodge/CreatureEffect.hs 66;" f flickerMod src/Dodge/Placement/Instance/LightSource/Flicker.hs 10;" f @@ -4286,7 +4286,7 @@ forceFoldable src/StrictHelp.hs 7;" f forceSpine src/StrictHelp.hs 4;" f fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 29;" f fpsText src/Dodge/Render/Picture.hs 47;" f -fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 111;" f +fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 114;" f frag src/Shader/Data.hs 102;" f freeShaderPointers' src/Shader.hs 37;" f fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 370;" f @@ -4420,7 +4420,7 @@ hasLOSIndirect src/Dodge/Base/Collide.hs 215;" f hat src/Dodge/Item/Equipment.hs 133;" f head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 139;" f -headLampShape src/Dodge/Item/Draw/SPic.hs 405;" f +headLampShape src/Dodge/Item/Draw/SPic.hs 408;" f headMap src/Dodge/DoubleTree.hs 170;" f heal src/Dodge/Item/Consumable.hs 17;" f heal25 src/Dodge/Item/Consumable.hs 14;" f @@ -4435,7 +4435,7 @@ heldInfo src/Dodge/Item/Info.hs 47;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 78;" f heldItemOrient2D src/Dodge/Item/HeldOffset.hs 26;" f heldItemRelativeOrient src/Dodge/Item/HeldOffset.hs 31;" f -heldItemSPic src/Dodge/Item/Draw/SPic.hs 194;" f +heldItemSPic src/Dodge/Item/Draw/SPic.hs 197;" f heldPositionInfo src/Dodge/Item/Info.hs 194;" f helpCommand src/Dodge/Terminal.hs 66;" f helpPoly3D src/Polyhedra.hs 125;" f @@ -4622,7 +4622,7 @@ keyCard src/Dodge/Item/Held/Utility.hs 30;" f keyCardAnalyserByDoor src/Dodge/Room/LasTurret.hs 68;" f keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 56;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f -keyPic src/Dodge/Item/Draw/SPic.hs 421;" f +keyPic src/Dodge/Item/Draw/SPic.hs 424;" f keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 470;" f lConnect src/Dodge/Render/Connectors.hs 42;" f @@ -4634,7 +4634,7 @@ lampCoverWhen src/Dodge/Placement/Instance/LightSource/Cover.hs 19;" f lampCrSPic src/Dodge/Render/ShapePicture.hs 58;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 111;" f lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f -lasGunPic src/Dodge/Item/Draw/SPic.hs 375;" f +lasGunPic src/Dodge/Item/Draw/SPic.hs 378;" f lasRayAt src/Dodge/HeldUse.hs 366;" f lasSensorTurretTest src/Dodge/Room/LasTurret.hs 104;" f lasTunnel src/Dodge/Room/LasTurret.hs 123;" f @@ -4645,7 +4645,7 @@ laserLinkTest src/Dodge/Item/Grammar.hs 119;" f lastMap src/Dodge/DoubleTree.hs 174;" f launcher src/Dodge/Item/Held/Launcher.hs 12;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f -launcherPic src/Dodge/Item/Draw/SPic.hs 355;" f +launcherPic src/Dodge/Item/Draw/SPic.hs 358;" f launcherX src/Dodge/Item/Held/Launcher.hs 29;" f layoutLevelFromSeed src/Dodge/LevelGen.hs 47;" f ldpVerticalSelection src/Dodge/Update/Input/ScreenLayer.hs 72;" f @@ -4662,7 +4662,7 @@ left src/DoubleStack.hs 16;" f leftIsParentCombine src/Dodge/Item/Grammar.hs 146;" f leftPad src/Padding.hs 14;" f leftRightCombine src/Dodge/Item/Grammar.hs 160;" f -legsSPic src/Dodge/Item/Draw/SPic.hs 439;" f +legsSPic src/Dodge/Item/Draw/SPic.hs 442;" f liShape src/Dodge/Placement/Instance/LightSource.hs 98;" f light src/Color.hs 104;" f lightSensByDoor src/Dodge/Room/LasTurret.hs 43;" f @@ -4877,8 +4877,8 @@ minOn src/FoldableHelp.hs 35;" f mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 334;" f miniGunCrit src/Dodge/Creature.hs 62;" f miniGunX src/Dodge/Item/Held/Cane.hs 88;" f -miniGunXPict src/Dodge/Item/Draw/SPic.hs 330;" f -miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 325;" f +miniGunXPict src/Dodge/Item/Draw/SPic.hs 333;" f +miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 328;" f miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f miniTree2 src/Dodge/Room/Room.hs 106;" f minimumOn src/FoldlHelp.hs 12;" f @@ -5014,13 +5014,13 @@ outLink src/Dodge/RoomLink.hs 105;" f outsideScreenPolygon src/Dodge/Debug/Picture.hs 44;" f outwardIntegers src/Dodge/Base.hs 159;" f overCol src/Picture/Base.hs 308;" f -overColObj src/Shape.hs 270;" f -overColSH src/Shape.hs 238;" f +overColObj src/Shape.hs 272;" f +overColSH src/Shape.hs 240;" f overLnkPosDir src/Dodge/RoomLink.hs 100;" f overLnkType src/Dodge/RoomLink.hs 87;" f overPos src/Picture/Base.hs 303;" f -overPosObj src/Shape.hs 274;" f -overPosSH src/Shape.hs 258;" f +overPosObj src/Shape.hs 276;" f +overPosSH src/Shape.hs 260;" f overPosSP src/ShapePicture.hs 41;" f overlapCircWalls src/Dodge/Base/Collide.hs 137;" f overlapCircWallsClosest src/Dodge/Base/Collide.hs 168;" f @@ -5137,8 +5137,8 @@ pointerYourSelectedItem src/Dodge/Item/Location.hs 25;" f pointsToPoly src/Geometry/ConvexPoly.hs 39;" f poisonSPic src/Dodge/Creature/State.hs 110;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f -poke34 src/Shader/Poke.hs 524;" f -pokeArrayOff src/Shader/Poke.hs 535;" f +poke34 src/Shader/Poke.hs 506;" f +pokeArrayOff src/Shader/Poke.hs 517;" f pokeBox src/Shader/Poke.hs 227;" f pokeBoxSurface src/Shader/Poke.hs 262;" f pokeCloud src/Shader/Poke/Cloud.hs 11;" f @@ -5148,18 +5148,17 @@ pokeCloudVerx src/Shader/Poke/Cloud.hs 17;" f pokeCylinder src/Shader/Poke.hs 172;" f pokeCylinderCaps src/Shader/Poke.hs 215;" f pokeF src/Shader/Poke.hs 67;" f -pokeFlatV src/Shader/Poke.hs 473;" f +pokeFlatV src/Shader/Poke.hs 455;" f pokeFloors src/Shader/Poke.hs 61;" f pokeIndex src/Shader/Poke.hs 297;" f pokeJustV src/Shader/Poke.hs 437;" f -pokeJustVInvNormal src/Shader/Poke.hs 455;" f -pokeLayVerx src/Shader/Poke.hs 498;" f -pokeLayVerxs src/Shader/Poke.hs 491;" f +pokeLayVerx src/Shader/Poke.hs 480;" f +pokeLayVerxs src/Shader/Poke.hs 473;" f pokeRoundedCurve src/Shader/Poke.hs 204;" f pokeRoundedFaces src/Shader/Poke.hs 140;" f pokeShape src/Shader/Poke.hs 111;" f pokeShapeObj src/Shader/Poke.hs 124;" f -pokeStride src/Shader/Poke.hs 517;" f +pokeStride src/Shader/Poke.hs 499;" f pokeTile src/Shader/Poke/Floor.hs 11;" f pokeTileVerx src/Shader/Poke/Floor.hs 17;" f pokeVerx src/Shader/Poke.hs 38;" f @@ -5421,9 +5420,9 @@ rotate3z src/Geometry/Vector3D.hs 54;" f rotateCamera src/Dodge/Update/Camera.hs 208;" f rotateCameraBy src/Dodge/Update/Camera.hs 205;" f rotateProp src/Dodge/Prop/Update.hs 49;" f -rotateSH src/Shape.hs 254;" f -rotateSHq src/Shape.hs 163;" f -rotateSHx src/Shape.hs 262;" f +rotateSH src/Shape.hs 256;" f +rotateSHq src/Shape.hs 165;" f +rotateSHx src/Shape.hs 264;" f rotateSP src/ShapePicture.hs 57;" f rotateTo src/Polyhedra/Geodesic.hs 64;" f rotateToOverlappingWall src/Dodge/Update/Camera.hs 183;" f @@ -5466,7 +5465,7 @@ scale src/Picture/Base.hs 149;" f scale3 src/Picture/Base.hs 145;" f scaleMat src/MatrixHelper.hs 59;" f scaleMatrix src/MatrixHelper.hs 56;" f -scaleSH src/Shape.hs 266;" f +scaleSH src/Shape.hs 268;" f scalp src/Dodge/Creature/Picture.hs 96;" f scancodeToHotkey src/Dodge/Creature/YourControl.hs 78;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f @@ -5583,7 +5582,7 @@ shapeVerxAttributes src/Shape/Parameters.hs 13;" f shapeVerxSize src/Shape/Parameters.hs 10;" f shardShape src/Dodge/Block/Debris.hs 181;" f shatterGun src/Dodge/Item/Held/Weapons.hs 8;" f -shatterGunSPic src/Dodge/Item/Draw/SPic.hs 268;" f +shatterGunSPic src/Dodge/Item/Draw/SPic.hs 271;" f shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f shellCollisionCheck src/Dodge/Projectile/Update.hs 52;" f shellCollisionEffect src/Dodge/Projectile/Update.hs 48;" f @@ -5828,7 +5827,7 @@ terminalScreenGlow src/Dodge/Machine/Update.hs 34;" f terminalShape src/Dodge/Machine/Draw.hs 32;" f terminalWheelEvent src/Dodge/Update/Scroll.hs 78;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 21;" f -teslaGunPic src/Dodge/Item/Draw/SPic.hs 372;" f +teslaGunPic src/Dodge/Item/Draw/SPic.hs 375;" f teslaParams src/Dodge/Tesla/ItemParams.hs 6;" f testCrossWalls src/Dodge/Room/Path.hs 47;" f testEvent src/Dodge/Event/Test.hs 10;" f @@ -5899,14 +5898,14 @@ topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 69;" f torch src/Dodge/Item/Held/Utility.hs 33;" f -torchShape src/Dodge/Item/Draw/SPic.hs 237;" f +torchShape src/Dodge/Item/Draw/SPic.hs 240;" f torqueCr src/Dodge/WorldEffect.hs 63;" f torso src/Dodge/Creature/Picture.hs 105;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f tractorBeamAt src/Dodge/HeldUse.hs 335;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 60;" f -tractorGunPic src/Dodge/Item/Draw/SPic.hs 399;" f +tractorGunPic src/Dodge/Item/Draw/SPic.hs 402;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f tranRot src/Picture/Base.hs 124;" f @@ -5921,9 +5920,9 @@ translatePointToHead src/Dodge/Creature/HandPos.hs 147;" f translatePointToLeftHand src/Dodge/Creature/HandPos.hs 75;" f translatePointToRightHand src/Dodge/Creature/HandPos.hs 23;" f translatePointToRightHand' src/Dodge/Creature/HandPos.hs 29;" f -translateSH src/Shape.hs 242;" f -translateSHxy src/Shape.hs 246;" f -translateSHz src/Shape.hs 250;" f +translateSH src/Shape.hs 244;" f +translateSHxy src/Shape.hs 248;" f +translateSHz src/Shape.hs 252;" f translateSP src/ShapePicture.hs 53;" f translateSPxy src/ShapePicture.hs 45;" f translateSPz src/ShapePicture.hs 49;" f @@ -6120,23 +6119,23 @@ updateWheelEvents src/Dodge/Update.hs 407;" f updateWorldEventFlag src/Dodge/Update.hs 117;" f updateWorldEventFlags src/Dodge/Update.hs 105;" f upperBody src/Dodge/Creature/Picture.hs 135;" f -upperBox src/Shape.hs 153;" f -upperBoxHalf src/Shape.hs 219;" f -upperBoxMT src/Shape.hs 144;" f -upperBoxST src/Shape.hs 147;" f -upperBoxSU src/Shape.hs 150;" f -upperCylinder src/Shape.hs 166;" f -upperPrismPoly src/Shape.hs 120;" f -upperPrismPolyHalf src/Shape.hs 204;" f -upperPrismPolyHalfMI src/Shape.hs 198;" f -upperPrismPolyHalfST src/Shape.hs 201;" f -upperPrismPolyMT src/Shape.hs 99;" f -upperPrismPolySE src/Shape.hs 102;" f -upperPrismPolySI src/Shape.hs 108;" f -upperPrismPolyST src/Shape.hs 105;" f -upperPrismPolySU src/Shape.hs 111;" f -upperPrismPolyTS src/Shape.hs 117;" f -upperRounded src/Shape.hs 182;" f +upperBox src/Shape.hs 155;" f +upperBoxHalf src/Shape.hs 221;" f +upperBoxMT src/Shape.hs 146;" f +upperBoxST src/Shape.hs 149;" f +upperBoxSU src/Shape.hs 152;" f +upperCylinder src/Shape.hs 168;" f +upperPrismPoly src/Shape.hs 122;" f +upperPrismPolyHalf src/Shape.hs 206;" f +upperPrismPolyHalfMI src/Shape.hs 200;" f +upperPrismPolyHalfST src/Shape.hs 203;" f +upperPrismPolyMT src/Shape.hs 101;" f +upperPrismPolySE src/Shape.hs 104;" f +upperPrismPolySI src/Shape.hs 110;" f +upperPrismPolyST src/Shape.hs 107;" f +upperPrismPolySU src/Shape.hs 113;" f +upperPrismPolyTS src/Shape.hs 119;" f +upperRounded src/Shape.hs 184;" f useBreakL src/Dodge/Item/Grammar.hs 27;" f useBreakListsLinkTest src/Dodge/Item/Grammar.hs 35;" f useBulletPayload src/Dodge/Bullet.hs 96;" f @@ -6193,7 +6192,7 @@ visibleWalls src/Dodge/Base/Collide.hs 123;" f visionCheck src/Dodge/Creature/Perception.hs 152;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 8;" f volleyGun src/Dodge/Item/Held/Cane.hs 30;" f -volleyGunShape src/Dodge/Item/Draw/SPic.hs 313;" f +volleyGunShape src/Dodge/Item/Draw/SPic.hs 316;" f waistSP src/Dodge/Creature/HandPos.hs 173;" f walkNozzle src/Dodge/HeldUse.hs 303;" f walkableNodeNear src/Dodge/Path.hs 48;" f @@ -6259,8 +6258,8 @@ wristArmour src/Dodge/Item/Equipment.hs 46;" f wristInvisibility src/Dodge/Item/Equipment.hs 158;" f writeConfig src/Dodge/Menu.hs 159;" f writeSaveSlot src/Dodge/Save.hs 34;" f -xCylinder src/Shape.hs 134;" f -xCylinderST src/Shape.hs 131;" f +xCylinder src/Shape.hs 136;" f +xCylinderST src/Shape.hs 133;" f xIntercepts src/Dodge/Zoning/Base.hs 58;" f xV2 src/Geometry/Vector.hs 199;" f xyV3 src/Geometry/Vector.hs 211;" f