justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Comment out bullet ammo targeting modules

Browse Source
This commit is contained in:
justin
2024-12-24 14:04:18 +00:00
parent d58fdb0b52
commit dc96424de9
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Creature.hs
+2 -2
View File
@@ -259,8 +259,8 @@ inventoryX c = case c of
, megaTinMag 10200 , megaTinMag 10200
, megaTinMag 10200 , megaTinMag 10200
] <> ] <>
[bulletTargetingModule btt | btt <- [minBound .. maxBound]] -- [bulletTargetingModule btt | btt <- [minBound .. maxBound]]
<> [bulletModule (BulletModPayload (BulBall x)) | x <- [minBound .. maxBound]] [bulletModule (BulletModPayload (BulBall x)) | x <- [minBound .. maxBound]]
<> [bulletModule (BulletModEffect x) | x <- [minBound .. maxBound]] <> [bulletModule (BulletModEffect x) | x <- [minBound .. maxBound]]
_ -> [] _ -> []
src/Dodge/Data/Item/BulletMod.hs
+2 -2
View File
@@ -8,8 +8,8 @@ import Data.Aeson.TH
import Dodge.Data.Bullet import Dodge.Data.Bullet
data BulletMod data BulletMod
= BulletModTrajectory { _bmTrajectory :: BulletTrajectoryType} = -- BulletModTrajectory { _bmTrajectory :: BulletTrajectoryType}
| BulletModPayload {_bmPayload :: BulletPayload} BulletModPayload {_bmPayload :: BulletPayload}
| BulletModEffect {_bmEffect :: BulletEffect} | BulletModEffect {_bmEffect :: BulletEffect}
deriving (Eq, Ord, Show, Read) deriving (Eq, Ord, Show, Read)
src/Dodge/Item/Display.hs
+1 -1
View File
@@ -57,7 +57,7 @@ itemBaseName itm = case _itType itm of
ATTACH ait -> showAttachItem ait itm ATTACH ait -> showAttachItem ait itm
AMMOMAG ait -> show ait AMMOMAG ait -> show ait
TARGETING tt -> show tt TARGETING tt -> show tt
BULLETMOD (BulletModTrajectory btt) -> show btt -- BULLETMOD (BulletModTrajectory btt) -> show btt
BULLETMOD (BulletModPayload btt) -> show btt BULLETMOD (BulletModPayload btt) -> show btt
BULLETMOD (BulletModEffect btt) -> show btt BULLETMOD (BulletModEffect btt) -> show btt
src/Dodge/Item/Grammar.hs
+1 -1
View File
@@ -106,7 +106,7 @@ itemToFunction itm = case itm ^. itType of
ATTACH ZOOMSCOPE -> WeaponScopeSF ATTACH ZOOMSCOPE -> WeaponScopeSF
ATTACH HOMINGMODULE -> AmmoTargetingSF LauncherAmmo ATTACH HOMINGMODULE -> AmmoTargetingSF LauncherAmmo
ATTACH AUGMENTEDHUD -> AugmentedHUDSF ATTACH AUGMENTEDHUD -> AugmentedHUDSF
BULLETMOD BulletModTrajectory{} -> AmmoTargetingSF BulletAmmo -- BULLETMOD BulletModTrajectory{} -> AmmoTargetingSF BulletAmmo
BULLETMOD BulletModPayload{} -> AmmoPayloadSF BulletAmmo BULLETMOD BulletModPayload{} -> AmmoPayloadSF BulletAmmo
BULLETMOD BulletModEffect{} -> AmmoEffectSF BulletAmmo BULLETMOD BulletModEffect{} -> AmmoEffectSF BulletAmmo
TARGETING{} -> WeaponTargetingSF TARGETING{} -> WeaponTargetingSF
src/Dodge/Item/Scope.hs
+3 -3
View File
@@ -3,7 +3,7 @@ module Dodge.Item.Scope (
targetingScope, targetingScope,
remoteScreen, remoteScreen,
homingModule, homingModule,
bulletTargetingModule, -- bulletTargetingModule,
augmentedHUD, augmentedHUD,
bulletModule, bulletModule,
bulletPayloadModule, bulletPayloadModule,
@@ -38,8 +38,8 @@ bulletModule bm =
& itType .~ BULLETMOD bm & itType .~ BULLETMOD bm
& itUse .~ UseBulletMod {_ubMod = bm} & itUse .~ UseBulletMod {_ubMod = bm}
bulletTargetingModule :: BulletTrajectoryType -> Item --bulletTargetingModule :: BulletTrajectoryType -> Item
bulletTargetingModule = bulletModule . BulletModTrajectory --bulletTargetingModule = bulletModule . BulletModTrajectory
bulletPayloadModule :: BulletPayload -> Item bulletPayloadModule :: BulletPayload -> Item
bulletPayloadModule = bulletModule . BulletModPayload bulletPayloadModule = bulletModule . BulletModPayload