implemented #146

SoPra-Team-17 · May 4, 2020 · 5b025b5 · 5b025b5
1 parent adf9e43
commit 5b025b5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/gameLogic/generation/ActionGenerator_Server.cpp b/src/gameLogic/generation/ActionGenerator_Server.cpp
@@ -4,6 +4,7 @@
 
 #include <datatypes/gameplay/CatAction.hpp>
 #include <util/GameLogicUtils.hpp>
+#include <datatypes/gameplay/JanitorAction.hpp>
 #include "ActionGenerator.hpp"
 
 namespace spy::gameplay {
@@ -20,9 +21,10 @@ namespace spy::gameplay {
         return action;
     }
 
-    std::shared_ptr<BaseOperation> ActionGenerator::generateJanitorAction(const State &/*s*/) {
-        // TODO implement
-        return std::shared_ptr<BaseOperation>();
+    std::shared_ptr<BaseOperation> ActionGenerator::generateJanitorAction(const State &s) {
+        auto target = util::GameLogicUtils::getRandomCharacterNeighbouringField(s, s.getJanitorCoordinates().value());
+        auto action = std::make_shared<JanitorAction>(spy::gameplay::JanitorAction(target));
+        return action;
     }
 
     std::shared_ptr<BaseOperation> ActionGenerator::generateNPCAction(const State &/*s*/, const util::UUID &/*activeNPC*/) {

diff --git a/src/util/GameLogicUtils.cpp b/src/util/GameLogicUtils.cpp
@@ -126,4 +126,11 @@ namespace spy::util {
         }
         return result;
     }
+
+    const util::Point &GameLogicUtils::getRandomCharacterNeighbouringField(const gameplay::State &s, const Point &p) {
+        return getRandomNeighbouringField(s, p, [&s](util::Point currentPoint) {
+            // check if character is on point
+            return isPersonOnField(s, currentPoint);
+        });
+    }
 }
diff --git a/src/util/GameLogicUtils.hpp b/src/util/GameLogicUtils.hpp
@@ -100,6 +100,15 @@ namespace spy::util {
             static std::optional<util::Point>
             getRandomCharacterFreeNeighbourField(const spy::gameplay::State &s, const util::Point &p);
 
+            /**
+             * @brief get point of of a neighbouring field with a character on it. If there are more fields randomize
+             * @param s current state
+             * @param p Point where character is at the moment
+             * @return point where closest character is standing
+             */
+            static const util::Point &
+            getRandomCharacterNeighbouringField(const spy::gameplay::State &s, const util::Point &p);
+
             /**
              * @brief get point of random neighbouring field which fulfils certain condition
              * @tparam t function