Update

Character.py

@@ -27,7 +27,7 @@ class Character:
         self.clan = clan # 宗族
 
     def die(self):
-        if self.is_alive:
+        if self.is_alive and self.cultivation_rank < IMMORTAL_RANK:
             self.history.append(f"{self.real_age}岁，死亡")
             self.special_history.append(f"{self.real_age}岁，死亡")
             self.is_alive = False
@@ -206,10 +206,10 @@ class Character:
             f"修仙阶段: ({self.cultivation_rank}){self.view_rank()}",
             f"特殊体质: {[special_constitution for (special_constitution, is_active) in zip(['战斗体质', '合欢体质', '灵龟体质', '蜉蝣体质'], self.special_constitution) if is_active]}",
             f"灵根: {[spiritual_root for (spiritual_root, is_active) in zip(['金', '木', '水', '火', '土'], self.spiritual_roots) if is_active]}",
-            f"伴侣: {self.partner.name if self.partner is not None else ''}",
+            f"伴侣: {self.partner.name if self.partner is not None else '无'}",
             f"存活: {self.is_alive}",
-            f"宗族: {self.clan}",
-            f"父母: {[parent.name for parent in self.parents]}",
+            f"宗族: {self.clan if self.clan is not None else '无'}",
+            f"父母: {[parent.name for parent in self.parents] if self.parents is not None else '无'}",
             f"孩子: {[child.name for child in self.children]}",
             f"Combat Power: {self.combat_power}",
             f"Experience Points: {self.experience_points}",

WorldSimulation.py

@@ -1,4 +1,4 @@
-from config import DISASTER_FREQUENCY, MARRIAGE_RATE, DISASTER_PROB, NORMAL_BIRTH_RATE, LOW_BIRTH_RATE, NORMAL_BATTLE_RATE, HIGH_BATTLE_RATE
+from config import DISASTER_FREQUENCY, MARRIAGE_RATE, DISASTER_PROB, NORMAL_BIRTH_RATE, LOW_BIRTH_RATE, NORMAL_BATTLE_RATE, HIGH_BATTLE_RATE, IMMORTAL_RANK
 from Character import Character
 from plugins.CharacterCreationPlugin import CharacterCreationPlugin
 from plugins.CultivationPlugin import CultivationPlugin
@@ -10,9 +10,9 @@ from plugins.BattlePlugin import BattlePlugin
 from plugins.ResourceDepletionPlugin import ResourceDepletionPlugin
 
 class WorldSimulation:
-    def __init__(self, special_constitution_ratio, spiritual_roots_ratio, initial_population, world_spiritual_energy, resources = 100000, resources_threshold = 10):
+    def __init__(self, world_spiritual_energy, resources = 100000, resources_threshold = 10):
         # 初始化插件
-        self.character_creation_plugin = CharacterCreationPlugin(special_constitution_ratio, spiritual_roots_ratio)
+        self.character_creation_plugin = CharacterCreationPlugin()
         self.cultivation_plugin = CultivationPlugin()
         self.marriage_plugin = MarriagePlugin(MARRIAGE_RATE)
         self.birth_plugin = BirthPlugin(NORMAL_BIRTH_RATE)
@@ -22,7 +22,6 @@ class WorldSimulation:
         self.resource_depletion_plugin = ResourceDepletionPlugin(resources_threshold)
 
         # 初始化参数
-        self.initial_population = initial_population
         self.resources = resources # 总资源量
         self.resources_threshold = resources_threshold  # 人均最少资源需求
         self.init_world_spiritual_energy = world_spiritual_energy
@@ -55,10 +54,6 @@ class WorldSimulation:
         self.marriage_plugin.execute(self.characters)
         self.cultivation_plugin.execute(self.characters, self.world_spiritual_energy, self.init_world_spiritual_energy, self.consume_spiritual_energy)
 
-    def start_simulation(self):
-        self.nth_round = 0
-        self.create_initial_population()
-
     def run_simulation(self, num_rounds):
         md = ""
         for _ in range(num_rounds):
@@ -81,13 +76,17 @@ class WorldSimulation:
         character = Character(name, gender, special_constitution, spiritual_roots)
         self.characters.append(character)
 
-    def create_initial_population(self):
+    def create_population(self, initial_population, special_constitution_ratio, spiritual_roots_ratio):
         # 创建角色
