bastion-siege-logic
Advanced tools
Comparing version 2.0.1 to 2.0.2
@@ -42,6 +42,6 @@ "use strict"; | ||
}); | ||
return Object.assign({}, basicRaw, { won, | ||
return Object.assign(Object.assign(Object.assign(Object.assign({}, basicRaw), { won, | ||
me, | ||
enemy, | ||
enemyAlliance }, winnersLosers, soldiers); | ||
enemyAlliance }), winnersLosers), soldiers); | ||
} | ||
@@ -62,6 +62,6 @@ function rawContentFromEnglish(content) { | ||
}); | ||
return Object.assign({}, basicRaw, { won, | ||
return Object.assign(Object.assign(Object.assign(Object.assign({}, basicRaw), { won, | ||
me, | ||
enemy, | ||
enemyAlliance }, winnersLosers, soldiers); | ||
enemyAlliance }), winnersLosers), soldiers); | ||
} | ||
@@ -112,3 +112,3 @@ function getWinnersLosersFromAllianceAttack(content, winnersRegex, losersRegex) { | ||
const friendsEnemies = getFriendsEnemies(raw); | ||
const battlereport = Object.assign({ attack, won: raw.won }, friendsEnemies, { soldiersAlive: raw.soldiersAlive, soldiersTotal: raw.soldiersTotal, gold }); | ||
const battlereport = Object.assign(Object.assign({ attack, won: raw.won }, friendsEnemies), { soldiersAlive: raw.soldiersAlive, soldiersTotal: raw.soldiersTotal, gold }); | ||
if (raw.gems) { | ||
@@ -115,0 +115,0 @@ battlereport.gems = raw.gems; |
@@ -11,3 +11,3 @@ "use strict"; | ||
const content = text_cleanup_1.inputTextCleanup(input); | ||
if (contentFilter.startsAny(content, JOIN_BEGIN_EMOJIS + 'Твоя армия присоединилась к осаде на', JOIN_BEGIN_EMOJIS + 'Your army joined the siege on', JOIN_BEGIN_EMOJIS + 'Your alliance successfully joined the siege of the castle. Your whole army is sent to its walls. All members of your alliance are notified of the siege.', JOIN_BEGIN_EMOJIS + 'Твой альянс успешно присоединился к осаде замка. Вся твоя армия отправлена к его стенам. Всем участникам твоего альянса отправлены уведомления о вступлении в осаду.')) { | ||
if (contentFilter.startsAny(content, JOIN_BEGIN_EMOJIS + 'Твоя армия присоединилась к осаде на', JOIN_BEGIN_EMOJIS + 'Your army joined the siege on', JOIN_BEGIN_EMOJIS + 'Your alliance successfully joined the siege ', JOIN_BEGIN_EMOJIS + 'Твой альянс успешно присоединился к осаде замка. Вся твоя армия отправлена к его стенам. Всем участникам твоего альянса отправлены уведомления о вступлении в осаду.')) { | ||
return { type: 'castleSiegeYouJoined' }; | ||
@@ -14,0 +14,0 @@ } |
@@ -31,5 +31,5 @@ "use strict"; | ||
const ingameTimestamp = Math.floor(unixTimestamp / 60) * 60; | ||
return Object.assign({}, parseGamescreenContent(content), { timestamp: unixTimestamp, ingameTimestamp }); | ||
return Object.assign(Object.assign({}, parseGamescreenContent(content)), { timestamp: unixTimestamp, ingameTimestamp }); | ||
} | ||
exports.parseGamescreen = parseGamescreen; | ||
//# sourceMappingURL=gamescreen.js.map |
@@ -54,3 +54,3 @@ "use strict"; | ||
const semitotalNeeded = Math.max(0, calcSemitotalGold(needed)); | ||
const income = calcSemitotalGoldIncome(Object.assign({}, buildings, { sawmill: needed.wood === 0 ? 0 : buildings.sawmill, mine: needed.stone === 0 ? 0 : buildings.mine })); | ||
const income = calcSemitotalGoldIncome(Object.assign(Object.assign({}, buildings), { sawmill: needed.wood === 0 ? 0 : buildings.sawmill, mine: needed.stone === 0 ? 0 : buildings.mine })); | ||
return Math.ceil(semitotalNeeded / income); | ||
@@ -57,0 +57,0 @@ } |
{ | ||
"name": "bastion-siege-logic", | ||
"version": "2.0.1", | ||
"version": "2.0.2", | ||
"description": "", | ||
@@ -40,3 +40,3 @@ "license": "MIT", | ||
"ava": "^2.0.0", | ||
"del-cli": "^2.0.0", | ||
"del-cli": "^3.0.0", | ||
"eslint-config-xo-typescript": "^0.15.0", | ||
@@ -43,0 +43,0 @@ "nyc": "^14.0.0", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
114890