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

Add files via upload

This commit is contained in:
Spmario233 2020-03-27 13:30:48 +08:00 committed by GitHub
parent c82fa9f289
commit 0c947afeb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 110 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
card/extra.js
View File

@ -401,12 +401,20 @@ game.import('card',function(lib,game,ui,get,ai,_status){
fullskin:true,
type:'equip',
subtype:'equip2',
loseDelay:false,
onLose:function(){
player.recover();
if(player.isDamaged()) player.logSkill('baiyin_skill');
var next=game.createEvent('baiyin_recover');
event.next.remove(next);
event.getParent().after.push(next);
next.player=player;
next.setContent(function(){
player.recover();
});
},
filterLose:function(card,player){
if(player.hasSkillTag('unequip2')) return false;
return player.hp<player.maxHp;
return true;
},
skills:['baiyin_skill'],
tag:{

2
card/guozhan.js
View File

@ -1022,6 +1022,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
return evt&&evt.card&&evt.card.name=='sha'&&event.player.countGainableCards(player,'h')>0;
},
//priority:7,
logTarget:'player',
prompt2:'获得该角色的一张手牌',
check:function(event,player){
return get.attitude(player,event.player)<0;
},

84
character/mobile.js
View File

@ -141,9 +141,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(player.hasSkillTag('unequip2')) return false;
return true;
},
onLose:function (){
player.recover();
player.draw(2);
loseDelay:false,
onLose:function(){
player.logSkill('rw_baiyin_skill');
var next=game.createEvent('rw_baiyin_recover');
event.next.remove(next);
event.getParent().after.push(next);
next.player=player;
next.setContent(function(){
player.draw(2);
player.recover();
});
},
skills:["rw_baiyin_skill"],
tag:{
@ -247,11 +255,31 @@ game.import('character',function(lib,game,ui,get,ai,_status){
valueswap:1,
},
},
skills:["zhuge_skill"],
skills:["rw_zhuge_skill"],
},
},
characterFilter:{},
skill:{
rw_zhuge_skill:{
equipSkill:true,
audio:true,
firstDo:true,
trigger:{player:'useCard1'},
forced:true,
filter:function(event,player){
return !event.audioed&&event.card.name=='sha'&&player.countUsed('sha',true)>1&&event.getParent().type=='phase';
},
content:function(){
trigger.audioed=true;
},
mod:{
cardUsable:function(card,player,num){
if(card.name=='sha'){
return Infinity;
}
}
},
},
xinqingjian:{
audio:'qingjian',
trigger:{player:'gainEnd'},
@ -344,7 +372,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
wanlan:{
audio:2,
trigger:{global:'dying'},
check:function(){return false},
check:function(event,player){
if(get.attitude(player,event.player)<4) return false;
if(player.countCards('h',function(card){
var mod2=game.checkMod(card,player,'unchanged','cardEnabled2',player);
if(mod2!='unchanged') return mod2;
var mod=game.checkMod(card,player,'unchanged','cardSavable',player);
if(mod!='unchanged') return mod;
var savable=get.info(card).savable;
if(typeof savable=='function') savable=savable(card,player,event.player);
return savable;
})>=1-event.player.hp) return false;
if(event.player==player||event.player==get.zhu(player)) return true;
if(_status.currentPhase&&get.damageEffect(_status.currentPhase,player,player)<0) return false;
return !player.hasUnknown();
},
limited:true,
unique:true,
filter:function(event,player){
@ -1053,7 +1095,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:'xinfu_wuniang',
content:function (){
'step 0'
player.chooseTarget(get.prompt('meiyong'),'获得一名其他角色的一张牌，然后摸一张牌。',function(card,player,target){
player.chooseTarget(get.prompt('meiyong'),'获得一名其他角色的一张牌，然后其摸一张牌。',function(card,player,target){
if(player==target) return false;
return target.countGainableCards(player,'he')>0;
}).set('ai',function(target){
@ -1228,12 +1270,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
shouye:{
audio:2,
group:'shouye_after',
trigger:{global:"useCard"},
trigger:{global:"useCardToTargeted"},
filter:function(event,player){
return event.player!=player&&event.targets&&
event.targets[0]==player&&event.targets.length==1;
return event.player!=player&&event.targets.length==1;
},
check:function(event,player){
if(event.player==game.me||event.player.isOnline()) return get.attitude(player,event.player)<0;
return get.effect(player,event.card,event.player,player)<0;
},
usable:1,
@ -1245,7 +1287,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 1'
if(result.bool){
trigger.excluded.add(player);
trigger.shouyeer=player;
trigger.getParent().shouyeer=player;
}
},
subSkill:{
@ -1266,12 +1308,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
content:function(){
var list=[];
for(var i=0;i<trigger.cards.length;i++){
if(trigger.cards[i].isInPile()){
list.push(trigger.cards[i]);
}
for(var i=0;i<trigger.cards.length;i++){
if(trigger.cards[i].isInPile()){
list.push(trigger.cards[i]);
}
player.gain(list,'gain2');
}
player.gain(list,'gain2','log');
},
},
},
@ -2512,11 +2554,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter:function (event,player){
if(event.type=='dying'){
if(player!=event.dying) return false;
return true;
return player.countCards('he',function(card){
return get.subtype(card)=='equip2';
})>0;
}
return player.countCards('he',function(card){
return get.subtype(card)=='equip2';
})>0;
return false;
},
check:function(){
return 1;
@ -3177,7 +3219,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"rewrite_tengjia":"桐油百韧甲",
"rewrite_tengjia_info":"锁定技，【南蛮入侵】、【万箭齐发】和普【杀】对你无效。当你受到火焰伤害时，此伤害+1。当你即将被横置时，取消之。",
"rewrite_zhuge":"元戎精械弩",
"rewrite_zhuge_info":"你于出牌阶段内使用【杀】无次数限制。",
"rewrite_zhuge_info":"锁定技，你于出牌阶段内使用【杀】无次数限制。",
rw_zhuge_skill:'诸葛连弩',
rw_zhuge_skill_info:'锁定技，你于出牌阶段内使用【杀】无次数限制。',
takaramono:"宝物",
"wolong_card":"卧龙",
"wolong_card_info":"对一名角色造成1点火焰伤害。若场上有存活的诸葛亮(火)，则改为对至多两名角色各造成两点火焰伤害。",

2
character/refresh.js
View File

@ -5389,7 +5389,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
re_zhangzhang:'界张昭张纮',
rehunzi:'魂姿',
rehunzi_info:'觉醒技，准备阶段，若你的体力值不大于2，你减1点体力上限，并获得技能〖英姿〗和〖英魂〗。',
zhijian_info:'出牌阶段，你可以将手牌中的一张装备牌置于一名其他角色装备区里（不得替换原装备），然后摸一张牌。当你使用装备牌时，你可以摸一张牌。',
rezhijian_info:'出牌阶段，你可以将手牌中的一张装备牌置于一名其他角色装备区里（不得替换原装备），然后摸一张牌。当你使用装备牌时，你可以摸一张牌。',
refangquan:'放权',
refangquan_info:'你可跳过你的出牌阶段，若如此做，你本回合的手牌上限+X（X为你已损失的体力值），且回合结束时，你可以弃置一张手牌并令一名其他角色进行一个额外的回合。',
re_wuguotai:'界吴国太',

2
character/shenhua.js
View File

@ -600,7 +600,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2,
filter:function (event,player){
if(event.player.countCards('h')<player.countCards('h')) return false;
if(event.card.name!='sha'&&event.card.name!='juedou') return true;
if(event.card.name!='sha'&&event.card.name!='juedou') return false;
return !game.hasPlayer2(function(current){
return current.getHistory('useCard',function(evt){
return evt!=event.getParent()&&evt.card&&['sha','juedou'].contains(evt.card.name)&&evt.targets.contains(player);

21
character/sp.js
View File

@ -648,6 +648,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
content:function(){
target.turnOver();
player.addTempSkill('spfuluan2');
},
ai:{
order:1,
@ -6530,12 +6531,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(mode!='chess'&&mode!='tafang'&&mode!='stone'){
event.num=Math.min(event.num,game.players.length+game.dead.length);
}
player.reinit('zhaoxiang',result.links[0],event.num);
player.reinit('zhaoxiang',result.links[0],false);
if(_status.characterlist){
_status.characterlist.add('zhaoxiang');
_status.characterlist.remove(result.links[0]);
}
'step 2'
var num=event.num-player.maxHp;
if(num>0) player.gainMaxHp(num);
else player.loseMaxHp(-num);
player.recover();
}
},
@ -14130,7 +14134,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
enable:"phaseUse",
usable:1,
filterTarget:function (card,player,target){
return player!=target&&target.countCards('e')<player.countCards('e')&&target.countCards('hej');
return player!=target&&target.countCards('e')<player.countCards('e');
},
content:function (){
"step 0"
@ -14168,8 +14172,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
target:function (player,target){
var numj=target.countCards('j');
var numhe=target.countCards('he');
if(numhe==0) return 6;
return -6+(numj+1)/numhe;
if(numhe==0) return numj>0?6:-6;
return -6-(numj+1)/numhe;
},
},
threaten:1.1,
@ -14256,7 +14260,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
content:function (){
"step 0"
if(!target.countCards('hej')){
if(target.countCards('hej')==0){
event._result={index:1};
}
else{
@ -14298,7 +14302,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter:function(event,player){
if(player.hasSkill('xinfu_sidaoy')||!player.countCards('h')) return false;
if(!event.targets||!event.targets.length||!event.isPhaseUsing(player)) return false;
var evt=player.getLastUsed(1);
var history=player.getHistory('useCard');
var index=history.indexOf(event)-1;
if(index<0) return false;
var evt=history[index];
if(!evt||!evt.targets||!evt.targets.length||!evt.isPhaseUsing(player)) return false;
for(var i=0;i<event.targets.length;i++){
if(evt.targets.contains(event.targets[i])&&lib.filter.filterTarget({name:'shunshou'},player,event.targets[i])) return true;
@ -17196,7 +17203,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
tianming_info:'当你成为【杀】的目标时，你可以弃置两张牌（不足则全弃，无牌则不弃），然后摸两张牌；若此时全场体力值最多的角色仅有一名且不是你，该角色也可以如此做。',
mizhao_info:'出牌阶段限一次，你可以将所有手牌交给一名其他角色。若如此做，你令该角色与你指定的另一名有手牌的角色拼点，视为拼点赢的角色对没赢的角色使用一张【杀】。',
yuanhu_info:'结束阶段开始时，你可以将一张装备牌置于一名角色的装备区里，然后根据此装备牌的类型执行以下对应效果。武器牌：弃置该角色距离1以内的一名角色区域中的一张牌；防具牌：该角色摸一张牌；坐骑牌：该角色回复1点体力。',
lihun_info:'出牌阶段限一次，你可以弃置一张牌并选择一名其他男性角色。若如此做，你将武将牌翻面并获得其一张手牌。出牌阶段结束时，你交给其X张牌。（X为该角色的体力值）',
lihun_info:'出牌阶段限一次，你可以弃置一张牌并选择一名其他男性角色。若如此做，你将武将牌翻面并获得其所有手牌。出牌阶段结束时，你交给其X张牌。（X为该角色的体力值）',
chongzhen_info:'当你发动〖龙胆〗使用或打出一张牌时，你可以获得对方的一张手牌。',
bifa_info:'结束阶段开始时，你可以将一张手牌移出游戏并指定一名其他角色。该角色的准备阶段开始时，其观看你移出游戏的牌并选择一项：交给你一张与此牌类型相同的手牌并获得此牌；或将此牌置入弃牌堆，然后失去1点体力。',
songci_info:'出牌阶段，你可以选择一项：令一名手牌数小于其体力值的角色摸两张牌；或令一名手牌数大于其体力值的角色弃置两张牌。每局游戏每名角色限一次。',

1
character/xinghuoliaoyuan.js
View File

@ -1439,6 +1439,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
aiValue:function(player,card,num){
if(card.name=='zhangba') return 15;
if(player.getEquip('zhangba')&&player.countCards('h')>1&&['shan','tao'].contains(card.name)) return 0;
if(card.name=='shan'||card.name=='tao') return num/2;
},
},
locked:false,

9
game/game.js
View File

@ -13044,7 +13044,8 @@
player.line(target,'green');
}
if(!event.chooseonly){
var next=target.discard(event.cards,'notBySelf');
var next=target.discard(event.cards);
if(player!=target) next.notBySelf=true;
event.done=next;
if(event.delay===false){
next.set('delay',false);
@ -17932,9 +17933,9 @@
for(var i=0;i<es.length;i++){
if(game.hasPlayer(function(current2){
if(withatt){
if(get.sgn(get.value(es[i]))!=-att) return false;
if(get.sgn(get.value(es[i],current))!=-att) return false;
var att2=get.sgn(get.attitude(player,current2));
if(att2!=-att) return false;
if(att2!=get.sgn(get.value(es[i],current2))) return false;
}
return current!=current2&&!current2.isMin()&&current2.isEmpty(get.subtype(es[i]));
})){
@ -50432,7 +50433,7 @@
else final=(result1*get.attitude(player,player)+(target?result2*get.attitude(player,target):0));
if(!isLink&&get.tag(card,'natureDamage')&&target.isLinked()&&!zerotarget){
game.countPlayer(function(current){
if(current!=target&&current.isLinked) final+=get.effect(current,card,player,player2,true);
if(current!=target&&current.isLinked()) final+=get.effect(current,card,player,player2,true);
})
}
return final;

24
game/update.js
View File

@ -1,6 +1,6 @@
window.noname_update={
version:'1.9.98.4.2',
update:'1.9.98.4.1',
version:'1.9.98.4.3',
update:'1.9.98.4.2',
changeLog:[
'bug修复',
],
@ -8,19 +8,19 @@ window.noname_update={
'card/extra.js',
//'card/huanlekapai.js',
//'card/sp.js',
'card/standard.js',
//'card/standard.js',
//'card/swd.js',
//'card/mtg.js',
//'card/guozhan.js',
'card/guozhan.js',
//'card/gwent.js',
//'card/zhenfa.js',
'card/zhulu.js',
'character/diy.js',
'character/extra.js',
//'card/zhulu.js',
//'character/diy.js',
//'character/extra.js',
//'character/hearth.js',
'character/gujian.js',
//'character/gujian.js',
//'character/gwent.js',
'character/hearth.js',
//'character/hearth.js',
'character/mobile.js',
//'character/mtg.js',
//'character/old.js',
@ -28,16 +28,16 @@ window.noname_update={
'character/shenhua.js',
'character/sp.js',
//'character/tw.js',
'character/standard.js',
//'character/standard.js',
//'character/swd.js',
//'character/xianjian.js',
'character/xinghuoliaoyuan.js',
'character/yijiang.js',
//'character/yijiang.js',
//'character/yxs.js',
//'extension/boss/extension.js',
//'layout/default/layout.css',
//'layout/nova/layout.css',
'mode/identity.js',
//'mode/identity.js',
//'mode/doudizhu.js',
//'mode/guozhan.js',
//'mode/chess.js',