From 41c878275389c72f79cd395a81c4fe97edd5d491 Mon Sep 17 00:00:00 2001 From: bridge Date: Thu, 16 Oct 2025 23:24:08 +0800 Subject: [PATCH] update effect str --- src/classes/effect.py | 10 +++++++--- src/run/run.py | 1 + static/config.yml | 2 +- static/game_configs/persona.csv | 2 +- static/game_configs/root.csv | 2 +- static/game_configs/sect.csv | 2 +- static/game_configs/technique.csv | 10 +++++----- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/classes/effect.py b/src/classes/effect.py index 7be01b5..7d8cab9 100644 --- a/src/classes/effect.py +++ b/src/classes/effect.py @@ -8,8 +8,9 @@ from typing import Any, Callable, Optional def load_effect_from_str(value: object) -> dict[str, Any]: """ 解析 effects 字符串为 dict： + - 支持裸键值对格式（如 'k': ['v']） - 支持 JSON 格式（双引号） - - 支持 Python 字面量（单引号，如 {'k': ['v']}) + - 支持 Python 字面量（单引号） - value 为 None/空字符串/'nan' 时返回 {} - 解析非 dict 则返回 {} """ @@ -20,14 +21,17 @@ def load_effect_from_str(value: object) -> dict[str, Any]: s = str(value).strip() if not s or s == "nan": return {} - # 使用全局配置中的分隔符将占位分隔符替换回逗号，便于 JSON/字面量解析 + # 使用全局配置中的分隔符将占位分隔符替换回逗号，便于解析 try: - from src.utils.config import CONFIG # 延迟导入避免循环依赖 + from src.utils.config import CONFIG sep = str(getattr(getattr(CONFIG, "df", {}), "ids_separator", ",")) if sep and sep != ",": s = s.replace(sep, ",") except Exception: pass + # 如果不是以 { 开头，则添加花括号包裹 + if not s.startswith("{"): + s = "{" + s + "}" try: obj = json.loads(s) return obj if isinstance(obj, dict) else {} diff --git a/src/run/run.py b/src/run/run.py index a41aa08..8a6182b 100644 --- a/src/run/run.py +++ b/src/run/run.py @@ -89,6 +89,7 @@ def make_avatars(world: World, count: int = 12, current_month_stamp: MonthStamp # 根据当前时间戳和年龄计算出生时间戳 birth_month_stamp = current_month_stamp - age_years * 12 + random.randint(0, 11) # 在出生年内随机选择月份 gender = random_gender() + # gender = Gender.FEMALE # 分配宗门或散修 assigned_sect = None if use_sects and sect_member_count < sect_member_target and existed_sects: diff --git a/static/config.yml b/static/config.yml index 7511231..9f7b3ca 100644 --- a/static/config.yml +++ b/static/config.yml @@ -15,7 +15,7 @@ ai: max_decide_num: 4 game: - init_npc_num: 3 + init_npc_num: 8 sect_num: 2 # init_npc_num大于sect_num时，会随机选择sect_num个宗门 npc_birth_rate_per_month: 0.001 diff --git a/static/game_configs/persona.csv b/static/game_configs/persona.csv index 84b53ad..f328aef 100644 --- a/static/game_configs/persona.csv +++ b/static/game_configs/persona.csv @@ -25,7 +25,7 @@ id,name,exclusion_ids,desc,weight,condition 23,热情,13;14;22,你待人友好、积极回应，倾向用鼓励与赞美拉近距离；你更愿意主动展开善意的交流，乐于合作与分享,1, 24,极端正义,20;25,你对邪恶深恶痛绝，对正义的理想抱有近乎偏执的追求。,1,avatar.alignment == "正" 25,极端邪恶,20;24,你推崇权力与恐惧，为达目的不择手段，对善良嗤之以鼻。,1,avatar.alignment == "邪" -26,开放,27,你对待和他人结为道侣或者双修比较随意,1, +26,开放,27,你对待和他人结为道侣或者双修比较随意,1000, 27,腼腆,26,你对待和他人结为道侣或者双修比较谨慎,1, 28,舔狗,13;14;22;27,你对异性中外貌出众者格外友善，倾向主动接近、帮助与合作。,1, 29,嫉妒,11;23,你对在修为、外貌或财富等方面远超于你的人容易产生敌意，更倾向对其冷淡、挑衅或打压。,1, diff --git a/static/game_configs/root.csv b/static/game_configs/root.csv index 4e2e9e9..85ce862 100644 --- a/static/game_configs/root.csv +++ b/static/game_configs/root.csv @@ -9,5 +9,5 @@ id,key,name,element_list,desc,effects 7,ICE,冰灵根,金;水,控制力强；持久性好, 8,WIND,风灵根,木;水,身法卓绝；难以捉摸, 9,DARK,暗灵根,火;土,隐匿系；擅幻术与诡道, -10,HEAVEN,天灵根,金;木;水;火;土,资质通天；五行皆通，修行全面,{"extra_breakthrough_success_rate": 0.1} +10,HEAVEN,天灵根,金;木;水;火;土,资质通天；五行皆通，修行全面,"extra_breakthrough_success_rate": 0.1 diff --git a/static/game_configs/sect.csv b/static/game_configs/sect.csv index 6861525..9c15c4d 100644 --- a/static/game_configs/sect.csv +++ b/static/game_configs/sect.csv @@ -5,7 +5,7 @@ id,name,desc,member_act_style,alignment,sect_surnames,male_sect_given_names,fema 3,水镜宗,正道十宗之一，实则严守中立。拥有仙界异宝"彻天水镜"可预知未来。,你处事冷静圆融，喜以柔克刚，擅借力与反制。,中,水;镜;寒;霜;冰;清;沐;澜;渊;泉,涟光;沧浪;泽远;浩川;泊舟;涓石;溪原;涵舟;泠曜;漪岑;淞岳;涔雨,漫霖;洛漪;潋月;涵烟;沁波;翠波;漫葭;汀兰;潭歌;涓玥;澧宁;潇然,1, 4,冥王宗,行走幽冥之道，术法阴冷狠厉。,你言辞冷厉少情，敬畏因果而不惧杀伐，偏向效率与结果。,邪,冥;王;玄;幽;夜;白;冷;狱;魇;阴,血燎;焚魄;灰燼;殁川;绝尘;厌离;朔寒;邪风;归墟;朽骨;朔月;止戈,寒绫;霜瑶;凄歌;素鸢;祭宁;黛魂;夙梦;绫雪;凛珑;霁月;旷音;凝岚,1, 5,朱勾宗,邪宗大派。以炼器、机关、暗杀闻名于世，素来阴毒冷僻。,你直面欲望与代价，不惧黑暗，以攻伐见长。,邪,朱;绯;刃;戮;蚀;渊;钧;鸦;墨;殷,暗阑;机括;鬼匣;夜禁;幻锁;残锋;暗弦;影栅;幽钩;断线;潜匿;迷踪,玄簪;霜绡;纤罗;碎玉;影裳;轻弦;凝黛;凝烟;冷珥;素纱;凛钗;寒袖,1, -6,合欢宗,以情入道，靠双修增进修为，善驭人心，长于权变。,你辞令婉转，善于拿捏人欲与局势，以柔制刚。,中,合;欢;苏;陆;柳;花;月;楚;顾;白,流烟;迟夜;长陌;归舟;暮成;远辞;行止;轻寒;沉香;野鹤;乘风,婉心;轻柔;疏影;如梦;绮念;惜香;慕雪;倾城;绯烟;晚晴;素袖;霁眉;绸缪;静妍,1000,{'legal_actions': ['DualCultivation']} +6,合欢宗,以情入道，靠双修增进修为，善驭人心，长于权变。,你辞令婉转，善于拿捏人欲与局势，以柔制刚。,中,合;欢;苏;陆;柳;花;月;楚;顾;白,流烟;迟夜;长陌;归舟;暮成;远辞;行止;轻寒;沉香;野鹤;乘风,婉心;轻柔;疏影;如梦;绮念;惜香;慕雪;倾城;绯烟;晚晴;素袖;霁眉;绸缪;静妍,1000,'legal_actions': ['DualCultivation'] 7,镇魂宗,铁血风格，擅安魂、封邪、渡厄，兼有刚烈镇压之术。,你肃穆沉稳，重安魂镇邪，少言而果决。,正,厉;卢;镇;魂;钟;青;凌;白;楚;顾,安魄;靖川;霁阳;季衡;砺甲;烁锋;昊戈;祁光;漠石;启封;殷策;定魄,清宁;素铃;靖霜;澄心;霁雪;安祈;净月;宁枝;祷绫;明槐;采霁;定寒,1, 8,幽魂噬影宗,镇宗典籍《幽冥录》。幽明气为根基。,你行事隐秘果断，重结果轻虚名，擅潜行与出其不意。,邪,冥;阎;鬼;幽;归;应;阴;碧;夜;魅,噬影;无藏;绝响;断痕;影渊;暗行;潜踪;魄隐;迷雾;空蝉;断念;裂隙,影绫;暗萝;霜绡;素鹭;玄绮;凝灯;绫岚;凛铃;朔华;漠音;宵岑;泠歌,1, 9,千帆城,炼器大宗，巧匠云集。著名法宝有灵灭丝、定魂蓝星、天罗网、万里极光壁、飞翼等。商旅云集，自成体系。,你务实精明，重交易与信誉，崇尚规则与秩序。,中,商;楚;顾;白;苏;林;叶;秦;赵;魏,持衡;清评;问价;立契;通衡;问道;理市;衡准;守约;筑匠;铸衡;估算,素蓝;明衡;巧心;青帆;绫舟;观星;衡绫;星槎;织霓;采绫;芸巧;霁行;砚秋;镶玑;绘蓝;银梭;珩心,1, diff --git a/static/game_configs/technique.csv b/static/game_configs/technique.csv index e685daa..075c911 100644 --- a/static/game_configs/technique.csv +++ b/static/game_configs/technique.csv @@ -18,19 +18,19 @@ id,name,technique_root,grade,desc,weight,condition,sect,effects 23,玄夜无相法,暗,中品,夜行无相，出入无痕，摄人心魄。,1,,, 25,九天淬体雷诀,雷,下品,引九天霆罡击体，筋骨再生，爆发如雷。,1,,, 26,九霄养雷法,雷,中品,引九霄真雷，养气通窍，威势赫然。,1,,, -28,血神噬魂大法,邪,下品,以血神邪念淬炼，杀伐狠辣，损阴德。,1,,,{"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50} -29,冥狱吞灵大法,邪,中品,循冥狱之道吞噬灵魄，逆乱阴阳，速成之途。,1,,,{"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50} +28,血神噬魂大法,邪,下品,以血神邪念淬炼，杀伐狠辣，损阴德。,1,,,"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50 +29,冥狱吞灵大法,邪,中品,循冥狱之道吞噬灵魄，逆乱阴阳，速成之途。,1,,,"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50 30,明心归一剑典,金,上品,以剑返本归一，明镜止水，一剑断妄。,10,,明心剑宗, 31,霆光明志剑,雷,上品,以霆光贯剑意，电掣雷行，破虚斩障。,10,,明心剑宗, 32,离火明心诀,火,上品,以离火照见自心，去蔽存真，剑随心行。,10,,明心剑宗, 33,御兽玄纲,木,上品,以木灵沟通群兽，血脉契合，驱策如臂。,10,,百兽宗, 34,蛮荒镇骨体,土,上品,以厚土淬锻筋骨，躯壳如山，血勇不挫。,10,,百兽宗, -35,血啸狩魂诀,邪,上品,以嗜血啸魄摄魂，狩猎杀伐，越战越猛。,10,,百兽宗,{"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50} +35,血啸狩魂诀,邪,上品,以嗜血啸魄摄魂，狩猎杀伐，越战越猛。,10,,百兽宗,"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50 36,彻天水镜观,水,上品,以彻天水镜观机，借势化力，先机在握。,10,,水镜宗, 37,寒漪反斩法,冰,上品,以寒漪回折之势，四两拨千斤，刚柔相济。,10,,水镜宗, 38,镜花游身步,风,上品,以轻风流转为引，身化水月，进退自如。,10,,水镜宗, 39,幽冥镇狱经,暗,上品,引幽冥阴煞镇压万灵，寒魄凝骨，万劫不侵。,10,,冥王宗, -40,冥焰噬神法,邪,上品,以冥焰噬神，逆夺生机，吞灵化魄。,10,,冥王宗,{"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50} +40,冥焰噬神法,邪,上品,以冥焰噬神，逆夺生机，吞灵化魄。,10,,冥王宗,"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50 41,黄泉引魄步,冰,上品,以玄寒引魄入泉，步步生霜，摄魂夺魄。,10,,冥王宗, 42,赤狱炼锋诀,火,上品,以赤狱真火炼锋，法器通灵，杀机更盛。,10,,朱勾宗, 43,魇丝摄魂术,暗,上品,以魇丝无声摄魄，藏形夺命，来去无迹。,10,,朱勾宗, @@ -43,7 +43,7 @@ id,name,technique_root,grade,desc,weight,condition,sect,effects 50,金章封煞术,金,上品,以金章为印，封煞束灵，斩乱镇邪。,10,,镇魂宗, 51,幽冥无相诀,暗,上品,隐形无相，出没幽明，摄心夺魄于无声。,10,,幽魂噬影宗, 52,噬影穿行步,风,上品,以风掠影，穿行缝隙，先至而不留痕。,10,,幽魂噬影宗, -53,冥狱吞魄经,邪,上品,循幽冥吞魄之道，化敌为养，速成险绝。,10,,幽魂噬影宗,{"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50} +53,冥狱吞魄经,邪,上品,循幽冥吞魄之道，化敌为养，速成险绝。,10,,幽魂噬影宗,"extra_breakthrough_success_rate": -0.1; "extra_cultivate_exp": 50 54,天罗机巧篇,金,上品,精研机巧阵枢，百变应敌，器术合一。,10,,千帆城, 55,蓝星定魂阵,土,上品,以厚土定魂为基，阵锁心神，稳如磐石。,10,,千帆城, 56,飞翼乘风术,风,上品,乘风而行，纵横千里，御器齐驱。,10,,千帆城,