v32.1.0

.gitignore

@@ -7,3 +7,4 @@ dist/
 public/dist/
 config/test-results/
 src/js/tests
+*.Identifier

CHANGELOG.md

@@ -1,6 +1,22 @@
+# <img src="https://img.shields.io/badge/-minor%20release-cd6f68?style=for-the-badge">  **32.1.0** *(2024-10-13)*
+
+<img src="https://img.shields.io/badge/-new-green"> Added Narva (Flooded) to the map list
+
+<img src="https://img.shields.io/badge/-new-green"> Added Pacific Proving Grounds to the map list
+
+<img src="https://img.shields.io/badge/-%20fix%20-orange"> Fixed MK19 spash damage values
+
+<img src="https://img.shields.io/badge/-%20improv%20-orange"> Added a quick ping to Squad Mortar Overlay before opening websocket to it, avoid ugly error message in console when it's off (code by Devil4ngle)
+
+<img src="https://img.shields.io/badge/-%20dev%20-orange"> Splited HTML/SCSS into components 
+
+
+</br></br><!-- CHANGELOG SPLIT MARKER -->
+
+
 # <img src="https://img.shields.io/badge/-major%20release-b22222?style=for-the-badge">  **32.0.0** *(2024-10-06)*
 
-<img src="https://img.shields.io/badge/-new-green"> **New Weapon : MK19-RWS.** This vehicule mounted MK19 can actually be shot *kinda* precisely at very long range (5km!!) thanks to the degrees indicator in the HUD. It's added as "experimental weapon" for now because of some flows : At very long range the projectile tends to disapear, and the HUD angle indicator being rounded the overall precision can be meh.
+<img src="https://img.shields.io/badge/-new-green"> **New Weapon : MK19-RWS.** This vehicule mounted MK19 can actually be shot *kinda* precisely at very long range (5km!!) thanks to the degrees indicator in the HUD. It's added as "experimental weapon" for now because of some flows : At very long range the projectile tends to disapear, and the HUD angle indicator being rounded the overall precision can be meh. Thanks to [Ferrariic](https://github.com/Ferrariic) for his original idea and numerous tests (see [this discussion](https://github.com/sh4rkman/SquadCalc/pull/204))
 
 <img src="https://img.shields.io/badge/-new-green"> **New Setting : "High Quality Basemap"**, allow you to use AI Upscaled 8192px*8192px file as default basemap. Resolution and quality is actually better than the ingame map but be aware it can cause performance issues/high loading time on some browsers.
 

LICENSE

@@ -1,21 +1,11 @@
 MIT License
 
-Copyright (c) 2024 Maxime Boussard
+Copyright (c) 2024 Maxime "sharkman" Boussard
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+1. Attribution for Reuploads: If the Software is reuploaded, credit must be given to the original project and original author. This includes maintaining any existing links to the original project’s GitHub repository, which must not be removed or altered.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+2. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -39,7 +39,7 @@
    - [Advanced Information & Simulation](#advanced-informations--simulation)
    - [Advanced Customisation](#advanced-customisation)
 3. [Squad Mortar Overlay Compatibility](#squad-mortar-overlay-compatibility)
-4. [Map & Weapons Support](#map--weapons-support)
+4. [Weapons Support](#map--weapons-support)
 
 
 </br>
@@ -134,6 +134,9 @@ It allows :
 * Having ingame markers automatically merged into SquadCalc map to quickly place the right targets
 * Having an ingame overlay with the current SquadCalc calculations displayed in front of Squad
 
+### [>> Download Squad Mortar Overlay last current version here <<](https://github.com/Devil4ngle/SquadMortarOverlay/releases)
+
+</br>
 
 <div align="center">
   <picture>
@@ -143,24 +146,17 @@ It allows :
 
 
 
-</br></br>
-
-
-# <div align="center">Map & Weapons Support</div>
-
-|                                   |       **SUPPORTED WEAPONS**   |                                            |
-|-------------------------------------------------------------------|-------------------------|------------------|
-|<img height="40" src="./src/img/icons/mortar.png">                 | Mortars                 |     ✅          |
-|<img height="40" src="./src/img/icons/ub32_deployable.png">        | UB-32                   |     ✅          |
-|<img height="40" src="./src/img/icons/hellcannon_white.png">       | Hell Canon              |     ✅          |
-|<img height="40" src="./src/img/icons/technical_mortar_white.png"> | Technicals mortars      |     ✅          |
-|<img height="40" src="./src/img/icons/ub32_white.png">             | Technicals/BRDM UB-32   |     ✅          |
-|<img height="40" src="./src/img/icons/mlrs_white.png">             | BM-21 Grad              |     ✅          |
-|<img height="40" src="./src/img/icons/m113a3_white.png">           | M1064-A3 120mm          |     ✅          |
-|<img height="40" src="./src/img/icons/mk19_rws_white.png">         | MK-19 RWS (Experimental)|     ✅          |
-
+</br></br></br>
+# <div align="center">Weapons Support</div>
+</br>
 
-|     |         **SUPPORTED MAPS**            |
-|-----------------------------|---------------------|
-| ✅ | Al Basrah, Anvil, Anvil, Belaya, Black Coast, Chora, Fallujah, Fool's Road, Goose Bay, Gorodok, Gorodok, Harju, Jensen's Range, Kamdesh Highlands, Kohat Toi, Kokan, Lashkar Valley, Logar Valley, Manicouagan, Mestia, Mutaha, Narva, Sanxian Islands, Skorpo, Sumari Bala, Tallil Outskirts, Yehorivka       |
-| ❌ | Narva (flooded), Pacific Proving Grounds    |          
+|ICON |       **NAME**   | Range |
+|--------|-------|-------|
+|<img height="35" src="./src/img/icons/mortar.png">| Mortar | 1237m |
+|<img height="35" src="./src/img/icons/ub32_deployable.png">| UB-32 | 2245m |
+|<img height="35" src="./src/img/icons/hellcannon_white.png">| Hell Canon | 923m |
+|<img height="35" src="./src/img/icons/technical_mortar_white.png">| Technicals Mortars | 1237m |
+|<img height="30" src="./src/img/icons/ub32_white.png">| Technicals/BRDM UB-32 | 2245m |
+|<img height="35" src="./src/img/icons/mlrs_white.png">| BM-21 Grad | 2045m |
+|<img height="35" src="./src/img/icons/m113a3_white.png">| M1064-A3 120mm | 2062m |
+|<img height="35" src="./src/img/icons/mk19_rws_white.png">| MK-19 RWS *(Experimental)* | 5647m |  

package.json

@@ -1,6 +1,6 @@
 {
   "name": "squadcalc",
-  "version": "32.0.0",
+  "version": "32.1.0",
   "description": "A Complete Mortar Calculator for Squad",
   "author": "Maxime 'sharkman' Boussard",
   "license": "MIT",

public/locales/en/maps.json

@@ -19,6 +19,8 @@
     "Mestia": "Mestia",
     "Mutaha": "Mutaha",
     "Narva": "Narva",
+    "Narva_f": "Narva Fl.",
+    "Pacific": "Pacific Pr. Gr.",
     "Sanxian": "Sanxian",
     "Skorpo": "Skorpo",
     "Sumari": "Sumari",

public/locales/fr/maps.json

@@ -19,6 +19,8 @@
     "Mestia": "Mestia",
     "Mutaha": "Mutaha",
     "Narva": "Narva",
+    "Narva_f": "Narva Fl.",
+    "Pacific": "Pacific Pr. Gr.",
     "Sanxian": "Sanxian",
     "Skorpo": "Skorpo",
     "Sumari": "Sumari",

public/locales/ru/maps.json

@@ -19,6 +19,8 @@
     "Mestia": "Mestia",
     "Mutaha": "Mutaha",
     "Narva": "Narva",
+    "Narva_f": "Narva Fl.",
+    "Pacific": "Pacific Pr. Gr.",
     "Sanxian": "Sanxian",
     "Skorpo": "Skorpo",
     "Sumari": "Sumari",

public/locales/uk/maps.json

@@ -19,6 +19,8 @@
     "Mestia": "Mestia",
     "Mutaha": "Mutaha",
     "Narva": "Narva",
+    "Narva_f": "Narva Fl.",
+    "Pacific": "Pacific Pr. Gr.",
     "Sanxian": "Sanxian",
     "Skorpo": "Skorpo",
     "Sumari": "Sumari",

public/locales/zh/maps.json

@@ -19,6 +19,8 @@
     "Mestia": "梅斯蒂亚",
     "Mutaha": "穆塔哈",
     "Narva": "纳尔瓦",
+    "Narva_f": "纳尔瓦 被淹没",
+    "Pacific": "太平洋试验场",
     "Sanxian": "三仙岛",
     "Skorpo": "斯科普",
     "Sumari": "苏马瑞",

src/components/header/header.scss

@@ -37,7 +37,7 @@
         padding-top: 1em;
         z-index: 5;
         .select2-results__options {
-            line-height: 1.1em;
+            line-height: 0.7em;
             font-size: 0.9em;
         }
         &.ui {

src/components/shared/_responsive.scss

@@ -27,7 +27,7 @@
     header {
         #mapSelector {
             .select2-results__options {
-                line-height: 1em;
+                line-height: 0.85em;
                 max-height: 570px;
             }
         }

src/js/data/maps.js

@@ -139,13 +139,20 @@ export const MAPS = [
         mapURL: "/narva/",
         maxZoomLevel: 4,
     },
-    /*{ 
-        name: "Narva (f)", 
+    { 
+        name: "Narva_f", 
         size: 2800, // OK
         scaling: 0.0583, 
-        mapURL: "/narva-flooded/{z}_{x}_{y}.webp",
+        mapURL: "/narva-flooded/",
+        maxZoomLevel: 4,
+    },
+    { 
+        name: "Pacific", 
+        size: 4032, // OK
+        scaling: 0.25852400000000003, 
+        mapURL: "/pacific/",
         maxZoomLevel: 4,
-    }, */
+    },
     { 
         name: "Sanxian",
         size: 4600, 

src/js/data/weapons.js

@@ -197,8 +197,8 @@ export var WEAPONS = [
         minDistance: 10,
         moa: 50,
         explosionDamage: 115,
-        explosionRadius: [5, 18],
-        explosionDistanceFromImpact: 0.2,
+        explosionRadius: [1, 15],
+        explosionDistanceFromImpact: 0.08,
         damageFallOff: 1,
     }
 ];

src/js/tests/mapdata.js

@@ -577,6 +577,24 @@ const MAPDATA = [
       },
 
     },
+    {
+      name: "Pacific Prooving Grounds",
+      url: "/maps/Pacific/{z}_{x}_{y}.jpg",
+      heightmap: {
+        url: "/heightmaps/Pacific.jpg",
+        tile: "/heightmaps/Pacific/{z}_{x}_{y}.jpg",
+      },
+      extra: {
+        scale: [1, 1, 0.28],
+        levels: [410, 9643],
+        minimap: [
+          [-2016, -2016],
+          [2016, 2016],
+        ],
+        hDim: [4033, 4033],
+        lOrigin: [-2016, -2016],
+      },
+    },
     {
       name: "Skorpo",
       url: "/maps/skorpo/{z}_{x}_{y}.jpg",