g

character/shenhua.js

@@ -2731,9 +2731,9 @@ character.shenhua={
 				player.awakenSkill('niepan');
 				player.storage.niepan=true;
 				'step 1'
-				if(player.isLinked()) player.link();
+				player.link(false);
 				'step 2'
-				if(player.isTurnedOver()) player.turnOver();
+				player.turnOver(false);
 			},
 			ai:{
 				order:1,
@@ -2757,6 +2757,59 @@ character.shenhua={
 				content:'limited'
 			}
 		},
+		oldniepan:{
+			audio:'niepan',
+			unique:true,
+			enable:'chooseToUse',
+			mark:true,
+			skillAnimation:true,
+			animationStr:'涅盘',
+			animationColor:'fire',
+			init:function(player){
+				player.storage.oldniepan=false;
+			},
+			filter:function(event,player){
+				if(player.storage.oldniepan) return false;
+				if(event.type=='dying'){
+					if(player!=event.dying) return false;
+					return true;
+				}
+				return false;
+			},
+			content:function(){
+				'step 0'
+				player.hp=Math.min(3,player.maxHp);
+				player.discard(player.get('hej'));
+				player.draw(3);
+				player.awakenSkill('oldniepan');
+				player.storage.oldniepan=true;
+				'step 1'
+				player.link(false);
+				'step 2'
+				player.turnOver(false);
+			},
+			ai:{
+				order:1,
+				skillTagFilter:function(player){
+					if(player.storage.oldniepan) return false;
+					if(player.hp>0) return false;
+				},
+				save:true,
+				result:{
+					player:function(player){
+						if(player.hp==0) return 10;
+						if(player.hp<=2&&player.num('he')<=1) return 10;
+						return 0;
+					}
+				},
+				threaten:function(player,target){
+					if(!target.storage.oldniepan) return 0.6;
+				}
+			},
+			intro:{
+				content:'limited'
+			}
+		},
 		quhu:{
 			audio:2,
 			enable:'phaseUse',
@@ -4120,6 +4173,7 @@ character.shenhua={
 		lianhuan3:'连环',
 		lianhuan2:'连铸',
 		niepan:'涅槃',
+		oldniepan:'涅槃',
 		quhu:'驱虎',
 		jieming:'节命',
 		qiangxi:'强袭',
@@ -4135,6 +4189,7 @@ character.shenhua={
 		kanpo_info:'你可以将你的任意一张♠或♣手牌当【无懈可击】使用。',
 		lianhuan_info:'出牌阶段，你可以将你任意一张梅花手牌当【铁索连环】使用或重铸。',
 		niepan_info:'限定技，出牌阶段或当你处于濒死状态时，你可以丢弃你所有的牌和你判定区里的牌，并复原你的武将牌，然后摸三张牌且体力回复至3点。',
+		oldniepan_info:'限定技，当你处于濒死状态时，你可以丢弃你所有的牌和你判定区里的牌，并复原你的武将牌，然后摸三张牌且体力回复至3点。',
 		quhu_info:'出牌阶段，你可以与一名体力比你多的角色拼点，若你赢，则该角色对其攻击范围内另一名由你指定的角色造成1点伤害。若你没赢，他/她对你造成一点伤害。每回合限用一次。',
 		jieming_info:'你每受到1点伤害，可令任意一名角色将手牌补至其体力上限的张数(不能超过五张)。',
 		qiangxi_info:'出牌阶段，你可以自减一点体力或弃一张武器牌，然后你对你攻击范围内的一名角色造成一点伤害，每回合限一次。',

character/sp.js

@@ -8222,7 +8222,8 @@ character.sp={
 		suishi_info:'每当其他角色进入濒死状态时，伤害来源可以令你摸一张牌；每当其他角色死亡时，伤害来源可以令你失去1点体力',
 		quji_info:'出牌阶段限一次，你可以弃置X张牌（X为你已损失的体力值），然后令至多X名已受伤的角色各回复1点体力。若你以此法弃置的牌中有黑色牌，你失去一点体力。',
 		junbing_info:'一名角色的结束阶段开始时，若其手牌数少于或者等于1，该角色可以摸一张牌。若如此做，该角色须将所有手牌交给你，然后你交给其等量的牌。',
-		xiongyi_info:'限定技，出牌阶段，你可以与你势力相同的所有角色各摸3张牌（非国战模式改为任选至多3名角色）；若你指定的角色数不超过2，你回复1点体力',
+		xiongyi_info:'限定技，出牌阶段，你可以指定至多三名角色与你各摸三张牌；若你指定的角色数不超过2，你回复1点体力',
+		xiongyi_info_guozhan:'限定技，出牌阶段，你可以令与你势力相同的所有角色各摸三张牌，然后若你的势力是角色最少的势力（或之一），则你回复1点体力',
 		shenzhi_info:'准备阶段开始时，你可以弃置所有手牌，若你以此法弃置的牌的张数不小于X，你回复1点体力（X为你当前的体力值）。',
 		shushen_info:'当你回复1点体力时，你可以令一名其他角色回复1点体力或摸两张牌',
 		wuji_info:'觉醒技，结束阶段开始时，若你于此回合内已造成3点或更多伤害，你加1点体力上限，回复1点体力，然后失去技能“虎啸”。',

mode/guozhan.js

@@ -135,6 +135,71 @@ mode.guozhan={
 			gz_dianwei:['male','wei',4,['qiangxi']],
 			gz_xunyu:['male','wei',3,['quhu','jieming']],
 			gz_caopi:['male','wei',3,['xingshang','fangzhu']],
+			gz_yuejin:['male','wei',4,[]],
+
+			gz_liubei:['male','shu',4,['rende']],
+			gz_guanyu:['male','shu',5,['wusheng']],
+			gz_zhangfei:['male','shu',4,['paoxiao']],
+			gz_zhugeliang:['male','shu',3,['guanxing','kongcheng']],
+			gz_zhaoyun:['male','shu',4,['longdan']],
+			gz_machao:['male','shu',4,['mashu','tieji']],
+			gz_huangyueying:['female','shu',3,['jizhi','qicai']],
+			gz_huangzhong:['male','shu',4,['liegong']],
+			gz_weiyan:['male','shu',4,['kuanggu']],
+			gz_pangtong:['male','shu',3,['lianhuan','oldniepan']],
+			gz_sp_zhugeliang:['male','shu',3,['huoji','bazhen','kanpo']],
+			gz_liushan:['male','shu',3,['xiangle','fangquan']],
+			gz_menghuo:['male','shu',4,['huoshou','zaiqi']],
+			gz_zhurong:['female','shu',4,['juxiang','lieren']],
+			gz_ganfuren:['female','shu',3,['shushen','shenzhi']],
+
+			gz_sunquan:['male','wu',4,['zhiheng']],
+			gz_ganning:['male','wu',4,['qixi']],
+			gz_lvmeng:['male','wu',4,['keji']],
+			gz_huanggai:['male','wu',4,['kurou']],
+			gz_zhouyu:['male','wu',3,['yingzi','fanjian']],
+			gz_daqiao:['female','wu',3,['guose','liuli']],
+			gz_luxun:['male','wu',3,[]],
+			gz_sunshangxiang:['female','wu',3,['jieyin','xiaoji']],
+			gz_sunjian:['male','wu',4,['yinghun']],
+			gz_xiaoqiao:['female','wu',3,['tianxiang','hongyan']],
+			gz_taishici:['male','wu',4,['tianyi']],
+			gz_zhoutai:['male','wu',4,['buqu']],
+			gz_re_lusu:['male','wu',3,['haoshi','dimeng']],
+			gz_zhangzhang:['male','wu',3,['zhijian','guzheng']],
+			gz_dingfeng:['male','wu',4,['fenxun','duanbing']],
+
+			gz_huatuo:['male','qun',3,['qingnang','jijiu']],
+			gz_lvbu:['male','qun',5,['wushuang']],
+			gz_diaochan:['female','qun',3,['lijian','biyue']],
+			gz_re_yuanshao:['male','qun',4,['luanji']],
+			gz_jiaxu:['male','qun',3,['wansha','luanwu','weimu']],
+			gz_pangde:['male','qun',4,['mashu','mengjin']],
+			gz_zhangjiao:['male','qun',3,['leiji','guidao']],
+			gz_caiwenji:['female','qun',3,['beige','duanchang']],
+			gz_mateng:['male','qun',4,['mashu','xiongyi']],
+			gz_kongrong:['male','qun',3,['mingshi','lirang']],
+			// gz_jiling:['male','qun',4,[]],
+			gz_tianfeng:['male','qun',3,['sijian','suishi']],
+			gz_panfeng:['male','qun',4,['kuangfu']],
+			// gz_zoushi:['female','qun',3,[]],
+
+			gz_dengai:['male','wei',4,[]],
+			gz_caohong:['male','wei',4,[]],
+			gz_jiangfei:['male','shu',3,[]],
+			gz_jiangwei:['male','shu',4,[]],
+			gz_xusheng:['male','wu',4,[]],
+			gz_jiangqing:['male','wu',4,[]],
+			gz_hetaihou:['female','qun',3,['zhendu','qiluan']],
+
+			gz_re_lidian:['male','wei',3,['xunxun','wangxi']],
+			// gz_zangba:['male','wei',4,[]],
+			gz_madai:['male','shu',4,[]],
+			gz_mifuren:['female','shu',3,[]],
+			gz_sunce:['male','wu',4,[]],
+			gz_chendong:['male','wu',4,['duanxie','fenming']],
+			gz_sp_dongzhuo:['male','qun',4,[]],
+			// gz_zhangren:['male','qun',4,[]],
 		}
 	},
 	game:{