Merge branch 'master' into conan_build

  Adding the utils density_clear function

CMakeLists.txt

@@ -14,11 +14,6 @@ else()
   message("==> CMAKE_BUILD_TYPE == ${CMAKE_BUILD_TYPE}.")
 endif()
 
-add_definitions("-std=c++11")
-set(Boost_USE_STATIC_LIBS        ON)
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
-
 ## set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -DGLIBCXX_FORCE_NEW")
 
 ## https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_macros.html
@@ -35,11 +30,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD   17)
 set(CMAKE_CXX_EXTENSIONS ON)
 
-#ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK)
+ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK)
 
 # add log_setup log 
-#FIND_PACKAGE( Boost 1.60 COMPONENTS program_options log_setup log REQUIRED )
-#INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+FIND_PACKAGE( Boost 1.60 COMPONENTS program_options log_setup log REQUIRED )
+INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
 if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp)
   message("***")
@@ -63,13 +58,11 @@ option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
 ### TESTS
 add_executable(test-galaxy test-galaxy.cpp galaxy.cpp config.cpp utils.cpp buysell.cpp)
 add_dependencies(test-galaxy gtest)
-#target_link_libraries(test-galaxy gtest_main ${Boost_LIBRARIES} yaml-cpp)
-target_link_libraries(test-galaxy gtest_main ${CONAN_LIBS} yaml-cpp)
+target_link_libraries(test-galaxy gtest_main ${Boost_LIBRARIES} yaml-cpp)
 
 add_executable(test-director test-director.cpp galaxy.cpp utils.cpp buysell.cpp director.cpp dispatchers.cpp boxes.cpp scripts.cpp config.cpp ansicolor.cpp)
 add_dependencies(test-director gtest)
-#target_link_libraries(test-director gtest_main ${Boost_LIBRARIES} yaml-cpp)
-target_link_libraries(test-director gtest_main ${CONAN_LIBS} yaml-cpp)
+target_link_libraries(test-director gtest_main ${Boost_LIBRARIES} yaml-cpp)
 
 enable_testing()
 add_test(NAME test-galaxy
@@ -79,8 +72,7 @@ add_test(NAME test-director
 
 # dispatchers.cpp 
 ADD_EXECUTABLE( twproxy twproxy.cpp utils.cpp session.cpp boxes.cpp director.cpp galaxy.cpp dispatchers.cpp scripts.cpp buysell.cpp config.cpp ansicolor.cpp)
-#TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread yaml-cpp)
-TARGET_LINK_LIBRARIES( twproxy ${CONAN_LIBS} pthread yaml-cpp)
+TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread yaml-cpp)
 
-#target_precompile_headers(twproxy PRIVATE pch.hpp)
+target_precompile_headers(twproxy PRIVATE pch.hpp)
 

utils.cpp

@@ -157,6 +157,48 @@ bool at_planet_prompt(const std::string &prompt) {
   return false;
 }
 
+bool density_clear(int sector, int density, int navhaz) {
+  if(sector == 0) return false;
+  //if(anomoly) return false;
+  /*
+  http://wiki.classictw.com/index.php?title=Gypsy%27s_Big_Dummy%27s_Guide_to_TradeWars_Text#Trader_Information
+  Density Readings:
+    0 = Empty Sector or Ferrengi Dreadanought
+    1 = Marker Beacon
+    2 = Limpet Type 2 Tracking Mine
+    5 = Fighter (per Fighter)
+   10 = Armid Type 1 Mine
+   21 = Navigation Hazard (Per 1 Percent)
+   21 = Destroyed Ship     (Due to 1 Percent Nav-Haz)
+   38 = Unmanned Ship
+   40 = Manned Ship, Alien or Ferrengi Assault Trader
+   50 = Destroyed Starport (After 25 Percent Nav-Haz Clears)
+  100 = Starport or Ferrengi Battle Cruiser
+  210 = Destroyed Planet   (Due to 10 Percent Nav-Haz)
+  462 = Federation Starship under Admiral Nelson
+  489 = Federation Starship under Captain Zyrain
+  500 = Planet
+  512 = Federation Starship under Admiral Clausewitz
+  575 = Destroyed Port (Before 25% Nav-Haz Clears)
+  */
+  int dense = density;
+  if((navhaz != 0) && (navhaz <= 5)) {
+    // Adjust density by upto 5% navhaz, exlude greather than 5%
+    dense -= navhaz * 21;
+  }
+  if(navhaz > 5) return false;
+  switch (dense) {
+    case 0:
+    case 1:
+    case 100:
+    case 101:
+      return true;
+  }
+  // Special case for Sector 001.
+  if((sector == 1) && (dense == 601)) return true;
+  return false;
+}
+
 #include <algorithm>
 #include <cctype>
 

utils.h

@@ -21,6 +21,8 @@ bool endswith(const std::string &line, const std::string &has);
 bool in(const std::string &line, const std::string &has);
 std::string repr(const std::string &source);
 
+bool density_clear(int sector, int density, int navhaz=0);
+
 bool file_exists(const std::string &name);
 bool at_command_prompt(const std::string &prompt);
 bool at_computer_prompt(const std::string &prompt);