yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deep wilderness threats now continue at next login if present when logging out

Browse Source 
Decreased brawler gloves and PvP gear drop rate from ordinary deep wilderness NPCs (does not apply to revenants or chaos elemental)
Brawler gloves and PvP gear drops from ordinary deep wilderness NPCs now require at least 100k high alchemy risk (does not apply to revenants or chaos elemental)
This commit is contained in:
Avi Weinstock
2023-08-29 07:41:59 +00:00
committed by Ryan
parent 4276ed731d
commit a0435fb890
8 changed files with 159 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/region/wilderness/handlers/DeepWildyThreat.kt
+11 -2
View File
@@ -14,6 +14,7 @@ import core.game.node.item.Item
import core.game.system.command.Privilege
import core.game.system.timer.PersistTimer
import core.game.system.timer.impl.Disease
import core.game.world.map.path.Pathfinder
import core.game.world.map.zone.impl.WildernessZone
import core.game.world.update.flag.context.Graphics
import core.tools.RandomFunction
@@ -45,6 +46,7 @@ class DWThreatTimer : PersistTimer(1, "dw-threat"), Commands {
var ticksLeft = 0
var lastMessage = 0
var currentRev: NPC? = null
var forceSpawn = false
override fun run(entity: Entity): Boolean {
if (ticksLeft-- <= 0) return false
@@ -61,7 +63,8 @@ class DWThreatTimer : PersistTimer(1, "dw-threat"), Commands {
else if (ticksLeft >= 500) 1500
else 2_000_000
if ((currentRev == null || DeathTask.isDead(currentRev) || !currentRev!!.isActive) && RandomFunction.roll(rollchance)) {
if ((currentRev == null || DeathTask.isDead(currentRev) || !currentRev!!.isActive) && (forceSpawn || RandomFunction.roll(rollchance))) {
forceSpawn = false
val type = RevenantType.getClosestHigherOrEqual(entity.properties.currentCombatLevel)
val npc = NPC.create(type.ids.random(), entity.location)
npc.isRespawn = false
@@ -80,10 +83,12 @@ class DWThreatTimer : PersistTimer(1, "dw-threat"), Commands {
override fun save(root: JSONObject, entity: Entity) {
root["threat-time-remaining"] = ticksLeft.toString()
root["threat-forceSpawn"] = (currentRev != null).toString()
}
override fun parse(root: JSONObject, entity: Entity) {
ticksLeft = root["threat-time-remaining"]?.toString()?.toIntOrNull() ?: 0
forceSpawn = root["threat-forceSpawn"]?.toString()?.toBoolean() ?: false
}
override fun defineCommands() {
@@ -140,4 +145,8 @@ class RevGuardianBehavior : NPCBehavior() {
val timer = getOrStartTimer<DWThreatTimer>(target)
timer.ticksLeft = 0
}
}
override fun getPathfinderOverride(self: NPC): Pathfinder? {
return Pathfinder.SMART
}
}