pyscreeps-arena 0.4a7__tar.gz → 0.4b0__tar.gz

{pyscreeps-arena-0.4a7 → pyscreeps-arena-0.4b0}/PKG-INFO

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

{pyscreeps-arena-0.4a7 → pyscreeps-arena-0.4b0}/pyscreeps_arena/compiler.py

@@ -60,7 +60,6 @@ var monitor = Monitor(1);
 know.now = 0;
 
 StageMachineLogicMeta.__types__ = [];  // 清空js首次构造时引入的数据
-StageMachineLogicMeta.__recursive__ = [];  // 清空js首次构造时引入的数据
 __init_my_exists_creep_before_k__();
 let knowCost = 0;
 let monitorCost = 0;
@@ -185,9 +184,10 @@ const GameScoreCollector = GameStructureSpawn;
 const RESOURCE_SCORE_X = "undefined";
 const RESOURCE_SCORE_Y = "undefined";
 const RESOURCE_SCORE_Z = "undefined";
+let GameFlag = GameStructureSpawn;
 import("game/prototypes")
-.then((module) => {{ const GameFlag = module.Flag; }})
-.catch((error) => {{ const GameFlag = undefined; }});
+.then((module) => {{ GameFlag = module.Flag; }})
+.catch((error) => {{}});
         """,
     }
 
@@ -336,7 +336,7 @@ class Compiler_Utils(Compiler_Const):
         if records is None:
             records = {}
         if not os.path.exists(fpath):
-            core.error('Compiler.find_chain_import', core.lformat(LOC_FILE_NOT_EXISTS, [fpath]), head='\n', ln=config.language)
+            core.error('Compiler.find_chain_import', core.lformat(LOC_FILE_NOT_EXISTS, ["py", fpath]), head='\n', ln=config.language)
         imps = []
         content = self.auto_read(fpath)
         project_path = project_path or os.path.dirname(fpath)
@@ -482,7 +482,52 @@ class Compiler_Utils(Compiler_Const):
         @\s*recursive\s+def\s+([^\s\(]+)
         """
         return re.sub(r'@\s*recursive(\s+def\s+)([^\s\(]+)', r'@recursive("\2")\1\2', content)
+    
+    @staticmethod
+    def process_mate_code(code):
+        # 用于存储匹配到的信息
+        mate_assignments = []
+        # 匹配变量赋值为Mate()的正则表达式，允许变量定义中包含或不包含类型注解
+        assign_pattern = re.compile(r'(\w+)\s*(?:\:\s*\w*)?\s*=\s*Mate\s*\(')
+        # 匹配类定义的正则表达式
+        class_pattern = re.compile(r'class\s+(\w+)')
+        # 用于记录当前所在的类名
+        current_class = None
+        # 将代码按行分割
+        lines = code.split('\n')
+        # 遍历每一行
+        for i, line in enumerate(lines):
+            # 匹配类定义
+            class_match = class_pattern.match(line)
+            if class_match:
+                current_class = class_match.group(1)
+            # 匹配变量赋值为Mate()
+            assign_match = assign_pattern.search(line)
+            if assign_match:
+                # 检查group(1)前面同一行内是否有#，如果有则忽略
+                comment = re.search(r'#', line[:assign_match.start()])
+                if comment:
+                    continue
+                variable_name = assign_match.group(1)
+                # 存储匹配到的信息
+                mate_assignments += [(variable_name, current_class)]
+
+        output_strings = []
+        for variable_name, class_name in mate_assignments:
+            output_string = f"# > insert Object.defineProperty ({class_name}, '{variable_name}', property.call ({class_name}, {class_name}.{variable_name}._MateGet_, {class_name}.{variable_name}._MateSet_));"
+            output_strings.append(output_string)
+        
+        return code + '\n'.join(output_strings)
+
 
+    @staticmethod
+    def remove_long_docstring(content:str) -> str:
+        """
+        移除长注释 | remove long docstring
+        """
+        code = re.sub(r'"""[^"]*"""', '', content)
+        code = re.sub(r"'''[^']*'''", '', code)
+        return code
 
 
 class CompilerBase(Compiler_Utils):
@@ -552,6 +597,7 @@ class Compiler(CompilerBase):
                     # 将PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "")插入到文件开头
                     content = self.auto_read(fpath)
                     content = self.PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "") + content
+                    # content = self.remove_long_docstring(content)  # 移除长注释 | remove long docstring
 
                     with open(fpath, 'w', encoding='utf-8') as f:  # 注意，这里修改的是build目录下的文件，不是源文件 | Note that the file under the build directory is modified here, not the source file
                         f.write(content)
@@ -623,6 +669,13 @@ class Compiler(CompilerBase):
             else:
                 _pre_sort_[fname] = 65535
 
+        # ------------------------------------ 自定义:调用process_mate_code ------------------------------------ #
+        for fpath in py_fpath:
+            content = self.auto_read(fpath)
+            content = self.process_mate_code(content)  # 调用process_mate_code
+            with open(fpath, 'w', encoding='utf-8') as f:
+                f.write(content)
+
         # ------------------------------------ DEFINE ------------------------------------ #
         # 扫描所有# > define的内容，然后在.py中移除这些行，并记录下来
         # | get all # > define in .py files, and record them
@@ -696,14 +749,14 @@ class Compiler(CompilerBase):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(new_content)
 
-        # ------------------------------------ 自定义 ------------------------------------ #
-        # 调用stage_recursive_replace
+        # ------------------------------------ 自定义:调用stage_recursive_replace ------------------------------------ #
         for fpath in py_fpath:
             content = self.auto_read(fpath)
-            content = self.stage_recursive_replace(content)
+            content = self.stage_recursive_replace(content)  # 调用stage_recursive_replace
             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_
 
@@ -839,7 +892,7 @@ 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
         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__ = '---unfilled---';\n"
+        total_js += f"const __AUTHOR__ = '{const.AUTHOR}';\nconst __AUTHOR_CN__ = '{const.BILIBILI_NAME}';"
 
         core.lprint(WAIT, LOC_GENERATING_TOTAL_MAIN_JS, end="", ln=config.language)
 

{pyscreeps-arena-0.4a7 → pyscreeps-arena-0.4b0}/pyscreeps_arena/core/const.py

@@ -9,10 +9,11 @@
 #
 import re
 
-VERSION = "0.4a7"
-AUTHOR = "我阅读理解一直可以的"
+VERSION = "0.4b0"
+AUTHOR = "●ω＜🤍♪"
 STEAM_ID = "1029562896"
 GITHUB_NAME = "EagleBaby"
+BILIBILI_NAME = "我阅读理解一直可以的"
 
 ARENA_GREEN = "spawn_and_swamp"
 ARENA_BLUE = "capture_the_flag"

{pyscreeps-arena-0.4a7 → pyscreeps-arena-0.4b0}/pyscreeps_arena.egg-info/PKG-INFO

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

{pyscreeps-arena-0.4a7 → pyscreeps-arena-0.4b0}/setup.py

@@ -7,7 +7,7 @@ with open(r"T:\New_PC\Import_Project\uploads\pyscreeps-arena_upload\pyscreeps-ar
     long_description = f.read()
 setup(
     name='pyscreeps-arena',
-    version='0.4a7',
+    version='0.4b0',
     description='Python api|interface to play game: Screeps: Arena.',
     long_description=long_description,
     long_description_content_type='text/markdown',