Pitted creatures lose all items
This commit is contained in:
@@ -2,6 +2,7 @@ module Dodge.Creature.Update (
|
|||||||
updateCreature,
|
updateCreature,
|
||||||
) where
|
) where
|
||||||
|
|
||||||
|
import Dodge.Inventory
|
||||||
import LensHelp
|
import LensHelp
|
||||||
import Geometry
|
import Geometry
|
||||||
import Dodge.SoundLogic
|
import Dodge.SoundLogic
|
||||||
@@ -18,7 +19,7 @@ import qualified Data.List as List
|
|||||||
|
|
||||||
updateCreature :: Creature -> World -> World
|
updateCreature :: Creature -> World -> World
|
||||||
updateCreature cr
|
updateCreature cr
|
||||||
| _crZ cr < negate 100 = id -- can remove creature and all items
|
| _crZ cr < negate 100 = destroyAllInvItems cr
|
||||||
| _crZ cr < 0 = (tocr . crZVel -~ 0.5)
|
| _crZ cr < 0 = (tocr . crZVel -~ 0.5)
|
||||||
. (tocr . crZ +~ _crZVel cr)
|
. (tocr . crZ +~ _crZVel cr)
|
||||||
| otherwise = updateCreature' cr
|
| otherwise = updateCreature' cr
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ module Dodge.Inventory (
|
|||||||
scrollAugNextInSection,
|
scrollAugNextInSection,
|
||||||
swapItemWith,
|
swapItemWith,
|
||||||
destroyItem,
|
destroyItem,
|
||||||
|
destroyAllInvItems,
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Dodge.Equipment
|
import Dodge.Equipment
|
||||||
@@ -41,12 +42,7 @@ import NewInt
|
|||||||
|
|
||||||
-- should consider never fully destroying items, but assigning a flag saying how
|
-- should consider never fully destroying items, but assigning a flag saying how
|
||||||
-- they were moved from play
|
-- they were moved from play
|
||||||
destroyInvItem ::
|
destroyInvItem :: Int -> Int -> World -> World
|
||||||
Int ->
|
|
||||||
-- | Inventory position
|
|
||||||
Int ->
|
|
||||||
World ->
|
|
||||||
World
|
|
||||||
destroyInvItem cid invid w =
|
destroyInvItem cid invid w =
|
||||||
rmInvItem cid invid w & removeitloc
|
rmInvItem cid invid w & removeitloc
|
||||||
& removeithotkey
|
& removeithotkey
|
||||||
@@ -61,6 +57,10 @@ destroyInvItem cid invid w =
|
|||||||
(cWorld . lWorld . imHotkeys . unNIntMap . at itid .~ Nothing)
|
(cWorld . lWorld . imHotkeys . unNIntMap . at itid .~ Nothing)
|
||||||
. (cWorld . lWorld . hotkeys . at hk .~ Nothing)
|
. (cWorld . lWorld . hotkeys . at hk .~ Nothing)
|
||||||
|
|
||||||
|
destroyAllInvItems :: Creature -> World -> World
|
||||||
|
destroyAllInvItems cr w = foldl' (flip $ destroyInvItem (cr ^. crID)) w
|
||||||
|
. reverse . IM.keys $ cr ^. crInv
|
||||||
|
|
||||||
destroyItem :: Int -> World -> World
|
destroyItem :: Int -> World -> World
|
||||||
destroyItem itid w = case w ^? cWorld . lWorld . itemLocations . ix itid of
|
destroyItem itid w = case w ^? cWorld . lWorld . itemLocations . ix itid of
|
||||||
Nothing -> error $ "Tried to destroy item that does not exist; item id: "++ show itid
|
Nothing -> error $ "Tried to destroy item that does not exist; item id: "++ show itid
|
||||||
|
|||||||
@@ -2611,14 +2611,14 @@ activeTargetCursorPic src/Dodge/Targeting/Draw.hs 31;" f
|
|||||||
addArmour src/Dodge/Creature.hs 85;" f
|
addArmour src/Dodge/Creature.hs 85;" f
|
||||||
addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f
|
addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f
|
||||||
addButtonSlowDoor src/Dodge/Room/LongDoor.hs 97;" f
|
addButtonSlowDoor src/Dodge/Room/LongDoor.hs 97;" f
|
||||||
addCrGibs src/Dodge/Prop/Gib.hs 18;" f
|
addCrGibs src/Dodge/Prop/Gib.hs 16;" f
|
||||||
addDepth src/Picture/Base.hs 133;" f
|
addDepth src/Picture/Base.hs 133;" f
|
||||||
addDoorWall src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 53;" f
|
addDoorWall src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 53;" f
|
||||||
addEdges src/Dodge/Path.hs 122;" f
|
addEdges src/Dodge/Path.hs 122;" f
|
||||||
addGib4 src/Dodge/Prop/Gib.hs 54;" f
|
addGib4 src/Dodge/Prop/Gib.hs 51;" f
|
||||||
addGibAt src/Dodge/Prop/Gib.hs 64;" f
|
addGibAt src/Dodge/Prop/Gib.hs 62;" f
|
||||||
addGibAtDir src/Dodge/Prop/Gib.hs 69;" f
|
addGibAtDir src/Dodge/Prop/Gib.hs 67;" f
|
||||||
addGibsAtDir src/Dodge/Prop/Gib.hs 41;" f
|
addGibsAtDir src/Dodge/Prop/Gib.hs 39;" f
|
||||||
addGirder src/Dodge/Room/Modify/Girder.hs 90;" f
|
addGirder src/Dodge/Room/Modify/Girder.hs 90;" f
|
||||||
addGirder' src/Dodge/Room/Modify/Girder.hs 111;" f
|
addGirder' src/Dodge/Room/Modify/Girder.hs 111;" f
|
||||||
addGirderEW src/Dodge/Room/Modify/Girder.hs 72;" f
|
addGirderEW src/Dodge/Room/Modify/Girder.hs 72;" f
|
||||||
@@ -2681,7 +2681,7 @@ applyGravityPU src/Dodge/Projectile/Update.hs 43;" f
|
|||||||
applyIndividualDamage src/Dodge/Creature/Damage.hs 16;" f
|
applyIndividualDamage src/Dodge/Creature/Damage.hs 16;" f
|
||||||
applyInvLock src/Dodge/HeldUse.hs 444;" f
|
applyInvLock src/Dodge/HeldUse.hs 444;" f
|
||||||
applyMagnetsToBul src/Dodge/Bullet.hs 30;" f
|
applyMagnetsToBul src/Dodge/Bullet.hs 30;" f
|
||||||
applyPastDamages src/Dodge/Creature/State.hs 132;" f
|
applyPastDamages src/Dodge/Creature/State.hs 130;" f
|
||||||
applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f
|
applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f
|
||||||
applyPosition src/Sound.hs 111;" f
|
applyPosition src/Sound.hs 111;" f
|
||||||
applyRecoil src/Dodge/HeldUse.hs 475;" f
|
applyRecoil src/Dodge/HeldUse.hs 475;" f
|
||||||
@@ -2873,9 +2873,9 @@ centroid src/Geometry/Polygon.hs 136;" f
|
|||||||
centroidNum src/Geometry/Polygon.hs 139;" f
|
centroidNum src/Geometry/Polygon.hs 139;" f
|
||||||
chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f
|
chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f
|
||||||
chainPairs src/Geometry.hs 363;" f
|
chainPairs src/Geometry.hs 363;" f
|
||||||
changeSwapOther src/Dodge/Inventory.hs 144;" f
|
changeSwapOther src/Dodge/Inventory.hs 149;" f
|
||||||
changeSwapSel src/Dodge/Inventory.hs 137;" f
|
changeSwapSel src/Dodge/Inventory.hs 142;" f
|
||||||
changeSwapWith src/Dodge/Inventory.hs 178;" f
|
changeSwapWith src/Dodge/Inventory.hs 183;" f
|
||||||
charToTuple src/Picture/Base.hs 317;" f
|
charToTuple src/Picture/Base.hs 317;" f
|
||||||
charToTupleGrad src/Picture/Text.hs 18;" f
|
charToTupleGrad src/Picture/Text.hs 18;" f
|
||||||
chartreuse src/Color.hs 24;" f
|
chartreuse src/Color.hs 24;" f
|
||||||
@@ -2884,7 +2884,7 @@ chaseCritAwarenessUpdate src/Dodge/Creature/Perception.hs 70;" f
|
|||||||
chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 114;" f
|
chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 114;" f
|
||||||
chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 31;" f
|
chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 31;" f
|
||||||
chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 37;" f
|
chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 37;" f
|
||||||
chasmTest src/Dodge/Creature/Update.hs 26;" f
|
chasmTest src/Dodge/Creature/Update.hs 37;" f
|
||||||
chasmWallToSurface src/Dodge/Base/Collide.hs 110;" f
|
chasmWallToSurface src/Dodge/Base/Collide.hs 110;" f
|
||||||
checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f
|
checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f
|
||||||
checkConnection src/Dodge/Inventory/Swap.hs 64;" f
|
checkConnection src/Dodge/Inventory/Swap.hs 64;" f
|
||||||
@@ -2981,12 +2981,12 @@ colorSH src/Shape.hs 237;" f
|
|||||||
combinationsDotGraph src/Dodge/Combine/Graph.hs 95;" f
|
combinationsDotGraph src/Dodge/Combine/Graph.hs 95;" f
|
||||||
combinationsGraph src/Dodge/Combine/Graph.hs 74;" f
|
combinationsGraph src/Dodge/Combine/Graph.hs 74;" f
|
||||||
combinationsOf src/Multiset.hs 46;" f
|
combinationsOf src/Multiset.hs 46;" f
|
||||||
combinationsTrie src/Dodge/Combine.hs 44;" f
|
combinationsTrie src/Dodge/Combine.hs 42;" f
|
||||||
combineAwareness src/Dodge/Creature/Perception.hs 110;" f
|
combineAwareness src/Dodge/Creature/Perception.hs 110;" f
|
||||||
combineFloors src/Dodge/Room/Procedural.hs 172;" f
|
combineFloors src/Dodge/Room/Procedural.hs 172;" f
|
||||||
combineInventoryExtra src/Dodge/Render/HUD.hs 339;" f
|
combineInventoryExtra src/Dodge/Render/HUD.hs 339;" f
|
||||||
combineItemListYouX src/Dodge/Combine.hs 36;" f
|
combineItemListYouX src/Dodge/Combine.hs 34;" f
|
||||||
combineList src/Dodge/Combine.hs 22;" f
|
combineList src/Dodge/Combine.hs 20;" f
|
||||||
combineRooms src/Dodge/Room/Procedural.hs 152;" f
|
combineRooms src/Dodge/Room/Procedural.hs 152;" f
|
||||||
combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f
|
combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f
|
||||||
combineTree src/Dodge/Tree/Compose.hs 66;" f
|
combineTree src/Dodge/Tree/Compose.hs 66;" f
|
||||||
@@ -3014,10 +3014,10 @@ contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 57;" f
|
|||||||
convexHull src/Geometry/Polygon.hs 110;" f
|
convexHull src/Geometry/Polygon.hs 110;" f
|
||||||
convexHullSafe src/Geometry/Polygon.hs 117;" f
|
convexHullSafe src/Geometry/Polygon.hs 117;" f
|
||||||
convexPolysOverlap src/Geometry/ConvexPoly.hs 50;" f
|
convexPolysOverlap src/Geometry/ConvexPoly.hs 50;" f
|
||||||
coolMachinePistol src/Dodge/Creature/State.hs 184;" f
|
coolMachinePistol src/Dodge/Creature/State.hs 182;" f
|
||||||
coolMinigun src/Dodge/Creature/State.hs 177;" f
|
coolMinigun src/Dodge/Creature/State.hs 175;" f
|
||||||
copier src/Dodge/Item/Scope.hs 88;" f
|
copier src/Dodge/Item/Scope.hs 88;" f
|
||||||
copierItemUpdate src/Dodge/Creature/State.hs 213;" f
|
copierItemUpdate src/Dodge/Creature/State.hs 211;" f
|
||||||
copyItemToFloor src/Dodge/FloorItem.hs 18;" f
|
copyItemToFloor src/Dodge/FloorItem.hs 18;" f
|
||||||
copyItemToFloorID src/Dodge/FloorItem.hs 22;" f
|
copyItemToFloorID src/Dodge/FloorItem.hs 22;" f
|
||||||
corDoor src/Dodge/Room/Room.hs 376;" f
|
corDoor src/Dodge/Room/Room.hs 376;" f
|
||||||
@@ -3246,9 +3246,11 @@ deleteWallFromZones src/Dodge/Wall/Zone.hs 23;" f
|
|||||||
deleteWallID src/Dodge/Wall/Delete.hs 13;" f
|
deleteWallID src/Dodge/Wall/Delete.hs 13;" f
|
||||||
deleteWallIDs src/Dodge/Wall/Delete.hs 28;" f
|
deleteWallIDs src/Dodge/Wall/Delete.hs 28;" f
|
||||||
denormalEdges src/Polyhedra.hs 136;" f
|
denormalEdges src/Polyhedra.hs 136;" f
|
||||||
|
destroyAllInvItems src/Dodge/Inventory.hs 60;" f
|
||||||
destroyBlock src/Dodge/Block.hs 52;" f
|
destroyBlock src/Dodge/Block.hs 52;" f
|
||||||
destroyDoor src/Dodge/Block.hs 80;" f
|
destroyDoor src/Dodge/Block.hs 80;" f
|
||||||
destroyInvItem src/Dodge/Inventory.hs 43;" f
|
destroyInvItem src/Dodge/Inventory.hs 45;" f
|
||||||
|
destroyItem src/Dodge/Inventory.hs 64;" f
|
||||||
destroyLS src/Dodge/LightSource.hs 32;" f
|
destroyLS src/Dodge/LightSource.hs 32;" f
|
||||||
destroyLSFlashAt src/Dodge/LightSource.hs 42;" f
|
destroyLSFlashAt src/Dodge/LightSource.hs 42;" f
|
||||||
destroyMachine src/Dodge/Machine/Destroy.hs 13;" f
|
destroyMachine src/Dodge/Machine/Destroy.hs 13;" f
|
||||||
@@ -3292,7 +3294,7 @@ dmType src/Dodge/Damage.hs 38;" f
|
|||||||
doAfterPlacement src/Dodge/Layout.hs 86;" f
|
doAfterPlacement src/Dodge/Layout.hs 86;" f
|
||||||
doAfterPlacements src/Dodge/Layout.hs 83;" f
|
doAfterPlacements src/Dodge/Layout.hs 83;" f
|
||||||
doAimTwist src/Dodge/Creature/YourControl.hs 140;" f
|
doAimTwist src/Dodge/Creature/YourControl.hs 140;" f
|
||||||
doAnyEquipmentEffect src/Dodge/Creature/State.hs 223;" f
|
doAnyEquipmentEffect src/Dodge/Creature/State.hs 221;" f
|
||||||
doBackspace src/Dodge/Update/Input/Text.hs 31;" f
|
doBackspace src/Dodge/Update/Input/Text.hs 31;" f
|
||||||
doBarrelSpin src/Dodge/Projectile/Update.hs 215;" f
|
doBarrelSpin src/Dodge/Projectile/Update.hs 215;" f
|
||||||
doBlBl src/Dodge/BlBl.hs 5;" f
|
doBlBl src/Dodge/BlBl.hs 5;" f
|
||||||
@@ -3308,7 +3310,7 @@ doCrImp src/Dodge/CreatureEffect.hs 28;" f
|
|||||||
doCrWdAc src/Dodge/CreatureEffect.hs 77;" f
|
doCrWdAc src/Dodge/CreatureEffect.hs 77;" f
|
||||||
doCrWdImp src/Dodge/CreatureEffect.hs 16;" f
|
doCrWdImp src/Dodge/CreatureEffect.hs 16;" f
|
||||||
doCrWdWd src/Dodge/CreatureEffect.hs 20;" f
|
doCrWdWd src/Dodge/CreatureEffect.hs 20;" f
|
||||||
doDamage src/Dodge/Creature/State.hs 128;" f
|
doDamage src/Dodge/Creature/State.hs 126;" f
|
||||||
doDeathToggle src/Dodge/WorldEffect.hs 91;" f
|
doDeathToggle src/Dodge/WorldEffect.hs 91;" f
|
||||||
doDeathTriggers src/Dodge/WorldEffect.hs 86;" f
|
doDeathTriggers src/Dodge/WorldEffect.hs 86;" f
|
||||||
doDebugTest src/Dodge/Update/Input/DebugTest.hs 22;" f
|
doDebugTest src/Dodge/Update/Input/DebugTest.hs 22;" f
|
||||||
@@ -3385,7 +3387,7 @@ doublePair src/Geometry.hs 165;" f
|
|||||||
doublePairSet src/Geometry.hs 169;" f
|
doublePairSet src/Geometry.hs 169;" f
|
||||||
doubleTreeToIndentList src/Dodge/DoubleTree.hs 129;" f
|
doubleTreeToIndentList src/Dodge/DoubleTree.hs 129;" f
|
||||||
doubleV2 src/Geometry.hs 172;" f
|
doubleV2 src/Geometry.hs 172;" f
|
||||||
drawARHUD src/Dodge/Creature/State.hs 275;" f
|
drawARHUD src/Dodge/Creature/State.hs 273;" f
|
||||||
drawAimSweep src/Dodge/Render/Picture.hs 271;" f
|
drawAimSweep src/Dodge/Render/Picture.hs 271;" f
|
||||||
drawAllShadows src/Dodge/Shadows.hs 5;" f
|
drawAllShadows src/Dodge/Shadows.hs 5;" f
|
||||||
drawBaseMachine src/Dodge/Machine/Draw.hs 57;" f
|
drawBaseMachine src/Dodge/Machine/Draw.hs 57;" f
|
||||||
@@ -3512,7 +3514,7 @@ drawWeapon src/Dodge/Creature/Volition.hs 14;" f
|
|||||||
drawWlIDs src/Dodge/Debug/Picture.hs 372;" f
|
drawWlIDs src/Dodge/Debug/Picture.hs 372;" f
|
||||||
drawZoneCol src/Dodge/Debug/Picture.hs 147;" f
|
drawZoneCol src/Dodge/Debug/Picture.hs 147;" f
|
||||||
drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 284;" f
|
drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 284;" f
|
||||||
dropAll src/Dodge/Creature/State.hs 125;" f
|
dropAll src/Dodge/Creature/State.hs 123;" f
|
||||||
dropExcept src/Dodge/Creature/Action.hs 166;" f
|
dropExcept src/Dodge/Creature/Action.hs 166;" f
|
||||||
dropInventoryPath src/Dodge/HeldUse.hs 1429;" f
|
dropInventoryPath src/Dodge/HeldUse.hs 1429;" f
|
||||||
dropItem src/Dodge/Creature/Action.hs 172;" f
|
dropItem src/Dodge/Creature/Action.hs 172;" f
|
||||||
@@ -3537,11 +3539,11 @@ dtToUpDownAdj src/Dodge/DoubleTree.hs 158;" f
|
|||||||
dummyMenuOption src/Dodge/Menu/Option.hs 74;" f
|
dummyMenuOption src/Dodge/Menu/Option.hs 74;" f
|
||||||
dustColor src/Shader/Poke/Cloud.hs 71;" f
|
dustColor src/Shader/Poke/Cloud.hs 71;" f
|
||||||
dustSpringVel src/Dodge/Update.hs 880;" f
|
dustSpringVel src/Dodge/Update.hs 880;" f
|
||||||
ebColor src/Dodge/EnergyBall.hs 78;" f
|
ebColor src/Dodge/EnergyBall.hs 77;" f
|
||||||
ebDamage src/Dodge/EnergyBall.hs 86;" f
|
ebDamage src/Dodge/EnergyBall.hs 85;" f
|
||||||
ebEffect src/Dodge/EnergyBall.hs 46;" f
|
ebEffect src/Dodge/EnergyBall.hs 45;" f
|
||||||
ebFlicker src/Dodge/EnergyBall.hs 71;" f
|
ebFlicker src/Dodge/EnergyBall.hs 70;" f
|
||||||
ebtToDamage src/Dodge/EnergyBall.hs 94;" f
|
ebtToDamage src/Dodge/EnergyBall.hs 93;" f
|
||||||
edgeFormatting src/Dodge/Combine/Graph.hs 131;" f
|
edgeFormatting src/Dodge/Combine/Graph.hs 131;" f
|
||||||
edgeToPic src/Dodge/Debug/Picture.hs 436;" f
|
edgeToPic src/Dodge/Debug/Picture.hs 436;" f
|
||||||
effectOnEquip src/Dodge/Equipment.hs 32;" f
|
effectOnEquip src/Dodge/Equipment.hs 32;" f
|
||||||
@@ -3636,7 +3638,7 @@ flameWall src/Dodge/Item/Held/SprayGuns.hs 48;" f
|
|||||||
flamerPic src/Dodge/Item/Draw/SPic.hs 406;" f
|
flamerPic src/Dodge/Item/Draw/SPic.hs 406;" f
|
||||||
flareCircleAt src/Dodge/HeldUse.hs 704;" f
|
flareCircleAt src/Dodge/HeldUse.hs 704;" f
|
||||||
flatItemCombinations src/Dodge/Combine/Combinations.hs 51;" f
|
flatItemCombinations src/Dodge/Combine/Combinations.hs 51;" f
|
||||||
flatLookupItems src/Dodge/Combine.hs 39;" f
|
flatLookupItems src/Dodge/Combine.hs 37;" f
|
||||||
flatShield src/Dodge/Item/Held/Utility.hs 17;" f
|
flatShield src/Dodge/Item/Held/Utility.hs 17;" f
|
||||||
flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 452;" f
|
flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 452;" f
|
||||||
fleeFrom src/Dodge/CreatureEffect.hs 120;" f
|
fleeFrom src/Dodge/CreatureEffect.hs 120;" f
|
||||||
@@ -3783,7 +3785,7 @@ gridPoints src/Grid.hs 67;" f
|
|||||||
gridPoints' src/Grid.hs 79;" f
|
gridPoints' src/Grid.hs 79;" f
|
||||||
gridPoints'' src/Grid.hs 74;" f
|
gridPoints'' src/Grid.hs 74;" f
|
||||||
gridPointsOff src/Grid.hs 62;" f
|
gridPointsOff src/Grid.hs 62;" f
|
||||||
groupSplitItemAmounts src/Dodge/Combine.hs 52;" f
|
groupSplitItemAmounts src/Dodge/Combine.hs 50;" f
|
||||||
gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f
|
gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f
|
||||||
gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f
|
gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f
|
||||||
gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" f
|
gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" f
|
||||||
@@ -3940,12 +3942,12 @@ invDimColor src/Dodge/DisplayInventory.hs 192;" f
|
|||||||
invHead src/Dodge/Render/HUD.hs 404;" f
|
invHead src/Dodge/Render/HUD.hs 404;" f
|
||||||
invIMDT src/Dodge/Item/Grammar.hs 248;" f
|
invIMDT src/Dodge/Item/Grammar.hs 248;" f
|
||||||
invIndents src/Dodge/Item/Grammar.hs 255;" f
|
invIndents src/Dodge/Item/Grammar.hs 255;" f
|
||||||
invItemEffs src/Dodge/Creature/State.hs 146;" f
|
invItemEffs src/Dodge/Creature/State.hs 144;" f
|
||||||
invItemLocUpdate src/Dodge/Creature/State.hs 153;" f
|
invItemLocUpdate src/Dodge/Creature/State.hs 151;" f
|
||||||
invRootMap src/Dodge/Item/Grammar.hs 227;" f
|
invRootMap src/Dodge/Item/Grammar.hs 227;" f
|
||||||
invSelectionItem src/Dodge/Inventory/SelectionList.hs 32;" f
|
invSelectionItem src/Dodge/Inventory/SelectionList.hs 32;" f
|
||||||
invSetSelection src/Dodge/Inventory.hs 185;" f
|
invSetSelection src/Dodge/Inventory.hs 190;" f
|
||||||
invSetSelectionPos src/Dodge/Inventory.hs 193;" f
|
invSetSelectionPos src/Dodge/Inventory.hs 198;" f
|
||||||
invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f
|
invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f
|
||||||
invSize src/Dodge/Inventory/CheckSlots.hs 30;" f
|
invSize src/Dodge/Inventory/CheckSlots.hs 30;" f
|
||||||
inventoryX src/Dodge/Creature.hs 114;" f
|
inventoryX src/Dodge/Creature.hs 114;" f
|
||||||
@@ -3956,7 +3958,7 @@ inverseShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 43;" f
|
|||||||
invertEncircleDistP src/Dodge/Creature/Boid.hs 14;" f
|
invertEncircleDistP src/Dodge/Creature/Boid.hs 14;" f
|
||||||
invertIntMap src/IntMapHelp.hs 99;" f
|
invertIntMap src/IntMapHelp.hs 99;" f
|
||||||
invertIntMap src/Multiset.hs 67;" f
|
invertIntMap src/Multiset.hs 67;" f
|
||||||
invertInventoryToMap src/Dodge/Combine.hs 57;" f
|
invertInventoryToMap src/Dodge/Combine.hs 55;" f
|
||||||
invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 21;" f
|
invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 21;" f
|
||||||
invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f
|
invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f
|
||||||
isAmmoIntLink src/Dodge/HeldUse.hs 730;" f
|
isAmmoIntLink src/Dodge/HeldUse.hs 730;" f
|
||||||
@@ -4208,7 +4210,7 @@ makeFragBullets src/Dodge/Bullet.hs 128;" f
|
|||||||
makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f
|
makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f
|
||||||
makeGrid src/Grid.hs 46;" f
|
makeGrid src/Grid.hs 46;" f
|
||||||
makeIntInterval src/Dodge/Zoning/Base.hs 35;" f
|
makeIntInterval src/Dodge/Zoning/Base.hs 35;" f
|
||||||
makeMovingEB src/Dodge/EnergyBall.hs 61;" f
|
makeMovingEB src/Dodge/EnergyBall.hs 60;" f
|
||||||
makeMuzzleFlare src/Dodge/HeldUse.hs 664;" f
|
makeMuzzleFlare src/Dodge/HeldUse.hs 664;" f
|
||||||
makeParagraph src/Justify.hs 6;" f
|
makeParagraph src/Justify.hs 6;" f
|
||||||
makePathBetween src/Dodge/Path.hs 35;" f
|
makePathBetween src/Dodge/Path.hs 35;" f
|
||||||
@@ -4836,7 +4838,7 @@ rightPadNoSquash src/Padding.hs 23;" f
|
|||||||
rlPosDir src/Dodge/RoomLink.hs 94;" f
|
rlPosDir src/Dodge/RoomLink.hs 94;" f
|
||||||
rlauncherPic src/Dodge/Item/Draw/SPic.hs 409;" f
|
rlauncherPic src/Dodge/Item/Draw/SPic.hs 409;" f
|
||||||
rmInLinks src/Dodge/RoomLink.hs 138;" f
|
rmInLinks src/Dodge/RoomLink.hs 138;" f
|
||||||
rmInvItem src/Dodge/Inventory.hs 64;" f
|
rmInvItem src/Dodge/Inventory.hs 75;" f
|
||||||
rmLinksOfType src/Dodge/RoomLink.hs 135;" f
|
rmLinksOfType src/Dodge/RoomLink.hs 135;" f
|
||||||
rmOutLinks src/Dodge/RoomLink.hs 138;" f
|
rmOutLinks src/Dodge/RoomLink.hs 138;" f
|
||||||
roomC src/Dodge/Room/Room.hs 38;" f
|
roomC src/Dodge/Room/Room.hs 38;" f
|
||||||
@@ -4928,8 +4930,8 @@ screenPolygon src/Dodge/Base/Window.hs 17;" f
|
|||||||
screenPolygonBord src/Dodge/Base/Window.hs 27;" f
|
screenPolygonBord src/Dodge/Base/Window.hs 27;" f
|
||||||
screenPosAbs src/Dodge/ScreenPos.hs 15;" f
|
screenPosAbs src/Dodge/ScreenPos.hs 15;" f
|
||||||
screenToWorldPos src/Dodge/Base/Coordinate.hs 51;" f
|
screenToWorldPos src/Dodge/Base/Coordinate.hs 51;" f
|
||||||
scrollAugInvSel src/Dodge/Inventory.hs 204;" f
|
scrollAugInvSel src/Dodge/Inventory.hs 209;" f
|
||||||
scrollAugNextInSection src/Dodge/Inventory.hs 217;" f
|
scrollAugNextInSection src/Dodge/Inventory.hs 222;" f
|
||||||
scrollCommandStrings src/Dodge/Update/Scroll.hs 161;" f
|
scrollCommandStrings src/Dodge/Update/Scroll.hs 161;" f
|
||||||
scrollCommands src/Dodge/Update/Scroll.hs 158;" f
|
scrollCommands src/Dodge/Update/Scroll.hs 158;" f
|
||||||
scrollDebugInfoInt src/Dodge/Debug.hs 71;" f
|
scrollDebugInfoInt src/Dodge/Debug.hs 71;" f
|
||||||
@@ -4994,7 +4996,7 @@ setOldPos src/Dodge/Update.hs 523;" f
|
|||||||
setOutLinks src/Dodge/RoomLink.hs 48;" f
|
setOutLinks src/Dodge/RoomLink.hs 48;" f
|
||||||
setOutLinksByType src/Dodge/RoomLink.hs 57;" f
|
setOutLinksByType src/Dodge/RoomLink.hs 57;" f
|
||||||
setOutLinksPD src/Dodge/RoomLink.hs 77;" f
|
setOutLinksPD src/Dodge/RoomLink.hs 77;" f
|
||||||
setRBCreatureTargeting src/Dodge/Creature/State.hs 374;" f
|
setRBCreatureTargeting src/Dodge/Creature/State.hs 372;" f
|
||||||
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 334;" f
|
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 334;" f
|
||||||
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f
|
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f
|
||||||
setShaderSource src/Shader/Compile.hs 290;" f
|
setShaderSource src/Shader/Compile.hs 290;" f
|
||||||
@@ -5064,8 +5066,8 @@ shiftRoomBy src/Dodge/Room/Link.hs 37;" f
|
|||||||
shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f
|
shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f
|
||||||
shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f
|
shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f
|
||||||
shiftedGrid src/Grid.hs 25;" f
|
shiftedGrid src/Grid.hs 25;" f
|
||||||
shineTargetLaser src/Dodge/Creature/State.hs 283;" f
|
shineTargetLaser src/Dodge/Creature/State.hs 281;" f
|
||||||
shineTorch src/Dodge/Creature/State.hs 322;" f
|
shineTorch src/Dodge/Creature/State.hs 320;" f
|
||||||
shootBullet src/Dodge/HeldUse.hs 1020;" f
|
shootBullet src/Dodge/HeldUse.hs 1020;" f
|
||||||
shootBullets src/Dodge/HeldUse.hs 1010;" f
|
shootBullets src/Dodge/HeldUse.hs 1010;" f
|
||||||
shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f
|
shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f
|
||||||
@@ -5240,7 +5242,7 @@ swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 55;" f
|
|||||||
swapInOutLinks src/Dodge/RoomLink.hs 80;" f
|
swapInOutLinks src/Dodge/RoomLink.hs 80;" f
|
||||||
swapIndices src/ListHelp.hs 50;" f
|
swapIndices src/ListHelp.hs 50;" f
|
||||||
swapInvItems src/Dodge/Inventory/Swap.hs 20;" f
|
swapInvItems src/Dodge/Inventory/Swap.hs 20;" f
|
||||||
swapItemWith src/Dodge/Inventory.hs 167;" f
|
swapItemWith src/Dodge/Inventory.hs 172;" f
|
||||||
swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f
|
swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f
|
||||||
swarmUsingCenter src/Dodge/Creature/Boid.hs 172;" f
|
swarmUsingCenter src/Dodge/Creature/Boid.hs 172;" f
|
||||||
switchDoor src/Dodge/Placement/Instance/Door.hs 96;" f
|
switchDoor src/Dodge/Placement/Instance/Door.hs 96;" f
|
||||||
@@ -5289,7 +5291,7 @@ teslaGun src/Dodge/Item/Held/BatteryGuns.hs 19;" f
|
|||||||
teslaGunPic src/Dodge/Item/Draw/SPic.hs 421;" f
|
teslaGunPic src/Dodge/Item/Draw/SPic.hs 421;" f
|
||||||
teslaParams src/Dodge/Item/Held/BatteryGuns.hs 25;" f
|
teslaParams src/Dodge/Item/Held/BatteryGuns.hs 25;" f
|
||||||
testCrossWalls src/Dodge/Room/Path.hs 47;" f
|
testCrossWalls src/Dodge/Room/Path.hs 47;" f
|
||||||
testEvent src/Dodge/Event/Test.hs 10;" f
|
testEvent src/Dodge/Event/Test.hs 9;" f
|
||||||
testInventory src/Dodge/Creature.hs 292;" f
|
testInventory src/Dodge/Creature.hs 292;" f
|
||||||
testStringInit src/Dodge/TestString.hs 30;" f
|
testStringInit src/Dodge/TestString.hs 30;" f
|
||||||
text src/Picture/Base.hs 193;" f
|
text src/Picture/Base.hs 193;" f
|
||||||
@@ -5425,7 +5427,7 @@ trunkDepth src/TreeHelp.hs 161;" f
|
|||||||
tryAttachItems src/Dodge/Item/Grammar.hs 33;" f
|
tryAttachItems src/Dodge/Item/Grammar.hs 33;" f
|
||||||
tryClickUse src/Dodge/Creature/YourControl.hs 221;" f
|
tryClickUse src/Dodge/Creature/YourControl.hs 221;" f
|
||||||
tryCombine src/Dodge/Update/Input/InGame.hs 526;" f
|
tryCombine src/Dodge/Update/Input/InGame.hs 526;" f
|
||||||
tryDrawToCapacitor src/Dodge/Creature/State.hs 233;" f
|
tryDrawToCapacitor src/Dodge/Creature/State.hs 231;" f
|
||||||
tryDropSelected src/Dodge/Update/Input/InGame.hs 125;" f
|
tryDropSelected src/Dodge/Update/Input/InGame.hs 125;" f
|
||||||
tryGetChannel src/Sound.hs 97;" f
|
tryGetChannel src/Sound.hs 97;" f
|
||||||
tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f
|
tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f
|
||||||
@@ -5438,9 +5440,9 @@ tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f
|
|||||||
tryPutItemInInvAt src/Dodge/Inventory/Add.hs 32;" f
|
tryPutItemInInvAt src/Dodge/Inventory/Add.hs 32;" f
|
||||||
trySeedFromClipboard src/Dodge/Menu.hs 91;" f
|
trySeedFromClipboard src/Dodge/Menu.hs 91;" f
|
||||||
trySpin src/Dodge/Projectile/Update.hs 171;" f
|
trySpin src/Dodge/Projectile/Update.hs 171;" f
|
||||||
trySynthBullet src/Dodge/Creature/State.hs 249;" f
|
trySynthBullet src/Dodge/Creature/State.hs 247;" f
|
||||||
tryThrust src/Dodge/Projectile/Update.hs 177;" f
|
tryThrust src/Dodge/Projectile/Update.hs 177;" f
|
||||||
tryUseParent src/Dodge/Creature/State.hs 227;" f
|
tryUseParent src/Dodge/Creature/State.hs 225;" f
|
||||||
turnTo src/Dodge/Movement/Turn.hs 8;" f
|
turnTo src/Dodge/Movement/Turn.hs 8;" f
|
||||||
turret src/Dodge/Placement/Instance/Turret.hs 35;" f
|
turret src/Dodge/Placement/Instance/Turret.hs 35;" f
|
||||||
turretItemOffset src/Dodge/Item/HeldOffset.hs 21;" f
|
turretItemOffset src/Dodge/Item/HeldOffset.hs 21;" f
|
||||||
@@ -5486,12 +5488,13 @@ updateBulVel src/Dodge/Bullet.hs 55;" f
|
|||||||
updateBullet src/Dodge/Bullet.hs 20;" f
|
updateBullet src/Dodge/Bullet.hs 20;" f
|
||||||
updateBullets src/Dodge/Update.hs 594;" f
|
updateBullets src/Dodge/Update.hs 594;" f
|
||||||
updateCamera src/Dodge/Update/Camera.hs 30;" f
|
updateCamera src/Dodge/Update/Camera.hs 30;" f
|
||||||
updateCloseObjects src/Dodge/Inventory.hs 116;" f
|
updateCloseObjects src/Dodge/Inventory.hs 121;" f
|
||||||
updateCloud src/Dodge/Update.hs 826;" f
|
updateCloud src/Dodge/Update.hs 826;" f
|
||||||
updateClouds src/Dodge/Update.hs 698;" f
|
updateClouds src/Dodge/Update.hs 698;" f
|
||||||
updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f
|
updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f
|
||||||
updateCombineSections src/Dodge/DisplayInventory.hs 44;" f
|
updateCombineSections src/Dodge/DisplayInventory.hs 44;" f
|
||||||
updateCreature src/Dodge/Creature/Update.hs 17;" f
|
updateCreature src/Dodge/Creature/Update.hs 19;" f
|
||||||
|
updateCreature' src/Dodge/Creature/Update.hs 28;" f
|
||||||
updateCreatureGroups src/Dodge/Update.hs 566;" f
|
updateCreatureGroups src/Dodge/Update.hs 566;" f
|
||||||
updateCreatureSoundPositions src/Dodge/Update.hs 542;" f
|
updateCreatureSoundPositions src/Dodge/Update.hs 542;" f
|
||||||
updateDebris src/Dodge/Update.hs 601;" f
|
updateDebris src/Dodge/Update.hs 601;" f
|
||||||
@@ -5504,7 +5507,7 @@ updateDistortions src/Dodge/Update.hs 587;" f
|
|||||||
updateDoor src/Dodge/Update.hs 326;" f
|
updateDoor src/Dodge/Update.hs 326;" f
|
||||||
updateDust src/Dodge/Update.hs 850;" f
|
updateDust src/Dodge/Update.hs 850;" f
|
||||||
updateDusts src/Dodge/Update.hs 701;" f
|
updateDusts src/Dodge/Update.hs 701;" f
|
||||||
updateEnergyBall src/Dodge/EnergyBall.hs 32;" f
|
updateEnergyBall src/Dodge/EnergyBall.hs 31;" f
|
||||||
updateEnergyBalls src/Dodge/Update.hs 689;" f
|
updateEnergyBalls src/Dodge/Update.hs 689;" f
|
||||||
updateEnterRegex src/Dodge/Update/Input/InGame.hs 480;" f
|
updateEnterRegex src/Dodge/Update/Input/InGame.hs 480;" f
|
||||||
updateExpBarrel src/Dodge/Barreloid.hs 20;" f
|
updateExpBarrel src/Dodge/Barreloid.hs 20;" f
|
||||||
@@ -5523,7 +5526,7 @@ updateInGameCamera src/Dodge/Update/Camera.hs 79;" f
|
|||||||
updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 400;" f
|
updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 400;" f
|
||||||
updateInt2Map src/Dodge/Zoning/Base.hs 92;" f
|
updateInt2Map src/Dodge/Zoning/Base.hs 92;" f
|
||||||
updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f
|
updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f
|
||||||
updateItemTargeting src/Dodge/Creature/State.hs 343;" f
|
updateItemTargeting src/Dodge/Creature/State.hs 341;" f
|
||||||
updateKeyInGame src/Dodge/Update/Input/InGame.hs 394;" f
|
updateKeyInGame src/Dodge/Update/Input/InGame.hs 394;" f
|
||||||
updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f
|
updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f
|
||||||
updateLampoid src/Dodge/Lampoid.hs 12;" f
|
updateLampoid src/Dodge/Lampoid.hs 12;" f
|
||||||
@@ -5546,7 +5549,7 @@ updatePastWorlds src/Dodge/Update.hs 441;" f
|
|||||||
updatePreload src/Preload/Update.hs 20;" f
|
updatePreload src/Preload/Update.hs 20;" f
|
||||||
updateProjectile src/Dodge/Projectile/Update.hs 28;" f
|
updateProjectile src/Dodge/Projectile/Update.hs 28;" f
|
||||||
updateProp src/Dodge/Prop/Update.hs 11;" f
|
updateProp src/Dodge/Prop/Update.hs 11;" f
|
||||||
updatePulse src/Dodge/Creature/Update.hs 39;" f
|
updatePulse src/Dodge/Creature/Update.hs 50;" f
|
||||||
updatePulseBall src/Dodge/Update.hs 467;" f
|
updatePulseBall src/Dodge/Update.hs 467;" f
|
||||||
updatePulseLaser src/Dodge/Update.hs 641;" f
|
updatePulseLaser src/Dodge/Update.hs 641;" f
|
||||||
updatePulseLasers src/Dodge/Update.hs 462;" f
|
updatePulseLasers src/Dodge/Update.hs 462;" f
|
||||||
|
|||||||
Reference in New Issue
Block a user