pyscreeps-arena 0.5.8.1__tar.gz → 0.5.9.0__tar.gz

{pyscreeps_arena-0.5.8.1 → pyscreeps_arena-0.5.9.0}/PKG-INFO

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

pyscreeps_arena-0.5.9.0/pyscreeps_arena/afters/__init__.py

@@ -0,0 +1,6 @@
+from pyscreeps_arena.afters.after_empty import ToEmptyAfter
+from pyscreeps_arena.afters.after_prefab import ToPrefabAfter
+from pyscreeps_arena.afters.after_custom import ToCustomAfter
+from pyscreeps_arena.afters.after_config import ToConfigAfter
+
+

pyscreeps_arena-0.5.9.0/pyscreeps_arena/afters/after_config.py

@@ -0,0 +1,84 @@
+import os
+import re
+import sys
+
+def ToConfigAfter(path='.', language='cn', arena='gray', level='basic'):
+    # 验证参数是否在范围内
+    valid_languages = ['cn', 'en']
+    valid_arenas = ['green', 'blue', 'red', 'gray']
+    valid_levels = ['basic', 'advanced']
+
+    if language not in valid_languages:
+        print(f"错误: language 参数必须是 {valid_languages} 中的一个")
+        return False
+
+    if arena not in valid_arenas:
+        print(f"错误: arena 参数必须是 {valid_arenas} 中的一个")
+        return False
+
+    if level not in valid_levels:
+        print(f"错误: level 参数必须是 {valid_levels} 中的一个")
+        return False
+
+    # 检查 build.py 文件是否存在
+    build_py_path = os.path.join(path, 'build.py')
+    if not os.path.exists(build_py_path):
+        print("build.py 文件不存在，跳过修改操作")
+        return False
+
+    # 读取文件内容
+    with open(build_py_path, 'r', encoding='utf-8') as f:
+        content = f.read()
+
+    # 使用正则表达式替换配置语句
+    # 替换 language 配置
+    content = re.sub(
+        r'config\.language\s*=\s*[\'"]([^\'"]*)[\'"]\s*#\s*\'en\'\s+or\s+\'cn\'',
+        f"config.language = '{language}'  # 'en' or 'cn'",
+        content
+    )
+
+    # 替换 arena 配置
+    content = re.sub(
+        r'config\.arena\s*=\s*[\'"]([^\'"]*)[\'"]\s*#\s*\'green\',\s*\'blue\',\s*\'red\',\s*\'gray\'',
+        f"config.arena = '{arena}'   # 'green', 'blue', 'red', 'gray'",
+        content
+    )
+
+    # 替换 level 配置
+    content = re.sub(
+        r'config\.level\s*=\s*[\'"]([^\'"]*)[\'"]\s*#\s*\'basic\',\s*\'advanced\'',
+        f"config.level = '{level}'   # 'basic', 'advanced'",
+        content
+    )
+
+    # 写回文件
+    with open(build_py_path, 'w', encoding='utf-8') as f:
+        f.write(content)
+
+    print(f"已更新 build.py 配置:")
+    print(f"  language = {language}")
+    print(f"  arena = {arena}")
+    print(f"  level = {level}")
+    return True
+
+if __name__ == "__main__":
+    # 解析命令行参数
+    # 默认值
+    path = '.'
+    language = 'cn'
+    arena = 'gray'
+    level = 'basic'
+
+    # 处理命令行参数
+    if len(sys.argv) > 1:
+        path = sys.argv[1]
+    if len(sys.argv) > 2:
+        language = sys.argv[2]
+    if len(sys.argv) > 3:
+        arena = sys.argv[3]
+    if len(sys.argv) > 4:
+        level = sys.argv[4]
+
+    # 执行更新
+    ToConfigAfter(path, language, arena, level)

pyscreeps_arena-0.5.9.0/pyscreeps_arena/afters/after_custom.py

