Merge pull request #153 from asdawej/dev-objpool

Add objpool
eesast · Mar 29, 2024 · cd37156 · cd37156
2 parents b12844e + 6721fe7
commit cd37156
Show file tree

Hide file tree

Showing 35 changed files with 526 additions and 219 deletions.
diff --git a/CAPI/python/PyAPI/DebugAPI.py b/CAPI/python/PyAPI/DebugAPI.py
@@ -260,6 +260,9 @@ def PrintSweeper(self) -> None:
             )
             self.__logger.info('************************\n')
 
+    def PrintTeam(self) -> None:
+        pass
+
     def PrintSelfInfo(self) -> None:
         sweeper = self.__logic.GetSelfInfo()
         self.__logger.info('******sweeper Info******')

diff --git a/CAPI/python/PyAPI/Interface.py b/CAPI/python/PyAPI/Interface.py
@@ -59,7 +59,7 @@ def GetHomeHp(self) -> int:
         pass
 
     @abstractmethod
-    def GetEnergy(self) -> int:
+    def GetMoney(self) -> int:
         pass
 
     @abstractmethod
@@ -214,7 +214,7 @@ def GetHomeHp(self) -> int:
         pass
 
     @abstractmethod
-    def GetEnergy(self) -> int:
+    def GetMoney(self) -> int:
         pass
 
     @abstractmethod

diff --git a/CAPI/python/PyAPI/logic.py b/CAPI/python/PyAPI/logic.py
@@ -11,6 +11,7 @@
 import PyAPI.structures as THUAI7
 from PyAPI.utils import Proto2THUAI7, AssistFunction
 from PyAPI.API import SweeperAPI, TeamAPI
+from PyAPI.DebugAPI import SweeperDebugAPI, TeamDebugAPI
 from PyAPI.AI import Setting
 from PyAPI.Communication import Communication
 from PyAPI.State import State
