diff --git a/card/yongjian.js b/card/yongjian.js
index 4209a7f77..c9c5dc9dd 100644
--- a/card/yongjian.js
+++ b/card/yongjian.js
@@ -486,7 +486,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
}
return event.card2.name=='du';
}
- if(event.name!='equip'&&event.name!='addJudge'&&!event.visible) return false;
+ if(event.name!='equip'&&!event.visible) return false;
var evt=event.getl(player);
if(!evt||!evt.hs||!evt.hs.filter(function(i){
return get.name(i,player)=='du';
diff --git a/character/clan.js b/character/clan.js
index e486df68b..6a998d880 100644
--- a/character/clan.js
+++ b/character/clan.js
@@ -1059,7 +1059,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var owner=_status.event.getParent().owner;
if(owner) owner.$throw(card.cards);
});
- if(card.name!=cardx.name||!get.is.sameNature(card,cardx)) next.viewAs=true;
+ if(card.name===cardx.name&&get.is.sameNature(card,cardx,true)) next.viewAs=false;
var owner=get.owner(card);
if(owner!=player&&get.position(card)=='h'){
next.throw=false;
diff --git a/character/huicui.js b/character/huicui.js
index 2a0d86b01..1522aed34 100644
--- a/character/huicui.js
+++ b/character/huicui.js
@@ -127,32 +127,32 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
async content(event,trigger,player){
await player.showHandcards(get.translation(player)+'发动了【抚黎】');
+ const getNum=(type)=>{
+ let num=['basic','trick','equip'].indexOf(type);
+ if(num===-1) num=3;
+ return num;
+ };
const types=player.getDiscardableCards(player,'h').filter(card=>{
return !player.getStorage('dcfuli').includes(get.type2(card));
}).reduce((list,card)=>list.add(get.type2(card)),[]).sort((a,b)=>{
- const getNum=(type)=>{
- let num=['basic','trick','equip'].indexOf(type);
- if(num==-1) num=3;
- return num;
- };
return getNum(a)-getNum(b);
});
if(types.length){
const {result:{control}}=await player.chooseControl(types).set('ai',()=>{
const player=get.event('player'),types=get.event('controls').slice();
- return types.sort((a,b)=>{
- const getNum=(type)=>{
- const cards=player.getDiscardableCards(player,'h').filter(card=>get.type2(card)==type);
- const countCards=(target,player,cards)=>{
- return target.countCards('h')-(target==player?cards.length:0);
- };
- const max=game.findPlayer(target=>{
- return !game.hasPlayer(target2=>{
- return countCards(target2,player,cards)>countCards(target,player,cards);
- });
- }).countCards('h');
- return Math.min(max,cards.reduce((sum,card)=>sum+get.cardNameLength(card),0))/cards.length;
+ const getNum=(type)=>{
+ const cards=player.getDiscardableCards(player,'h').filter(card=>get.type2(card)==type);
+ const countCards=(target,player,cards)=>{
+ return target.countCards('h')-(target==player?cards.length:0);
};
+ const max=game.findPlayer(target=>{
+ return !game.hasPlayer(target2=>{
+ return countCards(target2,player,cards)>countCards(target,player,cards);
+ });
+ }).countCards('h');
+ return Math.min(max,cards.reduce((sum,card)=>sum+get.cardNameLength(card),0))/cards.length;
+ };
+ return types.sort((a,b)=>{
return getNum(b)-getNum(a);
})[0];
}).set('prompt','弃置一种类别的所有手牌，然后摸这些牌的名字字数之和的牌');
@@ -177,7 +177,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.line(target);
target.addSkill('dcfuli_range');
target.addMark('dcfuli_range',1,false);
- player.when('phaseBegin').then(()=>{
+ player.when(['phaseBegin','dieBegin']).then(()=>{
target.removeMark('dcfuli_range',1,false);
if(!target.hasMark('dcfuli_range')) target.removeSkill('dcfuli_range');
}).vars({target:target});
@@ -226,12 +226,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){
forced:true,
async content(event,trigger,player){
const list=lib.inpile.filter(name=>{
- if(name=='shandian') return false;
+ if(get.type(name)==='delay') return false;
const card=new lib.element.VCard({name:name});
return get.tag(card,'damage')&&player.hasUseTarget(card);
});
if(list.length){
- const {result:{bool,links}}=await player.chooseButton(['###德化###视为使用一张仍可以使用的伤害类卡牌
',[list,'vcard']],true).set('ai',button=>get.event('player').getUseValue({name:button.link[2]},null,true));
+ const {result:{bool,links}}=await player.chooseButton(['###德化###视为使用一张仍可以使用的伤害类卡牌
',[list,'vcard']],true).set('ai',button=>{
+ const name=button.link[2],player=get.player();
+ let value=player.getUseValue({name,isCard:true},null,true);
+ if(player.countCards('h',card=>get.name(card)===name&&player.hasUseTarget(card))) value/=3;
+ if(name==='sha') value/=2;
+ if(player.getStorage('dcdehua').includes('sha')) value=Math.max(0.1,value);
+ return value;
+ });
if(bool){
const name=links[0][2],card=new lib.element.VCard({name:name});
await player.chooseUseTarget(card,true);
@@ -239,7 +246,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
}
if(!lib.inpile.some(name=>{
- if(name=='shandian') return false;
+ if(get.type(name)==='delay') return false;
const card=new lib.element.VCard({name:name});
return get.tag(card,'damage')&&!player.getStorage('dcdehua').includes(name);
})) player.removeSkillLog('dcdehua');
@@ -11618,6 +11625,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
gaoxiang:['gaoxiang','jsrg_gaoxiang'],
lingcao:['lingcao','dc_lingcao'],
sp_menghuo:['sp_menghuo','dc_sp_menghuo'],
+ sunchen:['dc_sunchen','ps_sunchen'],
},
translate:{
re_panfeng:'潘凤',
@@ -12105,9 +12113,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dcshoucheng_info:'一名角色于其回合外失去最后的手牌后，你可令其摸两张牌。',
dc_liuli:'刘理',
dcfuli:'抚黎',
- dcfuli_info:'出牌阶段，你可以展示手牌并弃置一种类别的所有手牌（每种类别每回合限一次），然后摸X张牌（X为这些卡牌的牌名字数和且X至多为场上手牌数最多的角色的手牌数）。若你因此弃置了伤害类卡牌，则你可以选择一名角色，令其攻击范围-1直到你的下个回合开始。',
+ dcfuli_info:'出牌阶段，你可以展示手牌并弃置一种类别的所有手牌（每种类别每回合限一次），然后摸X张牌（X为这些牌的牌名字数和且X至多为场上手牌数最多的角色的手牌数）。若你因此弃置了伤害类卡牌，则你可以选择一名角色，令其攻击范围-1直到你的下个回合开始。',
dcdehua:'德化',
- dcdehua_info:'锁定技，一轮游戏开始时，若你有可以使用的伤害类牌牌名，你选择其中一个牌名并视为使用之，然后你不能从手牌中使用此牌名的牌，然后若你已选择过所有的伤害类牌牌名，你失去〖德化〗。',
+ dcdehua_info:'锁定技。①一轮游戏开始时，若有你可以使用的非延时类伤害类牌的牌名，你选择其中一个并视为使用之，然后你不能从手牌中使用此牌名的牌，然后若你已选择过所有的伤害类牌牌名，你失去〖德化〗。②你的手牌上限+Y（Y为你〖德化①〗选择过的牌名数）。',
sp_baigei:'无双上将',
sp_caizijiaren:'才子佳人',
diff --git a/character/jsrg.js b/character/jsrg.js
index 753c2b1e4..898a66ee5 100644
--- a/character/jsrg.js
+++ b/character/jsrg.js
@@ -1045,6 +1045,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return `令${get.translation(event.card)}不计入次数限制，且你获得${get.translation(event.target)}一张牌，然后其可以令你本回合至其的距离+2`;
},
group:'jsrgeqian_prepare',
+ logTarget:'target',
async content(event,trigger,player){
if(trigger.addCount!==false){
trigger.addCount=false;
@@ -1071,14 +1072,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
direct:true,
async content(event,trigger,player){
- while(true){
+ while(player.countCards('h')>0){
const {result:{bool,cards}}=await player.chooseCard(get.prompt('jsrgeqian'),'你可以蓄谋任意次').set('ai',card=>{
const player=get.player();
if(player.hasValueTarget(card)) return player.getUseValue(card);
return 0;
});
if(!bool) break;
- player.addJudge({name:'xumou_jsrg'},cards);
+ await player.addJudge({name:'xumou_jsrg'},cards);
}
},
},
diff --git a/character/rank.js b/character/rank.js
index e6de52211..9b185d256 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -368,7 +368,7 @@ window.noname_character_rank={
'shen_lusu',
],
am:[
- 'bailingjun',
+ 'bailingyun',
'clan_wuqiao',
'muludawang',
'diy_caiwenji',
@@ -2143,7 +2143,7 @@ window.noname_character_rank={
'ol_sb_jiangwei',
'dc_sb_zhouyu',
'xia_shitao',
- 'bailingjun',
+ 'bailingyun',
],
rare:[
'zhugemengxue',
diff --git a/character/shenhua.js b/character/shenhua.js
index 8762ece9a..2b72fe1b8 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -7726,22 +7726,22 @@ game.import('character',function(lib,game,ui,get,ai,_status){
sp_zhugeliang:['sp_zhugeliang','ol_sp_zhugeliang','re_sp_zhugeliang','sb_sp_zhugeliang'],
pangtong:['pangtong','ol_pangtong','re_pangtong','sb_pangtong'],
re_jsp_pangtong:['re_jsp_pangtong','jsrg_pangtong','sp_pangtong'],
- taishici:['taishici','re_taishici'],
+ taishici:['taishici','re_taishici','ol_sb_taishici'],
re_yuanshao:['re_yuanshao','ol_yuanshao','xin_yuanshao','sb_yuanshao'],
pangde:['re_pangde','ol_pangde','pangde'],
yanwen:['yanwen','ol_yanwen','re_yanwen'],
caopi:['caopi','re_caopi','ps_caopi','sb_caopi'],
xuhuang:['re_xuhuang','ol_xuhuang','sb_xuhuang','xuhuang'],
- menghuo:['menghuo','re_menghuo','sb_menghuo'],
+ menghuo:['menghuo','re_menghuo','sb_menghuo','tw_menghuo'],
zhurong:['zhurong','ol_zhurong','re_zhurong','sb_zhurong'],
sunjian:['sunjian','ol_sunjian','re_sunjian'],
jiaxu:['jiaxu','re_jiaxu','ns_jiaxu','ps_jiaxu'],
dongzhuo:['dongzhuo','ol_dongzhuo','re_dongzhuo','sp_dongzhuo','yj_dongzhuo'],
dengai:['dengai','ol_dengai','re_dengai'],
sp_ol_zhanghe:['sp_ol_zhanghe','yj_zhanghe','sp_zhanghe','jsrg_zhanghe'],
- jiangwei:['jiangwei','ol_jiangwei','re_jiangwei','sb_jiangwei','jsrg_jiangwei'],
+ jiangwei:['jiangwei','ol_jiangwei','re_jiangwei','ol_sb_jiangwei','sb_jiangwei','jsrg_jiangwei'],
liushan:['liushan','ol_liushan','re_liushan'],
- sunce:['sunce','re_sunce','re_sunben','sb_sunce'],
+ sunce:['sunce','re_sunce','re_sunben','sb_sunce','dc_sunce'],
zhangzhang:['zhangzhang','ol_zhangzhang','re_zhangzhang'],
zuoci:['zuoci','re_zuoci'],
caiwenji:['caiwenji','ol_caiwenji','re_caiwenji'],
diff --git a/character/shiji.js b/character/shiji.js
index dffeeefcd..da6e942c0 100644
--- a/character/shiji.js
+++ b/character/shiji.js
@@ -6532,7 +6532,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
qiaogong:['qiaogong','tw_qiaogong'],
sp_chendong:['sp_chendong','tw_chendong','chendong'],
sp_jiangqing:['sp_jiangqing','tw_jiangqing','jiangqing'],
- kongrong:['sp_kongrong','jsrg_kongrong','kongrong','zy_kongrong'],
+ kongrong:['dc_kongrong','sp_kongrong','jsrg_kongrong','kongrong'],
dc_mifuren:['dc_mifuren','sp_mifuren'],
},
translate:{
diff --git a/character/sp.js b/character/sp.js
index 3f98f4ece..3b4d63777 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -724,7 +724,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return storage.some(target=>event.getg(target).length)&&storage.some(target=>target.hasCard(card=>lib.filter.canBeGained(card,target,player),'he'));
}
if(!game.hasPlayer(target=>!storage.includes(target)&&target!=player)) return false;
- if(event.name=='damage'&&player.getHistory('damage').indexOf(event)!=0) return false;
+ if(event.name=='damage'&&player.getAllHistory('damage').indexOf(event)!=0) return false;
return event.name!='phase'||game.phaseNumber==0;
},
forced:true,
@@ -755,6 +755,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
subSkill:{used:{charlotte:true}},
intro:{content:'已选择$为目标'},
+ ai:{
+ expose:0.3,
+ },
},
olchongshen:{
audio:2,
@@ -7059,8 +7062,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
else{
event.cancel();
- event.getParent().set('olbixin',true);
+ // event.getParent().set('olbixin',true);
event.getParent().goto(0);
+ delete event.getParent().openskilldialog;
}
},
}
@@ -25999,7 +26003,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
huangchengyan:['huangchengyan','dc_huangchengyan'],
puyuan:['ol_puyuan','puyuan'],
huangzu:['huangzu','dc_huangzu'],
- huojun:['huojun','dc_huojun','tw_huojun'],
+ huojun:['huojun','dc_huojun','xin_huojun','tw_huojun'],
zhaoyǎn:['zhaoyǎn','dc_zhaoyǎn'],
furong:['ol_furong','furong','tw_furong'],
daxiaoqiao:['daxiaoqiao','dc_daxiaoqiao','tw_daxiaoqiao'],
diff --git a/character/sp2.js b/character/sp2.js
index 3a715434b..dd945bd38 100644
--- a/character/sp2.js
+++ b/character/sp2.js
@@ -9961,7 +9961,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.directindex=result.index;
}
if(event.directindex==1){
- target.chooseUseTarget({name:'sha'},cards,true,false).viewAs=true;
+ target.chooseUseTarget({name:'sha'},cards,true,false).viewAs=false;
}
else{
target.chooseUseTarget(card,true,false,'nodistance');
diff --git a/character/standard.js b/character/standard.js
index 41b349e7f..787ea2253 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -2340,13 +2340,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
sp_zhangliao:['sp_zhangliao','yj_zhangliao','jsrg_zhangliao'],
xiahoudun:['xiahoudun','re_xiahoudun','xin_xiahoudun'],
liubei:['liubei','re_liubei','sb_liubei','dc_liubei','junk_liubei'],
- guanyu:['guanyu','re_guanyu','ps_guanyu','old_guanyu'],
+ guanyu:['guanyu','re_guanyu','ol_sb_guanyu','sb_guanyu','ps_guanyu','old_guanyu'],
zhangfei:['zhangfei','re_zhangfei','old_zhangfei','xin_zhangfei','sb_zhangfei','tw_zhangfei','jsrg_zhangfei','yj_zhangfei'],
zhaoyun:['zhaoyun','re_zhaoyun','old_zhaoyun','sb_zhaoyun','jsrg_zhaoyun','ps2063_zhaoyun','ps2067_zhaoyun'],
sp_zhaoyun:['sp_zhaoyun','jsp_zhaoyun'],
machao:['machao','re_machao','sb_machao','ps_machao'],
sp_machao:['sp_machao','dc_sp_machao','jsrg_machao','old_machao'],
- zhugeliang:['zhugeliang','re_zhugeliang','sb_zhugeliang','jsrg_zhugeliang','ps2066_zhugeliang','ps_zhugeliang'],
+ zhugeliang:['zhugeliang','re_zhugeliang','sb_zhugeliang','ps2066_zhugeliang','ps_zhugeliang'],
huangyueying:['huangyueying','re_huangyueying','junk_huangyueying','sb_huangyueying'],
sunquan:['sunquan','re_sunquan','sb_sunquan','dc_sunquan'],
zhouyu:['zhouyu','re_zhouyu','sb_zhouyu','ps1062_zhouyu','ps2080_zhouyu'],
diff --git a/character/xianding.js b/character/xianding.js
index 61694bacc..d59f784fd 100644
--- a/character/xianding.js
+++ b/character/xianding.js
@@ -5,7 +5,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
connect:true,
character:{
zhugemengxue:['female','wei',3,['dcjichun','dchanying']],
- bailingjun:['female','wei',3,['dclinghui','dcxiace','dcyuxin']],
+ bailingyun:['female','wei',3,['dclinghui','dcxiace','dcyuxin']],
dc_qinghegongzhu:['female','wei',3,['dczhangji','dczengou']],
caoxian:['female','wei',3,['dclingxi','dczhifou']],
dc_sb_zhouyu:['male','wu',4,['dcsbronghuo','dcsbyingmou']],
@@ -103,7 +103,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
sp2_jinse:['caojinyu','re_sunyi','re_fengfangnv','caohua','laiyinger','zhangfen','zhugeruoxue','caoxian','dc_qinghegongzhu','zhugemengxue'],
sp2_yinyu:['zhouyi','luyi','sunlingluan','caoyi'],
sp2_wangzhe:['dc_daxiaoqiao','dc_sp_machao'],
- sp2_doukou:['re_xinxianying','huaman','xuelingyun','dc_ruiji','duanqiaoxiao','tianshangyi','malingli','bailingjun'],
+ sp2_doukou:['re_xinxianying','huaman','xuelingyun','dc_ruiji','duanqiaoxiao','tianshangyi','malingli','bailingyun'],
sp2_jichu:['zhaoang','dc_liuye','dc_wangyun','yanghong','huanfan','xizheng'],
sp2_yuxiu:['dongguiren','dc_tengfanglan','zhangjinyun','zhoubuyi','dc_xujing'],
sp2_qifu:['dc_guansuo','xin_baosanniang','dc_zhaoxiang'],
@@ -3207,7 +3207,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.reinit('ganfurenmifuren',character,false);
'step 2'
player.recover(1-player.hp);
- player.addTempSkill('dcxunbie_muteki');
+ player.addTempSkill('dcxunbie_muteki',{player:'phaseAfter'});
},
subSkill:{
muteki:{
@@ -3220,7 +3220,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger.cancel();
},
mark:true,
- intro:{content:'防止本回合受到的所有伤害'},
+ intro:{content:'防止受到的所有伤害直到我的回合结束'},
ai:{
nofire:true,
nothunder:true,
@@ -6059,6 +6059,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger.finish();
trigger.untrigger(true);
trigger._triggered=5;
+ game.players.slice().concat(game.dead).forEach(current=>{
+ current.getHistory().isSkipped=true;
+ current.getStat().isSkipped=true;
+ });
var evt=player.insertPhase();
delete evt.skill;
game.broadcastAll(function(player){
@@ -6140,18 +6144,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dczhanmeng:{
audio:2,
trigger:{player:'useCard'},
- filter:function(event,player){
+ filter(event,player){
return !player.hasSkill('dczhanmeng_choice1')||!player.hasSkill('dczhanmeng_choice2')||
!player.hasSkill('dczhanmeng_choice0')&&!game.hasPlayer2(current=>{
- var history=current.actionHistory;
+ const history=current.actionHistory;
if(history.length<2) return false;
- var list=history[history.length-2].useCard.map(evt=>evt.card.name);
- if(list.includes(event.card.name)) return true;
+ for(let i=history.length-2;i>=0;i--){
+ if(history[i].isSkipped) continue;
+ const list=history[i].useCard.map(evt=>evt.card.name);
+ return list.includes(event.card.name);
+ }
return false;
- });
+ },true);
},
direct:true,
- content:function(){
+ content(){
'step 0'
var list=[];
var choiceList=[
@@ -6162,10 +6169,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var used=game.hasPlayer2(current=>{
var history=current.actionHistory;
if(history.length<2) return false;
- var list=history[history.length-2].useCard.map(evt=>evt.card.name);
- if(list.includes(trigger.card.name)) return true;
+ for(let i=history.length-2;i>=0;i--){
+ if(history[i].isSkipped) continue;
+ const list=history[i].useCard.map(evt=>evt.card.name);
+ return list.includes(trigger.card.name);
+ }
return false;
- });
+ },true);
if(!player.hasSkill('dczhanmeng_choice0')&&!used) list.push('选项一');
else choiceList[0]=''+choiceList[0]+(used?'（同名牌被使用过）':'（已选择）')+'';
if(!player.hasSkill('dczhanmeng_choice1')) list.push('选项二');
@@ -6244,7 +6254,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
charlotte:true,
forced:true,
popup:false,
- filter:function(event,player,name){
+ silent:true,
+ filter(event,player,name){
var history=player.actionHistory;
if(history.length<2) return false;
var list=history[history.length-2].useCard;
@@ -6258,7 +6269,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
return false;
},
- content:function(){
+ content(){
if(event.triggername!='phaseBeginStart'){
player.logSkill('dczhanmeng_delay');
var card=get.cardPile2(card=>{
@@ -7006,7 +7017,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
global:'phaseBegin',
},
filter:function(event,player){
- return event.player.phaseNumber==1&&lib.skill.dctongguan.derivation.some(i=>{
+ return event.player.getAllHistory().filter(history=>{
+ return history.isMe&&!history.isSkipped;
+ }).indexOf(event.player.getHistory())===0&&lib.skill.dctongguan.derivation.some(i=>{
return (player.getStorage('dctongguan')[i]||0)<2;
});
},
@@ -13739,7 +13752,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
characterIntro:{
- bailingjun:'柏灵筠，女，是电视剧《大军师司马懿之军师联盟》、《虎啸龙吟》中的主要角色之一，由张钧甯饰演。20岁，是曹丕赏赐司马懿的美人，也是曹丕的眼线，被送入司马府中为妾室。柔弱美貌、心机极深。',
+ bailingyun:'柏灵筠，女，是电视剧《大军师司马懿之军师联盟》、《虎啸龙吟》中的主要角色之一，由张钧甯饰演。20岁，是曹丕赏赐司马懿的美人，也是曹丕的眼线，被送入司马府中为妾室。柔弱美貌、心机极深。',
caoxian:'曹宪（生卒年不详），女，沛国谯县（今安徽省亳州市）人。东汉末年历史人物，汉献帝刘协嫔妃，魏武帝曹操女儿。建安十八年，嫁给汉献帝刘协，受封为贵人。黄初元年（220年），兄弟曹丕称帝后，汉献帝成为山阳公，不知所终。',
zhangjian:'张臶（136年－240年），字子明，钜鹿人。汉末三国时期隐士、音乐家，精通谶纬之学。张臶生活的年代从东汉一直到曹魏齐王时期，受到朝廷多次征召，一直回避，不愿做官。他活了一百零五岁，是三国时期有可靠记载的最长寿的人之一。',
puyuan:'蒲元是三国时蜀汉杰出的工匠。为诸葛亮造刀三千口，并且制作木牛流马。后来姜维为他写过两部传记《蒲元传》《蒲元别传》。',
@@ -14305,7 +14318,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dcchanjuan:'婵娟',
dcchanjuan_info:'每种牌名限两次。当你使用手牌中仅指定单一目标的【杀】或普通锦囊牌结算结束后，你可以视为使用一张名称和属性均相同的牌。若这两张牌指定的目标完全相同，你摸一张牌。',
dcxunbie:'殉别',
- dcxunbie_info:'限定技。当你进入濒死状态时，你可以将此武将牌替换为“甘夫人”或“糜夫人”（不能选择已在场上的武将）。然后回复至1点体力并防止所有伤害直到当前回合结束。',
+ dcxunbie_info:'限定技。当你进入濒死状态时，你可以将此武将牌替换为“甘夫人”或“糜夫人”（不能选择已在场上的武将）。然后回复至1点体力并防止所有伤害直到你的下一个回合结束。',
dc_mifuren:'糜夫人',
dcguixiu:'闺秀',
dcguixiu_info:'锁定技。①回合开始时，若你于本局游戏未发动过〖闺秀①〗，你摸两张牌。②当你发动〖存嗣〗后，你回复1点体力。',
@@ -14423,7 +14436,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dczhangji_info:'锁定技，一名角色使用多目标牌时，若你是此牌的目标之一，则你先结算此牌的效果，然后你摸X张牌（X为此牌的其他目标数）。',
dczengou:'谮构',
dczengou_info:'出牌阶段限一次，你可以将至多体力上限张牌称为“谮构”交给一名其他角色并摸等量张牌。若如此做，其下次体力值增加或使用牌结算完毕后，其展示所有手牌，然后失去Y点体力（Y为其手牌中的“谮构”牌数）。',
- bailingjun:'柏灵筠',
+ bailingyun:'柏灵筠',
dclinghui:'灵慧',
dclinghui_info:'一名角色的结束阶段，若当前回合角色为你或本回合有角色进入过濒死状态，则你可以观看牌堆顶的三张牌，然后你可以使用其中一张牌并获得剩余牌。',
dcxiace:'黠策',
diff --git a/game/pinyinjs.js b/game/pinyinjs.js
index 35d65b117..208209ad1 100644
--- a/game/pinyinjs.js
+++ b/game/pinyinjs.js
@@ -66,6 +66,7 @@ var pinyin_dict_polyphone = {
"库特莉亚芙卡": " kǎ",
"露娜": "lù ",
// 技能名
+ "重身": "chóng ",
"畜鸣": "chù ",
"聆乐": " yuè",
"没矢": "mò ",
diff --git a/image/character/sb_zhugeliang.jpg b/image/character/sb_zhugeliang.jpg
index 5cb970c1c..d53c7725e 100644
Binary files a/image/character/sb_zhugeliang.jpg and b/image/character/sb_zhugeliang.jpg differ
diff --git a/noname/library/element/content.js b/noname/library/element/content.js
index 3c2497162..aeb871633 100644
--- a/noname/library/element/content.js
+++ b/noname/library/element/content.js
@@ -1043,7 +1043,8 @@ export const Content = {
},
chooseUseTarget: function () {
'step 0';
- if (get.is.object(card) && !event.viewAs) card.isCard = true;
+ debugger
+ if (get.is.object(card) && event.viewAs === false) card.isCard = true;
if (cards && get.itemtype(card) != 'card') {
card = get.copy(card);
card.cards = cards.slice(0);
@@ -8118,6 +8119,7 @@ export const Content = {
},
addJudge: function () {
"step 0";
+ debugger
const cardName = typeof card == 'string' ? card : card.name , cardInfo = lib.card[cardName];
if (cards) {
var owner = get.owner(cards[0]);