From e9006addd051ea85a6138af9a32467e7aaa008ed Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 20 Dec 2024 18:14:27 +0000 Subject: [PATCH] Cleanup --- src/Dodge/Combine/Combinations.hs | 23 ++++++++++--------- src/Dodge/Creature.hs | 10 ++------ src/Dodge/Data/Item/Combine.hs | 4 ---- src/Dodge/Item/Ammo.hs | 1 + src/Dodge/Item/Craftable.hs | 38 ++++++++++++------------------- src/Dodge/Item/Info.hs | 8 +++---- src/Dodge/Item/Weapon/Bullet.hs | 26 ++++++++++----------- 7 files changed, 46 insertions(+), 64 deletions(-) diff --git a/src/Dodge/Combine/Combinations.hs b/src/Dodge/Combine/Combinations.hs index cf00a6f31..9cdb1b51c 100644 --- a/src/Dodge/Combine/Combinations.hs +++ b/src/Dodge/Combine/Combinations.hs @@ -14,13 +14,14 @@ import LensHelp watchCombinations :: [([(ItAmount, ItemType)], Item)] watchCombinations = - [ po [HELD TIMESTOPPER, HELD REWINDER] timeScroller - , po [CRAFT TIMEMODULE, CRAFT MICROCHIP, CRAFT HARDDRIVE] timeScroller - , po [CRAFT TIMEMODULE, CRAFT MICROCHIP, CRAFT RAM] timeScroller - ] - where - po xs it = (map o xs, it) - o = (1,) + [] +-- [ po [HELD TIMESTOPPER, HELD REWINDER] timeScroller +-- , po [CRAFT TIMEMODULE, CRAFT MICROCHIP, CRAFT HARDDRIVE] timeScroller +-- , po [CRAFT TIMEMODULE, CRAFT MICROCHIP, CRAFT RAM] timeScroller +-- ] +-- where +-- po xs it = (map o xs, it) +-- o = (1,) backpackCombinations :: [([(ItAmount,ItemType)],Item)] backpackCombinations = @@ -92,13 +93,13 @@ itemCombinations = -- , po [HELD LASGUN, HELD LASGUN, HELD LASGUN, cr HARDWARE] lasCircle , p [o $ cr TRANSFORMER, p 2 $ cr CAN] sparkGun , p [o (HELD SPARKGUN), p 2 $ cr PIPE] teslaGun - , p [o $ cr TELEPORTMODULE, p 2 $ cr MICROCHIP] blinker +-- , p [o $ cr TELEPORTMODULE, p 2 $ cr MICROCHIP] blinker , p [o $ HELD BLINKER, p 2 $ cr MICROCHIP] unsafeBlinker , po [cr MAGNET, cr TIN] magShield , p [p 2 $ cr PIPE, o $ cr PLATE, o $ cr MOTOR] powerLegs - , p [p 4 $ cr CAN] plateCraft - , p [p 3 $ cr TIN] plateCraft - , p [p 2 $ cr STEELDRUM] plateCraft + , p [p 4 $ cr CAN] metalPlate + , p [p 3 $ cr TIN] metalPlate + , p [p 2 $ cr STEELDRUM] metalPlate , p [p 2 $ cr PLATE] flatShield , po [cr MICROCHIP, cr PRISM] (makeTypeCraft LIGHTSENSOR) , po [cr MICROCHIP, cr MICROPHONE] (makeTypeCraft SOUNDSENSOR) diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index da201e110..e99120345 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -190,12 +190,10 @@ inventoryX c = case c of ] 'H' -> [shatterGun] 'I' -> - [ makeTypeCraft TELEPORTMODULE - , makeTypeCraft HARDDRIVE + [ makeTypeCraft HARDDRIVE , makeTypeCraft RAM ] <> fold - [ makeTypeCraftNum 2 TIMEMODULE - , makeTypeCraftNum 2 MICROCHIP + [ makeTypeCraftNum 2 MICROCHIP ] 'J' -> [ laser @@ -266,10 +264,6 @@ testInventory = , wristArmour , flatShield , sniperRifle --- , makeTypeCraft (ENERGYBALLCRAFT IncBall) --- , makeTypeCraft (ENERGYBALLCRAFT TeslaBall) --- , makeTypeCraft (ENERGYBALLCRAFT ConcBall) - , teleportModule ] <> fold [ makeTypeCraftNum 1 MOTOR , makeTypeCraftNum 9 PIPE diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs index 7207d5859..ccdc589ba 100644 --- a/src/Dodge/Data/Item/Combine.hs +++ b/src/Dodge/Data/Item/Combine.hs @@ -68,10 +68,6 @@ data CraftType | GASINJECTOR | FLAKCRAFT | FRAGCRAFT - | TELEPORTMODULE - | TIMEMODULE - | SIZEMODULE - | GRAVITYMODULE deriving (Eq, Ord, Show, Read) data AttachType diff --git a/src/Dodge/Item/Ammo.hs b/src/Dodge/Item/Ammo.hs index 3398d18c4..07da556cc 100644 --- a/src/Dodge/Item/Ammo.hs +++ b/src/Dodge/Item/Ammo.hs @@ -122,3 +122,4 @@ bulletSynthesizer :: Item bulletSynthesizer = makeAttach BULLETSYNTH & itUse .~ UseAttach (APInt 0) + diff --git a/src/Dodge/Item/Craftable.hs b/src/Dodge/Item/Craftable.hs index 833b442a9..88c5b66f6 100644 --- a/src/Dodge/Item/Craftable.hs +++ b/src/Dodge/Item/Craftable.hs @@ -1,14 +1,19 @@ -module Dodge.Item.Craftable - where +module Dodge.Item.Craftable ( + makeTypeCraft, + makeTypeCraftNum, + pipe, + metalPlate, +) where -import Dodge.Default.Item import Control.Lens import Dodge.Data.Item +import Dodge.Default.Item makeTypeCraftNum :: Int -> CraftType -> [Item] -makeTypeCraftNum i ct = replicate i $ - defaultCraftItem - & itType .~ CRAFT ct +makeTypeCraftNum i ct = + replicate i $ + defaultCraftItem + & itType .~ CRAFT ct makeTypeCraft :: CraftType -> Item makeTypeCraft = head . makeTypeCraftNum 1 @@ -20,27 +25,12 @@ makeTypeCraft = head . makeTypeCraftNum 1 --incendiaryModule = energyBallCraft IncBall --bulletBodyCraft :: BulletEffect -> Item ---bulletBodyCraft ebt = +--bulletBodyCraft ebt = -- makeTypeCraft (BULBODYCRAFT ebt) -- & itInvSize .~ 1 ---bounceModule :: Item ---bounceModule = bulletBodyCraft BounceBullet - -teleportModule :: Item -teleportModule = makeTypeCraft TELEPORTMODULE - -timeModule :: Item -timeModule = makeTypeCraft TIMEMODULE - -sizeModule :: Item -sizeModule = makeTypeCraft SIZEMODULE - -gravityModule :: Item -gravityModule = makeTypeCraft GRAVITYMODULE - pipe :: Item pipe = makeTypeCraft PIPE -plateCraft :: Item -plateCraft = makeTypeCraft PLATE +metalPlate :: Item +metalPlate = makeTypeCraft PLATE diff --git a/src/Dodge/Item/Info.hs b/src/Dodge/Item/Info.hs index fd4961ec0..0bebe753b 100644 --- a/src/Dodge/Item/Info.hs +++ b/src/Dodge/Item/Info.hs @@ -167,10 +167,10 @@ craftInfo fit = case fit of 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." +-- 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." diff --git a/src/Dodge/Item/Weapon/Bullet.hs b/src/Dodge/Item/Weapon/Bullet.hs index ae812871e..720e84ad1 100644 --- a/src/Dodge/Item/Weapon/Bullet.hs +++ b/src/Dodge/Item/Weapon/Bullet.hs @@ -1,9 +1,9 @@ module Dodge.Item.Weapon.Bullet ( - hvBulletAmmo, +-- hvBulletAmmo, defaultBullet, ) where -import Control.Lens +--import Control.Lens import Dodge.Data.Item.Use.Consumption.Ammo import Geometry.Data @@ -27,14 +27,14 @@ basicBulDams = [ Damage PIERCING 100 0 0 0 $ PushBackDamage 2 ] -hvBulletAmmo :: Bullet -hvBulletAmmo = - defaultBullet - & buWidth .~ 6 - & buVel .~ V2 80 0 - & buDamages .~ heavyBulDams - -heavyBulDams :: [Damage] -heavyBulDams = - [ Damage PIERCING 300 0 0 0 $ PushBackDamage 2 - ] +--hvBulletAmmo :: Bullet +--hvBulletAmmo = +-- defaultBullet +-- & buWidth .~ 6 +-- & buVel .~ V2 80 0 +-- & buDamages .~ heavyBulDams +-- +--heavyBulDams :: [Damage] +--heavyBulDams = +-- [ Damage PIERCING 300 0 0 0 $ PushBackDamage 2 +-- ]