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 f05c616d9..a22aa32e0 100644 --- a/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt +++ b/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt @@ -257,7 +257,7 @@ class ModernListeners : SpellListener("modern"){ removeRunes(player) addXP(player, 31.0) showMagicTab(player) - setDelay(player, 5) + //setDelay(player, 5) return true } fun alchemize(player: Player, item: Item, high: Boolean, explorersRing: Boolean = false): Boolean { diff --git a/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java b/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java index 5006b52be..204ff13f3 100644 --- a/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java +++ b/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java @@ -326,6 +326,7 @@ public final class RuneCraftPulse extends SkillPulse { if (altar == Altar.SOUL) { tablet = new Item(8022, amount); } if (tablet != null && player.getInventory().remove(clay)) { player.getInventory().add(tablet); + player.getSkills().addExperience(Skills.RUNECRAFTING, rune.getExperience() * amount, true); player.getPacketDispatch().sendMessage("You bind the temple's power into teleport tablets."); } } diff --git a/Server/src/main/core/game/node/entity/combat/spell/MagicSpell.java b/Server/src/main/core/game/node/entity/combat/spell/MagicSpell.java index 86b7e1260..601cc835f 100644 --- a/Server/src/main/core/game/node/entity/combat/spell/MagicSpell.java +++ b/Server/src/main/core/game/node/entity/combat/spell/MagicSpell.java @@ -214,19 +214,18 @@ public abstract class MagicSpell implements Plugin { } } */ + /* Snowscape custom: removing forced delay on binding spells. If possible, reimplement this for pvp scenarios if((spellId == 12 || spellId == 30 || spellId == 56) && caster instanceof Player){ if (caster.getAttribute("entangleDelay", 0) > GameWorld.getTicks()) { caster.asPlayer().sendMessage("You have recently cast a binding spell."); return false; } } + */ if (caster instanceof Player) { Player p = (Player) caster; //if(p.getEquipment().get(3) != null && p.getEquipment().get(3).getId() == 14726){ - if(this instanceof CombatSpell && RandomFunction.getRandom(100) > 33){ - //p.sendMessage("Your staff negates the rune requirement of the spell."); - return true; - } + //} if (runes == null) { return true; @@ -237,6 +236,11 @@ public abstract class MagicSpell implements Plugin { return false; } } + //Snowscape custom: only consume runes 33% of the time + if(this instanceof CombatSpell && RandomFunction.getRandom(100) > 33){ + //p.sendMessage("Your staff negates the rune requirement of the spell."); + return true; + } if (remove) { toRemove.forEach(i -> { p.getInventory().remove(i);