Merge pull request #1209 from PZ157/PR-Branch

国战禁用无限制变更势力的武将/技能，combo补充

character/huicui.js

@@ -678,6 +678,9 @@ game.import('character', function () {
 					await player.recover();
 					await player.addSkills('dczifu');
 				},
+				ai:{
+					combo:'dcjichou'
+				}
 			},
 			dczifu:{
 				audio:2,

character/jsrg.js

@@ -85,6 +85,11 @@ game.import('character', function () {
 		},
 		characterTitle:{
 		},
+		characterFilter:{
+			jsrg_jiangwei(mode){
+				return mode!=='guozhan';
+			},
+		},
 		perfectPair:{},
 		card:{
 			xumou_jsrg:{
@@ -4092,6 +4097,7 @@ game.import('character', function () {
 			},
 			//许攸
 			jsrglipan:{
+				forbid:['guozhan'],
 				audio:2,
 				trigger:{
 					player:'phaseEnd',
@@ -4328,6 +4334,7 @@ game.import('character', function () {
 			},
 			//吕布
 			jsrgwuchang:{
+				forbid:['guozhan'],
 				audio:2,
 				trigger:{
 					player:'gainAfter',

character/old.js

@@ -152,6 +152,7 @@ game.import('character', function () {
 			},
 			//魏武帝
 			junkguixin:{
+				forbid:['guozhan'],
 				init:function(){
 					if(!_status.junkguixin){
 						_status.junkguixin=[];

character/shenhua.js

@@ -2437,9 +2437,6 @@ game.import('character', function () {
 						},
 					},
 				},
-				ai:{
-					combo:'nzry_zhenliang',
-				},
 			},
 			"nzry_zhenliang":{
 				audio:"nzry_zhenliang_1",

character/sp.js

@@ -28,6 +28,9 @@ game.import('character', function () {
 			ol_dongzhao:function(mode){
 				return mode=='identity'&&['normal','zhong'].includes(_status.mode);
 			},
+			ol_mengda(mode){
+				return mode!=='guozhan';
+			},
 		},
 		character:{
 			ol_liupi:['male','qun',4,['olyicheng']],

character/tw.js

@@ -15919,6 +15919,7 @@ game.import('character', function () {
 				}
 			},
 			renshe:{
+				forbid:['guozhan'],
 				audio:2,
 				trigger:{player:'damageEnd'},
 				direct:true,

character/yingbian.js

@@ -3454,6 +3454,9 @@ game.import('character', function () {
 					player.addSkills('pozhu');
 				},
 				derivation:'pozhu',
+				ai:{
+					combo:'sanchen'
+				}
 			},
 			pozhu:{
 				enable:'phaseUse',