Send resources by thousands

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.10.1 (2026-11-20)
+
+- envoi des ressources par milliers sur le marché
+
+## 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

manifest.json

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

metadata.json

@@ -5,8 +5,8 @@
       "firefox"
     ],
     "release_notes": {
-      "fr": "- ajout d'un bouton pour sélectionner toutes les troupes",
-      "en-US": " - add button to select all units"
+      "fr": "- envoi des ressources par milliers sur le marché",
+      "en-US": "- send resources by thousands in market"
     }
   }
 }

src/kaplus.js

@@ -23,27 +23,48 @@ function str(n) {
 	return s.replace(/^0+/, "");
 }
 
-function createRow(key, value) {
-	let keyCell = document.createElement("td");
-    keyCell.textContent = key;
+function createCustomElement(tag, attrs, text, style) {
+    let elt = document.createElement(tag);
+    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");
-    valueCell.textContent = value;
+function createCustomInput(type, name, value, attrs, style) {
+    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("|");
@@ -66,20 +87,15 @@ function shortcutElementReplace(elt, img, text) {
         }
     }
 
-    let spanImageElement = document.createElement("span");
-    spanImageElement.classList.add("shortcut_element_image");
-
-    let imgElement = document.createElement("img");
-    imgElement.setAttribute("src", chrome.runtime.getURL("images/" + img + ".svg"));
+    let spanImageElement = createCustomElement("span", {"class": "shortcut_element_image"});
+    let imgElement = createCustomElement("img", {"src": chrome.runtime.getURL("images/" + img + ".svg")});
     spanImageElement.appendChild(imgElement);
 
     aElements[0].textContent = "";
     aElements[0].appendChild(spanImageElement);
 
     if (text) {
-        let spanDescElement = document.createElement("span");
-        spanDescElement.classList.add("shortcut_element_desc");
-        spanDescElement.textContent = text;
+        let spanDescElement = createCustomElement("span", {"class": "shortcut_element_desc"}, text);
         aElements[0].appendChild(spanDescElement);
     }
 }
@@ -103,15 +119,27 @@ function countUpMs() {
         + Math.floor(arrivalDate.getMilliseconds() / 100);
 }
 
+function handleDomContentLoaded() {
+    /* Remove iframe banner */
+    document.getElementById("banner_skyscraper").remove();
+}
+
 function main() {
+    /* Exit immediately if extension has already been loaded */
+    let kaplus = document.getElementById("kaplus-marker");
+    if (kaplus) {
+        return;
+    }
+
     /* Exit immediately if not on game page */
     let layCastleTopElements = document.getElementsByClassName("lay_castle_top");
     if (layCastleTopElements.length === 0) {
         return;
     }
+    window.addEventListener("DOMContentLoaded", handleDomContentLoaded);
 
-    /* Remove iframe banner */
-    document.getElementById("banner_skyscraper").remove();
+    /* Add extension marker */
+    document.body.appendChild(createCustomElement("div", {"id": "kaplus-marker"}, null, {"display": "none"}));
 
     /* Improve navbar icons */
     let shortcutElements = layCastleTopElements[0].getElementsByClassName("shortcut_element");
@@ -159,8 +187,8 @@ function main() {
             armyPercent = (Math.round(armyPoints / villagesCount) / 100).toString() + " %";
         }
 
-        playerPropertiesTable.appendChild(createRow("Points troupes:", str(armyPoints)));
-        playerPropertiesTable.appendChild(createRow("% points troupes:", armyPercent));
+        playerPropertiesTable.appendChild(createKeyValueRow("Points troupes:", str(armyPoints)));
+        playerPropertiesTable.appendChild(createKeyValueRow("% points troupes:", armyPercent));
     }
 
     /* Display unit-points on village overview */
@@ -185,9 +213,8 @@ function main() {
         let barracksCommands = sendCommandForm.getElementsByClassName("barracksCommand");
         let borderListTables = sendCommandForm.getElementsByClassName("borderlist");
 
-        let quantityLabel = document.createElement("label");
-        let quantityInput = document.createElement("input");
-        quantityInput.setAttribute("type", "checkbox");
+        let quantityLabel = createCustomElement("label");
+        let quantityInput = createCustomElement("input", {"type": "checkbox"});
         quantityInput.addEventListener("change", function () {
             let clickSpans = [];
             if (barracksCommands.length === 1) {
@@ -203,43 +230,34 @@ function main() {
             }
         })
         quantityLabel.appendChild(quantityInput);
-        let quantitySpan = document.createElement("span");
-        quantitySpan.classList.add("click", "all");
-        quantitySpan.textContent = "(Tout sélectionner)";
+        let quantitySpan = createCustomElement("span", {"class": "click all"}, "(Tout sélectionner)");
         quantityLabel.appendChild(quantitySpan);
 
         if (barracksCommands.length === 1) {
-            let boxCell = document.createElement("div");
-            boxCell.classList.add("box");
+            let boxCell = createCustomElement("div", {"class": "box"});
 
-            let backgroundCell = document.createElement("div");
-            backgroundCell.classList.add("background");
-            let backgroundImg = document.createElement("img");
-            backgroundImg.setAttribute("src", "//s58-fr.kingsage.gameforge.com/img/modern/card_sendunit.png");
+            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 = document.createElement("div");
-            imageCell.classList.add("image");
-            let imageImg = document.createElement("img");
-            imageImg.setAttribute("src", "//s58-fr.kingsage.gameforge.com/img/shortcut/barracks.png");
-            imageImg.style.width = "28px";
+            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 = document.createElement("div");
-            nameCell.classList.add("name");
-            let nameA = document.createElement("a");
-            nameA.setAttribute("href", "help.php?m=units");
-            nameA.setAttribute("target", "_help");
-            let nameB = document.createElement("b");
-            nameB.textContent = "Tout";
+            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 = document.createElement("div");
-            quantityCell.classList.add("quantity");
+            let quantityCell = createCustomElement("div", {"class": "quantity"});
             quantityCell.appendChild(quantityLabel);
             boxCell.appendChild(quantityCell);
 
@@ -250,12 +268,10 @@ function main() {
             let borderListRows = borderListTables[0].getElementsByTagName("tr");
             let selectAllCell = borderListRows[1].getElementsByTagName("td")[3];
 
-            let imageA = document.createElement("a");
-            imageA.setAttribute("href", "help.php?m=units");
-            imageA.setAttribute("target", "_help");
-            let imageImg = document.createElement("img");
-            imageImg.setAttribute("src", "//s58-fr.kingsage.gameforge.com/img/shortcut/barracks.png")
-            imageImg.setAttribute("title", "Tout");
+            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);
 
@@ -269,30 +285,23 @@ function main() {
         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 = document.createElement("tr");
-        let newLeftCell = document.createElement("td");
-        newLeftCell.textContent = "Arrivée:";
+        let newRow = createCustomElement("tr");
+        let newLeftCell = createCustomElement("td", null, "Arrivée:");
         newRow.appendChild(newLeftCell);
-        let newRightCell = document.createElement("td");
-        newRightCell.setAttribute("id", "countup-time-ms");
+        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 = document.createElement("table");
-        table.classList.add("borderlist");
-        let tbody = document.createElement("tbody");
-        let tr = document.createElement("tr");
-        let th = document.createElement("th");
-        th.textContent = "Nombre d'occurrences:";
+        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 input = document.createElement("input");
-        input.setAttribute("type", "number");
-        input.setAttribute("name", "occurrences");
-        input.setAttribute("value", "1");
+        let td = createCustomElement("td");
+        let input = createCustomElement("input", {"type": "number", "name": "occurrences", "value": "1"});
         td.appendChild(input);
         tr.appendChild(td);
         tbody.appendChild(tr);
@@ -301,7 +310,6 @@ function main() {
         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("occurrences").toString());
             formData.delete("occurrences");
@@ -320,8 +328,9 @@ function main() {
         });
     }
 
-    /* Fix select bug in market */
+    /* Market sending page */
     if (section === "build_market" && (module === "send" || module === null)) {
+        /* Fix select bug in target village select */
         let select = document.getElementsByName("village_name")[0];
         select.removeAttribute("onchange");
         select.addEventListener("change", function () {
@@ -336,6 +345,51 @@ function main() {
                 sendY.value = xy[1];
             }
         });
+
+        /* Add form to send resources by thousands */
+        let sendForm = document.getElementsByTagName("form")[0]
+        sendForm.addEventListener("submit", function () {
+            let inputs = this.getElementsByTagName("input");
+            for (let i = 0; i < inputs.length; i ++) {
+                if (inputs[i].getAttribute("name").endsWith("_k")) {
+                    inputs[i].setAttribute("name", "");
+                }
+            }
+        });
+        let sendFormTables = sendForm.getElementsByTagName("table");
+        let newTable = sendFormTables[0].cloneNode(true);
+        newTable.getElementsByTagName("th")[0].textContent = "Ressources par milliers";
+        let resCells = newTable.getElementsByTagName("td");
+        for (let i = 0; i < resCells.length; i ++) {
+            let resInput = resCells[i].getElementsByTagName("input")[0];
+            let resName = resInput.getAttribute("name");
+            let resNameK = resInput.getAttribute("name") + "_k";
+            resInput.setAttribute("name", resNameK);
+            resInput.addEventListener("change", function () {
+                document.getElementsByName(resName)[0].value = 1000 * parseInt(this.value);
+            });
+            let spanInput = resCells[i].getElementsByTagName("span")[0];
+            let resMax = spanInput.textContent.replace(/\(/, "").replace("\)", "").replace(/\./, "");
+            let rMax = Math.floor(parseInt(resMax) / 1000);
+            spanInput.setAttribute(
+                "onclick",
+                "insertNum('kingsage', '" + resNameK + "', '" + rMax.toString() + "'); " +
+                "insertNum('kingsage', '" + resName + "', '" + (1000 * rMax).toString() + "');"
+            )
+            spanInput.textContent = "(" + rMax.toString() + "K)";
+        }
+        sendForm.insertBefore(newTable, sendFormTables[0]);
+        sendForm.insertBefore(createCustomElement("br"), sendFormTables[1]);
+
+        /* Set inputs type=number */
+        let sendInputs = sendForm.getElementsByTagName("input");
+        for (let i = 0; i < sendInputs.length; i ++) {
+            if (sendInputs[i].name.startsWith("send_")) {
+                sendInputs[i].setAttribute("type", "number");
+                sendInputs[i].value = "";
+                sendInputs[i].style.width = "65px";
+            }
+        }
     }
 
     /* Improve attacks display */
@@ -345,7 +399,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 ++) {
@@ -360,20 +414,21 @@ function main() {
 
             let startPoint = searchPoint(cells[2].textContent);
             let targetPoint = searchPoint(cells[1].textContent);
-            let calculatorCell = document.createElement("td");
-            let calculatorForm = document.createElement("form");
-            calculatorForm.setAttribute("method", "post");
-            calculatorForm.setAttribute("action", "/?s=tools&m=runtime_calculator&inta=calculate");
-            calculatorForm.appendChild(createInput("hidden", "start_x", startPoint.x));
-            calculatorForm.appendChild(createInput("hidden", "start_y", startPoint.y));
-            calculatorForm.appendChild(createInput("hidden", "target_x", targetPoint.x));
-            calculatorForm.appendChild(createInput("hidden", "target_y", targetPoint.y));
-            let calculatorImg = document.createElement("input");
-            calculatorImg.setAttribute("type", "image");
-            calculatorImg.setAttribute("src", chrome.runtime.getURL("images/calculator.svg"));
-            calculatorImg.style.width = "20px";
-            calculatorImg.style.height = "20px";
-            calculatorImg.style.border = "none";
+            let calculatorCell = createCustomElement("td");
+            let calculatorForm = createCustomElement(
+                "form", {"method": "post", "action": "/?s=tools&m=runtime_calculator&inta=calculate"}
+            );
+            calculatorForm.appendChild(createCustomInput("hidden", "start_x", startPoint.x));
+            calculatorForm.appendChild(createCustomInput("hidden", "start_y", startPoint.y));
+            calculatorForm.appendChild(createCustomInput("hidden", "target_x", targetPoint.x));
+            calculatorForm.appendChild(createCustomInput("hidden", "target_y", targetPoint.y));
+            let calculatorImg = createCustomInput(
+                "image",
+                null,
+                null,
+                {"src": chrome.runtime.getURL("images/calculator.svg")},
+                {"width": "20px", "height": "20px", "border": "none"}
+            );
             calculatorForm.appendChild(calculatorImg);
             calculatorCell.appendChild(calculatorForm);
             rows[i].appendChild(calculatorCell);