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

Merge pull request 'dev' (#8) from dev into master

Browse source 
Reviewed-on: #8
This commit is contained in:
randy 2024-12-06 09:17:07 -07:00
commit b381d78362
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Server/src/main/content/global/skill/fishing/FishingOption.kt
View file

@ -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),

2
Server/src/main/content/global/skill/hunter/TrapSetting.java
View file

@ -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()) {

8
Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
View file

@ -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