From f65bd7697b7cc9a63fd75dcbba975dd7d08ff017 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sun, 3 Jan 2021 13:33:07 +0100 Subject: [PATCH] [Map Coords Picker] rename setVillageBgColor -> setVillageBorder --- dist/mapCoordsPicker.js | 10 +++++----- dist/quickbar/mapCoordsPicker.js | 2 +- src/mapCoordsPicker.js | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dist/mapCoordsPicker.js b/dist/mapCoordsPicker.js index 936106d..e7df4a4 100644 --- a/dist/mapCoordsPicker.js +++ b/dist/mapCoordsPicker.js @@ -203,7 +203,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope // @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/mapCoordsPicker.js // @version 0.7.3 // @description Map coords picker -// @author Kichiyaki http://dawid-wysokinski.pl/ +// @author Kichiyaki https://dawid-wysokinski.pl/ // @match *://*/game.php*screen=map* // @grant none // ==/UserScript== @@ -240,7 +240,7 @@ const villageIDByCoords = (x, y) => { return NaN; }; -const setVillageBgColor = function setVillageBgColor(x, y) { +const setVillageBorder = function setVillageBorder(x, y) { let color = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'transparent'; const id = villageIDByCoords(x, y); if (isNaN(id)) return; @@ -266,14 +266,14 @@ const handleMapClick = (x, y, e) => { if (selected) { config.groups[config.selectedGroup].villages = config.groups[config.selectedGroup].villages.filter(village => village.key !== key); - setVillageBgColor(x, y); + setVillageBorder(x, y, 'transparent'); } else { config.groups[config.selectedGroup].villages = [...config.groups[config.selectedGroup].villages, { x, y, key }]; - setVillageBgColor(x, y, config.groups[config.selectedGroup].color); + setVillageBorder(x, y, config.groups[config.selectedGroup].color); deleteVillageFromOtherGroups(key); } }; @@ -411,7 +411,7 @@ const handleButtonClick = () => { const colorizeGroupVillages = function colorizeGroupVillages(name) { let bgColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; config.groups[name].villages.forEach(village => { - setVillageBgColor(village.x, village.y, bgColor ? bgColor : config.groups[name].color); + setVillageBorder(village.x, village.y, bgColor ? bgColor : config.groups[name].color); }); }; diff --git a/dist/quickbar/mapCoordsPicker.js b/dist/quickbar/mapCoordsPicker.js index 595fc2b..11a2503 100644 --- a/dist/quickbar/mapCoordsPicker.js +++ b/dist/quickbar/mapCoordsPicker.js @@ -3,5 +3,5 @@ parcelRequire=function(e,r,t,n){var i,o="function"==typeof parcelRequire&&parcel },{}],"KWxH":[function(require,module,exports) { "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.setItem=exports.getItem=void 0;const e=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const o=localStorage.getItem(e);let s=t;return o&&(s=JSON.parse(o)),s};exports.getItem=e;const t=(e,t)=>{localStorage.setItem(e,JSON.stringify(t))};exports.setItem=t; },{}],"FWa8":[function(require,module,exports) { -"use strict";var e=r(require("./i18n/mapCoordsPicker")),t=require("./utils/localStorage");function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function o(e){for(var t=1;t h2");let s,i,p,u,d=(0,t.getItem)(l,{started:!1,groups:{All:{villages:[],color:"#ffffff"}},selectedGroup:"All"});const g=(0,e.default)(),m=()=>{(0,t.setItem)(l,d)},f=(e,t)=>{const r=parseInt("".concat(e).concat(t),10);return TWMap.villages[r]?TWMap.villages[r].id:NaN},v=function(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"transparent";const n=f(e,t);if(isNaN(n))return;const o=document.querySelector("#map_village_"+n);o&&(o.style.boxSizing="border-box",o.style.border="transparent"!==r?"5px solid ".concat(r):"none")},b=e=>{for(let t in d.groups){if(t===d.selectedGroup)return;d.groups[t].villages=d.groups[t].villages.filter(t=>t.key!==e)}},y=(e,t,r)=>{r.preventDefault();const n="".concat(e,"|").concat(t);d.groups[d.selectedGroup].villages.some(e=>e.key===n)?(d.groups[d.selectedGroup].villages=d.groups[d.selectedGroup].villages.filter(e=>e.key!==n),v(e,t)):(d.groups[d.selectedGroup].villages=[...d.groups[d.selectedGroup].villages,{x:e,y:t,key:n}],v(e,t,d.groups[d.selectedGroup].color),b(n))},h=(e,t)=>{const r=t&&t.name!==d.selectedGroup,n='\n \n \n \n ").concat(t?'"):"","\n ").concat(r?'"):"","\n "),a=document.createElement("form");if(a.innerHTML=n,a.addEventListener("submit",e=>{e.preventDefault(),t?(t.name===d.selectedGroup&&(d.selectedGroup=e.target[1].value),O(t.name,e.target[0].value),d.groups[e.target[1].value]=o(o({},d.groups[t.name]),{},{color:e.target[0].value}),t.name!==e.target[1].value&&delete d.groups[t.name]):d.groups[e.target[1].value]={color:e.target[0].value,villages:[]},k()}),t){a.querySelector('button[type="button"]').addEventListener("click",()=>{if(d.selectedGroup===t.name)return UI.ErrorMessage(g.cannotDeleteSelectedGroup);O(t.name,"transparent"),delete d.groups[t.name],a.remove()});const e=a.querySelector(".selectButton");e&&e.addEventListener("click",e=>{d.selectedGroup=t.name,k()})}e.appendChild(a)},k=()=>{i.innerHTML="";for(let e in d.groups)h(i,o(o({},d.groups[e]),{},{name:e}));h(i)},M=()=>{const e=[];for(let r in d.groups)e.push('
\n

