From b0b6a5fdd12285ed0fad88ed2983da2b5b9363e5 Mon Sep 17 00:00:00 2001
From: Ryan <2804894-ryannathans@users.noreply.gitlab.com>
Date: Sun, 23 Jan 2022 11:16:22 +0000
Subject: [PATCH] random events are now unpredictably timed

---
 .../game/content/ame/RandomEventManager.kt    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/Server/src/main/kotlin/rs09/game/content/ame/RandomEventManager.kt b/Server/src/main/kotlin/rs09/game/content/ame/RandomEventManager.kt
index 7ace936e6..c4c79717e 100644
--- a/Server/src/main/kotlin/rs09/game/content/ame/RandomEventManager.kt
+++ b/Server/src/main/kotlin/rs09/game/content/ame/RandomEventManager.kt
@@ -2,38 +2,45 @@ package rs09.game.content.ame
 
 import core.game.node.entity.player.Player
 import core.game.world.map.zone.ZoneRestriction
+import core.tools.RandomFunction
 import rs09.game.system.SystemLogger
 import rs09.game.world.GameWorld
 
-private const val DELAY_TICKS = 6000 //60 minutes
+private const val AVG_DELAY_TICKS = 6000 // 60 minutes
+private const val MIN_DELAY_TICKS = AVG_DELAY_TICKS / 2
+private const val MAX_DELAY_TICKS = MIN_DELAY_TICKS + AVG_DELAY_TICKS // window of 60 min centered on 60 min (30 to 90 min)
 class RandomEventManager(val player: Player) {
     var event: RandomEventNPC? = null
     var nextSpawn = 0
 
-    fun tick(){
-        if(player.isArtificial) return
-        if(GameWorld.ticks > nextSpawn) fireEvent()
+    fun tick() {
+        if (player.isArtificial) return
+        if (GameWorld.ticks > nextSpawn) fireEvent()
     }
 
-    fun fireEvent(){
-        if(player.zoneMonitor.isRestricted(ZoneRestriction.RANDOM_EVENTS)){
+    fun fireEvent() {
+        if (player.zoneMonitor.isRestricted(ZoneRestriction.RANDOM_EVENTS)) {
             nextSpawn = GameWorld.ticks + 3000
             return
         }
         val ame = RandomEvents.values().random()
         event = ame.npc.create(player,ame.loot,ame.type)
-        if(event!!.spawnLocation == null){
+        if (event!!.spawnLocation == null) {
             nextSpawn = GameWorld.ticks + 3000
             return
         }
         event!!.init()
-        nextSpawn = GameWorld.ticks + DELAY_TICKS
+        rollNextSpawn()
         SystemLogger.logRE("Fired ${event!!.name} for ${player.username}")
     }
 
-    fun init(){
-        if(player.isArtificial) return
-        nextSpawn = GameWorld.ticks + DELAY_TICKS
+    fun init() {
+        if (player.isArtificial) return
+        rollNextSpawn()
         SystemLogger.logRE("Initialized REManager for ${player.username}")
     }
+
+    private fun rollNextSpawn() {
+        nextSpawn = GameWorld.ticks + RandomFunction.random(MIN_DELAY_TICKS, MAX_DELAY_TICKS)
+    }
 }
\ No newline at end of file