Merge branch 'main' of ssh://git.douwco.be:2222/douwe/screeps

douwco_hivemind/include/Creeps/CreepBase.hpp

@@ -3,47 +3,35 @@
 
 #include <Screeps/Creep.hpp>
 
-namespace Screeps{
-    class RoomPosition;
-    class RoomObject;
-    class PathStep;
-}
+namespace Screeps {
+class RoomPosition;
+class RoomObject;
+class PathStep;
+} // namespace Screeps
 
-namespace DouwcoHivemind
-{
-    enum CreepRole
-    {
-        UNEMPLOYED,
-        SUPPLIER,
-        UPGRADER,
-        BUILDER,
-        MAINTAINER
-    };
+namespace DouwcoHivemind {
+enum CreepRole { UNEMPLOYED, SUPPLIER, UPGRADER, BUILDER, MAINTAINER, MINER };
 
-    class CreepBase
-    {
-    public:
+class CreepBase {
+public:
   CreepRole role;
   std::string target_id;
 
-    protected:
+protected:
   Screeps::Creep creep;
   JSON memory;
 
-    public:
+public:
   CreepBase(Screeps::Creep crp);
   virtual ~CreepBase();
   virtual void loop() {}
 
-
-
   bool isNearTo(const Screeps::RoomPosition &pos, int dist);
 
-        
-    protected:
+protected:
   void moveToTarget(int dist = 1);
   std::unique_ptr<Screeps::RoomObject> getRoomObjectTarget();
-    };
-}
+};
+} // namespace DouwcoHivemind
 
 #endif // DOUWCO_HIVEMIND_CREEPBASE_HPP

douwco_hivemind/include/Creeps/Miner.hpp

@@ -0,0 +1,21 @@
+#ifndef DOUWCO_HIVEMIND_MINER_HPP
+#define DOUWCO_HIVEMIND_MINER_HPP
+
+#include "Creeps/CreepBase.hpp"
+#include <string>
+
+namespace DouwcoHivemind
+{
+    class Miner : public CreepBase
+    {
+    private:
+        bool arrivedAtContainer;
+
+    public:
+        Miner(Screeps::Creep crp);
+        ~Miner() override;
+        void loop() override;
+    };
+}
+
+#endif // DOUWCO_HIVEMIND_MINER_HPP

douwco_hivemind/include/Creeps/Worker.hpp

@@ -20,6 +20,7 @@ namespace DouwcoHivemind
         virtual void depositEnergy(){}
     
     private:
+        void getEnergy();
         void harvestSource();
         std::unique_ptr<Screeps::Source> getSourceTarget();
         void searchSource();

