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

Refactoring

Browse Source
This commit is contained in:
Anton Vakhrushev 2020-05-17 12:17:55 +03:00
parent 9e59c7b7cc
commit 91684d0bad
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Task/BuildBuildingTask.ts
View File

@ -4,18 +4,17 @@ import { ActionDefinition, TaskController } from './TaskController';
import { Task } from '../Queue/TaskProvider'; import { Task } from '../Queue/TaskProvider';
import { path } from '../Helpers/Path'; import { path } from '../Helpers/Path';
import { registerTask, TaskType } from './TaskMap'; import { registerTask, TaskType } from './TaskMap';
import { taskError } from '../Errors';
import { goToResourceViewPage } from './ActionBundles';
@registerTask({ type: TaskType.Building }) @registerTask({ type: TaskType.Building })
export class BuildBuildingTask extends TaskController { export class BuildBuildingTask extends TaskController {
defineActions(task: Task): Array<ActionDefinition> { defineActions(task: Task): Array<ActionDefinition> {
const args = task.args; const args = task.args;
const villageId = args.villageId || taskError('No village id');
return [ return [
[ goToResourceViewPage(villageId),
GoToPageAction.name,
{
path: path('/dorf1.php', { newdid: args.villageId }),
},
],
[ [
GoToPageAction.name, GoToPageAction.name,
{ {

11
src/Task/ResourcesToLevel.ts
View File

@ -1,16 +1,15 @@
import { TaskController, ActionDefinition } from './TaskController'; import { TaskController, ActionDefinition } from './TaskController';
import { GoToPageAction } from '../Action/GoToPageAction';
import { UpgradeResourceToLevel } from '../Action/UpgradeResourceToLevel'; import { UpgradeResourceToLevel } from '../Action/UpgradeResourceToLevel';
import { Task } from '../Queue/TaskProvider'; import { Task } from '../Queue/TaskProvider';
import { path } from '../Helpers/Path';
import { registerTask } from './TaskMap'; import { registerTask } from './TaskMap';
import { goToResourceViewPage } from './ActionBundles';
import { taskError } from '../Errors';
@registerTask() @registerTask()
export class ResourcesToLevel extends TaskController { export class ResourcesToLevel extends TaskController {
defineActions(task: Task): Array<ActionDefinition> { defineActions(task: Task): Array<ActionDefinition> {
return [ const villageId = task.args.villageId || taskError('No village id');
[GoToPageAction.name, { path: path('/dorf1.php', { newdid: task.args.villageId }) }],
[UpgradeResourceToLevel.name], return [goToResourceViewPage(villageId), [UpgradeResourceToLevel.name]];
];
} }
} }

11
src/Task/UpgradeBuildingTask.ts
View File

@ -4,18 +4,17 @@ import { GoToPageAction } from '../Action/GoToPageAction';
import { Task } from '../Queue/TaskProvider'; import { Task } from '../Queue/TaskProvider';
import { path } from '../Helpers/Path'; import { path } from '../Helpers/Path';
import { registerTask, TaskType } from './TaskMap'; import { registerTask, TaskType } from './TaskMap';
import { goToResourceViewPage } from './ActionBundles';
import { taskError } from '../Errors';
@registerTask({ type: TaskType.Building }) @registerTask({ type: TaskType.Building })
export class UpgradeBuildingTask extends TaskController { export class UpgradeBuildingTask extends TaskController {
defineActions(task: Task): Array<ActionDefinition> { defineActions(task: Task): Array<ActionDefinition> {
const args = task.args; const args = task.args;
const villageId = args.villageId || taskError('No village id');
return [ return [
[ goToResourceViewPage(villageId),
GoToPageAction.name,
{
path: path('/dorf1.php', { newdid: args.villageId }),
},
],
[ [
GoToPageAction.name, GoToPageAction.name,
{ {