Mapper, ARHUD, radar sweeps update. Add dropper items

src/Dodge/Data/ComposedItem.hs

@@ -26,7 +26,7 @@ data ComposeLinkType
     | RemoteScreenLink
     | RemoteDetonatorLink
     | SmokeReducerLink
-    | AugmentedHUDLink
+--    | AugmentedHUDLink
     | FunctionChangeLink
     | MakeAutoLink
     | ProjectileStabiliserLink
@@ -47,7 +47,7 @@ data ItemStructuralFunction
     | WeaponTargetingSF
     | IntroScanSF
     | TriggerSF
-    | AugmentedHUDSF
+    | ARHUDSF
     | AmmoMagSF AmmoType
     | RemoteScreenSF
     | JoystickSF

src/Dodge/Data/Item/Combine.hs

@@ -23,8 +23,16 @@ data ItemType
     | STICKYMOD
     | ITEMSCAN
     | MAPPER
+    | DROPPER InventoryPathing
     | INTROSCAN {_ibtIntroScanType :: IntroScanType}
     | DETECTOR {_ibtDetector :: Detector}
+    | ARHUD
+    deriving (Eq, Ord, Show, Read)
+
+data InventoryPathing
+    = ABSOLUTE
+    | RELCURS
+    | RELITEM
     deriving (Eq, Ord, Show, Read)
 
 data IntroScanType
@@ -85,7 +93,6 @@ data AttachType
     | REMOTEDETONATOR
     | SMOKEREDUCER
     | HOMINGMODULE
-    | AUGMENTEDHUD
     | SHELLPAYLOAD {_shellPayload :: Payload}
     deriving (Eq, Ord, Show, Read)
 
@@ -175,6 +182,7 @@ data Detector
 makeLenses ''ItemType
 makeLenses ''HeldItemType
 makeLenses ''AttachType
+deriveJSON defaultOptions ''InventoryPathing
 deriveJSON defaultOptions ''IntroScanType
 deriveJSON defaultOptions ''CraftType
 deriveJSON defaultOptions ''ConsumableItemType

src/Dodge/Data/Item/Use.hs

@@ -41,6 +41,7 @@ data ItemUse
         }
     | UseEquip {_uequipEffect :: EquipEffect}
     | UseAttach {_uaParams :: AttachParams}
+    | UseInt {_uInt :: Int}
     | UseNothing
     | UseScope {_uScope :: Scope}
     | UseBulletMod {_ubMod :: BulletMod}
@@ -223,8 +224,6 @@ deriveJSON defaultOptions ''HeldParams
 deriveJSON defaultOptions ''AmmoPerShot
 deriveJSON defaultOptions ''Muzzle
 deriveJSON defaultOptions ''AimStance
-
---deriveJSON defaultOptions ''ScrollAttachParams
 deriveJSON defaultOptions ''AttachParams
 deriveJSON defaultOptions ''ItZoom
 deriveJSON defaultOptions ''AimParams

src/Dodge/Data/RadarSweep.hs

@@ -22,6 +22,8 @@ data RadarSweep = RadarSweep
     , _rsObject :: ObjectType
     , _rsTimer :: Int
     , _rsMapper :: Maybe (NewInt ItmInt)
+    , _rsAR :: Maybe (NewInt ItmInt)
+    , _rsSource :: NewInt ItmInt
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)