Merge pull request #262 from DragonAura/dev

refactor(CAPI): 🎨 change names

CAPI/cpp/API/include/constants.h

@@ -25,7 +25,7 @@ namespace Constants
     SCCI int numOfRequiredClassroomForHiddenGate = 3;  // 打开隐藏门需要完成的教室数量
 
     // 人物属性相关
-    SCCI int basicTreatSpeed = 100;
+    SCCI int basicEncourageSpeed = 100;
     SCCI int basicFixSpeed = 123;
     SCCI int basicSpeedOfOpeningOrLocking = 4000;
     SCCI int basicStudentSpeedOfClimbingThroughWindows = 611;
@@ -34,8 +34,8 @@ namespace Constants
 
     SCCI int basicHp = 3000000;
     SCCI int basicMaxGamingAddiction = 60000;
-    SCCI int basicTreatmentDegree = 1500000;
-    SCCI int basicTimeOfRescue = 1000;
+    SCCI int basicEncouragementDegree = 1500000;
+    SCCI int basicTimeOfRouse = 1000;
 
     SCCI int basicStudentSpeed = 1270;
     SCCI int basicTrickerSpeed = 1504;
@@ -119,7 +119,7 @@ namespace Constants
         SCCI int maxHp = basicHp;
         SCCI int maxAddiction = basicMaxGamingAddiction * 9 / 10;
         SCCI int fixSpeed = basicFixSpeed * 6 / 10;
-        SCCI int treatSpeed = basicTreatSpeed * 8 / 10;
+        SCCI int encourageSpeed = basicEncourageSpeed * 8 / 10;
         SCCI double concealment = 0.9;
         SCCI int alertnessRadius = basicStudentAlertnessRadius;
         SCCI int viewRange = basicStudentViewRange * 11 / 10;
@@ -134,7 +134,7 @@ namespace Constants
         SCCI int maxHp = basicHp * 10;
         SCCI int maxAddiction = basicMaxGamingAddiction * 10;
         SCCI int fixSpeed = basicFixSpeed * 0;
-        SCCI int treatSpeed = basicTreatSpeed * 7 / 10;
+        SCCI int encourageSpeed = basicEncourageSpeed * 7 / 10;
         SCCI double concealment = 0.5;
         SCCI int alertnessRadius = basicStudentAlertnessRadius / 2;
         SCCI int viewRange = basicStudentViewRange * 9 / 10;
@@ -149,7 +149,7 @@ namespace Constants
         SCCI int maxHp = basicHp * 11 / 10;
         SCCI int maxAddiction = basicMaxGamingAddiction * 13 / 10;
         SCCI int fixSpeed = basicFixSpeed * 11 / 10;
-        SCCI int treatSpeed = basicTreatSpeed * 8 / 10;
+        SCCI int encourageSpeed = basicEncourageSpeed * 8 / 10;
         SCCI double concealment = 0.9;
         SCCI int alertnessRadius = basicStudentAlertnessRadius * 9 / 10;
         SCCI int viewRange = basicStudentViewRange * 9 / 10;
@@ -164,7 +164,7 @@ namespace Constants
         SCCI int maxHp = basicHp * 0.4;
         SCCI int maxAddiction = basicMaxGamingAddiction * 0;
         SCCI int fixSpeed = basicFixSpeed;
-        SCCI int treatSpeed = basicTreatSpeed * 8 / 10;
+        SCCI int encourageSpeed = basicEncourageSpeed * 8 / 10;
         SCCI double concealment = 1;
         SCCI int alertnessRadius = basicStudentAlertnessRadius * 1;
         SCCI int viewRange = basicStudentViewRange;
@@ -179,7 +179,7 @@ namespace Constants
         SCCI int maxHp = basicHp * 9 / 10;
         SCCI int maxAddiction = basicMaxGamingAddiction * 11 / 10;
         SCCI int fixSpeed = basicFixSpeed * 11 / 10;
-        SCCI int treatSpeed = basicTreatSpeed * 9 / 10;
+        SCCI int encourageSpeed = basicEncourageSpeed * 9 / 10;
         SCCI double concealment = 1;
         SCCI int alertnessRadius = basicStudentAlertnessRadius;
         SCCI int viewRange = basicStudentViewRange * 9 / 10;
