Merge pull request #152 from shangfengh/dev

refactor: 🎨 standardize naming and introduce IAddable

logic/GameClass/GameObj/Areas/Construction.cs

@@ -31,7 +31,7 @@ public bool Construct(int constructSpeed, ConstructionType constructionType, Shi
         {
             if (this.constructionType == ConstructionType.Null || HP == 0)
             {
-                TeamID.SetReturnOri(ship.TeamID);
+                TeamID.SetROri(ship.TeamID);
                 this.constructionType = constructionType;
                 switch (constructionType)
                 {

logic/GameClass/GameObj/Bullet.cs

@@ -35,8 +35,8 @@ public override bool IgnoreCollideExecutor(IGameObj targetObj)
     public Bullet(Ship ship, int radius, XY Position) :
         base(Position, radius, GameObjType.Bullet)
     {
-        CanMove.SetReturnOri(true);
-        MoveSpeed.SetReturnOri(Speed);
+        CanMove.SetROri(true);
+        MoveSpeed.SetROri(Speed);
         Parent = ship;
     }
 }

logic/GameClass/GameObj/Bullets/Arc.cs

@@ -9,7 +9,7 @@ public Arc(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
         Random random = new();
-        AP.SetReturnOri(random.Next(GameData.ArcDamageMin, GameData.ArcDamageMax));
+        AP.SetROri(random.Next(GameData.ArcDamageMin, GameData.ArcDamageMax));
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.ArcRange;

logic/GameClass/GameObj/Bullets/Laser.cs

@@ -10,7 +10,7 @@ internal sealed class Laser : Bullet
     public Laser(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        AP.SetReturnOri(GameData.LaserDamage);
+        AP.SetROri(GameData.LaserDamage);
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.LaserRange;

logic/GameClass/GameObj/Bullets/Missile.cs

@@ -8,7 +8,7 @@ internal sealed class Missile : Bullet
     public Missile(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        AP.SetReturnOri(GameData.MissileDamage);
+        AP.SetROri(GameData.MissileDamage);
     }
     public override double BulletBombRange => GameData.MissileBombRange;
     public override double AttackDistance => GameData.MissileRange;

logic/GameClass/GameObj/Bullets/Plasma.cs

@@ -7,7 +7,7 @@ internal sealed class Plasma : Bullet
     public Plasma(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        AP.SetReturnOri(GameData.PlasmaDamage);
+        AP.SetROri(GameData.PlasmaDamage);
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.PlasmaRange;

logic/GameClass/GameObj/Bullets/Shell.cs

@@ -7,7 +7,7 @@ internal sealed class Shell : Bullet
     public Shell(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        AP.SetReturnOri(GameData.ShellDamage);
+        AP.SetROri(GameData.ShellDamage);
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.ShellRange;

logic/GameClass/GameObj/Map/MapGameTimer.cs

@@ -25,7 +25,7 @@ public bool StartGame(int timeInMilliseconds)
                     return false;
                 startTime = Environment.TickCount64;
                 Thread.Sleep(timeInMilliseconds);
-                IsGaming.SetReturnOri(false);
+                IsGaming.SetROri(false);
                 return true;
             }
         }

logic/GameClass/GameObj/MoneyPool.cs

@@ -9,14 +9,14 @@ public class MoneyPool : IMoneyPool
     public AtomicLong Score { get; } = new AtomicLong(0);
     public MoneyPool()
     {
-        Money.SetScore(Score);
+        Money.Score = Score;
     }
     public long AddMoney(long add)
     {
-        return Money.Add(add);
+        return Money.AddRNow(add);
     }
     public long SubMoney(long sub)
     {
-        return Money.Sub(sub);
+        return Money.SubRNow(sub);
     }
 }

logic/GameClass/GameObj/Ship.cs

@@ -391,7 +391,7 @@ public bool TryToRemoveFromGame(ShipStateType shipStateType)
         {
             if (SetShipState(RunningStateType.RunningForcibly, shipStateType) == -1) return false;
             TryToRemove();
-            CanMove.SetReturnOri(false);
+            CanMove.SetROri(false);
             position = GameData.PosNotInGame;
         }
         return true;
@@ -408,14 +408,14 @@ public bool Commandable()
     public Ship(int initRadius, ShipType shipType, MoneyPool moneyPool) :
         base(GameData.PosNotInGame, initRadius, GameObjType.Ship)
     {
-        this.CanMove.SetReturnOri(false);
-        this.IsRemoved.SetReturnOri(true);
+        this.CanMove.SetROri(false);
+        this.IsRemoved.SetROri(true);
         this.Occupation = OccupationFactory.FindIOccupation(this.ShipType = shipType);
         this.ViewRange = this.Occupation.ViewRange;
         this.HP = new(this.Occupation.MaxHp);
         this.Armor = new(this.Occupation.BaseArmor);
         this.Shield = new(this.Occupation.BaseShield);
-        this.MoveSpeed.SetReturnOri(this.orgMoveSpeed = Occupation.MoveSpeed);
+        this.MoveSpeed.SetROri(this.orgMoveSpeed = Occupation.MoveSpeed);
         this.MoneyPool = moneyPool;
         (this.producerType, this.constructorType, this.armorType, this.shieldType, this.weaponType) = this.ShipType switch
         {

logic/GameEngine/MoveEngine.cs

@@ -133,7 +133,7 @@ public void MoveObj(IMovable obj, int moveTime, double direction, long stateNum)
             lock (obj.ActionLock)
             {
                 if (!obj.IsAvailableForMove) { EndMove(obj); return; }
-                obj.IsMoving.SetReturnOri(true);
+                obj.IsMoving.SetROri(true);
             }
 
             new Thread
@@ -170,7 +170,7 @@ public void MoveObj(IMovable obj, int moveTime, double direction, long stateNum)
 
                     if (isEnded)
                     {
-                        obj.IsMoving.SetReturnOri(false);
+                        obj.IsMoving.SetROri(false);
                         EndMove(obj);
                         return;
                     }
@@ -214,7 +214,7 @@ public void MoveObj(IMovable obj, int moveTime, double direction, long stateNum)
                         }
                         if (isEnded)
                         {
-                            obj.IsMoving.SetReturnOri(false);
+                            obj.IsMoving.SetROri(false);
                             EndMove(obj);
                             return;
                         }
@@ -254,7 +254,7 @@ public void MoveObj(IMovable obj, int moveTime, double direction, long stateNum)
                                 }
                             } while (flag);
                         }
-                        obj.IsMoving.SetReturnOri(false);  // 结束移动
+                        obj.IsMoving.SetROri(false);  // 结束移动
                         EndMove(obj);
                     }
                 }

