v1.10.1.0.1

libccy · Sep 18, 2023 · 4ef8c89 · 4ef8c89
2 parents 31267fe + 8682cd0
commit 4ef8c89
Show file tree

Hide file tree

Showing 11 changed files with 376 additions and 245 deletions.
diff --git a/card/extra.js b/card/extra.js
@@ -604,6 +604,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					},
 				},
 				mark:true,
+				markimage2:'image/card/muniu_small.png',
 				intro:{
 					content:function(storage,player){
 						var muniu=player.getEquip('muniu');

diff --git a/character/sp.js b/character/sp.js
@@ -1098,7 +1098,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						forced:true,
 						charlotte:true,
 						filter:(event,player)=>{
-							if(!event.olqifan_discard) return false;
 							var num=player.getStorage('olqifan').length,pos=('jeh').slice(0,num);
 							return num>0&&player.countCards(pos)>0;
 						},
@@ -1122,14 +1121,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else card=get.autoViewAs({name,isCard:true});
 					event.result.card=card;
 					player.markAuto('olqifan',[get.type2(card,false)]);
-					event.getParent().set('olqifan_discard',true);
+					var id=get.id();
 					player.when('chooseToUseAfter')
+						.filter((evt)=>evt==event.getParent())
 						.filter(lib.skill.olqifan_discard.filter)
 						.then(()=>{
 							event.maxNum=Math.min(3,player.getStorage('olqifan').length);
 							event.num=0;
 						})
 						.then(lib.skill.olqifan_discard.content)
+						.translation('器翻');
 				},
 				filterCard:function(){return false},
 				selectCard:-1,

diff --git a/character/sp2.js b/character/sp2.js
@@ -2045,7 +2045,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							var target=trigger.target;
 							event.target=target;
 							trigger.targets.remove(target);
-							trigger.triggeredTargets1.remove(target);
+							//trigger.triggeredTargets1.remove(target);
 							trigger.untrigger();
 							game.delayx();
 							'step 1'

diff --git a/character/xianding.js b/character/xianding.js
@@ -4715,7 +4715,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					countdown:{
 						trigger:{player:'useCardAfter'},
 						mark:true,
-						marktext:'💀',
+						marktext:'噬',
 						silent:true,
 						forced:true,
 						charlotte:true,

diff --git a/game/asset.js b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'v1.10.1',
+	'v1.10.1.0.1',
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
 	'audio/background/aozhan_rewrite.mp3',
@@ -6199,6 +6199,7 @@ window.noname_asset_list=[
 	'image/card/mtg_youlin.jpg',
 	'image/card/mujiaren.png',
 	'image/card/muniu.png',
+	'image/card/muniu_small.png',
 	'image/card/mutoumianju.png',
 	'image/card/nanman.png',
 	'image/card/numa.png',