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

v1.9.93.2(Part 2)

This commit is contained in:
Spmario233 2019-09-25 22:52:38 +08:00 committed by GitHub
parent cbd3ed81ae
commit ef0c96e135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
character/extra.js
View File

@ -355,6 +355,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
content:function(){ content:function(){
"step 0" "step 0"
event.forceDie=true;
if(typeof event.count!='number'){ if(typeof event.count!='number'){
// event.count=trigger.cards.length-1; // event.count=trigger.cards.length-1;
event.count=1; event.count=1;

13
character/mobile.js
View File

@ -96,8 +96,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"step 0" "step 0"
player.chooseToCompare(trigger.target); player.chooseToCompare(trigger.target);
"step 1" "step 1"
if(result.bool&&trigger.target.countGainableCards(player,'he')){ if(result.bool){
player.gainPlayerCard(trigger.target,true,'he'); if(trigger.target.countGainableCards(player,'he')) player.gainPlayerCard(trigger.target,true,'he');
} }
else{ else{
var card1=result.player; var card1=result.player;
@ -262,11 +262,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.current=targets.shift(); event.current=targets.shift();
player.discardPlayerCard(event.current,'hej',true) player.discardPlayerCard(event.current,'hej',true)
if(targets.length) event.redo(); if(targets.length) event.redo();
'step 3'
if(player.storage.liezhi){
trigger.liezhi=true;
player.addSkill('liezhi_disable');
}
}, },
subSkill:{ subSkill:{
disable:{ disable:{
@ -276,7 +271,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
silent:true, silent:true,
popup:false, popup:false,
charlotte:true, charlotte:true,
filter:function(event){return !event.liezhi}, //filter:function(event){return !event.liezhi},
content:function(){player.removeSkill('liezhi_disable')}, content:function(){player.removeSkill('liezhi_disable')},
}, },
damage:{ damage:{
@ -284,7 +279,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
forced:true, forced:true,
silent:true, silent:true,
popup:false, popup:false,
content:function(){player.storage.liezhi=true} content:function(){player.addSkill('liezhi_disable')}
}, },
}, },
}, },

7
character/shenhua.js
View File

@ -1586,15 +1586,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return event.card.name!='lebu'&&event.card.name!='bingliang'; return event.card.name!='lebu'&&event.card.name!='bingliang';
}, },
content:function(){ content:function(){
"step 0"
player.storage.nzry_shicai.push(get.type(trigger.card,'trick')); player.storage.nzry_shicai.push(get.type(trigger.card,'trick'));
for(var i=0;i<trigger.cards.length;i++){ for(var i=0;i<trigger.cards.length;i++){
if(get.position(trigger.cards[i])=='d'){ if(get.position(trigger.cards[i])=='d'){
trigger.cards[i].fix();
ui.cardPile.insertBefore(trigger.cards[i],ui.cardPile.firstChild); ui.cardPile.insertBefore(trigger.cards[i],ui.cardPile.firstChild);
game.updateRoundNumber();
game.log(player,'将',trigger.cards[i],'置于牌堆顶'); game.log(player,'将',trigger.cards[i],'置于牌堆顶');
} }
}; };
game.updateRoundNumber();
player.draw(); player.draw();
"step 1"
if(event.triggername=='useCard'&&['equip','delay'].contains(get.type(trigger.card))){ if(event.triggername=='useCard'&&['equip','delay'].contains(get.type(trigger.card))){
trigger.cancel(); trigger.cancel();
game.broadcastAll(ui.clear); game.broadcastAll(ui.clear);
@ -3332,6 +3335,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{player:'die'}, trigger:{player:'die'},
forced:true, forced:true,
forceDie:true, forceDie:true,
skillAnimation:true,
animationColor:'gray',
filter:function(event){ filter:function(event){
return event.source&&event.source.isIn(); return event.source&&event.source.isIn();
}, },

11
character/sp.js
View File

@ -2674,7 +2674,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{global:'damageEnd'}, trigger:{global:'damageEnd'},
forced:true, forced:true,
filter:function(event,player){ filter:function(event,player){
return event.player!=player&&event.player.hasSkill('zongkui_mark'); return event.player!=player&&event.player.isAlive()&&event.player.hasSkill('zongkui_mark');
}, },
content:function(){ content:function(){
'step 0' 'step 0'
@ -3148,9 +3148,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:'当你受到伤害后，$受到等量的伤害，当你回复体力后，$回复等量的体力' content:'当你受到伤害后，$受到等量的伤害，当你回复体力后，$回复等量的体力'
}, },
nopop:true, nopop:true,
trigger:{player:['damageAfter','recoverAfter']}, trigger:{player:['damageEnd','recoverEnd']},
forced:true, forced:true,
popup:false, popup:false,
priority:15,
filter:function(event,player){ filter:function(event,player){
if(!(player.storage.xianfu2&&player.storage.xianfu2.isIn()&&event.num>0)) return false; if(!(player.storage.xianfu2&&player.storage.xianfu2.isIn()&&event.num>0)) return false;
if(event.name=='damage') return true; if(event.name=='damage') return true;
@ -3629,7 +3630,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.addTempSkill('weikui2'); player.addTempSkill('weikui2');
} }
else{ else{
player.discardPlayerCard(target,'visible',true); player.discardPlayerCard(target,'visible',true,'h');
} }
}, },
ai:{ ai:{
@ -5836,10 +5837,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
direct:true, direct:true,
notemp:true, notemp:true,
filter:function(event,player){ filter:function(event,player){
return player.countCards('h')>0; return player.countCards('he')>0;
}, },
init:function(player){ init:function(player){
player.storage.tuifeng=[]; if(!player.storage.tuifeng) player.storage.tuifeng=[];
}, },
content:function(){ content:function(){
'step 0' 'step 0'

7
character/xinghuoliaoyuan.js
View File

@ -573,6 +573,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.gain(event.cards[i],'gain2'); player.gain(event.cards[i],'gain2');
} }
else{ else{
event.cards[i].fix();
ui.cardPile.insertBefore(event.cards[i],ui.cardPile.childNodes[0]); ui.cardPile.insertBefore(event.cards[i],ui.cardPile.childNodes[0]);
} }
} }
@ -609,6 +610,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
check:function (){ check:function (){
return -1; return -1;
}, },
delay:0,
content:function (){ content:function (){
'step 0' 'step 0'
player.$throw(cards.length); player.$throw(cards.length);
@ -617,6 +619,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var num1=game.players.length; var num1=game.players.length;
var num2=ui.cardPile.childElementCount; var num2=ui.cardPile.childElementCount;
for(var i=0;i<event.cards.length;i++){ for(var i=0;i<event.cards.length;i++){
event.cards[i].fix();
var num3=num1*(i+1)-1; var num3=num1*(i+1)-1;
if(num3<num2){ if(num3<num2){
ui.cardPile.insertBefore(cards[i],ui.cardPile.childNodes[num3]); ui.cardPile.insertBefore(cards[i],ui.cardPile.childNodes[num3]);
@ -2782,7 +2785,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.canUse(event.cards[0],current); return player.canUse(event.cards[0],current);
}); });
if(bool){ if(bool){
player.chooseUseTarget(event.cards[i],true,false); player.chooseUseTarget(event.cards[0],true,false);
} }
else event.discards.push(event.cards[0]); else event.discards.push(event.cards[0]);
event.cards.remove(event.cards[0]); event.cards.remove(event.cards[0]);
@ -4015,7 +4018,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
}, },
chanyuan:{ chanyuan:{
charlotte:true, //charlotte:true,
trigger:{ trigger:{
player:["phaseBefore","changeHp"], player:["phaseBefore","changeHp"],
}, },

3
character/yijiang.js
View File

@ -1720,7 +1720,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
enable:'phaseUse', enable:'phaseUse',
filter:function(event,player){ filter:function(event,player){
if(player.hasSkill('wengua3')) return false; if(player.hasSkill('wengua3')) return false;
return player.countCards('h')&&game.hasPlayer(function(current){ return player.countCards('he')&&game.hasPlayer(function(current){
return current.hasSkill('wengua'); return current.hasSkill('wengua');
}); });
}, },
@ -3578,6 +3578,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 0' 'step 0'
player.showCards(cards); player.showCards(cards);
'step 1' 'step 1'
cards[0].fix();
ui.cardPile.insertBefore(cards[0],ui.cardPile.firstChild); ui.cardPile.insertBefore(cards[0],ui.cardPile.firstChild);
game.updateRoundNumber(); game.updateRoundNumber();
'step 2' 'step 2'