From ea353f8bcc7e7aabd22dc6dc1862267ded891395 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 1 Oct 2024 13:20:55 +0100 Subject: [PATCH] Fully remove forcefieldgun --- ghcidOutput | 13 +------------ src/Dodge/Data/Item/Use.hs | 1 - src/Dodge/Item/Draw/SPic.hs | 1 - src/Dodge/Item/Info.hs | 2 +- src/Dodge/LockAndKey.hs | 4 ++-- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index 5f118b5ba..28749886d 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1,12 +1 @@ -/home/justin/Haskell/loop/src/Dodge/Item/Held.hs:(26,23)-(68,28): warning: [-Wincomplete-patterns] - 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 - | ^^^^^^^^^^^^^^^^^^^^... +All good (604 modules, at 13:20:50) diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs index 51fbfc3d5..0278c50f3 100644 --- a/src/Dodge/Data/Item/Use.hs +++ b/src/Dodge/Data/Item/Use.hs @@ -148,7 +148,6 @@ data MuzzleEffect , _nzWalkSpeed :: Float } | MuzzleShatter - | MuzzleForceField | MuzzleDetector deriving (Eq, Ord, Show, Read) --Generic, Flat) diff --git a/src/Dodge/Item/Draw/SPic.hs b/src/Dodge/Item/Draw/SPic.hs index f6ef488ad..a6ae0b16d 100644 --- a/src/Dodge/Item/Draw/SPic.hs +++ b/src/Dodge/Item/Draw/SPic.hs @@ -175,7 +175,6 @@ leftItemSPic lt _ = case lt of heldItemSPic :: HeldItemType -> Item -> SPic heldItemSPic ht it = case ht of FLATSHIELD -> flatShieldEquipSPic - FORCEFIELDGUN -> defSPic TORCH -> noPic torchShape BANGSTICK i -> noPic $ baseStickShapeX it i -- <> addBullets it PISTOL -> noPic baseStickShape diff --git a/src/Dodge/Item/Info.hs b/src/Dodge/Item/Info.hs index dc94bb5a2..1c1f378aa 100644 --- a/src/Dodge/Item/Info.hs +++ b/src/Dodge/Item/Info.hs @@ -87,7 +87,7 @@ heldInfo hit = case hit of POISONSPRAYER -> "A weapon that releases noxious gases." DRONELAUNCHER -> "A device for launching drones." 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." TORCH -> "A stick with a light on the end." FLATSHIELD -> "A panel of metal that blocks unwanted objects from the front of the user." diff --git a/src/Dodge/LockAndKey.hs b/src/Dodge/LockAndKey.hs index c67c24c2d..b526b2ae2 100644 --- a/src/Dodge/LockAndKey.hs +++ b/src/Dodge/LockAndKey.hs @@ -24,12 +24,12 @@ lockRoomMultiItems = lockRoomKeyItems :: RandomGen g => [(Int -> State g (MetaTree Room String), State g ItemType)] 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) , (const slowDoorRoomRunPast, return $ HELD (MINIGUNX 3)) , (const longRoomRunPast, takeOne [HELD SNIPERRIFLE, HELD FLATSHIELD]) , (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)) ]