Merge pull request #19 from imzhaoyun/master

神愤,武魂,已修复
This commit is contained in:
libccy 2018-08-20 22:12:46 +08:00 committed by GitHub
commit 1584f74f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 37 deletions

View File

@ -3,7 +3,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return {
name:'extra',
character:{
shen_guanyu:['male','shen',6,['wuhun','wushen'],['shu']],
shen_guanyu:['male','shen',5,['wuhun','wushen'],['shu']],
shen_zhaoyun:['male','shen',2,['juejing','longhun'],['shu']],
shen_zhugeliang:['male','shen',3,['qixing','kuangfeng','dawu'],['shu']],
shen_lvmeng:['male','shen',3,['shelie','gongxin'],['wu']],
@ -46,10 +46,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(event.targets2.length){
var cur=event.targets2.shift();
if(cur&&cur.countCards('he')){
cur.chooseToDiscard('he',true,4);
cur.chooseToDiscard('e',true,Infinity);
cur.chooseToDiscard('h',true,4);
}
event.redo();
}
"step 3"
player.turnOver();
},
ai:{
combo:'baonu',
@ -247,6 +250,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
baonu:{
audio:2,
mark:true,
marktext:'暴',
init:function(player){
player.storage.baonu=2;
player.markSkill('baonu');
@ -618,7 +622,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
wuhun:{
trigger:{
player:'damageEnd',
player:"damageEnd",
},
alter:true,
filter:function (event,player){
@ -627,27 +631,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return true;
},
forced:true,
init:function (player){
for(var i=0;i<game.players.length;i++){
game.players[i].storage.wuhun_mark=0;
}
},
content:function (){
if(!trigger.source.storage.wuhun_mark){
trigger.source.storage.wuhun_mark=0;
}
trigger.source.storage.wuhun_mark+=trigger.num;
trigger.source.syncStorage('wuhun_mark');
trigger.source.markSkill('wuhun_mark');
},
global:['wuhun_mark'],
global:["wuhun_mark"],
subSkill:{
mark:{
marktext:'魇',
marktext:"魇",
intro:{
content:'mark',
content:"mark",
},
sub:true,
},
},
},
group:['wuhun2','wuhun4','wuhun5'],
},
group:["wuhun2","wuhun4","wuhun5"],
}
wuhun2:{
trigger:{
player:'dieBegin',
@ -712,6 +715,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
})
"step 1"
if(result.judge==-2){
player.removeSkill('wuhun3');
player.die();
}
player.removeSkill('wuhun3');
@ -737,7 +741,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
forced:true,
popup:false,
filter:function(event){
if(!event.source==undefined&&!get.is.altered('wuhun')) return true
if(event.source!=player&&event.source!=undefined&&!get.is.altered('wuhun')) return true
return false;
},
content:function(){
@ -1493,7 +1497,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
kuangfeng_info:'结束阶段你可以弃掉1枚“星”指定一名角色直到你的下回合开始该角色每次受到的火焰伤害+1。',
baonu:'狂暴',
baonu_bg:'暴',
baonu_info:'锁定技,游戏开始时,你获得两枚暴怒标记,每当你造成或受到一点伤害,你获得一枚暴怒标记',
baonu_info:'锁定技,游戏开始时,你获得两枚“暴怒”标记,;锁定技,每当你造成/受到1点伤害后你获得1枚“暴怒”标记。',
shenfen:'神愤',
shenfen_info:'限定技出牌阶段你可以弃置6枚暴怒标记对场上所有其他角色造成一点伤害然后令其弃置4张牌',
wuqian:'无前',