Skip to content

Commit f8bc7bf

Browse files
KatilithKatilith
authored
Merge pull request #375 from gruckion/rs2-woodcutting-all-tree-objects
chore: 🔧 Adds all the tree objects for woodcutting
2 parents 110ec88 + 613fe05 commit f8bc7bf

File tree

3 files changed

+107
-40
lines changed

3 files changed

+107
-40
lines changed

‎src/engine/world/config/harvestable-object.ts‎

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,20 @@ const TEAK_OBJECTS: Map<number, number> = new Map<number, number>([
7878
...objectIds.tree.teak.map((tree) => [tree.default, tree.stump]),
7979
] as [number, number][]);
8080

81+
const DRAMEN_OBJECTS: Map<number, number> = new Map<number, number>([
82+
...objectIds.tree.dramen.map((tree) => [tree.default, tree.stump]),
83+
] as [number, number][]);
84+
8185

8286
const MAPLE_OBJECTS: Map<number, number> = new Map<number, number>([
8387
...objectIds.tree.maple.map((tree) => [tree.default, tree.stump]),
8488
] as [number, number][]);
8589

8690

91+
const HOLLOW_OBJECTS: Map<number, number> = new Map<number, number>([
92+
...objectIds.tree.hollow.map((tree) => [tree.default, tree.stump]),
93+
] as [number, number][]);
94+
8795
const MAHOGANY_OBJECTS: Map<number, number> = new Map<number, number>([
8896
...objectIds.tree.mahogany.map((tree) => [tree.default, tree.stump]),
8997
] as [number, number][]);
@@ -245,8 +253,8 @@ const Trees: IHarvestable[] = [
245253
itemId: itemIds.logs.normal,
246254
level: 1,
247255
experience: 25,
248-
respawnLow: 10,
249-
respawnHigh: 20,
256+
respawnLow: 59,
257+
respawnHigh: 98,
250258
baseChance: 70,
251259
break: 100
252260
},
@@ -255,8 +263,8 @@ const Trees: IHarvestable[] = [
255263
itemId: itemIds.logs.achey,
256264
level: 1,
257265
experience: 25,
258-
respawnLow: 10,
259-
respawnHigh: 20,
266+
respawnLow: 59,
267+
respawnHigh: 98,
260268
baseChance: 70,
261269
break: 100
262270
},
@@ -265,8 +273,8 @@ const Trees: IHarvestable[] = [
265273
itemId: itemIds.logs.oak,
266274
level: 15,
267275
experience: 37.5,
268-
respawnLow: 20,
269-
respawnHigh: 30,
276+
respawnLow: 14,
277+
respawnHigh: 14,
270278
baseChance: 50,
271279
break: 100 / 8
272280
},
@@ -275,8 +283,8 @@ const Trees: IHarvestable[] = [
275283
itemId: itemIds.logs.willow,
276284
level: 30,
277285
experience: 67.5,
278-
respawnLow: 40,
279-
respawnHigh: 50,
286+
respawnLow: 14,
287+
respawnHigh: 14,
280288
baseChance: 30,
281289
break: 100 / 8
282290
},
@@ -285,18 +293,39 @@ const Trees: IHarvestable[] = [
285293
itemId: itemIds.logs.teak,
286294
level: 35,
287295
experience: 85,
288-
respawnLow: 50,
289-
respawnHigh: 60,
296+
respawnLow: 15,
297+
respawnHigh: 15,
290298
baseChance: 0,
291299
break: 100 / 8
292300
},
301+
302+
{
303+
objects: DRAMEN_OBJECTS,
304+
itemId: itemIds.logs.dramenbranch,
305+
level: 36,
306+
experience: 0,
307+
respawnLow: 0,
308+
respawnHigh: 0,
309+
baseChance: 100,
310+
break: 0
311+
},
293312
{
294313
objects: MAPLE_OBJECTS,
295314
itemId: itemIds.logs.maple,
296315
level: 45,
297316
experience: 100,
298-
respawnLow: 100,
299-
respawnHigh: 120,
317+
respawnLow: 59,
318+
respawnHigh: 59,
319+
baseChance: 0,
320+
break: 100 / 8
321+
},
322+
{
323+
objects: HOLLOW_OBJECTS,
324+
itemId: itemIds.logs.bark,
325+
level: 45,
326+
experience: 82.5,
327+
respawnLow: 43,
328+
respawnHigh: 44,
300329
baseChance: 0,
301330
break: 100 / 8
302331
},
@@ -305,8 +334,8 @@ const Trees: IHarvestable[] = [
305334
itemId: itemIds.logs.mahogany,
306335
level: 50,
307336
experience: 125,
308-
respawnLow: 200,
309-
respawnHigh: 220,
337+
respawnLow: 14,
338+
respawnHigh: 14,
310339
baseChance: -5,
311340
break: 100 / 8
312341
},
@@ -315,8 +344,8 @@ const Trees: IHarvestable[] = [
315344
itemId: itemIds.logs.yew,
316345
level: 60,
317346
experience: 175,
318-
respawnLow: 300,
319-
respawnHigh: 320,
347+
respawnLow: 99,
348+
respawnHigh: 99,
320349
baseChance: -15,
321350
break: 100 / 8
322351
},
@@ -325,8 +354,8 @@ const Trees: IHarvestable[] = [
325354
itemId: itemIds.logs.magic,
326355
level: 75,
327356
experience: 250,
328-
respawnLow: 800,
329-
respawnHigh: 820,
357+
respawnLow: 199,
358+
respawnHigh: 199,
330359
baseChance: -25,
331360
break: 100 / 8
332361
},

