pyscreeps-arena 0.2.1__tar.gz → 0.2.2__tar.gz

{pyscreeps_arena-0.2.1 → pyscreeps_arena-0.2.2}/PKG-INFO

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

{pyscreeps_arena-0.2.1 → pyscreeps_arena-0.2.2}/pyscreeps_arena/build.py

@@ -215,7 +215,6 @@ class Compiler:
         _pre_define_ = {}  # define
         _js_replace_, _insert_id_ = {}, 0  # insert
 
-
         # ----------------------------------- IMPORT ----------------------------------- #
         # 获取所有.py文件中的所有import的内容，并记录下来fname:[imp1, imp2, ...]
         for i, fpath in enumerate(py_fpath):
@@ -241,7 +240,7 @@ class Compiler:
                 f.write(new_content)
 
         # ------------------------------------ SORT ------------------------------------ #
-        # 获取所有.py文件中的所有# sort的内容，并记录下来(不存在则默认为65535)
+        # 获取所有.py文件中的所有# sort的内容，并记录下来(不存在则默认为2^32-1)
         for i, fpath in enumerate(py_fpath):
             fname = py_names[i][:-3] + '.js'
             content = self.auto_read(fpath)
@@ -250,11 +249,11 @@ class Compiler:
                 try:
                     sort_num = int(m.group(1))
                 except ValueError:
-                    print(Fore.YELLOW + '[Warn] ' + Fore.RESET + f'sort number error: "{m.group(1)}", use 65535 instead.')
-                    sort_num = 65535
+                    print(Fore.YELLOW + '[Warn] ' + Fore.RESET + f'sort number error: "{m.group(1)}", use 2^32-1 instead.')
+                    sort_num = 4294967295
                 _pre_sort_[fname] = sort_num
             else:
-                _pre_sort_[fname] = 65535
+                _pre_sort_[fname] = 4294967295
 
         # ------------------------------------ DEFINE ------------------------------------ #
         # 扫描所有# define的内容，然后在.py中移除这些行，并记录下来
@@ -471,15 +470,21 @@ class Compiler:
         f_sorts[self.JS_VM] = -1
 
         err_flag = False
-        for module in usr_modules:
+        for i, module in enumerate(usr_modules):
             if module[2:] not in f_sorts:
-                print(Fore.RED + '\n[Error] ' + Fore.RESET + f'"{module[2:-3]}.py" is not a user module.')
-                imp_detail = t_imps.get(module, None)
-                if imp_detail:
-                    print("\t\t-- May be imported by user in: %s" % imp_detail)
+                if module[2:6] == 'src.' and module[6:] in f_sorts:
+                    f_sorts[module[2:]] = f_sorts[module[6:]]
+                    # 为了解决这样的问题:
+                    # > import src.creeps.basic
+                    # import src.creeps.basic
                 else:
-                    print("\t\t-- Please move this file into the 'src' directory.")
-                err_flag = True
+                    print(Fore.RED + '\n[Error] ' + Fore.RESET + f'"{module[2:-3]}.py" is not a user module.')
+                    imp_detail = t_imps.get(module, None)
+                    if imp_detail:
+                        print("\t\t-- May be imported by user in: %s" % imp_detail)
+                    else:
+                        print("\t\t-- Please move this file into the 'src' directory.")
+                    err_flag = True
         if err_flag:
             sys.exit(1)
         for i in range(len(usr_modules)):

{pyscreeps_arena-0.2.1 → pyscreeps_arena-0.2.2}/pyscreeps_arena.egg-info/PKG-INFO

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

{pyscreeps_arena-0.2.1 → pyscreeps_arena-0.2.2}/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.2.1',
+    version='0.2.2',
     description='Python api|interface to play game: Screeps: Arena.',
     long_description=long_description,
     long_description_content_type='text/markdown',