Browse Source

BETA: Minor update for [8939] in order to consider (+/- random time), and not just (- random time).

MELERIX 12 years ago
parent
commit
683e05e78f

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

@@ -939,8 +939,8 @@ public class Antharas extends AbstractNpcAI
 			npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
 			_cubeSpawnTask = ThreadPoolManager.getInstance().scheduleGeneral(new CubeSpawn(0), 10000);
 			GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
-			// Respawn time is 264 Hours - 72 Random Hours
-			long respawnTime = (long) Config.Interval_Of_Antharas_Spawn - getRandom(Config.Random_Of_Antharas_Spawn);
+			// 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));
 			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());

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

@@ -471,8 +471,8 @@ public class Baium extends AbstractNpcAI
 		npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
 		// spawn the "Teleportation Cubic" for 15 minutes (to allow players to exit the lair)
 		addSpawn(TELEPORT_CUBIC, 115017, 15549, 10090, 0, false, 900000);
-		// Respawn time is 168 Hours - 48 Random Hours
-		long respawnTime = (long) Config.Interval_Of_Baium_Spawn - getRandom(Config.Random_Of_Baium_Spawn);
+		// 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));
 		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

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

@@ -407,8 +407,8 @@ public class Beleth extends AbstractNpcAI
 		{
 			setBelethKiller(1, killer);
 			GrandBossManager.getInstance().setBossStatus(29118, 3);
-			// Respawn time is 192 Hours - 148 Random Hours
-			long respawnTime = (long) Config.INTERVAL_OF_BELETH_SPAWN - getRandom(Config.RANDOM_OF_BELETH_SPAWN);
+			// 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));
 			StatsSet info = GrandBossManager.getInstance().getStatsSet(29118);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
 			GrandBossManager.getInstance().setStatsSet(29118, info);

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

@@ -199,8 +199,8 @@ public class Core extends AbstractNpcAI
 			npc.broadcastPacket(new NpcSay(objId, Say2.NPC_ALL, npcId, NpcStringId.DOT_DOT_DOT_DOT_DOT_DOT));
 			_FirstAttacked = false;
 			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
-			// Respawn time is 60 Hours - 24 Random Hours
-			long respawnTime = (long) Config.Interval_Of_Core_Spawn - getRandom(Config.Random_Of_Core_Spawn);
+			// 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));
 			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 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java

@@ -325,8 +325,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);
-			// Respawn time is 48 Hours - 20 Random Hours
-			long respawnTime = (long) Config.Interval_Of_Orfen_Spawn - getRandom(Config.Random_Of_Orfen_Spawn);
+			// 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));
 			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 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java

@@ -325,8 +325,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);
-			// Respawn time is 36 Hours - 17 Random Hours
-			long respawnTime = (long) Config.Interval_Of_QueenAnt_Spawn - getRandom(Config.Random_Of_QueenAnt_Spawn);
+			// 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));
 			startQuestTimer("queen_unlock", respawnTime, null, null);
 			cancelQuestTimer("action", npc, null);
 			cancelQuestTimer("heal", null, null);

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

@@ -440,10 +440,9 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
 		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
-		
-		long respawnTime = (long) Config.Interval_Of_Valakas_Spawn + getRandom(Config.Random_Of_Valakas_Spawn);
+		// 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));
 		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);
 		info.set("respawn_time", (System.currentTimeMillis() + respawnTime));

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

@@ -877,8 +877,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);
-			// Respawn time is 60 Hours - 20 Random Hours
-			long respawnTime = (long) Config.Interval_Of_Zaken_Spawn - getRandom(Config.Random_Of_Zaken_Spawn);
+			// 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));
 			startQuestTimer("zaken_unlock", respawnTime, null, null);
 			cancelQuestTimer("1001", npc, null);
 			cancelQuestTimer("1003", npc, null);