pyscreeps-arena 0.3.5__py3-none-any.whl → 0.4a0__py3-none-any.whl

pyscreeps_arena/__init__.py

@@ -7,6 +7,7 @@ def CMD_NewProject():
     """
     cmd:
         pyscreeps-arena  [project_path]
+        arena [project_path]
 
     * 复制"src" "game" "build.py" 到指定目录
 
@@ -14,7 +15,7 @@ def CMD_NewProject():
 
     """
     if len(sys.argv) < 2:
-        print("Usage: pyarena new [project_path]")
+        print("Usage: pyarena new [project_path]\n# or\narena new [project_path]")
         return
     project_path = sys.argv[1]
     if not os.path.exists(project_path):

pyscreeps_arena/compiler.py

@@ -43,12 +43,12 @@ class Compiler_Const:
 
     TOTAL_INSERT_AT_HEAD = """
 import { createConstructionSite, findClosestByPath, findClosestByRange, findInRange, findPath, getCpuTime, getDirection, getHeapStatistics, getObjectById, getObjects, getObjectsByPrototype, getRange, getTerrainAt, getTicks,} from 'game/utils';
-import { ConstructionSite, Creep, GameObject, OwnedStructure, Resource, Source, Structure, StructureContainer, StructureExtension, StructureRampart, StructureRoad, StructureSpawn, StructureWall, StructureTower} from 'game/prototypes';
+import { ConstructionSite as GameConstructionSite, Creep as GameCreep, GameObject as GameObjectProto, OwnedStructure, Resource as GameResource, Source as GameSource, Structure as GameStructure, StructureContainer as GameStructureContainer, StructureExtension as GameStructureExtension, StructureRampart as GameStructureRampart, StructureRoad as GameStructureRoad, StructureSpawn as GameStructureSpawn, StructureWall as GameStructureWall, StructureTower as GameStructureTower} from 'game/prototypes';
 import { ATTACK, ATTACK_POWER, BODYPART_COST, BODYPART_HITS, BOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT, BUILD_POWER, CARRY, CARRY_CAPACITY, CONSTRUCTION_COST, CONSTRUCTION_COST_ROAD_SWAMP_RATIO, CONSTRUCTION_COST_ROAD_WALL_RATIO, CONTAINER_CAPACITY, CONTAINER_HITS, CREEP_SPAWN_TIME, DISMANTLE_COST, DISMANTLE_POWER, ERR_BUSY, ERR_FULL, ERR_INVALID_ARGS, ERR_INVALID_TARGET, ERR_NAME_EXISTS, ERR_NOT_ENOUGH_ENERGY, ERR_NOT_ENOUGH_EXTENSIONS, ERR_NOT_ENOUGH_RESOURCES, ERR_NOT_FOUND, ERR_NOT_IN_RANGE, ERR_NOT_OWNER, ERR_NO_BODYPART, ERR_NO_PATH, ERR_TIRED, EXTENSION_ENERGY_CAPACITY, EXTENSION_HITS, HARVEST_POWER, HEAL, HEAL_POWER, LEFT, MAX_CONSTRUCTION_SITES, MAX_CREEP_SIZE, MOVE, OBSTACLE_OBJECT_TYPES, OK, RAMPART_HITS, RAMPART_HITS_MAX, RANGED_ATTACK, RANGED_ATTACK_DISTANCE_RATE, RANGED_ATTACK_POWER, RANGED_HEAL_POWER, REPAIR_COST, REPAIR_POWER, RESOURCES_ALL, RESOURCE_DECAY, RESOURCE_ENERGY, RIGHT, ROAD_HITS, ROAD_WEAROUT, SOURCE_ENERGY_REGEN, SPAWN_ENERGY_CAPACITY, SPAWN_HITS, STRUCTURE_PROTOTYPES, TERRAIN_PLAIN, TERRAIN_SWAMP, TERRAIN_WALL, TOP, TOP_LEFT, TOP_RIGHT, TOUGH, TOWER_CAPACITY, TOWER_COOLDOWN, TOWER_ENERGY_COST, TOWER_FALLOFF, TOWER_FALLOFF_RANGE, TOWER_HITS, TOWER_OPTIMAL_RANGE, TOWER_POWER_ATTACK, TOWER_POWER_HEAL, TOWER_POWER_REPAIR, TOWER_RANGE, WALL_HITS, WALL_HITS_MAX, WORK} from 'game/constants';
 
 import {arenaInfo} from "game";
 import {Visual} from "game/visual"
-import {searchPath} from "game/path-finder"
+import {searchPath, CostMatrix} from "game/path-finder"
     """
 
     TOTAL_INSERT_BEFORE_MAIN = """
@@ -59,19 +59,36 @@ export var sch = Scheduler();
 var monitor = Monitor(2);
 know.now = 0;
 
+StageMachineLogicMeta.__types__ = [];  // 清空js首次构造时引入的数据
+StageMachineLogicMeta.__recursive__ = [];  // 清空js首次构造时引入的数据
 __init_my_exists_creep_before_k__();
+let knowCost = 0;
+let monitorCost = 0;
+let stepCost = 0;
+let timeLine = 0;
 export var loop = function () {
-	know.now = get.ticks ();
-    know.update_(know);
+	get.handle();
+	know.now = get.now;
+	timeLine = get.cpu_us();
+    know.handle();
+    knowCost = get.cpu_us() - timeLine;
 	if (know.now === 1) {
 	    std.show_welcome();
 		init (know);
 	}
 	
+    timeLine = get.cpu_us();
     monitor.handle();
+    monitorCost = get.cpu_us() - timeLine;
+    for (const creep of get.creeps()){
+        creep.handle();
+    }
 	step (know);
+    timeLine = get.cpu_us();
 	sch.handle();
+	stepCost = get.cpu_us() - timeLine;
 	std.show_usage ();
+	print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
 };
     """
 
