From ffe1e11d11cce3fb48e019e97327c8860f43a1ef Mon Sep 17 00:00:00 2001 From: randy Date: Fri, 6 Dec 2024 08:05:40 -0700 Subject: [PATCH 1/2] Traps with a catch now last 10 minutes instead of 1 --- Server/src/main/content/global/skill/hunter/TrapSetting.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/main/content/global/skill/hunter/TrapSetting.java b/Server/src/main/content/global/skill/hunter/TrapSetting.java index ec0f87ba3..421a982bf 100644 --- a/Server/src/main/content/global/skill/hunter/TrapSetting.java +++ b/Server/src/main/content/global/skill/hunter/TrapSetting.java @@ -306,7 +306,7 @@ public class TrapSetting { case 3: handleCatch(counter, wrapper, node, npc, success); if (success) { - wrapper.setTicks(GameWorld.getTicks() + 100); + wrapper.setTicks(GameWorld.getTicks() + 1000); wrapper.setReward(node); wrapper.setObject(getFinalId(wrapper, node)); switch(wrapper.getType()) { From ecb3a66d5877cf7a776c187c23375fa399ef3f7a Mon Sep 17 00:00:00 2001 From: randy Date: Fri, 6 Dec 2024 09:13:09 -0700 Subject: [PATCH 2/2] Fishing with Hunter feathers and Note Spell changes Feathers earned with hunting can now be used for fly fishing. The note spell no longer charges a 10% tax, but is instead limited to noting 10 items at a time. --- .../main/content/global/skill/fishing/FishingOption.kt | 2 +- .../content/global/skill/magic/modern/ModernListeners.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Server/src/main/content/global/skill/fishing/FishingOption.kt b/Server/src/main/content/global/skill/fishing/FishingOption.kt index b75ccf9b4..5b304893c 100644 --- a/Server/src/main/content/global/skill/fishing/FishingOption.kt +++ b/Server/src/main/content/global/skill/fishing/FishingOption.kt @@ -11,7 +11,7 @@ enum class FishingOption(val tool: Int, val level: Int, val animation: Animation CRAYFISH_CAGE(Items.CRAYFISH_CAGE_13431, 1, Animation(10009), null, "cage", Fish.CRAYFISH), SMALL_NET(Items.SMALL_FISHING_NET_303, 1, Animation(621), null, "net", Fish.SHRIMP, Fish.ANCHOVIE), BAIT(Items.FISHING_ROD_307, 5, Animation(622), intArrayOf(Items.FISHING_BAIT_313), "bait", Fish.SARDINE, Fish.HERRING), - LURE(Items.FLY_FISHING_ROD_309, 20, Animation(622), intArrayOf(Items.FEATHER_314, Items.STRIPY_FEATHER_10087), "lure", Fish.TROUT, Fish.SALMON, Fish.RAINBOW_FISH), + LURE(Items.FLY_FISHING_ROD_309, 20, Animation(622), intArrayOf(Items.FEATHER_314, Items.STRIPY_FEATHER_10087, Items.RED_FEATHER_10088, Items.BLUE_FEATHER_10089, Items.YELLOW_FEATHER_10090, Items.ORANGE_FEATHER_10091), "lure", Fish.TROUT, Fish.SALMON, Fish.RAINBOW_FISH), PIKE_BAIT(Items.FISHING_ROD_307, 25, Animation(622), intArrayOf(Items.FISHING_BAIT_313), "bait", Fish.PIKE), LOBSTER_CAGE(Items.LOBSTER_POT_301, 40, Animation(619), null, "cage", Fish.LOBSTER), HARPOON(Items.HARPOON_311, 35, Animation(618), null, "harpoon", Fish.TUNA, Fish.SWORDFISH), diff --git a/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt b/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt index 6d356e205..f05c616d9 100644 --- a/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt +++ b/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt @@ -215,17 +215,17 @@ class ModernListeners : SpellListener("modern"){ setDelay(player,false) } - //Snowscape custom: Low Alch spell replaced with Note spell. This spell charges 10% of the items converted to notes as a tax. + //Snowscape custom: Low Alch spell replaced with Note spell. This spell converts up to 10 items to notes. public fun notespell(player: Player, item: Item) : Boolean { if (item.definition.isUnnoted) { if (item.definition.noteId < 0) { player.sendMessage("This item cannot be noted.") return false } - val amount = player.inventory.getAmount(item.id) + val amount = kotlin.math.min(player.inventory.getAmount(item.id), 10) player.inventory.remove(Item(item.id, amount)) - player.inventory.add(note(Item(item.id, kotlin.math.ceil(amount*0.9).toInt()))) - player.sendMessage("The Bank of Gielinor appreciates your business.") + player.inventory.add(note(Item(item.id, amount))) + //player.sendMessage("The Bank of Gielinor appreciates your business.") } else { player.sendMessage("This item is already noted!") return false