Fully remove forcefieldgun
This commit is contained in:
+1
-12
@@ -1,12 +1 @@
|
|||||||
/home/justin/Haskell/loop/src/Dodge/Item/Held.hs:(26,23)-(68,28): warning: [-Wincomplete-patterns]
|
All good (604 modules, at 13:20:50)
|
||||||
Pattern match(es) are non-exhaustive
|
|
||||||
In a case alternative: Patterns not matched: FORCEFIELDGUN
|
|
||||||
|
|
|
||||||
26 | itemFromHeldType ht = case ht of
|
|
||||||
| ^^^^^^^^^^...
|
|
||||||
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(186,66)-(194,53): warning: [-Wincomplete-patterns]
|
|
||||||
Pattern match(es) are non-exhaustive
|
|
||||||
In a case alternative: Patterns not matched: MuzzleForceField
|
|
||||||
|
|
|
||||||
186 | removeAmmoFromMag x mid cr . makeMuzzleFlare mz itmtree cr $ case _mzEffect mz of
|
|
||||||
| ^^^^^^^^^^^^^^^^^^^^...
|
|
||||||
|
|||||||
@@ -148,7 +148,6 @@ data MuzzleEffect
|
|||||||
, _nzWalkSpeed :: Float
|
, _nzWalkSpeed :: Float
|
||||||
}
|
}
|
||||||
| MuzzleShatter
|
| MuzzleShatter
|
||||||
| MuzzleForceField
|
|
||||||
| MuzzleDetector
|
| MuzzleDetector
|
||||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||||
|
|
||||||
|
|||||||
@@ -175,7 +175,6 @@ leftItemSPic lt _ = case lt of
|
|||||||
heldItemSPic :: HeldItemType -> Item -> SPic
|
heldItemSPic :: HeldItemType -> Item -> SPic
|
||||||
heldItemSPic ht it = case ht of
|
heldItemSPic ht it = case ht of
|
||||||
FLATSHIELD -> flatShieldEquipSPic
|
FLATSHIELD -> flatShieldEquipSPic
|
||||||
FORCEFIELDGUN -> defSPic
|
|
||||||
TORCH -> noPic torchShape
|
TORCH -> noPic torchShape
|
||||||
BANGSTICK i -> noPic $ baseStickShapeX it i -- <> addBullets it
|
BANGSTICK i -> noPic $ baseStickShapeX it i -- <> addBullets it
|
||||||
PISTOL -> noPic baseStickShape
|
PISTOL -> noPic baseStickShape
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ heldInfo hit = case hit of
|
|||||||
POISONSPRAYER -> "A weapon that releases noxious gases."
|
POISONSPRAYER -> "A weapon that releases noxious gases."
|
||||||
DRONELAUNCHER -> "A device for launching drones."
|
DRONELAUNCHER -> "A device for launching drones."
|
||||||
SHATTERGUN -> "A seismic device that shatters hard items in its line of fire."
|
SHATTERGUN -> "A seismic device that shatters hard items in its line of fire."
|
||||||
FORCEFIELDGUN -> "A device that produces a durable forcefield."
|
-- FORCEFIELDGUN -> "A device that produces a durable forcefield."
|
||||||
HELDDETECTOR d -> "A device that detects " ++ detectorInfo d ++ " in an expanding radius."
|
HELDDETECTOR d -> "A device that detects " ++ detectorInfo d ++ " in an expanding radius."
|
||||||
TORCH -> "A stick with a light on the end."
|
TORCH -> "A stick with a light on the end."
|
||||||
FLATSHIELD -> "A panel of metal that blocks unwanted objects from the front of the user."
|
FLATSHIELD -> "A panel of metal that blocks unwanted objects from the front of the user."
|
||||||
|
|||||||
@@ -24,12 +24,12 @@ lockRoomMultiItems =
|
|||||||
|
|
||||||
lockRoomKeyItems :: RandomGen g => [(Int -> State g (MetaTree Room String), State g ItemType)]
|
lockRoomKeyItems :: RandomGen g => [(Int -> State g (MetaTree Room String), State g ItemType)]
|
||||||
lockRoomKeyItems =
|
lockRoomKeyItems =
|
||||||
[ (lasCenSensEdge, takeOne [HELD LAUNCHER, HELD LASGUN, HELD SPARKGUN, HELD FLATSHIELD, HELD FORCEFIELDGUN])
|
[ (lasCenSensEdge, takeOne [HELD LAUNCHER, HELD LASGUN, HELD SPARKGUN, HELD FLATSHIELD])
|
||||||
, (sensorRoomRunPast LASERING, return $ HELD LASGUN)
|
, (sensorRoomRunPast LASERING, return $ HELD LASGUN)
|
||||||
, (const slowDoorRoomRunPast, return $ HELD (MINIGUNX 3))
|
, (const slowDoorRoomRunPast, return $ HELD (MINIGUNX 3))
|
||||||
, (const longRoomRunPast, takeOne [HELD SNIPERRIFLE, HELD FLATSHIELD])
|
, (const longRoomRunPast, takeOne [HELD SNIPERRIFLE, HELD FLATSHIELD])
|
||||||
, (const glassLessonRunPast, takeOne [HELD LASGUN])
|
, (const glassLessonRunPast, takeOne [HELD LASGUN])
|
||||||
, (const $ lasTunnelRunPast 400, takeOne [HELD FLATSHIELD, HELD FORCEFIELDGUN])
|
, (const $ lasTunnelRunPast 400, takeOne [HELD FLATSHIELD])
|
||||||
, (keyCardRoomRunPast 0, return (HELD $ KEYCARD 0))
|
, (keyCardRoomRunPast 0, return (HELD $ KEYCARD 0))
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user