@@ -109,42 +126,58 @@ export var loop = function () {
 
     ARENA_IMPORTS_GETTER = {
         const.ARENA_GREEN: lambda: f"""
-class BodyPart{{
+class GameBodyPart{{
     constructor(){{
     }}
 }};
-const ScoreCollector = StructureSpawn;
+class GameAreaEffect{{
+    constructor(){{ 
+    }}
+}};
+class GameFlag{{
+    constructor(){{ 
+    }}
+}};
+const GameScoreCollector = GameStructureSpawn;
         """,
         const.ARENA_BLUE: lambda: f"""
-const ScoreCollector = StructureSpawn;
-import {{ Flag, BodyPart}} from 'arena/season_{config.season}/capture_the_flag/basic';
+const GameScoreCollector = GameStructureSpawn;
+class GameAreaEffect{{
+    constructor(){{ 
+    }}
+}};
+import {{ Flag as GameFlag, BodyPart as GameBodyPart}} from 'arena/season_{config.season}/capture_the_flag/basic';
         """,
         const.ARENA_RED: lambda: f"""
-class BodyPart{{
+class GameBodyPart{{
     constructor(){{
     }}
 }};
-import {{ RESOURCE_SCORE, ScoreCollector, AreaEffect, EFFECT_DAMAGE, EFFECT_FREEZE }} from 'arena/season_{config.season}/collect_and_control/basic';
+class GameFlag{{
+    constructor(){{ 
+    }}
+}};
+import {{ RESOURCE_SCORE, ScoreCollector as GameScoreCollector, AreaEffect as GameAreaEffect, EFFECT_DAMAGE, EFFECT_FREEZE }} from 'arena/season_{config.season}/collect_and_control/basic';
 
 import ("arena/season_{config.season}/collect_and_control/basic")
 .then((module) => {{ const RESOURCE_SCORE_X = module.RESOURCE_SCORE_X; const RESOURCE_SCORE_Y = module.RESOURCE_SCORE_Y; const RESOURCE_SCORE_Z = module.RESOURCE_SCORE_Z; }})
 .catch((error) => {{ }});
         """,
         const.ARENA_GRAY: lambda: f"""
-class BodyPart{{
+class GameBodyPart{{
     constructor(){{
     }}
 }};
-const ScoreCollector = StructureSpawn;
+class GameAreaEffect{{
+    constructor(){{ 
+    }}
+}};
+const GameScoreCollector = GameStructureSpawn;
 import("game/prototypes")
-.then((module) => {{ const Flag = module.Flag; }})
-.catch((error) => {{ }});
+.then((module) => {{ const GameFlag = module.Flag; }})
+.catch((error) => {{ const GameFlag = undefined; }});
         """,
     }
-    ARENA_IMPORTS_NOT_BLUE = ""
-    ARENA_IMPORTS_NOT_BLUE1 = """
-import { StructureTower } from 'game/prototypes'
-    """
 
 
 class Compiler_Utils(Compiler_Const):
@@ -352,6 +385,18 @@ class Compiler_Utils(Compiler_Const):
             jsimps.append('./' + '.'.join(rel_path_nodes) + '.js')
         return jsimps
 
+    # ---------- 自定义函数 ---------- #
+    @staticmethod
+    def stage_recursive_replace(content:str) -> str:
+        """
+        替换'@recursive'为'@recursive(<fname>)', 其中<fname>为被装饰器标记的函数名 |
+            Replace '@recursive' with '@recursive(<fname>)', where <fname> is the name of the decorated function.
+
+        @\s*recursive\s+def\s+([^\s\(]+)
+        """
+        return re.sub(r'@\s*recursive(\s+def\s+)([^\s\(]+)', r'@recursive("\2")\1\2', content)
+
+
 
 class CompilerBase(Compiler_Utils):
 
@@ -562,6 +607,14 @@ class Compiler(CompilerBase):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(new_content)
 
+        # ------------------------------------ 自定义 ------------------------------------ #
+        # 调用stage_recursive_replace
+        for fpath in py_fpath:
+            content = self.auto_read(fpath)
+            content = self.stage_recursive_replace(content)
+            with open(fpath, 'w', encoding='utf-8') as f:
+                f.write(content)
+
         core.lprint(GREEN.format('[2/6]'), LOC_DONE, " ", LOC_PREPROCESSING_FINISH, sep="", head="\r", ln=config.language)
         return _imports, _js_imports, _pre_sort_, _pre_define_, _js_replace_
 
@@ -696,8 +749,6 @@ class Compiler(CompilerBase):
         """
         arena_name = const.ARENA_NAMES.get(config.arena, const.ARENA_NAMES['green'])  # like green -> spawn_and_swamp
         self.TOTAL_INSERT_AT_HEAD += self.ARENA_IMPORTS_GETTER[arena_name]()  # add arena imports
-        if config.arena != "blue":
-            self.TOTAL_INSERT_AT_HEAD += self.ARENA_IMPORTS_NOT_BLUE
         total_js = f"const __VERSION__ = '{const.VERSION}';\nconst __PYTHON_VERSION__ = '{python_version_info}';" + self.TOTAL_INSERT_AT_HEAD + f"\nexport var LANGUAGE = '{config.language}';\n"
 
         core.lprint(WAIT, LOC_GENERATING_TOTAL_MAIN_JS, end="", ln=config.language)

pyscreeps_arena/core/const.py

@@ -9,7 +9,7 @@
 #
 import re
 
-VERSION = "0.3.5"
+VERSION = "0.4a0"
 AUTHOR = "我阅读理解一直可以的"
 STEAM_ID = "1029562896"
 GITHUB_NAME = "EagleBaby"

{pyscreeps_arena-0.3.5.dist-info → pyscreeps_arena-0.4a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyscreeps-arena
-Version: 0.3.5
+Version: 0.4a0
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{pyscreeps_arena-0.3.5.dist-info → pyscreeps_arena-0.4a0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-pyscreeps_arena/__init__.py,sha256=3O7Oa_IofW8YQYsnrU88SGYNxn-CMR-PpmV8P2hhEhc,800
+pyscreeps_arena/__init__.py,sha256=aQvVULggzXzf3INx0Rrlozdk8Aoxe01lU7b5xytK678,862
 pyscreeps_arena/build.py,sha256=DQeGLnID2FjpsWTbnqwt2cOp28olWK68U67bfbFJSOU,177
-pyscreeps_arena/compiler.py,sha256=vitNi05yOzDmhioapJl6VydRBGYlDjwqQGnEwQbCOTQ,42082
+pyscreeps_arena/compiler.py,sha256=FakYyCZuGGxwarF_K700u9pVreZzdw-p72-m8uypzps,44042
 pyscreeps_arena/localization.py,sha256=gBbrNybIJAHlkzeD6maF-ie6RKSwPBbnCNzg_1ge8-c,5656
-pyscreeps_arena/project.7z,sha256=WgobRTq_uG0C-k9kn5kji0ug5sXmLyY6RWr8gMbCMdY,86873
+pyscreeps_arena/project.7z,sha256=crcLRbbeGLjgy0wQul1vvwfKoy0Chz3lew5m0f8hgz8,80026
 pyscreeps_arena/core/__init__.py,sha256=qoP_rx1TpbDLJoTm5via4XPwEPaV1FXr1SYvoVoHGms,41
 pyscreeps_arena/core/basic.py,sha256=DFvyDTsTXf2bQtnS9s254TrkshvRwajaHcvTyVvJyqw,2790
 pyscreeps_arena/core/config.py,sha256=U38Z-GiIXPSiAsPKKmOw52AS35Q_tP018H1VUSX6APU,535
-pyscreeps_arena/core/const.py,sha256=veIaT1mEwePm3DqjhnAIRSdJ98djMsN90Uo0qc_nqYM,552
+pyscreeps_arena/core/const.py,sha256=nky-fIzQcWWIT3ccRg-9aviCBNiC2BygaYyyw5GqPMY,552
 pyscreeps_arena/core/core.py,sha256=3Nty8eLKPNgwnYk_sVNBPrWuKxBXI2od8nfEezsEAZQ,5157
 pyscreeps_arena/core/main.py,sha256=-FNSOEjksNlDfCbUqsjtPSUW8vT3qxEdfzXqT5Tdsik,170
 pyscreeps_arena/core/utils.py,sha256=N9OOkORvrqnJakayaFp9qyS0apWhB9lBK4xyyYkhFdo,215
-pyscreeps_arena-0.3.5.dist-info/METADATA,sha256=WSRiQfPrKxYhdShprNQeijKM7dwgPeRL4NaMoe2nfSc,2079
-pyscreeps_arena-0.3.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pyscreeps_arena-0.3.5.dist-info/entry_points.txt,sha256=dqhZN327jfcNypYjEaEJ2t-ABUZ0sVhtDDrD7GiJBfo,67
-pyscreeps_arena-0.3.5.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
-pyscreeps_arena-0.3.5.dist-info/RECORD,,
+pyscreeps_arena-0.4a0.dist-info/METADATA,sha256=gdIKdN3rM9OAVBGud5q_MENg6ffGiyhdBa9Nlj--LkI,2079
+pyscreeps_arena-0.4a0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pyscreeps_arena-0.4a0.dist-info/entry_points.txt,sha256=mLTkJAsgPBEmFkrxNoo3dvb0_dAzSn9jf4Wh09PjdVU,106
+pyscreeps_arena-0.4a0.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
+pyscreeps_arena-0.4a0.dist-info/RECORD,,

{pyscreeps_arena-0.3.5.dist-info → pyscreeps_arena-0.4a0.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
+arena = pyscreeps_arena:CMD_NewProject
 pyscreeps-arena = pyscreeps_arena:CMD_NewProject