pyscreeps-arena 0.5.8.2__tar.gz → 0.5.8.4__tar.gz

{pyscreeps_arena-0.5.8.2 → pyscreeps_arena-0.5.8.4}/PKG-INFO

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

pyscreeps_arena-0.5.8.4/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.8.4/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.8.4/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.8.4/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.8.4/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.2 → pyscreeps_arena-0.5.8.4}/pyscreeps_arena/core/const.py

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

{pyscreeps_arena-0.5.8.2 → pyscreeps_arena-0.5.8.4}/pyscreeps_arena/ui/project_ui.py

@@ -7,12 +7,14 @@ import os
 from pathlib import Path
 from PyQt6.QtWidgets import (QApplication, QMainWindow, QWidget, QVBoxLayout, 
                              QHBoxLayout, QLabel, QLineEdit, QPushButton, 
-                             QFileDialog, QMessageBox)
+                             QFileDialog, QMessageBox, QComboBox)
 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QFont
 from PyQt6.QtGui import QIcon
 from pyscreeps_arena.core import const
 from pyscreeps_arena.ui.rs_icon import get_pixmap
+from pyscreeps_arena.afters import ToConfigAfter, ToEmptyAfter, ToPrefabAfter, ToCustomAfter
+from PyQt6.QtWidgets import QRadioButton, QGroupBox
 
 
 
@@ -27,7 +29,7 @@ class ProjectCreatorUI(QMainWindow):
         """初始化UI界面"""
         self.setWindowTitle("PyScreeps Arena - 项目创建器")
         self.setWindowIcon(QIcon(get_pixmap()))
-        self.setFixedSize(500, 350)
+        self.setFixedSize(500, 580)
         
         # 主窗口部件
         central_widget = QWidget()
@@ -85,6 +87,7 @@ class ProjectCreatorUI(QMainWindow):
         self._name_input = QLineEdit()
         self._name_input.setPlaceholderText("输入项目名称...")
         self._name_input.textChanged.connect(self._on_name_changed)
+        self._name_input.returnPressed.connect(self._create_project)
         name_layout.addWidget(name_label)
         name_layout.addWidget(self._name_input)
         input_layout.addLayout(name_layout)
@@ -113,6 +116,86 @@ class ProjectCreatorUI(QMainWindow):
         input_layout.addLayout(path_layout)
         layout.addWidget(input_widget)
         
+        # 分隔线
+        separator2 = QLabel("─" * 50)
+        separator2.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        separator2.setStyleSheet("color: #ccc;")
+        layout.addWidget(separator2)
+        
+        # 配置选项区域（左右布局）
+        config_container = QWidget()
+        config_container_layout = QHBoxLayout(config_container)
+        config_container_layout.setSpacing(20)
+        
+        # 左侧：语言、竞技场、难度配置
+        left_config_widget = QWidget()
+        left_config_layout = QVBoxLayout(left_config_widget)
+        left_config_layout.setSpacing(10)
+        
+        # 语言选择
+        lang_layout = QHBoxLayout()
+        lang_label = QLabel("语 言:")
+        lang_label.setFixedWidth(80)
+        self._lang_combo = QComboBox()
+        self._lang_combo.addItems(["中文 (cn)", "英文 (en)"])
+        self._lang_combo.setCurrentIndex(0)
+        lang_layout.addWidget(lang_label)
+        lang_layout.addWidget(self._lang_combo)
+        left_config_layout.addLayout(lang_layout)
+        
+        # 竞技场选择
+        arena_layout = QHBoxLayout()
+        arena_label = QLabel("竞技场:")
+        arena_label.setFixedWidth(80)
+        self._arena_combo = QComboBox()
+        self._arena_combo.addItems(["灰色 (gray)", "绿色 (green)", "蓝色 (blue)", "红色 (red)"])
+        self._arena_combo.setCurrentIndex(0)
+        arena_layout.addWidget(arena_label)
+        arena_layout.addWidget(self._arena_combo)
+        left_config_layout.addLayout(arena_layout)
+        
+        # 难度级别选择
+        level_layout = QHBoxLayout()
+        level_label = QLabel("难 度:")
+        level_label.setFixedWidth(80)
+        self._level_combo = QComboBox()
+        self._level_combo.addItems(["基础 (basic)", "高级 (advanced)"])
+        self._level_combo.setCurrentIndex(0)
+        level_layout.addWidget(level_label)
+        level_layout.addWidget(self._level_combo)
+        left_config_layout.addLayout(level_layout)
+        
+        config_container_layout.addWidget(left_config_widget)
+        
+        # 右侧：模式选择（单选框）
+        right_config_widget = QWidget()
+        right_config_layout = QVBoxLayout(right_config_widget)
+        right_config_layout.setSpacing(8)
+        
+        # 模式选择标题
+        # mode_title = QLabel("模式选择")
+        # mode_title.setFont(QFont("Arial", 10, QFont.Weight.Bold))
+        # right_config_layout.addWidget(mode_title)
+        
+        # 单选按钮
+        self._empty_radio = QRadioButton("空白 (Empty)")
+        self._basic_radio = QRadioButton("基础 (Basic)")
+        self._prefab_radio = QRadioButton("预设 (Prefab)")
+        self._pi_radio = QRadioButton("预设继承 (P&&I)")
+        
+        # 默认选择基础模式
+        self._basic_radio.setChecked(True)
+        
+        # 添加到布局
+        right_config_layout.addWidget(self._empty_radio)
+        right_config_layout.addWidget(self._basic_radio)
+        right_config_layout.addWidget(self._prefab_radio)
+        right_config_layout.addWidget(self._pi_radio)
+        
+        config_container_layout.addWidget(right_config_widget)
+        
+        layout.addWidget(config_container)
+        
         # 按钮区域
         button_layout = QHBoxLayout()
         button_layout.addStretch()
