Merge branch 'dev' of https://github.com/Hang-THU/THUAI8 into dev

eesast · Dec 20, 2024 · 93c79de · 93c79de
2 parents fb9e08f + fc63292
commit 93c79de
Show file tree

Hide file tree

Showing 5 changed files with 607 additions and 58 deletions.
diff --git a/CAPI/cpp/API/include/API.h b/CAPI/cpp/API/include/API.h
@@ -136,10 +136,10 @@ class ICharacterAPI : public IAPI
     virtual std::future<bool> Skill_Attack(double angleInRadian) = 0;
     virtual std::future<bool> Common_Attack(double angleInRadian) = 0;
     virtual std::future<bool> Recover(int64_t recover) = 0;
-    virtual std::future<bool> Produce() = 0;
+    virtual std::future<bool> Harvest() = 0;
     virtual std::future<bool> Rebuild(THUAI8::ConstructionType constructionType) = 0;
     virtual std::future<bool> Construct(THUAI8::ConstructionType constructionType) = 0;
-    virtual std::shared_ptr<const THUAI8::Ship> GetSelfInfo() const = 0;
+    virtual std::shared_ptr<const THUAI8::Character> GetSelfInfo() const = 0;
     virtual bool HaveView(int32_t targetX, int32_t targetY) const = 0;
 };
 
@@ -193,7 +193,7 @@ class CharacterAPI : public ICharacterAPI, public IGameTimer
     std::future<bool> Skill_Attack(double angleInRadian) override;
     std::future<bool> Common_Attack(double angleInRadian) override;
     std::future<bool> Recover(int64_t recover) override;
-    std::future<bool> Produce() override;
+    std::future<bool> Harvest() override;
     std::future<bool> Rebuild(THUAI8::ConstructionType constructionType) override;
     std::future<bool> Construct(THUAI8::ConstructionType constructionType) override;
 
@@ -306,7 +306,7 @@ class CharacterDebugAPI : public ICharacterAPI, public IGameTimer
     std::future<bool> Skill_Attack(double angleInRadian) override;
     std::future<bool> Common_Attack(double angleInRadian) override;
     std::future<bool> Recover(int64_t recover) override;
-    std::future<bool> Produce() override;
+    std::future<bool> Harvest() override;
     std::future<bool> Rebuild(THUAI8::ConstructionType constructionType) override;
     std::future<bool> Construct(THUAI8::ConstructionType constructionType) override;