Code simplification

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.9.2 (2025-11-18)
+
+- simplification du code
+
+## 1.9.1 (2025-11-18)
+
+- ajout d'un bouton pour sélectionner toutes les troupes
+
+## 1.8.1 (2025-11-17)
+
+- remplacement de 'attaques' par 'occurrences'
+- correction du calcul d'arrivée des unités
+- ajout des dizièmes de seconde pour envoyer des unités
+
 ## 1.7.4 (2025-11-16)
 
 - correction bug de calcul des secondes en utilisant search regex

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "KAplus",
-  "version": "1.7.4",
+  "version": "1.9.2",
 
   "developer": {
     "name": "Samuel Campos",

metadata.json

@@ -5,8 +5,8 @@
       "firefox"
     ],
     "release_notes": {
-      "fr": "- correction bug de calcul des secondes en utilisant search regex",
+      "fr": "- simplification du code",
-      "en-US": "- fix bug on seconds by using search regex"
+      "en-US": "- code simplification"
     }
   }
 }

src/kaplus.js

@@ -1,3 +1,8 @@
+let tomorrow = new Date(new Date().getTime() + 24*60*60*1000);
+tomorrow.setHours(0, 0, 0, 0);
+let afterTomorrow = new Date(tomorrow.getTime() + 24*60*60*1000);
+let movingDuration = 0;
+
 function num(s) {
 	return parseInt(s.replace(".", ""));
 }
@@ -18,27 +23,48 @@ function str(n) {
 	return s.replace(/^0+/, "");
 }
 
-function createRow(key, value) {
+function createCustomElement(tag, attrs, text, style) {
-	let keyCell = document.createElement("td");
+    let elt = document.createElement(tag);
-    keyCell.textContent = key;
+    if (attrs) {
+        for (let [key, value] of Object.entries(attrs)) {
+            elt.setAttribute(key, value.toString());
+        }
+    }
+    if (text) {
+        elt.textContent = text.toString();
+    }
+    if (style) {
+        for (let [key, value] of Object.entries(style)) {
+            elt.style[key] = value.toString();
+        }
+    }
+    return elt;
+}
 
-    let valueCell = document.createElement("td");
+function createCustomInput(type, name, value, attrs, style) {
-    valueCell.textContent = value;
+    let mergedAttrs = {};
+    if (attrs) {
+        mergedAttrs = attrs;
+    }
+    mergedAttrs["type"] = type;
+    if (name) {
+        mergedAttrs["name"] = name;
+    }
+    if (value) {
+        mergedAttrs["value"] = value;
+    }
+    return createCustomElement("input", mergedAttrs, null, style);
+}
 
-    let row = document.createElement("tr");
+function createKeyValueRow(key, value) {
+    let row = createCustomElement("tr");
+    let keyCell = createCustomElement("td", null, key);
+    let valueCell = createCustomElement("td", null, value);
     row.appendChild(keyCell);
     row.appendChild(valueCell);
     return row;
 }
 
-function createInput(type, name, value) {
-    let elt = document.createElement("input");
-    elt.setAttribute("type", type);
-    elt.setAttribute("name", name);
-    elt.setAttribute("value", value);
-    return elt;
-}
-
 function searchPoint(text) {
     let index = text.search(/\d{3}\|\d{3}/);
     let point = text.slice(index, index + 7).split("|");
@@ -61,24 +87,38 @@ function shortcutElementReplace(elt, img, text) {
         }
     }
 
-    let spanImageElement = document.createElement("span");
+    let spanImageElement = createCustomElement("span", {"class": "shortcut_element_image"});
-    spanImageElement.classList.add("shortcut_element_image");
+    let imgElement = createCustomElement("img", {"src": chrome.runtime.getURL("images/" + img + ".svg")});
-
-    let imgElement = document.createElement("img");
-    imgElement.setAttribute("src", chrome.runtime.getURL("images/" + img + ".svg"));
     spanImageElement.appendChild(imgElement);
 
     aElements[0].textContent = "";
     aElements[0].appendChild(spanImageElement);
 
     if (text) {
-        let spanDescElement = document.createElement("span");
+        let spanDescElement = createCustomElement("span", {"class": "shortcut_element_desc"}, text);
-        spanDescElement.classList.add("shortcut_element_desc");
-        spanDescElement.textContent = text;
         aElements[0].appendChild(spanDescElement);
     }
 }
 