@@ -851,11 +852,11 @@ def Main(
 
         if platform.system().lower() == 'windows':
             os.system(
-                f'mkdir '{os.path.dirname(os.path.dirname(os.path.realpath(__file__)))}\\logs''
+                f'mkdir "{os.path.dirname(os.path.dirname(os.path.realpath(__file__)))}\\logs"'
             )
         else:
             os.system(
-                f'mkdir -p '{os.path.dirname(os.path.dirname(os.path.realpath(__file__)))} / logs''
+                f'mkdir -p "{os.path.dirname(os.path.dirname(os.path.realpath(__file__)))}/logs"'
             )
 
         fileHandler = logging.FileHandler(

diff --git a/logic/Client/Interact/JsonInteractor.cs b/logic/Client/Interact/JsonInteractor.cs
@@ -19,9 +19,9 @@ static string[] JsonInteract()
 
             if (File.Exists(filepath))
             {
-                FileStream fs = new FileStream(filepath, FileMode.Open, FileAccess.ReadWrite);
-                StreamReader file = new StreamReader(fs, System.Text.Encoding.Default);
-                JsonTextReader reader = new JsonTextReader(file);//解析json模块
+                FileStream fs = new(filepath, FileMode.Open, FileAccess.ReadWrite);
+                StreamReader file = new(fs, System.Text.Encoding.Default);
+                JsonTextReader reader = new(file);//解析json模块
                 JObject o = (JObject)JToken.ReadFrom(reader);
                 string ip = o["ip"].ToString();
                 string port = o["port"].ToString();
@@ -51,7 +51,7 @@ static string[] JsonInteract()
         public static string[] FileInteract()
         {
             string[] cominfo = new string[10];
-            ConfigData d = new ConfigData();
+            ConfigData d = new();
             if (d.Commands.Launched == false)
             {
                 cominfo[0] = d.Commands.IP;

diff --git a/logic/GameClass/GameObj/Areas/Asteroid.cs b/logic/GameClass/GameObj/Areas/Asteroid.cs
@@ -1,5 +1,4 @@
 using Preparation.Utility;
-using System;
 
 namespace GameClass.GameObj.Areas;
 

diff --git a/logic/GameClass/GameObj/Areas/Construction.cs b/logic/GameClass/GameObj/Areas/Construction.cs
@@ -1,5 +1,4 @@
 using Preparation.Utility;
-using System;
 
 namespace GameClass.GameObj.Areas;
 

diff --git a/logic/GameClass/GameObj/Areas/Home.cs b/logic/GameClass/GameObj/Areas/Home.cs
@@ -1,6 +1,5 @@
 using Preparation.Interface;
 using Preparation.Utility;
-using System;
 
 namespace GameClass.GameObj.Areas;
 

diff --git a/logic/GameClass/GameObj/Areas/Resource.cs b/logic/GameClass/GameObj/Areas/Resource.cs
@@ -1,6 +1,4 @@
 using Preparation.Utility;
-using System;
-using System.Threading;
 
 namespace GameClass.GameObj.Areas;
 

diff --git a/logic/GameClass/GameObj/Areas/Shadow.cs b/logic/GameClass/GameObj/Areas/Shadow.cs
@@ -1,5 +1,4 @@
 using Preparation.Utility;
-using System;
 
 namespace GameClass.GameObj.Areas;
 

diff --git a/logic/GameClass/GameObj/Areas/Wormhole.cs b/logic/GameClass/GameObj/Areas/Wormhole.cs
@@ -1,6 +1,5 @@
 using Preparation.Interface;
 using Preparation.Utility;
-using System;
 using System.Collections.Generic;
 
 namespace GameClass.GameObj.Areas;

diff --git a/logic/GameClass/GameObj/Bullets/Laser.cs b/logic/GameClass/GameObj/Bullets/Laser.cs
@@ -1,7 +1,4 @@
-using Preparation.Interface;
 using Preparation.Utility;
-using System;
-using System.Threading;
 
 namespace GameClass.GameObj.Bullets;
 

diff --git a/logic/GameClass/GameObj/Bullets/Missile.cs b/logic/GameClass/GameObj/Bullets/Missile.cs
@@ -1,5 +1,5 @@
-using System;
-using Preparation.Utility;
+using Preparation.Utility;
+using System;
 
 namespace GameClass.GameObj.Bullets;
 

diff --git a/logic/GameClass/GameObj/Map/Map.cs b/logic/GameClass/GameObj/Map/Map.cs
@@ -1,11 +1,9 @@
-using System.Collections.Generic;
-using System.Threading;
+using GameClass.GameObj.Areas;
+using GameClass.MapGenerator;
 using Preparation.Interface;
 using Preparation.Utility;
 using System;
-using GameClass.GameObj.Areas;
-using System.Linq;
-using GameClass.MapGenerator;
+using System.Collections.Generic;
 
 namespace GameClass.GameObj
 {

diff --git a/logic/GameClass/GameObj/Map/MapGameTimer.cs b/logic/GameClass/GameObj/Map/MapGameTimer.cs
@@ -1,6 +1,6 @@
-using System;
+using Preparation.Utility;
+using System;
 using System.Threading;
-using Preparation.Utility;
 using ITimer = Preparation.Interface.ITimer;
 
 namespace GameClass.GameObj

diff --git a/logic/GameClass/GameObj/Ship.cs b/logic/GameClass/GameObj/Ship.cs
@@ -1,9 +1,8 @@
-using System;
-using GameClass.GameObj.Bullets;
-using Preparation.Interface;
-using Preparation.Utility;
+using GameClass.GameObj.Bullets;
 using GameClass.GameObj.Modules;
 using GameClass.GameObj.Occupations;
+using Preparation.Interface;
+using Preparation.Utility;
 
 namespace GameClass.GameObj;
 
@@ -18,7 +17,9 @@ public override bool IgnoreCollideExecutor(IGameObj targetObj)
     {
         if (IsRemoved)
             return true;
-        if (targetObj.Type == GameObjType.Ship && XY.DistanceCeil3(targetObj.Position, this.Position) < this.Radius + targetObj.Radius - GameData.AdjustLength)
+        if (targetObj.Type == GameObjType.Ship
+         && XY.DistanceCeil3(targetObj.Position, Position)
+            < Radius + targetObj.Radius - GameData.AdjustLength)
             return true;
         return false;
     }
@@ -355,7 +356,7 @@ public bool ResetShipState(long state, RunningStateType running = RunningStateTy
         lock (actionLock)
         {
             if (state != stateNum) return false;
-            this.runningState = running;
+            runningState = running;
             whatInteractingWith = (GameObj?)obj;
             shipState = value;
             ++stateNum;
@@ -367,7 +368,7 @@ public bool ResetShipStateInOneThread(long state, RunningStateType running = Run
         lock (actionLock)
         {
             if (state != stateNum) return false;
-            this.runningState = running;
+            runningState = running;
             whatInteractingWith = (GameObj?)obj;
             shipState = value;
             return true;
@@ -377,7 +378,7 @@ public bool StartThread(long stateNum, RunningStateType runningState)
     {
         lock (actionLock)
         {
-            if (this.StateNum == stateNum)
+            if (StateNum == stateNum)
             {
                 this.runningState = runningState;
                 return true;
@@ -408,16 +409,16 @@ public bool Commandable()
     public Ship(int initRadius, ShipType shipType, MoneyPool moneyPool) :
         base(GameData.PosNotInGame, initRadius, GameObjType.Ship)
     {
-        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.SetROri(this.orgMoveSpeed = Occupation.MoveSpeed);
-        this.MoneyPool = moneyPool;
-        (this.producerType, this.constructorType, this.armorType, this.shieldType, this.weaponType) = this.ShipType switch
+        CanMove.SetROri(false);
+        IsRemoved.SetROri(true);
+        Occupation = OccupationFactory.FindIOccupation(ShipType = shipType);
+        ViewRange = Occupation.ViewRange;
+        HP = new(Occupation.MaxHp);
+        Armor = new(Occupation.BaseArmor);
+        Shield = new(Occupation.BaseShield);
+        MoveSpeed.SetROri(orgMoveSpeed = Occupation.MoveSpeed);
+        MoneyPool = moneyPool;
+        (producerType, constructorType, armorType, shieldType, weaponType) = ShipType switch
         {
             ShipType.CivilShip => (
                 ProducerType.Producer1,
@@ -442,12 +443,12 @@ public Ship(int initRadius, ShipType shipType, MoneyPool moneyPool) :
             ),
             _ => (ProducerType.Null, ConstructorType.Null, ArmorType.Null, ShieldType.Null, WeaponType.Null)
         };
-        (this.producer, this.constructor, this.armor, this.shield, this.weapon) = (
-            ModuleFactory.FindIProducer(this.ShipType, this.producerType),
-            ModuleFactory.FindIConstructor(this.ShipType, this.constructorType),
-            ModuleFactory.FindIArmor(this.ShipType, this.armorType),
-            ModuleFactory.FindIShield(this.ShipType, this.shieldType),
-            ModuleFactory.FindIWeapon(this.ShipType, this.weaponType)
+        (producer, constructor, armor, shield, weapon) = (
+            ModuleFactory.FindIProducer(ShipType, producerType),
+            ModuleFactory.FindIConstructor(ShipType, constructorType),
+            ModuleFactory.FindIArmor(ShipType, armorType),
+            ModuleFactory.FindIShield(ShipType, shieldType),
+            ModuleFactory.FindIWeapon(ShipType, weaponType)
         );
     }
 }