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-08 11:38:31 +03:00
parent f8173a90c0
commit 4f7e38a953
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/VillageState.ts
View File

@ -27,7 +27,13 @@ interface VillageOwnStateDictionary {
} }
export interface VillageState extends VillageOwnState { export interface VillageState extends VillageOwnState {
/**
* Resource commitments of this village to other
*/
commitments: Resources; commitments: Resources;
/**
* List of village id, from which resources ship to this village
*/
shipment: Array<number>; shipment: Array<number>;
} }
@ -88,10 +94,12 @@ function createVillageState(
scheduler: Scheduler scheduler: Scheduler
): VillageState { ): VillageState {
const villageIds = scheduler.getResourceShipmentVillageIds(state.id); const villageIds = scheduler.getResourceShipmentVillageIds(state.id);
const commitments = villageIds.reduce((res, villageId) => { const commitments = villageIds.reduce((memo, shipmentVillageId) => {
const villageRequired = ownStates[villageId].required; const shipmentVillageState = ownStates[shipmentVillageId];
const missing = villageRequired.balance.min(Resources.zero()); const shipmentVillageRequired = shipmentVillageState.required;
return res.add(missing); const shipmentVillageIncoming = shipmentVillageState.incomingResources;
const targetVillageMissing = shipmentVillageRequired.balance.add(shipmentVillageIncoming).min(Resources.zero());
return memo.add(targetVillageMissing);
}, Resources.zero()); }, Resources.zero());
return { ...state, commitments, shipment: villageIds }; return { ...state, commitments, shipment: villageIds };
} }