Browse Source

BETA: Fixing all grand boss respawn timers now they will be hour by hour instead of milisec to milisec which means if you kill a boss at 12:18 it will respawn at XX:18 not totally randomly as before.
* Reported by: Tryskell

Rumen Nikiforov 12 years ago
parent
commit
994558c429

+ 4 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java

@@ -338,7 +338,7 @@ public class Antharas extends AbstractNpcAI
 				if (_monsterSpawnTask == null)
 				{
 					GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD_ID, WAITING);
-					_monsterSpawnTask = ThreadPoolManager.getInstance().scheduleGeneral(new AntharasSpawn(1), Config.Antharas_Wait_Time);
+					_monsterSpawnTask = ThreadPoolManager.getInstance().scheduleGeneral(new AntharasSpawn(1), Config.ANTHARAS_WAIT_TIME);
 				}
 			}
 		}
@@ -922,7 +922,9 @@ public class Antharas extends AbstractNpcAI
 			_cubeSpawnTask = ThreadPoolManager.getInstance().scheduleGeneral(new CubeSpawn(0), 10000);
 			GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
 			// Calculate Min and Max respawn times randomly.
-			long respawnTime = getRandom((Config.Interval_Of_Antharas_Spawn - Config.Random_Of_Antharas_Spawn), (Config.Interval_Of_Antharas_Spawn + Config.Random_Of_Antharas_Spawn));
+			long respawnTime = Config.ANTHARAS_SPAWN_INTERVAL + getRandom(-Config.ANTHARAS_SPAWN_RANDOM, Config.ANTHARAS_SPAWN_RANDOM);
+			respawnTime *= 60 * 60 * 1000;
+			
 			ThreadPoolManager.getInstance().scheduleGeneral(new UnlockAntharas(npc.getNpcId()), respawnTime);
 			// also save the respawn time so that the info is maintained past reboots
 			StatsSet info = GrandBossManager.getInstance().getStatsSet(npc.getNpcId());

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java

@@ -476,7 +476,9 @@ public class Baium extends AbstractNpcAI
 		// spawn the "Teleportation Cubic" for 15 minutes (to allow players to exit the lair)
 		addSpawn(TELEPORT_CUBIC, 115017, 15549, 10090, 0, false, 900000);
 		// Calculate Min and Max respawn times randomly.
-		long respawnTime = getRandom((Config.Interval_Of_Baium_Spawn - Config.Random_Of_Baium_Spawn), (Config.Interval_Of_Baium_Spawn + Config.Random_Of_Baium_Spawn));
+		long respawnTime = Config.BAIUM_SPAWN_INTERVAL + getRandom(-Config.BAIUM_SPAWN_RANDOM, Config.BAIUM_SPAWN_RANDOM);
+		respawnTime *= 60 * 60 * 1000;
+		
 		GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, DEAD);
 		startQuestTimer("baium_unlock", respawnTime, null, null);
 		// also save the respawn time so that the info is maintained past reboots

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java

@@ -412,7 +412,9 @@ public class Beleth extends AbstractNpcAI
 			setBelethKiller(1, killer);
 			GrandBossManager.getInstance().setBossStatus(29118, 3);
 			// Calculate Min and Max respawn times randomly.
-			long respawnTime = getRandom((Config.INTERVAL_OF_BELETH_SPAWN - Config.RANDOM_OF_BELETH_SPAWN), (Config.INTERVAL_OF_BELETH_SPAWN + Config.RANDOM_OF_BELETH_SPAWN));
+			long respawnTime = Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM);
+			respawnTime *= 60 * 60 * 1000;
+			
 			StatsSet info = GrandBossManager.getInstance().getStatsSet(29118);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
 			GrandBossManager.getInstance().setStatsSet(29118, info);

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java

@@ -204,7 +204,9 @@ public class Core extends AbstractNpcAI
 			_FirstAttacked = false;
 			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
-			long respawnTime = getRandom((Config.Interval_Of_Core_Spawn - Config.Random_Of_Core_Spawn), (Config.Interval_Of_Core_Spawn + Config.Random_Of_Core_Spawn));
+			long respawnTime = Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM);
+			respawnTime *= 60 * 60 * 1000;
+			
 			startQuestTimer("core_unlock", respawnTime, null, null);
 			// also save the respawn time so that the info is maintained past reboots
 			StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE);

+ 2 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java

@@ -330,7 +330,8 @@ public class Orfen extends AbstractNpcAI
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
 			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
-			long respawnTime = getRandom((Config.Interval_Of_Orfen_Spawn - Config.Random_Of_Orfen_Spawn), (Config.Interval_Of_Orfen_Spawn + Config.Random_Of_Orfen_Spawn));
+			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
+			respawnTime *= 60 * 60 * 1000;
 			startQuestTimer("orfen_unlock", respawnTime, null, null);
 			// also save the respawn time so that the info is maintained past reboots
 			StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN);

+ 2 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java

@@ -330,7 +330,8 @@ public class QueenAnt extends AbstractNpcAI
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
 			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
-			long respawnTime = getRandom((Config.Interval_Of_QueenAnt_Spawn - Config.Random_Of_QueenAnt_Spawn), (Config.Interval_Of_QueenAnt_Spawn + Config.Random_Of_QueenAnt_Spawn));
+			long respawnTime = Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM);
+			respawnTime *= 60 * 60 * 1000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
 			cancelQuestTimer("action", npc, null);
 			cancelQuestTimer("heal", null, null);

+ 4 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java

@@ -173,7 +173,7 @@ public class Valakas extends AbstractNpcAI
 				// Start timer to lock entry after 30 minutes
 				if (status == WAITING)
 				{
-					startQuestTimer("beginning", Config.Valakas_Wait_Time, valakas, null);
+					startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME, valakas, null);
 				}
 			}
 		}
@@ -445,7 +445,9 @@ public class Valakas extends AbstractNpcAI
 		
 		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
-		long respawnTime = getRandom((Config.Interval_Of_Valakas_Spawn - Config.Random_Of_Valakas_Spawn), (Config.Interval_Of_Valakas_Spawn + Config.Random_Of_Valakas_Spawn));
+		long respawnTime = Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM);
+		respawnTime *= 60 * 60 * 1000;
+		
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
 		// also save the respawn time so that the info is maintained past reboots
 		StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS);

+ 2 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java

@@ -882,7 +882,8 @@ public class Zaken extends AbstractNpcAI
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
 			GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
-			long respawnTime = getRandom((Config.Interval_Of_Zaken_Spawn - Config.Random_Of_Zaken_Spawn), (Config.Interval_Of_Zaken_Spawn + Config.Random_Of_Zaken_Spawn));
+			long respawnTime = Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM);
+			respawnTime *= 60 * 60 * 1000;
 			startQuestTimer("zaken_unlock", respawnTime, null, null);
 			cancelQuestTimer("1001", npc, null);
 			cancelQuestTimer("1003", npc, null);