Merge pull request #28 from SoroushMazloum/develop_issues

self.effort and wm.see_time

Author: naderzare

ChangeLog.md

@@ -1,5 +1,23 @@
 # ChangeLog
 
+## [1.0.4] - 2024-10-8
+
+### Added
+- self.effort and wm.see_time are added
+
+### Fixed
+-
+
+### Changed
+- 
+
+### Engineers
+- [NaderZare](https://github.com/naderzare)
+- [SadraKhanjari](https://github.com/SK2iP)
+- [SoroushMazloum](https://github.com/SoroushMazloum)
+
+=======
+
 ## [1.0.3] - 2024-10-7
 
 ### Added

idl/grpc/service.proto

@@ -1,4 +1,4 @@
-// version 1.3
+// version 1.4
 
 syntax = "proto3";
 
@@ -186,6 +186,7 @@ message Self {
   float stamina_capacity = 38;
   CardType card = 39;
   int32 catch_time = 40;
+  float effort = 41;
 }
 
 enum InterceptActionType {
@@ -296,6 +297,7 @@ message WorldModel {
   bool kickable_teammate_existance = 36;
   bool kickable_opponent_existance = 37;
   PenaltyKickState penalty_kick_state = 38;
+  int32 see_time = 39;
 }
 
 message State {

idl/thrift/soccer_service.thrift

@@ -1,4 +1,4 @@
-// version 1.3
+// version 1.4
 
 namespace cpp soccer
 namespace py soccer
@@ -188,7 +188,8 @@ struct Self {
   37: double recovery,
   38: double stamina_capacity,
   39: CardType card,
-  40: i32 catch_time
+  40: i32 catch_time,
+  41: double effort
 }
 
 enum InterceptActionType {
@@ -298,7 +299,8 @@ struct WorldModel {
   35: double their_defense_player_line_x,
   36: bool kickable_teammate_existance,
   37: bool kickable_opponent_existance,
-  38: PenaltyKickState penalty_kick_state
+  38: PenaltyKickState penalty_kick_state,
+  39: i32 see_time
 }
 
 struct State {

src/grpc-client/state_generator.cpp

@@ -173,7 +173,7 @@ protos::Self *StateGenerator::convertSelf(const rcsc::SelfObject &self, const rc
     res->set_stamina_capacity(static_cast<float>(self.staminaCapacity()));
     res->set_card(convertCardType(self.card()));
     res->set_catch_time(self.catchTime().cycle());
-
+    res->set_effort(static_cast<float>(self.effort()));
     return res;
 }
 
@@ -532,6 +532,7 @@ protos::WorldModel *StateGenerator::convertWorldModel(const rcsc::WorldModel &wm
     {
         res->set_allocated_penalty_kick_state(convertPenaltyKickState(wm, wm.penaltyKickState()));
     }
+    res->set_see_time(wm.seeTime().cycle());
     return res;
 }
 

src/thrift-client/thrift_state_generator.cpp

@@ -178,7 +178,7 @@ soccer::Self ThriftStateGenerator::convertSelf(const rcsc::SelfObject &self, con
     res.stamina_capacity = static_cast<float>(self.staminaCapacity());
     res.card = convertCardType(self.card());
     res.catch_time = self.catchTime().cycle();
-    
+    res.effort = static_cast<float>(self.effort());
     return res;
 }
 
@@ -560,6 +560,7 @@ soccer::WorldModel ThriftStateGenerator::convertWorldModel(const rcsc::WorldMode
     {
         res.penalty_kick_state = convertPenaltyKickState(wm, wm.penaltyKickState());
     }
+    res.see_time = wm.seeTime().cycle();
     return res;
 }