From f8ca13c5fa9fbef8d168f38bed67bee80c3e7b41 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Sun, 12 Nov 2017 21:16:14 +0800
Subject: [PATCH] 2

---
 character/mtg.js | 139 +++++------------------------------
 game/game.js     | 186 +++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 182 insertions(+), 143 deletions(-)

diff --git a/character/mtg.js b/character/mtg.js
index 2b2ea4d5c..8c76cbd39 100644
--- a/character/mtg.js
+++ b/character/mtg.js
@@ -45,81 +45,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			lingyong:{
 				enable:'phaseUse',
 				filter:function(event,player){
-					return player.hasSkillTag('lingyong');
+					return !player.hasSkill('subplayer')&&player.getSubPlayers('lingyong_get').length>0;
 				},
 				unique:true,
     			forceunique:true,
-				group:'lingyong2',
+				group:'lingyong_get',
 				direct:true,
 				delay:0,
 				skillAnimation:true,
 				animationColor:'thunder',
 				content:function(){
-					'step 0'
-					var list=[];
-					var list2=[];
-					var skills=player.getSkills();
-					for(var i=0;i<skills.length;i++){
-						var info=lib.skill[skills[i]];
-						if(info.ai&&info.ai.lingyong){
-							list.push(skills[i].slice(9));
-							list2.push(skills[i]);
-						}
-					}
-					event.list=list;
-					event.list2=list2;
-					if(list.length>1){
-						var dialog=ui.create.dialog('灵俑','hidden');
-	    				dialog.add([list,'character']);
-	    				player.chooseButton(dialog,true);
-					}
-					else if(list.length==1){
-						event.directresult=list[0];
-					}
-					else{
-						event.finish();
-					}
-					player.logSkill('lingyong');
-					'step 1'
-					if(!event.directresult){
-						if(result&&result.bool&&result.links[0]){
-							event.directresult=result.links[0];
-						}
-						else{
-							event.finish();
-							return;
-						}
-					}
-					if(event.directresult){
-						var storage={};
-						for(var i=0;i<event.list2.length;i++){
-							var skill=event.list2[i];
-							storage[skill]=player.storage[skill];
-						}
-						player.removeSkill(event.list2);
-						event.list2.remove('lingyong_'+event.directresult);
-						delete storage['lingyong_'+event.directresult];
-						var name=event.directresult;
-						player.storage.lingyong3={
-							name:'mtg_lilianna',
-							hp:player.hp,
-							maxHp:player.maxHp,
-							skills:event.list2.slice(0),
-							name2:name,
-							storage:storage,
-							hs:player.getCards('h'),
-							es:player.getCards('e')
-						}
-	    				player.reinit('mtg_lilianna',name,[1,1]);
-						player.addSkill('lingyong3');
-						player.lose(player.getCards('he'),ui.special)._triggered=null;
-
-						var evt=_status.event.getParent('phaseUse');
-						if(evt&&evt.name=='phaseUse'){
-							evt.skipped=true;
-						}
-						player.insertPhase();
-					}
+					player.callSubPlayer('lingyong_get');
 				},
 				ai:{
 					order:1,
@@ -131,65 +67,24 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							// return 0;
 						}
 					}
