diff --git a/card/gujian.js b/card/gujian.js index 448b843dd..87148cea0 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -268,7 +268,7 @@ card.gujian={ var nh=target.num('h'); if(nh>=3) return 1; if(target.hasSha()) return 1; - if(num&&Math.random()<0.5) return 1; + if(nh&&Math.random()<0.5) return 1; } return player.needsToDiscard?0.2:0; } @@ -354,7 +354,7 @@ card.gujian={ var nh=target.num('h'); if(nh>=3) return 1; if(target.hasSha()) return 1; - if(num&&Math.random()<0.5) return 1; + if(nh&&Math.random()<0.5) return 1; } return player.needsToDiscard?0.2:0; } @@ -1632,8 +1632,18 @@ card.gujian={ mapodoufu_info:'结束阶段，你有75%的机率弃置一名随机敌人的一张随机牌，持续三回合', }, list:[ - ['heart',2,'tanhuadong'], + ['spade',2,'tanhuadong'], ['club',1,'molicha'], + ['club',3,'chunbing'], + ['heart',12,'yougeng'], + ['heart',8,'gudonggeng'], + ['heart',1,'liyutang'], + ['diamond',4,'mizhilianou'], + ['diamond',6,'xiajiao'], + ['spade',3,'qingtuan'], + ['club',11,'luyugeng'], + ['heart',4,'mapodoufu'], + ['spade',8,'yuanbaorou'], ['spade',7,'yuheng'], ['club',4,'mutoumianju'], diff --git a/card/swd.js b/card/swd.js index 714c96d63..4cae38c8c 100644 --- a/card/swd.js +++ b/card/swd.js @@ -1120,6 +1120,7 @@ card.swd={ return 0; }, order:10.1, + value:[5,1], result:{ target:function(player,target){ if(target.hasSkill('jiguanyaoshu_skill')) return 0.5; diff --git a/character/extra.js b/character/extra.js index 8e82b5efe..7770b2a3b 100644 --- a/character/extra.js +++ b/character/extra.js @@ -718,10 +718,8 @@ character.extra={ var length=result.targets.length; for(var i=0;i=2; + return target!=player; }, filterCard:true, position:'he', @@ -41,7 +41,7 @@ character.ow={ content:function(){ 'step 0' player.judge(function(card){ - return get.color(card)=='black'?1:-1; + return get.suit(card)!='heart'?1:-1; }); 'step 1' if(result.bool){ @@ -66,18 +66,18 @@ character.ow={ }, liangou2:{ mod:{ - cardEnabled:function(card,player){ - return false; - }, - cardUsable:function(card,player){ - return false; - }, - cardRespondable:function(card,player){ - return false; - }, - cardSavable:function(card,player){ - return false; - }, + // cardEnabled:function(card,player){ + // return false; + // }, + // cardUsable:function(card,player){ + // return false; + // }, + // cardRespondable:function(card,player){ + // return false; + // }, + // cardSavable:function(card,player){ + // return false; + // }, globalTo:function(from,to){ if(from==to.storage.liangou2) return -Infinity; } @@ -90,14 +90,14 @@ character.ow={ content:function(){ trigger.num++; }, - ai:{ - effect:{ - target:function(card,player,target){ - if(get.tag(card,'damage')) return [1,-2]; - if(get.tag(card,'respond')) return [1,-1]; - } - } - } + // ai:{ + // effect:{ + // target:function(card,player,target){ + // if(get.tag(card,'damage')) return [1,-2]; + // if(get.tag(card,'respond')) return [1,-1]; + // } + // } + // } }, xiyang:{ trigger:{player:'phaseEnd'}, @@ -2947,7 +2947,7 @@ character.ow={ }, translate:{ liangou:'链钩', - liangou_info:'出牌阶段限一次，你可以弃置一张牌，指定一名体力值不小于2的角色并进行一次判定，若结果为黑色，该角色不能使用或打出卡牌、与你距离为1且受到的首次伤害+1直到回合结束', + liangou_info:'出牌阶段限一次，你可以弃置一张牌，指定一名其他角色并进行一次判定，若结果不为红桃，该角色与你距离为1且受到的首次伤害+1直到回合结束', xiyang:'吸氧', xiyang_info:'结束阶段，若你武将牌正面朝上，你可以翻面并回复两点体力', qinru:'侵入', diff --git a/character/rank.js b/character/rank.js index 56e4e2aba..e2e8cba05 100644 --- a/character/rank.js +++ b/character/rank.js @@ -9,7 +9,6 @@ window.characterRank={ 'swd_guyue', 'swd_murongshi', 'swd_cheyun', - 'swd_huanyuanzhi', 'swd_tuobayuer', 'swd_yuxiaoxue', 'gjqt_bailitusu', @@ -18,6 +17,7 @@ window.characterRank={ 'pal_liumengli', ], ap:[ + 'swd_huanyuanzhi', 'pal_xiahoujinxuan', 'swd_huiyan', 'hs_medivh', diff --git a/character/refresh.js b/character/refresh.js index 953b333d4..b5abde53e 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -394,13 +394,10 @@ character.refresh={ player.showCards(event.cards,'裸衣'); "step 2" for(var i=0;i=0){ - hasfriend=true;break; - } - } - if(!hasfriend) return; if(get.tag(card,'respondSha')||get.tag(card,'respondShan')){ if(ai.get.attitude(player,target)>0&&card.name=='juedou') return; if(target.num('h')==0) return 2; diff --git a/character/swd.js b/character/swd.js index 787d8c1a3..743aeead0 100644 --- a/character/swd.js +++ b/character/swd.js @@ -286,9 +286,15 @@ character.swd={ trigger.result={bool:true,card:{name:'shan'}} }, ai:{ - effect:{ - target:function(card,player,target,effect){ - if(get.tag(card,'respondShan')) return 0.1; + target:function(card,player,target,current){ + if(!player.isLinked()&¤t<0) return 1.5; + if(!target.hasFriend()) return; + if(get.tag(card,'loseCard')&&_status.currentPhase!=target&&target.num('he')){ + return [0.5,Math.max(2,target.num('h'))]; + } + if(get.tag(card,'respondSha')||get.tag(card,'respondShan')){ + if(ai.get.attitude(player,target)>0&&card.name=='juedou') return; + return [0.5,target.num('h','sha')+target.num('h','shan')]; } } } @@ -479,9 +485,41 @@ character.swd={ } }, hjifeng:{ + enable:'phaseUse', + filter:function(event,player){ + if(!player.num('h')) return false; + if(player.num('h',{type:'jiqi'})) return false; + return true; + }, + discard:false, + prepare:'throw2', + usable:1, + check:function(card){ + return 6-ai.get.value(card); + }, + filterCard:true, + content:function(){ + var name=get.suit(cards[0]); + ui.cardPile.insertBefore(cards[0],ui.cardPile.firstChild); + switch(name){ + case 'spade':name='qinglongzhigui';break; + case 'club':name='baishouzhihu';break; + case 'diamond':name='zhuquezhizhang';break; + case 'heart':name='xuanwuzhihuang';break; + } + player.gain(get.cardPile(name)||game.createCard(name),'draw'); + }, + ai:{ + order:4, + result:{ + player:1 + } + } + }, + hjifeng_old:{ trigger:{player:'phaseEnd'}, filter:function(event,player){ - if(!player.num('e')) return false; + if(!player.num('he',{type:'equip'})) return false; if(player.num('h',{type:'jiqi'})) return false; if(get.cardPile(function(card){return get.type(card)=='jiqi'})) return true; return false; @@ -489,7 +527,7 @@ character.swd={ direct:true, content:function(){ 'step 0' - player.chooseToDiscard('e','祭风：是否弃置一张装备牌并获得一张祭器牌？').set('ai',function(card){ + player.chooseToDiscard('he','祭风：是否弃置一张装备牌并获得一张祭器牌？',{type:'equip'}).set('ai',function(card){ return 6-ai.get.value(card); }).logSkill='hjifeng'; 'step 1' @@ -7429,6 +7467,7 @@ character.swd={ forceunique:true, skillAnimation:true, filter:function(event,player){ + if(get.mode()=='identity'&&_status.mode=='zhong'&&game.zhu&&!game.zhu.isZhu) return false; return !player.storage.duijue; }, filterTarget:function(card,player,target){ @@ -8714,7 +8753,7 @@ character.swd={ mufeng:'沐风', mufeng_info:'在一名角色的结束阶段，若你的手牌数比其少，你可以将手牌补至与该角色相同（最多补至5），每轮限一次', hjifeng:'祭风', - hjifeng_info:'结束阶段，若你手牌中没有祭器牌，你可以弃置一张装备区内的牌，并从牌堆中获得一张随机祭器', + hjifeng_info:'出牌阶段限一次，若你手牌中没有祭器牌，你可以将一张手牌置于牌堆顶，并根据其花色获得对应祭器。黑桃：青龙之圭；梅花：白兽之琥；方片：朱雀之璋；红桃：玄武之璜', mufeng_old_info:'锁定技，每当你于回合外失去牌，你的防御距离+1；若防御距离的变化值超过了存活角色数的一半，则降至0', lexue:'乐学', lexue_info:'回合内，你随机获得制衡、集智、缔盟、驱虎中的一个技能；回合外，你随机获得遗计、急救、鬼道、反馈中的一个技能', diff --git a/game/game.js b/game/game.js index 62071267b..b0d2adb69 100644 --- a/game/game.js +++ b/game/game.js @@ -1739,7 +1739,7 @@ }, tao:{ name:'桃', - init:'0.5', + init:'0', item:{ '1':'补充全部', '0.5':'补充一半', @@ -1748,7 +1748,7 @@ }, jiu:{ name:'酒', - init:'0.5', + init:'0', item:{ '1':'补充全部', '0.5':'补充一半', @@ -27113,7 +27113,7 @@ else{ this.parentNode.previousSibling.remove(); this.parentNode.remove(); - delete lib.config.gameRecord[this.parentNode.link]; + lib.config.gameRecord[this.parentNode.link]={data:{}}; game.saveConfig('gameRecord',lib.config.gameRecord); } }