This commit is contained in:
libccy 2017-02-17 18:25:01 +08:00
parent bcfd1f9b4d
commit a86ff24ad6
8 changed files with 36 additions and 11 deletions

View File

@ -810,14 +810,14 @@ card.standard={
if(target.hasSkillTag('notrick')) return 0; if(target.hasSkillTag('notrick')) return 0;
if(event.player==target){ if(event.player==target){
if(player.hasSkill('naman')) return -1; if(player.hasSkill('naman')) return -1;
if(ai.get.attitude(target,player)<0){ if(ai.get.attitude(target,player)<0||event.player.hp<=1){
return ai.get.unuseful2(card) return ai.get.unuseful2(card)
} }
return -1; return -1;
} }
else{ else{
if(target.hasSkill('naman')) return -1; if(target.hasSkill('naman')) return -1;
if(ai.get.attitude(player,target)<0){ if(ai.get.attitude(player,target)<0||event.player.hp<=1){
return ai.get.unuseful2(card) return ai.get.unuseful2(card)
} }
return -1; return -1;

View File

@ -584,7 +584,7 @@ character.hearth={
} }
var skill=list.randomGet(); var skill=list.randomGet();
var name='yushou_'+skill; var name='yushou_'+skill;
player.addTempSkill(name,{player:'phaseBegin'}); player.addSkill(name);
player.markSkillCharacter(name,'stone_'+skill,lib.translate[name],lib.translate[name+'_info']); player.markSkillCharacter(name,'stone_'+skill,lib.translate[name],lib.translate[name+'_info']);
}, },
ai:{ ai:{
@ -592,6 +592,23 @@ character.hearth={
result:{ result:{
player:1 player:1
} }
},
group:'yushou_lose'
},
yushou_lose:{
trigger:{player:'phaseBegin'},
forced:true,
popup:false,
silent:true,
content:function(){
var list=['yushou_misha','yushou_huofu','yushou_leiouke'];
var skills=player.get('s');
for(var i=0;i<list.length;i++){
if(!skills.contains(list[i])) list.splice(i--,1);
}
if(list.length){
player.removeSkill(list.randomGet());
}
} }
}, },
yushou_misha:{ yushou_misha:{
@ -604,6 +621,8 @@ character.hearth={
content:function(){ content:function(){
if(trigger.num>=1){ if(trigger.num>=1){
trigger.num--; trigger.num--;
// player.removeSkill('yushou_misha');
// player.draw();
} }
}, },
ai:{ ai:{
@ -5850,7 +5869,7 @@ character.hearth={
xingluo:'星落', xingluo:'星落',
xingluo_info:'准备阶段,你可以令任意名手牌数多于你的角色各弃置一张手牌,然后你可以从弃置的牌中选择一张加入手牌', xingluo_info:'准备阶段,你可以令任意名手牌数多于你的角色各弃置一张手牌,然后你可以从弃置的牌中选择一张加入手牌',
yushou:'御兽', yushou:'御兽',
yushou_info:'出牌阶段,你可以弃置一张牌并召唤一个随机的野兽宠物,效果持续到你的下一回合开始', yushou_info:'出牌阶段,你可以弃置一张牌并召唤一个随机的野兽宠物,回合开始阶段,你随机失去一个宠物',
yushou_misha:'米莎', yushou_misha:'米莎',
yushou_misha_info:'你每回合受到的首次伤害-1', yushou_misha_info:'你每回合受到的首次伤害-1',
yushou_huofu:'霍弗', yushou_huofu:'霍弗',

View File

@ -381,6 +381,8 @@ window.characterRank={
're_ganning', 're_ganning',
'caiwenji', 'caiwenji',
're_xushu', 're_xushu',
're_simayi',
'hs_lrexxar',
], ],
b:[ b:[
'diy_liufu', 'diy_liufu',
@ -423,10 +425,6 @@ window.characterRank={
'hs_huzhixiannv', 'hs_huzhixiannv',
'sp_sunshangxiang', 'sp_sunshangxiang',
'jiangqing', 'jiangqing',
'hs_lrexxar',
'diy_huangzhong',
'diy_weiyan',
're_simayi',
'shen_simayi', 'shen_simayi',
'swd_hanluo', 'swd_hanluo',
'swd_zhanggao', 'swd_zhanggao',

View File

@ -7090,7 +7090,7 @@ character.sp={
yjixi_info:'觉醒技结束阶段若你连续三回合没有失去过体力则你增加1点体力上限并回复1点体力然后选择一项获得技能“妄尊”或摸两张牌并获得当前主公的主公技', yjixi_info:'觉醒技结束阶段若你连续三回合没有失去过体力则你增加1点体力上限并回复1点体力然后选择一项获得技能“妄尊”或摸两张牌并获得当前主公的主公技',
xinyongsi:'庸肆', xinyongsi:'庸肆',
xinyongsi1:'庸肆', xinyongsi1:'庸肆',
xinyongsi2:'觊玺', xinyongsi2:'庸肆',
xinyongsi_info:'锁定技摸牌阶段你令额定摸牌数为X(X为势力数);弃牌阶段开始时你选择一项1.弃置一张牌;2.失去1点体力', xinyongsi_info:'锁定技摸牌阶段你令额定摸牌数为X(X为势力数);弃牌阶段开始时你选择一项1.弃置一张牌;2.失去1点体力',
xiehui:'黠慧', xiehui:'黠慧',
xiehui2:'黠慧', xiehui2:'黠慧',

View File

@ -771,6 +771,7 @@ character.xianjian={
trigger:{player:'phaseEnd'}, trigger:{player:'phaseEnd'},
direct:true, direct:true,
filter:function(event,player){ filter:function(event,player){
if(!player.num('h',{color:'black'})) return false;
if(player.storage.leiyu){ if(player.storage.leiyu){
for(var i=0;i<player.storage.leiyu.length;i++){ for(var i=0;i<player.storage.leiyu.length;i++){
if(player.storage.leiyu[i].isAlive()) return true; if(player.storage.leiyu[i].isAlive()) return true;
@ -2509,7 +2510,7 @@ character.xianjian={
feizhua:'飞爪', feizhua:'飞爪',
feizhua_info:'当你使用一张杀时,你可以将与目标相邻的角色追加为额外目标', feizhua_info:'当你使用一张杀时,你可以将与目标相邻的角色追加为额外目标',
leiyu:'雷狱', leiyu:'雷狱',
leiyu_info:'结束阶段,你可以弃置一张黑色牌,视为对本回合内所有成为过你的卡牌目标的角色使用一张惊雷闪', leiyu_info:'结束阶段,你可以弃置一张黑色牌,视为对本回合内所有成为过你的卡牌目标的角色使用一张惊雷闪',
lingxue:'灵血', lingxue:'灵血',
lingxue_info:'锁定技,每当你回复一点体力,你获得一点护甲', lingxue_info:'锁定技,每当你回复一点体力,你获得一点护甲',
zhaoyao:'招摇', zhaoyao:'招摇',

View File

@ -12870,6 +12870,7 @@
} }
}, },
removeSkill:function(skill){ removeSkill:function(skill){
if(!skill) return;
if(Array.isArray(skill)){ if(Array.isArray(skill)){
for(var i=0;i<skill.length;i++){ for(var i=0;i<skill.length;i++){
this.removeSkill(skill[i]); this.removeSkill(skill[i]);

View File

@ -27,6 +27,9 @@
#window:not(.nopointer) .dialog.fullheight .buttons .button.character:not(.squarebutton):not(.selectable){ #window:not(.nopointer) .dialog.fullheight .buttons .button.character:not(.squarebutton):not(.selectable){
cursor: default; cursor: default;
} }
#window:not(.nopointer) .obstacle.glow{
cursor: pointer;
}
#chess-container{ #chess-container{
width:100%; width:100%;
height :calc(100% - 120px); height :calc(100% - 120px);

View File

@ -85,8 +85,9 @@ mode.chess={
friend:lib.config.continue_name_chess.friend, friend:lib.config.continue_name_chess.friend,
enemy:lib.config.continue_name_chess.enemy, enemy:lib.config.continue_name_chess.enemy,
} }
_status.color=lib.config.continue_name_versus_three.color; _status.color=lib.config.continue_name_chess.color;
game.saveConfig('continue_name_chess'); game.saveConfig('continue_name_chess');
game.delay(0.5);
} }
else{ else{
game.chooseCharacterDouble(function(i){ game.chooseCharacterDouble(function(i){
@ -118,6 +119,8 @@ mode.chess={
if(_status.mode=='three'){ if(_status.mode=='three'){
_status.mylist=result.friend; _status.mylist=result.friend;
_status.enemylist=result.enemy; _status.enemylist=result.enemy;
_status.friendBackup=_status.mylist.slice(0);
_status.enemyBackup=_status.enemylist.slice(0);
} }
var mylistmap,enemylistmap; var mylistmap,enemylistmap;
if(event.video){ if(event.video){