diff --git a/apps/core/character/offline/character.js b/apps/core/character/offline/character.js
index 3d24fa907b..9008107937 100644
--- a/apps/core/character/offline/character.js
+++ b/apps/core/character/offline/character.js
@@ -1,26 +1,11 @@
const characters = {
- sm_shen_sunquan: {
- sex: "male",
- group: "shen",
- hp: 0,
- maxHp: 10,
- skills: ["smshenjiang", "smshengshou", "smshifeng"],
- isUnseen: true,
- },
- sm_mo_sunquan: {
- sex: "male",
- group: "devil",
- hp: 0,
- maxHp: 3,
- skills: ["smmobian", "smyanshi", "smpoyu"],
- isUnseen: true,
- },
sm_shenmo_sunquan: {
sex: "male",
group: "shen",
hp: 6,
skills: ["smsibian", "smqihua", "smdue"],
doubleGroup: ["shen", "devil"],
+ groupBorder: "devil",
},
pe_liuhui: {
sex: "male",
diff --git a/apps/core/character/offline/characterTitle.js b/apps/core/character/offline/characterTitle.js
index f0ba01ec9e..cd7e447643 100644
--- a/apps/core/character/offline/characterTitle.js
+++ b/apps/core/character/offline/characterTitle.js
@@ -1,7 +1,5 @@
export default {
sm_shenmo_sunquan: "一念神魔",
- sm_mo_sunquan: "魔睨东吴",
- sm_shen_sunquan: "神权帝胄",
pe_liuhui: "周天古率",
pe_baiqi: "大良造",
pe_huamulan: "孝烈巾帼",
diff --git a/apps/core/character/offline/index.js b/apps/core/character/offline/index.js
index 46270259c7..ef1c18fafd 100644
--- a/apps/core/character/offline/index.js
+++ b/apps/core/character/offline/index.js
@@ -30,6 +30,10 @@ game.import("character", function () {
shinin_lvlingqi: [["awaken_shinin_lvlingqi", []]],
shinin_dongwan: [["awaken_shinin_dongwan", []]],
zc26_sp_xushi: [["zc26_sp_xushi_shadow", ["die:xushi"]]],
+ sm_shenmo_sunquan: [
+ ["sm_shen_sunquan", []],
+ ["sm_mo_sunquan", []],
+ ],
},
dynamicTranslate: { ...dynamicTranslates },
characterIntro: { ...characterIntros },
diff --git a/apps/core/character/offline/skill.js b/apps/core/character/offline/skill.js
index 34ada9c86f..a2e14543f8 100644
--- a/apps/core/character/offline/skill.js
+++ b/apps/core/character/offline/skill.js
@@ -19,15 +19,19 @@ const skills = {
player.awakenSkill(event.name);
const num = player.getHp();
if (player.getHp() % 2 == 1 && player.countMark("smqihua_shen") > player.countMark("smqihua_mo")) {
- player.init("sm_shen_sunquan");
- player.markSkill("smqihua_shen");
+ player.changeSkin({ characterName: "sm_shenmo_sunquan" }, "sm_shen_sunquan");
+ await player.changeSkills(["smshenjiang", "smshengshou", "smshifeng"], ["smsibian", "smqihua", "smdue"]);
+ await player.changeGroup("shen");
+ player.maxHp = 10;
const next = game.createEvent("SmhuashenAfter", false);
next.player = player;
next.num = num;
next.setContent("emptyEvent");
} else {
- player.init("sm_mo_sunquan");
- player.markSkill("smqihua_mo");
+ player.changeSkin({ characterName: "sm_shenmo_sunquan" }, "sm_mo_sunquan");
+ await player.changeSkills(["smmobian", "smyanshi", "smpoyu"], ["smsibian", "smqihua", "smdue"]);
+ await player.changeGroup("devil");
+ player.maxHp = 3;
const next = game.createEvent("SmrumoAfter", false);
next.player = player;
next.num = num;
diff --git a/apps/core/character/offline/sort.js b/apps/core/character/offline/sort.js
index 0d889f07df..3a1028f1da 100644
--- a/apps/core/character/offline/sort.js
+++ b/apps/core/character/offline/sort.js
@@ -11,7 +11,7 @@ const characterSort = {
offline_piracyE_jb: ["pe_jun_caopi", "pe_jun_liushan", "pe_jun_sunquan", "pe_jun_liuxie", "pe_jun_liuhong", "pe_jun_liubei", "pe_jun_caocao", "pe_jun_sunce", "pe_jun_yuanshao", "pe_jun_zhangjiao"],
offline_piracyE_hl: ["hl_shen_lvbu", "hl_shen_zhouyu", "hl_shen_lvmeng", "hl_shen_zhugeliang", "hl_shen_guanyu"],
offline_piracyE: ["xia_caopi", "pe_xiahouxuan", "pe_guozhao", "pe_que", "yj_zhouji", "yj_ehuan", "yj_tianchuan", "yj_zhonghui", "yj_jiling", "yj_yongkai", "yj_chezhou", "yj_caocaoyuanshao", "pe_lishimin", "pe_xiahoulan", "pe_yangyuhuan", "pe_huamulan", "pe_liuhui", "pe_baiqi"],
- offline_piracyE_shenmo: ["sm_shenmo_sunquan", "sm_shen_sunquan", "sm_mo_sunquan"],
+ offline_piracyE_shenmo: ["sm_shenmo_sunquan"],
offline_piracyS: ["ns_jiaxu", "longyufei", "ps_guanyu", "ps1059_guojia", "ps2070_guojia", "ps2063_zhaoyun", "ps2067_zhaoyun", "ps1062_zhouyu", "ps2080_zhouyu", "ps_caozhi", "ps_jin_simayi", "ps_caopi", "ps_simayi", "ps2068_simayi", "ps_machao", "ps_zhugeliang", "ps2066_zhugeliang", "ps_jiaxu", "ps_lvbu", "jsp_liubei"],
offline_piracyK: ["pk_sp_duyu"],
offline_vtuber: ["vtb_xiaosha", "vtb_xiaoshan", "vtb_xiaotao", "vtb_xiaole", "vtb_xiaojiu"],
diff --git a/apps/core/character/offline/translate.js b/apps/core/character/offline/translate.js
index 76b29e7ecf..3a11019b2c 100644
--- a/apps/core/character/offline/translate.js
+++ b/apps/core/character/offline/translate.js
@@ -5,15 +5,15 @@ const translates = {
sm_shenmo_sunquan_prefix: "PE|神|魔",
smsibian: "俟变",
smsibian_info: `觉醒技,回合开始时,若你的体力值为奇数且“神格”多于“魔心”,你${get.poptip({
- id: "character_sm_shen_sunquan",
+ id: "smsibian_huashen",
name: "化神",
+ info: `
失去技能${get.poptip("smsibian")}、${get.poptip("smqihua")}和${get.poptip("smdue")}
获得技能${get.poptip("smshenjiang")}、${get.poptip("smshengshou")}和${get.poptip("smshifeng")}
调整体力上限为10`,
type: "character",
- dialog: "characterDialog",
})};若你的体力值为偶数且“魔心”多于”神格”,你${get.poptip({
- id: "character_sm_mo_sunquan",
+ id: "smsibian_rumo",
name: "入魔",
+ info: `
失去技能${get.poptip("smsibian")}、${get.poptip("smqihua")}和${get.poptip("smdue")}
获得技能${get.poptip("smmobian")}、${get.poptip("smyanshi")}和${get.poptip("smpoyu")}
调整体力上限为3`,
type: "character",
- dialog: "characterDialog",
})}。`,
smqihua: "启化",
smqihua_info: "每回合每项限一次。当其他角色受到伤害时,你可以失去等量体力防止之并获得等量“神格”;当你受到伤害时,你可以获得等量“魔心”并令一名其他角色失去等量体力。",
diff --git a/apps/core/character/rank.js b/apps/core/character/rank.js
index 7d74d6e58c..5fb342e81d 100644
--- a/apps/core/character/rank.js
+++ b/apps/core/character/rank.js
@@ -9,8 +9,6 @@ window.noname_character_rank = {
"sp_sm_shen_machao",
"dc_shen_sunquan",
"sm_shenmo_sunquan",
- "sm_shen_sunquan",
- "sm_mo_sunquan",
"tw_jsrg_sunjian",
"shinin_zhenji",
"shinin_wuguotai",
@@ -2384,8 +2382,6 @@ window.noname_character_rank = {
"zc26_shen_huangyueying",
"dc_shen_sunquan",
"sm_shenmo_sunquan",
- "sm_shen_sunquan",
- "sm_mo_sunquan",
"lord_goblin",
"scl_jiaxu",
"mb_cuilingyi",
diff --git a/apps/core/character/replace.js b/apps/core/character/replace.js
index 5aaa1ec728..560f0d5c1e 100644
--- a/apps/core/character/replace.js
+++ b/apps/core/character/replace.js
@@ -11,7 +11,7 @@ window.noname_character_replace = {
shen_lvmeng: ["shen_lvmeng", "tw_shen_lvmeng", "hl_shen_lvmeng"],
shen_machao: ["shen_machao", "ps_shen_machao", "wn_shen_machao", "mark_shen_machao", "sm_shen_machao", "sp_sm_shen_machao", "mb_shen_machao"],
shen_simayi: ["shen_simayi", "xin_simayi", "new_simayi"],
- shen_sunquan: ["shen_sunquan", "junk_sunquan", "dc_shen_sunquan", "sm_shenmo_sunquan", "sm_shen_sunquan", "sm_mo_sunquan"],
+ shen_sunquan: ["shen_sunquan", "junk_sunquan", "dc_shen_sunquan", "sm_shenmo_sunquan"],
shen_xuzhu: ["shen_xuzhu", "wn_shen_xuzhu"],
shen_zhangfei: ["shen_zhangfei", "ty_shen_zhangfei"],
shen_zhangliao: ["dc_shen_zhangliao", "ol_zhangliao", "shen_zhangliao"],
diff --git a/apps/core/character/yijiang/skill.js b/apps/core/character/yijiang/skill.js
index 57e03d5f74..5008fd426e 100644
--- a/apps/core/character/yijiang/skill.js
+++ b/apps/core/character/yijiang/skill.js
@@ -2734,6 +2734,7 @@ const skills = {
return coeff * get.attitude(player, target);
},
})
+ .set("coeff", num1 >= num2 ? 1 : -1)
.forResult();
event.result.cost_data = {
@@ -2760,7 +2761,7 @@ const skills = {
.forResult();
if (result?.cards?.length > 0 && result.autochoose && result.cards?.length === result.rawcards?.length) {
- player.clearMarkMark("xinjiexun", false);
+ player.clearMark("xinjiexun", false);
player.addSkill("funan_jiexun");
}
}