Skip to content

Commit 83ca7f4

Browse files
committed
refactor: move data and types into separate files
1 parent e95e199 commit 83ca7f4

File tree

3 files changed

+55
-53
lines changed

3 files changed

+55
-53
lines changed
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import { findItem } from '@engine/config';
2+
import { Burnable } from './types';
3+
4+
export const FIREMAKING_LOGS: Burnable[] = [
5+
{
6+
logItem: findItem('rs:logs'),
7+
requiredLevel: 1,
8+
experienceGained: 40
9+
},
10+
{
11+
logItem: findItem('rs:oak_logs'),
12+
requiredLevel: 15,
13+
experienceGained: 60
14+
},
15+
{
16+
logItem: findItem('rs:willow_logs'),
17+
requiredLevel: 30,
18+
experienceGained: 90
19+
},
20+
{
21+
logItem: findItem('rs:teak_logs'),
22+
requiredLevel: 35,
23+
experienceGained: 105
24+
},
25+
{
26+
logItem: findItem('rs:maple_logs'),
27+
requiredLevel: 45,
28+
experienceGained: 135
29+
},
30+
{
31+
logItem: findItem('rs:mahogany_logs'),
32+
requiredLevel: 50,
33+
experienceGained: 157.5
34+
},
35+
{
36+
logItem: findItem('rs:yew_logs'),
37+
requiredLevel: 60,
38+
experienceGained: 202.5
39+
},
40+
{
41+
logItem: findItem('rs:magic_logs'),
42+
requiredLevel: 75,
43+
experienceGained: 303.8
44+
}
45+
];

src/plugins/skills/firemaking/index.ts

Lines changed: 3 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -9,57 +9,7 @@ import { soundIds } from '@engine/world/config/sound-ids';
99
import { animationIds } from '@engine/world/config/animation-ids';
1010
import { LandscapeObject } from '@runejs/filestore';
1111
import { loopingEvent } from '@engine/plugins';
12-
import { findItem, ItemDetails } from '@engine/config';
13-
14-
15-
interface Burnable {
16-
logItem: ItemDetails;
17-
requiredLevel: number;
18-
experienceGained: number;
19-
}
20-
21-
const logs: Burnable[] = [
22-
{
23-
logItem: findItem('rs:logs'),
24-
requiredLevel: 1,
25-
experienceGained: 40
26-
},
27-
{
28-
logItem: findItem('rs:oak_logs'),
29-
requiredLevel: 15,
30-
experienceGained: 60
31-
},
32-
{
33-
logItem: findItem('rs:willow_logs'),
34-
requiredLevel: 30,
35-
experienceGained: 90
36-
},
37-
{
38-
logItem: findItem('rs:teak_logs'),
39-
requiredLevel: 35,
40-
experienceGained: 105
41-
},
42-
{
43-
logItem: findItem('rs:maple_logs'),
44-
requiredLevel: 45,
45-
experienceGained: 135
46-
},
47-
{
48-
logItem: findItem('rs:mahogany_logs'),
49-
requiredLevel: 50,
50-
experienceGained: 157.5
51-
},
52-
{
53-
logItem: findItem('rs:yew_logs'),
54-
requiredLevel: 60,
55-
experienceGained: 202.5
56-
},
57-
{
58-
logItem: findItem('rs:magic_logs'),
59-
requiredLevel: 75,
60-
experienceGained: 303.8
61-
}
62-
];
12+
import { FIREMAKING_LOGS } from './data';
6313

6414
const canLight = (logLevel: number, playerLevel: number): boolean => {
6515
playerLevel++;
@@ -120,7 +70,7 @@ const action: itemOnItemActionHandler = (details) => {
12070

12171
const log = usedItem.itemId !== itemIds.tinderbox ? usedItem : usedWithItem;
12272
const removeFromSlot = usedItem.itemId !== itemIds.tinderbox ? usedSlot : usedWithSlot;
123-
const skillInfo = logs.find(l => l.logItem.gameId === log.itemId);
73+
const skillInfo = FIREMAKING_LOGS.find(l => l.logItem.gameId === log.itemId);
12474
const position = player.position;
12575

12676
if(!skillInfo) {
@@ -181,7 +131,7 @@ export default {
181131
hooks: [
182132
{
183133
type: 'item_on_item',
184-
items: logs.map(log => ({ item1: itemIds.tinderbox, item2: log.logItem.gameId })),
134+
items: FIREMAKING_LOGS.map(log => ({ item1: itemIds.tinderbox, item2: log.logItem.gameId })),
185135
handler: action
186136
}
187137
]
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { ItemDetails } from '@engine/config';
2+
3+
export type Burnable = {
4+
logItem: ItemDetails;
5+
requiredLevel: number;
6+
experienceGained: number;
7+
}

0 commit comments

Comments
 (0)