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

Fix resources to level task

Browse Source
This commit is contained in:
Anton Vakhrushev 2020-04-27 11:36:01 +03:00
parent abb41dc86c
commit 822c4dc0ab
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Action/UpgradeResourceToLevel.ts
View File

@ -22,7 +22,7 @@ export class UpgradeResourceToLevel extends ActionController {
const requiredLevel = getNumber(args.level); const requiredLevel = getNumber(args.level);
const notUpgraded = deposits.filter(dep => requiredLevel > dep.level); const notUpgraded = deposits.filter(dep => !dep.underConstruction && requiredLevel > dep.level);
if (notUpgraded.length === 0) { if (notUpgraded.length === 0) {
this.scheduler.removeTask(task.id); this.scheduler.removeTask(task.id);

9
src/Game.ts
View File

@ -7,15 +7,10 @@ export class BuildingQueueInfo {
} }
} }
export class ResourceDeposit { export interface ResourceDeposit {
readonly buildId: number; readonly buildId: number;
readonly type: ResourceType; readonly type: ResourceType;
readonly level: number; readonly level: number;
readonly ready: boolean; readonly ready: boolean;
constructor(buildId: number, type: ResourceType, level: number, ready: boolean) { readonly underConstruction: boolean;
this.buildId = buildId;
this.type = type;
this.level = level;
this.ready = ready;
}
} }

12
src/Page/SlotBlock.ts
View File

@ -60,11 +60,13 @@ export function onResourceSlotCtrlClick(cb: (buildId: number) => void): void {
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');
const buildId = getNumber(elClassId(classes, 'buildingSlot')); return {
const level = getNumber(elClassId(classes, 'level')); buildId: getNumber(elClassId(classes, 'buildingSlot')),
const type = getNumber(elClassId(classes, 'gid')); type: numberToResourceType(getNumber(elClassId(classes, 'gid'))),
const ready = !jQuery(el).hasClass('notNow'); level: getNumber(elClassId(classes, 'level')),
return new ResourceDeposit(buildId, numberToResourceType(type), level, ready); ready: !jQuery(el).hasClass('notNow'),
underConstruction: jQuery(el).hasClass('underConstruction'),
};
} }
export function grabResourceDeposits(): Array<ResourceDeposit> { export function grabResourceDeposits(): Array<ResourceDeposit> {