Add chinook 47 related events (locked crate, oil rig etc...)

Author: alexemanuelol

src/languages/en.json

@@ -115,8 +115,8 @@
     "eventNotificationSetting-cargoShipUndocking": "Cargo Ship Undocking",
     "eventNotificationSetting-ch47Despawned": "Chinook (CH47) Despawned",
     "eventNotificationSetting-ch47Destroyed": "Chinook (CH47) Destroyed",
-    "eventNotificationSetting-ch47DroppedLockedCrate": "Locked Crate Dropped",
     "eventNotificationSetting-ch47HeavyScientistsCalled": "Heavy Scientists Called to Oil Rig",
+    "eventNotificationSetting-ch47MaybeDroppedLockedCrate": "Chinook (CH47) dropped locked crate.",
     "eventNotificationSetting-ch47OilRigLockedCrateUnlocked": "Locked Crate Unlocked at Oil Rig",
     "eventNotificationSetting-ch47Spawned": "Chinook (CH-47) Spawned",
     "eventNotificationSetting-patrolHelicopterDespawned": "Patrol Helicopter Despawned",
@@ -146,6 +146,14 @@
     "hbhfSensor": "HBHF Sensor",
     "heater": "Heater",
     "id": "ID",
+    "inGameEvent-ch47Despawned": "Chinook 47 left the map at {location}.",
+    "inGameEvent-ch47Despawned-destroyed": "Chinook 47 got destroyed at {location}.",
+    "inGameEvent-ch47HeavyScientistsCalled": "Heavy Scientists got called to the {rig} at {location}.",
+    "inGameEvent-ch47MaybeDroppedLockedCrate": "Chinook 47 is considering dropped locked crate at {monument} ({grid}).",
+    "inGameEvent-ch47OilRigLockedCrateUnlocked": "Locked Crate at {rig} at {location} has been unlocked.",
+    "inGameEvent-ch47Spawned": "Chinook 47 spawned at {location}.",
+    "inGameEvent-ch47Spawned-enters": "Chinook 47 enters the map from {location} to drop off a Locked Crate.",
+    "inGameEvent-ch47Spawned-located": "Chinook 47 is located at {location}.",
     "inGameEvent-vendingMachineSpawned": "A new Vending Machine located at {location}.",
     "inGameTime": "In-Game time: {time}.",
     "issuedAt": "Issued: {time}",

src/managers/fcmListenerManager.ts

@@ -463,7 +463,9 @@ async function pairingServer(flm: FcmListenerManager, steamId: types.SteamId, bo
             storageMonitorConfigMap: serverInfo ? serverInfo.storageMonitorConfigMap : {},
             smartSwitchGroupConfigMap: serverInfo ? serverInfo.smartSwitchGroupConfigMap : {},
             dayDurationSeconds: serverInfo ? serverInfo.dayDurationSeconds : null,
-            nightDurationSeconds: serverInfo ? serverInfo.nightDurationSeconds : null
+            nightDurationSeconds: serverInfo ? serverInfo.nightDurationSeconds : null,
+            oilRigLockedCrateUnlockTimeMs: serverInfo ? serverInfo.oilRigLockedCrateUnlockTimeMs :
+                constants.DEFAULT_OIL_RIG_LOCKED_CRATE_UNLOCK_TIME_MS
         };
 
         updatePairingDetails(gInstance.pairingDataMap, serverId, steamId, body);

src/managers/guildInstanceManager.ts

