av/travian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve slot markers

Browse Source
This commit is contained in:
Anton Vakhrushev
2020-05-03 15:08:21 +03:00
parent d2d5a039f6
commit 08d50921cf
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ControlPanel.ts
View File

@@ -5,6 +5,7 @@ import { UpgradeBuildingTask } from './Task/UpgradeBuildingTask';
import { grabActiveVillageId, grabVillageList } from './Page/VillageBlock'; import { grabActiveVillageId, grabVillageList } from './Page/VillageBlock';
import { import {
grabResourceDeposits, grabResourceDeposits,
onBuildingSlotCtrlClick,
onResourceSlotCtrlClick, onResourceSlotCtrlClick,
showBuildingSlotIds, showBuildingSlotIds,
showResourceSlotIds, showResourceSlotIds,
@@ -114,19 +115,27 @@ export class ControlPanel {
}, 500) }, 500)
); );
const tasks = this.scheduler.getTaskItems(); const getBuildingsInQueue = () =>
const buildingsInQueue = tasks this.scheduler
.filter(t => t.name === UpgradeBuildingTask.name && t.args.villageId === villageId) .getTaskItems()
.map(t => t.args.buildId || 0); .filter(t => t.name === UpgradeBuildingTask.name && t.args.villageId === villageId)
.map(t => t.args.buildId || 0);
if (p.pathname === '/dorf1.php') { if (p.pathname === '/dorf1.php') {
showResourceSlotIds(buildingsInQueue); showResourceSlotIds(getBuildingsInQueue());
onResourceSlotCtrlClick(buildId => this.onResourceSlotCtrlClick(villageId, buildId));
state.quickActions.push(...this.createDepositsQuickActions(villageId)); state.quickActions.push(...this.createDepositsQuickActions(villageId));
onResourceSlotCtrlClick(buildId => {
this.onSlotCtrlClick(villageId, buildId);
showResourceSlotIds(getBuildingsInQueue());
});
} }
if (p.pathname === '/dorf2.php') { if (p.pathname === '/dorf2.php') {
showBuildingSlotIds(buildingsInQueue); showBuildingSlotIds(getBuildingsInQueue());
onBuildingSlotCtrlClick(buildId => {
this.onSlotCtrlClick(villageId, buildId);
showBuildingSlotIds(getBuildingsInQueue());
});
} }
if (isBuildingPage()) { if (isBuildingPage()) {
@@ -166,7 +175,7 @@ export class ControlPanel {
return quickActions; return quickActions;
} }
private onResourceSlotCtrlClick(villageId: number, buildId: number) { private onSlotCtrlClick(villageId: number, buildId: number) {
this.scheduler.scheduleTask(UpgradeBuildingTask.name, { villageId, buildId }); this.scheduler.scheduleTask(UpgradeBuildingTask.name, { villageId, buildId });
notify(`Building ${buildId} scheduled`); notify(`Building ${buildId} scheduled`);
} }

17
src/Page/SlotBlock.ts
View File

@@ -22,7 +22,8 @@ function showSlotIds(prefix: string, buildingIds: Array<number>): void {
const upCount = buildingIds.filter(id => id === slot.buildId).length; const upCount = buildingIds.filter(id => id === slot.buildId).length;
const $slotEl = jQuery(slot.el); const $slotEl = jQuery(slot.el);
const $labelEl = $slotEl.find('.labelLayer'); const $labelEl = $slotEl.find('.labelLayer');
const oldLabel = $labelEl.text(); const oldLabel = $labelEl.data('oldLabel') || $labelEl.text();
$labelEl.data('oldLabel', oldLabel);
$labelEl.text(slot.buildId + ':' + oldLabel + (upCount > 0 ? '+' + upCount : '')); $labelEl.text(slot.buildId + ':' + oldLabel + (upCount > 0 ? '+' + upCount : ''));
$slotEl.css({ 'border-radius': '20%', 'width': upCount > 0 ? '56px' : '42px' }); $slotEl.css({ 'border-radius': '20%', 'width': upCount > 0 ? '56px' : '42px' });
$labelEl.css({ $labelEl.css({
@@ -50,8 +51,8 @@ export function showBuildingSlotIds(buildingIds: number[]): void {
showSlotIds('aid', buildingIds); showSlotIds('aid', buildingIds);
} }
export function onResourceSlotCtrlClick(cb: (buildId: number) => void): void { function onSlotCtrlClick(prefix: string, onClickHandler: (buildId: number) => void): void {
const slots = slotElements('buildingSlot'); const slots = slotElements(prefix);
slots.forEach(slot => { slots.forEach(slot => {
jQuery(slot.el) jQuery(slot.el)
.find('.labelLayer') .find('.labelLayer')
@@ -59,12 +60,20 @@ export function onResourceSlotCtrlClick(cb: (buildId: number) => void): void {
if (evt.ctrlKey) { if (evt.ctrlKey) {
evt.preventDefault(); evt.preventDefault();
evt.stopPropagation(); evt.stopPropagation();
cb(slot.buildId); onClickHandler(slot.buildId);
} }
}); });
}); });
} }
export function onResourceSlotCtrlClick(onClickHandler: (buildId: number) => void): void {
onSlotCtrlClick('buildingSlot', onClickHandler);
}
export function onBuildingSlotCtrlClick(onClickHandler: (buildId: number) => void): void {
onSlotCtrlClick('aid', onClickHandler);
}
function slotToDepositMapper(slot: Slot): ResourceDeposit { function slotToDepositMapper(slot: Slot): ResourceDeposit {
const el = slot.el; const el = slot.el;
const classes = jQuery(el).attr('class'); const classes = jQuery(el).attr('class');