From 56e194fd565cae745cd7f3c8c6b2168eb1bbebdc Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sun, 3 Jan 2021 13:26:31 +0100 Subject: [PATCH] fix #2 --- dist/mapCoordsPicker.js | 35 +++++--------------------------- dist/quickbar/mapCoordsPicker.js | 6 ++---- src/mapCoordsPicker.js | 23 +++++---------------- 3 files changed, 12 insertions(+), 52 deletions(-) diff --git a/dist/mapCoordsPicker.js b/dist/mapCoordsPicker.js index 704c23e..936106d 100644 --- a/dist/mapCoordsPicker.js +++ b/dist/mapCoordsPicker.js @@ -154,21 +154,6 @@ const translations = { var _default = () => translations[window.game_data.locale] || translations.en_DK; exports.default = _default; -},{}],"Mk65":[function(require,module,exports) { -"use strict"; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.default = hexToRgb; - -function hexToRgb(hex) { - const bigint = parseInt(hex, 16); - const r = bigint >> 16 & 255; - const g = bigint >> 8 & 255; - const b = bigint & 255; - return [r, g, b]; -} },{}],"KWxH":[function(require,module,exports) { "use strict"; @@ -201,8 +186,6 @@ exports.setItem = setItem; var _mapCoordsPicker = _interopRequireDefault(require("./i18n/mapCoordsPicker")); -var _hexToRGB = _interopRequireDefault(require("./utils/hexToRGB")); - var _localStorage = require("./utils/localStorage"); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -218,7 +201,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope // @namespace https://github.com/tribalwarshelp/scripts // @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/mapCoordsPicker.js // @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/mapCoordsPicker.js -// @version 0.7.1 +// @version 0.7.3 // @description Map coords picker // @author Kichiyaki http://dawid-wysokinski.pl/ // @match *://*/game.php*screen=map* @@ -258,22 +241,14 @@ const villageIDByCoords = (x, y) => { }; const setVillageBgColor = function setVillageBgColor(x, y) { - let bgColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'transparent'; + let color = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'transparent'; const id = villageIDByCoords(x, y); if (isNaN(id)) return; const village = document.querySelector('#map_village_' + id); if (village) { - let overlay = document.querySelector('#' + 'map_village_overlay_' + id); - - if (!overlay) { - overlay = document.createElement('div'); - overlay.id = 'map_village_overlay_' + id; - overlay.style.cssText = document.defaultView.getComputedStyle(village, '').cssText; - village.parentElement.appendChild(overlay); - } - - overlay.style.backgroundColor = bgColor !== 'transparent' ? "rgba(".concat((0, _hexToRGB.default)(bgColor.replace('#', '')).join(', '), ", 0.7)") : bgColor; + village.style.boxSizing = 'border-box'; + village.style.border = color !== 'transparent' ? "5px solid ".concat(color) : 'none'; } }; @@ -471,4 +446,4 @@ const renderUI = () => { console.log('Map Coords Picker', error); } })(); -},{"./i18n/mapCoordsPicker":"jH35","./utils/hexToRGB":"Mk65","./utils/localStorage":"KWxH"}]},{},["FWa8"], null) \ No newline at end of file +},{"./i18n/mapCoordsPicker":"jH35","./utils/localStorage":"KWxH"}]},{},["FWa8"], null) \ No newline at end of file diff --git a/dist/quickbar/mapCoordsPicker.js b/dist/quickbar/mapCoordsPicker.js index 3d95649..595fc2b 100644 --- a/dist/quickbar/mapCoordsPicker.js +++ b/dist/quickbar/mapCoordsPicker.js @@ -1,9 +1,7 @@ parcelRequire=function(e,r,t,n){var i,o="function"==typeof parcelRequire&&parcelRequire,u="function"==typeof require&&require;function f(t,n){if(!r[t]){if(!e[t]){var i="function"==typeof parcelRequire&&parcelRequire;if(!n&&i)return i(t,!0);if(o)return o(t,!0);if(u&&"string"==typeof t)return u(t);var c=new Error("Cannot find module '"+t+"'");throw c.code="MODULE_NOT_FOUND",c}p.resolve=function(r){return e[t][1][r]||r},p.cache={};var l=r[t]=new f.Module(t);e[t][0].call(l.exports,p,l,l.exports,this)}return r[t].exports;function p(e){return f(p.resolve(e))}}f.isParcelRequire=!0,f.Module=function(e){this.id=e,this.bundle=f,this.exports={}},f.modules=e,f.cache=r,f.parent=o,f.register=function(r,t){e[r]=[function(e,r){r.exports=t},{}]};for(var c=0;ce[window.game_data.locale]||e.en_DK;exports.default=o; -},{}],"Mk65":[function(require,module,exports) { -"use strict";function e(e){const t=parseInt(e,16);return[t>>16&255,t>>8&255,255&t]}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=e; },{}],"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=n(require("./i18n/mapCoordsPicker")),t=n(require("./utils/hexToRGB")),r=require("./utils/localStorage");function n(e){return e&&e.__esModule?e:{default:e}}function o(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 a(e){for(var t=1;t h2");let i,p,u,d,g=(0,r.getItem)(c,{started:!1,groups:{All:{villages:[],color:"#ffffff"}},selectedGroup:"All"});const m=(0,e.default)(),v=()=>{(0,r.setItem)(c,g)},f=(e,t)=>{const r=parseInt("".concat(e).concat(t),10);return TWMap.villages[r]?TWMap.villages[r].id:NaN},y=function(e,r){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"transparent";const o=f(e,r);if(isNaN(o))return;const a=document.querySelector("#map_village_"+o);if(a){let e=document.querySelector("#map_village_overlay_"+o);e||((e=document.createElement("div")).id="map_village_overlay_"+o,e.style.cssText=document.defaultView.getComputedStyle(a,"").cssText,a.parentElement.appendChild(e)),e.style.backgroundColor="transparent"!==n?"rgba(".concat((0,t.default)(n.replace("#","")).join(", "),", 0.7)"):n}},b=e=>{for(let t in g.groups){if(t===g.selectedGroup)return;g.groups[t].villages=g.groups[t].villages.filter(t=>t.key!==e)}},h=(e,t,r)=>{r.preventDefault();const n="".concat(e,"|").concat(t);g.groups[g.selectedGroup].villages.some(e=>e.key===n)?(g.groups[g.selectedGroup].villages=g.groups[g.selectedGroup].villages.filter(e=>e.key!==n),y(e,t)):(g.groups[g.selectedGroup].villages=[...g.groups[g.selectedGroup].villages,{x:e,y:t,key:n}],y(e,t,g.groups[g.selectedGroup].color),b(n))},k=(e,t)=>{const r=t&&t.name!==g.selectedGroup,n='\n \n \n \n ").concat(t?'"):"","\n ").concat(r?'"):"","\n "),o=document.createElement("form");if(o.innerHTML=n,o.addEventListener("submit",e=>{e.preventDefault(),t?(t.name===g.selectedGroup&&(g.selectedGroup=e.target[1].value),w(t.name,e.target[0].value),g.groups[e.target[1].value]=a(a({},g.groups[t.name]),{},{color:e.target[0].value}),t.name!==e.target[1].value&&delete g.groups[t.name]):g.groups[e.target[1].value]={color:e.target[0].value,villages:[]},_()}),t){o.querySelector('button[type="button"]').addEventListener("click",()=>{if(g.selectedGroup===t.name)return UI.ErrorMessage(m.cannotDeleteSelectedGroup);w(t.name,"transparent"),delete g.groups[t.name],o.remove()});const e=o.querySelector(".selectButton");e&&e.addEventListener("click",e=>{g.selectedGroup=t.name,_()})}e.appendChild(o)},_=()=>{p.innerHTML="";for(let e in g.groups)k(p,a(a({},g.groups[e]),{},{name:e}));k(p)},M=()=>{const e=[];for(let r in g.groups)e.push('
\n

