2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-17 12:00:17 -07:00
Code Issues Projects Releases Packages Wiki Activity

TLT dialogue bugfix

Browse source
This commit is contained in:
Ceikry 2021-03-22 20:15:20 -05:00
parent 56b02e4150
commit 88c615e424
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerInteractionHandler.kt
View file

@ -123,7 +123,7 @@ class FishingTrawlerInteractionHandler : InteractionListener() {
if(!session.isActive){ if(!session.isActive){
return@on false return@on false
} }
if(player.location.y > 0){ if(player.location.z > 0){
player.sendMessage("You can't scoop water out up here.") player.sendMessage("You can't scoop water out up here.")
return@on true return@on true
} }

8
Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt
View file

@ -153,20 +153,20 @@ class DukeHoracioTLTDialogue(val questStage: Int) : DialogueFile() {
"mistake." "mistake."
).also { stage++ } ).also { stage++ }
2 -> sendNormalDialogue( 1 -> sendNormalDialogue(
Sigmund, Sigmund,
FacialExpression.ANGRY, FacialExpression.ANGRY,
"And I suppose you believe them, goblin lover?" "And I suppose you believe them, goblin lover?"
).also { stage++ } ).also { stage++ }
3 -> player("Well, they seemed friendlier than most goblins, and", "nothing was taken from the cellar.").also { stage++ } 2 -> player("Well, they seemed friendlier than most goblins, and", "nothing was taken from the cellar.").also { stage++ }
4 -> npc( 3 -> npc(
"Actually, something was taken. Sigmund has informed", "Actually, something was taken. Sigmund has informed",
"me that some of the castle silverware is missing from", "me that some of the castle silverware is missing from",
"the cellar." "the cellar."
).also { stage++ } ).also { stage++ }
5 -> { 4 -> {
npc("Unless it is returned, I am afraid I will have no option", "but war.") npc("Unless it is returned, I am afraid I will have no option", "but war.")
player!!.questRepository.getQuest("Lost Tribe").setStage(player, 47) player!!.questRepository.getQuest("Lost Tribe").setStage(player, 47)
stage = END_DIALOGUE stage = END_DIALOGUE

2
Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Patch.kt
View file

@ -20,6 +20,8 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
Plantable.LIMPWURT_SEED, Plantable.WOAD_SEED -> 3 Plantable.LIMPWURT_SEED, Plantable.WOAD_SEED -> 3
else -> 1 else -> 1
} }
} else if(patch.type == PatchType.HOPS){
harvestAmt = RandomFunction.random(3,35)
} else { } else {
harvestAmt = RandomFunction.random(1,4) harvestAmt = RandomFunction.random(1,4)
} }

4
Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SeedlingWaterer.kt
View file

@ -9,7 +9,7 @@ import org.rs09.consts.Items
import rs09.game.node.entity.state.newsys.states.SeedlingState import rs09.game.node.entity.state.newsys.states.SeedlingState
private val cans = arrayListOf(Items.WATERING_CAN8_5340,Items.WATERING_CAN7_5339,Items.WATERING_CAN6_5338,Items.WATERING_CAN5_5337,Items.WATERING_CAN4_5336,Items.WATERING_CAN3_5335,Items.WATERING_CAN2_5334,Items.WATERING_CAN1_5333) private val cans = arrayListOf(Items.WATERING_CAN8_5340,Items.WATERING_CAN7_5339,Items.WATERING_CAN6_5338,Items.WATERING_CAN5_5337,Items.WATERING_CAN4_5336,Items.WATERING_CAN3_5335,Items.WATERING_CAN2_5334,Items.WATERING_CAN1_5333)
private val seedlings = arrayListOf(Items.OAK_SEEDLING_5358,Items.WILLOW_SEEDLING_5359,Items.MAPLE_SEEDLING_5360,Items.YEW_SEEDLING_5361,Items.MAGIC_SEEDLING_5362,Items.APPLE_TREE_SEED_5283,Items.BANANA_TREE_SEED_5284,Items.ORANGE_TREE_SEED_5285,Items.CURRY_TREE_SEED_5286,Items.PINEAPPLE_SEED_5287,Items.PAPAYA_TREE_SEED_5288,Items.PALM_TREE_SEED_5289) private val seedlings = arrayListOf(Items.OAK_SEEDLING_5358,Items.WILLOW_SEEDLING_5359,Items.MAPLE_SEEDLING_5360,Items.YEW_SEEDLING_5361,Items.MAGIC_SEEDLING_5362,Items.APPLE_SEEDLING_5480,Items.BANANA_SEEDLING_5481,Items.ORANGE_SEEDLING_5482,Items.CURRY_SEEDLING_5483,Items.PINEAPPLE_SEEDLING_5484,Items.PAPAYA_SEEDLING_5485,Items.PALM_SEEDLING_5486)
@Initializable @Initializable
class SeedlingWaterer : UseWithHandler(*cans.toIntArray()) { class SeedlingWaterer : UseWithHandler(*cans.toIntArray()) {
@ -25,7 +25,7 @@ class SeedlingWaterer : UseWithHandler(*cans.toIntArray()) {
val can = event.usedWith.asItem() ?: return false val can = event.usedWith.asItem() ?: return false
val nextCan = can.id.getNext() val nextCan = can.id.getNext()
val wateredSeedling = seedling.id + 6 val wateredSeedling = if(seedling.id > 5400 ) seedling.id + 8 else seedling.id + 6
if(player.inventory.remove(can) && player.inventory.remove(seedling)){ if(player.inventory.remove(can) && player.inventory.remove(seedling)){
player.inventory.add(Item(wateredSeedling)) player.inventory.add(Item(wateredSeedling))