YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复手杀朱灵bug，张楚bug

This commit is contained in:
copcap 2023-07-25 01:35:04 +08:00
parent ecebb6e132
commit 3c9cfba80f
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
character/mobile.js
View File

@ -15511,7 +15511,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
player.loseHp(); player.loseHp();
switch(get.type(cards[0],'trick',cards[0].original=='h'?player:false)){ switch(get.type(cards[0],'trick',cards[0].original=='h'?player:false)){
case 'basic':player.addTempSkill('xinzhanyi_basic');break; case 'basic':player.addTempSkill('xinzhanyi_basic');player.addMark('xinzhanyi_basic1',1,false);break;
case 'equip':player.addTempSkill('xinzhanyi_equip');break; case 'equip':player.addTempSkill('xinzhanyi_equip');break;
case 'trick':player.addTempSkill('xinzhanyi_trick');player.draw(3);break; case 'trick':player.addTempSkill('xinzhanyi_trick');player.draw(3);break;
} }
@ -15526,15 +15526,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
xinzhanyi_basic1:{ xinzhanyi_basic1:{
trigger:{player:"useCard"}, trigger:{player:"useCard"},
filter:function(event,player){ filter:function(event,player){
return event.skill=='xinzhanyi_basic_backup'&&!player.storage.xinzhanyi_basic1; return get.type(event.card,false)=='basic'&&player.hasMark('xinzhanyi_basic1');
}, },
forced:true, forced:true,
silent:true, silent:true,
popup:false, popup:false,
content:function(){ content:function(){
if(!trigger.baseDamage) trigger.baseDamage=1; if(!trigger.baseDamage) trigger.baseDamage=1;
trigger.baseDamage++; var num=player.countMark('xinzhanyi_basic1');
player.storage.xinzhanyi_basic1=true; trigger.baseDamage+=num;
player.removeMark('xinzhanyi_basic1',num,false);
game.log(trigger.card,'的伤害值/回复值','#y+'+num);
}, },
}, },
xinzhanyi_basic:{ xinzhanyi_basic:{
@ -15543,31 +15545,29 @@ game.import('character',function(lib,game,ui,get,ai,_status){
delete p.storage[s+1]; delete p.storage[s+1];
}, },
hiddenCard:function(player,name){ hiddenCard:function(player,name){
return ['sha','tao','jiu'].contains(name)&&player.countCards('h',{type:'basic'})>0; return get.type(name)=='basic'&&player.countCards('h',{type:'basic'})>0;
}, },
enable:"chooseToUse", enable:"chooseToUse",
filter:function(event,player){ filter:function(event,player){
if(event.filterCard({name:'sha'},player,event)|| if(!player.hasCard(function(card){
event.filterCard({name:'jiu'},player,event)|| return get.type(card)=='basic';
event.filterCard({name:'tao'},player,event)){ },'hs')) return false;
return player.hasCard(function(card){ for(var name of lib.inpile){
return get.type(card)=='basic'; if(get.type(name)!='basic') continue;
},'hs'); if(event.filterCard({name:name},player,event)) return true;
} }
return false; return false;
}, },
chooseButton:{ chooseButton:{
dialog:function(event,player){ dialog:function(event,player){
var list=[]; var list=[];
if(event.filterCard({name:'sha'},player,event)){ for(var name of lib.inpile){
list.push(['基本','','sha']); if(get.type(name)!='basic') continue;
for(var j of lib.inpile_nature) list.push(['基本','','sha',j]); if(event.filterCard({name:name},player,event)) list.push(['基本','',name]);
} if(name!='sha') continue;
if(event.filterCard({name:'tao'},player,event)){ for(var j of lib.inpile_nature){
list.push(['基本','','tao']); if(event.filterCard({name:name,nature:j},player,event)) list.push(['基本','','sha',j]);
} }
if(event.filterCard({name:'jiu'},player,event)){
list.push(['基本','','jiu']);
} }
return ui.create.dialog('战意',[list,'vcard'],'hidden'); return ui.create.dialog('战意',[list,'vcard'],'hidden');
}, },

6
character/sp2.js
View File

@ -3488,7 +3488,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
target.chooseToDiscard('集众：弃置三张手牌，或点击“取消”获得“信众”标记',3); target.chooseToDiscard('集众：弃置三张手牌，或点击“取消”获得“信众”标记',3);
} }
'step 2' 'step 2'
target.addMark('dcjizhong',1); if(!result.bool){
target.addMark('dcjizhong',1);
}
}, },
marktext:'信', marktext:'信',
intro:{ intro:{
@ -31140,7 +31142,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhangchu:'张楚', zhangchu:'张楚',
dcjizhong:'集众', dcjizhong:'集众',
dcjizhong_info:'出牌阶段限一次。你可以令一名其他角色摸两张牌，然后其选择一项：1.若其没有“信众”标记，其获得“信众”标记；2.弃置三张手牌。', dcjizhong_info:'出牌阶段限一次。你可以令一名其他角色摸两张牌，然后其选择一项：1.若其没有“信众”标记，其获得“信众”标记；2.弃置三张手牌。',
dcrihui:'日慧', dcrihui:'日彗',
dcrihui_info:'每回合限一次。当你使用普通锦囊牌或黑色基本牌结算结束后，若此牌的目标数为1且目标不为你，且其：没有“信众”，则所有有“信众”的角色依次视为对其使用一张与此牌牌名和属性相同的牌；有“信众”，则你可以获得其区域里的一张牌。', dcrihui_info:'每回合限一次。当你使用普通锦囊牌或黑色基本牌结算结束后，若此牌的目标数为1且目标不为你，且其：没有“信众”，则所有有“信众”的角色依次视为对其使用一张与此牌牌名和属性相同的牌；有“信众”，则你可以获得其区域里的一张牌。',
dcguangshi:'光噬', dcguangshi:'光噬',
dcguangshi_info:'锁定技。准备阶段，若所有其他角色均有“信众”，你失去1点体力并摸两张牌。', dcguangshi_info:'锁定技。准备阶段，若所有其他角色均有“信众”，你失去1点体力并摸两张牌。',