'.concat(r,"

\n \n
"));const t="\n ".concat(e.join(""),"\n ");Dialog.show(m.exportedVillages,t)},T=()=>{const e=document.createElement("button");e.innerHTML=m.export,e.addEventListener("click",M),u.appendChild(e)},E=(e,t)=>{TWMap.mapHandler.__spawnSector(e,t),x()},C=()=>{TWMap.map.handler.__onClick=TWMap.map.handler.onClick,TWMap.map.handler.onClick=h,TWMap.mapHandler.__spawnSector=TWMap.map.handler.spawnSector,TWMap.mapHandler.spawnSector=E,i.innerHTML=m.stopCoordsPicker,T(),x(),_(),d=setInterval(v,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),i.innerHTML=m.startCoordsPicker,p.innerHTML="",u.innerHTML="",x("transparent"),d&&clearInterval(d);for(let e in g.groups)g.groups[e].villages=[]},O=()=>{g.started?S():C(),g.started=!g.started,v()},w=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";g.groups[e].villages.forEach(r=>{y(r.x,r.y,t||g.groups[e].color)})},x=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";for(let t in g.groups)w(t,e)},L=()=>{(i=document.createElement("button")).style.marginLeft="5px",i.innerHTML=g.started?m.stopCoordsPicker:m.startCoordsPicker,i.addEventListener("click",O),s.appendChild(i),p=document.createElement("div"),s.parentElement.insertBefore(p,s.nextSibling),u=document.createElement("div"),s.parentElement.insertBefore(u,s.nextSibling),g.started&&C()};!function(){try{(i=document.createElement("button")).style.marginLeft="5px",i.innerHTML=g.started?m.stopCoordsPicker:m.startCoordsPicker,i.addEventListener("click",O),s.appendChild(i),p=document.createElement("div"),s.parentElement.insertBefore(p,s.nextSibling),u=document.createElement("div"),s.parentElement.insertBefore(u,s.nextSibling),g.started&&C()}catch(e){console.log("Map Coords Picker",e)}}(); -},{"./i18n/mapCoordsPicker":"jH35","./utils/hexToRGB":"Mk65","./utils/localStorage":"KWxH"}]},{},["FWa8"], null) \ No newline at end of file +"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)}}(); +},{"./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 a38ad08..8f51f4b 100644 --- a/src/mapCoordsPicker.js +++ b/src/mapCoordsPicker.js @@ -1,5 +1,4 @@ import getTranslations from './i18n/mapCoordsPicker'; -import hexToRGB from './utils/hexToRGB'; import { getItem, setItem } from './utils/localStorage'; // ==UserScript== @@ -7,7 +6,7 @@ import { getItem, setItem } from './utils/localStorage'; // @namespace https://github.com/tribalwarshelp/scripts // @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/mapCoordsPicker.js // @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/mapCoordsPicker.js -// @version 0.7.1 +// @version 0.7.3 // @description Map coords picker // @author Kichiyaki http://dawid-wysokinski.pl/ // @match *://*/game.php*screen=map* @@ -45,26 +44,14 @@ const villageIDByCoords = (x, y) => { return NaN; }; -const setVillageBgColor = (x, y, bgColor = 'transparent') => { +const setVillageBgColor = (x, y, color = 'transparent') => { const id = villageIDByCoords(x, y); if (isNaN(id)) return; const village = document.querySelector('#map_village_' + id); if (village) { - let overlay = document.querySelector('#' + 'map_village_overlay_' + id); - if (!overlay) { - overlay = document.createElement('div'); - overlay.id = 'map_village_overlay_' + id; - overlay.style.cssText = document.defaultView.getComputedStyle( - village, - '' - ).cssText; - village.parentElement.appendChild(overlay); - } - - overlay.style.backgroundColor = - bgColor !== 'transparent' - ? `rgba(${hexToRGB(bgColor.replace('#', '')).join(', ')}, 0.7)` - : bgColor; + village.style.boxSizing = 'border-box'; + village.style.border = + color !== 'transparent' ? `5px solid ${color}` : 'none'; } };