-        for _ in range((self.initial_population - len(self.characters))):
+        self.character_creation_plugin.set_parameters(special_constitution_ratio, spiritual_roots_ratio)
+        for _ in range((initial_population - len(self.characters))):
             character = self.character_creation_plugin.create_character()
             self.characters.append(character)
 
     def character_die(self, character):
+        # 成仙者不会死亡
+        if character.cultivation_level > IMMORTAL_RANK:
+            return
         character.die()
         self.world_spiritual_energy += character.consume_spiritual_energy  # 灵气回归
         if character.partner:

app.py

@@ -6,14 +6,11 @@ from WorldSimulation import WorldSimulation
 simulation = None
 num_rounds = 0
 
-def initialize_world(c1, c2, c3, c4, r1, r2, r3, r4, r5, initial_population=3000, world_spiritual_energy=1000000):
+def initialize_world(world_spiritual_energy=1000000):
     global simulation
-    special_constitution_ratio = [c1, c2, c3, c4]
-    spiritual_roots_ratio = [r1, r2, r3, r4, r5]
-    initial_population = int(initial_population)
-    simulation = WorldSimulation(special_constitution_ratio, spiritual_roots_ratio, initial_population, world_spiritual_energy)
+    simulation = WorldSimulation(world_spiritual_energy=world_spiritual_energy)
 
-    return f"世界初始化成功：\n\n初始人口：{initial_population}\n\n世界灵气能量：{world_spiritual_energy}"
+    return f"世界初始化成功：\n\n世界灵气能量：{world_spiritual_energy}"
 
 
 def add_custom_character(name, gender, special_constitution, spiritual_roots):
@@ -22,8 +19,11 @@ def add_custom_character(name, gender, special_constitution, spiritual_roots):
     simulation.add_custom_character(name, gender, special_constitution, spiritual_roots)
     return str(simulation.characters[-1])
 
-def start_simulation():
-    simulation.start_simulation()
+def start_simulation(c1, c2, c3, c4, r1, r2, r3, r4, r5, initial_population=3000):
+    special_constitution_ratio = [c1, c2, c3, c4]
+    spiritual_roots_ratio = [r1, r2, r3, r4, r5]
+    initial_population = int(initial_population)
+    simulation.create_population(special_constitution_ratio=special_constitution_ratio, spiritual_roots_ratio=spiritual_roots_ratio, initial_population=initial_population)
     return f"世界人口数量达到{len(simulation.characters)}，可以运行模拟了。"
 
 def run_simulation(rounds):
@@ -54,8 +54,27 @@ with gr.Blocks() as demo:
     # 初始化世界
     gr.Markdown("## 初始化世界")
     with gr.Row():
-        initial_population_input = gr.Number(label="初始人口", value=3000, precision=0)
         world_spiritual_energy_input = gr.Number(label="世界灵气能量", value=1000000)
+        initialize_button = gr.Button("初始化世界")
+    output_text = gr.Markdown(label="初始化结果")
+    initialize_button.click(fn=initialize_world, inputs=[ world_spiritual_energy_input], outputs=output_text)
+
+    # 添加角色
+    with gr.Accordion("添加角色 (可选)", open=False):
+        gr.Markdown("每次添加一个，添加完可以继续添加。")
+        name_input = gr.Textbox(label="姓名")
+        gender_input = gr.Radio(["男", "女"], label="性别")
+        special_constitution_input = gr.CheckboxGroup(["战斗体质", "合欢体质", "灵龟体质", "蜉蝣体质"], label="特殊体质", type="index")
+        spiritual_roots_input = gr.CheckboxGroup(["金", "木", "水", "火", "土"], label="灵根", type="index")
+        add_character_button = gr.Button("添加角色")
+        new_character_info_output = gr.Textbox(label="新角色信息")
+        add_character_button.click(fn=add_custom_character, inputs=[name_input,
+                gender_input,
+                special_constitution_input, spiritual_roots_input], outputs=new_character_info_output)
+    
+    # 生成初始人口
+    gr.Markdown("## 生成初始人口")
+    initial_population_input = gr.Number(label="初始人口", value=3000, precision=0)
     # 特殊体质
     gr.Markdown("特殊体质比例")
     with gr.Row():
@@ -73,27 +92,9 @@ with gr.Blocks() as demo:
             gr.Number(label="水", minimum=0, maximum=1, value=0.04), 
             gr.Number(label="火", minimum=0, maximum=1, value=0.04), 
             gr.Number(label="土", minimum=0, maximum=1, value=0.04)]
