From b0974724024b16a357047710c7e47915051030f7 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Mon, 10 Feb 2025 20:06:00 -0600 Subject: [PATCH] delete AI Players --- src/engine/AiPlayers/AiPlayer.java | 74 -------------------- src/engine/AiPlayers/AiPlayerManager.java | 71 ------------------- src/engine/mobileAI/Threads/MobAIThread.java | 7 +- src/engine/server/world/WorldServer.java | 4 -- src/engine/workthreads/UpdateThread.java | 7 -- 5 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 src/engine/AiPlayers/AiPlayer.java delete mode 100644 src/engine/AiPlayers/AiPlayerManager.java diff --git a/src/engine/AiPlayers/AiPlayer.java b/src/engine/AiPlayers/AiPlayer.java deleted file mode 100644 index cde279e2..00000000 --- a/src/engine/AiPlayers/AiPlayer.java +++ /dev/null @@ -1,74 +0,0 @@ -package engine.AiPlayers; - -import engine.Enum; -import engine.InterestManagement.InterestManager; -import engine.InterestManagement.WorldGrid; -import engine.gameManager.LootManager; -import engine.math.Vector3fImmutable; -import engine.net.client.msg.VendorDialogMsg; -import engine.objects.*; - -import java.sql.ResultSet; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; - -public class AiPlayer { - public Mob emulated; - - //randomized constructor - //creates a random AI player to start at level 10 and progress throughout the game world - public AiPlayer(){ - Mob emu = generateRandomPlayer(); - if(emu != null) - this.emulated = emu; - } - - public static Mob generateRandomPlayer(){ - Race race = AiPlayerManager.getRandomRace(); - if(race == null) - return null; - - BaseClass baseClass = null; - - List validClasses = race.getValidBaseClasses(); - if (!validClasses.isEmpty()) { - Random random = new Random(); - baseClass = validClasses.get(random.nextInt(validClasses.size())); - // Use randomClass here - } - - if(baseClass == null) - return null; - - City hamlet = AiPlayerManager.getRandomHamlet(); - Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(hamlet.getTOL().loc,30); - - Mob guard = Mob.createStrongholdMob(race.getRaceRuneID(), loc, Guild.getErrantGuild(),true,hamlet.getParent(),null,0, AiPlayerManager.generateFirstName(),10); - - if(guard != null){ - guard.parentZone = hamlet.getParent(); - guard.bindLoc = loc; - guard.setLoc(loc); - guard.StrongholdGuardian = true; - guard.runAfterLoad(); - guard.setLevel((short)10); - guard.spawnTime = 1000000000; - guard.setFirstName(AiPlayerManager.generateFirstName()); - guard.setLastName("Ai Player"); - InterestManager.setObjectDirty(guard); - WorldGrid.addObject(guard,loc.x,loc.z); - WorldGrid.updateObject(guard); - guard.mobPowers.clear(); - } - - return guard; - } - - public void update(){ - this.emulated.update(true); - } - - -} diff --git a/src/engine/AiPlayers/AiPlayerManager.java b/src/engine/AiPlayers/AiPlayerManager.java deleted file mode 100644 index 93d673bd..00000000 --- a/src/engine/AiPlayers/AiPlayerManager.java +++ /dev/null @@ -1,71 +0,0 @@ -package engine.AiPlayers; - -import engine.objects.City; -import engine.objects.Mob; -import engine.objects.Race; -import org.pmw.tinylog.Logger; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; - -public class AiPlayerManager { - - public static ArrayList AiPlayers = new ArrayList<>(); - public static int totalPlayers = 100; - - private static final List GENDER_NEUTRAL_NAMES = Arrays.asList( - "Alex", "Andy", "Avery", "Bailey", "Blake", "Cameron", "Casey", "Charlie", "Dakota", "Dallas", - "Devin", "Drew", "Elliot", "Emerson", "Finley", "Frankie", "Gray", "Harley", "Hayden", "Hunter", - "Jackie", "Jamie", "Jay", "Jessie", "Jordan", "Jules", "Kai", "Keegan", "Kendall", "Lane", - "Leighton", "Lennon", "Lennox", "Logan", "Mackenzie", "Marley", "Mason", "Micah", "Morgan", "Nico", - "Noel", "Oakley", "Parker", "Payton", "Phoenix", "Quinn", "Reagan", "Reese", "Remy", "Riley", - "River", "Robin", "Rowan", "Rory", "Ryan", "Sage", "Sam", "Sawyer", "Shay", "Shiloh", - "Sky", "Skyler", "Spencer", "Stevie", "Sydney", "Tatum", "Taylor", "Toby", "Toni", "Tyler", - "Val", "Wesley", "Winter", "Zephyr", "Arden", "Aspen", "Blaine", "Briar", "Brook", "Camdyn", - "Chandler", "Corey", "Denver", "Devon", "Eden", "Ellis", "Emory", "Ever", "Everest", "Fallon", - "Flynn", "Indigo", "Justice", "Karter", "Kyrie", "Lex", "Lyric", "Monroe", "Peyton", "Sterling" - ); - - private static final int[] hamletIds = {36105, 36245, 36423, 36562, 36661, 39049}; - - private static final Random RANDOM = new Random(); - - public static void init(){ - while(AiPlayers.size() < totalPlayers){ - try { - AiPlayer aiPlayer = new AiPlayer(); - if (aiPlayer != null) { - if (aiPlayer.emulated != null) { - AiPlayers.add(aiPlayer); - } - } - }catch(Exception e){ - Logger.error(e); - } - } - } - public static String generateFirstName(){ - return GENDER_NEUTRAL_NAMES.get(RANDOM.nextInt(GENDER_NEUTRAL_NAMES.size())); - } - - public static Race getRandomRace(){ - int RaceId = ThreadLocalRandom.current().nextInt(1999,2029); - while (RaceId == 2020 || RaceId == 2021 || RaceId == 2018 || RaceId == 2019){ - RaceId = ThreadLocalRandom.current().nextInt(1999,2029); - } - Race race = Race.getRace(RaceId); - return race; - } - - public static City getRandomHamlet() { - return City.getCity(hamletIds[RANDOM.nextInt(hamletIds.length)]); - } - - public static void runAi(Mob mob){ - - } - -} diff --git a/src/engine/mobileAI/Threads/MobAIThread.java b/src/engine/mobileAI/Threads/MobAIThread.java index d15595b6..8a7d8a8a 100644 --- a/src/engine/mobileAI/Threads/MobAIThread.java +++ b/src/engine/mobileAI/Threads/MobAIThread.java @@ -1,6 +1,5 @@ package engine.mobileAI.Threads; -import engine.AiPlayers.AiPlayerManager; import engine.gameManager.ConfigManager; import engine.mobileAI.MobAI; import engine.gameManager.ZoneManager; @@ -34,11 +33,7 @@ public class MobAIThread implements Runnable{ for (Mob mob : zone.zoneMobSet) { try { if (mob != null) { - if(mob.StrongholdGuardian){ - AiPlayerManager.runAi(mob); - }else { - MobAI.DetermineAction(mob); - } + MobAI.DetermineAction(mob); } } catch (Exception e) { Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e); diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index a603b71b..62ac5654 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -9,7 +9,6 @@ package engine.server.world; -import engine.AiPlayers.AiPlayerManager; import engine.Enum; import engine.Enum.BuildingGroup; import engine.Enum.DispatchChannel; @@ -515,9 +514,6 @@ public class WorldServer { Logger.info("Running garbage collection..."); System.gc(); - Logger.info("Spawning AI Players..."); - AiPlayerManager.init(); - Logger.info("Starting Bane Thread"); BaneThread.startBaneThread(); diff --git a/src/engine/workthreads/UpdateThread.java b/src/engine/workthreads/UpdateThread.java index d180749a..27d5f4b2 100644 --- a/src/engine/workthreads/UpdateThread.java +++ b/src/engine/workthreads/UpdateThread.java @@ -9,8 +9,6 @@ package engine.workthreads; -import engine.AiPlayers.AiPlayer; -import engine.AiPlayers.AiPlayerManager; import engine.Enum; import engine.gameManager.SessionManager; import engine.gameManager.SimulationManager; @@ -37,11 +35,6 @@ public class UpdateThread implements Runnable { player.update(true); } } - for(AiPlayer player : AiPlayerManager.AiPlayers){ - if (player != null) { - player.update(); - } - } } catch (Exception e) { Logger.error("UPDATE ERROR",e); }