Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: attack percentage based on api data instead of calculated data #127

Merged
merged 3 commits into from
Jun 27, 2018
Merged

fix: attack percentage based on api data instead of calculated data #127

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
201a1fa
fix: attack percentage based on api data instead of calculated data
TobiTenno Jun 22, 2018
cb8105c
fix: one more spot for invasion completion percent
TobiTenno Jun 22, 2018
3c03984
Merge branch 'dev' into fix/invasion-percentage
Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions assets/js/updaters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,9 +881,7 @@ function updateInvasions() {
$(`#${invasion.id}`).remove();
} else {
$(`#${invasion.id}_info`).html(`<b>${invasion.node}</b><br>${invasion.desc} ${endTimeEstimate}`);
const attackPercent =
Math.floor(((invasion.count + invasion.requiredRuns)
/ (invasion.requiredRuns * 2)) * 100);
const attackPercent = invasion.completion;
const defendPercent = 100 - attackPercent;

const attackBar = $(`#${invasion.id}_progress`).children()[0];
Expand Down Expand Up @@ -938,16 +936,13 @@ function updateInvasions() {
}
}
invasionRow += '</div>';

invasionRow += '<div class="row" style="margin-left:5px; margin-right:5px">';

const runningTimeBadge = `<span class="timer" data-starttime="${moment(invasion.activation).unix()}">...</span>`;
const progress = $(`<div class="progress" id="${invasion.id}_progress" data-html="true" data-placement="top" data-toggle="popover" title="Running time" style="cursor: pointer"></div>`);
progress.attr('data-content', runningTimeBadge);

const attackPercent =
Math.floor(((invasion.count + invasion.requiredRuns)
/ (invasion.requiredRuns * 2)) * 100);
const attackPercent = invasion.completion;
const defendPercent = 100 - attackPercent;
let attackWinning = '';
let defendWinning = '';
Expand All @@ -968,7 +963,7 @@ function updateInvasions() {
const sound = JSON.parse(localStorage.getItem('soundoptions') || '[]').includes('sound_invasion');
const rewards = `${invasion.attackerReward.asString.length ? `${invasion.attackerReward.asString} vs ` : ''}${invasion.defenderReward.asString}`;
sendNotification(
`${invasion.desc} • ${invasion.node}\n${invasion.attackingFaction} vs ${invasion.defendingFaction}\n${invasion.eta} Remaining`,
`${invasion.desc} • ${invasion.node}\n${invasion.attackingFaction} vs ${invasion.defendingFaction}\n${invasion.eta.replace('-Infinityd', '??').replace('Infinityd', '??')} Remaining`,
`${rewards}`, sound ? 'audio/TextMessage_SingleDrumHit.mp3' : undefined,
);
addNotifiedId(invasion.id);
Expand Down