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

Fix: Crop Noting, misc JSON

Browse Source
This commit is contained in:
skelsoft
2021-10-27 19:08:02 +00:00
committed by Ceikry
parent 1404222819
commit c45fafe8bc
3 changed files with 42 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/data/configs/ground_spawns.json
+4
View File
@@ -287,6 +287,10 @@
"item_id": "1523",
"loc_data": "{1,2614,9570,0,5898270}"
},
{
"item_id": "1550",
"loc_data": "{1,2714,3478,0,5898270}"
},
{
"item_id": "1573",
"loc_data": "{1,2740,3637,0,5898270}-{1,2736,3638,0,5898270}-{1,2735,3636,0,5898270}-{1,2743,3636,0,5898270}-{1,2739,3634,0,5898270}-{1,2743,3640,0,5898270}-{1,2741,3639,0,5898270}-{1,2736,3641,0,5898270}-{1,2738,3641,0,5898270}-{1,2734,3640,0,5898270}-{1,2738,3636,0,5898270}"
Server/data/configs/npc_configs.json
-60
View File
@@ -80064,26 +80064,6 @@
"range_level": "1",
"attack_level": "1"
},
{
"agg_radius": "64",
"examine": "Roar! A dragon!",
"melee_animation": "80",
"attack_speed": "4",
"magic_level": "70",
"respawn_delay": "35",
"defence_animation": "89",
"death_animation": "4642",
"name": "Elvarg",
"defence_level": "70",
"safespot": null,
"lifepoints": "80",
"strength_level": "70",
"id": "742",
"aggressive": "true",
"bonuses": "0,0,0,0,0,20,40,40,30,20,0,0,0,0,0",
"range_level": "1",
"attack_level": "70"
},
{
"examine": "A badly-behaved goblin.",
"slayer_task": "38",
@@ -144603,26 +144583,6 @@
"range_level": "1",
"attack_level": "1"
},
{
"agg_radius": "64",
"examine": "Roar! A dragon!",
"melee_animation": "80",
"attack_speed": "4",
"magic_level": "70",
"respawn_delay": "35",
"defence_animation": "89",
"death_animation": "4642",
"name": "Elvarg",
"defence_level": "70",
"safespot": null,
"lifepoints": "80",
"strength_level": "70",
"id": "742",
"aggressive": "true",
"bonuses": "0,0,0,0,0,20,40,40,30,20,0,0,0,0,0",
"range_level": "1",
"attack_level": "70"
},
{
"examine": "A badly-behaved goblin.",
"slayer_task": "38",
@@ -209969,26 +209929,6 @@
"range_level": "1",
"attack_level": "1"
},
{
"agg_radius": "64",
"examine": "Roar! A dragon!",
"melee_animation": "80",
"attack_speed": "4",
"magic_level": "70",
"respawn_delay": "35",
"defence_animation": "89",
"death_animation": "4642",
"name": "Elvarg",
"defence_level": "70",
"safespot": null,
"lifepoints": "80",
"strength_level": "70",
"id": "742",
"aggressive": "true",
"bonuses": "0,0,0,0,0,20,40,40,30,20,0,0,0,0,0",
"range_level": "1",
"attack_level": "70"
},
{
"examine": "A badly-behaved goblin.",
"slayer_task": "38",
Server/src/main/kotlin/rs09/game/node/entity/skill/farming/LeprechaunNoter.kt
+6 -3
View File
@@ -1,5 +1,7 @@
package rs09.game.node.entity.skill.farming
import api.ContentAPI
import core.game.content.dialogue.DialoguePlugin
import core.game.content.dialogue.FacialExpression
import core.game.node.item.Item
import core.plugin.Initializable
@@ -9,7 +11,7 @@ import rs09.game.interaction.InteractionListener
class LeprechaunNoter : InteractionListener() {
val CROPS = Plantable.values().map{ it.harvestItem }.toIntArray()
val LEPRECHAUNS = intArrayOf(NPCs.TOOL_LEPRECHAUN_3021,NPCs.GOTH_LEPRECHAUN_8000,NPCs.TOOL_LEPRECHAUN_4965)
val LEPRECHAUNS = intArrayOf(NPCs.TOOL_LEPRECHAUN_3021,NPCs.GOTH_LEPRECHAUN_8000,NPCs.TOOL_LEPRECHAUN_4965,NPCs.TECLYN_2861)
override fun defineListeners() {
onUseWith(NPC,CROPS,*LEPRECHAUNS){player, used, with ->
@@ -25,9 +27,10 @@ class LeprechaunNoter : InteractionListener() {
if(player.inventory.remove(Item(usedItem.id,amt))){
player.inventory.add(Item(usedItem.noteChange,amt))
}
player.dialogueInterpreter.sendDialogues(npc.id,expr,"There ya go.")
ContentAPI.sendItemDialogue(player,usedItem.id,"The leprechaun exchanges your items for banknotes.")
} else {
player.dialogueInterpreter.sendDialogues(npc.id,expr,"But that's already a note!")
// Unsure why the line below no longer functions, despite only changing the line above to be more correct. Using your note(NOT CROP) on the leprechaun no longer functions because of this. - Crash
player.dialogueInterpreter.sendDialogues(npc.id,expr,"That IS a banknote!")
}
return@onUseWith true