Cleanup

2021-12-05 12:29:01 +00:00
parent 1bb1a06101
commit d9c5cfc26d
22 changed files with 148 additions and 144 deletions
@@ -6,7 +6,6 @@ data CombineType
    = NOTDEFINED
    -- Weapons
    | BANGSTICK Int
-    | BANGROD
    | PISTOL
    | REVOLVER
    | REVOLVERX Int
@@ -20,12 +19,17 @@ data CombineType
    | GRAPESHOTCANNON
    | GRENADELAUNCHER Int -- number of chambers that can be reloaded
 --    | MORTARCONE / HANDMORTAR
-    | MINIGUN
    | BANGCANE
+    | MINIGUN
    | BANGCANEX Int
    | RIFLE
    | AUTORIFLE
    | ASSAULTRIFLE
+    | BANGROD
+    | ELEPHANTGUN
+    | AMR
+    | SNIPERRIFLE
+    | MACHINEGUN
    | AUTOGUN
    | SPREADGUN
    | MULTGUN
@@ -67,40 +71,16 @@ data CombineType
    | PRISM
    | LIGHTER
    | MAGNET
-    | TPipe
+    | PLATE
+    | MCHIP
+    | LED
+    | NAILBOX
+    | IRONBAR
+    | LIGHTSENSOR
+    | SOUNDSENSOR
+    | COPPERWIRE
+    | BATTERY
+    | FUELCELL
+    | PORTABLEFUSION
    | NoCombineType
-    | TLongPipe
-    | TVeryLongPipe
-    | TTube
-    | TPlate
-    | TMChip
-    | TMagnet
-    | TMotor
-    | TLED
-    | THardware
-    | TNailbox
-    | TPlank
-    | TPrism
-    | TIronBar
-    | TLightSensor
-    | TSoundSensor
-    | THeatSensor
-    | TCopperWire
-    | TEmptyCan
-    | TEmptyTin
-    | TPistol
-    | TAutoGun
-    | TRifle
-    | TLtAutoGun
-    | THvAutoGun
-    | THvRifle
-    | TMultGun Int
-    | TSpreadGun Int
-    | TLauncher Int
-    | TBattery
-    | TFuelCell
-    | TPortableFusion
-    | TAutoFiringMech
-    | TFiringMech
-    | TTargetingModule
  deriving (Eq,Ord,Show)