From fba2e413cfb7f37a3a807282fd7117f31e3e88fb Mon Sep 17 00:00:00 2001 From: randy Date: Thu, 21 Nov 2024 17:10:08 -0700 Subject: [PATCH 1/2] Added small summoning exp gain every minute a familiar is summoned The gain is the summoning level required + 10. --- .../content/global/skill/summoning/familiar/Familiar.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Server/src/main/content/global/skill/summoning/familiar/Familiar.java b/Server/src/main/content/global/skill/summoning/familiar/Familiar.java index 4177e1d5c..064de882c 100644 --- a/Server/src/main/content/global/skill/summoning/familiar/Familiar.java +++ b/Server/src/main/content/global/skill/summoning/familiar/Familiar.java @@ -225,10 +225,14 @@ public abstract class Familiar extends NPC implements Plugin { @Override public void handleTickActions() { - //Snowscape: only count down the familiar timer if summoning points are zero + //Snowscape: only count down the familiar timer if summoning points are zero, and give some summoning exp every minute a familiar is summoned. if (owner.getSkills().getLevel(Skills.SUMMONING) == 0) { ticks--; } + if (getWorldTicks() % 100 == 0) { + owner.getSkills().addExperience(Skills.SUMMONING, pouch.getLevelRequired()+10, true); + } + fracDrain += pointsPerTick; if (fracDrain > 1.0 && ticks > 0) { fracDrain -= 1.0; From 3119a01e3fb4d5733a3ed05341eef3b86e535f51 Mon Sep 17 00:00:00 2001 From: randy Date: Thu, 21 Nov 2024 17:44:13 -0700 Subject: [PATCH 2/2] Additional steps to remove random events The random events came back for some characters, seems the timer got started somehow. This change should pause the timer every time it's registered, so it should never start again. --- Server/src/main/core/game/system/timer/impl/AntiMacro.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Server/src/main/core/game/system/timer/impl/AntiMacro.kt b/Server/src/main/core/game/system/timer/impl/AntiMacro.kt index ab3c18394..8968827b7 100644 --- a/Server/src/main/core/game/system/timer/impl/AntiMacro.kt +++ b/Server/src/main/core/game/system/timer/impl/AntiMacro.kt @@ -41,7 +41,8 @@ class AntiMacro : PersistTimer(0, "antimacro", isAuto = true), Commands { override fun onRegister(entity: Entity) { if (entity !is Player || entity.isArtificial) entity.timers.removeTimer(this) - if (entity is Player && entity.rights == Rights.ADMINISTRATOR) + //if (entity is Player && entity.rights == Rights.ADMINISTRATOR) + if (entity is Player) paused = true if (runInterval == 0)