+function countUpMs() {
+    let arrivalDate = new Date(new Date().getTime() + movingDuration * 1000);
+    let prefix = "";
+    if (arrivalDate >= afterTomorrow) {
+        prefix = "le " + arrivalDate.getDate() + "." + arrivalDate.getMonth() + " ";
+    } else if (arrivalDate > tomorrow) {
+        prefix = "demain ";
+    }
+    document.getElementById("countup-time-ms").textContent = prefix
+        + "à "
+        + arrivalDate.getHours().toString().padStart(2, "0")
+        + ":"
+        + arrivalDate.getMinutes().toString().padStart(2, "0")
+        + ":"
+        + arrivalDate.getSeconds().toString().padStart(2, "0")
+        + ":"
+        + Math.floor(arrivalDate.getMilliseconds() / 100);
+}
+
 function main() {
     /* Exit immediately if not on game page */
     let layCastleTopElements = document.getElementsByClassName("lay_castle_top");
@@ -109,6 +149,7 @@ function main() {
     let section = urlParams.get("s");
     let module = urlParams.get("m");
     let sub = urlParams.get("sub");
+    let sendCommandForm = document.getElementById("sendCommandForm");
 
     /* Display unit-points on user profile */
     if (section === "info_player" && (module === "profile" || module === null)) {
@@ -134,8 +175,8 @@ function main() {
             armyPercent = (Math.round(armyPoints / villagesCount) / 100).toString() + " %";
         }
 
-        playerPropertiesTable.appendChild(createRow("Points troupes:", str(armyPoints)));
+        playerPropertiesTable.appendChild(createKeyValueRow("Points troupes:", str(armyPoints)));
-        playerPropertiesTable.appendChild(createRow("% points troupes:", armyPercent));
+        playerPropertiesTable.appendChild(createKeyValueRow("% points troupes:", armyPercent));
     }
 
     /* Display unit-points on village overview */
@@ -155,34 +196,112 @@ function main() {
         villagePointsRow.after(unitPointsRow);
     }
 
-    /* Allow multiple attacks */
+    /* Units order page */
-    if (section === "build_barracks" && module === "command" && sub === "send") {
+    if (section === "build_barracks" && (module === null || module === "command") && sendCommandForm !== null) {
-        let table = document.createElement("table");
+        let barracksCommands = sendCommandForm.getElementsByClassName("barracksCommand");
-        table.classList.add("borderlist");
+        let borderListTables = sendCommandForm.getElementsByClassName("borderlist");
-        let tbody = document.createElement("tbody");
+
-        let tr = document.createElement("tr");
+        let quantityLabel = createCustomElement("label");
-        let th = document.createElement("th");
+        let quantityInput = createCustomElement("input", {"type": "checkbox"});
-        th.textContent = "Nombre d'attaques:";
+        quantityInput.addEventListener("change", function () {
+            let clickSpans = [];
+            if (barracksCommands.length === 1) {
+                clickSpans = barracksCommands[0].getElementsByClassName("click");
+            } else if (borderListTables.length === 1) {
+                clickSpans = borderListTables[0].getElementsByClassName("click");
+            }
+            for (let i = 0; i < 12; i++) {
+                if (clickSpans[i].classList.contains("all")) {
+                    continue;
+                }
+                clickSpans[i].click();
+            }
+        })
+        quantityLabel.appendChild(quantityInput);
+        let quantitySpan = createCustomElement("span", {"class": "click all"}, "(Tout sélectionner)");
+        quantityLabel.appendChild(quantitySpan);
+
+        if (barracksCommands.length === 1) {
+            let boxCell = createCustomElement("div", {"class": "box"});
+
+            let backgroundCell = createCustomElement("div", {"class": "background"});
+            let backgroundImg = createCustomElement(
+                "img", {"src": "//s58-fr.kingsage.gameforge.com/img/modern/card_sendunit.png"}
+            );
+            backgroundCell.appendChild(backgroundImg);
+            boxCell.appendChild(backgroundCell);
+
+            let imageCell = createCustomElement("div", {"class": "image"});
+            let imageImg = createCustomElement(
+                "img", {"src": "//s58-fr.kingsage.gameforge.com/img/shortcut/barracks.png"}, null, {"width": "28px"}
+            );
+            imageCell.appendChild(imageImg);
+            boxCell.appendChild(imageCell);
+
+            let nameCell = createCustomElement("div", {"class": "name"});
+            let nameA = createCustomElement("a", {"href": "help.php?m=units", "target": "_help"});
+            let nameB = createCustomElement("b", null, "Tout");
+            nameA.appendChild(nameB);
+            nameCell.appendChild(nameA);
+            boxCell.appendChild(nameCell);
+
+            let quantityCell = createCustomElement("div", {"class": "quantity"});
+            quantityCell.appendChild(quantityLabel);
+            boxCell.appendChild(quantityCell);
+
+            let brTag = barracksCommands[0].getElementsByTagName("br")[1];
+            barracksCommands[0].insertBefore(boxCell, brTag);
+
+        } else if (borderListTables.length === 1) {
+            let borderListRows = borderListTables[0].getElementsByTagName("tr");
+            let selectAllCell = borderListRows[1].getElementsByTagName("td")[3];
+
+            let imageA = createCustomElement("a", {"href": "help.php?m=units", "target": "_help"});
+            let imageImg = createCustomElement(
+                "img", {"src": "//s58-fr.kingsage.gameforge.com/img/shortcut/barracks.png", "title": "Tout"}
+            );
+            imageA.appendChild(imageImg);
+            selectAllCell.appendChild(imageA);
+
+            selectAllCell.appendChild(quantityLabel);
+        }
+    }
+
+    /* Units sending page */
+    if (section === "build_barracks" && module === "command" && sub === "send" && sendCommandForm === null) {
+        /* Improve countup time cell */
+        let oldCell = document.getElementById("countup-time");
+        let hms = oldCell.parentElement.previousElementSibling.getElementsByTagName("td")[1].textContent.split(":");
+        movingDuration = parseInt(hms[0]) * 3600 + parseInt(hms[1]) * 60 + parseInt(hms[2]) ;
+        let newRow = createCustomElement("tr");
+        let newLeftCell = createCustomElement("td", null, "Arrivée:");
+        newRow.appendChild(newLeftCell);
+        let newRightCell = createCustomElement("td", {"id": "countup-time-ms"});
+        newRow.appendChild(newRightCell);
+        oldCell.parentElement.parentElement.insertBefore(newRow, oldCell.parentElement);
+        oldCell.parentElement.style.display = "none";
+        setInterval(countUpMs, 100);
+
+        /* Allow multiple occurrences of send */
+        let table = createCustomElement("table", {"class": "borderlist"});
+        let tbody = createCustomElement("tbody");
+        let tr = createCustomElement("tr");
+        let th = createCustomElement("th", null, "Nombre d'occurrences:");
         tr.appendChild(th)
-        let td = document.createElement("td");
+        let td = createCustomElement("td");
-        let input = document.createElement("input");
+        let input = createCustomElement("input", {"type": "number", "name": "occurrences", "value": "1"});
-        input.setAttribute("type", "number");
-        input.setAttribute("name", "attack_count");
-        input.setAttribute("value", "1");
         td.appendChild(input);
         tr.appendChild(td);
         tbody.appendChild(tr);
         table.appendChild(tbody);
-
         let form = document.getElementsByTagName("form")[0];
         let firstInput = form.getElementsByTagName("input")[0];
         form.insertBefore(table, firstInput);
         form.addEventListener("submit", function (event) {
             event.preventDefault();
             let formData = new FormData(this);
-            let attackCount = parseInt(formData.get("attack_count").toString());
+            let attackCount = parseInt(formData.get("occurrences").toString());
-            formData.delete("attack_count");
+            formData.delete("occurrences");
-
             let sent = 0;
             for (let i = 0; i < attackCount; i++) {
                 let xhr = new XMLHttpRequest();
@@ -223,7 +342,7 @@ function main() {
         let table = contentPane.getElementsByClassName("borderlist")[0];
         let rows = table.getElementsByTagName("tr");
 
-        let headCell = document.createElement("th");
+        let headCell = createCustomElement("th");
         rows[0].appendChild(headCell);
 
         for (let i = 1; i < rows.length; i ++) {
@@ -238,20 +357,21 @@ function main() {
 
             let startPoint = searchPoint(cells[2].textContent);
             let targetPoint = searchPoint(cells[1].textContent);
-            let calculatorCell = document.createElement("td");
+            let calculatorCell = createCustomElement("td");
-            let calculatorForm = document.createElement("form");
+            let calculatorForm = createCustomElement(
-            calculatorForm.setAttribute("method", "post");
+                "form", {"method": "post", "action": "/?s=tools&m=runtime_calculator&inta=calculate"}
-            calculatorForm.setAttribute("action", "/?s=tools&m=runtime_calculator&inta=calculate");
+            );
-            calculatorForm.appendChild(createInput("hidden", "start_x", startPoint.x));
+            calculatorForm.appendChild(createCustomInput("hidden", "start_x", startPoint.x));
-            calculatorForm.appendChild(createInput("hidden", "start_y", startPoint.y));
+            calculatorForm.appendChild(createCustomInput("hidden", "start_y", startPoint.y));
-            calculatorForm.appendChild(createInput("hidden", "target_x", targetPoint.x));
+            calculatorForm.appendChild(createCustomInput("hidden", "target_x", targetPoint.x));
-            calculatorForm.appendChild(createInput("hidden", "target_y", targetPoint.y));
+            calculatorForm.appendChild(createCustomInput("hidden", "target_y", targetPoint.y));
-            let calculatorImg = document.createElement("input");
+            let calculatorImg = createCustomInput(
-            calculatorImg.setAttribute("type", "image");
+                "image",
-            calculatorImg.setAttribute("src", chrome.runtime.getURL("images/calculator.svg"));
+                null,
-            calculatorImg.style.width = "20px";
+                null,
-            calculatorImg.style.height = "20px";
+                {"src": chrome.runtime.getURL("images/calculator.svg")},
-            calculatorImg.style.border = "none";
+                {"width": "20px", "height": "20px", "border": "none"}
+            );
             calculatorForm.appendChild(calculatorImg);
             calculatorCell.appendChild(calculatorForm);
             rows[i].appendChild(calculatorCell);