diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua
index cd3dbadb..ef4a3383 100644
--- a/lua/app/config/hero.lua
+++ b/lua/app/config/hero.lua
@@ -8,38 +8,44 @@ local hero = {
 		["rouge_skill_1"]=200501,
 		["rouge_skill_2"]=200502,
 		["rouge_skill_3"]=200503,
-		["hp_1"]=1000000,
-		["hp_2"]=1100000,
-		["hp_3"]=1200000,
-		["hp_4"]=1300000,
-		["hp_5"]=1400000,
-		["hp_6"]=1500000,
-		["hp_7"]=1600000,
-		["hp_8"]=1700000,
-		["hp_9"]=1800000,
-		["hp_10"]=1900000,
-		["hp_11"]=2000000,
-		["hp_12"]=2100000,
-		["hp_13"]=2200000,
-		["hp_14"]=2300000,
-		["hp_15"]=2400000,
-		["atk_1"]=1000000,
-		["atk_2"]=1100000,
-		["atk_3"]=1200000,
-		["atk_4"]=1300000,
-		["atk_5"]=1400000,
-		["atk_6"]=1500000,
-		["atk_7"]=1600000,
-		["atk_8"]=1700000,
-		["atk_9"]=1800000,
-		["atk_10"]=1900000,
-		["atk_11"]=2000000,
-		["atk_12"]=2100000,
-		["atk_13"]=2200000,
-		["atk_14"]=2300000,
-		["atk_15"]=2400000,
+		["begin_lv"]=1,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0001",
-		["icon"]="1"
+		["icon"]="1",
+		["item_id"]=12001
 	},
 	[22001]={
 		["position"]=2,
@@ -50,38 +56,44 @@ local hero = {
 		["rouge_skill_1"]=200201,
 		["rouge_skill_2"]=200202,
 		["rouge_skill_3"]=200203,
-		["hp_1"]=1000000,
-		["hp_2"]=1100000,
-		["hp_3"]=1200000,
-		["hp_4"]=1300000,
-		["hp_5"]=1400000,
-		["hp_6"]=1500000,
-		["hp_7"]=1600000,
-		["hp_8"]=1700000,
-		["hp_9"]=1800000,
-		["hp_10"]=1900000,
-		["hp_11"]=2000000,
-		["hp_12"]=2100000,
-		["hp_13"]=2200000,
-		["hp_14"]=2300000,
-		["hp_15"]=2400000,
-		["atk_1"]=1000000,
-		["atk_2"]=1100000,
-		["atk_3"]=1200000,
-		["atk_4"]=1300000,
-		["atk_5"]=1400000,
-		["atk_6"]=1500000,
-		["atk_7"]=1600000,
-		["atk_8"]=1700000,
-		["atk_9"]=1800000,
-		["atk_10"]=1900000,
-		["atk_11"]=2000000,
-		["atk_12"]=2100000,
-		["atk_13"]=2200000,
-		["atk_14"]=2300000,
-		["atk_15"]=2400000,
+		["begin_lv"]=1,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0002",
-		["icon"]="2"
+		["icon"]="2",
+		["item_id"]=22001
 	},
 	[23001]={
 		["position"]=2,
@@ -92,38 +104,44 @@ local hero = {
 		["rouge_skill_1"]=200701,
 		["rouge_skill_2"]=200702,
 		["rouge_skill_3"]=200703,
-		["hp_1"]=1500000,
-		["hp_2"]=1650000,
-		["hp_3"]=1800000,
-		["hp_4"]=1950000,
-		["hp_5"]=2100000,
-		["hp_6"]=2250000,
-		["hp_7"]=2400000,
-		["hp_8"]=2550000,
-		["hp_9"]=2700000,
-		["hp_10"]=2850000,
-		["hp_11"]=3000000,
-		["hp_12"]=3150000,
-		["hp_13"]=3300000,
-		["hp_14"]=3450000,
-		["hp_15"]=3600000,
-		["atk_1"]=1500000,
-		["atk_2"]=1650000,
-		["atk_3"]=1800000,
-		["atk_4"]=1950000,
-		["atk_5"]=2100000,
-		["atk_6"]=2250000,
-		["atk_7"]=2400000,
-		["atk_8"]=2550000,
-		["atk_9"]=2700000,
-		["atk_10"]=2850000,
-		["atk_11"]=3000000,
-		["atk_12"]=3150000,
-		["atk_13"]=3300000,
-		["atk_14"]=3450000,
-		["atk_15"]=3600000,
+		["begin_lv"]=3,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0006",
-		["icon"]="6"
+		["icon"]="6",
+		["item_id"]=23001
 	},
 	[32001]={
 		["position"]=3,
@@ -134,38 +152,44 @@ local hero = {
 		["rouge_skill_1"]=200101,
 		["rouge_skill_2"]=200102,
 		["rouge_skill_3"]=200103,
-		["hp_1"]=1000000,
-		["hp_2"]=1100000,
-		["hp_3"]=1200000,
-		["hp_4"]=1300000,
-		["hp_5"]=1400000,
-		["hp_6"]=1500000,
-		["hp_7"]=1600000,
-		["hp_8"]=1700000,
-		["hp_9"]=1800000,
-		["hp_10"]=1900000,
-		["hp_11"]=2000000,
-		["hp_12"]=2100000,
-		["hp_13"]=2200000,
-		["hp_14"]=2300000,
-		["hp_15"]=2400000,
-		["atk_1"]=1000000,
-		["atk_2"]=1100000,
-		["atk_3"]=1200000,
-		["atk_4"]=1300000,
-		["atk_5"]=1400000,
-		["atk_6"]=1500000,
-		["atk_7"]=1600000,
-		["atk_8"]=1700000,
-		["atk_9"]=1800000,
-		["atk_10"]=1900000,
-		["atk_11"]=2000000,
-		["atk_12"]=2100000,
-		["atk_13"]=2200000,
-		["atk_14"]=2300000,
-		["atk_15"]=2400000,
+		["begin_lv"]=1,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0003",
-		["icon"]="3"
+		["icon"]="3",
+		["item_id"]=32001
 	},
 	[33001]={
 		["position"]=3,
@@ -176,38 +200,44 @@ local hero = {
 		["rouge_skill_1"]=200601,
 		["rouge_skill_2"]=200602,
 		["rouge_skill_3"]=200603,
-		["hp_1"]=1500000,
-		["hp_2"]=1650000,
-		["hp_3"]=1800000,
-		["hp_4"]=1950000,
-		["hp_5"]=2100000,
-		["hp_6"]=2250000,
-		["hp_7"]=2400000,
-		["hp_8"]=2550000,
-		["hp_9"]=2700000,
-		["hp_10"]=2850000,
-		["hp_11"]=3000000,
-		["hp_12"]=3150000,
-		["hp_13"]=3300000,
-		["hp_14"]=3450000,
-		["hp_15"]=3600000,
-		["atk_1"]=1500000,
-		["atk_2"]=1650000,
-		["atk_3"]=1800000,
-		["atk_4"]=1950000,
-		["atk_5"]=2100000,
-		["atk_6"]=2250000,
-		["atk_7"]=2400000,
-		["atk_8"]=2550000,
-		["atk_9"]=2700000,
-		["atk_10"]=2850000,
-		["atk_11"]=3000000,
-		["atk_12"]=3150000,
-		["atk_13"]=3300000,
-		["atk_14"]=3450000,
-		["atk_15"]=3600000,
+		["begin_lv"]=3,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0007",
-		["icon"]="7"
+		["icon"]="7",
+		["item_id"]=33001
 	},
 	[42001]={
 		["position"]=4,
@@ -218,38 +248,44 @@ local hero = {
 		["rouge_skill_1"]=200301,
 		["rouge_skill_2"]=200302,
 		["rouge_skill_3"]=200303,
-		["hp_1"]=1000000,
-		["hp_2"]=1100000,
-		["hp_3"]=1200000,
-		["hp_4"]=1300000,
-		["hp_5"]=1400000,
-		["hp_6"]=1500000,
-		["hp_7"]=1600000,
-		["hp_8"]=1700000,
-		["hp_9"]=1800000,
-		["hp_10"]=1900000,
-		["hp_11"]=2000000,
-		["hp_12"]=2100000,
-		["hp_13"]=2200000,
-		["hp_14"]=2300000,
-		["hp_15"]=2400000,
-		["atk_1"]=1000000,
-		["atk_2"]=1100000,
-		["atk_3"]=1200000,
-		["atk_4"]=1300000,
-		["atk_5"]=1400000,
-		["atk_6"]=1500000,
-		["atk_7"]=1600000,
-		["atk_8"]=1700000,
-		["atk_9"]=1800000,
-		["atk_10"]=1900000,
-		["atk_11"]=2000000,
-		["atk_12"]=2100000,
-		["atk_13"]=2200000,
-		["atk_14"]=2300000,
-		["atk_15"]=2400000,
+		["begin_lv"]=1,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0004",
-		["icon"]="4"
+		["icon"]="4",
+		["item_id"]=42001
 	},
 	[43001]={
 		["position"]=4,
@@ -260,38 +296,44 @@ local hero = {
 		["rouge_skill_1"]=200801,
 		["rouge_skill_2"]=200802,
 		["rouge_skill_3"]=200803,
-		["hp_1"]=1500000,
-		["hp_2"]=1650000,
-		["hp_3"]=1800000,
-		["hp_4"]=1950000,
-		["hp_5"]=2100000,
-		["hp_6"]=2250000,
-		["hp_7"]=2400000,
-		["hp_8"]=2550000,
-		["hp_9"]=2700000,
-		["hp_10"]=2850000,
-		["hp_11"]=3000000,
-		["hp_12"]=3150000,
-		["hp_13"]=3300000,
-		["hp_14"]=3450000,
-		["hp_15"]=3600000,
-		["atk_1"]=1500000,
-		["atk_2"]=1650000,
-		["atk_3"]=1800000,
-		["atk_4"]=1950000,
-		["atk_5"]=2100000,
-		["atk_6"]=2250000,
-		["atk_7"]=2400000,
-		["atk_8"]=2550000,
-		["atk_9"]=2700000,
-		["atk_10"]=2850000,
-		["atk_11"]=3000000,
-		["atk_12"]=3150000,
-		["atk_13"]=3300000,
-		["atk_14"]=3450000,
-		["atk_15"]=3600000,
+		["begin_lv"]=3,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0008",
-		["icon"]="8"
+		["icon"]="8",
+		["item_id"]=43001
 	},
 	[52001]={
 		["position"]=5,
@@ -302,38 +344,44 @@ local hero = {
 		["rouge_skill_1"]=200401,
 		["rouge_skill_2"]=200402,
 		["rouge_skill_3"]=200403,
-		["hp_1"]=1000000,
-		["hp_2"]=1100000,
-		["hp_3"]=1200000,
-		["hp_4"]=1300000,
-		["hp_5"]=1400000,
-		["hp_6"]=1500000,
-		["hp_7"]=1600000,
-		["hp_8"]=1700000,
-		["hp_9"]=1800000,
-		["hp_10"]=1900000,
-		["hp_11"]=2000000,
-		["hp_12"]=2100000,
-		["hp_13"]=2200000,
-		["hp_14"]=2300000,
-		["hp_15"]=2400000,
-		["atk_1"]=1000000,
-		["atk_2"]=1100000,
-		["atk_3"]=1200000,
-		["atk_4"]=1300000,
-		["atk_5"]=1400000,
-		["atk_6"]=1500000,
-		["atk_7"]=1600000,
-		["atk_8"]=1700000,
-		["atk_9"]=1800000,
-		["atk_10"]=1900000,
-		["atk_11"]=2000000,
-		["atk_12"]=2100000,
-		["atk_13"]=2200000,
-		["atk_14"]=2300000,
-		["atk_15"]=2400000,
+		["begin_lv"]=1,
+		["hp"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
+		["atk"]={
+			1000000,
+			1100000,
+			1200000,
+			1300000,
+			1400000,
+			1500000,
+			1600000,
+			1700000,
+			1800000,
+			1900000,
+			2000000,
+			2100000,
+			2200000,
+			2300000,
+			2400000
+		},
 		["model_id"]="p0005",
-		["icon"]="5"
+		["icon"]="5",
+		["item_id"]=52001
 	}
 }
 local config = {
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index 04a13d61..f6f5d4c9 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -3,6 +3,7 @@ local skill = {
 		["position"]=1,
 		["method"]=2,
 		["skill_type"]=0,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -16,6 +17,7 @@ local skill = {
 	},
 	[2]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -29,6 +31,7 @@ local skill = {
 	},
 	[3]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -42,6 +45,7 @@ local skill = {
 	},
 	[4]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -55,6 +59,7 @@ local skill = {
 	},
 	[5]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -70,6 +75,7 @@ local skill = {
 		["position"]=2,
 		["method"]=2,
 		["skill_type"]=0,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -83,6 +89,7 @@ local skill = {
 	},
 	[7]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -96,6 +103,7 @@ local skill = {
 	},
 	[8]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -109,6 +117,7 @@ local skill = {
 	},
 	[9]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -122,6 +131,7 @@ local skill = {
 	},
 	[10]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -159,6 +169,7 @@ local skill = {
 		["skill_type"]=0,
 		["icon"]=20,
 		["battle_icon"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -197,6 +208,7 @@ local skill = {
 		},
 		["icon"]=20,
 		["battle_icon"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -230,6 +242,7 @@ local skill = {
 		["skill_type"]=0,
 		["icon"]=40,
 		["battle_icon"]=4,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -268,6 +281,7 @@ local skill = {
 		["skill_type"]=0,
 		["icon"]=60,
 		["battle_icon"]=6,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -287,6 +301,7 @@ local skill = {
 		["skill_type"]=0,
 		["icon"]=70,
 		["battle_icon"]=7,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -325,6 +340,7 @@ local skill = {
 		},
 		["icon"]=70,
 		["battle_icon"]=7,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -388,6 +404,7 @@ local skill = {
 		["skill_type"]=0,
 		["icon"]=80,
 		["battle_icon"]=8,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -430,6 +447,7 @@ local skill = {
 		},
 		["icon"]=80,
 		["battle_icon"]=8,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -449,6 +467,7 @@ local skill = {
 	},
 	[100000]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -463,6 +482,7 @@ local skill = {
 	},
 	[100001]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -477,6 +497,7 @@ local skill = {
 	},
 	[100002]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -493,6 +514,7 @@ local skill = {
 	},
 	[100003]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -509,6 +531,7 @@ local skill = {
 	},
 	[100004]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -525,6 +548,7 @@ local skill = {
 	},
 	[100005]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -539,6 +563,7 @@ local skill = {
 	},
 	[100006]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -573,6 +598,7 @@ local skill = {
 	},
 	[100007]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -587,6 +613,7 @@ local skill = {
 	},
 	[100008]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -609,6 +636,7 @@ local skill = {
 	},
 	[100009]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -629,6 +657,7 @@ local skill = {
 	},
 	[100010]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -663,6 +692,7 @@ local skill = {
 	},
 	[100011]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -679,6 +709,7 @@ local skill = {
 	},
 	[100012]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -693,6 +724,7 @@ local skill = {
 	},
 	[100013]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -709,6 +741,7 @@ local skill = {
 	},
 	[100014]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -723,6 +756,7 @@ local skill = {
 	},
 	[100015]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -745,6 +779,7 @@ local skill = {
 	},
 	[100016]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -779,6 +814,7 @@ local skill = {
 	},
 	[100017]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -793,6 +829,7 @@ local skill = {
 	},
 	[100018]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=3,
 		["effect"]={
 			{
@@ -809,6 +846,7 @@ local skill = {
 	},
 	[100019]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -825,6 +863,7 @@ local skill = {
 	},
 	[100020]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -839,6 +878,7 @@ local skill = {
 	},
 	[100021]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -873,6 +913,7 @@ local skill = {
 	},
 	[100022]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=3,
 		["effect"]={
 			{
@@ -889,6 +930,7 @@ local skill = {
 	},
 	[100023]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -911,6 +953,7 @@ local skill = {
 	},
 	[100024]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -945,6 +988,7 @@ local skill = {
 	},
 	[100025]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -959,6 +1003,7 @@ local skill = {
 	},
 	[100026]={
 		["position"]=2,
+		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
 			{
@@ -975,6 +1020,7 @@ local skill = {
 	},
 	[100027]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{
@@ -989,6 +1035,7 @@ local skill = {
 	},
 	[100028]={
 		["position"]=1,
+		["effect_type"]=1,
 		["trigger"]=3,
 		["effect"]={
 			{
@@ -1011,6 +1058,7 @@ local skill = {
 	},
 	[100029]={
 		["position"]=2,
+		["effect_type"]=2,
 		["trigger"]=2,
 		["effect"]={
 			{