Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forestry update #5737

Merged
merged 29 commits into from
Mar 9, 2024
Merged

Forestry update #5737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f6fad78
Forestry update
nwjgit Feb 29, 2024
40334c2
minor fix
nwjgit Feb 29, 2024
ade3c22
fix a few issues
nwjgit Mar 2, 2024
a315e21
fix repeat trip & add forestry event option
nwjgit Mar 2, 2024
fdd6180
minor cleanup
nwjgit Mar 2, 2024
bec2f7c
normal Leaves
nwjgit Mar 2, 2024
4991c58
xp tweaks & add event tracking for future use with /data
nwjgit Mar 2, 2024
f97951b
xp fixes
nwjgit Mar 2, 2024
ffc2430
update Beehive event
nwjgit Mar 2, 2024
1bc62dc
fix egg rate, fix beehive rate/message
nwjgit Mar 4, 2024
81c61d0
remove lost log message if powerchopping
nwjgit Mar 4, 2024
5462958
add 15% variance to non verifiedXPRate events
nwjgit Mar 4, 2024
407a088
add 10% nest boost for wood cutting cape
nwjgit Mar 4, 2024
5bc22c4
fix felling axe not working with sulliusceps
nwjgit Mar 4, 2024
685058f
merge master
nwjgit Mar 4, 2024
75eb4e7
update creatablesTable
nwjgit Mar 4, 2024
c7f6165
add ForestryEvent inferface, change how xp is calculated, change how …
nwjgit Mar 5, 2024
e0c17f7
remove old commented out old code
nwjgit Mar 5, 2024
07dfa28
small fix
nwjgit Mar 5, 2024
b656e9c
small fix
nwjgit Mar 5, 2024
0be3417
fix feedback
nwjgit Mar 6, 2024
c876154
fix commandRunOptions
nwjgit Mar 6, 2024
45028c0
remove type from twitcherSetting
nwjgit Mar 6, 2024
1951141
fix import
nwjgit Mar 6, 2024
8e0d0c0
set default twitcher setting to egg without
nwjgit Mar 6, 2024
6f815fc
Merge branch 'master' into ForestryUpdate
nwjgit Mar 6, 2024
d12eb1e
fix twitcher glove clue chance
nwjgit Mar 6, 2024
ecee5da
remove Sulliuscep from forestry, make behive xp accurate and fix beeh…
nwjgit Mar 9, 2024
5211f03
change beeHive to beeHiveRepairs
nwjgit Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mahoji/commands/chop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export const chopCommand: OSBMahojiCommand = {
let wcLvl = skills.woodcutting;

// Invisible wc boost for woodcutting guild, forestry events don't happen in woodcutting guild
if (!forestry_events || resolveItems(['Redwood logs', 'Logs']).includes(log.id)) {
if (!forestry_events || resolveItems(['Redwood logs', 'Logs']).includes(log.id) || log.lootTable) {
forestry_events = false;
if (skills.woodcutting >= 60 && log.wcGuild) {
boosts.push('+7 invisible WC lvls at the Woodcutting guild');
Expand Down
8 changes: 5 additions & 3 deletions src/tasks/minions/woodcuttingActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ async function handleForestry({ user, duration, loot }: { user: MUser; duration:
const event = ForestryEvents[eventIndex];
const defaultEventXP = 5 * (randInt(85, 115) / 100); // used for unverified xp rates
let eggsDelivered = 0;
let beeHive = 0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable should be given a better name, just reading it, i have 0 idea what it is for or does.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I renamed it beeHiveRepairs to more accuratley reflect what it is. It's purpose is to get a more accurate xp rate to ingame xp rates.

for (let i = 0; i < randInt(5, 7); i++)

  • accounts for the average of 6 beehives per event, 5-7 for variance depending on how "busy" the event is

beeHiveRepairs += randInt(5, 10);

  • accounts for the users interaction with repairing the beehive, 5-10 for variance depending on how "busy" the event is

eventXP[event.uniqueXP] += user.skillLevel(event.uniqueXP) * 0.3 * beeHiveRepairs;

  • beeHiveRepairs is then used here to give an accurate amount of construction xp per event based on the users con level


switch (event.id) {
case 1: // Rising Roots
Expand All @@ -114,13 +115,14 @@ async function handleForestry({ user, duration, loot }: { user: MUser; duration:
eventXP[event.uniqueXP] += user.skillLevel(event.uniqueXP) * defaultEventXP;
break;
case 5: // Beehive
for (let i = 0; i < randInt(4, 6); i++) {
if (percentChance(200 / 300)) {
for (let i = 0; i < randInt(5, 7); i++) {
if (percentChance(66)) {
loot.add('Sturdy beehive parts');
}
beeHive += randInt(5, 10);
}
eventCounts[event.id]++;
eventXP[event.uniqueXP] += user.skillLevel(event.uniqueXP) * defaultEventXP;
eventXP[event.uniqueXP] += user.skillLevel(event.uniqueXP) * 0.3 * beeHive;
break;
case 6: // Friendly Ent
loot.add(LeafTable.roll());
Expand Down
Loading