This commit is contained in:
libccy 2016-04-09 15:58:45 +08:00
parent cb6d86509e
commit 5005ecf03e
8 changed files with 69 additions and 52 deletions

View File

@ -1385,6 +1385,7 @@ card.standard={
event.state=true; event.state=true;
event.card=trigger.card; event.card=trigger.card;
event._global_waiting=true; event._global_waiting=true;
event.tempnowuxie=(trigger.targets&&trigger.targets.length>1&&!trigger.multitarget);
event.filterCard=function(card,player){ event.filterCard=function(card,player){
if(card.name!='wuxie') return false; if(card.name!='wuxie') return false;
var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.get('s')); var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.get('s'));
@ -1494,7 +1495,8 @@ card.standard={
} }
else{ else{
event.current=event.list.shift(); event.current=event.list.shift();
event.send(event.current,event.state,event.triggername=='phaseJudge',event.card,event.source,event.target,event.targets,event.id); event.send(event.current,event.state,event.triggername=='phaseJudge',
event.card,event.source,event.target,event.targets,event.id,trigger.parent.id,event.tempnowuxie);
} }
'step 3' 'step 3'
if(result.bool){ if(result.bool){
@ -1528,7 +1530,6 @@ card.standard={
} }
} }
}; };
var tempnowuxie=(trigger.targets&&trigger.targets.length>1&&!trigger.multitarget);
var withme=false; var withme=false;
var withol=false; var withol=false;
@ -1538,13 +1539,13 @@ card.standard={
withol=true; withol=true;
list[i].wait(sendback); list[i].wait(sendback);
list[i].send(event.send,list[i],event.state,event.triggername=='phaseJudge', list[i].send(event.send,list[i],event.state,event.triggername=='phaseJudge',
event.card,event.source,event.target,event.targets,event.id,trigger.parent.id,tempnowuxie); event.card,event.source,event.target,event.targets,event.id,trigger.parent.id,event.tempnowuxie);
list.splice(i--,1); list.splice(i--,1);
} }
else if(list[i]==game.me){ else if(list[i]==game.me){
withme=true; withme=true;
event.send(list[i],event.state,event.triggername=='phaseJudge', event.send(list[i],event.state,event.triggername=='phaseJudge',
event.card,event.source,event.target,event.targets,event.id,trigger.parent.id,tempnowuxie); event.card,event.source,event.target,event.targets,event.id,trigger.parent.id,event.tempnowuxie);
list.splice(i--,1); list.splice(i--,1);
} }
} }

View File

