这他妈是第几个袁术了

character/mobile.js

@@ -318,7 +318,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var cards=target.getCards('h','sha');
 					if(cards.length){
 						event.cards=cards;
-						event.goto(4);
+						event.goto(5);
 					}
 					else player.discardPlayerCard('he',target,true);
 					'step 2'
@@ -351,6 +351,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						target.useCard(player,false,{
 							name:'sha',
 							isCard:true,
+							cards:[card],
 						},[card]).card.beizhu=true;
 						event.redo();
 					}

character/old.js

@@ -4,11 +4,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		name:'old',
 		characterSort:{
 			old:{
+				old_standard:['ol_yuanshu'],
 				old_shenhua:["yuji","zhangjiao","old_zhugezhan","old_guanqiujian","xiahouyuan","weiyan","xiaoqiao","pangde"],
 				old_refresh:["old_zhangfei","old_huatuo","old_zhaoyun","ol_huaxiong"],
 				old_yijiang1:["masu","xushu","yujin","xin_yujin","old_xusheng","old_lingtong"],
 				old_yijiang2:["old_zhonghui"],
-				old_yijiang3:["liru","old_zhuran","ol_manchong","old_fuhuanghou","old_caochong"],
+				old_yijiang3:["liru","old_zhuran","old_fuhuanghou","old_caochong"],
 				old_yijiang4:["old_caozhen","old_chenqun","old_zhuhuan"],
 				old_yijiang5:["old_caoxiu","old_quancong","old_zhuzhi"],
 				old_yijiang67:["ol_zhangrang","ol_liuyu"],
@@ -17,6 +18,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		character:{
+			ol_yuanshu:['male','qun',4,['wangzun','tongji']],
 			pangde:['male','qun',4,['mashu','mengjin']],
 			ol_huaxiong:["male","qun",6,["new_reyaowu"]],
 			old_wangyun:['male','qun',4,['wylianji','moucheng']],
@@ -61,7 +63,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			zhangliang:["male","qun",4,["old_jijun","old_fangtong"]],
 			ol_zhangrang:['male','qun',3,['xintaoluan']],
 			ol_guansuo:['male','shu',4,['zhengnan','xiefang']],
-			ol_manchong:['male','wei',3,['yuce','junxing']],
+			//ol_manchong:['male','wei',3,['yuce','junxing']],
 			ol_liuyu:['male','qun',2,['zongzuo','zhige']],
 			old_guanqiujian:["male","wei",4,["drlt_zhenrong","drlt_hongju"],[]],
 		},
@@ -784,7 +786,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			zhenshan_use_info:'每名角色的回合限一次，每当你需要使用或打出一张基本牌时，你可以与一名手牌数少于你的角色交换手牌。若如此做，视为你使用或打出了此牌',
 			oldxuanfeng:'旋风',
 			oldxuanfeng_info:'每当你失去一次装备区里的牌时，你可以执行下列两项中的一项：1.视为对任意一名其他角色使用一张【杀】（此【杀】不计入每回合的使用限制）；2.对与你距离1以内的一名其他角色造成一点伤害',
+			ol_yuanshu:'旧袁术',
 			
+			old_standard:'标准包',
 			old_shenhua:'神话再临',
 			old_refresh:'界限突破',
 			old_yijiang1:'一将成名2011',

character/refresh.js

@@ -207,7 +207,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						return _status.event.targets.contains(target);
 					}).set('targets',game.filterPlayer(function(current){
 						return current!=player&&current.getHistory('lose').length>0;
-					}));
+					})).set('ai',function(target){
+						var player=_status.event.player;
+						return get.damageEffect(target,player,player);
+					});
 					'step 1'
 					if(result.bool){
 						var target=result.targets[0];
@@ -7864,7 +7867,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			ol_sunjian:'界孙坚',
 			wulie:'武烈',
 			wulie2:'武烈',
-			wulie_info:'限定技，结束阶段，你可以失去任意点体力并指定等量的角色。这些角色各获得一枚「烈」。有「烈」的角色受到伤害时，其移去一枚「烈」，然后防止此伤害。',
+			wulie_info:'限定技，结束阶段，你可以失去任意点体力并指定等量的角色。这些角色各获得一枚「烈」。有「烈」的其他角色受到伤害时，其移去一枚「烈」，然后防止此伤害。',
 			re_sunluban:'界孙鲁班',
 			re_masu:'界马谡',
 			ol_pangde:'界庞德',

character/sp.js

@@ -598,7 +598,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			retuogu:{
-				audio:2,
+				audio:'tuogu',
 				trigger:{global:'die'},
 				filter:function(event,player){
 					return event.player.getStockSkills('仲村由理','天下第一').filter(function(skill){
@@ -2760,7 +2760,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					global:"phaseUseBegin",
 				},
 				filter:function (event,player){
-					return event.player!=player&&event.player.isAlive()&&event.player.inRange(player);
+					return event.player!=player&&event.player.isAlive()&&player.countCards('he')>0&&event.player.inRange(player);
 				},
 				direct:true,
 				derivation:["new_zhixi"],
@@ -5415,7 +5415,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				init:function(player){
 					player.storage.yjixi=0;
 				},
-				derivation:'wangzun',
+				derivation:'rewangzun',
 				trigger:{player:'phaseJieshuBegin'},
 				forced:true,
 				filter:function(event,player){
@@ -5455,8 +5455,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}).set('choiceList',['获得技能〖妄尊〗',str]).set('choice',choice);
 					'step 2'
 					if(result.control=='选项一'){
-						player.addSkill('wangzun');
+						player.addSkill('rewangzun');
-						player.popup('wangzun');
+						player.popup('rewangzun');
 					}
 					else{
 						player.draw(2);

character/standard.js

@@ -40,7 +40,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gongsunzan:['male','qun',4,['yicong']],
 			
 			xf_yiji:["male","shu",3,["xinfu_jijie","xinfu_jiyuan"],[]],
-			re_yuanshu:['male','qun',4,['wangzun','tongji']],
+			re_yuanshu:['male','qun',4,['rewangzun','retongji']],
 		},
 		characterIntro:{
 			liubei:'先主姓刘，讳备，字玄德，涿郡涿县人，汉景帝子中山靖王胜之后也。以仁德治天下。',
@@ -89,6 +89,92 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			ganning:['lingtong'],
 		},
 		skill:{
+			rewangzun:{
+				trigger:{global:'phaseZhunbeiBegin'},
+				forced:true,
+				audio:'wangzun',
+				filter:function(event,player){
+					return event.player.hp>player.hp;
+				},
+				logTarget:'player',
+				content:function(){
+					player.draw();
+					var zhu=false;
+					var target=trigger.player;
+					switch(get.mode()){
+						case 'identity':{
+							zhu=target.isZhu;
+							break;
+						}
+						case 'guozhan':{
+							zhu=get.is.jun(target);
+							break;
+						}
+						case 'versus':{
+							zhu=target.identity=='zhu';
+							break;
+						}
+						case 'doudizhu':{
+							zhu=target==game.zhu;
+							break;
+						}
+					}
+					if(zhu){
+						player.draw();
+						target.addTempSkill('rewangzun2');
+						target.addMark('rewangzun2',1,false);
+					}
+				},
+			},
+			rewangzun2:{
+				onremove:true,
+				mod:{
+					maxHandcard:function(player,num){
+						return num-player.countMark('rewangzun2');
+					},
+				},
+				intro:{content:'手牌上限-#'},
+			},
+			retongji:{
+				trigger:{global:'useCardToTarget'},
+				logTarget:'target',
+				audio:'tongji',
+				direct:true,
+				filter:function(event,player){
+					return event.card.name=='sha'&&event.player!=player&&!event.targets.contains(player)&&
+					event.target.inRange(player)&&event.target.countCards('he')>0;
+				},
+				content:function(){
+					'step 0'
+					trigger.target.chooseCard('he','是否对'+get.translation(player)+'发动【同疾】？','弃置一张牌，将'+get.translation(trigger.card)+'转移给'+get.translation(player)).set('ai',function(card){
+						if(!_status.event.check) return -1;
+						return get.unuseful(card)+9;
+					}).set('check',function(){
+						if(trigger.target.countCards('h','shan')){
+							return -get.attitude(trigger.target,player);
+						}
+						if(get.attitude(trigger.target,player)<5){
+							return 6-get.attitude(trigger.target,player);
+						}
+						if(trigger.target.hp==1&&player.countCards('h','shan')==0){
+							return 10-get.attitude(trigger.target,player);
+						}
+						if(trigger.target.hp==2&&player.countCards('h','shan')==0){
+							return 8-get.attitude(trigger.target,player);
+						}
+						return -1;
+					}()>0);
+					'step 1'
+					if(result.bool){	
+						player.logSkill('retongji',trigger.target);
+						trigger.target.discard(result.cards);
+						var evt=trigger.getParent();
+						evt.triggeredTargets2.remove(trigger.target);
+						evt.targets.remove(trigger.target);
+						evt.targets.push(player);
+					}
+				},
+			},
 			hujia:{
 				audio:2,
 				audioname:['re_caocao'],
@@ -2835,6 +2921,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			zhanshen_info:'觉醒技，准备阶段，若场上有已死亡的其他己方角色且你已受伤，则你弃置装备区的武器牌，减1点体力上限，获得技能〖马术〗和〖神戟〗。',
 			shenji:'神戟',
 			shenji_info:'锁定技，你使用【杀】指定的目标数上限+2，次数上限+1。',
+			rewangzun:'妄尊',
+			rewangzun2:'妄尊',
+			rewangzun_info:'锁定技，一名其他角色的准备阶段开始时，若其体力值大于你，你摸一张牌。然后若其身份为主公/主帅/君主/地主且明智，则你摸一张牌，且其本回合的手牌上限-1。',
+			retongji:'同疾',
+			retongji_info:'攻击范围内包含你的角色成为【杀】的目标时，若你不是此【杀】的使用者或目标，其可弃置一张牌，然后将此【杀】转移给你。',
 			
 			standard_2008:"2008版标准包",
 			standard_2013:"2013版标准包",

character/yijiang.js

@@ -4861,24 +4861,27 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					order:1,
 					result:{
 						player:function(player){
-							var num=0,players=game.filterPlayer();
+							var num=0,eff=0,players=game.filterPlayer(function(current){
-							for(var i=0;i<players.length;i++){
+								return current!=player;
-								if(player!=players[i]&&get.damageEffect(players[i],player,players[i],'fire')<0){
+							}).sortBySeat(player);
-									var att=get.attitude(player,players[i]);
+							for(var target of players){
-									if(att>0){
+								if(get.damageEffect(target,player,target,'fire')>=0){num=0;continue};
-										num--;
+								var shao=false;
-									}
+								num++;
-									else if(att<0){
+								if(target.countCards('he',function(card){
-										num++;
+									if(get.type(card)!='basic'){
+										return get.value(card)<10;
 									}
+									return get.value(card)<8;
+								})<num) shao=true;
+								if(shao){
+									eff-=4*(get.realAttitude||get.attitude)(player,target);
+									num=0;
 								}
+								else eff-=num*(get.realAttitude||get.attitude)(player,target)/4;
 							}
-							if(game.players.length<5){
+							if(eff<4) return 0;
-								return num-1;
+							return eff;
-							}
-							else{
-								return num-2;
-							}
 						}
 					}
 				},
@@ -8902,9 +8905,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				trigger:{player:'phaseUseBegin'},
 				direct:true,
-				filterTarget:function(card,player,target){
+				filter:function(event,player){
-					return target!=player&&target.countCards('h')>0;
+					return game.hasPlayer(function(current){
+						return current!=player&&current.countCards('h')>0;
+					});
 				},
+				subfrequent:['draw'],
 				content:function(){
 					'step 0'
 					player.chooseTarget(get.prompt2('qiangzhi'),function(card,player,target){
@@ -8916,47 +8922,36 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					if(result.bool){
 						var target=result.targets[0];
 						player.logSkill('qiangzhi',target);
-						var card=target.getCards('h').randomGet();
+						player.choosePlayerCard(target,'h',true);
-						player.showCards(card);
-						player.storage.qiangzhi=get.type(card,'trick');
-						game.addVideo('storage',player,['qiangzhi',player.storage.qiangzhi]);
-						player.markSkill('qiangzhi');
 					}
+					else event.finish();
+					'step 2'
+					var card=result.cards[0];
+					player.showCards(card);
+					player.storage.qiangzhi_draw=get.type(card,'trick');
+					game.addVideo('storage',player,['qiangzhi_draw',player.storage.qiangzhi_draw]);
+					player.addTempSkill('qiangzhi_draw','phaseUseEnd');
 				},
+			},
+			qiangzhi_draw:{
+				trigger:{player:'useCard'},
+				frequent:true,
+				popup:false,
+				charlotte:true,
+				prompt:'是否执行【强识】的效果摸一张牌？',
+				filter:function(event,player){
+					return get.type(event.card,'trick')==player.storage.qiangzhi_draw;
+				},
+				content:function(){
+					player.draw();
+				},
+				onremove:true,
+				mark:true,
 				intro:{
 					content:function(type){
 						return get.translation(type)+'牌';
 					}
 				},
-				group:['qiangzhi2','qiangzhi3'],
-				ai:{
-					order:11,
-					result:{
-						player:1
-					}
-				}
-			},
-			qiangzhi2:{
-				trigger:{player:'useCard'},
-				frequent:true,
-				filter:function(event,player){
-					// return (get.type(event.card,'trick')==player.storage.qiangzhi&&event.cards[0]&&event.cards[0]==event.card);
-					return get.type(event.card,'trick')==player.storage.qiangzhi;
-				},
-				content:function(){
-					player.draw();
-				},
-				ai:{
-					threaten:1.4
-				}
-			},
-			qiangzhi3:{
-				trigger:{player:'phaseUseEnd'},
-				silent:true,
-				content:function(){
-					delete player.storage.qiangzhi;
-					player.unmarkSkill('qiangzhi');
-				}
 			},
 			dingpin:{
 				group:['dingpin3','dingpin4'],
@@ -12488,7 +12483,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			bingyi:'秉壹',
 			bingyi_info:'结束阶段开始时，你可以展示所有手牌，若这些牌颜色均相同，则你令至多X名角色各摸一张牌(X为你的手牌数)。',
 			qiangzhi:'强识',
-			qiangzhi2:'强识',
+			qiangzhi_draw:'强识',
 			qiangzhi_info:'出牌阶段开始时，你可以展示一名其他角色的一张手牌。若如此做，当你于此阶段内使用与此牌类别相同的牌时，你可以摸一张牌。',
 			xiantu:'献图',
 			xiantu2:'献图',

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'v1.9.105.6',
+	'v1.9.105.6.1',
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
 	'audio/background/aozhan_rewrite.mp3',
@@ -3419,7 +3419,7 @@ window.noname_asset_list=[
 	'image/character/re_yufan.jpg',
 	'image/character/sp_zhangliao.jpg',
 	'image/character/xin_jianyong.jpg',
-	'image/character/zhangyì.jpg',
+	'image/character/ol_yuanshu.jpg',
 	
 	'image/character/baiwuchang.jpg',
 	'image/character/baosanniang.jpg',

game/game.js

@@ -31296,7 +31296,7 @@
 						else if(info.enable=='phaseUse') enable=(event.type=='phase');
 						else if(typeof info.enable=='string') enable=(info.enable==event.name);
 						if(enable){
-							if(!game.expandSkills(player.getSkills()).contains(skills2[i])&&(info.noHidden||player.hasSkillTag('nomingzhi',false,null,true))) enable=false;
+							if(!game.expandSkills(player.getSkills().concat(lib.skill.global)).contains(skills2[i])&&(info.noHidden||player.hasSkillTag('nomingzhi',false,null,true))) enable=false;
 							if(info.filter&&!info.filter(event,player)) enable=false;
 							if(info.viewAs&&typeof info.viewAs!='function'&&event.filterCard&&!event.filterCard(info.viewAs,player,event)) enable=false;
 							if(info.viewAs&&typeof info.viewAs!='function'&&info.viewAsFilter&&info.viewAsFilter(player)==false) enable=false;

game/update.js

@@ -1,9 +1,8 @@
 window.noname_update={
-	version:'1.9.105.6',
+	version:'1.9.105.6.1',
-	update:'1.9.105.5.1',
+	update:'1.9.105.6',
 	changeLog:[
-		'界满宠、手杀简雍、界虞翻、界李儒、丁原、SP张辽',
+		'新标袁术',
-		'曹爽、刘表、界孙坚、界太史慈、界公孙瓒调整',
 		'bug修复',
 		
 	],
@@ -20,24 +19,24 @@ window.noname_update={
 		//'card/yunchou.js',
 		//'card/zhenfa.js',
 		//'card/zhulu.js',
-		'character/diy.js',
+		//'character/diy.js',
-		'character/extra.js',
+		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
 		'character/mobile.js',
 		//'character/mtg.js',
-		//'character/old.js',
+		'character/old.js',
 		'character/refresh.js',
-		'character/shenhua.js',
+		//'character/shenhua.js',
 		'character/sp.js',
-		'character/sp2.js',
+		//'character/sp2.js',
 		//'character/tw.js',
 		'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
-		'character/xinghuoliaoyuan.js',
+		//'character/xinghuoliaoyuan.js',
 		'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',

mode/versus.js

@@ -4057,7 +4057,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			'wenpin','re_xuzhu','wangyi','dianwei','re_lidian','xunyou','dengai','wangji',
 			'zhongyao','yuejin','simalang','zhangchunhua','sp_caoren','luzhi','litong','re_liubei',
 			'guanyu','re_zhangfei','re_zhugeliang','re_zhaoyun','re_machao','huangyueying','jiangwei','xin_masu',
-			'liuchen','re_huangzhong','mizhu','madai','wangping','xin_fazheng','re_xushu','liyan',
+			'liuchen','re_huangzhong','mizhu','old_madai','wangping','xin_fazheng','re_xushu','liyan',
 			'sp_sunshangxiang','zhoucang','yanyan','mazhong','mayunlu','sunquan','re_ganning','re_huanggai',
 			're_zhouyu','re_daqiao','sunshangxiang','sunjian','re_xiaoqiao','sunce','re_luxun','zhugejin',
 			'dingfeng','lingtong','guyong','xusheng','yufan','handang','panzhangmazhong','zhugeke',
@@ -4072,7 +4072,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			'dongzhuo','jiaxu','sunjian','xuhuang','zhurong','jiangwei','sunce',
 			'wangping','sunliang','wangji','yanyan',
 			'chengong','zhangchunhua','xin_fazheng','lingtong','wuguotai','caozhi','xusheng',
-			'xunyou','zhonghui','xin_wangyi','madai',//'bulianshi',
+			'xunyou','zhonghui','xin_wangyi','old_madai',//'bulianshi',
 			'handang','liubiao',
 			'fuhuanghou','xin_liru',//'jianyong',
 			'panzhangmazhong','yufan','liufeng',