Skip to content

Commit cb642c5

Browse files
authored
v1.10.3
v1.10.3
2 parents b5a16af + f21c9d8 commit cb642c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+31856
-2416
lines changed

audio/die/re_wenpin.mp3

168 KB
Binary file not shown.

audio/die/re_zhongyao.mp3

53 KB
Binary file not shown.

audio/skill/huomo_re_zhongyao1.mp3

41.5 KB
Binary file not shown.

audio/skill/huomo_re_zhongyao2.mp3

49 KB
Binary file not shown.

audio/skill/zhenwei_re_wenpin1.mp3

102 KB
Binary file not shown.

audio/skill/zhenwei_re_wenpin2.mp3

112 KB
Binary file not shown.
39.2 KB
Binary file not shown.
37.2 KB
Binary file not shown.

card/extra.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
781781
if(card.name=='sha'){
782782
var equip1=player.getEquip('zhuque');
783783
if(equip1&&equip1.name=='zhuque') return 1.9;
784-
if(!card.hasNature()) return 'zerotarget';
784+
if(!game.hasNature(card)) return 'zerotarget';
785785
}
786786
}
787787
}
@@ -810,7 +810,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
810810
effect:{
811811
target:function(card,player,target,current){
812812
if(card.name=='sha'){
813-
if(card.hasNature('fire')) return 2;
813+
if(game.hasNature(card,'fire')) return 2;
814814
if(player.hasSkill('zhuque_skill')) return 1.9;
815815
}
816816
if(get.tag(card,'fireDamage')&&current<0) return 2;
@@ -830,7 +830,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
830830
target:player,
831831
card:event.card
832832
})) return false;
833-
if(event.card.name=='sha'&&!event.card.hasNature()) return true;
833+
if(event.card.name=='sha'&&!game.hasNature(event.card)) return true;
834834
return false;
835835
},
836836
content:function(){
@@ -906,7 +906,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
906906
trigger:{player:'useCard1'},
907907
//priority:7,
908908
filter:function(event,player){
909-
if(event.card.name=='sha'&&!event.card.hasNature()) return true;
909+
if(event.card.name=='sha'&&!game.hasNature(event.card)) return true;
910910
},
911911
audio:true,
912912
check:function(event,player){

card/guozhan.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
11851185
}))+'的【诏书】上';
11861186
},
11871187
content:function(){
1188+
'step 0'
11881189
target.addToExpansion(cards,player,'give').gaintag.add('zhaoshu_cards');
1190+
'step 1'
1191+
target.markSkill('zhaoshu_skill');
11891192
},
11901193
ai:{
11911194
order:1,
@@ -1211,7 +1214,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
12111214
},
12121215
filter:function(event,player){
12131216
if(['huoshaolianying','huogong'].contains(event.card.name)) return true;
1214-
if(event.card.name=='sha') return event.card.hasNature('fire');
1217+
if(event.card.name=='sha') return game.hasNature(event.card,'fire');
12151218
return false;
12161219
},
12171220
content:function(){
@@ -1220,7 +1223,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
12201223
ai:{
12211224
effect:{
12221225
target:function(card,player,target,current){
1223-
if(['huoshaolianying','huogong'].contains(card.name)||(card.name=='sha'&&card.hasNature('fire'))){
1226+
if(['huoshaolianying','huogong'].contains(card.name)||(card.name=='sha'&&game.hasNature(card,'fire'))){
12241227
return 'zeroplayertarget';
12251228
}
12261229
},

0 commit comments

Comments
 (0)