'.concat(r,"

\n \n
"));const t="\n ".concat(e.join(""),"\n ");Dialog.show(g.exportedVillages,t)},T=()=>{const e=document.createElement("button");e.innerHTML=g.export,e.addEventListener("click",M),p.appendChild(e)},E=(e,t)=>{TWMap.mapHandler.__spawnSector(e,t),x()},_=()=>{TWMap.map.handler.__onClick=TWMap.map.handler.onClick,TWMap.map.handler.onClick=y,TWMap.mapHandler.__spawnSector=TWMap.map.handler.spawnSector,TWMap.mapHandler.spawnSector=E,s.innerHTML=g.stopCoordsPicker,T(),x(),k(),u=setInterval(m,500)},S=()=>{"function"==typeof TWMap.map.handler.__onClick&&(TWMap.map.handler.onClick=TWMap.map.handler.__onClick),"function"==typeof TWMap.map.handler.__spawnSector&&(TWMap.mapHandler.spawnSector=TWMap.map.handler.__spawnSector),s.innerHTML=g.startCoordsPicker,i.innerHTML="",p.innerHTML="",x("transparent"),u&&clearInterval(u);for(let e in d.groups)d.groups[e].villages=[]},C=()=>{d.started?S():_(),d.started=!d.started,m()},O=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";d.groups[e].villages.forEach(r=>{v(r.x,r.y,t||d.groups[e].color)})},x=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";for(let t in d.groups)O(t,e)},L=()=>{(s=document.createElement("button")).style.marginLeft="5px",s.innerHTML=d.started?g.stopCoordsPicker:g.startCoordsPicker,s.addEventListener("click",C),c.appendChild(s),i=document.createElement("div"),c.parentElement.insertBefore(i,c.nextSibling),p=document.createElement("div"),c.parentElement.insertBefore(p,c.nextSibling),d.started&&_()};!function(){try{(s=document.createElement("button")).style.marginLeft="5px",s.innerHTML=d.started?g.stopCoordsPicker:g.startCoordsPicker,s.addEventListener("click",C),c.appendChild(s),i=document.createElement("div"),c.parentElement.insertBefore(i,c.nextSibling),p=document.createElement("div"),c.parentElement.insertBefore(p,c.nextSibling),d.started&&_()}catch(e){console.log("Map Coords Picker",e)}}(); +"use strict";var e=r(require("./i18n/mapCoordsPicker")),t=require("./utils/localStorage");function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function o(e){for(var t=1;t h2");let s,i,p,u,d=(0,t.getItem)(l,{started:!1,groups:{All:{villages:[],color:"#ffffff"}},selectedGroup:"All"});const g=(0,e.default)(),m=()=>{(0,t.setItem)(l,d)},f=(e,t)=>{const r=parseInt("".concat(e).concat(t),10);return TWMap.villages[r]?TWMap.villages[r].id:NaN},v=function(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"transparent";const n=f(e,t);if(isNaN(n))return;const o=document.querySelector("#map_village_"+n);o&&(o.style.boxSizing="border-box",o.style.border="transparent"!==r?"5px solid ".concat(r):"none")},b=e=>{for(let t in d.groups){if(t===d.selectedGroup)return;d.groups[t].villages=d.groups[t].villages.filter(t=>t.key!==e)}},y=(e,t,r)=>{r.preventDefault();const n="".concat(e,"|").concat(t);d.groups[d.selectedGroup].villages.some(e=>e.key===n)?(d.groups[d.selectedGroup].villages=d.groups[d.selectedGroup].villages.filter(e=>e.key!==n),v(e,t,"transparent")):(d.groups[d.selectedGroup].villages=[...d.groups[d.selectedGroup].villages,{x:e,y:t,key:n}],v(e,t,d.groups[d.selectedGroup].color),b(n))},h=(e,t)=>{const r=t&&t.name!==d.selectedGroup,n='\n \n \n \n ").concat(t?'"):"","\n ").concat(r?'"):"","\n "),a=document.createElement("form");if(a.innerHTML=n,a.addEventListener("submit",e=>{e.preventDefault(),t?(t.name===d.selectedGroup&&(d.selectedGroup=e.target[1].value),O(t.name,e.target[0].value),d.groups[e.target[1].value]=o(o({},d.groups[t.name]),{},{color:e.target[0].value}),t.name!==e.target[1].value&&delete d.groups[t.name]):d.groups[e.target[1].value]={color:e.target[0].value,villages:[]},k()}),t){a.querySelector('button[type="button"]').addEventListener("click",()=>{if(d.selectedGroup===t.name)return UI.ErrorMessage(g.cannotDeleteSelectedGroup);O(t.name,"transparent"),delete d.groups[t.name],a.remove()});const e=a.querySelector(".selectButton");e&&e.addEventListener("click",e=>{d.selectedGroup=t.name,k()})}e.appendChild(a)},k=()=>{i.innerHTML="";for(let e in d.groups)h(i,o(o({},d.groups[e]),{},{name:e}));h(i)},M=()=>{const e=[];for(let r in d.groups)e.push('
\n

'.concat(r,"

\n \n
"));const t="\n ".concat(e.join(""),"\n ");Dialog.show(g.exportedVillages,t)},T=()=>{const e=document.createElement("button");e.innerHTML=g.export,e.addEventListener("click",M),p.appendChild(e)},E=(e,t)=>{TWMap.mapHandler.__spawnSector(e,t),x()},_=()=>{TWMap.map.handler.__onClick=TWMap.map.handler.onClick,TWMap.map.handler.onClick=y,TWMap.mapHandler.__spawnSector=TWMap.map.handler.spawnSector,TWMap.mapHandler.spawnSector=E,s.innerHTML=g.stopCoordsPicker,T(),x(),k(),u=setInterval(m,500)},S=()=>{"function"==typeof TWMap.map.handler.__onClick&&(TWMap.map.handler.onClick=TWMap.map.handler.__onClick),"function"==typeof TWMap.map.handler.__spawnSector&&(TWMap.mapHandler.spawnSector=TWMap.map.handler.__spawnSector),s.innerHTML=g.startCoordsPicker,i.innerHTML="",p.innerHTML="",x("transparent"),u&&clearInterval(u);for(let e in d.groups)d.groups[e].villages=[]},C=()=>{d.started?S():_(),d.started=!d.started,m()},O=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";d.groups[e].villages.forEach(r=>{v(r.x,r.y,t||d.groups[e].color)})},x=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";for(let t in d.groups)O(t,e)},L=()=>{(s=document.createElement("button")).style.marginLeft="5px",s.innerHTML=d.started?g.stopCoordsPicker:g.startCoordsPicker,s.addEventListener("click",C),c.appendChild(s),i=document.createElement("div"),c.parentElement.insertBefore(i,c.nextSibling),p=document.createElement("div"),c.parentElement.insertBefore(p,c.nextSibling),d.started&&_()};!function(){try{(s=document.createElement("button")).style.marginLeft="5px",s.innerHTML=d.started?g.stopCoordsPicker:g.startCoordsPicker,s.addEventListener("click",C),c.appendChild(s),i=document.createElement("div"),c.parentElement.insertBefore(i,c.nextSibling),p=document.createElement("div"),c.parentElement.insertBefore(p,c.nextSibling),d.started&&_()}catch(e){console.log("Map Coords Picker",e)}}(); },{"./i18n/mapCoordsPicker":"jH35","./utils/localStorage":"KWxH"}]},{},["FWa8"], null) \ No newline at end of file diff --git a/src/mapCoordsPicker.js b/src/mapCoordsPicker.js index 8f51f4b..2047f4d 100644 --- a/src/mapCoordsPicker.js +++ b/src/mapCoordsPicker.js @@ -8,7 +8,7 @@ import { getItem, setItem } from './utils/localStorage'; // @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/mapCoordsPicker.js // @version 0.7.3 // @description Map coords picker -// @author Kichiyaki http://dawid-wysokinski.pl/ +// @author Kichiyaki https://dawid-wysokinski.pl/ // @match *://*/game.php*screen=map* // @grant none // ==/UserScript== @@ -44,7 +44,7 @@ const villageIDByCoords = (x, y) => { return NaN; }; -const setVillageBgColor = (x, y, color = 'transparent') => { +const setVillageBorder = (x, y, color = 'transparent') => { const id = villageIDByCoords(x, y); if (isNaN(id)) return; const village = document.querySelector('#map_village_' + id); @@ -75,7 +75,7 @@ const handleMapClick = (x, y, e) => { config.groups[config.selectedGroup].villages = config.groups[ config.selectedGroup ].villages.filter((village) => village.key !== key); - setVillageBgColor(x, y); + setVillageBorder(x, y, 'transparent'); } else { config.groups[config.selectedGroup].villages = [ ...config.groups[config.selectedGroup].villages, @@ -85,7 +85,7 @@ const handleMapClick = (x, y, e) => { key, }, ]; - setVillageBgColor(x, y, config.groups[config.selectedGroup].color); + setVillageBorder(x, y, config.groups[config.selectedGroup].color); deleteVillageFromOtherGroups(key); } }; @@ -241,7 +241,7 @@ const handleButtonClick = () => { const colorizeGroupVillages = (name, bgColor = '') => { config.groups[name].villages.forEach((village) => { - setVillageBgColor( + setVillageBorder( village.x, village.y, bgColor ? bgColor : config.groups[name].color