Separate small and large oil rig notification settings

alexemanuelol · Jun 28, 2024 · fbc15b8 · fbc15b8
1 parent a9d885a
commit fbc15b8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/docs/full_list_features.md b/docs/full_list_features.md
@@ -85,7 +85,7 @@
 > Receive notifications for In-Game Events such as:
 - **Cargo Ship** - When it spawns, despawns, how long before it enters egress stage. How long time since it was last out. step-trace.
 - **Patrol Helicopter** - When it spawns, despawns or gets taken down. How long time since it was last out and how long since it was taken down. step-trace.
-- **Oil Rig** - When Oil Rig calls in Heavy Scientists and how long till the Locked Crate unlocks.
+- **Oil Rigs** - When Heavy Scientists are called at each, and how long until the Locked Crates unlock.
 - **Chinook 47** - When it enters map and when it leaves.
 - **Vending Machines** - Whenever a new Vending Machine appears on the map.
 

diff --git a/src/languages/en.json b/src/languages/en.json
@@ -387,9 +387,10 @@
     "hbhfSensor": "HBHF Sensor",
     "heart": "Heart",
     "heater": "Heater",
-    "heavyScientistCalledSetting": "When Heavy Scientists are called to Oil Rig, send a notification.",
     "heavyScientistsCalledLarge": "Heavy Scientists got called to the Large Oil Rig at {location}.",
+    "heavyScientistsCalledLargeSetting": "When Heavy Scientists are called to the Large Oil Rig, send a notification.",
     "heavyScientistsCalledSmall": "Heavy Scientists got called to the Small Oil Rig at {location}.",
+    "heavyScientistsCalledSmallSetting": "When Heavy Scientists are called to the Small Oil Rig, send a notification.",
     "hideTrademark": "Hide trademark.",
     "hoster": "Hoster",
     "hp": "HP",
@@ -444,8 +445,9 @@
     "linkCap": "LINK",
     "location": "Location",
     "lockedCrateLargeOilRigUnlocked": "Locked Crate at Large Oil Rig at {location} has been unlocked.",
-    "lockedCrateOilRigUnlockedSetting": "When a Locked Crate at Oil Rig is unlocked, send a notification.",
+    "lockedCrateLargeOilRigUnlockedSetting": "When a Locked Crate at Large Oil Rig is unlocked, send a notification.",
     "lockedCrateSmallOilRigUnlocked": "Locked Crate at Small Oil Rig at {location} has been unlocked.",
+    "lockedCrateSmallOilRigUnlockedSetting": "When a Locked Crate at Small Oil Rig is unlocked, send a notification.",
     "logDiscordCommand": "Discord Command - Guild: {guild}, Channel: {channel}, User: {user}, Message: {message}.",
     "logDiscordMessage": "Discord Message - Guild: {guild}, Channel: {channel}, User: {user}, Message: {message}.",
     "logInGameCommand": "{type} - Command: {command}, User: {user}.",

diff --git a/src/structures/MapMarkers.js b/src/structures/MapMarkers.js
@@ -362,7 +362,7 @@ class MapMarkers {
                         marker.ch47Type = 'smallOilRig';
 
                         this.rustplus.sendEvent(
-                            this.rustplus.notificationSettings.heavyScientistCalledSetting,
+                            this.rustplus.notificationSettings.heavyScientistsCalledSmallSetting,
                             this.client.intlGet(this.rustplus.guildId, 'heavyScientistsCalledSmall',
                                 { location: oilRigLocation.location }),
                             'small',
@@ -397,7 +397,7 @@ class MapMarkers {
                         marker.ch47Type = 'largeOilRig';
 
                         this.rustplus.sendEvent(
-                            this.rustplus.notificationSettings.heavyScientistCalledSetting,
+                            this.rustplus.notificationSettings.heavyScientistsCalledLargeSetting,
                             this.client.intlGet(this.rustplus.guildId, 'heavyScientistsCalledLarge',
                                 { location: oilRigLocation.location }),
                             'large',
@@ -688,7 +688,7 @@ class MapMarkers {
         let oilRigLocation = args[0];
 
         this.rustplus.sendEvent(
-            this.rustplus.notificationSettings.lockedCrateOilRigUnlockedSetting,
+            this.rustplus.notificationSettings.lockedCrateSmallOilRigUnlockedSetting,
             this.client.intlGet(this.rustplus.guildId, 'lockedCrateSmallOilRigUnlocked', {
                 location: oilRigLocation
             }),
@@ -706,7 +706,7 @@ class MapMarkers {
         let oilRigLocation = args[0];
 
         this.rustplus.sendEvent(
-            this.rustplus.notificationSettings.lockedCrateOilRigUnlockedSetting,
+            this.rustplus.notificationSettings.lockedCrateLargeOilRigUnlockedSetting,
             this.client.intlGet(this.rustplus.guildId, 'lockedCrateLargeOilRigUnlocked', {
                 location: oilRigLocation
             }),

diff --git a/src/templates/notificationSettingsTemplate.json b/src/templates/notificationSettingsTemplate.json
@@ -35,14 +35,26 @@
         "inGame": false,
         "voice": true
     },
-    "lockedCrateOilRigUnlockedSetting": {
-        "image": "locked_crate_logo.png",
+    "heavyScientistsCalledSmallSetting": {
+        "image": "small_oil_rig_logo.png",
         "discord": true,
         "inGame": false,
         "voice": true
     },
-    "heavyScientistCalledSetting": {
-        "image": "oil_rig_logo.png",
+    "lockedCrateSmallOilRigUnlockedSetting": {
+        "image": "locked_crate_small_oil_rig_logo.png",
+        "discord": true,
+        "inGame": false,
+        "voice": true
+    },
+    "heavyScientistsCalledLargeSetting": {
+        "image": "large_oil_rig_logo.png",
+        "discord": true,
+        "inGame": false,
+        "voice": true
+    },
+    "lockedCrateLargeOilRigUnlockedSetting": {
+        "image": "locked_crate_large_oil_rig_logo.png",
         "discord": true,
         "inGame": false,
         "voice": true