From 1efe475680b0795d3cfc81eb1a47b0ae4616d236 Mon Sep 17 00:00:00 2001 From: dginovker Date: Thu, 7 Nov 2019 15:38:41 -0500 Subject: [PATCH 1/4] Get rid of tips --- Server/src/org/crandor/game/world/GameWorld.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Server/src/org/crandor/game/world/GameWorld.java b/Server/src/org/crandor/game/world/GameWorld.java index 2832e8f17..fd78ab575 100644 --- a/Server/src/org/crandor/game/world/GameWorld.java +++ b/Server/src/org/crandor/game/world/GameWorld.java @@ -125,21 +125,6 @@ public final class GameWorld { pulses.clear(); ticks++; - for (Player p : Repository.getPlayers()) { - if (p.isPlaying()) { - switch (RandomFunction.getRandom(1000)) { - case 1: - p.sendMessage("Tip: You can earn some extra gold by looting the stalls in Ardougne."); - break; - case 2: - p.sendMessage("Tip: You can begin slayer by speaking to Turael at home."); - break; - case 3: - p.sendMessage("Tip: Speak to Bill Reach to get to popular areas."); - break; - } - } - } if (ticks % 50 == 0) { TaskExecutor.execute(() -> { try { From 9cf66aff26598072d2d9bd5f12250506f074877b Mon Sep 17 00:00:00 2001 From: dginovker Date: Thu, 7 Nov 2019 16:03:45 -0500 Subject: [PATCH 2/4] Fix header --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc466061d..e7444fbfc 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Since this portion of the guide is operating-system specific, you will either ne - Import `Server/server.sql` and `Server/global.sql` into their respective databases - _Refer [here](https://www.thecodedeveloper.com/import-large-sql-files-xampp/) for help importing the `.sql` files_ -# Linux Command Line +### Linux Command Line - Instructions for various Linux distros can be found [here](https://github.com/dginovker/RS-2009/tree/master/CompiledServer/Guides) From 0a316afe4dd5f376168c400a57ebff4538ae8fbf Mon Sep 17 00:00:00 2001 From: dginovker Date: Thu, 7 Nov 2019 16:43:01 -0500 Subject: [PATCH 3/4] make immersive bots occur at startup --- .../entity/player/ai/resource/ResourceAIPManager.java | 10 ++++++++++ Server/src/org/crandor/game/world/GameWorld.java | 1 + Server/src/plugin/command/AIPCommandPlugin.java | 7 ++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java b/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java index 725658a50..314a1f4a8 100644 --- a/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java +++ b/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java @@ -1,8 +1,11 @@ package org.crandor.game.node.entity.player.ai.resource; import org.crandor.game.node.entity.player.Player; +import org.crandor.game.node.entity.player.ai.AIPBuilder; +import org.crandor.game.node.entity.player.ai.pvmbots.PvMBotsBuilder; import org.crandor.game.node.entity.player.ai.resource.task.ResourceTask; import org.crandor.game.node.entity.player.ai.resource.task.ResourceTasks; +import org.crandor.game.node.entity.player.ai.skillingbot.SkillingBotsBuilder; import org.crandor.game.system.task.Pulse; import org.crandor.game.world.GameWorld; @@ -32,6 +35,13 @@ public class ResourceAIPManager { return this; } + public void immerseWorld() { //There's probably a better place for this (it adds bot at bootup) + PvMBotsBuilder.immersiveSpawns(); + AIPBuilder.immersiveSpawns(); + SkillingBotsBuilder.immersiveSpawnsSkillingBots(); + System.out.println("Loaded immerseWorld"); + } + public ResourceAIPManager runTask(Player player, String taskName) { for (Map.Entry entry : getTasks().entrySet()) { if (entry.getKey().getTaskName().equalsIgnoreCase(taskName)) { diff --git a/Server/src/org/crandor/game/world/GameWorld.java b/Server/src/org/crandor/game/world/GameWorld.java index fd78ab575..7508c7614 100644 --- a/Server/src/org/crandor/game/world/GameWorld.java +++ b/Server/src/org/crandor/game/world/GameWorld.java @@ -189,6 +189,7 @@ public final class GameWorld { SQLManager.postPlugin(); parseObjects(); CallbackHub.call(); + // ResourceAIPManager.get().init(); if (run) { SystemManager.flag(GameWorld.getSettings().isDevMode() ? SystemState.PRIVATE : SystemState.ACTIVE); diff --git a/Server/src/plugin/command/AIPCommandPlugin.java b/Server/src/plugin/command/AIPCommandPlugin.java index d3e840e26..017ac570b 100644 --- a/Server/src/plugin/command/AIPCommandPlugin.java +++ b/Server/src/plugin/command/AIPCommandPlugin.java @@ -13,6 +13,7 @@ import org.crandor.game.node.entity.player.ai.pvmbots.PvMBotsBuilder; import org.crandor.game.node.entity.player.ai.pvp.PVPAIPActions; import org.crandor.game.node.entity.player.ai.pvp.PVPAIPBuilderUtils; import org.crandor.game.node.entity.player.ai.resource.ResourceAIPActions; +import org.crandor.game.node.entity.player.ai.resource.ResourceAIPManager; import org.crandor.game.node.entity.player.ai.skillingbot.SkillingBotsBuilder; import org.crandor.game.node.entity.player.ai.wilderness.PvPBotsBuilder; import org.crandor.game.node.entity.player.link.appearance.Gender; @@ -214,10 +215,10 @@ public final class AIPCommandPlugin extends CommandPlugin { case "noobbot": PvMBotsBuilder.spawnNoob(player.getLocation()); return true; + case "immerse": + case "immersiveworld": case "immersive": - PvMBotsBuilder.immersiveSpawns(); - AIPBuilder.immersiveSpawns(); - SkillingBotsBuilder.immersiveSpawnsSkillingBots(); + ResourceAIPManager.get().immerseWorld(); return true; case "fishtest": SkillingBotsBuilder.spawnTroutLumbridge("Bot", new Location(3241, 3242)); From 15e96254b6aff8a225cfe71a45a84079f1b057f4 Mon Sep 17 00:00:00 2001 From: dginovker Date: Thu, 7 Nov 2019 16:49:44 -0500 Subject: [PATCH 4/4] Actually add immersive bots npow --- Server/src/org/crandor/game/world/GameWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/org/crandor/game/world/GameWorld.java b/Server/src/org/crandor/game/world/GameWorld.java index 7508c7614..953e3e7d8 100644 --- a/Server/src/org/crandor/game/world/GameWorld.java +++ b/Server/src/org/crandor/game/world/GameWorld.java @@ -186,11 +186,11 @@ public final class GameWorld { ScriptManager.load(); PluginManager.init(); ResourceAIPManager.get().init(); + ResourceAIPManager.get().immerseWorld(); SQLManager.postPlugin(); parseObjects(); CallbackHub.call(); -// ResourceAIPManager.get().init(); if (run) { SystemManager.flag(GameWorld.getSettings().isDevMode() ? SystemState.PRIVATE : SystemState.ACTIVE); }