twhelp
/
scripts-old
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extendedPlayerProfile.loadData refactor

This commit is contained in:
Dawid Wysokiński 2020-09-17 12:26:43 +02:00
parent a073cfc9cc
commit a268e1eeb0
11 changed files with 77 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/extendedMapPopup.js vendored
View File

@ -771,7 +771,7 @@ const buildUnitHeader = (unit, index) => {
};
const buildUnitArrivalInfo = (t, index) => {
return "\n <td style=\"padding: 2px; background-color: ".concat(getUnitTdBgColor(index), ";\">\n ").concat((0, _formatDate.default)((0, _addMinutes.default)(new Date(Timing.getCurrentServerTime()), t)), "\n </td>\n ");
return "\n <td style=\"padding: 2px; background-color: ".concat(getUnitTdBgColor(index), ";\">\n ").concat((0, _formatDate.default)((0, _addMinutes.default)(Timing.getCurrentServerTime(), t)), "\n </td>\n ");
};
const renderAdditionalInfo = (id, data, _ref) => {

65
dist/extendedPlayerProfile.js vendored
View File

@ -464,7 +464,7 @@ const translations = {
pl_PL: {
date: 'Data',
newOwner: 'Nowy właściciel',
oldOwner: 'Stary właściciel',
oldOwner: 'Poprzedni właściciel',
village: 'Wioska',
title: 'Przejęcia'
},
@ -1007,7 +1007,27 @@ var _default = function _default(e, history, daily) {
};
exports.default = _default;
},{"date-fns/subDays":"mRRL","../i18n/showHistoryPopup":"hNDe","../utils/showPopup":"chDM","../utils/pagination":"fCHX","../utils/formatDate":"V6Mf","../utils/tribalwars":"fHHP"}],"DMkL":[function(require,module,exports) {
},{"date-fns/subDays":"mRRL","../i18n/showHistoryPopup":"hNDe","../utils/showPopup":"chDM","../utils/pagination":"fCHX","../utils/formatDate":"V6Mf","../utils/tribalwars":"fHHP"}],"GxsT":[function(require,module,exports) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = void 0;
var _default = str => {
const arr = str.split(/[_-]/);
let newStr = '';
for (let i = 1; i < arr.length; i++) {
newStr += arr[i].charAt(0).toUpperCase() + arr[i].slice(1);
}
return arr[0] + newStr;
};
exports.default = _default;
},{}],"DMkL":[function(require,module,exports) {
"use strict";
Object.defineProperty(exports, "__esModule", {
@ -1077,6 +1097,8 @@ var _showEnnoblementsPopup = _interopRequireDefault(require("./common/showEnnobl
var _showHistoryPopup = _interopRequireDefault(require("./common/showHistoryPopup"));
var _hyphensToCamelCase = _interopRequireDefault(require("./utils/hyphensToCamelCase"));
var _pagination = require("./utils/pagination");
var _getIDFromURL = _interopRequireDefault(require("./utils/getIDFromURL"));
@ -1106,9 +1128,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
// ==UserScript==
// @name Extended player profile
// @namespace https://github.com/tribalwarshelp/scripts
// @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
// @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
// @version 1.1.3
// @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
// @version 1.1.4
// @description Extended player profile
// @author Kichiyaki http://dawid-wysokinski.pl/
// @match *://*/game.php*screen=info_player*
@ -1201,34 +1223,15 @@ const loadData = async () => {
if (data.player) {
const inADay = {};
inADay.att = await loadInADayData('kill_att', {
const filter = {
name: data.player.name,
playerID: data.player.id
});
inADay.def = await loadInADayData('kill_def', {
name: data.player.name,
playerID: data.player.id
});
inADay.sup = await loadInADayData('kill_sup', {
name: data.player.name,
playerID: data.player.id
});
inADay.lootRes = await loadInADayData('loot_res', {
name: data.player.name,
playerID: data.player.id
});
inADay.lootVil = await loadInADayData('loot_vil', {
name: data.player.name,
playerID: data.player.id
});
inADay.scavenge = await loadInADayData('scavenge', {
name: data.player.name,
playerID: data.player.id
});
inADay.conquer = await loadInADayData('conquer', {
name: data.player.name,
playerID: data.player.id
});
};
for (let type of ['kill_att', 'kill_def', 'kill_sup', 'loot_res', 'loot_vil', 'scavenge', 'conquer']) {
inADay[(0, _hyphensToCamelCase.default)(type.replace('kill_', ''))] = await loadInADayData(type, filter);
}
data.player.inADay = inADay;
}
@ -1524,4 +1527,4 @@ const renderActions = () => {
console.log('extended player profile', error);
}
})();
},{"./libs/InADayParser":"dSAr","./libs/requestCreator":"Ph2E","./i18n/extendedPlayerProfile":"I8dv","./common/renderTodaysStats":"yrCm","./utils/showPopup":"chDM","./common/showEnnoblementsPopup":"vNT1","./common/showHistoryPopup":"kEDU","./utils/pagination":"fCHX","./utils/getIDFromURL":"tQUs","./utils/getCurrentServer":"DMkL","./utils/formatDate":"V6Mf","./utils/twstats":"Syko","./utils/tribalwars":"fHHP","./utils/localStorage":"KWxH"}]},{},["yRop"], null)
},{"./libs/InADayParser":"dSAr","./libs/requestCreator":"Ph2E","./i18n/extendedPlayerProfile":"I8dv","./common/renderTodaysStats":"yrCm","./utils/showPopup":"chDM","./common/showEnnoblementsPopup":"vNT1","./common/showHistoryPopup":"kEDU","./utils/hyphensToCamelCase":"GxsT","./utils/pagination":"fCHX","./utils/getIDFromURL":"tQUs","./utils/getCurrentServer":"DMkL","./utils/formatDate":"V6Mf","./utils/twstats":"Syko","./utils/tribalwars":"fHHP","./utils/localStorage":"KWxH"}]},{},["yRop"], null)