-    initialize_button = gr.Button("初始化世界")
-    output_text = gr.Markdown(label="初始化结果")
-    initialize_button.click(fn=initialize_world, inputs=[*special_constitution_ratio_input, *spiritual_roots_ratio_input, initial_population_input, world_spiritual_energy_input], outputs=output_text)
-
-    # 添加角色
-    with gr.Accordion("添加角色"):
-        gr.Markdown("每次添加一个，添加完可以继续添加。")
-        name_input = gr.Textbox(label="姓名")
-        gender_input = gr.Radio(["男", "女"], label="性别")
-        special_constitution_input = gr.CheckboxGroup(["战斗体质", "合欢体质", "灵龟体质", "蜉蝣体质"], label="特殊体质", type="index")
-        spiritual_roots_input = gr.CheckboxGroup(["金", "木", "水", "火", "土"], label="灵根", type="index")
-        add_character_button = gr.Button("添加角色")
-        new_character_info_output = gr.Textbox(label="新角色信息")
-        add_character_button.click(fn=add_custom_character, inputs=[name_input,
-                gender_input,
-                special_constitution_input, spiritual_roots_input], outputs=new_character_info_output)
-    
-    # 开始模拟
     start_simulation_button = gr.Button("生成初始人口")
     output_text = gr.Markdown("")
-    start_simulation_button.click(fn=start_simulation, inputs=[], outputs=output_text)
+    start_simulation_button.click(fn=start_simulation, inputs=[*special_constitution_ratio_input, *spiritual_roots_ratio_input, initial_population_input], outputs=output_text)
 
     # 运行模拟
     gr.Markdown("## 运行模拟\n\n输入轮数，运行模拟，可以多次运行。")
@@ -104,10 +105,10 @@ with gr.Blocks() as demo:
     run_simulation_button.click(fn=run_simulation, inputs=[rounds_input], outputs=[simulation_result_output])
 
     # 查看统计信息
-    gr.Markdown("## 查看统计信息")
-    get_stats_button = gr.Button("查看统计信息")
-    with gr.Box():
-        world_stats_output = gr.Markdown("")
+    with gr.Accordion("查看统计信息", open=False):
+        get_stats_button = gr.Button("查看统计信息")
+        with gr.Box():
+            world_stats_output = gr.Markdown("")
     get_stats_button.click(fn=get_world_stats, inputs=[], outputs=[world_stats_output])
 
     # 查看角色信息

plugins/CharacterCreationPlugin.py

@@ -3,7 +3,7 @@ from Character import Character
 from utils import get_random_name
 
 class CharacterCreationPlugin:
-    def __init__(self, special_constitution_ratio, spiritual_roots_ratio):
+    def __init__(self, special_constitution_ratio=None, spiritual_roots_ratio=None):
         self.special_constitution_ratio = special_constitution_ratio
         self.spiritual_roots_ratio = spiritual_roots_ratio
 
@@ -16,3 +16,7 @@ class CharacterCreationPlugin:
 
         character = Character(get_random_name(), random.choice(["男", "女"]), special_constitution, spiritual_roots)
         return character
+
+    def set_parameters(self, special_constitution_ratio, spiritual_roots_ratio):
+        self.special_constitution_ratio = special_constitution_ratio
+        self.spiritual_roots_ratio = spiritual_roots_ratio

run.py

@@ -2,13 +2,13 @@ from CharacterStatistics import CharacterStatistics
 from WorldSimulation import WorldSimulation
 
 # 创建一个世界模拟对象
-simulation = WorldSimulation(special_constitution_ratio=[0.001, 0.001, 0.001, 0.001], spiritual_roots_ratio=[0.04, 0.04, 0.04, 0.04, 0.04], initial_population=3000, world_spiritual_energy=1000000)
+simulation = WorldSimulation(world_spiritual_energy=1000000)
 
 # 运行模拟
 simulation.add_custom_character("CoraBaby1", "女", special_constitution=[1, 0, 0, 1], spiritual_roots=[1, 1, 1, 1, 1])
 simulation.add_custom_character("CoraBaby2", "女", special_constitution=[0, 1, 0, 1], spiritual_roots=[1, 1, 1, 1, 1])
 
-simulation.start_simulation()
+simulation.create_population(special_constitution_ratio=[0.001, 0.001, 0.001, 0.001], spiritual_roots_ratio=[0.04, 0.04, 0.04, 0.04, 0.04], initial_population=3000)
 simulation.run_simulation(num_rounds=10)
 
 # 查看世界统计