-				}
-			},
-			lingyong2:{
-				trigger:{global:'dieAfter'},
-				forced:true,
-				filter:function(event,player){
-					return ![player.name,player.name1,player.name2].contains(event.player.name);
 				},
-				content:function(){
-					var name='lingyong_'+trigger.player.name;
-					lib.translate[name]=get.rawName(trigger.player.name).replace(/<br>/g,'')+'之俑';
-					lib.skill[name]={
-						intro:{
-							content:'出牌阶段，你可以移去此标记，然后变身为'+get.translation(trigger.player)
+				subSkill:{
+					get:{
+						trigger:{global:'dieAfter'},
+						forced:true,
+						filter:function(event,player){
+							return ![player.name,player.name1,player.name2].contains(event.player.name);
 						},
-						mark:'character',
-						onremove:true,
-						ai:{
-							lingyong:true
+						content:function(){
+							player.addSubPlayer({
+								name:trigger.player.name,
+								skills:lib.character[trigger.player.name][3],
+								hs:get.cards(2),
+								intro:'出牌阶段，你可以调遣此随从',
+								intro2:'xx'
+							});
 						}
 					}
-					player.storage[name]=trigger.player;
-					player.addSkill(name);
-				}
-			},
-			lingyong3:{
-				trigger:{player:'dieBefore'},
-				forced:true,
-				priority:-9,
-				onremove:true,
-				mark:'character',
-				intro:{
-					content:'死亡前变回莉莲娜'
-				},
-				content:function(){
-					'step 0'
-					if(player.storage.lingyong3){
-						player.reinit(player.storage.lingyong3.name2,'mtg_lilianna',[
-							player.storage.lingyong3.hp,
-							player.storage.lingyong3.maxHp
-						]);
-						player.update();
-						for(var i in player.storage.lingyong3.storage){
-							player.storage[i]=player.storage.lingyong3.storage[i];
-						}
-						player.addSkill(player.storage.lingyong3.skills);
-						trigger.cancel();
-						player.lose(player.getCards('he'),ui.discardPile)._triggered=null;
-					}
-					'step 1'
-					if(player.storage.lingyong3){
-						player.directgain(player.storage.lingyong3.hs);
-						player.directequip(player.storage.lingyong3.es);
-					}
-					player.removeSkill('lingyong3');
-				},
-				ai:{
-					nosave:true,
-					threaten:0.8
 				}
 			},
 			mhuanyi:{
diff --git a/game/game.js b/game/game.js
index 39d0b6a3d..8877668d4 100644
--- a/game/game.js
+++ b/game/game.js
@@ -5577,7 +5577,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>随从：通过技能获得，拥有独立的技能、手牌区和装备区（共享判定区），出场时替代主武将的位置；随从死亡时自动切换回主武将'
 		},
 		setIntro:function(node,func){
 			if(lib.config.touchscreen){
@@ -5911,6 +5911,9 @@
                                 else if(nameinfo[4][i].indexOf('mode:')==0){
                                     modeimage=nameinfo[4][i].slice(5);break;
                                 }
+								else if(nameinfo[4][i].indexOf('character:')==0){
+									name=nameinfo[4][i].slice(10);break;
+								}
         					}
         				}
                         if(extimage){
@@ -8975,6 +8978,104 @@
 		},
 		element:{
 			content:{
+				exitSubPlayer:function(){
+					'step 0'
+					if(player.storage.subplayer){
+						var current=player.storage.subplayer.name2;
+						player.reinit(current,player.storage.subplayer.name,[
+							player.storage.subplayer.hp,
+							player.storage.subplayer.maxHp
+						]);
+						player.update();
+						if(event.remove){
+							delete player.storage.subplayer.storage[current];
+							player.storage.subplayer.skills.remove(current);
+							game.log(player,'牺牲了随从','#g'+current);
+						}
+						else{
+							game.log(player,'收回了随从','#g'+current);
+						}
+						for(var i in player.storage.subplayer.storage){
+							player.storage[i]=player.storage.subplayer.storage[i];
+						}
+						player.addSkill(player.storage.subplayer.skills);
+						if(event.remove){
+							player.lose(player.getCards('he'),ui.discardPile)._triggered=null;
+						}
+						else{
+							player.storage[current].hs=player.getCards('h');
+							player.storage[current].es=player.getCards('e');
+							player.lose(player.getCards('he'),ui.special)._triggered=null;
+						}
+					}
+					'step 1'
+					if(player.storage.subplayer){
+						player.directgain(player.storage.subplayer.hs);
+						player.directequip(player.storage.subplayer.es);
+					}
+					player.removeSkill('subplayer');
+				},
+				callSubPlayer:function(){
+					'step 0'
+					var list=player.getSubPlayers(event.tag);
+					event.list=list;
+					if(!event.directresult){
+						if(list.length>1){
+							var dialog=ui.create.dialog('调遣一个随从','hidden');
+		    				dialog.add([list,'character']);
+		    				player.chooseButton(dialog,true);
+						}
+						else if(list.length==1){
+							event.directresult=list[0];
+						}
+						else{
+							event.finish();
+						}
+					}
+					else{
+						if(!list.contains(event.directresult)){
+							event.finish();
+						}
+					}
+					'step 1'
+					if(!event.directresult){
+						if(result&&result.bool&&result.links[0]){
+							event.directresult=result.links[0];
+						}
+						else{
+							event.finish();
+							return;
+						}
+					}
+					if(event.directresult){
+						var storage={};
+						for(var i=0;i<event.list.length;i++){
+							var skill=event.list[i];
+							storage[skill]=player.storage[skill];
+						}
+						var cfg=player.storage[event.directresult];
+						var source=cfg.source||player.name;
+						var name=event.directresult;
+						game.log(player,'调遣了随从','#b'+name);
+						player.storage.subplayer={
+							name:source,
+							name2:event.directresult,
+							hp:player.hp,
+							maxHp:player.maxHp,
+							skills:event.list.slice(0),
+							storage:storage,
+							hs:player.getCards('h'),
+							es:player.getCards('e'),
+							intro2:cfg.intro2
+						}
+						player.removeSkill(event.list);
+	    				player.reinit(source,name,[cfg.hp,cfg.maxHp]);
+						player.addSkill('subplayer');
+						player.lose(player.getCards('he'),ui.special)._triggered=null;
+						if(cfg.hs.length) player.directgain(cfg.hs);
+						if(cfg.es.length) player.directequip(cfg.es);
+					}
+				},
 				reverseOrder:function(){
 					"step 0"
 					game.delay();
@@ -16756,20 +16857,30 @@
 						},
 						mark:'character',
 						onremove:true,
+						subplayer:cfg.skill||_status.event.name,
 						ai:{
 							subplayer:true
 						}
 					}
-					if(!cfg.handcards){
-						cfg.handcards=[];
+					cfg.hs=cfg.hs||[];
+					cfg.es=cfg.es||[];
+					cfg.skills=cfg.skills||[];
+					cfg.hp=cfg.hp||1;
+					cfg.maxHp=cfg.maxHp||1;
+					cfg.sex=cfg.sex||'male';
+					cfg.group=cfg.group||'qun';
+					cfg.skill=cfg.skill||_status.event.name;
+					if(!cfg.source){
+						if(this.hasSkill(_status.event.name)&&this.name2&&lib.character[this.name2]&&
+							lib.character[this.name2][3].contains(_status.event.name)){
+							cfg.source=this.name2;
+						}
+						else{
+							cfg.source=this.name;
+						}
 					}
-					if(!cfg.equips){
-						cfg.equips=[];
-					}
-					if(!cfg.skills){
-						cfg.skills=[];
-					}
-					lib.translate[skill]=cfg.caption||get.rawName(trigger.player.name);
+					lib.character[skill]=[cfg.sex,cfg.group,cfg.maxHp,cfg.skills,['character:'+cfg.name]];
+					lib.translate[skill]=cfg.caption||get.rawName(cfg.name);
 					this.storage[skill]=cfg;
 					this.addSkill(skill);
 				},
@@ -16777,29 +16888,38 @@
 
 				},
 				callSubPlayer:function(){
-
+					if(this.hasSkill('subplayer')) return;
+					var next=game.createEvent('callSubPlayer');
+					next.player=this;
+					for(var i=0;i<arguments.length;i++){
+						if(typeof arguments[i]=='string'){
+							next.tag=arguments[i];
+						}
+					}
+					next.setContent('callSubPlayer');
+					return next;
 				},
-				getSubPlayers:function(){
+				exitSubPlayer:function(remove){
+					if(!this.hasSkill('subplayer')) return;
+					var next=game.createEvent('exitSubPlayer');
+					next.player=this;
+					next.remove=remove;
+					next.setContent('exitSubPlayer');
+					return next;
+				},
+				getSubPlayers:function(tag){
 					var skills=this.getSkills();
 					var list=[];
 					for(var i=0;i<skills.length;i++){
 						var name=skills[i];
 						var info=lib.skill[name];
+						if(tag&&info.subplayer!=tag) continue;
 						if(info.ai&&info.ai.subplayer&&this.storage[name]&&this.storage[name].name){
 							list.push(name);
 						}
 					}
 					return list;
 				},
-				getSubPlayerNames:function(list){
-					if(!list){
-						list=this.getSubPlayers();
-					}
-					var names=[];
-					for(var i=0;i<list.length;i++){
-						names.push(this.storage[list[i]].name);
-					}
-				},
                 addSkillTrigger:function(skill,hidden,triggeronly){
                     var info=lib.skill[skill];
                     if(!info) return;
@@ -20667,6 +20787,30 @@
             zhu:{},
             zhuSkill:{},
 			unequip:{ai:{unequip:true}},
+			subplayer:{
+				trigger:{player:'dieBefore'},
+				forced:true,
+				priority:-9,
+				onremove:true,
+				mark:'character',
+				intro:{
+					content:function(storage,player){
+						if(typeof storage.intro2=='string') return storage.intro2;
+						if(typeof storage.intro2=='function') return storage.intro2(storage,player);
+						return '死亡前变回'+get.translation(storage.name);
+					},
+					name:function(storage){
+						return get.rawName(storage.name2);
+					}
+				},
+				content:function(){
+					trigger.cancel();
+					player.exitSubPlayer(true);
+				},
+				ai:{
+					nosave:true
+				}
+			},
 			autoswap:{
 				trigger:{player:['chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin',
 				'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin',