Refactored Antifire potion effect

Relicym Balm can now cure disease
Antifire potion effect now persists through log out

Server/src/main/content/data/consumables/Consumables.java

@@ -328,7 +328,7 @@ public enum Consumables {
 	ANTIPOISON_(new Potion(new int[] {5943, 5945, 5947, 5949}, new AddTimerEffect("poison:immunity", minutesToTicks(9)))),
 	ANTIPOISON__(new Potion(new int[] {5952, 5954, 5956, 5958}, new AddTimerEffect("poison:immunity", minutesToTicks(12)))),
 	SUPER_ANTIP(new Potion(new int[] {2448, 181, 183, 185}, new AddTimerEffect("poison:immunity", minutesToTicks(6)))),
-	RELICYM(new Potion(new int[] {4842, 4844, 4846, 4848}, new MultiEffect(new SetAttributeEffect("disease:immunity", 300), new RemoveTimerEffect("disease")))),
+	RELICYM(new Potion(new int[] {4842, 4844, 4846, 4848}, new CureDiseaseEffect())),
 	AGILITY(new Potion(new int[] {3032, 3034, 3036, 3038}, new SkillEffect(Skills.AGILITY, 3, 0))),
 	HUNTER(new Potion(new int[] {9998, 10000, 10002, 10004}, new SkillEffect(Skills.HUNTER, 3, 0))),
 	RESTORE(new Potion(new int[] {2430, 127, 129, 131}, new RestoreEffect(10, 0.3))),
@@ -340,7 +340,7 @@ public enum Consumables {
 	PRAYER(new Potion(new int[] {2434, 139, 141, 143}, new PrayerEffect(7, 0.25))),
 	SUPER_RESTO(new Potion(new int[] {3024, 3026, 3028, 3030}, new RestoreEffect(8, 0.25, true))),
 	ZAMMY_BREW(new Potion(new int[] {2450, 189, 191, 193}, new MultiEffect(new DamageEffect(10, true), new SkillEffect(Skills.ATTACK, 0, 0.25), new SkillEffect(Skills.STRENGTH, 0, 0.15), new SkillEffect(Skills.DEFENCE, 0, -0.1), new RandomPrayerEffect(0, 10)))),
-	ANTIFIRE(new Potion(new int[] {2452, 2454, 2456, 2458}, new SetAttributeEffect("fire:immune", 600, true))),
+	ANTIFIRE(new Potion(new int[] {2452, 2454, 2456, 2458}, new AddTimerEffect("dragonfire:immunity", 600, true))),
 	GUTH_REST(new Potion(new int[] {4417, 4419, 4421, 4423}, new MultiEffect(new RemoveTimerEffect("poison"), new EnergyEffect(5), new HealingEffect(5)))),
 	MAGIC_ESS(new Potion(new int[] {11491, 11489}, new SkillEffect(Skills.MAGIC,3,0))),
 	SANFEW(new Potion(new int[] {10925, 10927, 10929, 10931}, new MultiEffect(new RestoreEffect(8,0.25, true),  new AddTimerEffect("poison:immunity", secondsToTicks(90)), new RemoveTimerEffect("disease")))),
@@ -352,7 +352,7 @@ public enum Consumables {
 	ZAMMY_MIX(new BarbarianMix(new int[] {11521, 11523}, new MultiEffect(new DamageEffect(10, true), new SkillEffect(Skills.ATTACK, 0, 0.15), new SkillEffect(Skills.STRENGTH, 0, 0.25), new SkillEffect(Skills.DEFENCE, 0, -0.1), new RandomPrayerEffect(0, 10)))),
 	ATT_MIX(new BarbarianMix(new int[] {11429, 11431}, new MultiEffect(new SkillEffect(Skills.ATTACK, 3, 0.1), new HealingEffect(3)))),
 	ANTIP_MIX(new BarbarianMix(new int[] {11433, 11435}, new MultiEffect(new AddTimerEffect("poison:immunity", secondsToTicks(90)), new HealingEffect(3)))),
-	RELIC_MIX(new BarbarianMix(new int[] {11437, 11439}, new MultiEffect(new RemoveTimerEffect("disease"), new SetAttributeEffect("disease:immunity", 300), new HealingEffect(3)))),
+	RELIC_MIX(new BarbarianMix(new int[] {11437, 11439}, new MultiEffect(new CureDiseaseEffect(), new HealingEffect(3)))),
 	STR_MIX(new BarbarianMix(new int[] {11443, 11441}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0.1), new HealingEffect(3)))),
 	RESTO_MIX(new BarbarianMix(new int[] {11449, 11451}, new MultiEffect(new RestoreEffect(10, 0.3), new HealingEffect(3)))),
 	SUPER_RESTO_MIX(new BarbarianMix(new int [] {11493, 11495}, new MultiEffect(new RestoreEffect(8,0.25), new PrayerEffect(8, 0.25), new SummoningEffect(8, 0.25), new HealingEffect(6)))),
@@ -367,6 +367,7 @@ public enum Consumables {
 	SUPER_STR_MIX(new BarbarianMix(new int[] {11485, 11487}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 5, 0.15), new HealingEffect(6)))),
 	ANTIDOTE_PLUS_MIX(new BarbarianMix(new int[] {11501, 11503}, new MultiEffect(new AddTimerEffect("poison:immunity", minutesToTicks(9)), new RandomHealthEffect(3, 7)))),
 	ANTIP_SUPERMIX(new BarbarianMix(new int[] {11473, 11475}, new MultiEffect(new AddTimerEffect("poison:immunity", minutesToTicks(6)), new RandomHealthEffect(3, 7)))),
+	ANTIFIRE_MIX(new BarbarianMix(new int[] {11505, 11507}, new MultiEffect(new AddTimerEffect("dragonfire:immunity", 600, true), new RandomHealthEffect(3, 7)))),
 
     /** Stealing creation potions */
 	SC_PRAYER(new Potion(new int[] {14207, 14209, 14211, 14213, 14215}, new PrayerEffect(7, 0.25))),

Server/src/main/content/data/consumables/effects/CureDiseaseEffect.kt

@@ -0,0 +1,21 @@
+package content.data.consumables.effects
+
+import core.api.*
+import core.game.consumable.ConsumableEffect
+import core.game.node.entity.player.Player
+import core.game.system.timer.impl.Disease
+
+class CureDiseaseEffect () : ConsumableEffect() {
+    override fun activate (p: Player) {
+        val existingTimer = getTimer<Disease>(p)
+        if (existingTimer != null) {
+            existingTimer.hitsLeft -= 9
+            if (existingTimer.hitsLeft <= 0) {
+                sendMessage(p, "The disease has been cured.")
+                removeTimer<Disease>(p)
+            }else{
+                sendMessage(p,"You feel slightly better.")
+            }
+        }
+    }
+}

Server/src/main/core/api/ContentAPI.kt

@@ -3122,7 +3122,7 @@ fun calculateDragonfireMaxHit(entity: Entity, maxDamage: Int, wyvern: Boolean =
 
     if (entity is Player) {
         hasShield = hasDragonfireShieldProtection(entity, wyvern)
-        hasPotion = !wyvern && getAttribute(entity, "fire:immune", 0) >= getWorldTicks()
+        hasPotion = !wyvern && hasTimerActive<DragonFireImmunity>(entity)
         hasPrayer = entity.prayer.get(PrayerType.PROTECT_FROM_MAGIC)
 
         if (sendMessage) {

Server/src/main/core/game/system/timer/impl/DragonFireImmunity.kt

@@ -0,0 +1,47 @@
+package core.game.system.timer.impl
+
+import core.game.system.timer.*
+import core.api.*
+import core.tools.*
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+import org.json.simple.*
+import org.rs09.consts.Sounds
+
+/**
+ * A timer that replicates the behavior of Dragon Fire immunity mechanics. Runs every tick.
+ * Will notify the player of various levels of remaining Dragon Fire immunity, and then remove itself once it has run out.
+ * This timer is a "soft" timer, meaning it will tick down even while other timers would normally stall (e.g. during entity delays or when the entity has a modal open.)
+**/
+class DragonFireImmunity : PersistTimer (1, "dragonfire:immunity", isSoft = true, flags = arrayOf(TimerFlag.ClearOnDeath)) {
+    var ticksRemaining = 0
+
+    override fun save (root: JSONObject, entity: Entity) {
+        root["ticksRemaining"] = ticksRemaining.toString()
+    }
+
+    override fun parse (root: JSONObject, entity: Entity) {
+        ticksRemaining = root["ticksRemaining"].toString().toInt()
+    }
+
+    override fun run (entity: Entity) : Boolean {
+        ticksRemaining--
+
+        if (entity is Player && ticksRemaining == secondsToTicks(30)) {
+            sendMessage(entity, colorize("%RYou have 30 seconds remaining on your antifire potion."))
+            playAudio(entity, Sounds.CLOCK_TICK_1_3120, 0, 3)
+        }
+        else if (entity is Player && ticksRemaining == 0) {
+            sendMessage(entity, colorize("%RYour antifire potion has expired."))
+            playAudio(entity, Sounds.DRAGON_POTION_FINISHED_2607)
+        }
+
+        return ticksRemaining > 0
+    }
+
+    override fun getTimer (vararg args: Any) : RSTimer {
+        val t =  DragonFireImmunity()
+        t.ticksRemaining = args.getOrNull(0) as? Int ?: 100
+        return t
+    }
+}