Fix trooper training
This commit is contained in:
src
@ -1,20 +1,23 @@
|
||||
import { ActionController, err, registerAction } from './ActionController';
|
||||
import { TryLaterError } from '../Errors';
|
||||
import { aroundMinutes } from '../utils';
|
||||
import { aroundMinutes, randomInRange } from '../utils';
|
||||
import { Args } from '../Queue/Args';
|
||||
import { Task } from '../Queue/TaskProvider';
|
||||
import { clickTrainButton, fillTrainCount, getAvailableCount } from '../Page/BuildingPage/TrooperPage';
|
||||
import { TrainTroopTask } from '../Task/TrainTroopTask';
|
||||
import { Resources } from '../Core/Resources';
|
||||
|
||||
@registerAction
|
||||
export class TrainTrooperAction extends ActionController {
|
||||
async run(args: Args, task: Task): Promise<any> {
|
||||
const troopId = args.troopId || err('No troop id');
|
||||
const trainCount = args.trainCount || err('No troop train count');
|
||||
const troopResources = args.troopResources || err('No troop resources');
|
||||
|
||||
const availableCount = getAvailableCount(troopId);
|
||||
const desiredCount = randomInRange(3, 12);
|
||||
|
||||
const readyToTrainCount = Math.min(availableCount, trainCount);
|
||||
const readyToTrainCount = Math.min(availableCount, trainCount, desiredCount);
|
||||
const nextToTrainCount = trainCount - readyToTrainCount;
|
||||
|
||||
if (readyToTrainCount <= 0) {
|
||||
@ -22,7 +25,11 @@ export class TrainTrooperAction extends ActionController {
|
||||
}
|
||||
|
||||
if (nextToTrainCount > 0) {
|
||||
this.scheduler.scheduleTask(TrainTroopTask.name, { ...task.args, trainCount: nextToTrainCount });
|
||||
this.scheduler.scheduleTask(TrainTroopTask.name, {
|
||||
...task.args,
|
||||
trainCount: nextToTrainCount,
|
||||
resources: Resources.fromObject(troopResources).scale(nextToTrainCount),
|
||||
});
|
||||
}
|
||||
|
||||
fillTrainCount(troopId, readyToTrainCount);
|
||||
|
Reference in New Issue
Block a user