Added super weapons

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
-data/
+data/
+.vscode/

app.js

@@ -1,30 +1,45 @@
+const express = require('express');
 const warapi = require('./warapi.js');
 
-const express = require('express');
 const app = express();
 
 app.use('/map', express.static('public'));
-
-app.get('/map/api/dynamic', function(request, response) {
-    response.sendFile(__dirname + '/data/dynamic.json');
+app.get('/map', (request, response) => {
+    response.sendFile(__dirname + '/views/index.html');
 });
 
-app.get('/map/api/static', function(request, response) {
-    response.sendFile(__dirname + '/data/static.json');
+// Shard 1
+app.get('/map/api/live-1/war', (request, response) => {
+    response.sendFile(__dirname + '/data/live-1/war.json');
 });
-
-app.get('/map/api/activemaps', function(request, response) {
-    response.sendFile(__dirname + '/data/activemaps.json');
+app.get('/map/api/live-1/regions', (request, response) => {
+    response.sendFile(__dirname + '/data/live-1/regions.json');
+});
+app.get('/map/api/live-1/dynamic', (request, response) => {
+    response.sendFile(__dirname + '/data/live-1/dynamic.json');
+});
+app.get('/map/api/live-1/static', (request, response) => {
+    response.sendFile(__dirname + '/data/live-1/static.json');
 });
 
-app.get('/map', function(request, response) {
-    response.sendFile(__dirname + '/views/index.html');
+// Shard 2
+app.get('/map/api/live-2/war', (request, response) => {
+    response.sendFile(__dirname + '/data/live-2/war.json');
+});
+app.get('/map/api/live-2/regions', (request, response) => {
+    response.sendFile(__dirname + '/data/live-2/regions.json');
+});
+app.get('/map/api/live-2/dynamic', (request, response) => {
+    response.sendFile(__dirname + '/data/live-2/dynamic.json');
+});
+app.get('/map/api/live-2/static', (request, response) => {
+    response.sendFile(__dirname + '/data/live-2/static.json');
 });
 
 const port = 3002;
 app.listen(port, () => {
-    console.log(`App listening at http://localhost:${port}`)
-});
+    console.log(`App listening at ${port}`);
 
-warapi.updateWarData();
-setInterval(warapi.updateWarData, 60000);
+    warapi.updateWarData();
+    setInterval(warapi.updateWarData, 60000);
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "foxhole-war-map",
-  "version": "4.0.0",
+  "version": "4.3.0",
   "description": "",
   "main": "app.js",
   "scripts": {

public/js/Map.js

@@ -22,7 +22,7 @@ const map = L.map("map", {
         mapLayers.RegionNames,
         mapLayers.RegionBorders,
 
-        mapLayers.StaticBases,
+        mapLayers.TownBases,
         mapLayers.RelicBases,
         mapLayers.Keeps,
         mapLayers.Safehouses,
@@ -39,7 +39,7 @@ const map = L.map("map", {
         mapLayers.Shipyards,
         mapLayers.ConstructionYards,
         mapLayers.MassProductionFactories,
-        mapLayers.SeaPorts,
+        mapLayers.Seaports,
         mapLayers.EngineeringCenters,
 
         mapLayers.SalvageFields,
@@ -50,6 +50,9 @@ const map = L.map("map", {
         mapLayers.ComponentMines,
         mapLayers.SulfurMines,
         mapLayers.OilWells,
+
+        mapLayers.StormCannons,
+        mapLayers.IntelCenters,
     ]
 });
 

public/js/MapIcons.js

@@ -6,22 +6,22 @@ const MapIcon = L.Icon.extend({
     }
 });
 
-export const StaticBase1 = [
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase1.png"}),
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase1Colonial.png"}),
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase1Warden.png"})
+export const TownBase1 = [
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier1.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier1Colonial.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier1Warden.png"})
 ]
 
-export const StaticBase2 = [
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase2.png"}),
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase2Colonial.png"}),
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase2Warden.png"})
+export const TownBase2 = [
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier2.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier2Colonial.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier2Warden.png"})
 ]
 
-export const StaticBase3 = [
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase3.png"}),
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase3Colonial.png"}),
-    new MapIcon({iconUrl: "./icons/MapIconStaticBase3Warden.png"})
+export const TownBase3 = [
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier3.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier3Colonial.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconTownBaseTier3Warden.png"})
 ]
 
 export const Safehouse = [
@@ -60,6 +60,18 @@ export const CoastalGun = [
     new MapIcon({iconUrl: "./icons/MapIconCoastalGunWarden.png"})
 ]
 
+export const StormCannon = [
+    new MapIcon({iconUrl: "./icons/MapIconStormCannon.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconStormCannonColonial.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconStormCannonWarden.png"})
+]
+
+export const IntelCenter = [
+    new MapIcon({iconUrl: "./icons/MapIconIntelCenter.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconIntelCenterColonial.png"}),
+    new MapIcon({iconUrl: "./icons/MapIconIntelCenterWarden.png"})
+]
+
 export const Armory = [
     new MapIcon({iconUrl: "./icons/MapIconArmory.png"}),
     new MapIcon({iconUrl: "./icons/MapIconArmoryColonial.png"}),

public/js/MapItem.js

@@ -1,11 +1,14 @@
 import * as MapIcon from './MapIcons.js';
 import * as MapData from './MapRegions.js';
-import { mapLayers } from "./MapLayers.js";
+import { mapLayers } from './MapLayers.js';
+import { regions } from './MapRegions.js';
 
 export default class MapItem{
     constructor(regionId, teamId, iconType, x, y, flags) {
         this.regionId = regionId;
-        this.regionName = MapData.regions[regionId-3].name;
+
+        const region = regions.find(x => x.id === regionId);
+        this.regionName = region.name;
         this.iconType = iconType;
         this.x = x;
         this.y = y;
@@ -31,6 +34,7 @@ export default class MapItem{
         }
 
         switch(iconType) {
+            /*
             case 5:
                 this.description = 'Town Hall (Tier 1)';
                 this.iconImage = MapIcon.StaticBase1[this.teamId];
@@ -49,6 +53,7 @@ export default class MapItem{
                 this.layer = mapLayers.StaticBases;
                 this.pane = 'basesPane';
                 break;
+            */
             case 11:
                 this.description = 'Hospital';
                 this.iconImage = MapIcon.Hospital[this.teamId];
@@ -201,7 +206,7 @@ export default class MapItem{
             case 52:
                 this.description = 'Seaport';
                 this.iconImage = MapIcon.Seaport[this.teamId];
-                this.layer = mapLayers.SeaPorts;
+                this.layer = mapLayers.Seaports;
                 this.pane = 'structuresPane';
                 break;
             case 53:
@@ -210,6 +215,36 @@ export default class MapItem{
                 this.layer = mapLayers.CoastalGuns;
                 this.pane = 'structuresPane';
             break;
+            case 56:
+                this.description = 'Town Base (Tier 1)';
+                this.iconImage = MapIcon.TownBase1[this.teamId];
+                this.layer = mapLayers.TownBases;
+                this.pane = 'basesPane';
+                break;
+            case 57:
+                this.description = 'Town Base (Tier 2)';
+                this.iconImage = MapIcon.TownBase2[this.teamId];
+                this.layer = mapLayers.TownBases;
+                this.pane = 'basesPane';
+                break;
+            case 58:
+                this.description = 'Town Base (Tier 3)';
+                this.iconImage = MapIcon.TownBase3[this.teamId];
+                this.layer = mapLayers.TownBases;
+                this.pane = 'basesPane';
+                break;
+            case 59:
+                this.description = 'Storm Cannon';
+                this.iconImage = MapIcon.StormCannon[this.teamId];
+                this.layer = mapLayers.StormCannons;
+                this.pane = 'structuresPane';
+                break;
+            case 60:
+                this.description = 'Intel Center';
+                this.iconImage = MapIcon.IntelCenter[this.teamId];
+                this.layer = mapLayers.IntelCenters;
+                this.pane = 'structuresPane';
+                break;
             default:
                 console.log('Unknown IconType - ' + iconType);
         }