‎src/engine/world/config/item-ids.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,9 @@ export const itemIds = {
398398
oak: 1521,
399399
willow: 1519,
400400
teak: 6333,
401+
dramenbranch:771,
401402
maple: 1517,
403+
bark: 3239,
402404
mahogany: 6332,
403405
yew: 1515,
404406
magic: 1513

‎src/engine/world/config/object-ids.ts‎

Lines changed: 58 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,51 +26,87 @@ export const objectIds = {
2626
tree: {
2727
normal: [
2828
{ default: 1276, stump: 1342 },
29-
{ default: 1278, stump: 1342 }
29+
{ default: 1277, stump: 1343 },
30+
{ default: 1278, stump: 1342 },
31+
{ default: 1279, stump: 1345 },
32+
{ default: 1280, stump: 1343 },
33+
{ default: 1315, stump: 1342 },
34+
{ default: 1316, stump: 1355 },
35+
{ default: 1318, stump: 1355 },
36+
{ default: 1319, stump: 1355 },
37+
{ default: 1330, stump: 1357 },
38+
{ default: 1331, stump: 1357 },
39+
{ default: 1332, stump: 1357 },
40+
{ default: 3033, stump: 1345 },
41+
{ default: 3034, stump: 1345 },
42+
{ default: 3879, stump: 3880 },
43+
{ default: 3881, stump: 3880 },
44+
{ default: 3882, stump: 3880 },
45+
// { default: 3883, stump: 3884 }, // sigex: no matching stump
46+
{ default: 14308, stump: 1342 }, // Sigex questionable object, high value
47+
{ default: 14309, stump: 1342 }, // Sigex questionable object, high value
3048
],
3149
dead: [
50+
// Sigex: OSRS has an extra root on the stump too
3251
{ default: 1282, stump: 1347 },
3352
{ default: 1283, stump: 1347 },
53+
{ default: 1284, stump: 1348 },
54+
{ default: 1285, stump: 1349 },
3455
{ default: 1286, stump: 1351 },
3556
{ default: 1289, stump: 1353 },
36-
{ default: 1365, stump: 1352 }
57+
{ default: 1290, stump: 1354 },
58+
{ default: 1291, stump: 1351 },
59+
{ default: 1365, stump: 1352 },
60+
{ default: 1383, stump: 1358 },
61+
{ default: 1384, stump: 1359 },
62+
{ default: 3035, stump: 1347 },
63+
// { default: 3036, stump: 1351 },// Sigex: no suitable stump offset looks wrong
64+
{ default: 5902, stump: 1347 },
65+
{ default: 5903, stump: 1351 },
66+
{ default: 5904, stump: 1351 },
3767
],
3868
archey: [
3969
{ default: 2023, stump: 3371 }
4070
],
4171
oak: [
42-
{ default: 1281, stump: 1342 },
43-
{ default: 3037, stump: 1342 }
72+
{ default: 1281, stump: 1356 },
73+
// { default: 3037, stump: 1342 }, // Sigex: dark Oak tutorial island no stump
74+
{ default: 8467, stump: 0 } // Farming
4475
],
4576
willow: [
46-
{ default: 5551, stump: 1324 },
47-
{ default: 1308, stump: 1324 },
48-
{ default: 5552, stump: 1324 },
49-
{ default: 5553, stump: 1324 },
50-
{ default: 8481, stump: 1324 },
51-
{ default: 8482, stump: 1324 },
52-
{ default: 8483, stump: 1324 },
53-
{ default: 8484, stump: 1324 },
54-
{ default: 8485, stump: 1324 },
55-
{ default: 8486, stump: 1324 },
56-
{ default: 8487, stump: 1324 },
57-
{ default: 8488, stump: 1324 },
77+
{ default: 1308, stump: 7399 },
78+
{ default: 5551, stump: 5554 },
79+
{ default: 5552, stump: 5554 }, // Sigex: offset is wrong
80+
{ default: 5553, stump: 5554 }, // Sigex: offset is wrong
81+
{ default: 8487, stump: 1324 }, // Farming
82+
// { default: 8488, stump: 1324 }, // Farming
5883
],
5984
teak: [
60-
{ default: 9036, stump: 1342 },
85+
{ default: 9036, stump: 9037 },
86+
{ default: 15062, stump: 9037 }, // Sigex: questionable object, high value
87+
],
88+
dramen: [
89+
{ default: 1292, stump: -1 },
6190
],
6291
maple: [
63-
{ default: 1307, stump: 1342 },
64-
{ default: 4674, stump: 1342 },
92+
{ default: 1307, stump: 7400 },
93+
{ default: 4674, stump: 7400 },
94+
// { default: 8444, stump: 0 }, // Farming
95+
],
96+
hollow: [
97+
{ default: 2289, stump: 2310 },
98+
{ default: 4060, stump: 4061 },
6599
],
66100
mahogany: [
67-
{ default: 9034, stump: 1342 },
101+
{ default: 9034, stump: 9035 },
68102
],
69103
yew: [
70-
{ default: 1309, stump: 1342 },
104+
{ default: 1309, stump: 7402 },
105+
// { default: 8513, stump: 0 }, // Farming
71106
],
72107
magic: [
73-
{ default: 1292, stump: 1324 },
108+
{ default: 1306, stump: 7401 },
109+
// { default: 8409, stump: 0 }, // Farming
74110
],
75111
},
76112
default: {

0 commit comments

Comments
 (0)