Merge branch 'main' of https://github.com/JueXiuHuang/MapArtist

JueXiuHuang · Apr 6, 2024 · 55c3cde · 55c3cde
2 parents cff2f6e + 09aa35f
commit 55c3cde
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/dependency/pathfinding b/dependency/pathfinding
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
@@ -44,6 +44,7 @@ std::ostream &operator<<(std::ostream &os, const PrivateConf &conf) {
 
 std::ostream &operator<<(std::ostream &os, const MoveConf &conf) {
   os << "Use Flash: " << (conf.use_flash ? "True" : "False") << std::endl;
+  os << "Max Interval: " << conf.max_interval << std::endl;
   return os;
 }
 
@@ -159,6 +160,7 @@ static MoveConf parseMove(toml::table *table) {
   MoveConf conf;
 
   conf.use_flash = (*table)["use_flash"].value_or(false);
+  conf.max_interval = (*table)["max_interval"].value_or(1);
 
   std::cout << conf << std::endl;
 

diff --git a/src/ConfigParser.hpp b/src/ConfigParser.hpp
@@ -37,6 +37,7 @@ struct PrivateConf {
 
 struct MoveConf {
   bool use_flash;
+  std::size_t max_interval;
 };
 
 struct OtherConf {

diff --git a/src/CustomTask.cpp b/src/CustomTask.cpp
@@ -754,7 +754,7 @@ Botcraft::Status FindPathAndMoveImpl(Botcraft::BehaviourClient &c,
     std::cout << GetTime() << "Find a path from " << from << " to " << to
               << "\n";
     // find path and go
-    r = finder.findPathAndGo(from, goal, 15000);
+    r = finder.findPathAndGo(from, goal, artist.conf.move.max_interval, 15000);
     if (r) break;
     from = getFromPosition();  // get the latest position
     std::cout << GetTime() << "Failed, retry after 5 seconds..." << std::endl;
@@ -785,7 +785,7 @@ Botcraft::Status FindPathAndMoveImpl(Botcraft::BehaviourClient &c,
     pf::Position from = getFromPosition();
     std::cout << GetTime() << "Find a path from " << from << " to " << to
               << "\n";
-    r = finder.findPathAndGo(from, goal, 15000);
+    r = finder.findPathAndGo(from, goal, artist.conf.move.max_interval, 15000);
   }
 
   return (r ? Botcraft::Status::Success : Botcraft::Status::Failure);
+3 −3		include/pf/Finder/AstarFinder.hpp
+3 −3		include/pf/Finder/BiAstarFinder.hpp
+165 −0		include/pf/Finder/CompleteFinder.hpp
+14 −130		include/pf/Finder/FinderBase.hpp
+3 −3		include/pf/Finder/IDAstarFinder.hpp
+3 −3		include/pf/Finder/MultiGoalFinder.hpp
+25 −0		include/pf/Path.hpp