logic/Gaming/AttackManager.cs

@@ -21,7 +21,7 @@ private class AttackManager(Map gameMap, ShipManager shipManager)
             public readonly MoveEngine moveEngine = new(
                     gameMap: gameMap,
                     OnCollision: (obj, collisionObj, moveVec) => MoveEngine.AfterCollision.Destroyed,
-                    EndMove: obj => obj.CanMove.SetReturnOri(false)
+                    EndMove: obj => obj.CanMove.SetROri(false)
                 );
 
             public void ProduceBulletNaturally(BulletType bulletType, Ship ship, double angle, XY pos)
@@ -57,7 +57,7 @@ public bool TryRemoveBullet(Bullet bullet)
             {
                 if (gameMap.Remove(bullet))
                 {
-                    bullet.CanMove.SetReturnOri(false);
+                    bullet.CanMove.SetROri(false);
                     if (bullet.BulletBombRange > 0)
                     {
                         BombedBullet bombedBullet = new(bullet);

logic/Gaming/Game.cs

@@ -197,7 +197,7 @@ public void ClearAllLists()
                 {
                     gameMap.GameObjDict[GameObjType.Ship].ForEach(delegate (IGameObj ship)
                     {
-                        ((Ship)ship).CanMove.SetReturnOri(false);
+                        ((Ship)ship).CanMove.SetROri(false);
                     });
                     gameMap.GameObjDict[keyValuePair.Key].Clear();
                 }

logic/Gaming/ShipManager.cs

@@ -14,8 +14,8 @@ private class ShipManager(Map gameMap)
             {
                 Ship newShip = new(GameData.ShipRadius, shipType, moneyPool);
                 gameMap.Add(newShip);
-                newShip.TeamID.SetReturnOri(teamID);
-                newShip.PlayerID.SetReturnOri(playerID);
+                newShip.TeamID.SetROri(teamID);
+                newShip.PlayerID.SetROri(playerID);
                 return newShip;
             }
             public bool ActivateShip(Ship ship, XY pos)
@@ -38,7 +38,7 @@ public bool ActivateShip(Ship ship, XY pos)
                 ship.ReSetPos(pos);
                 long stateNum = ship.SetShipState(RunningStateType.RunningActively, ShipStateType.Null);
                 ship.ResetShipState(stateNum);
-                ship.CanMove.SetReturnOri(true);
+                ship.CanMove.SetROri(true);
                 return true;
             }
             public void BeAttacked(Ship ship, Bullet bullet)