diff --git a/assets/females/1.png b/assets/females/1.png index a7189bd..9454418 100644 Binary files a/assets/females/1.png and b/assets/females/1.png differ diff --git a/assets/females/10.png b/assets/females/10.png index 1ef8402..729672a 100644 Binary files a/assets/females/10.png and b/assets/females/10.png differ diff --git a/assets/females/11.png b/assets/females/11.png index ee5ff64..16b2634 100644 Binary files a/assets/females/11.png and b/assets/females/11.png differ diff --git a/assets/females/12.png b/assets/females/12.png index c04946b..a412bca 100644 Binary files a/assets/females/12.png and b/assets/females/12.png differ diff --git a/assets/females/13.png b/assets/females/13.png index f80ab9b..b005228 100644 Binary files a/assets/females/13.png and b/assets/females/13.png differ diff --git a/assets/females/14.png b/assets/females/14.png index 412e48e..f440924 100644 Binary files a/assets/females/14.png and b/assets/females/14.png differ diff --git a/assets/females/15.png b/assets/females/15.png index 135d44b..0290b96 100644 Binary files a/assets/females/15.png and b/assets/females/15.png differ diff --git a/assets/females/2.png b/assets/females/2.png index d046ee3..9610740 100644 Binary files a/assets/females/2.png and b/assets/females/2.png differ diff --git a/assets/females/3.png b/assets/females/3.png index 2a064a1..3936d22 100644 Binary files a/assets/females/3.png and b/assets/females/3.png differ diff --git a/assets/females/4.png b/assets/females/4.png index f66a69d..e003ca6 100644 Binary files a/assets/females/4.png and b/assets/females/4.png differ diff --git a/assets/females/5.png b/assets/females/5.png index c00d49b..483ede6 100644 Binary files a/assets/females/5.png and b/assets/females/5.png differ diff --git a/assets/females/6.png b/assets/females/6.png index f856ee0..c768bda 100644 Binary files a/assets/females/6.png and b/assets/females/6.png differ diff --git a/assets/females/7.png b/assets/females/7.png index 83b835b..7513363 100644 Binary files a/assets/females/7.png and b/assets/females/7.png differ diff --git a/assets/females/8.png b/assets/females/8.png index b36facc..965da2d 100644 Binary files a/assets/females/8.png and b/assets/females/8.png differ diff --git a/assets/females/9.png b/assets/females/9.png index 2a6d5ef..0c1ab9d 100644 Binary files a/assets/females/9.png and b/assets/females/9.png differ diff --git a/assets/males/1.png b/assets/males/1.png index 0981a38..6a3c49f 100644 Binary files a/assets/males/1.png and b/assets/males/1.png differ diff --git a/assets/males/10.png b/assets/males/10.png index 1ba1ced..1435917 100644 Binary files a/assets/males/10.png and b/assets/males/10.png differ diff --git a/assets/males/11.png b/assets/males/11.png index 2b20ed9..54fdc65 100644 Binary files a/assets/males/11.png and b/assets/males/11.png differ diff --git a/assets/males/12.png b/assets/males/12.png index 7b2689f..d06f8e5 100644 Binary files a/assets/males/12.png and b/assets/males/12.png differ diff --git a/assets/males/13.png b/assets/males/13.png index e1d53cf..201b41b 100644 Binary files a/assets/males/13.png and b/assets/males/13.png differ diff --git a/assets/males/14.png b/assets/males/14.png index 88dc323..1eace0a 100644 Binary files a/assets/males/14.png and b/assets/males/14.png differ diff --git a/assets/males/15.png b/assets/males/15.png index 616e1ce..2738d67 100644 Binary files a/assets/males/15.png and b/assets/males/15.png differ diff --git a/assets/males/16.png b/assets/males/16.png new file mode 100644 index 0000000..6c12a71 Binary files /dev/null and b/assets/males/16.png differ diff --git a/assets/males/2.png b/assets/males/2.png index 2d6f2a3..c7366af 100644 Binary files a/assets/males/2.png and b/assets/males/2.png differ diff --git a/assets/males/3.png b/assets/males/3.png index 6da0131..a1c0edb 100644 Binary files a/assets/males/3.png and b/assets/males/3.png differ diff --git a/assets/males/4.png b/assets/males/4.png index 4ca343c..6be2e7f 100644 Binary files a/assets/males/4.png and b/assets/males/4.png differ diff --git a/assets/males/5.png b/assets/males/5.png index 403d873..3fd78f3 100644 Binary files a/assets/males/5.png and b/assets/males/5.png differ diff --git a/assets/males/6.png b/assets/males/6.png index 8b43788..ce3af48 100644 Binary files a/assets/males/6.png and b/assets/males/6.png differ diff --git a/assets/males/7.png b/assets/males/7.png index 5d8f39a..3b29019 100644 Binary files a/assets/males/7.png and b/assets/males/7.png differ diff --git a/assets/males/8.png b/assets/males/8.png index 0600a5b..2ecf337 100644 Binary files a/assets/males/8.png and b/assets/males/8.png differ diff --git a/assets/males/9.png b/assets/males/9.png index 7f4066d..8d41a38 100644 Binary files a/assets/males/9.png and b/assets/males/9.png differ diff --git a/assets/screenshot.png b/assets/screenshot.png index d998a3a..660b07c 100644 Binary files a/assets/screenshot.png and b/assets/screenshot.png differ diff --git a/assets/tiles/desert - 副本.png b/assets/tiles/desert - 副本.png deleted file mode 100644 index d823aa1..0000000 Binary files a/assets/tiles/desert - 副本.png and /dev/null differ diff --git a/assets/tiles/desert.png b/assets/tiles/desert.png index 47fc077..d823aa1 100644 Binary files a/assets/tiles/desert.png and b/assets/tiles/desert.png differ diff --git a/src/classes/mutual_action/conversation.py b/src/classes/mutual_action/conversation.py index 6aeb31c..719be0a 100644 --- a/src/classes/mutual_action/conversation.py +++ b/src/classes/mutual_action/conversation.py @@ -64,9 +64,11 @@ class Conversation(MutualAction): if target is None: return False, "目标不存在" if target.tile is None or self.avatar.tile is None: - return False, "任一角色未处于有效区域" - ok = target.tile.region == self.avatar.tile.region - return (ok, "" if ok else "目标不在同一区域") + return False, "目标未处于有效区域" + # 先不限定同一区域，之后再限制 + # if target.tile.region != self.avatar.tile.region: + # return False, "目标不在同一区域" + return True, "" def start(self, target_avatar: "Avatar|str", **kwargs) -> Event: target = self._get_target_avatar(target_avatar) diff --git a/src/classes/mutual_action/dual_cultivation.py b/src/classes/mutual_action/dual_cultivation.py index cafc44a..6d97222 100644 --- a/src/classes/mutual_action/dual_cultivation.py +++ b/src/classes/mutual_action/dual_cultivation.py @@ -46,10 +46,13 @@ class DualCultivation(MutualAction): effects = self.avatar.effects legal_actions = effects.get("legal_actions", []) if not isinstance(legal_actions, list) or "DualCultivation" not in legal_actions: - return False, "仅合欢宗或未被允许" + return False, "不具有双修的权限" target = self._get_target_avatar(target_avatar) if target is None: - return False, "目标不存在" + return False, "双修目标不存在" + # 先不限定同一区域，之后再限制 + # if target.tile.region != self.avatar.tile.region: + # return False, "目标不在同一区域" return True, "" def start(self, target_avatar: "Avatar|str") -> Event: diff --git a/static/game_configs/persona.csv b/static/game_configs/persona.csv index 516fcaa..ad1103e 100644 --- a/static/game_configs/persona.csv +++ b/static/game_configs/persona.csv @@ -29,4 +29,4 @@ id,name,exclusion_ids,desc,weight,condition 27,腼腆,26,你对待和他人结为道侣或者双修比较谨慎,1, 28,舔狗,13;14;22;27,你对异性中外貌出众者格外友善，倾向主动接近、帮助与合作。,1, 29,嫉妒,11;23,你对在修为、外貌或财富等方面远超于你的人容易产生敌意，更倾向对其冷淡、挑衅或打压。,1, -30,穿越者,,你来自现代社会，怀念现代社会的一切，你的思考（thinking）必须是现代化的思考,1000, \ No newline at end of file +30,穿越者,,你来自现代社会，怀念现代社会的一切，你的思考（thinking）必须是现代化的思考,1, \ No newline at end of file diff --git a/static/game_configs/sect.csv b/static/game_configs/sect.csv index 3bc3ea9..a01c049 100644 --- a/static/game_configs/sect.csv +++ b/static/game_configs/sect.csv @@ -1,6 +1,6 @@ id,name,desc,member_act_style,alignment,sect_surnames,male_sect_given_names,female_sect_given_names,weight,effects ,,宗门名称与描述,宗门成员行事风格,阵营(正/中/邪),宗门常用姓氏(分号分隔),男性常用名(分号分隔),女性常用名(分号分隔),权重(默认1),effects(JSON) -1,明心剑宗,通玄界东方第一宗，以无上剑道称雄于世。云纹禁制为不传心法。,清明克己，行止如一。重剑与心法并重，讲究明心见性。,正,明;心;剑;霄;玄;霁;衡;孤;徽;肃,澄川;宏石;磐岳;霆岱;寂岚;久安;宸秋;烁离;沧岳;砺锋;炎洲;远歌,采微;霏岚;韶华;绮澜;珠影;远岫;若水;凝香;雪瑶;南絮;轻萝;宛竹,1, +1,明心剑宗,通玄界东方第一宗，以无上剑道称雄于世。云纹禁制为不传心法。,清明克己，行止如一。重剑与心法并重，讲究明心见性。,正,明;心;剑;霄;玄;霁;衡;孤;徽;肃,澄川;宏石;磐岳;霆岱;寂岚;久安;宸秋;烁离;沧岳;砺锋;炎洲;远歌,采微;霏岚;韶华;绮澜;珠影;远岫;若水;凝香;雪瑶;南絮;轻萝;宛竹,1000, 2,百兽宗,以驯养灵兽闻名，豢养各种妖兽灵怪为战力。,你言语直接，重视力量与血性，崇尚狩猎与搏斗。,邪,,驼王;飞熊;虎魄;狼行;熊罡;白猿;石坚;山岚;青鬃;玄爪;金瞳;裂爪;破角;狂鬃;赤鬣;苍隼;啸风;裂岩,狐绮;白貂;青翎;雪牙;赤羽;玄狸;灵爪;月狐;银鳞;霜蹄;云貉;绒尾;锦狐;轻蹄,1, 3,水镜宗,正道十宗之一，实则严守中立。拥有仙界异宝"彻天水镜"可预知未来。,你处事冷静圆融，喜以柔克刚，擅借力与反制。,中,水;镜;寒;霜;冰;清;沐;澜;渊;泉,涟光;沧浪;泽远;浩川;泊舟;涓石;溪原;涵舟;泠曜;漪岑;淞岳;涔雨,漫霖;洛漪;潋月;涵烟;沁波;翠波;漫葭;汀兰;潭歌;涓玥;澧宁;潇然,1, 4,冥王宗,行走幽冥之道，术法阴冷狠厉。,你言辞冷厉少情，敬畏因果而不惧杀伐，偏向效率与结果。,邪,冥;王;玄;幽;夜;白;冷;狱;魇;阴,血燎;焚魄;灰灭;殁川;绝尘;厌离;朔寒;邪风;归墟;朽骨;朔月;止戈,寒绫;霜瑶;凄歌;素鸢;祭宁;黛魂;夙梦;绫雪;凛珑;霁月;旷音;凝岚,1, diff --git a/tools/img_gen/gen_img.py b/tools/img_gen/gen_img.py index 8962951..8741bb0 100644 --- a/tools/img_gen/gen_img.py +++ b/tools/img_gen/gen_img.py @@ -115,7 +115,7 @@ def save_generated_image(query: str, folder: str = "tools/img_gen/tmp/raw") -> s if __name__ == "__main__": - female_prompt_base = "一个好看的仙侠女性头像。只有头部和面部。二次元风格的漫画图片，略微Q版，正面看镜头。纯白背景。" + female_prompt_base = "一个好看的仙侠女性头像。只有头部和面部。二次元风格的漫画图片，略微Q版，正面看镜头。纯白背景。像素风格，细节别太多。" female_affixes = [ "紫色长发，表情嗔怒，带有一丝冷峻，有一个簪子。", "乌黑直发，眉心一点红砂，清冷淡漠，镶玉步摇。", @@ -134,7 +134,7 @@ if __name__ == "__main__": "湖绿挑染长发，狡黠微笑，狐耳发饰点缀。", "灰蓝长直发，平刘海，面无表情，银环头饰。", ] - male_prompt_base = "一个英俊的的仙侠男性头像。只有头部和面部。二次元风格的漫画图片，略微Q版，正面看镜头。纯白背景。" + male_prompt_base = "一个英俊的的仙侠男性头像。只有头部和面部。二次元风格的漫画图片，略微Q版，正面看镜头。纯白背景。像素风格，细节别太多。" male_affixes = [ "乌发高束，剑眉星目，气质冷峻，青玉发冠。", "银白长发，淡笑从容，额间玄纹，流苏头箍。",