官！渡！之！战！

libccy · Jul 17, 2020 · 21a77e8 · 21a77e8
1 parent ef9e08b
commit 21a77e8
Show file tree

Hide file tree

Showing 79 changed files with 1,274 additions and 108 deletions.
diff --git a/audio/die/chunyuqiong.mp3 b/audio/die/chunyuqiong.mp3
diff --git a/audio/die/sp_xuyou.mp3 b/audio/die/sp_xuyou.mp3
diff --git a/audio/die/xingdaorong.mp3 b/audio/die/xingdaorong.mp3
diff --git a/audio/die/yl_yuanshu.mp3 b/audio/die/yl_yuanshu.mp3
diff --git a/audio/skill/cangchu1.mp3 b/audio/skill/cangchu1.mp3
diff --git a/audio/skill/cangchu2.mp3 b/audio/skill/cangchu2.mp3
diff --git a/audio/skill/chenggong1.mp3 b/audio/skill/chenggong1.mp3
diff --git a/audio/skill/chenggong2.mp3 b/audio/skill/chenggong2.mp3
diff --git a/audio/skill/drlt_weidi1.mp3 b/audio/skill/drlt_weidi1.mp3
diff --git a/audio/skill/drlt_weidi2.mp3 b/audio/skill/drlt_weidi2.mp3
diff --git a/audio/skill/drlt_yongsi1.mp3 b/audio/skill/drlt_yongsi1.mp3
diff --git a/audio/skill/drlt_yongsi2.mp3 b/audio/skill/drlt_yongsi2.mp3
diff --git a/audio/skill/liangying1.mp3 b/audio/skill/liangying1.mp3
diff --git a/audio/skill/spshicai1.mp3 b/audio/skill/spshicai1.mp3
diff --git a/audio/skill/spshicai2.mp3 b/audio/skill/spshicai2.mp3
diff --git a/audio/skill/sushou1.mp3 b/audio/skill/sushou1.mp3
diff --git a/audio/skill/sushou2.mp3 b/audio/skill/sushou2.mp3
diff --git a/audio/skill/xuxie1.mp3 b/audio/skill/xuxie1.mp3
diff --git a/audio/skill/xuxie2.mp3 b/audio/skill/xuxie2.mp3
diff --git a/card/guozhan.js b/card/guozhan.js
@@ -245,21 +245,27 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				audio:true,
 				type:'trick',
 				enable:function(card,player){
+					if(get.mode()=='versus') return true;
 					return game.hasPlayer(function(current){
 						return current.isMajor();
 					});
 				},
