v1.10.3

libccy · Oct 5, 2023 · cb642c5 · cb642c5
2 parents b5a16af + f21c9d8
commit cb642c5
Show file tree

Hide file tree

Showing 57 changed files with 31,856 additions and 2,416 deletions.
diff --git a/audio/die/re_wenpin.mp3 b/audio/die/re_wenpin.mp3
diff --git a/audio/die/re_zhongyao.mp3 b/audio/die/re_zhongyao.mp3
diff --git a/audio/skill/huomo_re_zhongyao1.mp3 b/audio/skill/huomo_re_zhongyao1.mp3
diff --git a/audio/skill/huomo_re_zhongyao2.mp3 b/audio/skill/huomo_re_zhongyao2.mp3
diff --git a/audio/skill/zhenwei_re_wenpin1.mp3 b/audio/skill/zhenwei_re_wenpin1.mp3
diff --git a/audio/skill/zhenwei_re_wenpin2.mp3 b/audio/skill/zhenwei_re_wenpin2.mp3
diff --git a/audio/skill/zuoding_re_zhongyao1.mp3 b/audio/skill/zuoding_re_zhongyao1.mp3
diff --git a/audio/skill/zuoding_re_zhongyao2.mp3 b/audio/skill/zuoding_re_zhongyao2.mp3
diff --git a/card/extra.js b/card/extra.js
@@ -781,7 +781,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 							if(card.name=='sha'){
 								var equip1=player.getEquip('zhuque');
 								if(equip1&&equip1.name=='zhuque') return 1.9;
-								if(!card.hasNature()) return 'zerotarget';
+								if(!game.hasNature(card)) return 'zerotarget';
 							}
 						}
 					}
@@ -810,7 +810,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					effect:{
 						target:function(card,player,target,current){
 							if(card.name=='sha'){
-								if(card.hasNature('fire')) return 2;
+								if(game.hasNature(card,'fire')) return 2;
 								if(player.hasSkill('zhuque_skill')) return 1.9;
 							}
 							if(get.tag(card,'fireDamage')&&current<0) return 2;
@@ -830,7 +830,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						target:player,
 						card:event.card
 					})) return false;
-					if(event.card.name=='sha'&&!event.card.hasNature()) return true;
+					if(event.card.name=='sha'&&!game.hasNature(event.card)) return true;
 					return false;
 				},
 				content:function(){
@@ -906,7 +906,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				trigger:{player:'useCard1'},
 				//priority:7,
 				filter:function(event,player){
-					if(event.card.name=='sha'&&!event.card.hasNature()) return true;
+					if(event.card.name=='sha'&&!game.hasNature(event.card)) return true;
 				},
 				audio:true,
 				check:function(event,player){

diff --git a/card/guozhan.js b/card/guozhan.js
@@ -1185,7 +1185,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					}))+'的【诏书】上';
 				},
 				content:function(){
+					'step 0'
 					target.addToExpansion(cards,player,'give').gaintag.add('zhaoshu_cards');
+					'step 1'
+					target.markSkill('zhaoshu_skill');
 				},
 				ai:{
 					order:1,
@@ -1211,7 +1214,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				filter:function(event,player){
 					if(['huoshaolianying','huogong'].contains(event.card.name)) return true;
-					if(event.card.name=='sha') return event.card.hasNature('fire');
+					if(event.card.name=='sha') return game.hasNature(event.card,'fire');
 					return false;
 				},
 				content:function(){
@@ -1220,7 +1223,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				ai:{
 					effect:{
 						target:function(card,player,target,current){
-							if(['huoshaolianying','huogong'].contains(card.name)||(card.name=='sha'&&card.hasNature('fire'))){
+							if(['huoshaolianying','huogong'].contains(card.name)||(card.name=='sha'&&game.hasNature(card,'fire'))){
 								return 'zeroplayertarget';
 							}
 						},