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

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

Browse source 
Reviewed-on: #9
This commit is contained in:
randy 2024-12-07 20:23:38 -07:00
commit bd8669f629
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

1
Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java
View file

@ -326,6 +326,7 @@ public final class RuneCraftPulse extends SkillPulse<Item> {
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.");
}
}

12
Server/src/main/core/game/node/entity/combat/spell/MagicSpell.java
View file

@ -214,19 +214,18 @@ public abstract class MagicSpell implements Plugin<SpellType> {
}
}
*/
/* 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<SpellType> {
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);