Exposed another npc interaction delay (and greatly lowered it)

nooperation · May 3, 2021 · 12cd489 · 12cd489
1 parent 321559f
commit 12cd489
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/D2Hackit/Core/Resources/D2HackIt.ini b/D2Hackit/Core/Resources/D2HackIt.ini
@@ -47,8 +47,9 @@ TickRate=10
 
 [Vendor]
 MenuTimeout=200
-InteractTimeout=200
+InteractTimeout=150
 ItemTimeout=200
+WalkToTimeout=100
 
 ;
 ;====================================================================

diff --git a/D2Hackit/Core/ServerStartStop.cpp b/D2Hackit/Core/ServerStartStop.cpp
@@ -168,6 +168,7 @@ BOOL PRIVATE ServerStart(HANDLE hModule)
 	psi->VendorItemTimeout = GetPrivateProfileInt("Vendor", "ItemTimeout", 150, psi->IniFile);
 	psi->VendorMenuTimeout = GetPrivateProfileInt("Vendor", "MenuTimeout", 300, psi->IniFile);
 	psi->VendorInteractTimeout = GetPrivateProfileInt("Vendor", "InteractTimeout", 100, psi->IniFile);
+	psi->VendorWalkToTimeout = GetPrivateProfileInt("Vendor", "WalkToTimeout", 100, psi->IniFile);
 
 
 	// -- B

diff --git a/D2Hackit/Core/ServerStructs.h b/D2Hackit/Core/ServerStructs.h
@@ -52,6 +52,7 @@ typedef struct privateserverinfo_t
 	int				VendorItemTimeout;
 	int				VendorMenuTimeout;
 	int				VendorInteractTimeout;
+	int				VendorWalkToTimeout;
 	// -- B
 
 	// Tick thread

diff --git a/D2Hackit/Core/me.cpp b/D2Hackit/Core/me.cpp
@@ -346,7 +346,7 @@ void DoNpcProc()
 			}
 			else
 			{
-				g_npcState.Update(NPC_INTERACT, 2000);
+				g_npcState.Update(NPC_INTERACT, psi->VendorWalkToTimeout);
 			}
 		}
 		else

diff --git a/D2Hackit/Modules/shopbot/main.cpp b/D2Hackit/Modules/shopbot/main.cpp
@@ -7,7 +7,7 @@ std::vector<MAPPOS> customPath;
 
 BOOL PRIVATE Shop(char** argv, int argc)
 {
-	if(customPath.size() == 0)
+	if(customPath.size() <= 1)
 	{
 		switch(me->GetCurrentMapID())
 		{

diff --git a/D2Hackit/Modules/shopbot/shopbot.cpp b/D2Hackit/Modules/shopbot/shopbot.cpp
@@ -92,6 +92,12 @@ bool ShopBot::Start(const std::vector<MAPPOS> &customPath, const std::string &me
 	currentTeleportIndex = 1;
 	ticksSinceLastTeleport = 0;
 
+	if (customPath.size() <= 1)
+	{
+		server->GameStringf("ÿc:Shopbotÿc0: Min prefix: Invalid path, please mark a path using '.shopbot mark' leading out of town.", minPrefix, minSuffix);
+		return false;
+	}
+
 	if(!ReadConfig(".\\plugin\\goodPrefix_shopbot.txt", goodPrefix))
 		return false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -346,7 +346,7 @@ void DoNpcProc() @@
     			}
     			else
     			{
-    				g_npcState.Update(NPC_INTERACT, 2000);
+    				g_npcState.Update(NPC_INTERACT, psi->VendorWalkToTimeout);
     			}
     		}
     		else
@@ Expand Down @@