Make all items have an id an associated location

2022-08-01 23:50:26 +01:00
parent 237cd3e020
commit 82aedc3830
11 changed files with 123 additions and 84 deletions
@@ -214,54 +214,50 @@ inventoryX c = case c of
        , makeTypeCraftNum 1 CONCUSSMODULE
        , makeTypeCraftNum 1 STATICMODULE
        ]
+    'M' -> stackedInventory
+    'T' -> testInventory
    _ -> []

-testInventory :: IM.IntMap Item
+testInventory :: [Item]
 testInventory =
-    IM.fromList $
-        zip
-            [0 ..]
-            [ makeTypeCraftNum 9 PIPE
-            , autoAmr
-            , brainHat
-            , headLamp
-            , autoDetector WALLDETECTOR
-            , magShield
-            , frontArmour
-            , wristArmour
-            , flatShield
-            , sniperRifle
-            , makeTypeCraftNum 1 MOTOR
-            , makeTypeCraft INCENDIARYMODULE
-            , makeTypeCraft STATICMODULE
-            , makeTypeCraft CONCUSSMODULE
-            , teleportModule
-            , makeTypeCraftNum 10 HARDWARE
-            , makeTypeCraftNum 3 SPRING
-            , makeTypeCraftNum 10 CAN
-            , makeTypeCraftNum 3 PLANK
-            ]
+    [ makeTypeCraftNum 9 PIPE
+    , autoAmr
+    , brainHat
+    , headLamp
+    , autoDetector WALLDETECTOR
+    , magShield
+    , frontArmour
+    , wristArmour
+    , flatShield
+    , sniperRifle
+    , makeTypeCraftNum 1 MOTOR
+    , makeTypeCraft INCENDIARYMODULE
+    , makeTypeCraft STATICMODULE
+    , makeTypeCraft CONCUSSMODULE
+    , teleportModule
+    , makeTypeCraftNum 10 HARDWARE
+    , makeTypeCraftNum 3 SPRING
+    , makeTypeCraftNum 10 CAN
+    , makeTypeCraftNum 3 PLANK
+    ]

-stackedInventory :: IM.IntMap Item
+stackedInventory :: [Item]
 stackedInventory =
-    IM.fromList $
-        zip
-            [0 ..]
-            [ burstRifle
-            , pipe
-            , rewindGun
-            , tractorGun
-            , autoPistol
-            , pistol
-            , teslaGun
-            , blinkGun
-            , miniGunX 3
-            , boosterGun
-            , remoteLauncher
-            , flatShield
-            , spawnGun (lamp 5)
-            , lasGun
-            , flameThrower
-            , poisonSprayer
-            , launcher
-            ]
+    [ burstRifle
+    , pipe
+    , rewindGun
+    , tractorGun
+    , autoPistol
+    , pistol
+    , teslaGun
+    , blinkGun
+    , miniGunX 3
+    , boosterGun
+    , remoteLauncher
+    , flatShield
+    , spawnGun (lamp 5)
+    , lasGun
+    , flameThrower
+    , poisonSprayer
+    , launcher
+    ]