douwco_hivemind/include/Engine.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Creeps/CreepBase.hpp"
-#include "Room.hpp"
+#include "Entity/Room.hpp"
 #include "Structures/StructureBase.hpp"
 
 namespace DouwcoHivemind {

douwco_hivemind/src/Creeps/CreepBase.cpp

@@ -4,54 +4,60 @@
 #include <Screeps/Room.hpp>
 #include <Screeps/RoomPosition.hpp>
 #include <cstddef>
+#include <cstdlib>
 
 #include "Creeps/CreepBase.hpp"
 
 #include "Tools/JsonTool.hpp"
-#include "Tools/PathTool.hpp"
 #include "Tools/MeasureTool.hpp"
+#include "Tools/PathTool.hpp"
 
-DouwcoHivemind::CreepBase::CreepBase(Screeps::Creep crp) : creep(crp),
-                                                   memory(crp.memory())
-{
-    role = memory.contains("role") ? static_cast<CreepRole>(memory["role"]) : CreepRole::UNEMPLOYED;
-    target_id = memory.contains("target_id") ? static_cast<std::string>(memory["target_id"]) : std::string();
+DouwcoHivemind::CreepBase::CreepBase(Screeps::Creep crp)
+    : creep(crp), memory(crp.memory()) {
+  role = memory.contains("role") ? static_cast<CreepRole>(memory["role"])
+                                 : CreepRole::UNEMPLOYED;
+  target_id = memory.contains("target_id")
+                  ? static_cast<std::string>(memory["target_id"])
+                  : std::string();
 }
 
-DouwcoHivemind::CreepBase::~CreepBase()
-{
+DouwcoHivemind::CreepBase::~CreepBase() {
   memory["role"] = role;
   memory["target_id"] = target_id;
   creep.setMemory(memory);
 }
 
-void DouwcoHivemind::CreepBase::moveToTarget(int dist)
-{
+void DouwcoHivemind::CreepBase::moveToTarget(int dist) {
   // Is move required?
   auto target = getRoomObjectTarget();
-    if (isNearTo(target->pos(), dist))
-    {
+  if (isNearTo(target->pos(), dist)) {
     memory.erase("path");
     return;
   }
 
   // Is wating?
-    if (memory.contains("wait") && memory["wait"] > 0)
-    {
+  if (memory.contains("wait") && memory["wait"] > 0) {
     memory["wait"] = memory["wait"].get<int>() - 1;
     creep.say("Waiting..");
     return;
   }
 
   // Is there a path to walk?
-    if (!memory.contains("path") || memory["path"].empty())
-    {
+  if (!memory.contains("path") || memory["path"].empty()) {
     creep.say("Searching route!");
     auto target_pos = target->pos();
     auto path = creep.room().findPath(creep.pos(), target_pos);
     auto last = path.back();
-        if (last.x - target_pos.x() > dist || last.y - target_pos.y() > dist)
-        {
+    if (dist == 0) {
+      Screeps::Room::PathStep step;
+      step.x = target_pos.x();
+      step.y = target_pos.y();
+      step.dx = step.x - last.x;
+      step.dy = step.y - last.y;
+      path.push_back(step);
+    }
+    if (abs(last.x - target_pos.x()) > dist ||
+        abs(last.y - target_pos.y()) > dist) {
       creep.say("No possible path");
       memory["wait"] = rand() % 20;
       return;
@@ -67,15 +73,11 @@ void DouwcoHivemind::CreepBase::moveToTarget(int dist)
 
   // Get step from memory
   int pathStepData[5] = {0};
-    if (memory["path"].size() > 5)
-    {
-        for (int i = 0; i < 5; i++)
-        {
+  if (memory["path"].size() > 5) {
+    for (int i = 0; i < 5; i++) {
       pathStepData[i] = memory["path"][i];
     }
-    }
-    else
-    {
+  } else {
     memory.erase("path");
     return;
   }
@@ -91,13 +93,11 @@ void DouwcoHivemind::CreepBase::moveToTarget(int dist)
   step.dy = pathStepData[3];
   step.direction = pathStepData[4];
 
-    if (memory.contains("last_pos"))
-    {
+  if (memory.contains("last_pos")) {
     int last_x = memory["last_pos"]["x"];
     int last_y = memory["last_pos"]["y"];
     memory.erase("last_pos");
-        if (x == last_x && y == last_y)
-        {
+    if (x == last_x && y == last_y) {
       creep.say("I'm stuck!");
       memory["wait"] = rand() % 5;
       return;
@@ -105,8 +105,7 @@ void DouwcoHivemind::CreepBase::moveToTarget(int dist)
   }
 
   // Is the creep on the place intended by the path?
-    if (!(x == step.x - step.dx && y == step.y - step.dy))
-    {
+  if (!(x == step.x - step.dx && y == step.y - step.dy)) {
     creep.say("I'm lost!");
     memory["wait"] = rand() % 5;
     memory.erase("path");
@@ -115,33 +114,32 @@ void DouwcoHivemind::CreepBase::moveToTarget(int dist)
 
   // Lets move forward
   int resp = creep.move(step.direction);
-    if (resp == Screeps::OK)
-    {
+  if (resp == Screeps::OK) {
     memory["last_pos"]["x"] = x;
     memory["last_pos"]["y"] = y;
 
-        for (int i = 0; i < 5; i++)
-        {
+    for (int i = 0; i < 5; i++) {
       memory["path"].erase(0);
     }
   }
 }
 
-std::unique_ptr<Screeps::RoomObject> DouwcoHivemind::CreepBase::getRoomObjectTarget()
-{
+std::unique_ptr<Screeps::RoomObject>
+DouwcoHivemind::CreepBase::getRoomObjectTarget() {
   // Check if any target is present
-    if(target_id.empty()) return nullptr;
+  if (target_id.empty())
+    return nullptr;
   // Check if game can find target
   auto roomObj = Screeps::Game.getObjectById(target_id);
-    if (!roomObj)
-    {
-        JS::console.log(creep.name() + ": Game can\'t find target id: " + target_id);
+  if (!roomObj) {
+    JS::console.log(creep.name() +
+                    ": Game can\'t find target id: " + target_id);
     return nullptr;
   }
   return std::move(roomObj);
 }
 
-bool DouwcoHivemind::CreepBase::isNearTo(const Screeps::RoomPosition &pos, int dist)
-{
+bool DouwcoHivemind::CreepBase::isNearTo(const Screeps::RoomPosition &pos,
+                                         int dist) {
   return DouwcoHivemind::isNearTo(creep.pos(), pos, dist);
 }

douwco_hivemind/src/Creeps/Maintainer.cpp

@@ -17,6 +17,7 @@
 
 #include "Creeps/Maintainer.hpp"
 #include "Creeps/CreepBase.hpp"
+#include "Screeps/Constants.hpp"
 
 void DouwcoHivemind::Maintainer::depositEnergy()
 {
@@ -61,22 +62,24 @@ std::unique_ptr<Screeps::Structure> DouwcoHivemind::Maintainer::getDamagedStruct
 
 void DouwcoHivemind::Maintainer::searchDamagedStructure()
 {
-    int lowestMaintaince = INT16_MAX;
+    int highestDamage = 0;
     Screeps::Structure *selectedStructure;
     auto structures = creep.room().find(Screeps::FIND_STRUCTURES);
     for (auto &structureObject : structures)
     {
-        auto structure = dynamic_cast<Screeps::Structure *>(structureObject.get());
+        auto structure = dynamic_cast<Screeps::Structure *>(structureObject.release());
         if (!structure)
             continue;
 
-        int maintance = structure->hits();
+        int damage = structure->hitsMax() - structure->hits();
         auto structureType = structure->structureType();
         if (structureType == Screeps::STRUCTURE_CONTROLLER)
             continue;
-        if (maintance < lowestMaintaince)
+        if(structureType == Screeps::STRUCTURE_WALL || structureType == Screeps::STRUCTURE_RAMPART)
+            continue; // todo cover this situation as well.
+        if (highestDamage < damage)
         {
-            lowestMaintaince = maintance;
+            highestDamage = damage;
             selectedStructure = structure;
         }
     }

douwco_hivemind/src/Creeps/Miner.cpp

@@ -0,0 +1,42 @@
+#include "Creeps/Miner.hpp"
+#include "Creeps/CreepBase.hpp"
+#include "Screeps/Constants.hpp"
+#include "Screeps/Creep.hpp"
+#include "Screeps/Room.hpp"
+#include "Screeps/RoomPosition.hpp"
+#include "Screeps/Source.hpp"
+#include <string>
+
+DouwcoHivemind::Miner::Miner(Screeps::Creep crp) : CreepBase(crp) {
+  arrivedAtContainer = memory.contains("arrivedAtContainer")
+                           ? static_cast<bool>(memory["arrivedAtContainer"])
+                           : false;
+}
+
+DouwcoHivemind::Miner::~Miner() {
+  memory["arrivedAtContainer"] = arrivedAtContainer;
+}
+
+void DouwcoHivemind::Miner::loop() {
+  if (arrivedAtContainer) {
+    auto source =
+        static_cast<Screeps::Source *>(getRoomObjectTarget().release());
+    creep.harvest(*source);
+  } else {
+    auto container = getRoomObjectTarget();
+    if (!container)
+      return;
+    if (isNearTo(container->pos(), 0)) {
+      arrivedAtContainer = true;
+      int x = creep.pos().x();
+      int y = creep.pos().y();
+      auto roomObjs = creep.room().lookForAtArea(Screeps::LOOK_SOURCES, y - 1,
+                                                 x - 1, y + 1, x + 1);
+      return; // fault is here somewhere
+      auto source = static_cast<Screeps::Source *>(roomObjs[0].release());
+      target_id = source->id();
+    } else {
+      moveToTarget(0);
+    }
+  }
+}

douwco_hivemind/src/Creeps/Worker.cpp

@@ -1,48 +1,42 @@
-#include <vector>
-#include <optional>
 #include <emscripten.h>
+#include <optional>
+#include <string>
+#include <vector>
 
-#include <Screeps/Game.hpp>
+#include <Screeps/Constants.hpp>
 #include <Screeps/Creep.hpp>
-#include <Screeps/Source.hpp>
+#include <Screeps/Game.hpp>
 #include <Screeps/Room.hpp>
-#include <Screeps/RoomPosition.hpp>
 #include <Screeps/RoomObject.hpp>
+#include <Screeps/RoomPosition.hpp>
+#include <Screeps/Source.hpp>
+#include <Screeps/Store.hpp>
 #include <Screeps/Structure.hpp>
 #include <Screeps/StructureController.hpp>
-#include <Screeps/StructureSpawn.hpp>
 #include <Screeps/StructureExtension.hpp>
+#include <Screeps/StructureSpawn.hpp>
 #include <Screeps/StructureTower.hpp>
-#include <Screeps/Constants.hpp>
-#include <Screeps/Store.hpp>
 
 #include "Creeps/Worker.hpp"
+#include "Screeps/StructureContainer.hpp"
 
-DouwcoHivemind::Worker::Worker(Screeps::Creep crp) : CreepBase(crp)
-{
-    harvesting = memory.contains("harvesting") ? static_cast<bool>(memory["harvesting"]) : false;
+DouwcoHivemind::Worker::Worker(Screeps::Creep crp) : CreepBase(crp) {
+  harvesting = memory.contains("harvesting")
+                   ? static_cast<bool>(memory["harvesting"])
+                   : false;
 }
 
-DouwcoHivemind::Worker::~Worker()
-{
-    memory["harvesting"] = harvesting;
-}
+DouwcoHivemind::Worker::~Worker() { memory["harvesting"] = harvesting; }
 
-void DouwcoHivemind::Worker::loop()
-{
-    if (harvesting)
-    {
-        if (creep.store().getFreeCapacity(Screeps::RESOURCE_ENERGY) == 0)
-        {
+void DouwcoHivemind::Worker::loop() {
+  if (harvesting) {
+    if (creep.store().getFreeCapacity(Screeps::RESOURCE_ENERGY) == 0) {
       harvesting = false;
       target_id.clear();
     }
-        harvestSource();
-    }
-    else
-    {
-        if (creep.store().getUsedCapacity(Screeps::RESOURCE_ENERGY) == 0)
-        {
+    getEnergy();
+  } else {
+    if (creep.store().getUsedCapacity(Screeps::RESOURCE_ENERGY) == 0) {
       harvesting = true;
       target_id.clear();
     }
@@ -50,43 +44,55 @@ void DouwcoHivemind::Worker::loop()
   }
 }
 
-void DouwcoHivemind::Worker::harvestSource()
-{
+void DouwcoHivemind::Worker::getEnergy() {
+  for (auto containersJSON : creep.room().memory()["sourceContainers"]) {
+    auto containerID = static_cast<std::string>(containersJSON);
+    target_id = containerID;
+    auto containerRoomObject = getRoomObjectTarget();
+    auto container = static_cast<Screeps::StructureContainer *>(
+        containerRoomObject.release());
+    if (0 < container->store().getUsedCapacity(Screeps::RESOURCE_ENERGY)) {
+      if (isNearTo(container->pos(), 1)) {
+        int resp = creep.withdraw(*container, Screeps::RESOURCE_ENERGY);
+      } else {
+        moveToTarget();
+      }
+    }
+  }
+  harvestSource();
+}
+
+void DouwcoHivemind::Worker::harvestSource() {
   auto source = getSourceTarget();
   if (!source)
     return;
 
-    if (isNearTo(source->pos(), 1))
-    {
+  if (isNearTo(source->pos(), 1)) {
     int resp = creep.harvest(*source);
-    }
-    else
-    {
+  } else {
     moveToTarget();
   }
 }
 
-std::unique_ptr<Screeps::Source> DouwcoHivemind::Worker::getSourceTarget()
-{
+std::unique_ptr<Screeps::Source> DouwcoHivemind::Worker::getSourceTarget() {
   auto roomObj = getRoomObjectTarget();
-    if (!roomObj)
-    {
+  if (!roomObj) {
     searchSource();
     return nullptr;
   }
 
   // Check if found roomobject is an actual source
-    auto source = std::unique_ptr<Screeps::Source>(dynamic_cast<Screeps::Source *>(roomObj.release()));
-    if (!source)
-    {
-        // EM_ASM({console.log($0 + ': Can\'t cast target to Source')}, creep.name().c_str());
+  auto source = std::unique_ptr<Screeps::Source>(
+      dynamic_cast<Screeps::Source *>(roomObj.release()));
+  if (!source) {
+    // EM_ASM({console.log($0 + ': Can\'t cast target to Source')},
+    // creep.name().c_str());
     searchSource();
     return nullptr;
   }
 
   // Check if the source still has energy to harvest
-    if (source->energy() == 0)
-    {
+  if (source->energy() == 0) {
     searchSource();
     return nullptr;
   }
@@ -94,8 +100,7 @@ std::unique_ptr<Screeps::Source> DouwcoHivemind::Worker::getSourceTarget()
   return std::move(source);
 }
 
-void DouwcoHivemind::Worker::searchSource()
-{
+void DouwcoHivemind::Worker::searchSource() {
   target_id.clear();
 
   auto sources = creep.room().find(Screeps::FIND_SOURCES_ACTIVE);
@@ -107,17 +112,19 @@ void DouwcoHivemind::Worker::searchSource()
 
   int closestDistance = INT16_MAX;
   Screeps::Source *selectedSource;
-    for(auto &sourceObject : sources){
-        auto source =dynamic_cast<Screeps::Source *>(sourceObject.get());
-        if(source->energy()==0) continue;
+  for (auto &sourceObject : sources) {
+    auto source = dynamic_cast<Screeps::Source *>(sourceObject.get());
+    if (source->energy() == 0)
+      continue;
     int dx = source->pos().x() - x;
     int dy = source->pos().y() - y;
-        int distance = dx*dx + dy*dy;
-        if(distance < closestDistance){
+    int distance = dx * dx + dy * dy;
+    if (distance < closestDistance) {
       closestDistance = distance;
       selectedSource = source;
     }
   }
-    if(!selectedSource) return;
+  if (!selectedSource)
+    return;
   target_id = selectedSource->id();
 }

douwco_hivemind/src/Engine.cpp

@@ -6,8 +6,10 @@
 
 #include "Creeps/Builder.hpp"
 #include "Creeps/Maintainer.hpp"
+#include "Creeps/Miner.hpp"
 #include "Creeps/Supplier.hpp"
 #include "Creeps/Upgrader.hpp"
+#include "Creeps/Miner.hpp"
 
 #include "Structures/Spawn.hpp"
 
@@ -57,6 +59,8 @@ void DouwcoHivemind::Engine::ReadOutCreeps() {
       creeps.push_back(std::make_unique<Builder>(creep.second));
     else if (role == CreepRole::MAINTAINER)
       creeps.push_back(std::make_unique<Maintainer>(creep.second));
+    else if (role == CreepRole::MINER)
+      creeps.push_back(std::make_unique<Miner>(creep.second));
   }
 }
 

douwco_hivemind/src/Entity/Room.cpp

@@ -1,4 +1,4 @@
-#include "Room.hpp"
+#include "Entity/Room.hpp"
 
 #include "Screeps/Constants.hpp"
 #include "Screeps/Room.hpp"

douwco_hivemind/src/Structures/Spawn.cpp

@@ -4,8 +4,7 @@
 #include "Creeps/CreepBase.hpp"
 #include "Structures/Spawn.hpp"
 
-void DouwcoHivemind::Spawn::loop()
-{
+void DouwcoHivemind::Spawn::loop() {
   // Only run every 50 ticks
   if (Screeps::Game.time() % 50 != 0)
     return;
@@ -15,10 +14,14 @@ void DouwcoHivemind::Spawn::loop()
 
   int required_upgraders = 1;
   int required_suppliers = 1;
-    int required_maintainers = spawn.room().find(Screeps::FIND_STRUCTURES).size() <= 2 ? 0 : 1;;
-    int required_builders = spawn.room().find(Screeps::FIND_MY_CONSTRUCTION_SITES).size() == 0 ? 0 : 1;
-    for (auto &creep : Screeps::Game.creeps())
-    {
+  int required_maintainers =
+      spawn.room().find(Screeps::FIND_STRUCTURES).size() <= 2 ? 0 : 1;
+  ;
+  int required_builders =
+      spawn.room().find(Screeps::FIND_MY_CONSTRUCTION_SITES).size() == 0 ? 0
+                                                                         : 1;
+  int required_miners = 1; //spawn.room().memory()["sourceContainers"].size();
+  for (auto &creep : Screeps::Game.creeps()) {
     CreepRole role = creep.second.memory()["role"];
 
     if (role == CreepRole::SUPPLIER)
@@ -29,45 +32,48 @@ void DouwcoHivemind::Spawn::loop()
       required_maintainers--;
     else if (role == CreepRole::BUILDER)
       required_builders--;
+    else if (role == CreepRole::MINER)
+      required_miners--;
   }
 
-    // if (energyAvailable < energyCapacityAvailable && 3 < Screeps::Game.creeps().size())
+  // if (energyAvailable < energyCapacityAvailable && 3 <
+  // Screeps::Game.creeps().size())
   //     return;
   std::string name;
   JSON opts;
-    if (required_suppliers > 0)
-    {
-        opts["memory"]["role"] = CreepRole::SUPPLIER;
-        name = "Supplier: ";
-    }
-    else if (required_upgraders > 0)
-    {
+  if (required_upgraders > 0) {
     opts["memory"]["role"] = CreepRole::UPGRADER;
     name = "Upgrader: ";
-    }
-    else if (required_builders > 0)
-    {
+  } else if (required_miners > 0) {
+    opts["memory"]["role"] = CreepRole::MINER;
+    opts["memory"]["target_id"] =
+        spawn.room().memory()["sourceContainers"][0]; // make logic for more
+    name = "Miner: ";
+  } else if (required_suppliers > 0) {
+    opts["memory"]["role"] = CreepRole::SUPPLIER;
+    name = "Supplier: ";
+  } else if (required_builders > 0) {
     opts["memory"]["role"] = CreepRole::BUILDER;
     name = "Builder: ";
-    }
-    else if (required_maintainers > 0)
-    {
+  } else if (required_maintainers > 0) {
     opts["memory"]["role"] = CreepRole::MAINTAINER;
     name = "Maintainer: ";
-    }
-    else
+  } else
     return;
 
   std::vector<std::string> body;
-    for (int i = 0; i < energyAvailable / 200; i++)
-    {
+  if (opts["memory"]["role"] == CreepRole::MINER) {
+    body.push_back("move");
+    for (int i = 0; i < (energyAvailable - 50) / 100 && i < 5; i++) {
+      body.push_back("work");
+    }
+  } else {
+    for (int i = 0; i < energyAvailable / 200; i++) {
       body.push_back("work");
       body.push_back("carry");
       body.push_back("move");
     }
+  }
 
-    spawn.spawnCreep(
-        body,
-        name + std::to_string(Screeps::Game.time()),
-        opts);
+  spawn.spawnCreep(body, name + std::to_string(Screeps::Game.time()), opts);
 }