@ -3786,7 +3786,7 @@ character.hearth={
moying_old_info:'每当你造成或受到一次伤害,你可以令伤害目标或来源进行一次判定,若结果为黑色,其流失一点体力', moying_old_info:'每当你造成或受到一次伤害,你可以令伤害目标或来源进行一次判定,若结果为黑色,其流失一点体力',
jingxiang:'镜像', jingxiang:'镜像',
jingxiang_info:'每当你需要打出卡牌时,你可以观看一名随机角色的手牌并将其视为你的手牌打出', jingxiang_info:'每当你需要打出卡牌时,你可以观看一名随机角色的手牌并将其视为你的手牌打出',
tuteng:'图腾', tuteng:'元素',
tuteng_info:'出牌阶段你可以获得一个基础图腾你最多可以同时拥有3个图腾每当你受到一次伤害你随机失去一个图腾', tuteng_info:'出牌阶段你可以获得一个基础图腾你最多可以同时拥有3个图腾每当你受到一次伤害你随机失去一个图腾',
zuling:'祖灵', zuling:'祖灵',
zuling_info:'觉醒技回合开始阶段若你拥有至少3个图腾你失去一点体力上限并解锁强化图腾', zuling_info:'觉醒技回合开始阶段若你拥有至少3个图腾你失去一点体力上限并解锁强化图腾',

View File

@ -168,10 +168,11 @@ character.shenhua={
var fang=player.hp>=2&&player.num('h')<=player.hp+1; var fang=player.hp>=2&&player.num('h')<=player.hp+1;
player.chooseTarget('是否发动【放权】?',function(card,player,target){ player.chooseTarget('是否发动【放权】?',function(card,player,target){
return target!=player; return target!=player;
}).ai=function(target){ }).set('ai',function(target){
if(!fang) return -1; if(!_status.event.fang) return -1;
if(target.num('j','lebu')) return -1;
return ai.get.attitude(player,target)-4; return ai.get.attitude(player,target)-4;
}; }).set('fang',fang);
"step 1" "step 1"
if(result.bool){ if(result.bool){
player.logSkill('fangquan',result.targets); player.logSkill('fangquan',result.targets);

View File

@ -4,8 +4,8 @@ window.config={
'caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu','gongsunzan'], 'caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu','gongsunzan'],
forbidversus:['swd_kangnalishi'], forbidversus:['swd_kangnalishi'],
forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin','hs_siwangzhiyi', forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin','hs_siwangzhiyi',
'gjqt_bailitusu','yuanshao','swd_anka','swd_nicole','daqiao','re_daqiao', 'gjqt_bailitusu','yuanshao','swd_anka','swd_nicole','daqiao','re_daqiao','hs_xuanzhuanjijia',
'zhuran','huatuo','swd_tuwei','hs_guldan','wangyi','caoang','swd_guyue', 'zhuran','huatuo','swd_tuwei','hs_guldan','wangyi','caoang','swd_guyue','swd_rongshuang',
'swd_jiangziya','guojia','re_guojia','shen_caocao','swd_qiner','caopi','hs_yngvar', 'swd_jiangziya','guojia','re_guojia','shen_caocao','swd_qiner','caopi','hs_yngvar',
'gjqt_aruan','swd_hanluo','hs_anduin','swd_huanglei','yxs_luzhishen','swd_muyun'], 'gjqt_aruan','swd_hanluo','hs_anduin','swd_huanglei','yxs_luzhishen','swd_muyun'],
forbidchess:['hetaihou','swd_kangnalishi'], forbidchess:['hetaihou','swd_kangnalishi'],

View File

@ -4442,7 +4442,7 @@
} }
return; return;
} }
if(ui.tempnowuxie&&ui.tempnowuxie.classList.contains('glow')){ if(ui.tempnowuxie&&ui.tempnowuxie.classList.contains('glow')&&event.getParent().state){
event.result={ event.result={
bool:false bool:false
} }
@ -10742,6 +10742,9 @@
}, },
trigger:function(name){ trigger:function(name){
if(_status.video) return; if(_status.video) return;
if(name=='gameStart'){
_status.gameStarted=true;
}
var event=this; var event=this;
var i,j,iwhile,next,add; var i,j,iwhile,next,add;
var totalPopulation=game.players.length+game.dead.length+1; var totalPopulation=game.players.length+game.dead.length+1;
@ -11521,22 +11524,14 @@
"step 0" "step 0"
if(lib.config.mode=='stone'&&_status.mode=='deck'&& if(lib.config.mode=='stone'&&_status.mode=='deck'&&
!player.isMin()&&get.type(cards[0]).indexOf('stone')==0){ !player.isMin()&&get.type(cards[0]).indexOf('stone')==0){
// var list=[]; var list=get.stonecard(1,player.career);
// for(var i=0;i<player.deckCards.length;i++){ if(list.length){
// if(get.type(player.deckCards[i])=='stonecard'){ player.gain(game.createCard(list.randomGet()),'draw');
// list.push(player.deckCards[i]); }
// } else{
// }
// if(list.length){
// var choice=list.randomGet();
// player.deckCards.remove(choice);
// player.gain(choice,'draw');
// }
// else{
// player.draw({drawDeck:1})
// }
player.draw({drawDeck:1}) player.draw({drawDeck:1})
} }
}
else{ else{
player.draw(); player.draw();
} }
@ -23019,6 +23014,7 @@
if(_status.paused2) return; if(_status.paused2) return;
if(_status.nopause) return; if(_status.nopause) return;
if(ui.pause.classList.contains('hidden')) return; if(ui.pause.classList.contains('hidden')) return;
if(!_status.gameStarted) return;
ui.system.hide(); ui.system.hide();
game.pause2(); game.pause2();
var node=ui.create.pause().animate('start'); var node=ui.create.pause().animate('start');

View File

@ -1,11 +1,6 @@
window.noname_update={ window.noname_update={
version:'1.8.4.1', version:'1.8.4.2',
changeLog:[ changeLog:[
'修复几处界面问题', '修复无懈bug',
'修复完杀和双将bug',
'旁观可切换视角',
'聊天手势',
'房间信息',
'准备阶段可更改人数',
] ]
} }

View File

@ -1158,7 +1158,7 @@ mode.stone={
stone_qiezei:['male','qun',2,['rogue_touqie'],['minskin','stone'],[2,2,'rogue']], stone_qiezei:['male','qun',2,['rogue_touqie'],['minskin','stone'],[2,2,'rogue']],
stone_heitieairen:['male','qun',2,['rogue_qiancang'],['minskin','stone'],[4,3,'rogue']], stone_heitieairen:['male','qun',2,['rogue_qiancang'],['minskin','stone'],[4,3,'rogue']],
stone_tegong:['male','qun',2,['rogue_touxi'],['minskin','stone'],[3,3,'rogue']], stone_tegong:['male','qun',2,['rogue_touxi'],['minskin','stone'],[3,3,'rogue']],
stone_haidaotoumu:['male','qun',2,['rogue_zhaomu'],['minskin','stone'],[3,2,'rogue']], stone_haidaotoumu:['male','qun',2,['rogue_zhaomu'],['minskin','stone'],[2,2,'rogue']],
stone_haidao:['male','qun',1,[],['minskin','stone','stonehidden'],[1,2,'rogue']], stone_haidao:['male','qun',1,[],['minskin','stone','stonehidden'],[1,2,'rogue']],
stone_cike:['male','qun',1,['rogue_cisha','stone_qianxing'],['minskin','stone'],[1,1,'rogue']], stone_cike:['male','qun',1,['rogue_cisha','stone_qianxing'],['minskin','stone'],[1,1,'rogue']],
stone_duyanhaidao:['male','qun',2,['rogue_duxing'],['minskin','stone'],[3,4,'rogue']], stone_duyanhaidao:['male','qun',2,['rogue_duxing'],['minskin','stone'],[3,4,'rogue']],
@ -1643,6 +1643,18 @@ mode.stone={
}, },
}, },
get:{ get:{
stonecard:function(type,career){
var list=[];
for(var i in lib.card){
if(lib.card[i].stonehidden) continue;
if(lib.card[i].type!='stonecard'&&lib.card[i].type!='stonecharacter') continue;
if(type==1&&lib.card[i].type!='stonecard') continue;
if(type==2&&lib.card[i].type!='stonecharacter') continue;
if(career&&lib.card[i].career!=career) continue;
list.push(i);
}
return list;
},
deck:function(player,name){ deck:function(player,name){
var career,deck; var career,deck;
if(name=='random'||name.indexOf('random:')==0){ if(name=='random'||name.indexOf('random:')==0){
@ -1723,7 +1735,7 @@ mode.stone={
type:'stonecard', type:'stonecard',
fullimage:true, fullimage:true,
enable:true, enable:true,
stoneact:2, stoneact:3,
career:'warlock', career:'warlock',
filterTarget:true, filterTarget:true,
content:function(){ content:function(){
@ -2448,19 +2460,20 @@ mode.stone={
spell_shalumingling:{ spell_shalumingling:{
type:'stonecard', type:'stonecard',
stoneact:3, stoneact:2,
career:'hunter', career:'hunter',
enable:true, enable:true,
fullimage:true, fullimage:true,
filterTarget:true, filterTarget:true,
content:function(){ content:function(){
'step 0' var num=1;
target.damage(2);
'step 1'
var friends=player.getFellow(); var friends=player.getFellow();
if(friends.length){ for(var i=0;i<friends.length;i++){
game.asyncDraw(friends); if(lib.beastList.contains(friends[i].name)){
num=2;break;
} }
}
target.damage(num);
}, },
ai:{ ai:{
order:7, order:7,
@ -3120,7 +3133,7 @@ mode.stone={
}, },
spell_hanbingpingzhang:{ spell_hanbingpingzhang:{
type:'stonecard', type:'stonecard',
stoneact:2, stoneact:1,
career:'mage', career:'mage',
enable:true, enable:true,
fullimage:true, fullimage:true,
@ -3232,7 +3245,11 @@ mode.stone={
career:'mage', career:'mage',
filterTarget:true, filterTarget:true,
content:function(){ content:function(){
target.damage(4,'fire'); var num=4;
if(!target.isMin()){
num=Math.min(4,target.hp);
}
target.damage(num,'fire');
}, },
ai:{ ai:{
order:8, order:8,
@ -4979,7 +4996,11 @@ mode.stone={
career:'mage', career:'mage',
filterTarget:true, filterTarget:true,
content:function(){ content:function(){
target.damage(3,'fire'); var num=3;
if(!target.isMin()){
num=Math.min(3,target.hp);
}
target.damage(num,'fire');
}, },
ai:{ ai:{
order:8, order:8,
@ -5188,7 +5209,7 @@ mode.stone={
if(player.isMin()) return false; if(player.isMin()) return false;
return player.canAddFellow(); return player.canAddFellow();
}, },
stoneact:5, stoneact:6,
filterTarget:function(card,player,target){ filterTarget:function(card,player,target){
return target.isMin()&&target.side!=player.side; return target.isMin()&&target.side!=player.side;
}, },
@ -5196,6 +5217,9 @@ mode.stone={
target.getLeader().removeFellow(target); target.getLeader().removeFellow(target);
target.side=player.side; target.side=player.side;
player.addFellow(target); player.addFellow(target);
if(!target.isTurnedOver()){
target.turnOver();
}
}, },
ai:{ ai:{
order:9.5, order:9.5,
@ -9387,7 +9411,7 @@ mode.stone={
hunter_tanxianmao_info:'你死亡时,将一张探险帽置入主将的手牌', hunter_tanxianmao_info:'你死亡时,将一张探险帽置入主将的手牌',
spell_tanxianmao_info:'令一名友方随从增加一点体力和体力上限并摸一张牌,当该随从死亡时,将一张探险帽置入你的手牌', spell_tanxianmao_info:'令一名友方随从增加一点体力和体力上限并摸一张牌,当该随从死亡时,将一张探险帽置入你的手牌',
spell_shalumingling:'杀戮命令', spell_shalumingling:'杀戮命令',
spell_shalumingling_info:'造成两点伤害,所有友方随从摸一张牌', spell_shalumingling_info:'造成一点伤害,如果你控制任何野兽,则改为造成两点伤害',
spell_zhuizongshu:'追踪术', spell_zhuizongshu:'追踪术',
spell_zhuizongshu_info:'从牌库中随机选择三张牌,获得其中的一张', spell_zhuizongshu_info:'从牌库中随机选择三张牌,获得其中的一张',
spell_tianjiangzhuqun:'天降蛛群', spell_tianjiangzhuqun:'天降蛛群',
@ -9427,7 +9451,7 @@ mode.stone={
spell_emozhixin:'恶魔之心', spell_emozhixin:'恶魔之心',
spell_emozhixin_info:'对一名敌方随从造成四点伤害,或令一名友方随从摸四张牌', spell_emozhixin_info:'对一名敌方随从造成四点伤害,或令一名友方随从摸四张牌',
spell_ansezhadan:'暗色炸弹', spell_ansezhadan:'暗色炸弹',
spell_ansezhadan_info:'造成两点伤害,随机弃置一张手牌', spell_ansezhadan_info:'造成两点伤害',
spell_fushishu:'腐蚀术', spell_fushishu:'腐蚀术',
warlock_fushishu:'腐蚀', warlock_fushishu:'腐蚀',
warlock_fushishu_info:'下个回合结束后死亡', warlock_fushishu_info:'下个回合结束后死亡',
@ -9590,7 +9614,7 @@ mode.stone={
spell_canying:'残影', spell_canying:'残影',
spell_canying_info:'复制你的所有随从,并将其置入你的手牌', spell_canying_info:'复制你的所有随从,并将其置入你的手牌',
spell_yanbaoshu:'炎爆术', spell_yanbaoshu:'炎爆术',
spell_yanbaoshu_info:'造成四点火焰伤害', spell_yanbaoshu_info:'造成四点火焰伤害(若目标为主将,伤害不能超过目标的当前体力值)',
spell_jingxiang:'镜像', spell_jingxiang:'镜像',
spell_jingxiang_info:'召唤两个具有嘲讽且摸牌阶段不摸牌的随从', spell_jingxiang_info:'召唤两个具有嘲讽且摸牌阶段不摸牌的随从',
spell_aoshufeidan:'奥术飞弹', spell_aoshufeidan:'奥术飞弹',
@ -9611,7 +9635,7 @@ mode.stone={
spell_bianxingshu:'变形术', spell_bianxingshu:'变形术',
spell_bianxingshu_info:'将一个随从变成一只绵羊', spell_bianxingshu_info:'将一个随从变成一只绵羊',
spell_huoqiushu:'火球术', spell_huoqiushu:'火球术',
spell_huoqiushu_info:'造成三点火焰伤害', spell_huoqiushu_info:'造成三点火焰伤害(若目标为主将,伤害不能超过目标的当前体力值)',
stone_mianyang:'绵羊', stone_mianyang:'绵羊',
mage_mianyang:'绵羊', mage_mianyang:'绵羊',
@ -9974,7 +9998,7 @@ mode.stone={
shaman_zhuore:'灼热', shaman_zhuore:'灼热',
shaman_zhuore_info:'已方主将的回合结束阶段,对一名随机敌方随从造成一点伤害', shaman_zhuore_info:'已方主将的回合结束阶段,对一名随机敌方随从造成一点伤害',
_shaman_skill:'祭天', _shaman_skill:'图腾',
_shaman_skill_info:'召唤一个随机图腾', _shaman_skill_info:'召唤一个随机图腾',
_mage_skill:'火冲', _mage_skill:'火冲',
_mage_skill_info:'对一名随从造成一点火焰伤害', _mage_skill_info:'对一名随从造成一点火焰伤害',
@ -10156,7 +10180,7 @@ mode.stone={
'<li>使用随从牌可召唤一个随从随从出场时背面朝上。每一方在场的随从数不能超过4<li>随从于摸牌阶段摸牌基数为1随从的随从牌均视为闪装备牌均视为杀<li>'+ '<li>使用随从牌可召唤一个随从随从出场时背面朝上。每一方在场的随从数不能超过4<li>随从于摸牌阶段摸牌基数为1随从的随从牌均视为闪装备牌均视为杀<li>'+
'随从与其他所有角色相互距离基数为1<li>'+ '随从与其他所有角色相互距离基数为1<li>'+
'主将杀死对方随从后获得一个额外的行动值并摸两张牌,杀死己方随从无惩罚,随从杀死随从无效果'+ '主将杀死对方随从后获得一个额外的行动值并摸两张牌,杀死己方随从无惩罚,随从杀死随从无效果'+
'<li>主将可重铸随从牌但回合内总的重铸次数不能超过3随从不能重铸任何牌包括铁索等默认可以重铸的牌若重铸的牌为随从牌或法术牌则摸牌改为从牌库中获得一张法术牌'+ '<li>主将可重铸随从牌但回合内总的重铸次数不能超过3随从不能重铸任何牌包括铁索等默认可以重铸的牌若重铸的牌为随从牌或法术牌则摸牌改为获得一张随机法术牌'+
'<li>嘲讽:若一方阵营中有嘲讽角色,则同阵营的无嘲讽角色不以能成为杀目标'+ '<li>嘲讽:若一方阵营中有嘲讽角色,则同阵营的无嘲讽角色不以能成为杀目标'+
'<li>行动顺序为先主将后随从。主将或随从死亡后立即移出游戏主将死亡后替补登场替补登场时摸3+X张牌X为对方存活的随从数无替补时游戏结束' '<li>行动顺序为先主将后随从。主将或随从死亡后立即移出游戏主将死亡后替补登场替补登场时摸3+X张牌X为对方存活的随从数无替补时游戏结束'
} }

View File

@ -80,7 +80,7 @@ play.coin={
buy.listen(clickBuy); buy.listen(clickBuy);
} }
if(!game.phaseNumber){ if(!game.phaseNumber&&!game.online){
uiintro.add('下注'); uiintro.add('下注');
uiintro.add('<div class="coin_buy">本局获胜<div class="menubutton">20金</span></div></div>'); uiintro.add('<div class="coin_buy">本局获胜<div class="menubutton">20金</span></div></div>');
var bet=uiintro.content.lastChild.lastChild.lastChild; var bet=uiintro.content.lastChild.lastChild.lastChild;