Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +3 -8
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 48f949a452 - Show all commits

6
Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt
View file

@ -50,7 +50,7 @@ class WoodcuttingListener : InteractionListener {
defineInteraction( defineInteraction(
IntType.SCENERY, IntType.SCENERY,
ids = WoodcuttingNode.values().map { it.id }.toIntArray(), ids = WoodcuttingNode.values().map { it.id }.toIntArray(),
"chop-down", "chop", "chop down", "cut down", "chop-down", "chop", "chop down", "cut down", "cut-branch",
persistent = true, persistent = true,
allowedDistance = 1, allowedDistance = 1,
handler = ::handleWoodcutting handler = ::handleWoodcutting
@ -74,10 +74,10 @@ class WoodcuttingListener : InteractionListener {
if (clockReady(player, Clocks.SKILLING)) { if (clockReady(player, Clocks.SKILLING)) {
animateWoodcutting(player) animateWoodcutting(player)
if (resource == WoodcuttingNode.DRAMEN_TREE) { if (resource in arrayOf(WoodcuttingNode.DRAMEN_TREE, WoodcuttingNode.SWAYING_TREE)) {
// Reward after one chop and then abort chopping (this is authentic) // Reward after one chop and then abort chopping (this is authentic)
queueScript(player, 1, QueueStrength.STRONG) { queueScript(player, 1, QueueStrength.STRONG) {
sendMessage(player, "You cut a branch from the Dramen tree.") sendMessage(player, "You cut a branch from the ${if (resource == WoodcuttingNode.DRAMEN_TREE) "Dramen" else "strangely musical"} tree.")
addItem(player, resource.getReward()) addItem(player, resource.getReward())
return@queueScript clearScripts(player) return@queueScript clearScripts(player)
} }

5
Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt
View file

@ -260,11 +260,6 @@ class TFTInteractionListeners : InteractionListener {
return@on true return@on true
} }
on(SWAYING_TREE, IntType.SCENERY, "cut-branch"){ player, node ->
player.pulseManager.run(WoodcuttingSkillPulse(player, node as Scenery))
return@on true
}
on(SHOPNPCS, IntType.NPC, "Trade") { player, npc -> on(SHOPNPCS, IntType.NPC, "Trade") { player, npc ->
if(isQuestComplete(player, Quests.THE_FREMENNIK_TRIALS)){ if(isQuestComplete(player, Quests.THE_FREMENNIK_TRIALS)){
npc.asNpc().openShop(player) npc.asNpc().openShop(player)