From 8a7523caea8d770c15bbffc497ea942419d1a3a6 Mon Sep 17 00:00:00 2001
From: bridge <wangxin4qiao@163.com>
Date: Sat, 25 Oct 2025 21:26:36 +0800
Subject: [PATCH] update name logic

---
 src/classes/action/catch.py | 2 +-
 src/classes/action/hunt.py  | 2 +-
 src/sim/new_avatar.py       | 6 +++++-
 static/config.yml           | 5 +++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/classes/action/catch.py b/src/classes/action/catch.py
index df26725..c46445d 100644
--- a/src/classes/action/catch.py
+++ b/src/classes/action/catch.py
@@ -61,7 +61,7 @@ class Catch(TimedAction):
             return False, "当前不在普通区域"
         animals = region.animals
         if len(animals) == 0:
-            return False, "当前区域没有动物"
+            return False, f"当前区域{region.name}没有动物"
         # 动物境界是否可御
         available_animals = [animal for animal in animals if self.avatar.cultivation_progress.realm >= animal.realm]
         if len(available_animals) == 0:
diff --git a/src/classes/action/hunt.py b/src/classes/action/hunt.py
index 214e45b..db909b6 100644
--- a/src/classes/action/hunt.py
+++ b/src/classes/action/hunt.py
@@ -46,7 +46,7 @@ class Hunt(TimedAction):
             return False, "当前不在普通区域"
         animals = getattr(region, "animals", [])
         if len(animals) == 0:
-            return False, "当前区域没有动物"
+            return False, f"当前区域{region.name}没有动物"
         available_animals = [
             animal for animal in animals
             if self.avatar.cultivation_progress.realm >= animal.realm
diff --git a/src/sim/new_avatar.py b/src/sim/new_avatar.py
index d0c336e..878e721 100644
--- a/src/sim/new_avatar.py
+++ b/src/sim/new_avatar.py
@@ -474,13 +474,17 @@ def make_avatars(
     defined = getattr(CONFIG, "defined_avatar", None)
     used = 0
     if defined is not None:
+        surname = str(getattr(defined, "surname", "") or "").strip()
+        given_name = str(getattr(defined, "given_name", "") or "").strip()
+        defined_name = f"{surname}{given_name}"
         da = get_new_avatar_with_config(
             world,
             current_month_stamp,
-            name=str(getattr(defined, "name", "") or ""),
+            name=defined_name,
             age=int(getattr(defined, "age", 0) or 0) if str(getattr(defined, "age", "")).strip() else None,
             gender=str(getattr(defined, "gender", "")).strip() or None,
             sect=getattr(defined, "sect", None),
+            level=int(getattr(defined, "level", 0) or 0) if str(getattr(defined, "level", "")).strip() else None,
             appearance=int(getattr(defined, "appearance", 0) or 0) if str(getattr(defined, "appearance", "")).strip() else None,
             technique=getattr(defined, "technique", None),
             treasure=getattr(defined, "treasure", None),
diff --git a/static/config.yml b/static/config.yml
index 158e647..6bbe996 100644
--- a/static/config.yml
+++ b/static/config.yml
@@ -31,10 +31,11 @@ social:
   event_context_num: 6
 
 defined_avatar:
-  name: 王大锤
+  surname: 丰川
+  given_name: 祥子
   level: 29
   age: 18
-  gender: 男
+  gender: 女
   sect: 百兽宗
   appearance: 10
   personas: