Skip to content

Commit d0cf3ab

Browse files
committed
Add event dates variables
1 parent ac27a5c commit d0cf3ab

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

src/structures/rustPlusMapMarkers.ts

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,13 @@ export class RustPlusMapMarkers {
104104
public cargoShipUndockingNotificationTimeoutIds: { [cargoShip: number]: NodeJS.Timeout };
105105
public travellingVendorLeavingNotificationTimeoutIds: { [travellingVendor: number]: NodeJS.Timeout };
106106

107-
public timeSinceSmallOilRigWasTriggered: Date | null;
108-
public timeSinceLargeOilRigWasTriggered: Date | null;
107+
public dateSmallOilRigWasTriggered: Date | null;
108+
public dateLargeOilRigWasTriggered: Date | null;
109+
public dateCh47LeftMap: Date | null;
110+
public dateCargoShipLeftMap: Date | null;
111+
public datePatrolHelicopterLeftMap: Date | null;
112+
public datePatrolHelicopterDestroyed: Date | null;
113+
public dateTravellingVendorLeftMap: Date | null;
109114

110115
public knownVendingMachines: Point[];
111116
public oilRigCh47s: number[];
@@ -142,8 +147,13 @@ export class RustPlusMapMarkers {
142147
this.travellingVendorLeavingNotificationTimeoutIds = {};
143148

144149
/* Event dates */
145-
this.timeSinceSmallOilRigWasTriggered = null;
146-
this.timeSinceLargeOilRigWasTriggered = null;
150+
this.dateSmallOilRigWasTriggered = null;
151+
this.dateLargeOilRigWasTriggered = null;
152+
this.dateCh47LeftMap = null;
153+
this.dateCargoShipLeftMap = null;
154+
this.datePatrolHelicopterLeftMap = null;
155+
this.datePatrolHelicopterDestroyed = null;
156+
this.dateTravellingVendorLeftMap = null;
147157

148158
this.knownVendingMachines = [];
149159
this.oilRigCh47s = [];
@@ -296,8 +306,8 @@ export class RustPlusMapMarkers {
296306
);
297307

298308
const now = new Date()
299-
this.timeSinceSmallOilRigWasTriggered = smallOilRig ? now : this.timeSinceSmallOilRigWasTriggered;
300-
this.timeSinceLargeOilRigWasTriggered = largeOilRig ? now : this.timeSinceLargeOilRigWasTriggered;
309+
this.dateSmallOilRigWasTriggered = smallOilRig ? now : this.dateSmallOilRigWasTriggered;
310+
this.dateLargeOilRigWasTriggered = largeOilRig ? now : this.dateLargeOilRigWasTriggered;
301311
}
302312
}
303313
else {
@@ -331,6 +341,7 @@ export class RustPlusMapMarkers {
331341
this.rpInstance.sendEventNotification('ch47Despawned', eventText);
332342
}
333343

344+
this.dateCh47LeftMap = new Date();
334345
this.ch47LockedCrateNotified = this.ch47LockedCrateNotified.filter(e => e !== marker.id);
335346
this.ch47s = this.ch47s.filter(e => e.id !== marker.id);
336347
}
@@ -463,6 +474,7 @@ export class RustPlusMapMarkers {
463474
delete this.cargoShipUndockingNotificationTimeoutIds[marker.id];
464475
}
465476

477+
this.dateCargoShipLeftMap = new Date();
466478
delete this.cargoShipMetaData[marker.id];
467479
this.cargoShips = this.cargoShips.filter(e => e.id !== marker.id);
468480
}
@@ -706,6 +718,9 @@ export class RustPlusMapMarkers {
706718
this.rpInstance.sendEventNotification(settingsKey as keyof EventNotificationSettings, eventText);
707719
}
708720

721+
const now = new Date()
722+
this.datePatrolHelicopterLeftMap = now;
723+
this.datePatrolHelicopterDestroyed = !isOutside ? now : this.datePatrolHelicopterDestroyed;
709724
delete this.patrolHelicopterMetaData[marker.id];
710725
this.patrolHelicopters = this.patrolHelicopters.filter(e => e.id !== marker.id);
711726
}
@@ -794,6 +809,7 @@ export class RustPlusMapMarkers {
794809
delete this.travellingVendorLeavingNotificationTimeoutIds[marker.id];
795810
}
796811

812+
this.dateTravellingVendorLeftMap = new Date();
797813
this.travellingVendors = this.travellingVendors.filter(e => e.id !== marker.id);
798814
}
799815

0 commit comments

Comments
 (0)