renku

character/diy.js

@@ -537,6 +537,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						animationColor:'key',
 						content:function(){
 							'step 0'
+							game.log(player,'成功完成使命');
 							player.awakenSkill('mia_qianmeng');
 							if(player!=trigger.player) player.gain(player.storage.mia_qianmeng,trigger.player,'give');
 							'step 1'
@@ -554,6 +555,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						},
 						content:function(){
 							'step 0'
+							game.log(player,'使命失败');
 							player.chooseTarget(get.prompt('mia_qianmeng'),'令一名角色获得牌堆中所有点数为'+player.storage.mia_qianmeng.number+'的牌',lib.filter.notMe);
 							'step 1'
 							if(result.bool){

character/rank.js

@@ -253,6 +253,7 @@ window.noname_character_rank={
 		'liubian',
 		'panshu',
 		'caochun',
+		'xin_caifuren',
 		'key_misuzu',
 		'key_sunohara',
 		'key_umi',
@@ -478,6 +479,7 @@ window.noname_character_rank={
 		're_dongcheng',
 		'ol_yujin',
 		'ol_huaxin',
+		'zhangzhongjing',
 	],
 	bp:[
 		'chess_diaochan',
@@ -689,6 +691,9 @@ window.noname_character_rank={
 		'duxi',
 		'heyan',
 		're_caifuren',
+		'sp_kongrong',
+		'qiaogong',
+		'liuzhang',
 	],
 	b:[
 		'diy_feishi',
@@ -869,7 +874,6 @@ window.noname_character_rank={
 		'shibao',
 		'zhangmiao',
 		'ol_zhurong',
-		'sp_kongrong',
 		'sp_mifangfushiren',
 		'zhangheng',
 		're_hucheer',
@@ -878,6 +882,7 @@ window.noname_character_rank={
 		'xiangchong',
 		'qiuliju',
 		're_dongbai',
+		're_guyong',
 	],
 	bm:[
 		'diy_xizhenxihong',
@@ -1026,6 +1031,7 @@ window.noname_character_rank={
 		'wangfuzhaolei',
 		'caizhenji',
 		'longyufei',
+		'sp_zhangwen',
 	],
 	c:[
 		'xiahoudun',
@@ -1703,6 +1709,11 @@ window.noname_character_rank={
 			're_caifuren',
 			're_dongbai',
 			'tw_dongzhao',
+			'xin_caifuren',
+			'sp_yanghu',
+			'qiaogong',
+			'liuzhang',
+			'zhangzhongjing',
 		],
 		junk:[
 			'sunshao',

character/refresh.js

@@ -12,12 +12,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				refresh_yijiang1:['re_wuguotai','re_gaoshun','re_caozhi','yujin_yujin','re_masu','xin_xusheng','re_fazheng','xin_lingtong','re_zhangchunhua'],
 				refresh_yijiang2:['old_madai','wangyi','guanzhang','xin_handang','re_zhonghui','re_liaohua','re_chengpu','re_caozhang','re_bulianshi','xin_liubiao'],
 				refresh_yijiang3:['re_jianyong','re_guohuai','re_zhuran','re_panzhangmazhong','re_yufan','re_liru','re_manchong','re_fuhuanghou','re_guanping'],
-				refresh_yijiang4:['re_sunluban','re_wuyi','re_hanhaoshihuan','re_caozhen','re_zhoucang','re_chenqun','re_caifuren'],
+				refresh_yijiang4:['re_sunluban','re_wuyi','re_hanhaoshihuan','re_caozhen','re_zhoucang','re_chenqun','re_caifuren','xin_guyong'],
 				refresh_yijiang5:['re_zhangyi','re_quancong','re_caoxiu','re_sunxiu','re_gongsunyuan','re_guotufengji'],
 			},
 		},
 		connect:true,
 		character:{
+			xin_guyong:['male','wu',3,['xinshenxing','bingyi']],
 			re_caifuren:['female','qun',3,['reqieting','rexianzhou']],
 			re_guanping:['male','shu',4,['relongyin','jiezhong']],
 			re_guotufengji:['male','qun',3,['rejigong','shifei']],
@@ -136,6 +137,27 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			re_xushu:['zhaoyun','sp_zhugeliang'],
 		},
 		skill:{
+			xinshenxing:{
+				audio:2,
+				enable:'phaseUse',
+				filter:function(event,player){
+					return (player.getStat('skill').xinshenxing||0)<player.hp&&player.countCards('he')>1;
+				},
+				selectCard:2,
+				position:'he',
+				check:function(card){
+					if(!ui.selected.cards.length||get.color(card)!=get.color(ui.selected.cards[0])) return 6.5-get.value(card);
+					return 6.5-get.value(card)-get.value(ui.selected.cards[0]);
+				},
+				filterCard:true,
+				content:function(){
+					player.draw(get.color(cards)=='none'?2:1);
+				},
+				ai:{
+					order:1,
+					result:{player:1},
+				},
+			},
 			//界蔡夫人
 			reqieting:{
 				audio:2,
@@ -9779,6 +9801,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			reqieting_info:'其他角色的回合结束时，若其本回合内未造成过伤害，则你可将其装备区内的一张牌置于你的装备区内；若其本回合内未对其他角色使用过牌，则你可摸一张牌。',
 			rexianzhou:'献州',
 			rexianzhou_info:'限定技。出牌阶段，你可将装备区内的所有牌交给一名其他角色。你回复X点体力，然后对其攻击范围内的至多X名角色各造成1点伤害（X为你以此法给出的牌数）。',
+			xin_guyong:'界顾雍',
+			xinshenxing:'慎行',
+			xinshenxing_info:'出牌阶段限X次（X为你的体力值），你可以弃置两张牌，然后摸一张牌。若这两张牌颜色不同，则改为摸两张牌。',
 			
 			refresh_standard:'界限突破·标',
 			refresh_feng:'界限突破·风',

character/sp2.js

@@ -767,17 +767,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.finish();
 					'step 3'
 					if(result.bool){
-						player.$gain2(event.cards2);
-						player.gain(event.cards2);
-						game.delay(0.3);
+						for(var i=0;i<cards.length;i++){
+							if(event.cards2.contains(cards[i])){
+								targets[i].$give(cards[i],player,false);
+							}
+						}
+						player.gain(event.cards2,'log');
 					}
 					else event.finish();
 					'step 4'
+					var draws=[];
 					for(var i=0;i<cards.length;i++){
 						if(!event.cards2.contains(cards[i])){
 							targets[i].discard(cards[i]).delay=false;
 						}
+						else draws.push(targets[i]);
 					}
+					if(draws.length) game.asyncDraw(draws);
 					'step 5'
 					game.delayx();
 				},

character/yijiang.js

@@ -8745,6 +8745,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			bingyi:{
 				audio:2,
+				audioname:['xin_guyong'],
 				trigger:{player:'phaseJieshuBegin'},
 				filter:function(event,player){
 					return player.countCards('h')>0;
@@ -9329,6 +9330,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				skillAnimation:true,
 				animationColor:'gray',
 				audio:2,
+				audioname:['xin_caifuren'],
 				unique:true,
 				limited:true,
 				enable:'phaseUse',
@@ -12119,7 +12121,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			zhoucang:['re_zhoucang','xin_zhoucang','zhoucang'],
 			guotufengji:['re_guotufengji','guotufengji'],
 			guanping:['re_guanping','guanping'],
-			caifuren:['re_caifuren','caifuren'],
+			caifuren:['xin_caifuren','re_caifuren','caifuren'],
+			guyong:['xin_guyong','guyong'],
 		},
 		translate:{
 			old_huaxiong:'华雄',

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'v1.9.110.8.5.1',
+	'v1.9.110.8.6',
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
 	'audio/background/aozhan_rewrite.mp3',
@@ -764,6 +764,14 @@ window.noname_asset_list=[
 	'audio/die/re_caifuren.mp3',
 	'audio/die/tw_dongzhao.mp3',
 	'audio/die/tw_gexuan.mp3',
+	'audio/die/liuzhang.mp3',
+	'audio/die/lvkuanglvxiang.mp3',
+	'audio/die/qiaogong.mp3',
+	'audio/die/sp_yanghu.mp3',
+	'audio/die/sp_zhangwen.mp3',
+	'audio/die/xin_caifuren.mp3',
+	'audio/die/xin_guyong.mp3',
+	'audio/die/zhangzhongjing.mp3',
 
 	'audio/skill/decadezishou1.mp3',
 	'audio/skill/decadezishou2.mp3',
@@ -3408,6 +3416,50 @@ window.noname_asset_list=[
 	'audio/skill/yachai2.mp3',
 	'audio/skill/yusui1.mp3',
 	'audio/skill/yusui2.mp3',
+	'audio/skill/binglun1.mp3',
+	'audio/skill/binglun2.mp3',
+	'audio/skill/bingyi_xin_guyong1.mp3',
+	'audio/skill/bingyi_xin_guyong2.mp3',
+	'audio/skill/gebo1.mp3',
+	'audio/skill/gebo2.mp3',
+	'audio/skill/gonghuan1.mp3',
+	'audio/skill/gonghuan2.mp3',
+	'audio/skill/huaibi1.mp3',
+	'audio/skill/huaibi2.mp3',
+	'audio/skill/jishi1.mp3',
+	'audio/skill/jishi2.mp3',
+	'audio/skill/liaoyi1.mp3',
+	'audio/skill/liaoyi2.mp3',
+	'audio/skill/liehou1.mp3',
+	'audio/skill/liehou2.mp3',
+	'audio/skill/luanchou1.mp3',
+	'audio/skill/luanchou2.mp3',
+	'audio/skill/mibei1.mp3',
+	'audio/skill/mibei2.mp3',
+	'audio/skill/mingfa1.mp3',
+	'audio/skill/mingfa2.mp3',
+	'audio/skill/qigong1.mp3',
+	'audio/skill/qigong2.mp3',
+	'audio/skill/qingyu1.mp3',
+	'audio/skill/qingyu2.mp3',
+	'audio/skill/rongbei1.mp3',
+	'audio/skill/rongbei2.mp3',
+	'audio/skill/spsongshu1.mp3',
+	'audio/skill/spsongshu2.mp3',
+	'audio/skill/xianzhou_xin_caifuren1.mp3',
+	'audio/skill/xianzhou_xin_caifuren2.mp3',
+	'audio/skill/xingqi1.mp3',
+	'audio/skill/xingqi2.mp3',
+	'audio/skill/xinqieting1.mp3',
+	'audio/skill/xinqieting2.mp3',
+	'audio/skill/xinshenxing1.mp3',
+	'audio/skill/xinshenxing2.mp3',
+	'audio/skill/xiusheng1.mp3',
+	'audio/skill/xiusheng2.mp3',
+	'audio/skill/yinlang1.mp3',
+	'audio/skill/yinlang2.mp3',
+	'audio/skill/yizhu1.mp3',
+	'audio/skill/yizhu2.mp3',
 
 	'audio/voice/male/0.mp3',
 	'audio/voice/male/1.mp3',
@@ -4315,6 +4367,13 @@ window.noname_asset_list=[
 	'image/character/pengyang.jpg',
 	'image/character/tw_dongzhao.jpg',
 	'image/character/tw_gexuan.jpg',
+	'image/character/liuzhang.jpg',
+	'image/character/qiaogong.jpg',
+	'image/character/sp_yanghu.jpg',
+	'image/character/sp_zhangwen.jpg',
+	'image/character/xin_caifuren.jpg',
+	'image/character/xin_guyong.jpg',
+	'image/character/zhangzhongjing.jpg',
 	
 	'image/character/baiwuchang.jpg',
 	'image/character/baosanniang.jpg',

game/game.js

@@ -28,6 +28,7 @@
 			yingbian_fujia:[],
 			yingbian_canqu:[],
 		},
+		renku:[],
 	};
 	var lib={
 		configprefix:'noname_0.9_',
@@ -6677,6 +6678,7 @@
 			'<div style="margin:10px">游戏操作</div><ul style="margin-top:0"><li>在命令框中输出结果<br>game.print(str)<li>清除命令框中的内容<br>cls<li>上一条/下一条输入的内容<br>up/down<li>游戏结束<br>game.over(bool)'+
 			'<li>角色资料<br>lib.character<li>卡牌资料<br>lib.card</ul>',
 			'游戏名词':'<ul><li>智囊：无名杀默认为过河拆桥/无懈可击/无中生有/洞烛先机。牌堆中没有的智囊牌会被过滤。可在卡牌设置中自行增减。若没有可用的智囊，则改为随机选取的三种锦囊牌的牌名。'+
+			'<li>仁库：部分武将使用的游戏外共通区域。至多包含六张牌。当有新牌注入后，若牌数超过上限，则将最早进入仁库的溢出牌置入弃牌堆。'+
 			'<li>护甲：和体力类似，每点护甲可抵挡一点伤害，但不影响手牌上限'+
 			'<li>随从：通过技能获得，拥有独立的技能、手牌区和装备区（共享判定区），出场时替代主武将的位置；随从死亡时自动切换回主武将'+
 			'<li>发现：从三张随机亮出的牌中选择一张，若无特殊说明，则获得此牌'+
@@ -10362,6 +10364,7 @@
 			pss_paper_info:'石头剪刀布时的一种手势。克制石头，但被剪刀克制。',
 			pss_scissor_info:'石头剪刀布时的一种手势。克制布，但被石头克制。',
 			pss_stone_info:'石头剪刀布时的一种手势。克制剪刀，但被布克制。',
+			renku:'仁库',
 		},
 		element:{
 			content:{
@@ -10674,6 +10677,15 @@
 						cards[i].fix();
 						ui.special.appendChild(cards[i]);
 					}
+					if(event.toRenku){
+						_status.renku.addArray(cards);
+						if(_status.renku.length>6){
+							var cards=_status.renku.splice(0,_status.renku.length-6);
+							game.log(cards,'从仁库进入了弃牌堆');
+							game.cardsDiscard(cards).fromRenku=true;
+						}
+						game.updateRenku();
+					}
 					if(event.notrigger!==true) event.trigger('addCardToStorage');
 				},
 				chooseToEnable:function(){
@@ -15442,6 +15454,7 @@
 					else if(event.position==ui.cardPile){
 						game.updateRoundNumber();
 					}
+					if(event.toRenku) _status.renku.addArray(cards);
 					event.hs=hs;
 					event.es=es;
 					event.js=js;
@@ -15491,6 +15504,15 @@
 					event.num++;
 					event.goto(2);
 					"step 4"
+					if(event.toRenku){
+						if(_status.renku.length>6){
+							var cards=_status.renku.splice(0,_status.renku.length-6);
+							game.log(cards,'从仁库进入了弃牌堆');
+							game.cardsDiscard(cards).fromRenku=true;
+						}
+						game.updateRenku();
+					}
+					"step 5"
 					var evt=event.getParent();
 					if(evt.name!='discard'&&event.type!='discard') return;
 					if(evt.delay!=false){
@@ -16443,6 +16465,7 @@
 					return next;
 				},
 				addGaintag:function(cards,tag){
+					if(get.itemtype(cards)=='card') cards=[cards];
 					game.addVideo('addGaintag',this,[get.cardsInfo(cards),tag]);
 					game.broadcastAll(function(player,cards,tag){
 						var hs=player.getCards('h');
@@ -19891,6 +19914,10 @@
 						else if(arguments[i]=='fromStorage'){
 							next.fromStorage=true;
 						}
+						else if(arguments[i]=='fromRenku'){
+							next.fromStorage=true;
+							next.fromRenku=true;
+						}
 						else if(arguments[i]=='bySelf'){
 							next.bySelf=true;
 						}
@@ -19957,6 +19984,10 @@
 						else if(arguments[i]=='toStorage'){
 							next.toStorage=true;
 						}
+						else if(arguments[i]=='toRenku'){
+							next.toStorage=true;
+							next.toRenku=true;
+						}
 						else if(arguments[i]=='visible'){
 							next.visible=true;
 						}
@@ -21788,6 +21819,14 @@
 						return history;
 					}
 				},
+				hasHistory:function(key,filter,last){
+					var history=this.getHistory(key).slice(0);
+					if(last) history=history.slice(0,history.indexOf(last)+1);
+					for(var i=0;i<history.length;i++){
+						if(filter(history[i])) return true;
+					}
+					return false;
+				},
 				getLastHistory:function(key,filter,last){
 					var history=false;
 					for(var i=this.actionHistory.length-1;i>=0;i--){
@@ -21827,6 +21866,18 @@
 					}
 					return list;
 				},
+				hasAllHistory:function(key,filter,last){
+					var list=[];
+					var all=this.actionHistory;
+					for(var j=0;j<all.length;j++){
+						var history=all[j][key].slice(0);
+						if(last) history=history.slice(0,history.indexOf(last)+1);
+						for(var i=0;i<history.length;i++){
+							if(filter(history[i])) return true;
+						}
+					}
+					return false;
+				},
 				getLastUsed:function(num){
 					if(typeof num!='number') num=0;
 					var history=this.getHistory('useCard');
@@ -26063,6 +26114,21 @@
 			}
 		},
 		skill:{
+			renku:{
+				intro:{
+					markcount:function(){
+						return _status.renku.length;
+					},
+					mark:function(dialog,content,player){
+						if(!_status.renku.length) return '仁库中没有牌';
+						else dialog.addAuto(_status.renku);
+					},
+					content:function(){
+						if(!_status.renku.length) return '仁库中没有牌';
+						return get.translation(_status.renku);
+					},
+				},
+			},
 			_showHiddenCharacter:{
 				trigger:{player:['changeHp','phaseBeginStart','loseMaxHpBegin']},
 				firstDo:true,
@@ -27514,6 +27580,7 @@
 						}
 						ui.arena.setNumber(state.number);
 						_status.mode=state.mode;
+						_status.renku=state.renku;
 						lib.inpile=state.inpile;
 						var pos=state.players[observe||game.onlineID].position;
 						for(var i in state.players){
@@ -27843,6 +27910,14 @@
 		],
 	};
 	var game={
+		updateRenku:function(){
+			game.broadcast(function(renku){
+				_status.renku=renku;
+			},_status.renku);
+			for(var i of game.players){
+				if(i.storage.renku) i.markSkill('renku');
+			}
+		},
 		loseAsync:function(arg){
 			var next=game.createEvent('loseAsync');
 			next.getl=function(player){
@@ -27913,7 +27988,8 @@
 			if(type!='cards'&&type!='card') return;
 			var next=game.createEvent('cardsGotoSpecial');
 			next.cards=type=='cards'?cards.slice(0):[cards];
-			if(bool===false) next.notrigger=true;
+			if(bool=='toRenku') next.toRenku=true;
+			else if(bool===false) next.notrigger=true;
 			next.setContent('cardsGotoSpecial');
 			return next;
 		},
@@ -50021,6 +50097,7 @@
 				roomId:game.roomId,
 				over:_status.over,
 				inpile:lib.inpile,
+				renku:_status.renku,
 			};
 			for(var i in lib.playerOL){
 				state.players[i]=lib.playerOL[i].getState();

game/server.js

@@ -4,7 +4,7 @@
 	var bannedKeys=[];
 	var bannedIps=[];
 
-	var rooms=[{},{},{},{},{},{},{},{}];
+	var rooms=[{},{},{},{},{},{},{},{},{},{}];
 	var events=[];
 	var clients={};
 	var bannedKeyWords=[];

game/update.js

@@ -1,11 +1,9 @@
 window.noname_update={
-	version:'1.9.110.8.5.1',
-	update:'1.9.110.8.5',
+	version:'1.9.110.8.6',
+	update:'1.9.110.8.5.1',
 	changeLog:[
-		'TW董昭、TW葛玄',
-		'国战文聘、彭羕',
-		'张横、吕旷吕翔、辛毗技能调整',
-		'移除欢乐武将',
+		'手杀蔡夫人、顾雍、刘璋、桥公、羊祜、张机、张温',
+		'糜夫人、王凌、孔融技能调整',
 		'bug修复',
 	],
 	files:[
@@ -22,8 +20,8 @@ window.noname_update={
 		//'card/yingbian.js',
 		//'card/zhenfa.js',
 		//'card/zhulu.js',
-		//'character/diy.js',
-		'character/extra.js',
+		'character/diy.js',
+		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
@@ -35,16 +33,16 @@ window.noname_update={
 		//'character/ow.js',
 		'character/rank.js',
 		'character/refresh.js',
-		'character/shenhua.js',
-		'character/sp.js',
+		//'character/shenhua.js',
+		//'character/sp.js',
 		'character/sp2.js',
-		'character/tw.js',
-		'character/standard.js',
+		//'character/tw.js',
+		//'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
 		//'character/xinghuoliaoyuan.js',
 		//'character/yingbian.js',
-		//'character/yijiang.js',
+		'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'layout/default/layout.css',
@@ -55,12 +53,12 @@ window.noname_update={
 		//'mode/brawl.js',
 		//'mode/chess.js',
 		//'mode/doudizhu.js',
-		'mode/guozhan.js',
+		//'mode/guozhan.js',
 		//'mode/identity.js',
 		//'mode/single.js',
 		//'mode/stone.js',
 		//'mode/tafang.js',
-		'mode/versus.js',
+		//'mode/versus.js',
 		'game/game.js',
 		//'game/keyWords.js',
 		//'game/NoSleep.js',