-				mode:['guozhan'],
+				mode:['guozhan','versus'],
 				filterTarget:true,
 				chongzhu:true,
 				changeTarget:function(player,targets){
 					var target=targets[0];
 					game.filterPlayer(function(current){
+						if(get.mode()=='versus') return current.isFriendOf(target);
 						return current.isMajor()==target.isMajor()&&current!=target&&!current.hasSkill('diaohulishan');
 					},targets);
 				},
 				content:function(){
-					if(target.isLinked()){
+					if(get.mode()=='versus'){
+						if(target.isEnemyOf(player)) target.link(true);
+						else if(target.isLinked()) target.draw();
+					}
+					else if(target.isLinked()){
 						target.draw();
 					}
 					else{
@@ -275,6 +281,16 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					},
 					result:{
 						player:function(player,target){
+							if(get.mode()=='versus') return game.countPlayer(function(current){
+								if(target.isFriendOf(current)){
+									if(current.isFriendOf(player)&&current.isLinked()){
+										return get.attitude(player,target);
+									}
+									else if(current.isEnemyOf(player)&&!current.isLinked()){
+										return -get.attitude(player,target)*0.6;
+									}
+								}
+							});
 							return game.countPlayer(function(current){
 								if(target.isMajor()==current.isMajor()){
 									if(current.isLinked()){
@@ -1377,6 +1393,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			shuiyanqijunx_info:'出牌阶段，对一名装备区里有牌的其他角色使用。目标角色选择一项：1、弃置装备区里的所有牌；2、受到你造成的1点雷电伤害',
 			lulitongxin:'勠力同心',
 			lulitongxin_info:'出牌阶段，对所有大势力角色或所有小势力角色使用。若目标角色：不处于“连环状态”，其横置；处于“连环状态”，其摸一张牌',
+			lulitongxin_info_versus:'出牌阶段，对所有敌方角色或所有己方角色使用。若目标角色：为敌方角色且不处于“连环状态”，其横置；为己方角色且处于“连环状态”，其摸一张牌。',
 			lianjunshengyan:'联军盛宴',
 			lianjunshengyan_info:'出牌阶段，对你和你选择的除你的势力外的一个势力的所有角色。若目标角色：为你，你选择摸Y张牌并回复X-Y点体力（X为该势力的角色数，Y∈[0,X]）；不为你，其摸一张牌，然后重置。',
 			lianjunshengyan_info_boss:'出牌阶段，对场上所有角色使用。你摸X张牌（X为目存活角色数），其他角色依次选择回复1点体力或摸一张牌。',

diff --git a/card/standard.js b/card/standard.js
@@ -1682,22 +1682,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				direct:true,
 				filter:function(event,player){
 					if(get.mode()=='guozhan') return false;
-					return player.canUse('sha',event.target,false)&&player.hasSha();
+					return player.canUse('sha',event.target,false)&&(player.hasSha()||_status.connectMode&&player.countCards('h'));
 				},
 				content:function(){
 					"step 0"
-					if(player.hasSkill('jiu')){
-						game.broadcastAll(function(player){
-							player.removeSkill('jiu');
-						},player);
-						event.jiu=true;
-					}
-					player.chooseToUse(get.prompt('qinglong'),{name:'sha'},trigger.target,-1).set('addCount',false).logSkill='qinglong_skill';
-					"step 1"
-					if(result.bool);
-					else if(event.jiu){
-						player.addSkill('jiu');
-					}
+					player.chooseToUse(get.prompt('qinglong'),function(card,player,event){
+						if(get.name(card)!='sha') return false;
+						return lib.filter.filterCard.apply(this,arguments);
+					},trigger.target,-1).set('addCount',false).logSkill='qinglong_skill';
 				}
 			},
 			zhangba_skill:{

diff --git a/character/diy.js b/character/diy.js
@@ -1527,7 +1527,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					});
 					'step 1'
 					if(result.bool){
-						player.chooseTarget(lib.filter.notMe,true,'选择一名其他角色，对其造成1点雷属性伤害');
+						player.chooseTarget(lib.filter.notMe,true,'选择一名其他角色，对其造成1点雷属性伤害').set('',function(target){
+							var player=_status.event.player;
+							return get.damageEffect(target,player,player,'thunder');
+						});
 					}
 					else event.finish();
 					'step 2'
@@ -2532,7 +2535,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					target.chooseToUse({
 						cards:cards,
 						filterCard:function(card){
-							if(!_status.event.cards.contains(card)) return false;
+							if(get.itemtype(card)!='card'||!_status.event.cards||!_status.event.cards.contains(card)) return false;
 							return lib.filter.filterCard.apply(this,arguments);
 						},
 						prompt:'是否使用得到的牌中的一张？',
@@ -8887,7 +8890,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			haruka_shuangche:'双掣',
 			kanata_shuangche:'双掣',
 			haruka_shuangche_backup:'双掣',
-			haruka_shuangche_info:'出牌阶段，你可以视为使用任意基本牌或普通锦囊牌。此牌结算完成后，你选择一项：1.弃置X张牌。2.失去1点体力且本回合内不能再发动〖双掣〗。',
+			haruka_shuangche_info:'出牌阶段，你可以视为使用任意基本牌或普通锦囊牌。此牌结算完成后，你选择一项：1.弃置X张牌。2.失去1点体力且本回合内不能再发动〖双掣〗。（X为你于此回合内发动过〖双掣〗的次数）',
 			//你不能以此法使用【回魂】
 			saya_shouji:'授计',
 			saya_shouji_info:'每回合限一次，当你使用的牌结算完成后，你可以将此牌对应的所有实体牌交给一名其他角色。其可以使用这些牌中的一张，若如此做，你摸一张牌。',

diff --git a/character/mobile.js b/character/mobile.js
@@ -612,6 +612,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						game.cardsGotoSpecial(cards);
 						game.log(player,'将',cards,'置于了',target,'的武将牌上');
 					}
+					"step 4"
+					game.updateRoundNumber();
 				},
 				ai:{
 					order:10,

diff --git a/character/old.js b/character/old.js
@@ -12,11 +12,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				old_yijiang4:["old_caozhen","old_chenqun","old_zhuhuan"],
 				old_yijiang5:["old_caoxiu","old_quancong","old_zhuzhi"],
 				old_yijiang67:["ol_xinxianying","ol_zhangrang","ol_liuyu"],
-				old_sp:["old_lingju","old_maliang","old_machao","zhangliang","jsp_caoren","ol_guansuo","old_zhangxingcai","old_huangfusong","ol_maliang","panfeng","old_wangyun"],
+				old_sp:["old_lingju","old_maliang","old_machao","zhangliang","jsp_caoren","ol_guansuo","old_zhangxingcai","old_huangfusong","ol_maliang","panfeng","old_wangyun","sunluyu"],
 				old_mobile:["old_caochun","old_majun"],
 			},
 		},
 		character:{
+			sunluyu:['female','wu',3,['new_meibu','new_mumu']],
 			pangde:['male','qun',4,['mashu','mengjin']],
 			ol_huaxiong:["male","qun",6,["new_reyaowu"]],
 			old_wangyun:['male','qun',4,['wylianji','moucheng']],

diff --git a/character/shenhua.js b/character/shenhua.js
@@ -790,10 +790,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			"drlt_yongsi":{
+				audio:2,
 				group:["drlt_yongsi_1","drlt_yongsi_2"],
 				subSkill:{
 					'1':{
-						audio:["yongsi1",2],
+						audio:"drlt_yongsi",
 						trigger:{
 							player:'phaseDrawBegin2'
 						},
@@ -806,7 +807,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						},
 					},
 					'2':{
-						audio:["yongsi2",2],
+						audio:"drlt_yongsi",
 						trigger:{
 							player:'phaseUseEnd'
 						},