@@ -150,7 +150,7 @@ export interface EventNotificationSettings {
     ch47Spawned: EventNotificationSetting;
     ch47Despawned: EventNotificationSetting;
     ch47Destroyed: EventNotificationSetting;
-    ch47DroppedLockedCrate: EventNotificationSetting;
+    ch47MaybeDroppedLockedCrate: EventNotificationSetting;
     ch47HeavyScientistsCalled: EventNotificationSetting;
     ch47OilRigLockedCrateUnlocked: EventNotificationSetting;
     cargoShipSpawned: EventNotificationSetting;
@@ -200,7 +200,7 @@ export interface SettingsMessages {
     ch47Spawned: types.MessageId | null;
     ch47Despawned: types.MessageId | null;
     ch47Destroyed: types.MessageId | null;
-    ch47DroppedLockedCrate: types.MessageId | null;
+    ch47MaybeDroppedLockedCrate: types.MessageId | null;
     ch47HeavyScientistsCalled: types.MessageId | null;
     ch47OilRigLockedCrateUnlocked: types.MessageId | null;
     cargoShipSpawned: types.MessageId | null;
@@ -284,6 +284,7 @@ export interface ServerInfo {
     smartSwitchGroupConfigMap: SmartSwitchGroupConfigMap;
     dayDurationSeconds: number | null;
     nightDurationSeconds: number | null;
+    oilRigLockedCrateUnlockTimeMs: number;
 }
 
 export interface SmartSwitchConfig {
@@ -602,7 +603,7 @@ export class GuildInstanceManager {
                 ch47Spawned: null,
                 ch47Despawned: null,
                 ch47Destroyed: null,
-                ch47DroppedLockedCrate: null,
+                ch47MaybeDroppedLockedCrate: null,
                 ch47HeavyScientistsCalled: null,
                 ch47OilRigLockedCrateUnlocked: null,
                 cargoShipSpawned: null,
@@ -1060,7 +1061,7 @@ export function isValidEventNotificationSettings(object: unknown): object is Eve
         'ch47Spawned',
         'ch47Despawned',
         'ch47Destroyed',
-        'ch47DroppedLockedCrate',
+        'ch47MaybeDroppedLockedCrate',
         'ch47HeavyScientistsCalled',
         'ch47OilRigLockedCrateUnlocked',
         'cargoShipSpawned',
@@ -1088,7 +1089,7 @@ export function isValidEventNotificationSettings(object: unknown): object is Eve
     errors.push(vu.validateInterface('ch47Spawned', obj.ch47Spawned, isValidEventNotificationSetting));
     errors.push(vu.validateInterface('ch47Despawned', obj.ch47Despawned, isValidEventNotificationSetting));
     errors.push(vu.validateInterface('ch47Destroyed', obj.ch47Destroyed, isValidEventNotificationSetting));
-    errors.push(vu.validateInterface('ch47DroppedLockedCrate', obj.ch47DroppedLockedCrate,
+    errors.push(vu.validateInterface('ch47MaybeDroppedLockedCrate', obj.ch47MaybeDroppedLockedCrate,
         isValidEventNotificationSetting));
     errors.push(vu.validateInterface('ch47HeavyScientistsCalled', obj.ch47HeavyScientistsCalled,
         isValidEventNotificationSetting));
@@ -1198,7 +1199,7 @@ export function isValidSettingsMessages(object: unknown): object is SettingsMess
         'ch47Spawned',
         'ch47Despawned',
         'ch47Destroyed',
-        'ch47DroppedLockedCrate',
+        'ch47MaybeDroppedLockedCrate',
         'ch47HeavyScientistsCalled',
         'ch47OilRigLockedCrateUnlocked',
         'cargoShipSpawned',
@@ -1243,7 +1244,7 @@ export function isValidSettingsMessages(object: unknown): object is SettingsMess
     errors.push(vu.validateType('ch47Spawned', obj.ch47Spawned, 'string', null));
     errors.push(vu.validateType('ch47Despawned', obj.ch47Despawned, 'string', null));
     errors.push(vu.validateType('ch47Destroyed', obj.ch47Destroyed, 'string', null));
-    errors.push(vu.validateType('ch47DroppedLockedCrate', obj.ch47DroppedLockedCrate, 'string', null));
+    errors.push(vu.validateType('ch47MaybeDroppedLockedCrate', obj.ch47MaybeDroppedLockedCrate, 'string', null));
     errors.push(vu.validateType('ch47HeavyScientistsCalled', obj.ch47HeavyScientistsCalled, 'string', null));
     errors.push(vu.validateType('ch47OilRigLockedCrateUnlocked', obj.ch47OilRigLockedCrateUnlocked, 'string', null));
     errors.push(vu.validateType('cargoShipSpawned', obj.cargoShipSpawned, 'string', null));
@@ -1473,7 +1474,8 @@ export function isValidServerInfo(object: unknown): object is ServerInfo {
         'storageMonitorConfigMap',
         'smartSwitchGroupConfigMap',
         'dayDurationSeconds',
-        'nightDurationSeconds'
+        'nightDurationSeconds',
+        'oilRigLockedCrateUnlockTimeMs'
     ];
 
     const errors: (vu.ValidationError | null)[] = [];
@@ -1500,6 +1502,7 @@ export function isValidServerInfo(object: unknown): object is ServerInfo {
         isValidSmartSwitchGroupConfig));
     errors.push(vu.validateType('dayDurationSeconds', obj.dayDurationSeconds, 'number', null));
     errors.push(vu.validateType('nightDurationSeconds', obj.nightDurationSeconds, 'number', null));
+    errors.push(vu.validateType('oilRigLockedCrateUnlockTimeMs', obj.oilRigLockedCrateUnlockTimeMs, 'number'));
 
     const filteredErrors = errors.filter((error): error is vu.ValidationError => error !== null);
 

src/structures/rustPlusMap.ts

@@ -25,19 +25,30 @@ import * as path from 'path';
 
 import { guildInstanceManager as gim, localeManager as lm } from '../../index';
 import { RustPlusInstance } from '../managers/rustPlusManager';
-import { getGridPos, getMonumentsInfo } from '../utils/map';
+import { getGridPos, getMonumentsInfo, getDistance } from '../utils/map';
 import * as constants from '../utils/constants';
 import { GuildInstance } from '../managers/guildInstanceManager';
 
+export interface Point {
+    x: number;
+    y: number;
+}
+
 export class RustPlusMap {
     public rpInstance: RustPlusInstance;
     public appMap: rp.AppMap;
 
+    public invalidClosestMonuments: string[];
+
     private static fontsRegistered = false;
 
     constructor(rpInstance: RustPlusInstance, appMap: rp.AppMap) {
         this.rpInstance = rpInstance;
         this.appMap = appMap;
+
+        this.invalidClosestMonuments = [
+            'DungeonBase', 'train_tunnel_display_name', 'train_tunnel_link_display_name'
+        ];
     }
 
     public updateMap(appMap: rp.AppMap) {
@@ -208,4 +219,20 @@ export class RustPlusMap {
     private async drawMarkers(ctx: SKRSContext2D) {
         // TODO! TBD
     }
+
+    public getMonumentPointIfInside(point: Point, monumentName: string, radius: number): Point | null {
+        const monument = this.appMap.monuments.find(e => monumentName === e.token &&
+            getDistance(point.x, point.y, e.x, e.y) <= radius);
+
+        return monument ? { x: monument.x, y: monument.y } : null;
+    }
+
+    public getClosestMonument(point: Point): rp.AppMap_Monument {
+        const validMonuments = this.appMap.monuments.filter(e => !this.invalidClosestMonuments.includes(e.token));
+        return validMonuments.reduce((closest, monument) => {
+            const currentDistance = getDistance(point.x, point.y, monument.x, monument.y);
+            const closestDistance = getDistance(point.x, point.y, closest.x, closest.y);
+            return currentDistance < closestDistance ? monument : closest;
+        });
+    }
 }