@@ -0,0 +1,87 @@
+import os
+import re
+
+
+def ToCustomAfter(path='.'):
+    # 检查 prefab 目录是否存在
+    prefab_dir = os.path.join(path, 'src', 'prefab')
+    if not os.path.exists(prefab_dir):
+        print("src/prefab 目录不存在，跳过处理")
+        return
+
+    # 创建 src/custom 目录
+    custom_dir = os.path.join(path, 'src', 'custom')
+    if not os.path.exists(custom_dir):
+        os.makedirs(custom_dir)
+        print("已创建 src/custom 目录")
+    else:
+        print("src/custom 目录已存在，跳过创建操作")
+
+    # 遍历 prefab 目录中的非 _ 开头的 .py 文件
+    for file_name in os.listdir(prefab_dir):
+        if file_name.startswith('_') or not file_name.endswith('.py'):
+            continue
+
+        file_path = os.path.join(prefab_dir, file_name)
+        print(f"处理文件: {file_path}")
+
+        # 读取文件内容
+        with open(file_path, 'r', encoding='utf-8') as f:
+            content = f.read()
+
+        # 检查是否存在 """$TEMPLATE...""" 的内容
+        template_match = re.search(r'"""(\$TEMPLATE.*?)"""', content, re.DOTALL)
+        if template_match:
+            template_content = template_match.group(1)
+            # 移除开头的 $TEMPLATE 标记
+            template_content = re.sub(r'^\s*\$TEMPLATE\s*', '', template_content)
+
+            # 在 custom 目录下创建同名文件
+            custom_file_path = os.path.join(custom_dir, file_name)
+            with open(custom_file_path, 'w', encoding='utf-8') as f:
+                f.write(template_content)
+            print(f"已在 custom 目录下创建 {file_name} 文件")
+        else:
+            print(f"{file_name} 中未找到模板内容，跳过")
+
+    # 检查并修改 src/main.py 文件，在导入语句末尾添加 from custom import *
+    main_py_path = os.path.join(path, 'src', 'main.py')
+    if not os.path.exists(main_py_path):
+        print("src/main.py 文件不存在，跳过导入语句添加操作")
+        return
+
+    # 读取文件内容
+    with open(main_py_path, 'r') as f:
+        lines = f.readlines()
+
+    # 检查是否存在 from custom import * 语句
+    has_custom_import = False
+    import_end_line = 0
+
+    for i, line in enumerate(lines):
+        if re.search(r'from\s+custom\s+import\s+\*', line):
+            has_custom_import = True
+            break
+        # 检查是否为导入语句
+        if re.match(r'^(from|import)\s+', line.strip()):
+            import_end_line = i + 1  # 记录导入语句的结束位置（下一行）
+
+    if not has_custom_import:
+        # 在导入语句的末尾插入 from custom import * 语句
+        if import_end_line > 0:
+            # 在导入语句末尾插入
+            lines.insert(import_end_line, '\nfrom custom import *\n')
+        else:
+            # 如果没有导入语句，在文件开头插入
+            lines.insert(0, 'from custom import *\n')
+
+        # 写回文件
+        with open(main_py_path, 'w') as f:
+            f.writelines(lines)
+        print("已在 src/main.py 中导入语句末尾追加 from custom import * 语句")
+    else:
+        print("src/main.py 中已存在 from custom import * 语句，跳过添加操作")
+
+
+if __name__ == "__main__":
+    ToCustomAfter('.')

pyscreeps_arena-0.5.9.0/pyscreeps_arena/afters/after_empty.py

@@ -0,0 +1,34 @@
+import os
+import re
+
+def ToEmptyAfter(path='.'):
+    # 删除 src/basic.py 文件
+    basic_path = os.path.join(path, 'src', 'basic.py')
+    if os.path.exists(basic_path):
+        os.remove(basic_path)
+        print("已删除 src/basic.py")
+    else:
+        print("src/basic.py 不存在，跳过删除操作")
+
+    # 修改 src/main.py 文件，将 from basic import * 改为 from builtin import *
+    main_path = os.path.join(path, 'src', 'main.py')
+    if os.path.exists(main_path):
+        with open(main_path, 'r') as f:
+            content = f.read()
+
+        # 使用正则表达式替换，处理各种可能的空白字符
+        modified_content = re.sub(r'from\s+basic\s+import\s+\*', 'from builtin import *', content)
+
+        # 检查是否发生了替换
+        if modified_content != content:
+            with open(main_path, 'w') as f:
+                f.write(modified_content)
+            print("已修改 src/main.py，将 from basic import * 改为 from builtin import *")
+        else:
+            print("src/main.py 中未找到 from basic import * 语句，跳过修改操作")
+    else:
+        print("src/main.py 不存在，跳过修改操作")
+
+if __name__ == "__main__":
+    ToEmptyAfter('.')
+    

