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

t

This commit is contained in:
libccy 2017-07-23 16:42:56 +08:00
parent 5a4c15848c
commit 2101d0b36b
5 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
card/gujian.js
View File

@ -226,7 +226,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
target.$gain2(cards); target.$gain2(cards);
target.storage.mapodoufu=card; target.storage.mapodoufu=card;
target.storage.mapodoufu_markcount=3; target.storage.mapodoufu_markcount=2;
target.addSkill('mapodoufu'); target.addSkill('mapodoufu');
}, },
ai:{ ai:{
@ -1034,7 +1034,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
nopop:true, nopop:true,
intro:{ intro:{
content:function(storage,player){ content:function(storage,player){
return '你受到杀造成的伤害时有50%的机率令伤害-1（剩余'+player.storage.gudonggeng_markcount+'回合）' return '当你下一次受到杀造成的伤害时，令伤害-1（剩余'+player.storage.gudonggeng_markcount+'回合）'
} }
}, },
content:function(){ content:function(){
@ -1053,11 +1053,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){
damage:{ damage:{
trigger:{player:'damageBegin'}, trigger:{player:'damageBegin'},
filter:function(event,player){ filter:function(event,player){
return event.card&&event.card.name=='sha'&&event.num>0&&Math.random()<0.5; return event.card&&event.card.name=='sha'&&event.num>0;
}, },
forced:true, forced:true,
content:function(){ content:function(){
trigger.num--; trigger.num--;
delete player.storage.gudonggeng;
delete player.storage.gudonggeng_markcount;
player.removeSkill('gudonggeng');
} }
} }
}, },
@ -1226,14 +1229,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
nopop:true, nopop:true,
intro:{ intro:{
content:function(storage,player){ content:function(storage,player){
return '结束阶段有，你50%机率摸一张牌（剩余'+player.storage.tanhuadong_markcount+'回合）' return '出牌阶段结束时，你摸一张牌（剩余'+player.storage.tanhuadong_markcount+'回合）'
} }
}, },
content:function(){ content:function(){
if(Math.random()<0.5){
player.logSkill('tanhuadong');
player.draw();
}
player.storage.tanhuadong_markcount--; player.storage.tanhuadong_markcount--;
if(player.storage.tanhuadong_markcount==0){ if(player.storage.tanhuadong_markcount==0){
delete player.storage.tanhuadong; delete player.storage.tanhuadong;
@ -1243,6 +1242,16 @@ game.import('card',function(lib,game,ui,get,ai,_status){
else{ else{
player.updateMarks(); player.updateMarks();
} }
},
group:'tanhuadong_draw',
subSkill:{
draw:{
trigger:{player:'phaseUseEnd'},
forced:true,
content:function(){
player.draw();
}
}
} }
}, },
mapodoufu:{ mapodoufu:{
@ -1253,11 +1262,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
nopop:true, nopop:true,
intro:{ intro:{
content:function(storage,player){ content:function(storage,player){
return '结束阶段，你有65%的机率弃置一名随机敌人的一张随机牌（剩余'+player.storage.mapodoufu_markcount+'回合）' return '结束阶段，你随机弃置一名随机敌人的一张随机牌（剩余'+player.storage.mapodoufu_markcount+'回合）'
} }
}, },
content:function(){ content:function(){
if(Math.random()<0.65){
var list=player.getEnemies(); var list=player.getEnemies();
for(var i=0;i<list.length;i++){ for(var i=0;i<list.length;i++){
if(!list[i].countCards('he')){ if(!list[i].countCards('he')){
@ -1270,7 +1278,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
target.discard(target.getCards('he').randomGet()); target.discard(target.getCards('he').randomGet());
target.addExpose(0.2); target.addExpose(0.2);
} }
}
player.storage.mapodoufu_markcount--; player.storage.mapodoufu_markcount--;
if(player.storage.mapodoufu_markcount==0){ if(player.storage.mapodoufu_markcount==0){
delete player.storage.mapodoufu; delete player.storage.mapodoufu;
@ -1580,7 +1588,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
chunbing:'春饼', chunbing:'春饼',
chunbing_info:'你的手牌上限+1，持续五回合', chunbing_info:'你的手牌上限+1，持续五回合',
gudonggeng:'骨董羹', gudonggeng:'骨董羹',
gudonggeng_info:'你受到杀造成的伤害时有50%的机率令伤害-1，持续三回合', gudonggeng_info:'当你下一次受到杀造成的伤害时，令伤害-1，持续三回合',
yougeng:'酉羹', yougeng:'酉羹',
yougeng_info:'准备阶段，若你的体力值为全场最少或之一，你回复一点体力，持续两回合', yougeng_info:'准备阶段，若你的体力值为全场最少或之一，你回复一点体力，持续两回合',
liyutang:'鲤鱼汤', liyutang:'鲤鱼汤',
@ -1590,7 +1598,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
xiajiao:'虾饺', xiajiao:'虾饺',
xiajiao_info:'你在摸牌阶段额外摸一张牌，并在摸牌阶段时弃置一张牌，持续三回合', xiajiao_info:'你在摸牌阶段额外摸一张牌，并在摸牌阶段时弃置一张牌，持续三回合',
tanhuadong:'昙花冻', tanhuadong:'昙花冻',
tanhuadong_info:'结束阶段，你有50%的机率摸一张牌，持续三回合', tanhuadong_info:'出牌阶段结束时，你摸一张牌，持续三回合',
qingtuan:'青团', qingtuan:'青团',
qingtuan_info:'你在回合内使用首张杀时摸一张牌，持续两回合', qingtuan_info:'你在回合内使用首张杀时摸一张牌，持续两回合',
luyugeng:'鲈鱼羹', luyugeng:'鲈鱼羹',
@ -1600,7 +1608,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
molicha:'茉莉茶', molicha:'茉莉茶',
molicha_info:'弃置判定区内的所有牌；你不能成为过河拆桥或延时锦囊牌的目标，持续五回合', molicha_info:'弃置判定区内的所有牌；你不能成为过河拆桥或延时锦囊牌的目标，持续五回合',
mapodoufu:'麻婆豆腐', mapodoufu:'麻婆豆腐',
mapodoufu_info:'结束阶段，你有65%的机率弃置一名随机敌人的一张随机牌，持续三回合', mapodoufu_info:'结束阶段，你弃置一名随机敌人的一张随机牌，持续两回合',
}, },
list:[ list:[
['spade',2,'tanhuadong'], ['spade',2,'tanhuadong'],

5
card/gwent.js
View File

@ -861,12 +861,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){
es2.push(game.createCard(list.randomGet())); es2.push(game.createCard(list.randomGet()));
} }
if(es2.length){ if(es2.length){
event.delay=true;
player.$draw(es2); player.$draw(es2);
for(var i=0;i<es2.length;i++){ for(var i=0;i<es2.length;i++){
player.equip(es2[i]); player.equip(es2[i]);
} }
} }
'step 3' 'step 3'
if(event.delay) game.delay();
player.addTempSkill('qianxing',{player:'phaseBegin'}); player.addTempSkill('qianxing',{player:'phaseBegin'});
}, },
contentAfter:function(){ contentAfter:function(){
@ -1816,6 +1818,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
skill:{ skill:{
gw_kunenfayin:{ gw_kunenfayin:{
mark:true, mark:true,
nopop:true,
intro:{ intro:{
content:'不能成为其他角色的普通锦囊牌的目标（剩余#回合）' content:'不能成为其他角色的普通锦囊牌的目标（剩余#回合）'
}, },
@ -1873,6 +1876,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
}, },
trigger:{player:'phaseEnd'}, trigger:{player:'phaseEnd'},
forced:true, forced:true,
nopop:true,
content:function(){ content:function(){
player.randomDiscard(); player.randomDiscard();
player.storage.gw_nuhaifengbao--; player.storage.gw_nuhaifengbao--;
@ -1971,6 +1975,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
trigger:{global:'phaseEnd'}, trigger:{global:'phaseEnd'},
forced:true, forced:true,
mark:true, mark:true,
nopop:true,
process:function(player){ process:function(player){
if(player.hasSkill('gw_dieyi')){ if(player.hasSkill('gw_dieyi')){
player.storage.gw_dieyi++; player.storage.gw_dieyi++;

4
character/gwent.js
View File

@ -242,8 +242,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
silent:true, silent:true,
content:function(){ content:function(){
if(typeof player.storage.gwjieyin_round=='number'){ if(typeof player.storage.gwjieyin_round=='number'){
if((game.roundNumber-player.storage.gwjieyin_round)%2==0){ var num=game.roundNumber-player.storage.gwjieyin_round;
if(num&&num%2==0){
player.storage.gwjieyin.length=0; player.storage.gwjieyin.length=0;
player.storage.gwjieyin_round=game.roundNumber;
} }
} }
else{ else{

10
game/game.js
View File

@ -13602,7 +13602,7 @@
if(num==undefined) return 0; if(num==undefined) return 0;
return num; return num;
}, },
getStockSkills:function(unowned){ getStockSkills:function(unowned,unique){
var list=[]; var list=[];
if(lib.character[this.name]&&!this.isUnseen(0)){ if(lib.character[this.name]&&!this.isUnseen(0)){
list.addArray(lib.character[this.name][3]); list.addArray(lib.character[this.name][3]);
@ -13617,6 +13617,14 @@
} }
} }
} }
if(!unique){
for(var i=0;i<list.length;i++){
var info=lib.skill[list[i]];
if(!info||info.unique||info.temp||info.sub){
list.splice(i--,1);
}
}
}
return list; return list;
}, },
getCards:function(arg1,arg2){ getCards:function(arg1,arg2){

1
game/update.js
View File

@ -14,6 +14,7 @@ window.noname_update={
// 'card/*', // 'card/*',
'card/gwent.js', 'card/gwent.js',
'card/swd.js', 'card/swd.js',
'card/gujian.js',
// 'character/*', // 'character/*',
'character/hearth.js', 'character/hearth.js',
'character/extra.js', 'character/extra.js',