pyscreeps-arena 0.3.6__py3-none-any.whl → 0.4a1__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,7 +43,7 @@ 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";
@@ -56,27 +56,40 @@ import {searchPath, CostMatrix} from "game/path-finder"
 
     TOTAL_APPEND_ATEND = """
 export var sch = Scheduler();
-var monitor = Monitor(2);
+var monitor = Monitor(1);
 know.now = 0;
 
-_SchedulerMeta.__types__ = [];  // 清空js首次构造时引入的数据
-_StageMachineMeta.__recursive__ = [];  // 清空js首次构造时引入的数据
+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 ();
+	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();
-    for (const creep of know._creeps){
-        creep.motion.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);
 };
     """
 
@@ -114,42 +127,71 @@ 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 RESOURCE_SCORE_X = "undefined";
+const RESOURCE_SCORE_Y = "undefined";
+const RESOURCE_SCORE_Z = "undefined";
         """,
         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(){{ 
+    }}
+}};
+const RESOURCE_SCORE_X = "undefined";
+const RESOURCE_SCORE_Y = "undefined";
+const RESOURCE_SCORE_Z = "undefined";
+import {{ Flag as GameFlag, BodyPart as GameBodyPart}} from 'arena/season_{config.season}/capture_the_flag/{"advanced" if config.level in ["advance", "advanced"] else "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")
+{'''import ("arena/season_{config.season}/collect_and_control/advanced")
 .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) => {{ }});
+.catch((error) => {{ const RESOURCE_SCORE_X = "undefined"; const RESOURCE_SCORE_Y = "undefined"; const RESOURCE_SCORE_Z = "undefined"; }});''' if config.level in ['advanced', 'advanced'] else '''
+const RESOURCE_SCORE_X = "undefined";
+const RESOURCE_SCORE_Y = "undefined";
+const RESOURCE_SCORE_Z = "undefined";
+'''}
         """,
         const.ARENA_GRAY: lambda: f"""
-class BodyPart{{
+class GameBodyPart{{
     constructor(){{
     }}
 }};
-const ScoreCollector = StructureSpawn;
+class GameAreaEffect{{
+    constructor(){{ 
+    }}
+}};
+const GameScoreCollector = GameStructureSpawn;
+const RESOURCE_SCORE_X = "undefined";
+const RESOURCE_SCORE_Y = "undefined";
+const RESOURCE_SCORE_Z = "undefined";
 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):
@@ -721,8 +763,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/config.py

@@ -15,5 +15,5 @@ season = "beta"
 language = 'cn'
 # 默认路径: 用户 + ScreepsArena + beta-spawn_and_swamp + main.mjs
 target = None
-TARGET_GETTER = lambda: os.path.join(os.path.expanduser('~'), 'ScreepsArena', f'{season}-{const.ARENA_NAMES.get(arena, "spawn_and_swamp")}', 'main.mjs')
+TARGET_GETTER = lambda: os.path.join(os.path.expanduser('~'), 'ScreepsArena', f'{season}-{const.ARENA_NAMES.get(arena, "spawn_and_swamp")}{"-advanced" if level in ["advance", "advanced"] else ""}', 'main.mjs')
 

pyscreeps_arena/core/const.py

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

{pyscreeps_arena-0.3.6.dist-info → pyscreeps_arena-0.4a1.dist-info}/METADATA

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

pyscreeps_arena-0.4a1.dist-info/RECORD

@@ -0,0 +1,17 @@
+pyscreeps_arena/__init__.py,sha256=aQvVULggzXzf3INx0Rrlozdk8Aoxe01lU7b5xytK678,862
+pyscreeps_arena/build.py,sha256=DQeGLnID2FjpsWTbnqwt2cOp28olWK68U67bfbFJSOU,177
+pyscreeps_arena/compiler.py,sha256=OihFaEmNtHYXLPwvm6rP9mP1OFWcAUvS16NxcuTuqyU,44760
+pyscreeps_arena/localization.py,sha256=gBbrNybIJAHlkzeD6maF-ie6RKSwPBbnCNzg_1ge8-c,5656
+pyscreeps_arena/project.7z,sha256=usYbo8Dhajy_ejzNzEuuk7WWiXdWoaVHcZoqhZg37z4,82498
+pyscreeps_arena/core/__init__.py,sha256=qoP_rx1TpbDLJoTm5via4XPwEPaV1FXr1SYvoVoHGms,41
+pyscreeps_arena/core/basic.py,sha256=DFvyDTsTXf2bQtnS9s254TrkshvRwajaHcvTyVvJyqw,2790
+pyscreeps_arena/core/config.py,sha256=lVk9ynNBDKEkgFnCOsd93w4Q0JiyRPRhTEASLg1KHPw,592
+pyscreeps_arena/core/const.py,sha256=P3UZB28ls6Z8bNxXfubpvoNVwXposm45oLIomFvx8Jw,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.4a1.dist-info/METADATA,sha256=ObJNmHfSGi_JbbqBFXQTxflu_kO-k5Udt0kESWuGuuU,2079
+pyscreeps_arena-0.4a1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pyscreeps_arena-0.4a1.dist-info/entry_points.txt,sha256=mLTkJAsgPBEmFkrxNoo3dvb0_dAzSn9jf4Wh09PjdVU,106
+pyscreeps_arena-0.4a1.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
+pyscreeps_arena-0.4a1.dist-info/RECORD,,

{pyscreeps_arena-0.3.6.dist-info → pyscreeps_arena-0.4a1.dist-info}/entry_points.txt

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

pyscreeps_arena-0.3.6.dist-info/RECORD

@@ -1,17 +0,0 @@
-pyscreeps_arena/__init__.py,sha256=3O7Oa_IofW8YQYsnrU88SGYNxn-CMR-PpmV8P2hhEhc,800
-pyscreeps_arena/build.py,sha256=DQeGLnID2FjpsWTbnqwt2cOp28olWK68U67bfbFJSOU,177
-pyscreeps_arena/compiler.py,sha256=4rmFo4ah6GZl12wB3RrKqac_pmn_IYcX37rEpOzwYac,43203
-pyscreeps_arena/localization.py,sha256=gBbrNybIJAHlkzeD6maF-ie6RKSwPBbnCNzg_1ge8-c,5656
-pyscreeps_arena/project.7z,sha256=WgobRTq_uG0C-k9kn5kji0ug5sXmLyY6RWr8gMbCMdY,86873
-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=vGLNcjVX8ydpK_-RPdTAhtyzOsBErd_idzfORQfh6rU,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.6.dist-info/METADATA,sha256=5Ja6mnFYo-VlmhkVf6JWH_yVDXWg-592FbkpykfmaL8,2079
-pyscreeps_arena-0.3.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pyscreeps_arena-0.3.6.dist-info/entry_points.txt,sha256=dqhZN327jfcNypYjEaEJ2t-ABUZ0sVhtDDrD7GiJBfo,67
-pyscreeps_arena-0.3.6.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
-pyscreeps_arena-0.3.6.dist-info/RECORD,,