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

Merge pull request #1199 from mengxinzxz/PR-Branch 

bugfix；技能调整
This commit is contained in:
Spmario233 2024-04-14 16:02:54 +08:00 committed by GitHub
parent 1f4dd94c87 233068d260
commit 3f7bd95de3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
character/mobile.js
View File

@ -604,7 +604,7 @@ game.import('character', function () {
filter(event,player){
return (event.name!='phase'||game.phaseNumber==0)&&game.hasPlayer(current=>{
return current!==player&&current.hasEnabledSlot(1);
});
})&&get.mode()=='identity';
},
async cost(event,trigger,player){
event.result = await player.chooseTarget(get.prompt('mbcuizhen'), '废除至多两名其他角色的武器栏', [1, 2], (card, player, target) => {
@ -17545,7 +17545,8 @@ game.import('character', function () {
mb_sp_guanqiujian:'SP毌丘俭',
mb_sp_guanqiujian_prefix:'SP',
mbcuizhen:'摧阵',
mbcuizhen_info:'①游戏开始时，你可以废除至多两名其他角色的武器栏。②当你于出牌阶段使用伤害类牌指定其他角色为目标后，若目标角色的手牌数不小于体力值，你可以废除其武器栏。③摸牌阶段，你令额定摸牌数+X（X为所有角色被废除的武器栏数之和，至多为2）。',
mbcuizhen_info_identity:'①游戏开始时，你可以废除至多两名其他角色的武器栏。②当你于出牌阶段使用伤害类牌指定其他角色为目标后，若目标角色的手牌数不小于体力值，你可以废除其武器栏。③摸牌阶段，你令额定摸牌数+X（X为所有角色被废除的武器栏数之和，至多为2）。',
mbcuizhen_info:'①当你于出牌阶段使用伤害类牌指定其他角色为目标后，若目标角色的手牌数不小于体力值，你可以废除其武器栏。②摸牌阶段，你令额定摸牌数+X（X为所有角色被废除的武器栏数之和，至多为2）。',
mbkuili:'溃离',
mbkuili_info:'锁定技。当你受到伤害后，你弃置等同于伤害值的手牌；若来源有被废除的武器栏，你令其恢复武器栏。',
mb_caomao:'手杀曹髦',

16
character/tw.js
View File

@ -1388,13 +1388,15 @@ game.import('character', function () {
}
}
}
let result;
const transList=list.map(i=>get.translation(i));
const {result:{bool,links}}=await player.chooseButton([
if(transList.length<=num) result={bool:true,links:transList};
else result=await player.chooseButton([
'劫囚：请选择你要恢复的装备栏',
[transList,'tdnodes'],
],Math.min(transList.length,num),true).set('map',map)
.set('ai',button=>['equip5','equip4','equip1','equip3','equip2'].indexOf(get.event('map')[button.link])+2);
if(bool) await player.enableEquip(links.slice().map(i=>map[i]));
.set('ai',button=>['equip5','equip4','equip1','equip3','equip2'].indexOf(get.event('map')[button.link])+2).forResult();
if(result.bool) await player.enableEquip(result.links.slice().map(i=>map[i]));
},
group:['twjieqiu_end'],
},
@ -1442,13 +1444,15 @@ game.import('character', function () {
list.push('equip'+i);
}
}
let result;
const transList=list.map(i=>get.translation(i));
const {result:{bool,links}}=await player.chooseButton([
if(transList.length==1) result={bool:true,links:transList};
else result=await player.chooseButton([
'恩仇：请选择'+get.translation(target)+'要恢复的装备栏',
[transList,'tdnodes'],
],true).set('map',map)
.set('ai',button=>1/(['equip5','equip4','equip1','equip3','equip2'].indexOf(get.event('map')[button.link])+2));
if(bool) await target.enableEquip(links.slice().map(i=>map[i]));
.set('ai',button=>1/(['equip5','equip4','equip1','equip3','equip2'].indexOf(get.event('map')[button.link])+2)).forResult();
if(result.bool) await target.enableEquip(result.links.slice().map(i=>map[i]));
},
ai:{
order:9,

12
character/xianding.js
View File

@ -509,6 +509,7 @@ game.import('character', function () {
}).sortBySeat()];
},
filter(event,player,triggername,targets){
if(player.getStorage('dcjijie_used').includes(event.name=='recover'?'recover':'draw')) return false;
if(event.name==='recover') return targets[0]!==player&&_status.currentPhase!==targets[0]&&player.isDamaged();
return targets.some(current=>{
return current!==player&&_status.currentPhase!==current&&event.getg(current).length>0;
@ -520,7 +521,9 @@ game.import('character', function () {
return targets;
},
async content(event,trigger,player){
player.addTempSkill('dcjijie_used');
if (trigger.name === 'recover') {
player.markAuto('dcjijie_used',['recover']);
await player.recover(trigger.num);
}
else{
@ -528,9 +531,16 @@ game.import('character', function () {
if(current === player || _status.currentPhase === current) return 0;
return trigger.getg(current).length;
});
player.markAuto('dcjijie_used',['draw']);
await player.draw(count);
}
},
subSkill:{
used:{
charlotte:true,
onremove:true,
},
},
},
dchuiji:{
audio:2,
@ -15774,7 +15784,7 @@ game.import('character', function () {
sp_zhenji:'SP甄宓',
sp_zhenji_prefix:'SP',
dcjijie:'己诫',
dcjijie_info:'锁定技。每回合限一次，当其他角色于其回合外得到牌后/回复体力后，你摸等量的牌/回复等量的体力。',
dcjijie_info:'锁定技。每回合每项各限一次，其他角色于其回合外得到牌后/回复体力后，你摸等量的牌/回复等量的体力。',
dchuiji:'惠济',
dchuiji_info:'出牌阶段限一次。你可以令一名角色摸两张牌或从牌堆中随机使用一张不为赠物的装备牌，然后若其手牌数不小于存活角色数，其视为使用一张【五谷丰登】。系统不于此牌使用准备工作结束时执行亮出牌堆顶的牌的动作，改为你令其将所有手牌置于处理区，然后令所有目标角色依次获得其中一张牌。当这些牌因执行【五谷丰登】的执行动作而置于弃牌堆后，你令其获得这些牌。',