find characters by name

Character.py

@@ -27,9 +27,10 @@ class Character:
         self.clan = clan # 宗族
 
     def die(self):
-        self.history.append(f"{self.real_age}岁，死亡")
-        self.special_history.append(f"{self.real_age}岁，死亡")
-        self.is_alive = False
+        if self.is_alive:
+            self.history.append(f"{self.real_age}岁，死亡")
+            self.special_history.append(f"{self.real_age}岁，死亡")
+            self.is_alive = False
 
     def cultivate(self, experience_points):
         if not self.is_alive:

WorldSimulation.py

@@ -97,4 +97,17 @@ class WorldSimulation:
         self.dead_characters.append(character)
 
     def consume_spiritual_energy(self, amount):
-        self.world_spiritual_energy -= amount
+        self.world_spiritual_energy -= amount
+
+    def find_characters_by_name(self, name):
+        # 可能会有重名，把所有都返回
+        res = [c for c in self.characters if c.name == name]
+        if len(res) == 0:
+            return [c for c in self.dead_characters if c.name == name]
+        return res
+    
+    def find_characters_by_clan(self, clan):
+        res = [c for c in self.characters if c.clan == clan]
+        if len(res) == 0:
+            return [c for c in self.dead_characters if c.clan == clan]
+        return res

app.py

@@ -33,11 +33,12 @@ def run_simulation(rounds):
         return "请先初始化世界"
     return simulation.run_simulation(num_rounds)
 
-def get_character_info(character_index):
-    if character_index < len(simulation.characters):
-        return str(simulation.characters[character_index])
+def get_character_info(name):
+    characters = simulation.find_characters_by_name(name)
+    if len(characters) == 0:
+        return f"没有找到名字为{name}的角色"
     else:
-        return f"没有第{character_index}个角色，目前共有{len(simulation.characters)}个存活角色"
+        return "\n\n".join([str(c) for c in characters])
 
 def get_dead_character_info(character_index):
     if character_index < len(simulation.dead_characters):
@@ -111,15 +112,15 @@ with gr.Blocks() as demo:
 
     # 查看角色信息
     with gr.Row():
-        character_info_output = gr.Number(label="角色信息", info="输入角色编号", precision=0)
+        character_info_output = gr.Textbox(label="角色信息", info="输入角色名字")
         get_character_info_button = gr.Button("查看角色信息")
     character_info_output_display = gr.Textbox(label="角色信息")
     get_character_info_button.click(fn=get_character_info, inputs=[character_info_output], outputs=[character_info_output_display])
 
     with gr.Row():
-        dead_character_info_output = gr.Number(label="死亡角色信息", info="输入死亡角色编号", precision=0)
+        dead_character_info_output = gr.Number(label="死亡角色信息", info="输入死亡角色序号（按死亡顺序排列）", precision=0)
         get_dead_character_info_button = gr.Button("查看死亡角色信息")
     dead_character_info_output_display = gr.Textbox(label="死亡角色信息")
     get_dead_character_info_button.click(fn=get_dead_character_info, inputs=[dead_character_info_output], outputs=[dead_character_info_output_display])
     
-demo.launch(debug=True)
+demo.queue().launch(debug=True)

plugins/ResourceDepletionPlugin.py

@@ -26,6 +26,7 @@ class ResourceDepletionPlugin:
             killed = random.sample(clan_members, num_killed)
 
             for c in killed:
+                c.history.append(f"{c.real_age}岁，因资源耗尽死亡")
                 character_die_callback(c)
 
     def execute(self, resources, characters, character_die_callback):

run.py

@@ -17,6 +17,3 @@ print(stats.summarize_markdown())
 
 print(simulation.characters[0])
 print(simulation.characters[1])
-
-print(simulation.dead_characters[0])
-print(simulation.dead_characters[1])