This commit is contained in:
539943419 committed 2023-10-14 15:27:50 +08:00
1 parent 5e60731b51
commit 384a47c50b
1 file changed
+101 -109
+101 -109
View File
@@ -100,6 +100,17 @@ game.import("extension", function (lib, game, ui, get, ai, _status) {
});
const player = ui.create.player(ui.arena).animate("start");
if (character) player.init(character, character2);
// //技能修复
// var skills=lib.character[character][3];
// if(character2)skills.concat(lib.character[character2][3])
// for(var i of skills){
// game.log(i)
// player.removeSkill(i)
// player.addSkill(i);
// }
// 属性
player.storage.enhancementArray = {
attack: 0, //攻击力
defend: 0, //防御力
@@ -7817,6 +7828,10 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
var p = game.addPlayer(player.dataset.position+1, player.name)
//fix bug....
p.removeSkill("zioy_riyuexingkong")
p.addSkill("zioy_riyuexingkong")
p.node.avatar.style.backgroundImage = 'url("extension/喵喵喵喵/zioy_xiyueying2.jpg")'
p.node.name.innerHTML = "辉月";
p.maxHp = player.maxHp
@@ -7830,15 +7845,16 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
p.identityShown = true;
p.storage._miao_twins = player
player.storage._miao_twins = p
// player.removeSkill(event.name);
// p.removeSkill(event.name)
for(var p1 of game.players){
game.log(p1.sex,typeof p1.sex)
game.log(p1.identity)
}
// for(var p1 of game.players){
// game.log(p1.sex,typeof p1.sex)
// game.log(p1.identity)
// }
// game.log(p1.sex,typeof p1.sex)
},
group:["zioy_riyuexingkong_die","zioy_riyuexingkong_return"],
@@ -7848,41 +7864,39 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
player:"dieBefore",
},
filter:function(event,player){
return player.storage._miao_twins.hp > 0&&player.storage._miao_twins.isIn()&&event.getParent().name!='giveup'&&player.maxHp>0;
// game.log(player.storage._miao_twins.hp > 0&& player.storage._miao_twins.isIn()&&event.getParent().name!='giveup'&&player.maxHp>0)
return !player.storage._miao_twins.storage.zioy_riyuexingkong_die
},
forced:true,
direct:true,
priority:-1561565189,
// group:["mbmowang_die","mbmowang_return"],
content:function(){
if(false && (_status.mbmowang_return&&_status.mbmowang_return[player.playerid])){
trigger.cancel();
}
else{
// 休整
if(player.storage._miao_twins.hp > 0 && player.storage._miao_twins.isIn()&&event.getParent().name!='giveup'&&player.maxHp>0){
// trigger.cancel()
trigger.setContent(function(){
'step 0'
event.forceDie=true;
// if(source){
// game.log(player,'被',source,'杀害');
// if(source.stat[source.stat.length-1].kill==undefined){
// source.stat[source.stat.length-1].kill=1;
// }
// else{
// source.stat[source.stat.length-1].kill++;
// }
// }
// else{
// game.log(player,'阵亡');
// }
if(player.isIn()&&(false&&(!_status.mbmowang_return||!_status.mbmowang_return[player.playerid]))){
// event.forceDie=true;
if(source){
game.log(player,'被',source,'杀害');
if(source.stat[source.stat.length-1].kill==undefined){
source.stat[source.stat.length-1].kill=1;
}
else{
source.stat[source.stat.length-1].kill++;
}
}
else{
game.log(player,'阵亡');
}
// if(player.isIn()&&(false&&(!_status.mbmowang_return||!_status.mbmowang_return[player.playerid]))){
event.reserveOut=true;
game.log(player,'进入了修整状态');
game.log(player,'移出了游戏');
//game.addGlobalSkill('mbmowang_return');
// if(!_status.mbmowang_return) _status.mbmowang_return={};
// _status.mbmowang_return[player.playerid]=1;
}
else event.finish();
// }
// else event.finish();
if(!game.countPlayer()) game.over();
else if(player.hp!=0){
player.changeHp(0-player.hp,false).forceDie=true;
@@ -7902,93 +7916,71 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
},player);
game.addVideo('link',player,player.isLinked());
game.addVideo('turnOver',player,player.classList.contains('turnedover'));
// 'step 1'
// event.trigger('die');
// 'step 2'
// if(event.reserveOut){
// if(!game.reserveDead){
// for(var mark in player.marks){
// if(mark=='mbdanggu') continue;
// player.unmarkSkill(mark);
// }
// var count=1;
// var list=Array.from(player.node.marks.childNodes);
// if(list.some(i=>i.name=='mbdanggu')) count++;
// while(player.node.marks.childNodes.length>count){
// var node=player.node.marks.lastChild;
// if(node.name=='mbdanggu'){
// node=node.previousSibling;
// }
// node.remove();
// }
// game.broadcast(function(player,count){
// while(player.node.marks.childNodes.length>count){
// var node=player.node.marks.lastChild;
// if(node.name=='mbdanggu'){
// node=node.previousSibling;
// }
// node.remove();
// }
// },player,count);
// }
// for(var i in player.tempSkills){
// player.removeSkill(i);
// }
// var skills=player.getSkills();
// for(var i=0;i<skills.length;i++){
// if(lib.skill[skills[i]].temp){
// player.removeSkill(skills[i]);
// }
// }
// event.cards=player.getCards('hejsx');
// if(event.cards.length){
// player.discard(event.cards).forceDie=true;
// }
// }
// 'step 3'
// if(event.reserveOut){
// game.broadcastAll(function(player,list){
// player.classList.add('out');
// if(list.contains(player.name1)||player.name1=='shichangshi'){
// player.smoothAvatar(false);
// player.node.avatar.setBackground(player.name1+'_dead','character');
// }
// if(list.contains(player.name2)||player.name2=='shichangshi'){
// player.smoothAvatar(true);
// player.node.avatar2.setBackground(player.name2+'_dead','character');
// }
// },player,lib.skill.mbdanggu.changshi.map(i=>i[0]));
// }
// if(source&&lib.config.border_style=='auto'&&(lib.config.autoborder_count=='kill'||lib.config.autoborder_count=='mix')){
// switch(source.node.framebg.dataset.auto){
// case 'gold':case 'silver':source.node.framebg.dataset.auto='gold';break;
// case 'bronze':source.node.framebg.dataset.auto='silver';break;
// default:source.node.framebg.dataset.auto=lib.config.autoborder_start||'bronze';
// }
// if(lib.config.autoborder_count=='kill'){
// source.node.framebg.dataset.decoration=source.node.framebg.dataset.auto;
// }
// else{
// var dnum=0;
// for(var j=0;j<source.stat.length;j++){
// if(source.stat[j].damage!=undefined) dnum+=source.stat[j].damage;
// }
// source.node.framebg.dataset.decoration='';
// switch(source.node.framebg.dataset.auto){
// case 'bronze':if(dnum>=4) source.node.framebg.dataset.decoration='bronze';break;
// case 'silver':if(dnum>=8) source.node.framebg.dataset.decoration='silver';break;
// case 'gold':if(dnum>=12) source.node.framebg.dataset.decoration='gold';break;
// }
// }
// source.classList.add('topcount');
// }
// game.broadcastAll(function(player){
player.classList.add('out');
// });
player.$dieAfter();
player.classList.remove('fullskin2');
player.node.avatar2.classList.add('hidden');
// player.node.framebg.dataset.auto='silver';
// player.node.framebg.dataset.decoration='silver';
});
trigger.includeOut=true;
}
// 死透了
else{
// game.broadcastAll(function(player){
player.storage._miao_twins.classList.remove('out');
// });
player.storage._miao_twins.storage.zioy_riyuexingkong_die = true;
player.storage.zioy_riyuexingkong_die = true;
player.storage._miao_twins.die();
}
},
},
return:{
trigger:{
player:"phaseBefore",
},
forced:true,
charlotte:true,
silent:true,
forceDie:true,
forceOut:true,
filter:function(event,player){
return event.player.isOut();
},
content:function(){
'step 0'
// trigger._mbmowang_return=true;
game.broadcastAll(function(player){
player.classList.remove('out');
},trigger.player);
game.log(trigger.player,'移回了游戏');
// delete _status.mbmowang_return[trigger.player.playerid];
trigger.player.recover(trigger.player.maxHp-trigger.player.hp);
// game.broadcastAll(function(player){
// if(player.name1=='shichangshi'){
// player.smoothAvatar(false);
// player.node.avatar.setBackground(player.name1,'character');
// }
// if(player.name2=='shichangshi'){
// player.smoothAvatar(true);
// player.node.avatar2.setBackground(player.name2,'character');
// }
// },trigger.player);
'step 1'
event.trigger('restEnd');
},
sub:true,
popup:false,
"_priority":1,
}
}
}