Add bangcone

2021-12-04 18:52:03 +00:00
parent cb670bdfd8
commit cbf344e73e
6 changed files with 221 additions and 30 deletions
@@ -6,14 +6,24 @@ data CombineType
    = NOTDEFINED
    -- Weapons
    | BANGSTICK Int
-    | BANGCANE
    | BANGROD
    | PISTOL
    | REVOLVER
    | REVOLVERX Int
    | HVAUTOGUN
    | LTAUTOGUN
+    | MACHINEPISTOL
+    | AUTOPISTOL
+    | SMG
+    | BANGCONE
+    | BLUNDERBUSS
+    | GRAPESHOTCANNON
+    | GRENADELAUNCHER Int -- number of chambers that can be reloaded
+    | MORTAR
    | MINIGUN
+    | BANGCANE
+    | BANGCANEX Int
+    | RIFLE
    | AUTOGUN
    | SPREADGUN
    | MULTGUN
@@ -42,13 +52,18 @@ data CombineType
    | JETPACK
    -- Crafting
    | PIPE
-    | LONGPIPE
-    | VERYLONGPIPE
+    | TUBE
    | HARDWARE
    | SPRING
    | CAN
    | TIN
    | DRUM
+    | PLANK
+    | SHARDGLASS
+    | PUMP
+    | MOTOR
+    | PRISM
+    | MAGNET
    | TPipe
    | NoCombineType
    | TLongPipe