2
dist/extendedTribeProfile.js vendored
View File

@ -1200,7 +1200,7 @@ const translations = {
pl_PL: {
date: 'Data',
newOwner: 'Nowy właściciel',
oldOwner: 'Stary właściciel',
oldOwner: 'Poprzedni właściciel',
village: 'Wioska',
title: 'Przejęcia'
},

10
dist/extendedVillageProfile.js vendored
View File

@ -638,7 +638,7 @@ const translations = {
pl_PL: {
date: 'Data',
newOwner: 'Nowy właściciel',
oldOwner: 'Stary właściciel',
oldOwner: 'Poprzedni właściciel',
village: 'Wioska',
title: 'Przejęcia'
},
@ -1037,7 +1037,7 @@ const renderTr = (_ref) => {
tr.children[1].innerHTML = data;
};
const countTroopsInVillage = () => {
const countUnitsInVillage = () => {
const trs = document.querySelectorAll('#content_value > div tbody tr');
const units = [];
if (trs.length === 0) throw new Error();
@ -1073,14 +1073,14 @@ const renderAdditionalInfo = function renderAdditionalInfo() {
});
try {
const troops = countTroopsInVillage();
const units = countUnitsInVillage();
const tr = document.createElement('tr');
tr.style.textAlign = 'center';
tr.style.fontWeight = 'bold';
tr.appendChild(document.createElement('td'));
troops.forEach(troop => {
units.forEach(count => {
const td = document.createElement('td');
td.innerHTML = troop;
td.innerHTML = count;
tr.appendChild(td);
});
document.querySelector('#content_value > div tbody').appendChild(tr);

2
dist/quickbar/extendedMapPopup.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/quickbar/extendedPlayerProfile.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/quickbar/extendedTribeProfile.js vendored
View File

@ -33,7 +33,7 @@ parcelRequire=function(e,r,t,n){var i,o="function"==typeof parcelRequire&&parcel
},{}],"yrCm":[function(require,module,exports) {
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var t=a(require("../i18n/renderTodaysStats")),n=a(require("../utils/isNil"));function a(t){return t&&t.__esModule?t:{default:t}}const c=(0,t.default)(),o=t=>{return t>0?"color: #000; background-color: #0f0":t<0?"color: #000; background-color: #f00":"color: #000; background-color: #808080"};var r=(t,a)=>{let r=t.querySelector("#todaysStats");r||((r=document.createElement("div")).id="todaysStats",r.width="100%",t.prepend(r));const d=!(0,n.default)(a.rankSup);r.innerHTML='\n <table width="100%" class="vis">\n <tbody>\n <tr>\n <th colspan="2">\n '.concat(c.title,"\n </th>\n </tr>\n <tr>\n <td>\n ").concat(c.points,':\n </td>\n <td style="').concat(o(a.points),'">\n ').concat(Math.abs(a.points).toLocaleString(),"\n </td>\n </tr>\n <tr>\n <td>\n ").concat(c.rank,':\n </td>\n <td style="').concat(o(a.rank),'">\n ').concat(Math.abs(a.rank),"\n </td>\n </tr>\n <tr>\n <td>\n ").concat(c.villages,':\n </td>\n <td style="').concat(o(a.villages),'">\n ').concat(Math.abs(a.villages).toLocaleString(),"\n </td>\n </tr>\n ").concat(d?"":"<tr>\n <td>\n ".concat(c.members,':\n </td>\n <td style="').concat(o(a.members),'">\n ').concat(Math.abs(a.members),"\n </td>\n </tr>"),"\n <tr>\n <td>\n ").concat(c.oda,':\n </td>\n <td style="').concat(o(a.scoreAtt),'">\n ').concat(Math.abs(a.scoreAtt).toLocaleString(),"\n </td>\n </tr>\n <tr>\n <td>\n ").concat(c.odaRank,':\n </td>\n <td style="').concat(o(a.rankAtt),'">\n ').concat(Math.abs(a.rankAtt),"\n </td>\n </tr>\n <tr>\n <td>\n ").concat(c.odd,':\n </td>\n <td style="').concat(o(a.scoreDef),'">\n ').concat(Math.abs(a.scoreDef).toLocaleString(),"\n </td>\n </tr>\n <tr>\n <td>\n ").concat(c.oddRank,':\n </td>\n <td style="').concat(o(a.rankDef),'">\n ').concat(Math.abs(a.rankDef),"\n </td>\n </tr>\n ").concat(d?"<tr>\n <td>\n ".concat(c.ods,':\n </td>\n <td style="').concat(o(a.scoreSup),'">\n ').concat(Math.abs(a.scoreSup).toLocaleString(),"\n </td>\n </tr>\n <tr>\n <td>\n ").concat(c.odsRank,':\n </td>\n <td style="').concat(o(a.rankSup),'">\n ').concat(Math.abs(a.rankSup),"\n </td>\n </tr>"):"","\n <tr>\n <td>\n ").concat(c.od,':\n </td>\n <td style="').concat(o(a.scoreTotal),'">\n ').concat(Math.abs(a.scoreTotal).toLocaleString(),"\n </td>\n </tr>\n <tr>\n <td>\n ").concat(c.odRank,':\n </td>\n <td style="').concat(o(a.rankTotal),'">\n ').concat(Math.abs(a.rankTotal),"\n </td>\n </tr>\n </tbody>\n </table>\n ")};exports.default=r;
},{"../i18n/renderTodaysStats":"l9PO","../utils/isNil":"yQib"}],"tKRp":[function(require,module,exports) {
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;const e={pl_PL:{date:"Data",newOwner:"Nowy właściciel",oldOwner:"Stary właściciel",village:"Wioska",title:"Przejęcia"},en_DK:{date:"Date",newOwner:"New owner",oldOwner:"Old owner",village:"Village",title:"Ennoblements"}};var a=()=>e[window.game_data.locale]||e.en_DK;exports.default=a;
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;const e={pl_PL:{date:"Data",newOwner:"Nowy właściciel",oldOwner:"Poprzedni właściciel",village:"Wioska",title:"Przejęcia"},en_DK:{date:"Date",newOwner:"New owner",oldOwner:"Old owner",village:"Village",title:"Ennoblements"}};var l=()=>e[window.game_data.locale]||e.en_DK;exports.default=l;
},{}],"chDM":[function(require,module,exports) {
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.POPUP_SELECTOR=void 0;const e=".popup_helper",t="#inline_popup";exports.POPUP_SELECTOR=t;var o=function(){let{e:e,title:o,html:n,id:l}=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};const p=document.querySelector(t);p&&(p.style.width="auto",p.style.maxWidth="1000px"),p.classList.contains("show")?(p.querySelector("#inline_popup_title").innerHTML=o,p.querySelector("#inline_popup_content").innerHTML=n):inlinePopup(e,l,null,{offset_x:0,offset_y:0},n,o);const i=document.querySelector(".popup_helper");i&&(i.style.width="auto",i.style.position="fixed",i.style.zIndex="50001")};exports.default=o;
},{}],"V6Mf":[function(require,module,exports) {

2
dist/quickbar/extendedVillageProfile.js vendored
View File

@ -29,7 +29,7 @@ parcelRequire=function(e,r,t,n){var i,o="function"==typeof parcelRequire&&parcel
},{"../differenceInMilliseconds/index.js":"H70G","../_lib/requiredArgs/index.js":"kK6Q"}],"ATOB":[function(require,module,exports) {
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var e=t(require("date-fns/differenceInMinutes"));function t(e){return e&&e.__esModule?e:{default:e}}var r=(t,r)=>{let u=25+Math.abs((0,e.default)(t,new Date))*(r/60);return u>100&&(u=100),Math.floor(u)};exports.default=r;
},{"date-fns/differenceInMinutes":"oGJj"}],"tKRp":[function(require,module,exports) {
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;const e={pl_PL:{date:"Data",newOwner:"Nowy właściciel",oldOwner:"Stary właściciel",village:"Wioska",title:"Przejęcia"},en_DK:{date:"Date",newOwner:"New owner",oldOwner:"Old owner",village:"Village",title:"Ennoblements"}};var a=()=>e[window.game_data.locale]||e.en_DK;exports.default=a;
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;const e={pl_PL:{date:"Data",newOwner:"Nowy właściciel",oldOwner:"Poprzedni właściciel",village:"Wioska",title:"Przejęcia"},en_DK:{date:"Date",newOwner:"New owner",oldOwner:"Old owner",village:"Village",title:"Ennoblements"}};var l=()=>e[window.game_data.locale]||e.en_DK;exports.default=l;
},{}],"chDM":[function(require,module,exports) {
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.POPUP_SELECTOR=void 0;const e=".popup_helper",t="#inline_popup";exports.POPUP_SELECTOR=t;var o=function(){let{e:e,title:o,html:n,id:l}=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};const p=document.querySelector(t);p&&(p.style.width="auto",p.style.maxWidth="1000px"),p.classList.contains("show")?(p.querySelector("#inline_popup_title").innerHTML=o,p.querySelector("#inline_popup_content").innerHTML=n):inlinePopup(e,l,null,{offset_x:0,offset_y:0},n,o);const i=document.querySelector(".popup_helper");i&&(i.style.width="auto",i.style.position="fixed",i.style.zIndex="50001")};exports.default=o;
},{}],"vNT1":[function(require,module,exports) {

2
src/extendedMapPopup.js
View File

@ -183,7 +183,7 @@ const buildUnitHeader = (unit, index) => {
const buildUnitArrivalInfo = (t, index) => {
return `
<td style="padding: 2px; background-color: ${getUnitTdBgColor(index)};">
${formatDate(addMinutes(new Date(Timing.getCurrentServerTime()), t))}
${formatDate(addMinutes(Timing.getCurrentServerTime(), t))}
</td>
`;
};

46
src/extendedPlayerProfile.js
View File

@ -5,6 +5,7 @@ import renderTodaysStats from './common/renderTodaysStats';
import showPopup from './utils/showPopup';
import showEnnoblementsPopup from './common/showEnnoblementsPopup';
import showHistoryPopup from './common/showHistoryPopup';
import hyphensToCamelCase from './utils/hyphensToCamelCase';
import {
generatePaginationItems,
getContainerStyles,
@ -21,9 +22,9 @@ import { setItem, getItem } from './utils/localStorage';
// ==UserScript==
// @name Extended player profile
// @namespace https://github.com/tribalwarshelp/scripts
// @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
// @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
// @version 1.1.3
// @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
// @version 1.1.4
// @description Extended player profile
// @author Kichiyaki http://dawid-wysokinski.pl/
// @match *://*/game.php*screen=info_player*
@ -238,34 +239,23 @@ const loadData = async () => {
});
if (data.player) {
const inADay = {};
inADay.att = await loadInADayData('kill_att', {
const filter = {
name: data.player.name,
playerID: data.player.id,
});
inADay.def = await loadInADayData('kill_def', {
name: data.player.name,
playerID: data.player.id,
});
inADay.sup = await loadInADayData('kill_sup', {
name: data.player.name,
playerID: data.player.id,
});
inADay.lootRes = await loadInADayData('loot_res', {
name: data.player.name,
playerID: data.player.id,
});
inADay.lootVil = await loadInADayData('loot_vil', {
name: data.player.name,
playerID: data.player.id,
});
inADay.scavenge = await loadInADayData('scavenge', {
name: data.player.name,
playerID: data.player.id,
});
inADay.conquer = await loadInADayData('conquer', {
name: data.player.name,
playerID: data.player.id,
});
};
for (let type of [
'kill_att',
'kill_def',
'kill_sup',
'loot_res',
'loot_vil',
'scavenge',
'conquer',
]) {
inADay[
hyphensToCamelCase(type.replace('kill_', ''))
] = await loadInADayData(type, filter);
}
data.player.inADay = inADay;
}
cachePlayerData(data);

8
src/utils/hyphensToCamelCase.js Normal file
View File

@ -0,0 +1,8 @@
export default (str) => {
const arr = str.split(/[_-]/);
let newStr = '';
for (let i = 1; i < arr.length; i++) {
newStr += arr[i].charAt(0).toUpperCase() + arr[i].slice(1);
}
return arr[0] + newStr;
};