pyscreeps_arena-0.5.9.0/pyscreeps_arena/afters/after_prefab.py

@@ -0,0 +1,67 @@
+import os
+import shutil
+import re
+
+def ToPrefabAfter(path='.'):
+    # 检查 docs/prefab 目录是否存在
+    source_dir = os.path.join(path, 'docs', 'prefab')
+    if not os.path.exists(source_dir):
+        print("docs/prefab 目录不存在，跳过移动操作")
+        return
+
+    # 检查 src 目录是否存在
+    src_dir = os.path.join(path, 'src')
+    if not os.path.exists(src_dir):
+        os.makedirs(src_dir)
+        print("已创建 src 目录")
+
+    # 移动 docs/prefab 到 src/prefab
+    dest_dir = os.path.join(src_dir, 'prefab')
+    if os.path.exists(dest_dir):
+        # 如果目标目录已存在，先删除
+        shutil.rmtree(dest_dir)
+        print("已删除现有 src/prefab 目录")
+
+    shutil.move(source_dir, dest_dir)
+    print("已将 docs/prefab 移动到 src/prefab")
+
+    # 检查并修改 src/main.py 文件
+    main_py_path = os.path.join(src_dir, 'main.py')
+    if not os.path.exists(main_py_path):
+        print("src/main.py 文件不存在，跳过导入语句添加操作")
+        return
+
+    # 读取文件内容
+    with open(main_py_path, 'r') as f:
+        lines = f.readlines()
+
+    # 检查是否存在 from prefab import * 语句
+    has_prefab_import = False
+    import_end_line = 0
+
+    for i, line in enumerate(lines):
+        if re.search(r'from\s+prefab\s+import\s+\*', line):
+            has_prefab_import = True
+            break
+        # 检查是否为导入语句
+        if re.match(r'^(from|import)\s+', line.strip()):
+            import_end_line = i + 1  # 记录导入语句的结束位置（下一行）
+
+    if not has_prefab_import:
+        # 在导入语句的末尾插入 from prefab import * 语句
+        if import_end_line > 0:
+            # 在导入语句末尾插入
+            lines.insert(import_end_line, 'from prefab import *\n')
+        else:
+            # 如果没有导入语句，在文件开头插入
+            lines.insert(0, 'from prefab import *\n')
+        
+        # 写回文件
+        with open(main_py_path, 'w') as f:
+            f.writelines(lines)
+        print("已在 src/main.py 中导入语句末尾追加 from prefab import * 语句")
+    else:
+        print("src/main.py 中已存在 from prefab import * 语句，跳过添加操作")
+
+if __name__ == "__main__":
+    ToPrefabAfter('.')

{pyscreeps_arena-0.5.8.1 → pyscreeps_arena-0.5.9.0}/pyscreeps_arena/compiler.py

@@ -8,6 +8,7 @@ import shutil
 import chardet
 import subprocess
 import pyperclip
+import datetime
 from colorama import Fore
 from typing import List, Optional, Tuple, Union
 
@@ -52,6 +53,7 @@ def replace_src_prefix(file_list):
 #     """
 #     return PYFILE_PRAGMA_INSERTS + "\n" + content
 class Compiler_Const:
+    CALLED_FUNCTIONS = ['behavior', 'sequence', 'selector', 'parallel', 'listen']
     PROTO_DEFINES_DIRS = ["builtin", "library"]
     FILE_STRONG_REPLACE = {
         "std": {
@@ -108,14 +110,14 @@ export var loop = function () {
     if (know.now === 1) {
 	    std.show_welcome();
 		init (know);
-		
+
 	}
 	step (know);
     timeLine = get.cpu_us();
 	if (get._SCH_FLAG) sch.handle();
 	stepCost = get.cpu_us() - timeLine;
 	std.show_usage ();
-	print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
+    print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
 	if (know.draw) know.draw();
 };
     """
@@ -648,6 +650,82 @@ class Compiler_Utils(Compiler_Const):
 
         return result
 
+    @staticmethod
+    def stage_called_replace(caller_name: str, content: str) -> str:
+        """
+        移除 '@<caller_name>(...)' 装饰器行，并在文末添加对应的 _<caller_name>Login 调用。
+
+        对于类方法: _<caller_name>Login("ClassName", "method_name", a, b, ...)
+        对于普通函数: _<caller_name>Login("", "function_name", a, b, ...)
+        """
+        calls_to_add = []
+        deletions = []
+
+        # 1. 收集所有类定义的位置和缩进
+        class_pattern = re.compile(r'^(\s*)class\s+(\w+)', re.MULTILINE)
+        classes = [(m.start(), len(m.group(1)), m.group(2))
+                   for m in class_pattern.finditer(content)]
+
+        # 2. 查找所有 @<caller_name>(...) 装饰器（支持多行参数）
+        decorator_pattern = re.compile(
+            r'^\s*@\s*' + re.escape(caller_name) + r'\s*\((.*?)\)\s*$\n?',
+            re.MULTILINE | re.DOTALL
+        )
+
+        for dec_match in decorator_pattern.finditer(content):
+            dec_start = dec_match.start()
+            dec_end = dec_match.end()
+            # 提取装饰器的参数
+            params_str = dec_match.group(1).strip()
+
+            # 查找接下来的函数定义（跳过可能的空行）
+            after_decorator = content[dec_end:]
+            func_match = re.search(r'^(\s*)def\s+([^\s\(]+)', after_decorator, re.MULTILINE)
+
+            if not func_match:
+                continue
+
+            func_indent_len = len(func_match.group(1))
+            func_name = func_match.group(2)
+
+            # 3. 确定类名：查找装饰器前最近的、缩进小于函数缩进的类
+            class_name = ""
+            for cls_pos, cls_indent_len, cls_name in reversed(classes):
+                if cls_pos < dec_match.start() and func_indent_len > cls_indent_len:
+                    class_name = cls_name
+                    break
+
+            # 4. 处理参数，保持参数的格式
+            # 移除参数中的换行和多余空格，保持参数列表的格式
+            params = []
+            if params_str:
+                # 简单处理参数，保持引号内的内容不变
+                # 这里可以根据需要进行更复杂的参数解析
+                params = [p.strip() for p in params_str.split(',') if p.strip()]
+
+            # 构建参数部分的字符串
+            params_part = ""
+            if params:
+                params_part = ", " + ", ".join(params)
+
+            # 5. 记录删除位置和调用信息
+            deletions.append((dec_start, dec_end))
+            calls_to_add.append(f'_{caller_name}Login("{class_name}", "{func_name}"{params_part})')
+
+        # 6. 应用删除（倒序避免位置偏移）
+        if not deletions:
+            return content
+
+        result = content
+        for start, end in sorted(deletions, key=lambda x: x[0], reverse=True):
+            result = result[:start] + result[end:]
+
+        # 7. 在文末添加调用
+        if calls_to_add:
+            result = '\n'.join(calls_to_add) + '\n' + result
+
+        return result
+
     @staticmethod
     def process_mate_code(code):
         # 用于存储匹配到的信息
@@ -921,6 +999,8 @@ class Compiler(CompilerBase):
 
                     # 将PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "")插入到文件开头
                     content = self.auto_read(fpath)
+                    # 移除"""$..."""代码块
+                    content = re.sub(r'"""\$[\s\S]*?"""', '', content)
                     content = self.PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "") + content
                     # content = self.remove_long_docstring(content)  # 移除长注释 | remove long docstring
 
@@ -1077,10 +1157,13 @@ class Compiler(CompilerBase):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(new_content)
 
-        # ------------------------------------ 自定义:调用stage_recursive_replace ------------------------------------ #
+        # ------------------------------------ 自定义:调用stage_recursive_replace和stage_called_replace ------------------------------------ #
         for fpath in py_fpath:
             content = self.auto_read(fpath)
             content = self.stage_recursive_replace(content)  # 调用stage_recursive_replace
+            # 调用stage_called_replace处理四个装饰器
+            for caller in self.CALLED_FUNCTIONS:
+                content = self.stage_called_replace(caller, content)
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(content)
 
@@ -1217,12 +1300,22 @@ class Compiler(CompilerBase):
         :param min_js_files: list[str]  # .min.js文件路径列表
         :return: str
         """
-        arena_name = const.ARENA_NAMES.get(config.arena, const.ARENA_NAMES['green'])  # like green -> spawn_and_swamp
+        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
-        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"
-        total_js += f"const __AUTHOR__ = '{const.AUTHOR}';\nconst __AUTHOR_CN__ = '{const.BILIBILI_NAME}';"
+        current_time = datetime.datetime.now()
+        timestamp_ms = int(current_time.timestamp() * 1000)
+        timestring = current_time.strftime("%Y-%m-%d %H:%M")
+
+        total_js = f"""const __VERSION__ = '{const.VERSION}';
+const __PYTHON_VERSION__ = '{python_version_info}';""" + self.TOTAL_INSERT_AT_HEAD + f"""
+export var LANGUAGE = '{config.language}';
+"""
+
+        total_js += f"export var TIMESTAMP = {timestamp_ms};\n"
+        total_js += f"export var TIMESTRING = '{timestring}';\n"
+        total_js += f"""const __AUTHOR__ = '{const.AUTHOR}';
+const __AUTHOR_CN__ = '{const.BILIBILI_NAME}';"""
 
-        # 添加.min.js文件的import语句
         if min_js_files:
             for min_js_path in min_js_files:
                 min_js_filename = os.path.basename(min_js_path)
@@ -1342,14 +1435,6 @@ class Compiler(CompilerBase):
         dir_path = os.path.dirname(mjs_path)
         build_dir_path = os.path.dirname(build_main_mjs)
 
-        # 复制.min.js文件到目标目录
-        for min_js_path in min_js_files:
-            min_js_filename = os.path.basename(min_js_path)
-            # 复制到build目录
-            shutil.copy(min_js_path, os.path.join(build_dir_path, min_js_filename))
-            # 复制到最终导出目录
-            shutil.copy(min_js_path, os.path.join(dir_path, min_js_filename))
-
         # 生成total_js，传入.min.js文件列表
         total_js = imports + "\n" + self.generate_total_js(
             replace_src_prefix(modules), imps, sorts, self.FILE_STRONG_REPLACE, reps, min_js_files
@@ -1365,6 +1450,14 @@ class Compiler(CompilerBase):
         with open(mjs_path, 'w', encoding='utf-8') as f:
             f.write(total_js)
 
+        # 复制.min.js文件到目标目录
+        for min_js_path in min_js_files:
+            min_js_filename = os.path.basename(min_js_path)
+            # 复制到build目录
+            shutil.copy(min_js_path, os.path.join(build_dir_path, min_js_filename))
+            # 复制到最终导出目录
+            shutil.copy(min_js_path, os.path.join(dir_path, min_js_filename))
+
         core.lprint(GREEN.format('[6/6]'), LOC_DONE, " ", LOC_EXPORTING_TOTAL_MAIN_JS_FINISH, sep="", head="\r", ln=config.language)
 
         if mjs_path != build_main_mjs:
@@ -1422,7 +1515,7 @@ if __name__ == '__main__':
     # compiler.compile()
     # compiler.clean()
     test = """
-    
+
 def patrolling(self, c: Creep):
     e = self.center.nearest(k.civilian.enemies, 5)
     if e:
@@ -1432,6 +1525,6 @@ def patrolling(self, c: Creep):
         ):
             case True: c.move(e, SWAMP_MOTION)
             case False: c.move(self.bpos, SWAMP_MOTION)
-    
+
     """
     print(f"res=\n{Compiler.convert_match_to_if(test)}")

{pyscreeps_arena-0.5.8.1 → pyscreeps_arena-0.5.9.0}/pyscreeps_arena/core/const.py

@@ -9,7 +9,7 @@
 #
 import re
 
-VERSION = "0.5.8.1"
+VERSION = "0.5.9.0"
 AUTHOR = "●ω＜🤍♪"
 STEAM_ID = "1029562896"
 GITHUB_NAME = "EagleBaby"