Merge pull request #337 from the-hideout/artillery

Add artillery zones to maps
the-hideout · Oct 10, 2024 · b5d9e03 · b5d9e03
2 parents 3af46ae + 09fd307
commit b5d9e03
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/resolvers/traderResolver.mjs b/resolvers/traderResolver.mjs
@@ -47,8 +47,10 @@ export default {
             return context.data.worker.item.getItem(context, info, data.currencyItem);
         },
         taskUnlock(data, args, context, info) {
-            if (data.vendor.taskUnlock) return context.data.worker.task.get(context, info, data.vendor.taskUnlock);
-            return null;
+            if (!data.vendor.taskUnlock) {
+                return null;
+            }
+            return context.data.worker.task.get(context, info, data.vendor.taskUnlock);
         },
         buyLimit(data) {
             return data.vendor.buyLimit;
@@ -60,14 +62,17 @@ export default {
             return context.data.worker.trader.getLocale(trader.name, context, info);
         },
         async normalizedName(data, args, context, info) {
-            return (await context.data.worker.trader.get(context, info, data.trader_id)).normalizedName;
+            const trader = await context.data.worker.trader.get(context, info, data.trader_id);
+            return trader.normalizedName;
         },
         trader(data, args, context, info) {
             return context.data.worker.trader.get(context, info, data.trader_id);
         },
         taskUnlock(data, args, context, info) {
-            if (data.taskUnlock) return context.data.worker.task.get(context, info, data.taskUnlock);
-            return null;
+            if (!data.taskUnlock) {
+                return null;
+            }
+            return context.data.worker.task.get(context, info, data.taskUnlock);
         },
     },
     TraderPrice: {

diff --git a/schema-static.mjs b/schema-static.mjs
@@ -768,9 +768,22 @@ type Map {
   hazards: [MapHazard]
   lootContainers: [LootContainerPosition]
   stationaryWeapons: [StationaryWeaponPosition]
+  artillery: MapArtillerySettings
   #svg: MapSvg
 }
 
+type MapArtillerySettings {
+  zones: [MapArtilleryZone]
+}
+
+type MapArtilleryZone {
+  position: MapPosition
+  outline: [MapPosition]
+  top: Float
+  bottom: Float
+  radius: Float @deprecated(reason: "Use outline instead.")
+}
+
 type MapExtract {
   id: ID!
   name: String