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

Fix commitments calculation

Browse Source
This commit is contained in:
Anton Vakhrushev
2020-05-02 08:43:11 +03:00
parent 129f107881
commit 9f17ed2bc3
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Action/SendResourcesAction.ts
View File

@@ -25,7 +25,10 @@ export class SendResourcesAction extends ActionController {
console.log('Send', resources, 'to', coordinates);
const recipientVillage = this.findRecipientVillage(coordinates);
const recipientVillage = args.targetVillageId
? this.findRecipientVillageById(args.targetVillageId)
: this.findRecipientVillage(coordinates);
const readyToTransfer = this.getResourcesForTransfer(recipientVillage.id).min(resources);
const remainingResources = resources.sub(readyToTransfer).max(Resources.zero());
@@ -50,6 +53,15 @@ export class SendResourcesAction extends ActionController {
clickSendButton();
}
private findRecipientVillageById(villageId: number): Village {
const villageList = grabVillageList();
const village = villageList.find(v => v.id === villageId);
if (!village) {
throw new AbortTaskError('No village');
}
return village;
}
private findRecipientVillage(coordinates: Coordinates): Village {
const villageList = grabVillageList();
const village = villageList.find(v => v.crd.eq(coordinates));