@@ -122,6 +205,7 @@ class ProjectCreatorUI(QMainWindow):
         self._create_btn.setFixedSize(100, 35)
         self._create_btn.clicked.connect(self._create_project)
         self._create_btn.setEnabled(False)
+        self._create_btn.setDefault(True)
         button_layout.addWidget(self._create_btn)
         
         # 取消按钮
@@ -201,6 +285,35 @@ class ProjectCreatorUI(QMainWindow):
             archive.extractall(path=target_path)
             
         print(f"[DEBUG] 项目模板已解压到: {target_path}")  # 调试输出
+        
+        # 获取用户选择的配置
+        lang_text = self._lang_combo.currentText()
+        lang = lang_text.split('(')[1].strip(')')
+        
+        arena_text = self._arena_combo.currentText()
+        arena = arena_text.split('(')[1].strip(')')
+        
+        level_text = self._level_combo.currentText()
+        level = level_text.split('(')[1].strip(')')
+        
+        # 调用配置方法
+        ToConfigAfter(path=target_path, language=lang, arena=arena, level=level)
+        print(f"[DEBUG] 项目配置已更新: language={lang}, arena={arena}, level={level}")  # 调试输出
+        
+        # 根据选择的模式执行相应的操作
+        if self._empty_radio.isChecked():
+            print(f"[DEBUG] 执行空白模式配置")
+            ToEmptyAfter(path=target_path)
+        elif self._basic_radio.isChecked():
+            print(f"[DEBUG] 执行基础模式配置（不操作）")
+            # 基础模式不执行任何操作
+        elif self._prefab_radio.isChecked():
+            print(f"[DEBUG] 执行预设模式配置")
+            ToPrefabAfter(path=target_path)
+        elif self._pi_radio.isChecked():
+            print(f"[DEBUG] 执行预设继承模式配置")
+            ToPrefabAfter(path=target_path)
+            ToCustomAfter(path=target_path)
 
 
 def run_project_creator():

{pyscreeps_arena-0.5.8.2 → pyscreeps_arena-0.5.8.4}/pyscreeps_arena.egg-info/PKG-INFO

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

{pyscreeps_arena-0.5.8.2 → pyscreeps_arena-0.5.8.4}/pyscreeps_arena.egg-info/SOURCES.txt

@@ -10,6 +10,11 @@ pyscreeps_arena.egg-info/dependency_links.txt
 pyscreeps_arena.egg-info/entry_points.txt
 pyscreeps_arena.egg-info/requires.txt
 pyscreeps_arena.egg-info/top_level.txt
+pyscreeps_arena/afters/__init__.py
+pyscreeps_arena/afters/after_config.py
+pyscreeps_arena/afters/after_custom.py
+pyscreeps_arena/afters/after_empty.py
+pyscreeps_arena/afters/after_prefab.py
 pyscreeps_arena/core/__init__.py
 pyscreeps_arena/core/basic.py
 pyscreeps_arena/core/config.py

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