diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index 6eb46932a..ea3589bc8 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -259,8 +259,8 @@ inventoryX c = case c of , megaTinMag 10200 , megaTinMag 10200 ] <> - [bulletTargetingModule btt | btt <- [minBound .. maxBound]] - <> [bulletModule (BulletModPayload (BulBall x)) | x <- [minBound .. maxBound]] +-- [bulletTargetingModule btt | btt <- [minBound .. maxBound]] + [bulletModule (BulletModPayload (BulBall x)) | x <- [minBound .. maxBound]] <> [bulletModule (BulletModEffect x) | x <- [minBound .. maxBound]] _ -> [] diff --git a/src/Dodge/Data/Item/BulletMod.hs b/src/Dodge/Data/Item/BulletMod.hs index a258eb7b8..884af03c8 100644 --- a/src/Dodge/Data/Item/BulletMod.hs +++ b/src/Dodge/Data/Item/BulletMod.hs @@ -8,8 +8,8 @@ import Data.Aeson.TH import Dodge.Data.Bullet data BulletMod - = BulletModTrajectory { _bmTrajectory :: BulletTrajectoryType} - | BulletModPayload {_bmPayload :: BulletPayload} + = -- BulletModTrajectory { _bmTrajectory :: BulletTrajectoryType} + BulletModPayload {_bmPayload :: BulletPayload} | BulletModEffect {_bmEffect :: BulletEffect} deriving (Eq, Ord, Show, Read) diff --git a/src/Dodge/Item/Display.hs b/src/Dodge/Item/Display.hs index e424ac3cf..a23ce232b 100644 --- a/src/Dodge/Item/Display.hs +++ b/src/Dodge/Item/Display.hs @@ -57,7 +57,7 @@ itemBaseName itm = case _itType itm of ATTACH ait -> showAttachItem ait itm AMMOMAG ait -> show ait TARGETING tt -> show tt - BULLETMOD (BulletModTrajectory btt) -> show btt +-- BULLETMOD (BulletModTrajectory btt) -> show btt BULLETMOD (BulletModPayload btt) -> show btt BULLETMOD (BulletModEffect btt) -> show btt diff --git a/src/Dodge/Item/Grammar.hs b/src/Dodge/Item/Grammar.hs index c162e9434..f2c03fc97 100644 --- a/src/Dodge/Item/Grammar.hs +++ b/src/Dodge/Item/Grammar.hs @@ -106,7 +106,7 @@ itemToFunction itm = case itm ^. itType of ATTACH ZOOMSCOPE -> WeaponScopeSF ATTACH HOMINGMODULE -> AmmoTargetingSF LauncherAmmo ATTACH AUGMENTEDHUD -> AugmentedHUDSF - BULLETMOD BulletModTrajectory{} -> AmmoTargetingSF BulletAmmo +-- BULLETMOD BulletModTrajectory{} -> AmmoTargetingSF BulletAmmo BULLETMOD BulletModPayload{} -> AmmoPayloadSF BulletAmmo BULLETMOD BulletModEffect{} -> AmmoEffectSF BulletAmmo TARGETING{} -> WeaponTargetingSF diff --git a/src/Dodge/Item/Scope.hs b/src/Dodge/Item/Scope.hs index cd91d04f5..17fd14a33 100644 --- a/src/Dodge/Item/Scope.hs +++ b/src/Dodge/Item/Scope.hs @@ -3,7 +3,7 @@ module Dodge.Item.Scope ( targetingScope, remoteScreen, homingModule, - bulletTargetingModule, +-- bulletTargetingModule, augmentedHUD, bulletModule, bulletPayloadModule, @@ -38,8 +38,8 @@ bulletModule bm = & itType .~ BULLETMOD bm & itUse .~ UseBulletMod {_ubMod = bm} -bulletTargetingModule :: BulletTrajectoryType -> Item -bulletTargetingModule = bulletModule . BulletModTrajectory +--bulletTargetingModule :: BulletTrajectoryType -> Item +--bulletTargetingModule = bulletModule . BulletModTrajectory bulletPayloadModule :: BulletPayload -> Item bulletPayloadModule = bulletModule . BulletModPayload