Improve item use hammer, improve wide laser

This commit is contained in:
2022-07-07 10:58:18 +01:00
parent 3759434d92
commit 68cb191063
26 changed files with 328 additions and 301 deletions
+3 -3
View File
@@ -65,7 +65,7 @@ itemCombinations =
-- , p [o LASGUN,o PIPE] lasGunPulse
, p [p 2 LASGUN,p 1 $ cr HARDWARE] dualBeam
-- , p [o LASGUN,o $ cr PIPE, o $ cr PRISM] lasWidePulse
, p [o LASGUN,o $ cr TRANSFORMER] (lasGunWide 2)
, p [o LASGUN,o $ cr TRANSFORMER] (lasWide 2)
, p [o $ cr TRANSFORMER,p 2 $ cr CAN] sparkGun
, p [o SPARKGUN,p 2 $ cr PIPE] teslaGun
@@ -83,7 +83,7 @@ itemCombinations =
, p [p 2 $ cr PLATE] flatShield
]
++ map (\i -> po [LASGUNWIDE i,cr TRANSFORMER] $ lasGunWide (i+1)) [2..9]
++ map (\i -> po [LASWIDE i,cr TRANSFORMER] $ lasWide (i+1)) [2..9]
-- ++ map (\i -> po [LASGUNWIDE i,cr HARDWARE] $ lasFocus i) [2..10]
++ map (\i -> po [cr PIPE,BANGSTICK i] $ bangStick (i+1)) [1..8]
++ map (\i -> po [REVOLVERX i,cr CAN] $ revolverX (i+1)) [1..5]
@@ -182,7 +182,7 @@ batteryGuns =
-- , lasSway
, lasSwing
] ++
[ lasGunWide i | i <- [2..10]
[ lasWide i | i <- [2..10]
]
-- ++
-- [ lasFocus i | i <- [1..10]]
+2 -2
View File
@@ -112,8 +112,8 @@ data ItemBaseType
| DUALBEAM
| LASGUNSWING
-- | LASGUNSWAY
| LASGUNWIDEPULSE
| LASGUNWIDE {_xNum :: Int}
-- | LASGUNWIDEPULSE
| LASWIDE {_xNum :: Int}
-- | LASGUNFOCUS Int
| SONICGUN
| TRACTORGUN
+1 -1
View File
@@ -49,7 +49,7 @@ maxShowX bt = case bt of
MINIGUNX _ -> Just 3
GRAPECANNON _ -> Just 1
LAUNCHERX _ -> Just 2
LASGUNWIDE _ -> Just 2
LASWIDE _ -> Just 2
-- LASGUNFOCUS _ -> Just 2
_ -> Nothing