From 4f6a431f65ca6b0defbebb6060d5fb4aa68633b5 Mon Sep 17 00:00:00 2001
From: dginovker <dcress01@uoguelph.ca>
Date: Sun, 9 Jun 2019 10:58:58 -0400
Subject: [PATCH] Bot scripting simplification!

---
 .../data/eco/grand_exchange_db.emp            | Bin 138082 -> 138082 bytes
 .../game/node/entity/player/ai/AIPlayer.java  |  20 ------------------
 .../player/ai/general/GeneralBotCreator.java  |   7 ++++--
 .../entity/player/ai/general/ScriptAPI.java   |   6 +-----
 .../general/scriptrepository/ManThiever.java  |   9 +-------
 5 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/09HDscape-server/data/eco/grand_exchange_db.emp b/09HDscape-server/data/eco/grand_exchange_db.emp
index dfacbcb3f1c4e0a3a452e46de27fe47e7d991642..2b045145b03cd5f1ed951fd1fc2b46fa0c565c71 100644
GIT binary patch
delta 25
hcmaE~jpNZa4h{we#%x=|zw;Y8S~(cEaxg_n0|0oG2nqlI

delta 25
gcmaE~jpNZa4h{we#%wD`UG7GXRu0Ck986Kt0BIfuvj6}9

diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java
index 23385fcb0..f7bff6073 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java
@@ -143,26 +143,6 @@ public class AIPlayer extends Player {
 		this.setAttribute("dead", true);
 	}
 
-	public void runScript(Script script)
-	{
-		if (!this.getPulseManager().hasPulseRunning())
-		{
-			getPulseManager().run(new Pulse() {
-				@Override
-				public boolean pulse() {
-					return false;
-				}
-
-				@Override
-				public boolean update() {
-				    super.update();
-				    script.runLoop();
-				    return true;
-				}
-			});
-		}
-	}
-
 	/**
 	 * Gets the UID.
 	 * @return the UID.
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java
index cd4399a44..2ce49f637 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/GeneralBotCreator.java
@@ -27,8 +27,11 @@ public class GeneralBotCreator {
                     AIPlayer.deregister(bot.getUid());
                     return true;
                 }
-
-                bot.runScript(botScript);
+                System.out.println("Running script");
+                if (!bot.getPulseManager().hasPulseRunning())
+                {
+                    botScript.runLoop();
+                }
                 return false;
             }
         });
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java
index 53bf70bfa..07000b01a 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/ScriptAPI.java
@@ -26,12 +26,8 @@ public class ScriptAPI {
         double minDistance = Double.MAX_VALUE;
         for (Node e : RegionManager.forId(me.getLocation().getRegionId()).getPlanes()[me.getLocation().getZ()].getEntities())
         {
-            if (e != null && e.getName().equals(entityName) && distance(me, e) < minDistance && Pathfinder.find(me, e).isSuccessful())
+            if (e != null && e.getName().equals(entityName) && distance(me, e) < minDistance && Pathfinder.find(me, e, false, Pathfinder.SMART).isSuccessful())
             {
-                /*if (entity != null)
-                {
-                    System.out.println("I'm at " + me.getLocation() + ". " + e.getLocation() + distance(me, e) + " is closer to me than " + entity.getLocation() + distance(me, entity));
-                }*/
                 entity = e;
                 minDistance = distance(me, e);
             }
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java
index 76ce5b41a..9e8c76fdc 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/general/scriptrepository/ManThiever.java
@@ -8,13 +8,6 @@ public class ManThiever extends Script {
     public void runLoop() {
         Node man = scriptAPI.getNearestEntity(me, "Man");
 
-        System.out.println("Current pulse: " + me.getPulseManager().getCurrent());
-        System.out.println("Is moving pulse? " + me.getPulseManager().isMovingPulse());
-        if (!me.getPulseManager().isMovingPulse())
-        {
-            man.getInteraction().handle(me, man.getInteraction().get(2));
-        }
-        /*scriptAPI.walk(me, man);
-        new ThievingOptionPlugin().handle(me, man, "pickpocket");*/
+        man.getInteraction().handle(me, man.getInteraction().get(2));
     }
 }