Skip to content

Commit 1993108

Browse files
TynarusTynarus
committed
Moving engine/world/action to engine/action, as the action pipeline is not part of the game world so much as the game engine. Also fixing imports within every action hook descriptor file.
1 parent b5bd5da commit 1993108

File tree

149 files changed

+268
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+268
-305
lines changed

src/engine/world/action/action-pipeline.ts renamed to src/engine/action/action-pipeline.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { gameEngineDist } from '@engine/util/directories';
2-
import { getFiles } from '@engine/util/files';
3-
import { logger } from '@runejs/core';
4-
import { Actor } from '@engine/world/actor/actor';
5-
import { ActionHook, TaskExecutor } from '@engine/world/action/hooks';
6-
import { Position } from '@engine/world/position';
7-
import { Player } from '@engine/world/actor/player/player';
81
import { Subscription } from 'rxjs';
2+
3+
import { logger } from '@runejs/core';
94
import { LandscapeObject } from '@runejs/filestore';
105

6+
import { gameEngineDist, getFiles } from '@engine/util';
7+
import { Actor, Player } from '@engine/world/actor';
8+
import { ActionHook, TaskExecutor } from '@engine/action';
9+
import { Position } from '@engine/world';
10+
1111

1212
/**
1313
* The priority of an queueable action within the pipeline.
@@ -44,7 +44,8 @@ export type ActionType =
4444
| 'player_command'
4545
| 'player_interaction'
4646
| 'region_change'
47-
| 'equipment_change';
47+
| 'equipment_change'
48+
| 'prayer';
4849

4950

5051
export const gentleActions: ActionType[] = [
@@ -258,4 +259,4 @@ export async function loadActionFiles(): Promise<void> {
258259
}
259260

260261

261-
export * from './hooks/index';
262+
export * from './hooks';

src/engine/world/action/button.action.ts renamed to src/engine/action/button.action.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Player } from '@engine/world/actor/player/player';
2-
import { ActionHook, getActionHooks } from '@engine/world/action/hooks';
3-
import { advancedNumberHookFilter, questHookFilter } from '@engine/world/action/hooks/hook-filters';
4-
import { ActionPipe, RunnableHooks } from '@engine/world/action/action-pipeline';
1+
import { Player } from '@engine/world/actor';
2+
import {
3+
ActionHook, getActionHooks, advancedNumberHookFilter, questHookFilter, ActionPipe, RunnableHooks
4+
} from '@engine/action';
55

66

77
/**

src/engine/world/action/equipment-change.action.ts renamed to src/engine/action/equipment-change.action.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Player } from '@engine/world/actor/player/player';
2-
import { ActionHook, getActionHooks } from '@engine/world/action/hooks';
3-
import { findItem } from '@engine/config/config-handler';
4-
import { EquipmentSlot, ItemDetails } from '@engine/config/item-config';
5-
import { numberHookFilter, stringHookFilter, questHookFilter } from '@engine/world/action/hooks/hook-filters';
6-
import { ActionPipe, RunnableHooks } from '@engine/world/action/action-pipeline';
1+
import { Player } from '@engine/world/actor';
2+
import { findItem, EquipmentSlot, ItemDetails } from '@engine/config';
3+
import {
4+
ActionHook, getActionHooks, numberHookFilter, stringHookFilter, questHookFilter, ActionPipe, RunnableHooks
5+
} from '@engine/action';
76

87

98
/**

src/engine/world/action/hooks/index.ts renamed to src/engine/action/hooks/action-hook.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { QuestKey } from '@engine/config/quest-config';
2-
import { ActionStrength, ActionType } from '@engine/world/action/action-pipeline';
3-
import { HookTask } from '@engine/world/action/hooks/task';
1+
import { QuestKey } from '@engine/config';
2+
import { ActionStrength, ActionType, HookTask } from '@engine/action';
43
import { actionHookMap } from '@engine/plugins';
54

65

@@ -58,7 +57,3 @@ export const getActionHooks = <T extends ActionHook>(actionType: ActionType, fil
5857
export function sortActionHooks<T = any>(actionHooks: ActionHook<T>[]): ActionHook<T>[] {
5958
return actionHooks.sort(actionHook => actionHook.questRequirement !== undefined ? -1 : 1);
6059
}
61-
62-
63-
export * from './hook-filters';
64-
export * from './task';

src/engine/world/action/hooks/hook-filters.ts renamed to src/engine/action/hooks/hook-filters.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Player } from '@engine/world/actor/player/player';
2-
import { ActionHook } from '@engine/world/action/hooks/index';
1+
import { ActionHook } from '@engine/action';
2+
import { Player } from '@engine/world/actor';
33

44

55
export const stringHookFilter = (expected: string | string[], input: string): boolean => {

‎src/engine/action/hooks/index.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export * from './hook-filters';
2+
export * from './task';
3+
export * from './action-hook';

src/engine/world/action/hooks/task.ts renamed to src/engine/action/hooks/task.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import uuidv4 from 'uuid/v4';
22
import { lastValueFrom, Subscription, timer } from 'rxjs';
3-
import { Actor } from '@engine/world/actor/actor';
4-
import { ActionHook } from '@engine/world/action/action-pipeline';
5-
import { World } from '@engine/world/world';
3+
64
import { logger } from '@runejs/core';
7-
import { Player } from '@engine/world/actor/player/player';
8-
import { Npc } from '@engine/world/actor/npc';
9-
import { ActionStrength } from '@engine/world/action/action-pipeline';
5+
6+
import { ActionHook, ActionStrength } from '@engine/action';
7+
import { World } from '@engine/world';
8+
import { Actor, Player, Npc } from '@engine/world/actor';
109

1110

1211
export type TaskSessionData = { [key: string]: any };

src/engine/world/action/index.ts renamed to src/engine/action/index.ts

File renamed without changes.

src/engine/world/action/item-interaction.action.ts renamed to src/engine/action/item-interaction.action.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Player } from '@engine/world/actor/player/player';
2-
import { ActionHook, getActionHooks } from '@engine/world/action/hooks';
3-
import { ItemDetails } from '@engine/config/item-config';
4-
import { findItem } from '@engine/config/config-handler';
5-
import { numberHookFilter, stringHookFilter, questHookFilter } from '@engine/world/action/hooks/hook-filters';
6-
import { ActionPipe, RunnableHooks } from '@engine/world/action/action-pipeline';
1+
import { Player } from '@engine/world/actor';
2+
import { findItem, ItemDetails } from '@engine/config';
3+
import {
4+
ActionHook, getActionHooks, numberHookFilter, stringHookFilter, questHookFilter, ActionPipe, RunnableHooks
5+
} from '@engine/action';
76

87

98
/**

src/engine/world/action/item-on-item.action.ts renamed to src/engine/action/item-on-item.action.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import { Player } from '@engine/world/actor/player/player';
2-
import { Item } from '@engine/world/items/item';
3-
import { ActionHook, getActionHooks } from '@engine/world/action/hooks';
4-
import { questHookFilter } from '@engine/world/action/hooks/hook-filters';
5-
import { ActionPipe, RunnableHooks } from '@engine/world/action/action-pipeline';
1+
import { Player } from '@engine/world/actor';
2+
import { Item } from '@engine/world';
3+
import { ActionHook, getActionHooks, questHookFilter, ActionPipe, RunnableHooks } from '@engine/action';
64

75

86
/**

0 commit comments

Comments
 (0)