player.hp;
+ },
+ async content(event,trigger,player){
+ player.recover(event.target.hp-player.hp);
+ if(!player.storage.jsrgzunwei) player.storage.jsrgzunwei=[];
+ player.storage.jsrgzunwei.add(2);
+ },
+ ai:{
+ order:10,
+ result:{
+ player:function(player,target){
+ return (Math.min(target.hp,player.maxHp)-player.hp);
+ },
+ },
+ },
+ },
+ ],
+ ai:{
+ order:10,
+ result:{
+ player:1,
+ },
+ },
+ subSkill:{
+ backup:{},
+ }
+ },
//江山如故·转
//404郭嘉
jsrgqingzi:{
@@ -935,7 +2803,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ai1:function(card){
var player=get.player();
var maxVal=5.5;
- if(get.name(card,false)=='ying'&&player.hasSkill('jsrgchuaxin')) maxVal-=3;
+ if(get.name(card,false)=='ying'&&player.hasSkill('jsrgchuanxin')) maxVal-=3;
return maxVal-get.value(card);
},
precontent:function(){
@@ -6329,6 +8197,94 @@ game.import('character',function(lib,game,ui,get,ai,_status){
jsrg_fanjiangzhangda_prefix:'转',
jsrgfushan:'负山',
jsrgfushan_info:'出牌阶段开始时,所有其他角色可以依次交给你一张牌并令你此阶段使用【杀】的次数上限+1。此阶段结束时,若你使用【杀】的次数未达到上限且此阶段以此法交给你牌的角色均存活,你失去2点体力,否则你将手牌摸至体力上限。',
+ jsrg_zhugeliang:'梦诸葛亮',
+ jsrg_zhugeliang_prefix:'梦',
+ jsrgwentian:'问天',
+ jsrgwentian_info:'①你可以将牌堆顶的牌当【无懈可击】/【火攻】使用,若此牌不为黑色/红色,〖问天〗于本回合失效。②每回合限一次。你的一个阶段开始时,你可以观看牌堆顶的五张牌,然后将其中一张牌交给一名其他角色,将其余牌以任意顺序置于牌堆顶或牌堆底。',
+ jsrgchushi:'出师',
+ jsrgchushi_info:'出牌阶段限一次。若你不为主公,你可以与主公议事。若结果为:红色,你与其各摸一张牌,若你与其手牌数之和小于7,重复此流程;黑色,当你于本轮内造成属性伤害时,此伤害+1。',
+ jsrgyinlve:'隐略',
+ jsrgyinlve_info:'每轮各限一次。当一名角色受到火焰/雷电伤害时,你可以防止此伤害,然后于当前回合结束后执行一个只有摸牌/弃牌阶段的回合。',
+ jsrg_jiangwei:'合姜维',
+ jsrg_jiangwei_prefix:'合',
+ jsrgjinfa:'矜伐',
+ jsrgjinfa_info:'出牌阶段限一次。你可以展示一张手牌,然后令所有体力上限不大于你的角色议事。若结果与此牌颜色:相同,你令其中至多两名角色将手牌摸至体力上限;不同,你获得两张【影】。然后若没有其他角色与你意见相同,你可以变更势力。',
+ jsrgfumou:'复谋',
+ jsrgfumou_info:'魏势力技。当你议事结算结束后,与你意见不同的角色本回合不能使用或打出与其意见颜色相同的牌,你可以将一张【影】当【出其不意】对一名与你意见不同的角色使用。',
+ jsrgxuanfeng:'选锋',
+ jsrgxuanfeng_info:'蜀势力技。你可以将一张【影】当无距离和次数限制的刺【杀】使用。',
+ jsrg_luxun:'合陆逊',
+ jsrg_luxun_prefix:'合',
+ jsrgyoujin:'诱进',
+ jsrgyoujin_info:'出牌阶段开始时,你可以与一名角色拼点,你与其本回合不能使用或打出点数小于自己拼点牌的手牌,且赢的角色视为对没赢的角色使用一张【杀】。',
+ jsrgdailao:'待劳',
+ jsrgdailao_info:'出牌阶段,若你没有可以使用的手牌,你可以展示所有手牌并摸两张牌,然后结束此回合。',
+ jsrgzhubei:'逐北',
+ jsrgzhubei_info:'锁定技。①当你对本回合受到过伤害的角色造成伤害时,此伤害+1。②你对本回合失去过最后手牌的角色使用牌无次数限制。',
+ jsrg_zhaoyun:'合赵云',
+ jsrg_zhaoyun_prefix:'合',
+ jsrglonglin:'龙临',
+ jsrglonglin_info:'其他角色于其出牌阶段内首次使用【杀】指定第一个目标后,你可以弃置一张牌令此【杀】无效,然后其可以视为对你使用一张【决斗】,你以此法造成伤害后,其本阶段不能再使用手牌。',
+ jsrgzhendan:'镇胆',
+ jsrgzhendan_info:'①你可以将一张非基本手牌当任意基本牌使用或打出。②当你受到伤害后,你摸X张牌并令该技能本轮失效(X为本轮所有角色执行过的回合数且至多为5)。③一轮游戏开始时,若上一轮该技能未因〖镇胆②〗失效过,你摸Y张牌(Y为上一轮所有角色执行过的回合数且至多为5)。',
+ jsrg_simayi:'合司马懿',
+ jsrg_simayi_prefix:'合',
+ jsrgyingshi:'鹰眎',
+ jsrgyingshi_info:'当你翻面时,你可以观看牌堆底的三张牌(若死亡角色数大于2则改为五张),然后将其中任意数量的牌以任意顺序置于牌堆顶,其余以任意顺序置于牌堆底。',
+ jsrgtuigu:'蜕骨',
+ jsrgtuigu_info:'①回合开始时,你可以翻面并令你本回合的手牌上限+X,然后摸X张牌并视为使用一张【解甲归田】(X为存活角色数的一半,向下取整),目标角色不能使用以此法得到的牌直到其回合结束。②一轮游戏开始时,若你上一轮未执行过回合,你获得一个额外的回合。③当你失去装备牌里的牌后,你回复1点体力。',
+ jsrg_guoxun:'合郭循',
+ jsrg_guoxun_prefix:'合',
+ jsrgeqian:'遏前',
+ jsrgeqian_info:'①结束阶段,你可以蓄谋任意次。②当你使用【杀】或蓄谋牌指定其他角色为唯一目标后,你可以令此牌不计入次数限制并获得目标一张牌,然后其可以令你本回合至其的距离+2。',
+ jsrgfusha:'伏杀',
+ jsrgfusha_info:'限定技。出牌阶段,若你的攻击范围内仅有一名角色,你可以对其造成X点伤害(X为你的攻击范围,至多为游戏人数)。',
+ jsrg_sunlubansunluyu:'合孙鲁班孙鲁育',
+ jsrg_sunlubansunluyu_prefix:'合',
+ jsrgdaimou:'殆谋',
+ jsrgdaimou_info:'每回合各限一次。当一名角色使用【杀】指定其他角色/你为目标时,你可以用牌堆顶的牌蓄谋/你须弃置你区域里的一张蓄谋牌。',
+ jsrgfangjie:'芳洁',
+ jsrgfangjie_info:'准备阶段,若你没有蓄谋牌,你回复1点体力并摸一张牌,否则你可以弃置你区域里的任意张蓄谋牌并失去〖芳洁〗。',
+ jsrg_caofang:'合曹芳',
+ jsrg_caofang_prefix:'合',
+ jsrgzhaotu:'诏图',
+ jsrgzhaotu_info:'每轮限一次。你可以将一张红色非锦囊牌当【乐不思蜀】使用,然后当前回合结束后,目标执行一个手牌上限-2的额外回合。',
+ jsrgjingju:'惊惧',
+ jsrgjingju_info:'当你需要使用任意一种基本牌时,你可以将其他角色判定区里的一张牌移动至你的判定区,视为你使用之。',
+ jsrgweizhui:'危坠',
+ jsrgweizhui_info:'主公技。其他魏势力角色的结束阶段,其可以将一张黑色手牌当【过河拆桥】对你使用。',
+ jsrg_sunjun:'合孙峻',
+ jsrg_sunjun_prefix:'合',
+ jsrgyaoyan:'邀宴',
+ jsrgyaoyan_info:'准备阶段,你可以令所有角色依次选择是否于回合结束时议事,若议事结果为:红色,你获得任意名未议事的角色各一张手牌;黑色,你可以对一名议事的角色造成2点伤害。',
+ jsrgbazheng:'霸政',
+ jsrgbazheng_info:'当你参与的议事展示意见时,本回合受到过你伤害的角色意见视为与你相同。',
+ jsrg_liuyong:'合刘永',
+ jsrg_liuyong_prefix:'合',
+ jsrgdanxin:'丹心',
+ jsrgdanxin_info:'你可以将一张牌当【推心置腹】使用,你展示以此法交出与得到的牌,以此法得到♥牌的角色回复1点体力,然后你至目标角色的距离+1直到回合结束。',
+ jsrgfengxiang:'封乡',
+ jsrgfengxiang_info:'锁定技。当你受到伤害后,你与一名其他角色交换装备区里的所有牌。若你装备区里的牌因此减少,你摸等同于减少牌数的牌。',
+ jsrg_weiwenzhugezhi:'合卫温诸葛直',
+ jsrg_weiwenzhugezhi_prefix:'合',
+ jsrgfuhai:'浮海',
+ jsrgfuhai_info:'出牌阶段限一次。你可以令所有有手牌的其他角色同时展示一张手牌,然后你选择一个方向并摸X张牌(X为该方向上的角色展示的点数连续严格递增或严格递减的牌数,至少为1)。',
+ jsrg_zhangxuan:'合张嫙',
+ jsrg_zhangxuan_prefix:'合',
+ jsrgtongli:'同礼',
+ jsrgtongli_info:'当你于出牌阶段内使用基本牌或普通锦囊牌指定第一个目标后,若你手牌中的花色数和你于本阶段内使用过的牌数相等,则你可以展示所有手牌,令此牌额外结算一次。',
+ jsrgshezang:'奢葬',
+ jsrgshezang_info:'每轮限一次。当你或你回合内的其他角色进入濒死状态时,你可以亮出牌堆顶的四张牌,获得其中任意张花色各不相同的牌。',
+ jsrg_gaoxiang:'合高翔',
+ jsrg_gaoxiang_prefix:'合',
+ jsrgchiying:'驰应',
+ jsrgchiying_info:'出牌阶段限一次。你可以选择一名角色,令其攻击范围内的其他角色依次弃置一张牌。若以此法弃置的基本牌数不大于其体力值,其获得这些基本牌。',
+ jsrg_guozhao:'合郭照',
+ jsrg_guozhao_prefix:'合',
+ jsrgpianchong:'偏宠',
+ jsrgpianchong_info:'一名角色的结束阶段,若你于此回合内失去过牌,你可以判定。若结果为红色/黑色,你摸此回合进入弃牌堆的红色/黑色牌数量的牌。',
+ jsrgzunwei:'尊位',
+ jsrgzunwei_info:'出牌阶段限一次。你可以选择一名其他角色并选择执行一项,然后移除该选项:1.将手牌数摸至与该角色相同(最多摸五张);2.将其装备牌移至你的装备区,直到你装备区的牌数不少于其;3.将体力值回复至与该角色相同。',
xumou_jsrg:'蓄谋',
xumou_jsrg_info:'“蓄谋”牌可在判定区内重复存在。判定阶段开始时,你选择一项:⒈使用此牌对应的实体牌,然后本阶段不能再使用此牌名的牌;⒉将所有的“蓄谋”牌置入弃牌堆。',
@@ -6336,6 +8292,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
jiangshanrugu_qi:'江山如故·起',
jiangshanrugu_cheng:'江山如故·承',
jiangshanrugu_zhuan:'江山如故·转',
+ jiangshanrugu_he:'江山如故·合',
},
};
});
diff --git a/character/mobile.js b/character/mobile.js
index 07b1b1fe0..37218e870 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -15391,7 +15391,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhanggong:['zhanggong','re_zhanggong'],
baosanniang:['xin_baosanniang','re_baosanniang','baosanniang'],
heqi:['re_heqi','heqi'],
- weiwenzhugezhi:['weiwenzhugezhi','re_weiwenzhugezhi'],
+ weiwenzhugezhi:['weiwenzhugezhi','re_weiwenzhugezhi','jsrg_weiwenzhugezhi'],
xugong:['xugong','re_xugong','jsrg_xugong'],
liuzan:['re_liuzan','liuzan'],
sufei:['yj_sufei','sp_sufei','xf_sufei'],
diff --git a/character/shenhua.js b/character/shenhua.js
index 95ce88be9..222262139 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -7714,7 +7714,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
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'],
+ jiangwei:['jiangwei','ol_jiangwei','re_jiangwei','sb_jiangwei','jsrg_jiangwei'],
liushan:['liushan','ol_liushan','re_liushan'],
sunce:['sunce','re_sunce','re_sunben','sb_sunce'],
zhangzhang:['zhangzhang','ol_zhangzhang','re_zhangzhang'],
diff --git a/character/sp.js b/character/sp.js
index 57854724a..5c3e0ab60 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -13360,7 +13360,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2,
direct:true,
filter:function(event,player){
- return player!=event.player&&!event.player.isDisabledJudge()&&event.player.countCards('he')&&!event.player.countCards('j');
+ return player!=event.player&&!event.player.isDisabledJudge()&&event.player.countCards('he')&&!event.player.countCards('j',{type:'delay'});
},
content:function(){
'step 0'
@@ -26332,7 +26332,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
retuogu:'托孤',
retuogu_info:'一名角色死亡时,你可以令其选择其武将牌上的一个技能(主公技,限定技,觉醒技,隐匿技、使命技等特殊技能除外),然后你获得其选择的技能并失去上次因〖托孤〗获得的技能。',
shanzhuan:'擅专',
- shanzhuan_info:'当你对其他角色造成伤害后,若其判定区没有牌,则你可以将其的一张牌置于其的判定区。若此牌不为延时锦囊牌且此牌为:红色,此牌视为【乐不思蜀】;黑色,此牌视为【兵粮寸断】。回合结束时,若你本回合内未造成伤害,你可摸一张牌。',
+ shanzhuan_info:'①当你对其他角色造成伤害后,若其判定区没有延时类锦囊牌,则你可以将其的一张牌置于其的判定区。若此牌不为延时锦囊牌且此牌为:红色,此牌视为【乐不思蜀】;黑色,此牌视为【兵粮寸断】。②回合结束时,若你本回合内未造成伤害,你可摸一张牌。',
spniluan:'逆乱',
spniluan_info:'出牌阶段,你可以将一张黑色牌当做【杀】使用。此【杀】使用结算完成后,若你未因此【杀】造成过伤害,则你令此【杀】不计入使用次数。',
spweiwu:'违忤',
diff --git a/character/standard.js b/character/standard.js
index a026971f6..ba5e193e6 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -2325,7 +2325,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
characterReplace:{
caocao:['caocao','re_caocao','sb_caocao','dc_caocao'],
guojia:['guojia','re_guojia','ps1059_guojia','ps2070_guojia'],
- simayi:['simayi','re_simayi','ps_simayi','ps2068_simayi'],
+ simayi:['simayi','re_simayi','jsrg_simayi','ps_simayi','ps2068_simayi'],
jin_simayi:['jin_simayi','junk_simayi','ps_jin_simayi'],
zhenji:['zhenji','re_zhenji','sb_zhenji','yj_zhenji'],
xuzhu:['xuzhu','re_xuzhu'],
@@ -2335,15 +2335,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
liubei:['liubei','re_liubei','sb_liubei','dc_liubei','junk_liubei'],
guanyu:['guanyu','re_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','ps2063_zhaoyun','ps2067_zhaoyun'],
+ 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','ps2066_zhugeliang','ps_zhugeliang','sb_zhugeliang'],
+ zhugeliang:['zhugeliang','re_zhugeliang','sb_zhugeliang','jsrg_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'],
- luxun:['luxun','re_luxun'],
+ luxun:['luxun','re_luxun','jsrg_luxun'],
lvmeng:['lvmeng','re_lvmeng','sb_lvmeng'],
huanggai:['huanggai','re_huanggai','sb_huanggai'],
daqiao:['daqiao','re_daqiao','sb_daqiao'],
diff --git a/character/xianding.js b/character/xianding.js
index 5b240138a..a958de99c 100644
--- a/character/xianding.js
+++ b/character/xianding.js
@@ -13524,7 +13524,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
fengfangnv:['fengfangnv','re_fengfangnv'],
luotong:['dc_luotong','luotong'],
dc_wangchang:['dc_wangchang','tw_wangchang'],
- guozhao:['guozhao','xin_guozhao'],
+ guozhao:['guozhao','xin_guozhao','jsrg_guozhao'],
dingshangwan:['dingshangwan','ol_dingshangwan'],
},
translate:{
diff --git a/image/character/jsrg_caofang.jpg b/image/character/jsrg_caofang.jpg
new file mode 100644
index 000000000..c9260f90b
Binary files /dev/null and b/image/character/jsrg_caofang.jpg differ
diff --git a/image/character/jsrg_gaoxiang.jpg b/image/character/jsrg_gaoxiang.jpg
new file mode 100644
index 000000000..d2abd8ec8
Binary files /dev/null and b/image/character/jsrg_gaoxiang.jpg differ
diff --git a/image/character/jsrg_guoxun.jpg b/image/character/jsrg_guoxun.jpg
new file mode 100644
index 000000000..9dab9d780
Binary files /dev/null and b/image/character/jsrg_guoxun.jpg differ
diff --git a/image/character/jsrg_guozhao.jpg b/image/character/jsrg_guozhao.jpg
new file mode 100644
index 000000000..cf5826644
Binary files /dev/null and b/image/character/jsrg_guozhao.jpg differ
diff --git a/image/character/jsrg_jiangwei.jpg b/image/character/jsrg_jiangwei.jpg
new file mode 100644
index 000000000..29b66240e
Binary files /dev/null and b/image/character/jsrg_jiangwei.jpg differ
diff --git a/image/character/jsrg_liuyong.jpg b/image/character/jsrg_liuyong.jpg
new file mode 100644
index 000000000..57363374f
Binary files /dev/null and b/image/character/jsrg_liuyong.jpg differ
diff --git a/image/character/jsrg_luxun.jpg b/image/character/jsrg_luxun.jpg
new file mode 100644
index 000000000..30d02d27a
Binary files /dev/null and b/image/character/jsrg_luxun.jpg differ
diff --git a/image/character/jsrg_simayi.jpg b/image/character/jsrg_simayi.jpg
new file mode 100644
index 000000000..e16231af7
Binary files /dev/null and b/image/character/jsrg_simayi.jpg differ
diff --git a/image/character/jsrg_sunjun.jpg b/image/character/jsrg_sunjun.jpg
new file mode 100644
index 000000000..659080375
Binary files /dev/null and b/image/character/jsrg_sunjun.jpg differ
diff --git a/image/character/jsrg_sunlubansunluyu.jpg b/image/character/jsrg_sunlubansunluyu.jpg
new file mode 100644
index 000000000..86656bc1a
Binary files /dev/null and b/image/character/jsrg_sunlubansunluyu.jpg differ
diff --git a/image/character/jsrg_weiwenzhugezhi.jpg b/image/character/jsrg_weiwenzhugezhi.jpg
new file mode 100644
index 000000000..f75f46082
Binary files /dev/null and b/image/character/jsrg_weiwenzhugezhi.jpg differ
diff --git a/image/character/jsrg_zhangxuan.jpg b/image/character/jsrg_zhangxuan.jpg
new file mode 100644
index 000000000..6e877f117
Binary files /dev/null and b/image/character/jsrg_zhangxuan.jpg differ
diff --git a/image/character/jsrg_zhaoyun.jpg b/image/character/jsrg_zhaoyun.jpg
new file mode 100644
index 000000000..3168751e0
Binary files /dev/null and b/image/character/jsrg_zhaoyun.jpg differ
diff --git a/image/character/jsrg_zhugeliang.jpg b/image/character/jsrg_zhugeliang.jpg
new file mode 100644
index 000000000..4b16a866b
Binary files /dev/null and b/image/character/jsrg_zhugeliang.jpg differ
diff --git a/noname/game/index.js b/noname/game/index.js
index f38cd8cb7..ad55dc55f 100644
--- a/noname/game/index.js
+++ b/noname/game/index.js
@@ -6017,7 +6017,18 @@ export class Game extends Uninstantable {
if (info.usable && get.skillCount(skills2[i]) >= info.usable) enable = false;
if (info.chooseButton && _status.event.noButton) enable = false;
if (info.round && (info.round - (game.roundNumber - player.storage[skills2[i] + '_roundcount']) > 0)) enable = false;
- if (player.storage[`temp_ban_${skills2[i]}`] === true) enable = false;
+ for (const item in player.storage) {
+ if (item.startsWith('temp_ban_')) {
+ if(player.storage[item] !== true) continue;
+ const skillName = item.slice(9);
+ if (lib.skill[skillName]) {
+ const skills=game.expandSkills([skillName]);
+ if(skills.includes(skills2[i])) {
+ enable = false; break;
+ }
+ }
+ }
+ }
}
if (enable) {
if (event.isMine() || !event._aiexclude.includes(skills2[i])) {
diff --git a/noname/get/index.js b/noname/get/index.js
index f38faf096..cf07f4b35 100644
--- a/noname/get/index.js
+++ b/noname/get/index.js
@@ -3014,7 +3014,16 @@ export class Get extends Uninstantable {
var js = node.getCards('j');
for (var i = 0; i < js.length; i++) {
if (js[i].viewAs && js[i].viewAs != js[i].name) {
- uiintro.add('' + js[i].outerHTML + '
' + lib.translate[js[i].viewAs] + ':' + lib.translate[js[i].viewAs + '_info'] + '
');
+ let html = js[i].outerHTML;
+ let cardInfo = lib.card[js[i].viewAs], showCardIntro=true;
+ if (cardInfo.blankCard) {
+ var cardOwner = get.owner(js[i]);
+ if (cardOwner && !cardOwner.isUnderControl(true)) showCardIntro = false;
+ }
+ if (!showCardIntro) {
+ html=ui.create.button(js[i],'blank').outerHTML;
+ }
+ uiintro.add('' + html + '
' + lib.translate[js[i].viewAs] + ':' + lib.translate[js[i].viewAs + '_info'] + '
');
}
else {
uiintro.add('' + js[i].outerHTML + '
' + lib.translate[js[i].name + '_info'] + '
');
@@ -3484,7 +3493,7 @@ export class Get extends Uninstantable {
const defaultYingbianEffect = get.defaultYingbianEffect(node.link || node);
if (lib.yingbian.prompt.has(defaultYingbianEffect)) yingbianEffects.push(defaultYingbianEffect);
}
- if (yingbianEffects.length) uiintro.add(`应变:${yingbianEffects.map(value => lib.yingbian.prompt.get(value)).join(';')}
`);
+ if (yingbianEffects.length && showCardIntro) uiintro.add(`应变:${yingbianEffects.map(value => lib.yingbian.prompt.get(value)).join(';')}
`);
}
if (lib.translate[name + '_append']) {
uiintro.add('' + lib.translate[name + '_append'] + '
');
diff --git a/noname/library/element/content.js b/noname/library/element/content.js
index 59d53f4cf..62ccb6803 100644
--- a/noname/library/element/content.js
+++ b/noname/library/element/content.js
@@ -476,6 +476,9 @@ export const Content = {
else black.push([target, card]);
}
event.red = red; event.black = black;
+ event.trigger('debateShowOpinion');
+ 'step 2'
+ var red = event.red, black = event.black;
if (red.length) {
game.log(red.map(function (i) {
return i[0];
@@ -528,7 +531,7 @@ export const Content = {
dialog.open();
}, get.translation(player), event.videoId, red, black);
game.delay(4);
- 'step 2';
+ 'step 3';
game.broadcastAll('closeDialog', event.videoId);
var opinion = null;
if (event.red.length > event.black.length) opinion = 'red';
@@ -542,7 +545,7 @@ export const Content = {
black: event.black,
targets: event.targets
};
- 'step 3';
+ 'step 4';
if (event.callback) {
var next = game.createEvent('debateCallback', false);
next.player = player;
diff --git a/noname/library/index.js b/noname/library/index.js
index 3d407ab8e..59f0324b3 100644
--- a/noname/library/index.js
+++ b/noname/library/index.js
@@ -9691,7 +9691,16 @@ export class Library extends Uninstantable {
if (typeof info.usable == 'number' && player.hasSkill('counttrigger') &&
player.storage.counttrigger && player.storage.counttrigger[skill] >= info.usable) return false;
if (info.round && (info.round - (game.roundNumber - player.storage[skill + '_roundcount']) > 0)) return false;
- if (player.storage[`temp_ban_${skill}`] === true) return false;
+ for (const item in player.storage) {
+ if (item.startsWith('temp_ban_')) {
+ if(player.storage[item] !== true) continue;
+ const skillName = item.slice(9);
+ if (lib.skill[skillName]) {
+ const skills=game.expandSkills([skillName]);
+ if(skills.includes(skill)) return false;
+ }
+ }
+ }
return true;
},
characterDisabled: function (i, libCharacter) {
@@ -12781,6 +12790,10 @@ export class Library extends Uninstantable {
color: '#c3f9ff',
nature: 'thundermm',
}],
+ ['合', {
+ color: '#c3f9ff',
+ nature: 'thundermm',
+ }],
['转', {
color: '#c3f9ff',
nature: 'thundermm',