feat: ✨ change the skill of Idol

CAPI/cpp/API/include/constants.h

@@ -269,7 +269,7 @@ namespace Constants
 
     struct ShowTime
     {
-        SCCI int skillCD = commonSkillCD * 3;
+        SCCI int skillCD = commonSkillCD * 8 / 3;
         SCCI int durationTime = commonSkillTime * 1;
     };
 

CAPI/python/PyAPI/constants.py

@@ -270,7 +270,7 @@ class Howl:
 
 
 class ShowTime:
-    skillCD = (int)(3.0 * Constants.commonSkillCD)
+    skillCD = (int)(8 * Constants.commonSkillCD/3)
     durationTime = (int)(1.0 * Constants.commonSkillTime)
 
 

logic/GameClass/GameObj/Character/Character.cs

@@ -584,7 +584,7 @@ namespace GameClass.GameObj
                      this.Vampire = this.OriVampire;
                  }
              }*/
-        public void Die(PlayerStateType playerStateType)
+        public void RemoveFromGame(PlayerStateType playerStateType)
         {
             lock (gameObjLock)
             {

logic/GameRules.md

@@ -1,5 +1,5 @@
 # 规则
-V4.4
+V4.5
 - [规则](#规则)
   - [简则](#简则)
     - [地图](#地图)

logic/Gaming/ActionManager.cs

@@ -43,6 +43,14 @@ namespace Gaming
                 return true;
             }
 
+            public bool MovePlayerWhenStunned(Character playerToMove, int moveTimeInMilliseconds, double moveDirection)
+            {
+                if (!playerToMove.Commandable() && playerToMove.PlayerState != PlayerStateType.Stunned) return false;
+                characterManager.SetPlayerState(playerToMove, PlayerStateType.Stunned);
+                moveEngine.MoveObj(playerToMove, moveTimeInMilliseconds, moveDirection);
+                return true;
+            }
+
             public bool Stop(Character player)
             {
                 if (player.Commandable() || !TryToStop())
@@ -129,7 +137,7 @@ namespace Gaming
                 {
                     player.AddScore(GameData.StudentScoreEscape);
                     ++gameMap.NumOfEscapedStudent;
-                    player.Die(PlayerStateType.Escaped);
+                    player.RemoveFromGame(PlayerStateType.Escaped);
                     return true;
                 }
                 else
@@ -139,7 +147,7 @@ namespace Gaming
                     {
                         player.AddScore(GameData.StudentScoreEscape);
                         ++gameMap.NumOfEscapedStudent;
-                        player.Die(PlayerStateType.Escaped);
+                        player.RemoveFromGame(PlayerStateType.Escaped);
                         return true;
                     }
                     return false;

logic/Gaming/CharacterManager .cs

@@ -378,12 +378,12 @@ namespace Gaming
                 return true;
             }
 
-            private void Die(Character player)
+            public void Die(Student player)
             {
 #if DEBUG
                 Debugger.Output(player, "die.");
 #endif
-                player.Die(PlayerStateType.Deceased);
+                player.RemoveFromGame(PlayerStateType.Deceased);
 
                 for (int i = 0; i < GameData.maxNumOfPropInPropInventory; i++)
                 {

logic/Gaming/SkillManager/SkillManager.ActiveSkill.cs

@@ -49,8 +49,25 @@ namespace Gaming
                                  {
                                      foreach (Character person in gameMap.GameObjDict[GameObjType.Character])
                                      {
-                                         if (!person.IsGhost())
-                                             actionManager.MovePlayer(person, GameData.frameDuration, (player.Position - person.Position).Angle());
+                                         if (!person.IsGhost() && player.CharacterType != CharacterType.Robot && !person.NoHp())
+                                         {
+                                             double dis = XY.Distance(person.Position, player.Position);
+                                             if (dis >= player.AlertnessRadius)
+                                             {
+                                                 person.AddMoveSpeed(GameData.checkIntervalWhenShowTime, dis / player.AlertnessRadius);
+                                                 actionManager.MovePlayerWhenStunned(person, GameData.checkIntervalWhenShowTime, (player.Position - person.Position).Angle());
+                                             }
+                                             else if (dis >= player.ViewRange)
+                                             {
+                                                 Student student = (Student)person;
+                                                 student.GamingAddiction += GameData.checkIntervalWhenShowTime;
+                                                 if (student.GamingAddiction == student.MaxGamingAddiction)
+                                                 {
+                                                     player.AddScore(GameData.TrickerScoreStudentDie);
+                                                     characterManager.Die(student);
+                                                 }
+                                             }
+                                         }
                                      }
                                  }
                                  finally
@@ -58,7 +75,7 @@ namespace Gaming
                                      gameMap.GameObjLockDict[GameObjType.Character].ExitReadLock();
                                  }
                              },
-                             timeInterval: GameData.frameDuration,
+                             timeInterval: GameData.checkIntervalWhenShowTime,
                              finallyReturn: () => 0
                          )
 
@@ -167,7 +184,7 @@ namespace Gaming
                     {
                         foreach (Character character in gameMap.GameObjDict[GameObjType.Character])
                         {
-                            if (!character.IsGhost() && XY.Distance(character.Position, player.Position) <= player.ViewRange)
+                            if (!character.IsGhost() && !character.NoHp() && XY.Distance(character.Position, player.Position) <= player.ViewRange)
                             {
                                 if (characterManager.BeStunned(character, GameData.timeOfStudentStunnedWhenHowl))
                                     player.AddScore(GameData.TrickerScoreStudentBeStunned(GameData.timeOfStudentStunnedWhenHowl));

logic/Preparation/Interface/ISkill.cs

@@ -123,7 +123,7 @@ namespace Preparation.Interface
 
     public class ShowTime : IActiveSkill
     {
-        public int SkillCD => GameData.commonSkillCD * 3;
+        public int SkillCD => GameData.commonSkillCD * 8 / 3;
         public int DurationTime => GameData.commonSkillTime;
 
         private readonly object commonSkillLock = new();