Remove internal ammo

This commit is contained in:
2024-06-21 12:48:41 +01:00
parent d41604fcde
commit 0a1b0386b9
33 changed files with 838 additions and 789 deletions
+1 -12
View File
@@ -54,8 +54,6 @@ itemCombinations =
, po [HELD PISTOL, CRAFT SPRING] autoPistol
, po [HELD AUTOPISTOL, cr PLANK] smg
, po [HELD AUTOPISTOL, cr SPRING] machinePistol
, po [HELD (BANGSTICK 1), cr CAN] revolver
, po [HELD REVOLVER, cr SPRING] $ revolverX 1
, po [cr CAN, cr HARDWARE] bangCone
, po [HELD BANGCONE, cr PLANK] blunderbuss
, po [HELD BLUNDERBUSS, cr STEELDRUM] (grapeCannon 1)
@@ -107,7 +105,6 @@ itemCombinations =
]
++ map (\i -> po [HELD (LASWIDE i), cr TRANSFORMER] $ lasWide (i + 1)) [2 .. 9]
++ map (\i -> po [cr PIPE, HELD (BANGSTICK i)] $ bangStick (i + 1)) [1 .. 8]
++ map (\i -> po [hd (REVOLVERX i), cr CAN] $ revolverX (i + 1)) [1 .. 5]
++ map (\i -> po [hd (VOLLEYGUN i), HELD (BANGSTICK 1)] $ volleyGun (i + 1)) [3 .. 5]
++ map (\i -> po [hd (MINIGUNX i), HELD (BANGSTICK 1)] $ miniGunX (i + 1)) [3 .. 15]
++ map (\i -> po [hd (GRAPECANNON i), cr STEELDRUM] $ grapeCannon (i + 1)) [1, 2, 3]
@@ -210,13 +207,7 @@ moduleCombinations =
[ amod [cr MICROCHIP, cr TRANSMITTER] LAUNCHHOME
]
)
,
( ModBattery
, batteryGuns
,
[ amod [cr BATTERY] EXTRABATTERY
]
)
]
where
amod = (,)
@@ -241,14 +232,12 @@ bulletWeapons :: [Item]
bulletWeapons =
[bangStick i | i <- [1 .. 9]]
++ [volleyGun i | i <- [3 .. 6]]
++ [revolverX i | i <- [1 .. 5]]
++ [miniGunX i | i <- [3 .. 16]]
++ [grapeCannon i | i <- [1, 2, 3, 4]]
++ [ pistol
, autoPistol
, smg
, machinePistol
, revolver
, rifle
, repeater
, autoRifle
-1
View File
@@ -44,7 +44,6 @@ bulletCombinations = filter
maxShowX :: ItemBaseType -> Maybe Int
maxShowX bt = case bt of
HELD (BANGSTICK _) -> Just 2
HELD (REVOLVERX _) -> Just 1
HELD (VOLLEYGUN _) -> Just 3
HELD (MINIGUNX _) -> Just 3
HELD (GRAPECANNON _) -> Just 1
-1
View File
@@ -32,7 +32,6 @@ moduleModification imt = case imt of
. (itParams . subParams ?~ teslaParams)
WEPTELE -> makeDirectedTele
LAUNCHHOME -> itUse . heldConsumption . laAmmoType . amPjCreation .~ CreateTrackingShell
EXTRABATTERY -> itUse . heldConsumption . laSource . _InternalSource . iaMax +~ 1000
ATTACHTORCH -> id
where
makeDirectedTele it =