@@ -194,7 +194,7 @@ namespace Constants
         SCCI int maxHp = basicHp * 32 / 30;
         SCCI int maxAddiction = basicMaxGamingAddiction * 11 / 10;
         SCCI int fixSpeed = basicFixSpeed;
-        SCCI int treatSpeed = basicTreatSpeed * 2;
+        SCCI int encourageSpeed = basicEncourageSpeed * 2;
         SCCI double concealment = 1;
         SCCI int alertnessRadius = basicStudentAlertnessRadius;
         SCCI int viewRange = basicStudentViewRange;

CAPI/cpp/API/include/structures.h

@@ -126,11 +126,11 @@ namespace THUAI6
         Addicted = 3,
         Quit = 4,
         Graduated = 5,
-        Treated = 6,
-        Rescued = 7,
+        Encouraged = 6,
+        Roused = 7,
         Stunned = 8,
-        Treating = 9,
-        Rescuing = 10,
+        Encouraging = 9,
+        Rousing = 10,
         Swinging = 11,
         Attacking = 12,
         Locking = 13,
@@ -195,9 +195,9 @@ namespace THUAI6
         int32_t determination;  // 剩余毅力
         int32_t addiction;      // 沉迷程度
         int32_t learningSpeed;
-        int32_t treatSpeed;
-        int32_t treatProgress;
-        int32_t rescueProgress;
+        int32_t encourageSpeed;
+        int32_t encourageProgress;
+        int32_t rouseProgress;
         double dangerAlert;
         std::vector<StudentBuffType> buff;  // buff
     };
@@ -302,11 +302,11 @@ namespace THUAI6
         {PlayerState::Addicted, "Addicted"},
         {PlayerState::Quit, "Quit"},
         {PlayerState::Graduated, "Graduated"},
-        {PlayerState::Treated, "Treated"},
-        {PlayerState::Rescued, "Rescued"},
+        {PlayerState::Encouraged, "Encouraged"},
+        {PlayerState::Roused, "Roused"},
         {PlayerState::Stunned, "Stunned"},
-        {PlayerState::Treating, "Treating"},
-        {PlayerState::Rescuing, "Rescuing"},
+        {PlayerState::Encouraging, "Encouraging"},
+        {PlayerState::Rousing, "Rousing"},
         {PlayerState::Swinging, "Swinging"},
         {PlayerState::Attacking, "Attacking"},
         {PlayerState::Locking, "Locking"},

CAPI/cpp/API/include/utils.hpp

@@ -146,11 +146,11 @@ namespace Proto2THUAI6
         {protobuf::PlayerState::ADDICTED, THUAI6::PlayerState::Addicted},
         {protobuf::PlayerState::QUIT, THUAI6::PlayerState::Quit},
         {protobuf::PlayerState::GRADUATED, THUAI6::PlayerState::Graduated},
-        {protobuf::PlayerState::RESCUED, THUAI6::PlayerState::Rescued},
-        {protobuf::PlayerState::TREATED, THUAI6::PlayerState::Treated},
+        {protobuf::PlayerState::RESCUED, THUAI6::PlayerState::Roused},
+        {protobuf::PlayerState::TREATED, THUAI6::PlayerState::Encouraged},
         {protobuf::PlayerState::STUNNED, THUAI6::PlayerState::Stunned},
-        {protobuf::PlayerState::RESCUING, THUAI6::PlayerState::Rescuing},
-        {protobuf::PlayerState::TREATING, THUAI6::PlayerState::Treating},
+        {protobuf::PlayerState::RESCUING, THUAI6::PlayerState::Rousing},
+        {protobuf::PlayerState::TREATING, THUAI6::PlayerState::Encouraging},
         {protobuf::PlayerState::SWINGING, THUAI6::PlayerState::Swinging},
         {protobuf::PlayerState::ATTACKING, THUAI6::PlayerState::Attacking},
         {protobuf::PlayerState::LOCKING, THUAI6::PlayerState::Locking},
@@ -240,9 +240,9 @@ namespace Proto2THUAI6
         student->facingDirection = studentMsg.facing_direction();
         student->bulletType = bulletTypeDict[studentMsg.bullet_type()];
         student->learningSpeed = studentMsg.learning_speed();
