Cleanup
This commit is contained in:
@@ -30,13 +30,13 @@ backpackCombinations =
|
||||
po xs it = (map o xs, it)
|
||||
o = (1,)
|
||||
|
||||
hatCombinations :: [([(ItAmount,ItemBaseType)],Item)]
|
||||
hatCombinations =
|
||||
[ po [EQUIP HAT, CRAFT (TARGETMODULE tt)] (targetingHat tt) | tt <- [minBound..]
|
||||
]
|
||||
where
|
||||
po xs it = (map o xs, it)
|
||||
o = (1,)
|
||||
--hatCombinations :: [([(ItAmount,ItemBaseType)],Item)]
|
||||
--hatCombinations =
|
||||
-- [ po [EQUIP HAT, CRAFT (TARGETMODULE tt)] (targetingHat tt) | tt <- [minBound..]
|
||||
-- ]
|
||||
-- where
|
||||
-- po xs it = (map o xs, it)
|
||||
-- o = (1,)
|
||||
|
||||
magazineCombinations :: [([(ItAmount,ItemBaseType)],Item)]
|
||||
magazineCombinations =
|
||||
@@ -55,7 +55,7 @@ itemCombinations :: [([(ItAmount, ItemBaseType)], Item)]
|
||||
itemCombinations =
|
||||
watchCombinations ++
|
||||
backpackCombinations ++
|
||||
hatCombinations ++
|
||||
-- hatCombinations ++
|
||||
magazineCombinations ++
|
||||
[ po [CRAFT PIPE, CRAFT HARDWARE] (bangStick 1)
|
||||
, po [HELD (BANGSTICK 1), CRAFT TIN] pistol
|
||||
@@ -108,8 +108,8 @@ itemCombinations =
|
||||
, po [cr MICROCHIP, cr TRANSMITTER, cr HEATSENSOR] (autoDetector CREATUREDETECTOR)
|
||||
, po [AMMOMAG BATTERY, cr LED] torch
|
||||
, po [hd TORCH, eq HAT] headLamp
|
||||
, po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (energyBallCraft IncBall)
|
||||
, po [cr TRANSFORMER, AMMOMAG BATTERY, cr MICROCHIP] (energyBallCraft TeslaBall)
|
||||
-- , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (energyBallCraft IncBall)
|
||||
-- , po [cr TRANSFORMER, AMMOMAG BATTERY, cr MICROCHIP] (energyBallCraft TeslaBall)
|
||||
]
|
||||
-- ++ 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]
|
||||
@@ -222,8 +222,6 @@ itemCombinations =
|
||||
-- amod = (,)
|
||||
-- cr = CRAFT
|
||||
|
||||
homingLaunchers :: [Item]
|
||||
homingLaunchers = launcher : [launcherX i | i <- [2 .. 10]]
|
||||
|
||||
--batteryGuns :: [Item]
|
||||
--batteryGuns =
|
||||
@@ -237,13 +235,13 @@ homingLaunchers = launcher : [launcherX i | i <- [2 .. 10]]
|
||||
--teleportableWeapons :: [Item]
|
||||
--teleportableWeapons = bulletWeapons ++ batteryGuns ++ homingLaunchers
|
||||
|
||||
bulletMagazines :: [Item]
|
||||
bulletMagazines =
|
||||
[tinMag
|
||||
,revolveMag
|
||||
,drumMag
|
||||
,beltMag
|
||||
]
|
||||
--bulletMagazines :: [Item]
|
||||
--bulletMagazines =
|
||||
-- [tinMag
|
||||
-- ,revolveMag
|
||||
-- ,drumMag
|
||||
-- ,beltMag
|
||||
-- ]
|
||||
|
||||
bulletWeapons :: [Item]
|
||||
bulletWeapons =
|
||||
|
||||
Reference in New Issue
Block a user