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

fix: fix the inverted content of kangge and jielie

This commit is contained in:
S-N-O-R-L-A-X 2023-10-08 00:50:25 +08:00
parent 42983613a1
commit 37c9720ab5
1 changed files with 128 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
character/sp2.js
View File

@ -4545,12 +4545,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
}, },
//唐姬 //唐姬
jielie:{ kangge:{
audio:2, audio:2,
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
direct:true, direct:true,
filter:function(event,player){ filter:function(event,player){
return player.phaseNumber==1&&!player.storage.jielie&&game.hasPlayer(current=>current!=player); return player.phaseNumber==1&&!player.storage.kangge&&game.hasPlayer(current=>current!=player);
}, },
content:function(){ content:function(){
'step 0' 'step 0'
@ -4560,31 +4560,31 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 1' 'step 1'
if(result.bool){ if(result.bool){
var target=result.targets[0]; var target=result.targets[0];
player.logSkill('jielie',target); player.logSkill('kangge',target);
player.addSkill('jielie_clear'); player.addSkill('kangge_clear');
player.storage.jielie=target; player.storage.kangge=target;
player.markSkill('jielie'); player.markSkill('kangge');
game.delayx(); game.delayx();
} }
}, },
intro:{content:'已指定$为目标'}, intro:{content:'已指定$为目标'},
group:['jielie_draw','jielie_dying','jielie_die'], group:['kangge_draw','kangge_dying','kangge_die'],
subSkill:{ subSkill:{
draw:{ draw:{
audio:'jielie', audio:'kangge',
trigger:{ trigger:{
global:['gainAfter','loseAsyncAfter'], global:['gainAfter','loseAsyncAfter'],
}, },
forced:true, forced:true,
filter:function(event,player){ filter:function(event,player){
if(player.countMark('jielie_draw')>=3) return false; if(player.countMark('kangge_draw')>=3) return false;
var target=player.storage.jielie; var target=player.storage.kangge;
return target&&target!=_status.currentPhase&&event.getg(target).length>0; return target&&target!=_status.currentPhase&&event.getg(target).length>0;
}, },
logTarget:'player', logTarget:'player',
content:function(){ content:function(){
var num=Math.min(3-player.countMark('jielie_draw'),trigger.getg(player.storage.jielie).length); var num=Math.min(3-player.countMark('kangge_draw'),trigger.getg(player.storage.kangge).length);
player.addMark('jielie_draw',num,false); player.addMark('kangge_draw',num,false);
player.draw(num); player.draw(num);
}, },
}, },
@ -4595,18 +4595,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
popup:false, popup:false,
charlotte:true, charlotte:true,
filter:function(event,player){ filter:function(event,player){
return player.countMark('jielie_draw')>0; return player.countMark('kangge_draw')>0;
}, },
content:function(){ content:function(){
player.removeMark('jielie_draw',player.countMark('jielie_draw'),false); player.removeMark('kangge_draw',player.countMark('kangge_draw'),false);
}, },
}, },
dying:{ dying:{
audio:'jielie', audio:'kangge',
trigger:{global:'dying'}, trigger:{global:'dying'},
logTarget:'player', logTarget:'player',
filter:function(event,player){ filter:function(event,player){
return event.player==player.storage.jielie&&event.player.hp<1&&!player.hasSkill('jielie_temp'); return event.player==player.storage.kangge&&event.player.hp<1&&!player.hasSkill('kangge_temp');
}, },
check:function(event,player){ check:function(event,player){
return get.attitude(player,event.player)>0; return get.attitude(player,event.player)>0;
@ -4614,15 +4614,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
prompt2:'令其将体力值回复至1点', prompt2:'令其将体力值回复至1点',
content:function(){ content:function(){
trigger.player.recover(1-trigger.player.hp); trigger.player.recover(1-trigger.player.hp);
player.addTempSkill('jielie_temp','roundStart'); player.addTempSkill('kangge_temp','roundStart');
}, },
}, },
temp:{}, temp:{},
die:{ die:{
audio:'jielie', audio:'kangge',
trigger:{global:'dieAfter'}, trigger:{global:'dieAfter'},
filter:function(event,player){ filter:function(event,player){
return event.player==player.storage.jielie; return event.player==player.storage.kangge;
}, },
forced:true, forced:true,
content:function(){ content:function(){
@ -4636,24 +4636,24 @@ game.import('character',function(lib,game,ui,get,ai,_status){
threaten:2, threaten:2,
}, },
}, },
kangge:{ jielie:{
audio:2, audio:2,
trigger:{player:'damageBegin4'}, trigger:{player:'damageBegin4'},
direct:true, direct:true,
filter:function(event,player){ filter:function(event,player){
return ((!event.source)||(event.source!=player&&event.source!=player.storage.jielie))&&player.storage.jielie&&player.storage.jielie.isIn(); return ((!event.source)||(event.source!=player&&event.source!=player.storage.kangge))&&player.storage.kangge&&player.storage.kangge.isIn();
}, },
content:function(){ content:function(){
'step 0' 'step 0'
player.chooseControl(lib.suit.slice(0),'cancel2').set('prompt',get.prompt('kangge')).set('prompt2','防止伤害并改为失去等量体力，且令'+get.translation(player.storage.jielie)+'从弃牌堆中获得等量的花色牌').set('ai',function(){ player.chooseControl(lib.suit.slice(0),'cancel2').set('prompt',get.prompt('jielie')).set('prompt2','防止伤害并改为失去等量体力，且令'+get.translation(player.storage.kangge)+'从弃牌堆中获得等量的花色牌').set('ai',function(){
var player=_status.event.player; var player=_status.event.player;
if(get.attitude(player,player.storage.jielie)<=0) return 'cancel2'; if(get.attitude(player,player.storage.kangge)<=0) return 'cancel2';
return lib.suit.randomGet(); return lib.suit.randomGet();
}); });
'step 1' 'step 1'
if(result.control!='cancel2'){ if(result.control!='cancel2'){
event.suit=result.control; event.suit=result.control;
player.logSkill('kangge',player.storage.jielie); player.logSkill('jielie',player.storage.kangge);
trigger.cancel(); trigger.cancel();
player.loseHp(trigger.num); player.loseHp(trigger.num);
} }
@ -4667,7 +4667,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(card) cards.push(card); if(card) cards.push(card);
else break; else break;
} }
if(cards.length) player.storage.jielie.gain(cards,'gain2'); if(cards.length) player.storage.kangge.gain(cards,'gain2');
}, },
}, },
//张横 //张横
@ -10450,10 +10450,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
liangjue:'粮绝', liangjue:'粮绝',
liangjue_info:'锁定技，当有黑色牌进入或者离开你的判定区或装备区后，若你的体力值大于1，你失去1点体力，然后摸两张牌。', liangjue_info:'锁定技，当有黑色牌进入或者离开你的判定区或装备区后，若你的体力值大于1，你失去1点体力，然后摸两张牌。',
tangji:'唐姬', tangji:'唐姬',
jielie:'抗歌', kangge:'抗歌',
jielie_info:'你的第一个回合开始时，选择一名其他角色，该角色每次于其回合外得到牌后，你摸等量的牌（每回合至多摸三张）；其进入濒死状态时，你可令其回复体力至1点（每轮限一次）。该角色死亡时，你弃置所有牌并失去1点体力。', kangge_info:'你的第一个回合开始时，选择一名其他角色，该角色每次于其回合外得到牌后，你摸等量的牌（每回合至多摸三张）；其进入濒死状态时，你可令其回复体力至1点（每轮限一次）。该角色死亡时，你弃置所有牌并失去1点体力。',
kangge:'节烈', jielie:'节烈',
kangge_info:'当你受到除自己和“抗歌”角色以外的角色造成的伤害时，你可以防止此伤害并选择一种花色，然后你失去X点体力，令“抗歌”角色从弃牌堆中随机获得X张此花色的牌（X为伤害值）。', jielie_info:'当你受到除自己和“抗歌”角色以外的角色造成的伤害时，你可以防止此伤害并选择一种花色，然后你失去X点体力，令“抗歌”角色从弃牌堆中随机获得X张此花色的牌（X为伤害值）。',
re_dongcheng:'董承', re_dongcheng:'董承',
xuezhao:'血诏', xuezhao:'血诏',
xuezhao_info:'出牌阶段限一次，你可弃置一张手牌并选择至多X名其他角色(X为你的体力上限）。这些角色依次选择是否交给你一张牌，若选择是，该角色摸一张牌且你本回合可多使用一张【杀】；若选择否，该角色本回合无法响应你使用的牌。', xuezhao_info:'出牌阶段限一次，你可弃置一张手牌并选择至多X名其他角色(X为你的体力上限）。这些角色依次选择是否交给你一张牌，若选择是，该角色摸一张牌且你本回合可多使用一张【杀】；若选择否，该角色本回合无法响应你使用的牌。',