-        student->treatSpeed = studentMsg.treat_speed();
-        student->treatProgress = studentMsg.treat_progress();
-        student->rescueProgress = studentMsg.rescue_progress();
+        student->encourageSpeed = studentMsg.treat_speed();
+        student->encourageProgress = studentMsg.treat_progress();
+        student->rouseProgress = studentMsg.rescue_progress();
         student->dangerAlert = studentMsg.danger_alert();
         student->timeUntilSkillAvailable.clear();
         for (int i = 0; i < studentMsg.time_until_skill_available().size(); i++)

CAPI/cpp/API/src/DebugAPI.cpp

@@ -661,7 +661,7 @@ void StudentDebugAPI::PrintStudent() const
             props += THUAI6::propTypeDict[prop] + ", ";
         logger->info("state={}, bullet={}, props={}", THUAI6::playerStateDict[student->playerState], THUAI6::bulletTypeDict[student->bulletType], props);
         logger->info("type={}, determination={}, addiction={}, danger alert={}", THUAI6::studentTypeDict[student->studentType], student->determination, student->addiction, student->dangerAlert);
-        logger->info("learning speed={}, treat speed={}, treat progress={}, rescue progress={}", student->learningSpeed, student->treatSpeed, student->treatProgress, student->rescueProgress);
+        logger->info("learning speed={}, encourage speed={}, encourage progress={}, rouse progress={}", student->learningSpeed, student->encourageSpeed, student->encourageProgress, student->rouseProgress);
         std::string studentBuff = "";
         for (const auto& buff : student->buff)
             studentBuff += THUAI6::studentBuffDict[buff] + ", ";
@@ -686,7 +686,7 @@ void TrickerDebugAPI::PrintStudent() const
             props += THUAI6::propTypeDict[prop] + ", ";
         logger->info("state={}, bullet={}, props={}", THUAI6::playerStateDict[student->playerState], THUAI6::bulletTypeDict[student->bulletType], props);
         logger->info("type={}, determination={}, addiction={}, danger alert={}", THUAI6::studentTypeDict[student->studentType], student->determination, student->addiction, student->dangerAlert);
-        logger->info("learning speed={}, treat speed={}, treat progress={}, rescue progress={}", student->learningSpeed, student->treatSpeed, student->treatProgress, student->rescueProgress);
+        logger->info("learning speed={}, encourage speed={}, encourage progress={}, rouse progress={}", student->learningSpeed, student->encourageSpeed, student->encourageProgress, student->rouseProgress);
         std::string studentBuff = "";
         for (const auto& buff : student->buff)
             studentBuff += THUAI6::studentBuffDict[buff] + ", ";
@@ -778,7 +778,7 @@ void StudentDebugAPI::PrintSelfInfo() const
         props += THUAI6::propTypeDict[prop] + ", ";
     logger->info("state={}, bullet={}, props={}", THUAI6::playerStateDict[student->playerState], THUAI6::bulletTypeDict[student->bulletType], props);
     logger->info("type={}, determination={}, addiction={}, danger alert={}", THUAI6::studentTypeDict[student->studentType], student->determination, student->addiction, student->dangerAlert);
-    logger->info("learning speed={}, treat speed={}, treat progress={}, rescue progress={}", student->learningSpeed, student->treatSpeed, student->treatProgress, student->rescueProgress);
+    logger->info("learning speed={}, encourage speed={}, encourage progress={}, rouse progress={}", student->learningSpeed, student->encourageSpeed, student->encourageProgress, student->rouseProgress);
     std::string studentBuff = "";
     for (const auto& buff : student->buff)
         studentBuff += THUAI6::studentBuffDict[buff] + ", ";

CAPI/python/PyAPI/DebugAPI.py

@@ -326,7 +326,7 @@ class StudentDebugAPI(IStudentAPI, IGameTimer):
             self.__logger.info(
                 f"type={student.studentType.name}, determination={student.determination}, addiction={student.addiction}, danger alert={student.dangerAlert}")
             self.__logger.info(
-                f"learning speed={student.learningSpeed}, treat speed={student.treatSpeed}, treat progress={student.treatProgress}, rescue progress={student.rescueProgress}")
+                f"learning speed={student.learningSpeed}, encourage speed={student.encourageSpeed}, encourage progress={student.encourageProgress}, rouse progress={student.rouseProgress}")
             studentBuff = ""
             for buff in student.buff:
                 studentBuff += buff.name + ", "
