Reloading slows movement
This commit is contained in:
+16
-5
@@ -5,6 +5,7 @@ import Dodge.Data
|
||||
--import Dodge.Combine.Data
|
||||
import Multiset
|
||||
import Dodge.Item.Weapon.BulletGuns
|
||||
import Dodge.Item.Weapon.Launcher
|
||||
--import Dodge.Item.Craftable
|
||||
|
||||
import Control.Lens
|
||||
@@ -18,22 +19,32 @@ import Data.List (scanl')
|
||||
itemCombinations :: [ (M.Map CombineType Int, Item) ]
|
||||
itemCombinations = map (first toMultiset) $
|
||||
[ p [PIPE,HARDWARE] (bangStick 1)
|
||||
, p [PIPE,PIPE,HARDWARE] bangCane
|
||||
, p [PIPE,PIPE,PIPE,HARDWARE] bangRod
|
||||
, p [BANGSTICK 1,CAN] revolver
|
||||
, p [BANGSTICK 1,TIN] pistol
|
||||
, p [PISTOL, SPRING, HARDWARE] autoPistol
|
||||
, p [AUTOPISTOL, PLANK, HARDWARE] smg
|
||||
, p [AUTOPISTOL, HARDWARE] machinePistol
|
||||
, p [BANGSTICK 1,CAN] revolver
|
||||
, p [REVOLVER, SPRING, HARDWARE] $ revolverX 1
|
||||
|
||||
, p [PIPE,TUBE,HARDWARE] bangCone
|
||||
, p [BANGCONE,PLANK] blunderbuss
|
||||
, p [BLUNDERBUSS,TUBE] grapeShotCannon
|
||||
, p [BANGCONE,PUMP,HARDWARE] $ grenadeLauncher 1
|
||||
, p [GRENADELAUNCHER 1,MOTOR,DRUM] $ grenadeLauncher 2
|
||||
, p [BLUNDERBUSS,TUBE] grapeShotCannon
|
||||
|
||||
, p [PIPE,PIPE,HARDWARE] bangCane
|
||||
, p [BANGCANE,PIPE,PIPE] (bangCaneX 2)
|
||||
, p [BANGCANE,TIN] rifle
|
||||
, p [RIFLE,SPRING,HARDWARE] autoRifle
|
||||
, p [RIFLE,SPRING,CAN] assaultRifle
|
||||
|
||||
, p [PIPE,PIPE,PIPE,HARDWARE] bangRod
|
||||
|
||||
, p [TUBE,TUBE,TUBE,HARDWARE] launcher
|
||||
]
|
||||
++ map (\i -> ([PIPE,BANGSTICK i],bangStick (i+1))) [1..8]
|
||||
++ map (\i -> ([REVOLVERX i,CAN] ,revolverX (i+1))) [1..6]
|
||||
++ map (\i -> ([REVOLVERX i,CAN] ,revolverX (i+1))) [1..5]
|
||||
++ map (\i -> ([BANGCANEX i,PIPE,PIPE] ,bangCaneX (i+1))) [1..5]
|
||||
where
|
||||
p = (,)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user