v1.9.124

libccy · Aug 1, 2023 · 067cc9a · 067cc9a
2 parents 83c0370 + 4c27999
commit 067cc9a
Show file tree

Hide file tree

Showing 206 changed files with 45,374 additions and 36,773 deletions.
diff --git a/audio/die/chentai.mp3 b/audio/die/chentai.mp3
diff --git a/audio/die/dc_dengzhi.mp3 b/audio/die/dc_dengzhi.mp3
diff --git a/audio/die/dc_sunhanhua.mp3 b/audio/die/dc_sunhanhua.mp3
diff --git a/audio/die/ganfurenmifuren.mp3 b/audio/die/ganfurenmifuren.mp3
diff --git a/audio/die/huanfan.mp3 b/audio/die/huanfan.mp3
diff --git a/audio/die/liuchongluojun.mp3 b/audio/die/liuchongluojun.mp3
diff --git a/audio/die/lushi.mp3 b/audio/die/lushi.mp3
diff --git a/audio/die/ol_mengda.mp3 b/audio/die/ol_mengda.mp3
diff --git a/audio/die/qianzhao.mp3 b/audio/die/qianzhao.mp3
diff --git a/audio/die/re_caochong.mp3 b/audio/die/re_caochong.mp3
diff --git a/audio/die/re_liaohua.mp3 b/audio/die/re_liaohua.mp3
diff --git a/audio/die/sb_menghuo.mp3 b/audio/die/sb_menghuo.mp3
diff --git a/audio/die/sb_zhurong.mp3 b/audio/die/sb_zhurong.mp3
diff --git a/audio/die/shichangshi.mp3 b/audio/die/shichangshi.mp3
diff --git a/audio/die/shichangshiRest.mp3 b/audio/die/shichangshiRest.mp3
diff --git a/audio/die/sp_xunchen.mp3 b/audio/die/sp_xunchen.mp3
diff --git a/audio/die/zhangchu.mp3 b/audio/die/zhangchu.mp3
diff --git a/audio/die/zhaotongzhaoguang.mp3 b/audio/die/zhaotongzhaoguang.mp3
diff --git a/audio/skill/chengye3.mp3 b/audio/skill/chengye3.mp3
diff --git a/audio/skill/dangxian_re_liaohua1.mp3 b/audio/skill/dangxian_re_liaohua1.mp3
diff --git a/audio/skill/dangxian_re_liaohua2.mp3 b/audio/skill/dangxian_re_liaohua2.mp3
diff --git a/audio/skill/dcchanjuan1.mp3 b/audio/skill/dcchanjuan1.mp3
diff --git a/audio/skill/dcchanjuan2.mp3 b/audio/skill/dcchanjuan2.mp3
diff --git a/audio/skill/dcchenyong1.mp3 b/audio/skill/dcchenyong1.mp3
diff --git a/audio/skill/dcchenyong2.mp3 b/audio/skill/dcchenyong2.mp3
diff --git a/audio/skill/dcchongxu1.mp3 b/audio/skill/dcchongxu1.mp3
diff --git a/audio/skill/dcchongxu2.mp3 b/audio/skill/dcchongxu2.mp3
diff --git a/audio/skill/dcctjiuxian1.mp3 b/audio/skill/dcctjiuxian1.mp3
diff --git a/audio/skill/dcctjiuxian2.mp3 b/audio/skill/dcctjiuxian2.mp3
diff --git a/audio/skill/dcfumou1.mp3 b/audio/skill/dcfumou1.mp3
diff --git a/audio/skill/dcfumou2.mp3 b/audio/skill/dcfumou2.mp3
diff --git a/audio/skill/dcguangshi1.mp3 b/audio/skill/dcguangshi1.mp3
diff --git a/audio/skill/dcguangshi2.mp3 b/audio/skill/dcguangshi2.mp3
diff --git a/audio/skill/dchuiling1.mp3 b/audio/skill/dchuiling1.mp3
diff --git a/audio/skill/dchuiling2.mp3 b/audio/skill/dchuiling2.mp3
diff --git a/audio/skill/dcjianzheng1.mp3 b/audio/skill/dcjianzheng1.mp3
diff --git a/audio/skill/dcjianzheng2.mp3 b/audio/skill/dcjianzheng2.mp3
diff --git a/audio/skill/dcjini1.mp3 b/audio/skill/dcjini1.mp3
diff --git a/audio/skill/dcjini2.mp3 b/audio/skill/dcjini2.mp3
diff --git a/audio/skill/dcjiuxian1.mp3 b/audio/skill/dcjiuxian1.mp3
diff --git a/audio/skill/dcjiuxian2.mp3 b/audio/skill/dcjiuxian2.mp3
diff --git a/audio/skill/dcjizhong1.mp3 b/audio/skill/dcjizhong1.mp3
diff --git a/audio/skill/dcjizhong2.mp3 b/audio/skill/dcjizhong2.mp3
diff --git a/audio/skill/dcminze1.mp3 b/audio/skill/dcminze1.mp3
diff --git a/audio/skill/dcminze2.mp3 b/audio/skill/dcminze2.mp3
diff --git a/audio/skill/dcqinghuang1.mp3 b/audio/skill/dcqinghuang1.mp3
diff --git a/audio/skill/dcqinghuang2.mp3 b/audio/skill/dcqinghuang2.mp3
diff --git a/audio/skill/dcrihui1.mp3 b/audio/skill/dcrihui1.mp3
diff --git a/audio/skill/dcrihui2.mp3 b/audio/skill/dcrihui2.mp3
diff --git a/audio/skill/dctaji1.mp3 b/audio/skill/dctaji1.mp3
diff --git a/audio/skill/dctaji2.mp3 b/audio/skill/dctaji2.mp3
diff --git a/audio/skill/dcxunbie1.mp3 b/audio/skill/dcxunbie1.mp3
diff --git a/audio/skill/dcxunbie2.mp3 b/audio/skill/dcxunbie2.mp3
diff --git a/audio/skill/gzyinghun_re_sunyi1.mp3 b/audio/skill/gzyinghun_re_sunyi1.mp3
diff --git a/audio/skill/mbshihe1.mp3 b/audio/skill/mbshihe1.mp3
diff --git a/audio/skill/mbshihe2.mp3 b/audio/skill/mbshihe2.mp3
diff --git a/audio/skill/mbzhenfu1.mp3 b/audio/skill/mbzhenfu1.mp3
diff --git a/audio/skill/mbzhenfu2.mp3 b/audio/skill/mbzhenfu2.mp3
diff --git a/audio/skill/olgoude1.mp3 b/audio/skill/olgoude1.mp3
diff --git a/audio/skill/olgoude2.mp3 b/audio/skill/olgoude2.mp3
diff --git a/audio/skill/olleijie1.mp3 b/audio/skill/olleijie1.mp3
diff --git a/audio/skill/olleijie2.mp3 b/audio/skill/olleijie2.mp3
diff --git a/audio/skill/olzhuyan1.mp3 b/audio/skill/olzhuyan1.mp3
diff --git a/audio/skill/olzhuyan2.mp3 b/audio/skill/olzhuyan2.mp3
diff --git a/audio/skill/rechengxiang1.mp3 b/audio/skill/rechengxiang1.mp3
diff --git a/audio/skill/rechengxiang2.mp3 b/audio/skill/rechengxiang2.mp3
diff --git a/audio/skill/renxin_re_caochong1.mp3 b/audio/skill/renxin_re_caochong1.mp3
diff --git a/audio/skill/renxin_re_caochong2.mp3 b/audio/skill/renxin_re_caochong2.mp3
diff --git a/audio/skill/reyingzi_re_sunyi1.mp3 b/audio/skill/reyingzi_re_sunyi1.mp3
diff --git a/audio/skill/sbhuoshou1.mp3 b/audio/skill/sbhuoshou1.mp3
diff --git a/audio/skill/sbhuoshou2.mp3 b/audio/skill/sbhuoshou2.mp3
diff --git a/audio/skill/sbjuxiang1.mp3 b/audio/skill/sbjuxiang1.mp3
diff --git a/audio/skill/sbjuxiang2.mp3 b/audio/skill/sbjuxiang2.mp3
diff --git a/audio/skill/sblieren1.mp3 b/audio/skill/sblieren1.mp3
diff --git a/audio/skill/sblieren2.mp3 b/audio/skill/sblieren2.mp3
diff --git a/audio/skill/sbzaiqi1.mp3 b/audio/skill/sbzaiqi1.mp3
diff --git a/audio/skill/sbzaiqi2.mp3 b/audio/skill/sbzaiqi2.mp3
diff --git a/audio/skill/scs_bilan_enter.mp3 b/audio/skill/scs_bilan_enter.mp3
diff --git a/audio/skill/scs_duangui_enter.mp3 b/audio/skill/scs_duangui_enter.mp3
diff --git a/audio/skill/scs_gaowang_enter.mp3 b/audio/skill/scs_gaowang_enter.mp3
diff --git a/audio/skill/scs_guosheng_enter.mp3 b/audio/skill/scs_guosheng_enter.mp3
diff --git a/audio/skill/scs_hankui_enter.mp3 b/audio/skill/scs_hankui_enter.mp3
diff --git a/audio/skill/scs_lisong_enter.mp3 b/audio/skill/scs_lisong_enter.mp3
diff --git a/audio/skill/scs_sunzhang_enter.mp3 b/audio/skill/scs_sunzhang_enter.mp3
diff --git a/audio/skill/scs_xiayun_enter.mp3 b/audio/skill/scs_xiayun_enter.mp3
diff --git a/audio/skill/scs_zhangrang_enter.mp3 b/audio/skill/scs_zhangrang_enter.mp3
diff --git a/audio/skill/scs_zhaozhong_enter.mp3 b/audio/skill/scs_zhaozhong_enter.mp3
diff --git a/audio/skill/scsanruo1.mp3 b/audio/skill/scsanruo1.mp3
diff --git a/audio/skill/scschihe1.mp3 b/audio/skill/scschihe1.mp3
diff --git a/audio/skill/scschiyan1.mp3 b/audio/skill/scschiyan1.mp3
diff --git a/audio/skill/scskuiji1.mp3 b/audio/skill/scskuiji1.mp3
diff --git a/audio/skill/scsniqu1.mp3 b/audio/skill/scsniqu1.mp3
diff --git a/audio/skill/scspicai1.mp3 b/audio/skill/scspicai1.mp3
diff --git a/audio/skill/scstaoluan1.mp3 b/audio/skill/scstaoluan1.mp3
diff --git a/audio/skill/scsxiaolu1.mp3 b/audio/skill/scsxiaolu1.mp3
diff --git a/audio/skill/scsyaozhuo1.mp3 b/audio/skill/scsyaozhuo1.mp3
diff --git a/audio/skill/scszimou1.mp3 b/audio/skill/scszimou1.mp3
diff --git a/audio/skill/xinfu_longyuan1.mp3 b/audio/skill/xinfu_longyuan1.mp3
diff --git a/audio/skill/xinfu_longyuan2.mp3 b/audio/skill/xinfu_longyuan2.mp3
diff --git a/audio/skill/xinfuli1.mp3 b/audio/skill/xinfuli1.mp3
diff --git a/audio/skill/xinfuli2.mp3 b/audio/skill/xinfuli2.mp3
diff --git a/audio/skill/yizan1.mp3 b/audio/skill/yizan1.mp3
diff --git a/audio/skill/yizan2.mp3 b/audio/skill/yizan2.mp3
diff --git a/audio/skill/yizan_respond_sha1.mp3 b/audio/skill/yizan_respond_sha1.mp3
diff --git a/audio/skill/yizan_respond_sha2.mp3 b/audio/skill/yizan_respond_sha2.mp3
diff --git a/audio/skill/yizan_respond_shan1.mp3 b/audio/skill/yizan_respond_shan1.mp3
diff --git a/audio/skill/yizan_respond_shan2.mp3 b/audio/skill/yizan_respond_shan2.mp3
diff --git a/card/standard.js b/card/standard.js
@@ -734,6 +734,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					else{
 						num=game.countPlayer();
 					}