@@ -379,7 +379,7 @@ class StudentDebugAPI(IStudentAPI, IGameTimer):
         self.__logger.info(
             f"type={student.studentType.name}, determination={student.determination}, addiction={student.addiction}, danger alert={student.dangerAlert}")
         self.__logger.info(
-            f"learning speed={student.learningSpeed}, treat speed={student.treatSpeed}, treat progress={student.treatProgress}, rescue progress={student.rescueProgress}")
+            f"learning speed={student.learningSpeed}, encourage speed={student.encourageSpeed}, encourage progress={student.encourageProgress}, rouse progress={student.rouseProgress}")
         studentBuff = ""
         for buff in student.buff:
             studentBuff += buff.name + ", "
@@ -778,7 +778,7 @@ class TrickerDebugAPI(ITrickerAPI, IGameTimer):
             self.__logger.info(
                 f"type={student.studentType.name}, determination={student.determination}, addiction={student.addiction}, danger alert={student.dangerAlert}")
             self.__logger.info(
-                f"learning speed={student.learningSpeed}, treat speed={student.treatSpeed}, treat progress={student.treatProgress}, rescue progress={student.rescueProgress}")
+                f"learning speed={student.learningSpeed}, encourage speed={student.encourageSpeed}, encourage progress={student.encourageProgress}, rouse progress={student.rouseProgress}")
             studentBuff = ""
             for buff in student.buff:
                 studentBuff += buff.name + ", "

CAPI/python/PyAPI/constants.py

@@ -40,13 +40,13 @@ class Constants(NoInstance):
     basicTrickerSpeed = 1504
 
     basicConcealment = 1.0
-    basicStudentalertnessRadius = 15 * numOfGridPerCell
-    basicTrickeralertnessRadius = 17 * numOfGridPerCell
-    basicStudentviewRange = 10 * numOfGridPerCell
-    basicTrickerviewRange = 15 * numOfGridPerCell
+    basicStudentAlertnessRadius = 15 * numOfGridPerCell
+    basicTrickerAlertnessRadius = 17 * numOfGridPerCell
+    basicStudentViewRange = 10 * numOfGridPerCell
+    basicTrickerViewRange = 15 * numOfGridPerCell
     PinningDownRange = 5 * numOfGridPerCell
 
-    maxNumOfProp = 3 # 人物道具栏容量
+    maxNumOfProp = 3  # 人物道具栏容量
 
     # 攻击相关
 
@@ -85,168 +85,211 @@ class Constants(NoInstance):
     addedTimeOfSpeedWhenInspire = 0.6
     timeOfAddingSpeedWhenInspire = 6000
 
+
 class Assassin:
