From e320e4ad544c3aea09cde25e526e34cd78ad33cb Mon Sep 17 00:00:00 2001
From: sh4rkman <sh4rkman@users.noreply.github.com>
Date: Wed, 12 Jun 2024 20:00:54 +0200
Subject: [PATCH] M1064-A3

---
 CHANGELOG.md                   |  11 +++++++++++
 README.md                      |  23 ++++++++++++-----------
 package.json                   |   2 +-
 src/img/icons/m113a3_white.png | Bin 0 -> 1232 bytes
 src/js/squadMinimap.js         |  15 +++++++--------
 src/js/weapons.js              |   3 ++-
 6 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 src/img/icons/m113a3_white.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e18e861cd..626e3efd36 100644
--- 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
index 462f9c0153..9303d49c5f 100644
--- 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
index 103d138543..3f10853110 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..69e756f60370a6ba156dd5bd02e1406c80c904a0
GIT binary patch
literal 1232
zcmV;>1TXuEP)<h;3K|Lk000e1NJLTq005By002t}1^@s6aD8QJ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ941Z7D?K~#8N?b<s}
z^HvxK@aGK+w+cakin~BULR<xcg_~etgPjQm$_Hpa08{5me1J|2%<m^)pc1M?C=vsE
zX`uvAULYV;qNYB_kC6#B@%7k=|33-E$DE5}{_#0>AOHXW00000s0Ls7HMaWt`lzd`
zi*mUf6^lh`XlS74=Vv-UKj#_{wG_X`R&8x9rPFDusi~n<Dn<46^;B0^M-vkhTm#?}
z{r&yCrQ6)xOf@z(()#*3EiEn4{QSJUIstsp)YL@N)6=xIwZ(ggGMUV8$H&Kia8X)b
zUZ#bG1ug-Y3=a>#yTV*vUjCz%rMtVkJnxovc6N9RfOU6w^OnvWAVW5r{l>qhfq?<u
zf~dr5VJ+4`qobo-(gW1d(eXVO-?X*0HSs1D3WeC;VS)l$P-t#$j!QbLE0BS!NTrK!
zNT~7gao*B74G_db<kOjWm?&=54O)OMt)?*Hi$=VPb(6@`*w~m{ghPUfsc3a|l}ki_
zYxL{QM_ffdz24s5mTRY>p&>jcN~+e@R+^caq21kG-XpI-Wdmdw85yC$!9gxTBK7q2
z(AwG>m)xy^CMPH56$lbc1jy{{?Ce+0izTi`8yg!mH8mx_Gc)am7*M*f7E{p0#RZp$
zPEJm~o}QlGU0+|{@-ADmv$NFP+$?{>rpLEfEEEd=@up+k1q4k@KZ}ctT+;oe5hp#L
z&;Pr>zyI^q)z!89E0nmox%qZ@csL>!)WXWjiu_(JXgpjXxJw9=mY)kg-_paw!^_^@
z-Y=O<=J)&i`xoB*Mhn>0!NI|3Z*MR65Ii2LVmv-RzVM+ZPicS*+O+m3S9!y~lEm|)
zqobqH9t!a=6^9Q$Qp&z}%4V}azP`Tx)Y;kj{u@?iJV-2MK2c(7Yj1B4Wl<EDKZqB0
z=S~$RgWulXKBUv>@3?3wm&@f_T3X)KancTSQ3lD=z?J-|t!7aLDfa(k4bDaN;YNt6
zOcX(K9U^V*65f3_R3xm4s+7w05vH>$rSgN05LGc%L2`Y`Q<-oGM%Ysuu0#nC_6Hv!
zN{BFngb*c2SV2OF5+;lwAw&rjbdV6DgbFf92vLFs6(ocx;erSfLIl2pgb;z`CrAhp
zyzv?&*CA5*F9uK<a3uoY5F+r+Q;0C7ftlwk5rPB;U(*?a1cL815rPCt0^sLC7O3Ur
zqJX<I@C_jX-w-134Iu*G5F+pmcV|_~e3#|){Cl}G6Ji%4t2g4Ny_wNhCAJTuty#H#
ztlBuGWIA(tfOhqqwg-EkokPFpSJ|4#?}55y9?#3zQMUKf)~z7=SGutFdcaRlPe1Uc
zBUa<M89R*jPFb~e)1O`4(&<dp6S(M0Af32nH$RtqQ+Dml{Pq!Md(~rG)h{=O7lC)^
z)@LWi>J7WCZ^f<;745?syBw$edl6d4UU)r0g4>f+I+n`zL62?6ZNFYA8N>^xCkj4N
u6&^!uLsSZ(`kd<E00000002O|5d9Bx@Q}%Z-?b_L0000<MNUMnLSTZVn?C;l

literal 0
HcmV?d00001

diff --git a/src/js/squadMinimap.js b/src/js/squadMinimap.js
index 85423f8a5f..90178ee2eb 100644
--- 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
index acfd389169..c0075c212d 100644
--- 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),