yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected tree felling mechanics (now 1 in 8 chance for a tree to fall per log)

Browse Source 
Moved the diary check in woodcutting out to the diary events hook
Corrected the woodcutting animation to not reset/interrupt itself
This commit is contained in:
Ceikry
2022-03-27 04:57:23 +00:00
committed by Ryan
parent fd9eaca1f3
commit f5452e27e4
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java
+5 -9
View File
@@ -99,7 +99,7 @@ public class WoodcuttingSkillPulse extends Pulse {
}
public void animate() {
player.animate(SkillingTool.getHatchet(player).getAnimation());
if(!player.getAnimator().isAnimating()) player.animate(SkillingTool.getHatchet(player).getAnimation());
}
public boolean reward() {
@@ -169,21 +169,17 @@ public class WoodcuttingSkillPulse extends Pulse {
}
//transform to depleted version
//OSRS and RS3 Wikis both agree: All trees present in 2009 are a 1/8 fell chance, aside from normal trees/dead trees which are 100%
//OSRS: https://oldschool.runescape.wiki/w/Woodcutting scroll down to the mechanics section
//RS3 : https://runescape.wiki/w/Woodcutting scroll down to the mechanics section, and expand the tree felling chances table
if (resource.getRespawnRate() != 0) {
int charge = 1000 / resource.getRewardAmount();
node.setCharge(node.getCharge() - RandomFunction.random(charge, charge << 2));
if (node.getCharge() < 1) {
node.setCharge(1000);
if (RandomFunction.roll(8) || resource.identifier == 1 || resource.identifier == 2) {
if (resource.isFarming()) {
FarmingPatch fPatch = FarmingPatch.forObject(node.asScenery());
if(fPatch != null) {
Patch patch = fPatch.getPatchFor(player);
patch.setCurrentState(patch.getCurrentState() + 1);
}
if(resource.getId() == 8513 && player.getLocation().getRegionId() == 11828){
//Chop down a yew tree you grew in falador park
player.getAchievementDiaryManager().finishTask(player,DiaryType.FALADOR,2,3);
}
return true;
}
if (resource.getEmptyId() > -1) {
Server/src/main/kotlin/rs09/game/node/entity/player/link/diary/DiaryEventHook.kt
+3
View File
@@ -139,6 +139,9 @@ class DiaryEventHook : LoginListener
if(event.source.id == 333 && entity.zoneMonitor.isInZone("karamja"))
finishTask(entity, DiaryType.KARAMJA, 0, 6)
if(event.source.id == Scenery.YEW_TREE_8513 && regionId == 11828)
finishTask(entity, DiaryType.FALADOR, 2, 3)
}
}