-    moveSpeed = (int)(1.1*Constants.basicTrickerSpeed)
-    concealment = 1.5*Constants.basicConcealment
-    alertnessRadius = (int)(1.3*Constants.basicTrickerAlertnessRadius)
-    viewRange = (int)(1.2*Constants.basicTrickerViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(1.0*Constants.basicTrickerSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(1.1 * Constants.basicTrickerSpeed)
+    concealment = 1.5 * Constants.basicConcealment
+    alertnessRadius = (int)(1.3 * Constants.basicTrickerAlertnessRadius)
+    viewRange = (int)(1.2 * Constants.basicTrickerViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        1.0 * Constants.basicTrickerSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class Klee:
-    moveSpeed = (int)(1.0*Constants.basicTrickerSpeed)
-    concealment = 1.0*Constants.basicConcealment
-    alertnessRadius = (int)(1.0*Constants.basicTrickerAlertnessRadius)
-    viewRange = (int)(1.0*Constants.basicTrickerViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(1.0*Constants.basicTrickerSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.1*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(1.0 * Constants.basicTrickerSpeed)
+    concealment = 1.0 * Constants.basicConcealment
+    alertnessRadius = (int)(1.0 * Constants.basicTrickerAlertnessRadius)
+    viewRange = (int)(1.0 * Constants.basicTrickerViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        1.0 * Constants.basicTrickerSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.1 * Constants.basicSpeedOfOpenChest)
+
 
 class ANoisyPerson:
-    moveSpeed = (int)(1.07*Constants.basicTrickerSpeed)
-    concealment = 0.8*Constants.basicConcealment
-    alertnessRadius = (int)(0.9*Constants.basicTrickerAlertnessRadius)
-    viewRange = (int)(1.0*Constants.basicTrickerViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(1.1*Constants.basicTrickerSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.1*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(1.07 * Constants.basicTrickerSpeed)
+    concealment = 0.8 * Constants.basicConcealment
+    alertnessRadius = (int)(0.9 * Constants.basicTrickerAlertnessRadius)
+    viewRange = (int)(1.0 * Constants.basicTrickerViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        1.1 * Constants.basicTrickerSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.1 * Constants.basicSpeedOfOpenChest)
+
 
 class Idol:
-    moveSpeed = (int)(1.0*Constants.basicTrickerSpeed)
-    concealment = 0.75*Constants.basicConcealment
-    alertnessRadius = (int)(1.0*Constants.basicTrickerAlertnessRadius)
-    viewRange = (int)(1.1*Constants.basicTrickerViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(1.0*Constants.basicTrickerSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(1.0 * Constants.basicTrickerSpeed)
+    concealment = 0.75 * Constants.basicConcealment
+    alertnessRadius = (int)(1.0 * Constants.basicTrickerAlertnessRadius)
+    viewRange = (int)(1.1 * Constants.basicTrickerViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        1.0 * Constants.basicTrickerSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class Athlete:
-    moveSpeed = (int)(1.1*Constants.basicStudentSpeed)
-    maxHp = (int)(1.0*Constants.basicHp)
-    maxAddiction = (int)(0.9*Constants.basicMaxGamingAddiction)
-    LearnSpeed = (int)(0.6*Constants.basicLearnSpeed)
-    EncourageSpeed = (int)(0.8*Constants.basicLearnSpeed)
-    concealment = 0.9*Constants.basicConcealment
-    alertnessRadius = (int)(1.0*Constants.basicStudentAlertnessRadius)
-    viewRange = (int)(1.1*Constants.basicStudentViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(1.2*Constants.basicStudentSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(1.1 * Constants.basicStudentSpeed)
+    maxHp = (int)(1.0 * Constants.basicHp)
+    maxAddiction = (int)(0.9 * Constants.basicMaxGamingAddiction)
+    LearnSpeed = (int)(0.6 * Constants.basicLearnSpeed)
+    EncourageSpeed = (int)(0.8 * Constants.basicLearnSpeed)
+    concealment = 0.9 * Constants.basicConcealment
+    alertnessRadius = (int)(1.0 * Constants.basicStudentAlertnessRadius)
+    viewRange = (int)(1.1 * Constants.basicStudentViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        1.2 * Constants.basicStudentSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class Teacher:
-    moveSpeed = (int)(0.75*Constants.basicStudentSpeed)
-    maxHp = (int)(10.0*Constants.basicHp)
-    maxAddiction = (int)(10.0*Constants.basicMaxGamingAddiction)
-    LearnSpeed = (int)(0.0*Constants.basicLearnSpeed)
-    EncourageSpeed = (int)(0.7*Constants.basicLearnSpeed)
-    concealment = 0.5*Constants.basicConcealment
-    alertnessRadius = (int)(0.5*Constants.basicStudentAlertnessRadius)
-    viewRange = (int)(0.9*Constants.basicStudentViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(0.5*Constants.basicStudentSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(0.75 * Constants.basicStudentSpeed)
+    maxHp = (int)(10.0 * Constants.basicHp)
+    maxAddiction = (int)(10.0 * Constants.basicMaxGamingAddiction)
+    LearnSpeed = (int)(0.0 * Constants.basicLearnSpeed)
+    EncourageSpeed = (int)(0.7 * Constants.basicLearnSpeed)
+    concealment = 0.5 * Constants.basicConcealment
+    alertnessRadius = (int)(0.5 * Constants.basicStudentAlertnessRadius)
+    viewRange = (int)(0.9 * Constants.basicStudentViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        0.5 * Constants.basicStudentSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class StraightAStudent:
-    moveSpeed = (int)(0.8*Constants.basicStudentSpeed)
-    maxHp = (int)(1.1*Constants.basicHp)
-    maxAddiction = (int)(1.3*Constants.basicMaxGamingAddiction)
-    LearnSpeed = (int)(1.1*Constants.basicLearnSpeed)
-    EncourageSpeed = (int)(0.8*Constants.basicLearnSpeed)
-    concealment = 0.9*Constants.basicConcealment
-    alertnessRadius = (int)(0.9*Constants.basicStudentAlertnessRadius)
-    viewRange = (int)(0.9*Constants.basicStudentViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(0.83333*Constants.basicStudentSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(0.8 * Constants.basicStudentSpeed)
+    maxHp = (int)(1.1 * Constants.basicHp)
+    maxAddiction = (int)(1.3 * Constants.basicMaxGamingAddiction)
+    LearnSpeed = (int)(1.1 * Constants.basicLearnSpeed)
+    EncourageSpeed = (int)(0.8 * Constants.basicLearnSpeed)
+    concealment = 0.9 * Constants.basicConcealment
+    alertnessRadius = (int)(0.9 * Constants.basicStudentAlertnessRadius)
+    viewRange = (int)(0.9 * Constants.basicStudentViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        0.83333 * Constants.basicStudentSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class Robot:
-    moveSpeed = (int)(1.0*Constants.basicStudentSpeed)
-    maxHp = (int)(0.4*Constants.basicHp)
-    maxAddiction = (int)(0.0*Constants.basicMaxGamingAddiction)
-    LearnSpeed = (int)(1.0*Constants.basicLearnSpeed)
-    EncourageSpeed = (int)(0.8*Constants.basicLearnSpeed)
-    concealment = 1.0*Constants.basicConcealment
-    alertnessRadius = (int)(1.0*Constants.basicStudentAlertnessRadius)
-    viewRange = (int)(1.0*Constants.basicStudentViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(0.0016*Constants.basicStudentSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(1.0 * Constants.basicStudentSpeed)
+    maxHp = (int)(0.4 * Constants.basicHp)
+    maxAddiction = (int)(0.0 * Constants.basicMaxGamingAddiction)
+    LearnSpeed = (int)(1.0 * Constants.basicLearnSpeed)
+    EncourageSpeed = (int)(0.8 * Constants.basicLearnSpeed)
+    concealment = 1.0 * Constants.basicConcealment
+    alertnessRadius = (int)(1.0 * Constants.basicStudentAlertnessRadius)
+    viewRange = (int)(1.0 * Constants.basicStudentViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        0.0016 * Constants.basicStudentSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class TechOtaku:
-    moveSpeed = (int)(0.75*Constants.basicStudentSpeed)
-    maxHp = (int)(0.9*Constants.basicHp)
-    maxAddiction = (int)(1.1*Constants.basicMaxGamingAddiction)
-    LearnSpeed = (int)(1.1*Constants.basicLearnSpeed)
-    EncourageSpeed = (int)(0.9*Constants.basicLearnSpeed)
-    concealment = 1.0*Constants.basicConcealment
-    alertnessRadius = (int)(1.0*Constants.basicStudentAlertnessRadius)
-    viewRange = (int)(0.9*Constants.basicStudentViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(0.75*Constants.basicStudentSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(0.75 * Constants.basicStudentSpeed)
+    maxHp = (int)(0.9 * Constants.basicHp)
+    maxAddiction = (int)(1.1 * Constants.basicMaxGamingAddiction)
+    LearnSpeed = (int)(1.1 * Constants.basicLearnSpeed)
+    EncourageSpeed = (int)(0.9 * Constants.basicLearnSpeed)
+    concealment = 1.0 * Constants.basicConcealment
+    alertnessRadius = (int)(1.0 * Constants.basicStudentAlertnessRadius)
+    viewRange = (int)(0.9 * Constants.basicStudentViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        0.75 * Constants.basicStudentSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class Sunshine:
-    moveSpeed = (int)(1.0*Constants.basicStudentSpeed)
-    maxHp = (int)(1.0667*Constants.basicHp)
-    maxAddiction = (int)(1.1*Constants.basicMaxGamingAddiction)
-    LearnSpeed = (int)(1.0*Constants.basicLearnSpeed)
-    EncourageSpeed = (int)(2.0*Constants.basicLearnSpeed)
-    concealment = 1.0*Constants.basicConcealment
-    alertnessRadius = (int)(1.0*Constants.basicStudentAlertnessRadius)
-    viewRange = (int)(1.0*Constants.basicStudentViewRange)
-    speedOfOpeningOrLocking =(int)( 1.0*Constants.basicSpeedOfOpeningOrLocking)
-    speedOfClimbingThroughWindows = (int)(1.0*Constants.basicStudentSpeedOfClimbingThroughWindows)
-    speedOfOpenChest = (int)(1.0*Constants.basicSpeedOfOpenChest)
+    moveSpeed = (int)(1.0 * Constants.basicStudentSpeed)
+    maxHp = (int)(1.0667 * Constants.basicHp)
+    maxAddiction = (int)(1.1 * Constants.basicMaxGamingAddiction)
+    LearnSpeed = (int)(1.0 * Constants.basicLearnSpeed)
+    EncourageSpeed = (int)(2.0 * Constants.basicLearnSpeed)
+    concealment = 1.0 * Constants.basicConcealment
+    alertnessRadius = (int)(1.0 * Constants.basicStudentAlertnessRadius)
+    viewRange = (int)(1.0 * Constants.basicStudentViewRange)
+    speedOfOpeningOrLocking = (int)(
+        1.0 * Constants.basicSpeedOfOpeningOrLocking)
+    speedOfClimbingThroughWindows = (int)(
+        1.0 * Constants.basicStudentSpeedOfClimbingThroughWindows)
+    speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)
+
 
 class CanBeginToCharge:
-    skillCD = (int)(0.8*Constants.commonSkillCD)
-    durationTime = (int)(0.5*Constants.commonSkillTime)
+    skillCD = (int)(0.8 * Constants.commonSkillCD)
+    durationTime = (int)(0.5 * Constants.commonSkillTime)
+
 
 class BecomeInvisible:
-    skillCD = (int)(4*Constants.commonSkillCD/3)
+    skillCD = (int)(4 * Constants.commonSkillCD / 3)
     durationTime = (int)(Constants.commonSkillTime)
 
+
 class Punish:
-    skillCD = (int)(1.0*Constants.commonSkillCD)
-    durationTime = (int)(0.0*Constants.commonSkillTime)
+    skillCD = (int)(1.0 * Constants.commonSkillCD)
+    durationTime = (int)(0.0 * Constants.commonSkillTime)
+
 
 class Rouse:
-    skillCD = (int)(2.0*Constants.commonSkillCD)
-    durationTime = (int)(0.0*Constants.commonSkillTime)
+    skillCD = (int)(2.0 * Constants.commonSkillCD)
+    durationTime = (int)(0.0 * Constants.commonSkillTime)
+
 
 class Encourage:
-    skillCD = (int)(2.0*Constants.commonSkillCD)
-    durationTime = (int)(0.0*Constants.commonSkillTime)
+    skillCD = (int)(2.0 * Constants.commonSkillCD)
+    durationTime = (int)(0.0 * Constants.commonSkillTime)
+
 
 class Inspire:
-    skillCD = (int)(2.0*Constants.commonSkillCD)
-    durationTime = (int)(0.0*Constants.commonSkillTime)
+    skillCD = (int)(2.0 * Constants.commonSkillCD)
+    durationTime = (int)(0.0 * Constants.commonSkillTime)
+
 
 class Howl:
-    skillCD = (int)(0.8333*Constants.commonSkillCD)
-    durationTime = (int)(0*Constants.commonSkillTime)
+    skillCD = (int)(0.8333 * Constants.commonSkillCD)
+    durationTime = (int)(0 * Constants.commonSkillTime)
+
 
 class ShowTime:
-    skillCD = (int)(3.0*Constants.commonSkillCD)
-    durationTime = (int)(1.0*Constants.commonSkillTime)
+    skillCD = (int)(3.0 * Constants.commonSkillCD)
+    durationTime = (int)(1.0 * Constants.commonSkillTime)
+
 
 class JumpyBomb:
-    skillCD = (int)(0.5*Constants.commonSkillCD)
-    durationTime = (int)(0.3*Constants.commonSkillTime)
+    skillCD = (int)(0.5 * Constants.commonSkillCD)
+    durationTime = (int)(0.3 * Constants.commonSkillTime)
+
 
 class UseKnife:
-    skillCD = (int)(1.0*Constants.commonSkillCD)
-    durationTime = (int)(0.1*Constants.commonSkillTime)
+    skillCD = (int)(1.0 * Constants.commonSkillCD)
+    durationTime = (int)(0.1 * Constants.commonSkillTime)
+
 
 class UseRobot:
-    skillCD = (int)(0.0017*Constants.commonSkillCD)
-    durationTime = (int)(0.0*Constants.commonSkillTime)
+    skillCD = (int)(0.0017 * Constants.commonSkillCD)
+    durationTime = (int)(0.0 * Constants.commonSkillTime)
+
 
 class WriteAnswers:
-    skillCD = (int)(1.0*Constants.commonSkillCD)
-    durationTime = (int)(0.0*Constants.commonSkillTime)
+    skillCD = (int)(1.0 * Constants.commonSkillCD)
+    durationTime = (int)(0.0 * Constants.commonSkillTime)
+
 
 class SummonGolem:
-    skillCD = (int)(1.0*Constants.commonSkillCD)
-    durationTime = (int)(0.0*Constants.commonSkillTime)
+    skillCD = (int)(1.0 * Constants.commonSkillCD)
+    durationTime = (int)(0.0 * Constants.commonSkillTime)

CAPI/python/PyAPI/structures.py

@@ -104,11 +104,11 @@ class PlayerState(Enum):
     Addicted = 3
     Quit = 4
     Graduated = 5
-    Treated = 6
-    Rescued = 7
+    Encouraged = 6
+    Roused = 7
     Stunned = 8
-    Treating = 9
-    Rescuing = 10
+    Encouraging = 9
+    Rousing = 10
     Swinging = 11
     Attacking = 12
     Locking = 13
@@ -163,10 +163,10 @@ class Student(Player):
     studentType: StudentType
     determination: int
     addiction: int
-    treatProgress: int
-    rescueProgress: int
+    encourageProgress: int
+    rouseProgress: int
     learningSpeed: int
-    treatSpeed: int
+    encourageSpeed: int
     dangerAlert: float
     buff: List[StudentBuffType] = []
 

CAPI/python/PyAPI/utils.py

@@ -136,11 +136,11 @@ class Proto2THUAI6(NoInstance):
         MessageType.ADDICTED: THUAI6.PlayerState.Addicted,
         MessageType.QUIT: THUAI6.PlayerState.Quit,
         MessageType.GRADUATED: THUAI6.PlayerState.Graduated,
-        MessageType.RESCUED: THUAI6.PlayerState.Rescued,
-        MessageType.TREATED: THUAI6.PlayerState.Treated,
+        MessageType.RESCUED: THUAI6.PlayerState.Roused,
+        MessageType.TREATED: THUAI6.PlayerState.Encouraged,
         MessageType.STUNNED: THUAI6.PlayerState.Stunned,
-        MessageType.RESCUING: THUAI6.PlayerState.Rescuing,
-        MessageType.TREATING: THUAI6.PlayerState.Treating,
+        MessageType.RESCUING: THUAI6.PlayerState.Rousing,
+        MessageType.TREATING: THUAI6.PlayerState.Encouraging,
         MessageType.SWINGING: THUAI6.PlayerState.Swinging,
         MessageType.ATTACKING: THUAI6.PlayerState.Attacking,
         MessageType.LOCKING: THUAI6.PlayerState.Locking,
@@ -207,9 +207,9 @@ class Proto2THUAI6(NoInstance):
         student.facingDirection = studentMsg.facing_direction
         student.bulletType = Proto2THUAI6.bulletTypeDict[studentMsg.bullet_type]
         student.learningSpeed = studentMsg.learning_speed
-        student.treatSpeed = studentMsg.treat_speed
-        student.treatProgress = studentMsg.treat_progress
-        student.rescueProgress = studentMsg.rescue_progress
+        student.encourageSpeed = studentMsg.treat_speed
+        student.encourageProgress = studentMsg.treat_progress
+        student.rouseProgress = studentMsg.rescue_progress
         student.dangerAlert = studentMsg.danger_alert
         student.timeUntilSkillAvailable.clear()
         for time in studentMsg.time_until_skill_available: