M1064-A3

sh4rkman · Jun 12, 2024 · e320e4a · e320e4a
1 parent d8074b1
commit e320e4a
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+
+
+
+
+# <img src="https://img.shields.io/badge/-major%20release-blue?style=flat-square">  **25.0** *(2024-06-12)*
+
+<img src="https://img.shields.io/badge/-new-green"> Added M1064-A3 120mm
+
+
+</br></br><!-- CHANGELOG SPLIT MARKER -->
+
 # <img src="https://img.shields.io/badge/-minor%20release-%2337b6ff">  **24.1.0** *(2024-05-25)*
 
 <img src="https://img.shields.io/badge/-new-green"> Now displaying a weapon number next to calcs when using several weapons

diff --git a/README.md b/README.md
@@ -55,19 +55,19 @@ SquadCalc utilizes heightmaps extracted from the Squad SDK to precisely compute
 ### Base map :
 The classic, straight from the game base map.  
 
-<img width="400" height="400" src="./src/img/github/basemap.webp">
+<img width="400" height="360" src="./src/img/github/basemap.webp">
 
 ### Terrain map :
 Base map enhanced with bumpmap from SDK's heightmap. Add a better comprehension of terrain.  
 Also known as "why the fuck is it not the default ingame map?"
 
-<img width="400" height="400" src="./src/img/github/terrainmap.webp">
+<img width="400" height="360" src="./src/img/github/terrainmap.webp">
 
 
 ### Topographic map :
 A mix of bump map, contour map with a touch of hypsometric colors for a complete understanding of map reliefs.
 
-<img width="400" height="400" src="./src/img/github/topomap.webp">
+<img width="400" height="360" src="./src/img/github/topomap.webp">
 
 
 ## **Advanced informations & Simulation**
@@ -89,14 +89,15 @@ Rather have a minimalist/non-clustered map ? you can too. Hop in settings to cus
 # **Map & Weapons Support**
 
 
-| **WEAPONS**           |                    |
-|-----------------------|--------------------|
-| Mortars               |        ✅          |
-| UB-32                 |        ✅          |
-| Hell Canon            |        ✅          |
-| Technicals mortars    |        ✅          |
-| Technicals/BRDM UB-32 |        ✅          |
-| BM-21 Grad            |        ✅          |
+|                                   |       **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        |        ✅          |
 
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "squadcalc",
-  "version": "24.1.0",
+  "version": "25.0.0",
   "description": "A Complete Mortar Calculator for Squad",
   "author": "Maxime 'sharkman' Boussard",
   "license": "MIT",

diff --git a/src/img/icons/m113a3_white.png b/src/img/icons/m113a3_white.png
diff --git a/src/js/squadMinimap.js b/src/js/squadMinimap.js
@@ -23,23 +23,22 @@ export var squadMinimap = Map.extend({
     initialize: function (id, tilesSize, defaultMap, options) {
 
         options = {
-            center: [-tilesSize/2, tilesSize/2],
             attributionControl: false,
+            boxZoom: true,
+            center: [-tilesSize/2, tilesSize/2],
+            closePopupOnClick: false,
             crs: CRS.Simple,
-            minZoom: 1,
-            maxZoom: 8,
-            zoomControl: false,
             doubleClickZoom: false,
             edgeBufferTiles: 5,
+            fadeAnimation: true,
+            maxZoom: 8,
+            minZoom: 1,
             renderer: svg({padding: 3}),
-            closePopupOnClick: false,
             wheelPxPerZoomLevel: 75,
-            boxZoom: true,
-            fadeAnimation: true,
             zoom: 2,
+            zoomControl: false,
         };
 
-
         Util.setOptions(this, options);
         Map.prototype.initialize.call(this, id, options);
         this.activeMap = defaultMap;

diff --git a/src/js/weapons.js b/src/js/weapons.js
@@ -9,6 +9,7 @@ import mlrsLogo from "../img/icons/mlrs_white.png";
 //import frenchLogo from "../img/icons/120mm_white.png";
 import ub32Logo from "../img/icons/ub32_white.png";
 import ub322Logo from "../img/icons/ub32_deployable.png";
+import m113Logo from "../img/icons/m113a3_white.png"
 
 /* eslint no-unused-vars: "off" */
 import target from "../img/icons/target.png";
@@ -109,7 +110,7 @@ export const WEAPONS = [
     new Weapon("Technical", 109.890938, 1, [-45, 135], "deg", technicalLogo, "50%", "vehicles", "high", 1, 51, 50),
     new Weapon("Tech. UB-32", UB32_table, 2, [-45, 135], "deg", ub32Logo, "55%", "vehicles", "low", 1, 0, 300),
     new Weapon("BM-21 Grad", 200, 2, [-45, 135], "deg", mlrsLogo, "60%", "vehicles", "low", 1, 0, 200),
-
+    new Weapon("M1064-A3 120mm", 190, 1, [-45, 135], "deg", m113Logo, "45%", "vehicles", "high", 1, 0, 25),
     //new Weapon("Short", 109.890938, 1, 1520, undefined, "mil", frenchLogo, "135%", "frenchDLC", "high", 0),
     //new Weapon("Medium", 143.5, 1, 1520, undefined, "mil", frenchLogo, "135%", "frenchDLC", "high", 0),
     //new Weapon("Long", 171.5, 1, 1520, undefined, "mil", frenchLogo, "135%", "frenchDLC", "high", 0),