+					if(card.storage&&typeof card.storage.extraCardsNum=='number') num+=card.storage.extraCardsNum;
 					var cards=get.cards(num);
 					game.cardsGotoOrdering(cards).relatedEvent=event.getParent();
 					var dialog=ui.create.dialog('五谷丰登',cards,true);
@@ -2547,6 +2548,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 											return 0;
 										}
 									}
+									if(name=='bingliang'&&source.countCards('j')>0&&source.countCards('h')>=source.hp-1){
+										return 0;
+									}
 									var card2;
 									if(name!=card.name){
 										card2={name:name};
@@ -2732,7 +2736,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(event.wuxieresult&&event.wuxieresult2&&event.wuxieresult2.skill){
 						var info=get.info(event.wuxieresult2.skill);
 						if(info&&info.precontent&&!game.online){
-							var next=game.createEvent('pre_'+event.wuxieresult2);
+							var next=game.createEvent('pre_'+event.wuxieresult2.skill);
 							next.setContent(info.precontent);
 							next.set('result',event.wuxieresult2);
 							next.set('player',event.wuxieresult);

diff --git a/card/yingbian.js b/card/yingbian.js
@@ -678,7 +678,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(event.zhuzhanresult){
 						var target=event.zhuzhanresult;
 						target.line(player,'green');
-						target.discard(event.zhuzhanresult2.cards);
+						target.discard(event.zhuzhanresult2.cards).discarder=target;
 						target.popup('助战','wood');
 						game.log(target,'响应了',player,'发起的助战');
 						target.addExpose(0.2);

diff --git a/card/yongjian.js b/card/yongjian.js
@@ -176,7 +176,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						target:function(player,target){
 							var cards=target.getCards('e'),js=target.getCards('j');
 							var val=get.value(cards,target);
-							for(var card of js) val-=get.effect(target,card.viewAs?{name:card.viewAs}:card,target,target)
+							for(var card of js) val-=get.effect(target,card.viewAs?{name:card.viewAs}:card,target,player);
 							return -val;
 						},
 					},
@@ -422,13 +422,30 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				filterCard:true,
 				position:'h',
 				filterTarget:lib.filter.notMe,
+				check:function(card){
+					var player=_status.event.player;
+					var val=5;
+					if(player.needsToDiscard()) val=15;
+					return val-get.value(card);
+				},
 				discard:false,
 				lose:false,
 				delay:false,
 				equipSkill:true,
 				content:function(){
 					player.give(cards,target);
 				},
+				ai:{
+					expose:0.1,
+					order:1,
+					result:{
+						target:function(player,target){
+							if(!ui.selected.cards.length) return 0;
+							if(get.value(ui.selected.cards[0],false,'raw')<0) return -1;
+							return 1;
+						}
+					}
+				}
 			},
 			qixingbaodao:{
 				trigger:{player:'equipAfter'},
@@ -546,7 +563,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 							return 0;
 						},
 						ai2:function(target){
-							return -get.attitude(_status.event.player,target);
+							return -get.attitude(_status.event.player,target)+0.01;
 						},
 					});
 					'step 2'