diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index aa6cb6ae..76e4586e 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1570,49 +1570,43 @@ local act_gift = { }, [130002]={ ["type"]=13, - ["recharge_id"]=10, - ["limit"]=1 + ["recharge_id"]=12, + ["limit"]=1, + ["value"]=700 }, [130102]={ ["type"]=13, ["recharge_id"]=13, - ["limit"]=1 + ["limit"]=1, + ["value"]=900 }, [130202]={ ["type"]=13, - ["recharge_id"]=15, + ["recharge_id"]=13, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=42, - ["id_for_nothing"]="Ugo=", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=43, - ["id_for_nothing"]="Ugs=", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=3400101, + ["id_for_nothing"]="VQxcA2RRfg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["limit"]=1, @@ -1620,39 +1614,31 @@ local act_gift = { }, [130302]={ ["type"]=13, - ["recharge_id"]=15, + ["recharge_id"]=13, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=42, - ["id_for_nothing"]="Ugo=", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=43, - ["id_for_nothing"]="Ugs=", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5400101, + ["id_for_nothing"]="UwxcA2RRfg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["limit"]=1, @@ -1660,39 +1646,31 @@ local act_gift = { }, [130402]={ ["type"]=13, - ["recharge_id"]=12, + ["recharge_id"]=13, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=42, - ["id_for_nothing"]="Ugo=", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=43, - ["id_for_nothing"]="Ugs=", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=18, + ["num_for_nothing"]="VwA=" } }, ["limit"]=1, diff --git a/lua/app/config/attr.lua b/lua/app/config/attr.lua index a5649b09..42a5443a 100644 --- a/lua/app/config/attr.lua +++ b/lua/app/config/attr.lua @@ -202,6 +202,26 @@ local attr = { [51]={ ["id"]=51, ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["name"]="attr_hp_purple" } } local keys = { @@ -256,12 +276,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua index 204745ac..6d3d1fd9 100644 --- a/lua/app/config/avatar.lua +++ b/lua/app/config/avatar.lua @@ -110,9 +110,25 @@ local avatar = { [25001]={ ["iconId"]="26", ["hero"]=54002 + }, + [1400201]={ + ["iconId"]="skin_3", + ["item"]=1400201 + }, + [3400101]={ + ["iconId"]="skin_1", + ["item"]=3400101 + }, + [5300101]={ + ["iconId"]="skin_4", + ["item"]=5300101 + }, + [5400101]={ + ["iconId"]="skin_2", + ["item"]=5400101 } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index c95f76d2..1fc59b5b 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -756,14 +756,14 @@ local buff = { ["buff_type"]=7, ["decr"]=1, ["formula"]=3, - ["icon"]="weakness_all_add" + ["icon"]="rebirth" }, [85]={ ["id"]=85, ["name"]="ocean_shield", ["buff_type"]=2, ["decr"]=1, - ["icon"]="shield_ice" + ["icon"]="ocean_shield1" }, [86]={ ["id"]=86, @@ -772,7 +772,7 @@ local buff = { ["stack"]=2, ["decr"]=1, ["formula"]=3, - ["icon"]="lock" + ["icon"]="self_heal" } } local keys = { diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 752745b4..48f261a9 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -7387,8 +7387,8 @@ local chapter = { ["next_chapter"]=37, ["icon"]="chapter_31", ["scene"]="bg_31", - ["block_icon"]="battle_hinder_26", - ["chess_board"]="chessboard_1", + ["block_icon"]="battle_hinder_33", + ["chess_board"]="chessboard_2", ["board"]={ 135, 136, @@ -7396,30 +7396,30 @@ local chapter = { 138 }, ["monster"]={ - 57201, - 57301, - 57401, - 57501, - 57601, - 57701, - 57801, - 57901, - 58001, - 58101, - 58201, - 58301, - 58401, - 58501, - 58601, - 58701, - 58801, - 58901, - 59001, - 59101 + 67201, + 67301, + 67401, + 67501, + 67601, + 67701, + 67801, + 67901, + 68001, + 68101, + 68201, + 68301, + 68401, + 68501, + 68601, + 68701, + 68801, + 68901, + 69001, + 69101 }, ["mystery_box"]={ 1, - 4 + 3 }, ["mystery_box_reward"]={ { @@ -7606,8 +7606,8 @@ local chapter = { ["next_chapter"]=38, ["icon"]="chapter_32", ["scene"]="bg_32", - ["block_icon"]="battle_hinder_27", - ["chess_board"]="chessboard_1", + ["block_icon"]="battle_hinder_34", + ["chess_board"]="chessboard_2", ["board"]={ 139, 140, @@ -7615,29 +7615,29 @@ local chapter = { 142 }, ["monster"]={ - 59201, - 59301, - 59401, - 59501, - 59601, - 59701, - 59801, - 59901, - 60001, - 60101, - 60201, - 60301, - 60401, - 60501, - 60601, - 60701, - 60801, - 60901, - 61001, - 61101 + 69201, + 69301, + 69401, + 69501, + 69601, + 69701, + 69801, + 69901, + 70001, + 70101, + 70201, + 70301, + 70401, + 70501, + 70601, + 70701, + 70801, + 70901, + 71001, + 71101 }, ["mystery_box"]={ - 3, + 2, 4 }, ["mystery_box_reward"]={ @@ -7825,7 +7825,7 @@ local chapter = { ["next_chapter"]=39, ["icon"]="chapter_33", ["scene"]="bg_33", - ["block_icon"]="battle_hinder_28", + ["block_icon"]="battle_hinder_31", ["chess_board"]="chessboard_1", ["board"]={ 143, @@ -7834,30 +7834,30 @@ local chapter = { 146 }, ["monster"]={ - 61201, - 61301, - 61401, - 61501, - 61601, - 61701, - 61801, - 61901, - 62001, - 62101, - 62201, - 62301, - 62401, - 62501, - 62601, - 62701, - 62801, - 62901, - 63001, - 63101 + 71201, + 71301, + 71401, + 71501, + 71601, + 71701, + 71801, + 71901, + 72001, + 72101, + 72201, + 72301, + 72401, + 72501, + 72601, + 72701, + 72801, + 72901, + 73001, + 73101 }, ["mystery_box"]={ 1, - 3 + 4 }, ["mystery_box_reward"]={ { @@ -8044,8 +8044,8 @@ local chapter = { ["next_chapter"]=40, ["icon"]="chapter_34", ["scene"]="bg_34", - ["block_icon"]="battle_hinder_30", - ["chess_board"]="chessboard_3", + ["block_icon"]="battle_hinder_32", + ["chess_board"]="chessboard_1", ["board"]={ 147, 148, @@ -8053,30 +8053,30 @@ local chapter = { 150 }, ["monster"]={ - 63201, - 63301, - 63401, - 63501, - 63601, - 63701, - 63801, - 63901, - 64001, - 64101, - 64201, - 64301, - 64401, - 64501, - 64601, - 64701, - 64801, - 64901, - 65001, - 65101 + 73201, + 73301, + 73401, + 73501, + 73601, + 73701, + 73801, + 73901, + 74001, + 74101, + 74201, + 74301, + 74401, + 74501, + 74601, + 74701, + 74801, + 74901, + 75001, + 75101 }, ["mystery_box"]={ - 1, - 2 + 2, + 4 }, ["mystery_box_reward"]={ { @@ -8262,8 +8262,8 @@ local chapter = { ["before_chapter"]=39, ["icon"]="chapter_35", ["scene"]="bg_35", - ["block_icon"]="battle_hinder_29", - ["chess_board"]="chessboard_3", + ["block_icon"]="battle_hinder_35", + ["chess_board"]="chessboard_2", ["board"]={ 151, 152, @@ -8271,26 +8271,26 @@ local chapter = { 154 }, ["monster"]={ - 65201, - 65301, - 65401, - 65501, - 65601, - 65701, - 65801, - 65901, - 66001, - 66101, - 66201, - 66301, - 66401, - 66501, - 66601, - 66701, - 66801, - 66901, - 67001, - 67101 + 75201, + 75301, + 75401, + 75501, + 75601, + 75701, + 75801, + 75901, + 76001, + 76101, + 76201, + 76301, + 76401, + 76501, + 76601, + 76701, + 76801, + 76901, + 77001, + 77101 }, ["mystery_box"]={ 2, diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 67a849b4..ca34d9b0 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -39493,115 +39493,7 @@ local chapter_board = { [135]={ ["board"]={ { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, + 2, 0 }, { @@ -39609,11 +39501,11 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 2, 0 }, { @@ -39628,178 +39520,80 @@ local chapter_board = { 2, 0 }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 14, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 36, - 0 - }, - { - 36, - 0 - }, - { - 36, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - }, - ["mystery_box_board"]={ - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, + 2, 0 }, { @@ -39807,11 +39601,43 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 21, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 21, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 21, + 5 + }, + { + 21, + 3 + }, + { + 37, 0 }, { @@ -39826,64 +39652,238 @@ local chapter_board = { 2, 0 }, + { + 37, + 0 + }, + { + 21, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + }, + ["mystery_box_board"]={ + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 17, 0 }, { - 0, + 2, 0 }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, { 0, - 0 + 2 }, { 0, - 0 + 2 + }, + { + 21, + 5 }, { 0, - 0 + 2 }, { 0, + 2 + }, + { + 21, + 5 + }, + { + 21, + 3 + }, + { + 37, 0 }, { - 0, + 2, 0 }, { - 3, + 2, 0 }, { - 0, + 2, 0 }, { - 36, + 37, 0 }, { - 36, + 21, + 5 + }, + { + 2, 0 }, { - 36, + 2, 0 }, { - 0, + 2, 0 }, { - 1, + 2, 0 }, { - 1, + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 } } @@ -39892,7 +39892,7 @@ local chapter_board = { ["board"]={ { 0, - 5 + 1 }, { 0, @@ -39900,11 +39900,11 @@ local chapter_board = { }, { 0, - 5 + 3 }, { 0, - 4 + 3 }, { 0, @@ -39914,44 +39914,40 @@ local chapter_board = { 0, 4 }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, { 0, 3 }, - { - 0, - 1 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, { 0, 4 }, { 0, - 3 + 4 }, { 0, - 3 + 4 }, { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -39979,111 +39975,115 @@ local chapter_board = { 0 }, { - 0, - 0 + 21, + 2 + }, + { + 21, + 2 }, { 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 36, - 0 + 5 }, { 14, 0 }, { - 36, + 0, + 5 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 2, 0 }, { 0, + 5 + }, + { + 2, 0 }, { 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 37, + 0 + }, + { + 1, + 2 + }, + { + 2, + 0 + }, + { + 2, 0 } } @@ -40092,268 +40092,36 @@ local chapter_board = { ["board"]={ { 0, - 5 + 2 }, { 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 + 3 }, { 2, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 36, - 0 - }, - { - 0, - 0 - }, - { - 36, - 0 - }, - { - 0, - 0 - }, - { - 36, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - } - }, - [138]={ - ["board"]={ - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 36, - 0 - }, - { - 3, - 0 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, { 0, 2 }, + { + 2, + 0 + }, + { + 0, + 3 + }, { 0, 2 }, + { + 1, + 0 + }, { 0, 2 @@ -40364,7 +40132,7 @@ local chapter_board = { }, { 0, - 3 + 2 }, { 0, @@ -40372,96 +40140,44 @@ local chapter_board = { }, { 0, - 4 + 2 }, { 1, 0 }, { - 2, - 0 + 21, + 5 }, { 2, 0 }, { - 2, - 0 + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 }, { 2, 0 }, { - 2, - 0 + 21, + 5 }, { 1, 0 }, - { - 36, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 36, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 36, - 0 - }, { 2, 0 @@ -40483,95 +40199,179 @@ local chapter_board = { 0 }, { - 36, + 1, 0 + }, + { + 21, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 } }, ["mystery_box_board"]={ { 0, - 1 + 2 }, { 0, - 1 + 3 }, { - 3, - 0 - }, - { - 36, - 0 - }, - { - 3, + 2, 0 }, { 0, - 4 + 2 + }, + { + 2, + 0 }, { 0, + 3 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 21, 5 }, { - 0, - 1 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 2, 0 }, { 0, - 4 + 2 }, { 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 21, 5 }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, { 1, 0 @@ -40584,90 +40384,6 @@ local chapter_board = { 2, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 36, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 36, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 36, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 17, 0 @@ -40681,20 +40397,100 @@ local chapter_board = { 0 }, { - 36, + 1, 0 + }, + { + 21, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 } } }, - [139]={ + [138]={ ["board"]={ { - 1, - 0 - }, - { - 1, - 0 + 0, + 3 }, { 0, @@ -40702,104 +40498,44 @@ local chapter_board = { }, { 0, - 4 + 3 }, { - 0, - 4 + 2, + 5 }, { 0, 5 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 + 5 }, { 0, 5 }, { - 1, + 3, 0 }, { 1, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 36, - 0 - }, { 0, 1 }, { 0, - 1 + 2 }, { 0, 1 }, - { - 36, - 0 - }, - { - 1, - 0 - }, { 1, 0 @@ -40812,6 +40548,26 @@ local chapter_board = { 3, 0 }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, { 3, 0 @@ -40821,12 +40577,12 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 1 }, { - 1, - 0 + 0, + 2 }, { 1, @@ -40834,28 +40590,48 @@ local chapter_board = { }, { 0, - 3 + 2 }, { 0, - 3 + 1 }, { - 36, + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 0, - 3 + 1 }, { 14, 0 }, { - 1, + 0, + 1 + }, + { + 3, 0 }, + { + 3, + 0 + }, + { + 0, + 4 + }, { 1, 0 @@ -40865,12 +40641,8 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 + 0, + 1 }, { 3, @@ -40878,6 +40650,234 @@ local chapter_board = { }, { 1, + 1 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 37, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 37, + 0 + }, + { + 0, + 3 + } + } + }, + [139]={ + ["board"]={ + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 37, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 21, + 5 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 14, + 0 + }, + { + 37, + 0 + }, + { + 2, 0 }, { @@ -40889,121 +40889,29 @@ local chapter_board = { [140]={ ["board"]={ { - 1, - 0 - }, - { - 36, + 2, 0 }, { 0, - 1 + 5 }, { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 2, + 0 }, { 0, 4 }, { - 1, + 2, 0 }, { 0, 1 }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 36, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, { 2, 0 @@ -41013,7 +40921,15 @@ local chapter_board = { 5 }, { - 36, + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, 0 }, { @@ -41021,24 +40937,12 @@ local chapter_board = { 1 }, { - 1, + 2, 0 }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 + 1 }, { 14, @@ -41046,70 +40950,12 @@ local chapter_board = { }, { 0, - 3 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5 }, { 1, 0 }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - } - }, - ["mystery_box_board"]={ - { - 1, - 0 - }, - { - 36, - 0 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, { 0, 4 @@ -41123,84 +40969,12 @@ local chapter_board = { 1 }, { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 36, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 2, + 14, 0 }, { 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5 }, { 2, @@ -41211,7 +40985,15 @@ local chapter_board = { 5 }, { - 36, + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, 0 }, { @@ -41223,13 +41005,151 @@ local chapter_board = { 0 }, { - 0, + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 1, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + } + }, + ["mystery_box_board"]={ + { + 2, 0 }, { 0, + 5 + }, + { + 2, 0 }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 14, + 0 + }, + { + 0, + 5 + }, { 1, 0 @@ -41238,12 +41158,76 @@ local chapter_board = { 0, 4 }, + { + 1, + 0 + }, + { + 0, + 1 + }, { 17, 0 }, { 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 1, + 0 + }, + { + 21, 3 }, { @@ -41251,35 +41235,51 @@ local chapter_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 21, + 3 }, { 2, 0 }, { - 2, - 0 + 21, + 3 }, { 2, 0 }, { - 0, + 21, + 3 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, 0 } } @@ -41292,11 +41292,15 @@ local chapter_board = { }, { 0, - 3 + 2 }, { 0, - 3 + 1 + }, + { + 1, + 0 }, { 0, @@ -41308,11 +41312,11 @@ local chapter_board = { }, { 0, - 5 + 1 }, { - 0, - 3 + 3, + 0 }, { 0, @@ -41322,6 +41326,82 @@ local chapter_board = { 0, 2 }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, { 0, 3 @@ -41330,282 +41410,52 @@ local chapter_board = { 0, 4 }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 36, - 0 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 36, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 36, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 36, - 0 - }, - { - 0, - 0 - }, { 14, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - }, - ["mystery_box_board"]={ - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, { 0, 2 }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 37, + 0 + }, { 0, 5 }, { - 0, - 3 + 21, + 1 }, { 0, 1 }, { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 36, + 37, 0 }, { 0, - 2 + 5 }, { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 36, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 36, + 2, 0 }, { @@ -41613,15 +41463,7 @@ local chapter_board = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 2, 0 }, { @@ -41639,46 +41481,6 @@ local chapter_board = { { 2, 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 36, - 0 - }, - { - 0, - 0 - }, - { - 17, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 } } }, @@ -41690,42 +41492,42 @@ local chapter_board = { }, { 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 + 1 }, { 0, 1 }, { - 0, - 5 + 2, + 0 }, { 0, - 5 + 4 }, { 0, - 2 + 4 + }, + { + 0, + 4 }, { 0, 1 }, { - 0, - 3 + 2, + 0 }, { - 36, + 0, + 1 + }, + { + 37, 0 }, { @@ -41733,27 +41535,7 @@ local chapter_board = { 4 }, { - 0, - 4 - }, - { - 0, - 5 - }, - { - 36, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 3, + 2, 0 }, { @@ -41761,20 +41543,12 @@ local chapter_board = { 4 }, { - 0, - 4 - }, - { - 36, + 2, 0 }, { - 1, - 0 - }, - { - 3, - 0 + 21, + 2 }, { 2, @@ -41789,11 +41563,11 @@ local chapter_board = { 0 }, { - 3, - 0 + 21, + 3 }, { - 1, + 2, 0 }, { @@ -41801,47 +41575,23 @@ local chapter_board = { 0 }, { - 0, + 2, 0 }, { 0, 0 }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 36, - 0 - }, { 14, 0 }, { - 36, + 0, + 0 + }, + { + 2, 0 }, { @@ -41849,15 +41599,31 @@ local chapter_board = { 0 }, { - 0, + 2, 0 }, { - 1, + 21, + 2 + }, + { + 2, 0 }, { - 1, + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, 0 }, { @@ -41865,7 +41631,23 @@ local chapter_board = { 0 }, { - 3, + 2, + 0 + }, + { + 0, + 5 + }, + { + 37, + 0 + }, + { + 0, + 5 + }, + { + 2, 0 }, { @@ -41873,31 +41655,241 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 21, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 37, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 17, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 37, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 21, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 3 + }, + { + 2, 0 } } }, [143]={ ["board"]={ - { - 1, - 0 - }, { 0, 1 }, { - 0, - 2 - }, - { - 1, + 2, 0 }, { @@ -41906,14 +41898,14 @@ local chapter_board = { }, { 0, - 5 + 3 }, { - 1, - 0 + 0, + 3 }, { - 1, + 2, 0 }, { @@ -41922,122 +41914,138 @@ local chapter_board = { }, { 0, - 2 - }, - { - 1, 0 }, { 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, 1 }, { - 4, - 2 + 2, + 0 }, { - 4, + 0, 3 }, { - 4, - 4 + 2, + 0 }, { - 4, + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 21, 5 }, { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 0, 0 }, { 14, 0 }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, { 0, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, + 21, 4 }, { @@ -42045,57 +42053,41 @@ local chapter_board = { 0 }, { - 0, - 0 + 21, + 5 }, { - 0, - 0 + 21, + 5 }, { - 1, - 0 + 21, + 5 }, { - 0, - 0 + 21, + 1 }, { - 0, - 0 + 21, + 4 }, { - 1, - 0 + 21, + 4 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 + 21, + 4 } }, ["mystery_box_board"]={ - { - 1, - 0 - }, { 0, 1 }, { - 0, - 2 - }, - { - 1, + 2, 0 }, { @@ -42104,14 +42096,14 @@ local chapter_board = { }, { 0, - 5 + 3 }, { - 1, - 0 + 0, + 3 }, { - 1, + 2, 0 }, { @@ -42120,122 +42112,138 @@ local chapter_board = { }, { 0, - 2 - }, - { - 1, 0 }, { 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, 1 }, { - 4, - 2 + 2, + 0 }, { - 4, + 0, 3 }, { - 4, - 4 + 2, + 0 }, { - 4, + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 21, 5 }, { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 0, 0 }, { 17, 0 }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, { 0, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, + 21, 4 }, { @@ -42243,57 +42251,208 @@ local chapter_board = { 0 }, { - 0, - 0 + 21, + 5 }, { - 0, - 0 + 21, + 5 }, { - 1, - 0 + 21, + 5 }, { - 0, - 0 + 21, + 1 }, { - 0, - 0 + 21, + 4 }, { - 1, - 0 + 21, + 4 }, { - 0, - 0 + 21, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=1, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=22, + ["type"]=1, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=33, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=17, + ["type"]=1, + ["direction"]=2 + }, + { + ["pos"]=22, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=35, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=1, + ["direction"]=4 } } }, [144]={ ["board"]={ + { + 1, + 0 + }, { 0, - 1 + 5 + }, + { + 0, + 5 }, { 0, 1 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, { 0, 1 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, { 0, 2 @@ -42306,608 +42465,539 @@ local chapter_board = { 0, 4 }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, { 0, 2 }, { 0, - 3 + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 }, { 0, 2 }, - { - 0, - 3 - }, { 0, 4 }, { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, + 21, 5 }, { - 4, + 21, 2 }, { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, - 1 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, + 21, 2 }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, { 14, 0 }, { - 1, - 0 + 21, + 5 + }, + { + 21, + 2 + }, + { + 21, + 3 + }, + { + 21, + 4 + }, + { + 21, + 2 }, { 1, 0 }, { - 1, - 0 + 21, + 5 }, { 1, 0 }, { - 1, - 0 + 21, + 2 + }, + { + 21, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=22, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=42, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=62, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=72, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=16, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=76, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=14, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=14, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=2, + ["direction"]=2 } } }, [145]={ ["board"]={ { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 5, - 3 - }, - { - 1, + 2, 0 }, { - 5, + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, 2 }, { - 4, + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 2 }, - { - 5, - 2 - }, - { - 1, - 3 - }, - { - 5, - 3 - }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 5, - 5 - }, - { - 5, 4 }, { - 5, - 5 - }, - { - 5, - 4 - }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 3 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, + 0, 1 }, { - 5, - 2 - }, - { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 5, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 2 }, { - 5, + 0, 1 }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 21, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 21, + 3 + }, { 14, 0 }, { - 5, + 21, 2 }, { - 5, + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, 2 }, { - 1, + 21, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 21, + 2 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, 0 } }, - ["mystery_box_board"]={ + ["grid_edge"]={ { - 0, - 5 + ["pos"]=13, + ["type"]=2, + ["direction"]=3 }, { - 0, - 5 + ["pos"]=23, + ["type"]=2, + ["direction"]=3 }, { - 0, - 5 + ["pos"]=33, + ["type"]=2, + ["direction"]=3 }, { - 0, - 5 + ["pos"]=42, + ["type"]=2, + ["direction"]=1 }, { - 0, - 5 + ["pos"]=42, + ["type"]=2, + ["direction"]=3 }, { - 0, - 5 + ["pos"]=51, + ["type"]=2, + ["direction"]=1 }, { - 0, - 5 + ["pos"]=51, + ["type"]=2, + ["direction"]=2 }, { - 5, - 3 + ["pos"]=62, + ["type"]=2, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=62, + ["type"]=2, + ["direction"]=2 }, { - 5, - 2 + ["pos"]=73, + ["type"]=2, + ["direction"]=3 }, { - 4, - 2 + ["pos"]=15, + ["type"]=2, + ["direction"]=4 }, { - 5, - 2 + ["pos"]=25, + ["type"]=2, + ["direction"]=4 }, { - 1, - 3 + ["pos"]=35, + ["type"]=2, + ["direction"]=4 }, { - 5, - 3 + ["pos"]=46, + ["type"]=2, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=46, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=57, + ["type"]=2, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=57, + ["type"]=2, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=66, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=66, + ["type"]=2, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=75, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=54, + ["type"]=3, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=54, + ["type"]=3, + ["direction"]=2 }, { - 5, - 5 + ["pos"]=54, + ["type"]=3, + ["direction"]=3 }, { - 5, - 4 - }, - { - 5, - 5 - }, - { - 5, - 4 - }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 3 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 1 - }, - { - 5, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 1 - }, - { - 17, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 1, - 0 + ["pos"]=54, + ["type"]=3, + ["direction"]=4 } } }, [146]={ ["board"]={ - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, { 0, 3 @@ -42920,6 +43010,10 @@ local chapter_board = { 0, 5 }, + { + 1, + 0 + }, { 0, 2 @@ -42937,176 +43031,476 @@ local chapter_board = { 4 }, { - 4, + 0, 4 }, { - 4, - 5 + 0, + 4 }, { - 4, - 5 - }, - { - 1, + 2, 0 }, { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 1, - 0 - }, - { - 4, + 0, 2 }, { - 1, - 0 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 4, - 4 - }, - { - 4, + 0, 3 }, { - 4, + 0, 3 }, { - 4, - 2 - }, - { - 4, + 0, 1 }, { - 4, + 0, 2 }, { - 4, - 5 + 0, + 2 }, { - 4, - 5 - }, - { - 3, + 2, 0 }, { - 3, - 0 + 0, + 1 }, { - 3, - 0 + 0, + 4 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, + 0, 3 }, { - 5, + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, 3 }, { 1, 0 }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 2 + }, + { + 21, + 3 + }, + { + 21, + 4 + }, { 14, 0 }, + { + 21, + 4 + }, + { + 21, + 3 + }, + { + 21, + 2 + } + }, + ["mystery_box_board"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, { 1, 0 }, { - 5, + 0, + 2 + }, + { + 0, 3 }, { - 5, + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 2 + }, + { + 21, + 3 + }, + { + 21, + 4 + }, + { + 17, + 0 + }, + { + 21, + 4 + }, + { + 21, + 3 + }, + { + 21, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=51, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=51, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=62, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=73, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=73, + ["type"]=1, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=66, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=1, + ["direction"]=3 + }, + { + ["pos"]=57, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=1, + ["direction"]=3 } } }, [147]={ ["board"]={ { - 21, - 1 + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 0, 1 }, + { + 2, + 0 + }, { 0, 2 }, { 0, - 3 + 1 }, { 0, - 3 + 1 }, { - 0, - 4 - }, - { - 21, - 4 + 2, + 0 }, { 0, @@ -43122,50 +43516,86 @@ local chapter_board = { }, { 0, - 2 + 3 + }, + { + 0, + 1 }, { 0, 3 }, { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, + 2, 0 }, { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, + 0, 3 }, { - 5, + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, 3 }, { - 5, + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, 4 }, { - 5, - 4 + 0, + 1 }, { - 37, + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 3 + }, + { + 3, + 0 + }, + { + 21, + 3 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -43178,31 +43608,7 @@ local chapter_board = { }, { 21, - 5 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 21, - 5 + 3 }, { 14, @@ -43210,322 +43616,117 @@ local chapter_board = { }, { 21, - 5 + 3 }, { 0, 0 }, { - 37, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { - 5, - 3 - }, - { - 5, - 2 + 0, + 0 }, { 21, - 5 + 3 }, { - 5, - 5 + 21, + 3 }, { - 5, - 5 + 21, + 3 }, { - 1, + 0, 0 }, { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 2 - }, - { - 1, + 0, 0 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 } }, - ["mystery_box_board"]={ + ["grid_edge"]={ { - 21, - 1 + ["pos"]=51, + ["type"]=2, + ["direction"]=1 }, { - 0, - 1 + ["pos"]=52, + ["type"]=2, + ["direction"]=1 }, { - 0, - 2 + ["pos"]=53, + ["type"]=2, + ["direction"]=1 }, { - 0, - 3 + ["pos"]=54, + ["type"]=2, + ["direction"]=1 }, { - 0, - 3 + ["pos"]=55, + ["type"]=2, + ["direction"]=1 }, { - 0, - 4 + ["pos"]=56, + ["type"]=2, + ["direction"]=1 }, { - 21, - 4 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 37, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 21, - 5 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 21, - 5 - }, - { - 17, - 0 - }, - { - 21, - 5 - }, - { - 0, - 0 - }, - { - 37, - 0 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 2 - }, - { - 21, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 2 - }, - { - 1, - 0 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 + ["pos"]=57, + ["type"]=2, + ["direction"]=1 } } }, [148]={ ["board"]={ { - 21, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 5, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 21, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 5, - 2 - }, - { - 37, + 7, 0 }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, { 0, 1 @@ -43534,56 +43735,28 @@ local chapter_board = { 0, 1 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 4 }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, { 0, 5 }, { - 5, - 5 + 0, + 4 }, { - 5, + 0, + 3 + }, + { + 0, 1 }, { - 5, + 0, 4 }, { @@ -43591,139 +43764,167 @@ local chapter_board = { 4 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 7, 0 }, { - 3, + 7, 0 }, { - 3, + 7, 0 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 7, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 21, + 5 + }, + { + 21, + 5 + }, + { + 0, 0 }, { 14, 0 }, - { - 5, - 3 - }, - { - 37, - 0 - }, { 0, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, + 21, 5 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 0, - 3 + 21, + 5 } }, ["mystery_box_board"]={ { - 21, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 5, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 21, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 5, - 2 - }, - { - 37, + 7, 0 }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, { 0, 1 @@ -43732,56 +43933,28 @@ local chapter_board = { 0, 1 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 4 }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, { 0, 5 }, { - 5, - 5 + 0, + 4 }, { - 5, + 0, + 3 + }, + { + 0, 1 }, { - 5, + 0, 4 }, { @@ -43789,175 +43962,360 @@ local chapter_board = { 4 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 7, 0 }, { - 3, + 7, 0 }, { - 3, + 7, 0 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 7, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 21, + 5 + }, + { + 21, + 5 + }, + { + 0, 0 }, { 17, 0 }, - { - 5, - 3 - }, - { - 37, - 0 - }, { 0, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, + 21, 5 }, { - 1, - 0 + 21, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=51, + ["type"]=2, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=52, + ["type"]=2, + ["direction"]=1 }, { - 0, - 3 + ["pos"]=53, + ["type"]=2, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=55, + ["type"]=2, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=56, + ["type"]=2, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=57, + ["type"]=2, + ["direction"]=1 }, { - 5, - 4 + ["pos"]=43, + ["type"]=3, + ["direction"]=3 }, { - 5, - 4 + ["pos"]=43, + ["type"]=3, + ["direction"]=1 }, { - 5, - 4 + ["pos"]=44, + ["type"]=3, + ["direction"]=1 }, { - 0, - 3 + ["pos"]=45, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=1 } } }, [149]={ ["board"]={ - { - 1, - 0 - }, { 0, - 2 - }, - { - 0, - 2 - }, - { - 37, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, 5 }, { - 5, + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, 5 }, { - 5, + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, 5 }, { - 5, + 0, + 3 + }, + { + 0, 1 }, { - 5, + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, 1 }, { - 1, + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 3, 0 }, { @@ -43965,112 +44323,100 @@ local chapter_board = { 2 }, { - 21, - 2 + 2, + 0 }, { - 21, - 2 - }, - { - 21, - 3 - }, - { - 21, - 3 - }, - { - 21, - 3 + 0, + 4 }, { 14, 0 }, { - 1, - 0 - }, - { - 5, + 0, 4 }, { - 5, - 4 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 1, + 2, 0 }, { 21, - 4 - }, - { - 21, - 4 - }, - { - 21, - 4 - }, - { - 21, - 1 - }, - { - 21, - 1 - }, - { - 21, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=13, + ["type"]=2, + ["direction"]=3 }, { - 5, - 2 + ["pos"]=23, + ["type"]=2, + ["direction"]=3 }, { - 5, - 3 + ["pos"]=23, + ["type"]=2, + ["direction"]=2 }, { - 5, - 3 + ["pos"]=34, + ["type"]=3, + ["direction"]=3 }, { - 5, - 3 + ["pos"]=34, + ["type"]=3, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=34, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=15, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=71, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=77, + ["type"]=2, + ["direction"]=3 } } }, @@ -44080,140 +44426,12 @@ local chapter_board = { 0, 2 }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, { 0, 2 }, { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 5 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 5 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 37, - 0 - }, - { - 21, - 1 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 21, - 1 - }, - { - 1, + 3, 0 }, { @@ -44221,43 +44439,7 @@ local chapter_board = { 0 }, { - 1, - 0 - }, - { - 0, - 2 - }, - { - 37, - 0 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 37, + 3, 0 }, { @@ -44269,51 +44451,625 @@ local chapter_board = { 4 }, { - 1, + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + } + }, + ["mystery_box_board"]={ + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 17, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=22, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=16, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=26, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=72, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=73, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=3, + ["direction"]=4 } } }, [151]={ ["board"]={ { - 37, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, 0 }, { 0, - 3 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, 1 }, { 0, - 5 + 1 }, { - 37, + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, 0 }, { 0, - 3 + 1 }, { 0, 3 }, { - 7, + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 21, + 4 + }, + { + 21, + 4 + }, + { + 2, 0 }, { @@ -44321,172 +45077,184 @@ local chapter_board = { 0 }, { - 7, - 0 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 2, 0 }, { 21, 4 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, { 21, - 3 + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=2, + ["direction"]=4 }, { - 21, - 3 + ["pos"]=21, + ["type"]=2, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=32, + ["type"]=3, + ["direction"]=1 }, { - 21, - 5 + ["pos"]=32, + ["type"]=2, + ["direction"]=4 }, { - 21, - 5 + ["pos"]=43, + ["type"]=3, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=45, + ["type"]=3, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=36, + ["type"]=2, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=36, + ["type"]=3, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=27, + ["type"]=2, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=17, + ["type"]=2, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=41, + ["type"]=2, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=41, + ["type"]=2, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=51, + ["type"]=2, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=52, + ["type"]=2, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=52, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=52, + ["type"]=2, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=56, + ["type"]=2, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=56, + ["type"]=2, + ["direction"]=3 }, { - 0, - 0 + ["pos"]=56, + ["type"]=2, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=57, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=47, + ["type"]=2, + ["direction"]=1 } } }, [152]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 4 + 1 }, { 0, - 4 + 5 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 }, { 0, @@ -44501,190 +45269,190 @@ local chapter_board = { 3 }, { - 1, + 2, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, - { - 5, - 4 - }, - { - 37, - 0 - }, - { - 5, - 3 - }, - { - 21, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 4 - }, { 14, 0 }, { - 5, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { 0, - 0 - }, - { - 5, - 4 - }, - { - 5, 5 }, { - 5, + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, 3 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 3, 0 }, { - 1, + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, 0 } }, ["mystery_box_board"]={ { - 1, + 3, 0 }, { 0, - 4 + 1 }, { 0, - 4 + 5 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 }, { 0, @@ -44699,183 +45467,189 @@ local chapter_board = { 3 }, { - 1, + 2, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, - { - 5, - 4 - }, - { - 37, - 0 - }, - { - 5, - 3 - }, - { - 21, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 4 - }, { 17, 0 }, { - 5, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { 0, - 0 - }, - { - 5, - 4 - }, - { - 5, 5 }, { - 5, + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, 3 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 3, 0 }, { - 1, + 3, 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=23, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=3 } } }, [153]={ ["board"]={ { - 1, + 3, + 0 + }, + { + 3, 0 }, { @@ -44886,29 +45660,29 @@ local chapter_board = { 0, 3 }, - { - 0, - 2 - }, { 0, 1 }, { 0, - 1 + 4 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { 0, - 1 + 4 + }, + { + 0, + 4 }, { 0, @@ -44916,28 +45690,16 @@ local chapter_board = { }, { 0, - 3 + 2 }, { 0, - 4 + 2 }, { - 0, - 4 - }, - { - 1, + 3, 0 }, - { - 0, - 1 - }, - { - 0, - 1 - }, { 0, 3 @@ -44948,166 +45710,268 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 37, - 0 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 37, - 0 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, 3 }, { - 5, - 3 + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 }, { 21, - 5 + 1 }, { - 5, - 3 - }, - { - 1, + 3, 0 }, { - 1, + 2, 0 }, { - 5, - 2 + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 14, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=61, + ["type"]=2, + ["direction"]=1 }, { - 5, - 4 + ["pos"]=62, + ["type"]=2, + ["direction"]=1 }, { - 21, - 5 + ["pos"]=62, + ["type"]=2, + ["direction"]=4 }, { - 5, - 3 + ["pos"]=63, + ["type"]=2, + ["direction"]=1 }, { - 21, - 4 + ["pos"]=63, + ["type"]=2, + ["direction"]=1 }, { - 37, - 0 + ["pos"]=64, + ["type"]=2, + ["direction"]=1 }, { - 5, - 2 + ["pos"]=65, + ["type"]=2, + ["direction"]=1 }, { - 1, - 0 - }, - { - 5, - 4 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 1, - 0 + ["pos"]=72, + ["type"]=2, + ["direction"]=4 } } }, [154]={ ["board"]={ { - 1, + 3, + 0 + }, + { + 3, 0 }, { 0, - 2 + 3 }, { 0, - 2 + 3 }, { 0, - 2 + 3 }, { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 37, + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -45123,189 +45987,189 @@ local chapter_board = { 1 }, { - 37, + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 3 + }, + { + 21, + 3 + }, { 14, 0 }, { - 5, + 21, 3 }, { - 5, + 21, 3 }, { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 1 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 21, - 2 - }, - { - 21, - 2 - }, - { - 21, - 1 - }, - { - 21, - 1 - }, - { - 21, - 5 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 } }, ["mystery_box_board"]={ { - 1, + 3, + 0 + }, + { + 3, 0 }, { 0, - 2 + 3 }, { 0, - 2 + 3 }, { 0, - 2 + 3 }, { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 37, + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -45321,152 +46185,192 @@ local chapter_board = { 1 }, { - 37, + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 3 + }, + { + 21, + 3 + }, { 17, 0 }, { - 5, + 21, 3 }, { - 5, + 21, 3 }, { - 5, - 3 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 1 - }, - { - 0, + 3, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=12, + ["type"]=3, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=22, + ["type"]=2, + ["direction"]=3 }, { - 0, - 0 + ["pos"]=32, + ["type"]=2, + ["direction"]=3 }, { - 0, - 0 + ["pos"]=42, + ["type"]=3, + ["direction"]=3 }, { - 0, - 0 + ["pos"]=42, + ["type"]=2, + ["direction"]=2 }, { - 5, - 1 + ["pos"]=53, + ["type"]=2, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=53, + ["type"]=2, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=63, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=64, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=55, + ["type"]=2, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=55, + ["type"]=2, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=46, + ["type"]=2, + ["direction"]=2 }, { - 5, - 1 + ["pos"]=46, + ["type"]=3, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=36, + ["type"]=2, + ["direction"]=4 }, { - 5, - 2 + ["pos"]=26, + ["type"]=2, + ["direction"]=4 }, { - 5, - 2 + ["pos"]=16, + ["type"]=2, + ["direction"]=3 }, { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 1, - 0 - }, - { - 21, - 2 - }, - { - 21, - 2 - }, - { - 21, - 1 - }, - { - 21, - 1 - }, - { - 21, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 + ["pos"]=16, + ["type"]=3, + ["direction"]=2 } } } diff --git a/lua/app/config/grid_edge_type.lua b/lua/app/config/grid_edge_type.lua index 8b3c5a45..a0e4780b 100644 --- a/lua/app/config/grid_edge_type.lua +++ b/lua/app/config/grid_edge_type.lua @@ -1,10 +1,12 @@ local grid_edge_type = { [1]={ - ["icon"]="battle_obstacle_stick_3" + ["icon"]="battle_obstacle_stick_3", + ["break_sfx"]="sfx_piece_za_b01" }, [2]={ ["icon"]="battle_obstacle_stick_2", - ["next_type"]=1 + ["next_type"]=1, + ["break_sfx"]="sfx_piece_za_b01" }, [3]={ ["icon"]="battle_obstacle_stick_1", diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index b46f4dce..bd1a6acb 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -741,7 +741,7 @@ local hero = { ["model_id"]="p0031", ["icon"]="27", ["item_id"]=24003, - ["unlock_arena"]=10, + ["unlock_arena"]=5, ["collection_point"]=5, ["skin"]={ 24003 @@ -1116,7 +1116,7 @@ local hero = { ["model_id"]="p0027", ["icon"]="28", ["item_id"]=34002, - ["unlock_arena"]=6, + ["unlock_arena"]=4, ["is_show"]=1, ["collection_point"]=5, ["skin"]={ diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index e8cbaa0e..2ca8cd81 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -2347,7 +2347,7 @@ local item = { [1400201]={ ["type"]=12, ["parameter"]=1400201, - ["qlt"]=4, + ["qlt"]=3, ["icon"]="1400201" }, [3400101]={ @@ -2359,7 +2359,7 @@ local item = { [5300101]={ ["type"]=12, ["parameter"]=5300101, - ["qlt"]=4, + ["qlt"]=2, ["icon"]="5300101" }, [5400101]={ diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 5e4508b2..c59b8c1d 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -443,6 +443,8 @@ local LocalizationGlobalConst = ACT_DESC_7 = "ACT_DESC_7", ACT_DESC_8 = "ACT_DESC_8", ACT_DESC_9 = "ACT_DESC_9", + ACT_DESC_10 = "ACT_DESC_10", + ACT_DESC_11 = "ACT_DESC_11", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 3e6498b7..fc6dd769 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -8990,524 +8990,1361 @@ local monster_chapter = { ["monster_exp"]=22000 }, [67201]={ + ["monster_base"]=10074, ["hp"]=42410000, ["atk"]=2000000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=11000 }, [67301]={ + ["monster_base"]=10062, ["hp"]=59150000, ["atk"]=2110000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=11000 }, [67401]={ + ["monster_base"]=10073, ["hp"]=66960000, ["atk"]=2190000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20208, + 20209, + 20210 + }, + ["monster_exp"]=17000 }, [67501]={ + ["monster_base"]=10062, ["hp"]=89000000, ["atk"]=2300000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=19000 }, [67601]={ + ["monster_base"]=20006, ["is_boss"]=1, ["hp"]=123600000, ["atk"]=2460000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30016, + 30017, + 30018 + }, + ["skill"]={ + 10033 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=18000 }, [67701]={ + ["monster_base"]=10075, ["hp"]=84260000, ["atk"]=2380000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20214, + 20215, + 20216 + }, + ["monster_exp"]=9000 }, [67801]={ + ["monster_base"]=10064, ["hp"]=94020000, ["atk"]=2670000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=10000 }, [67901]={ + ["monster_base"]=10063, ["hp"]=108530000, ["atk"]=2480000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=11000 }, [68001]={ + ["monster_base"]=10069, ["hp"]=123600000, ["atk"]=2750000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=12000 }, [68101]={ + ["monster_base"]=20021, ["is_boss"]=1, ["hp"]=242450000, ["atk"]=2800000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30061, + 30062, + 30063 + }, + ["skill"]={ + 10034 + }, + ["passive_skill"]={ + 10011, + 10008 + }, + ["monster_exp"]=12000 }, [68201]={ + ["monster_base"]=10062, ["hp"]=140060000, ["atk"]=2720000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=16000 }, [68301]={ + ["monster_base"]=10063, ["hp"]=158470000, ["atk"]=2800000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=18000 }, [68401]={ + ["monster_base"]=10075, ["hp"]=168240000, ["atk"]=2910000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20214, + 20215, + 20216 + }, + ["monster_exp"]=21000 }, [68501]={ + ["monster_base"]=10064, ["hp"]=182190000, ["atk"]=2990000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=22000 }, [68601]={ + ["monster_base"]=20027, ["is_boss"]=1, ["hp"]=353210000, ["atk"]=3100000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30079, + 30080, + 30081 + }, + ["skill"]={ + 10082 + }, + ["monster_exp"]=24000 }, [68701]={ + ["monster_base"]=10074, ["hp"]=243290000, ["atk"]=3390000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=15000 }, [68801]={ + ["monster_base"]=10071, ["hp"]=259190000, ["atk"]=3500000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20202, + 20203, + 20204 + }, + ["monster_exp"]=16000 }, [68901]={ + ["monster_base"]=10069, ["hp"]=284580000, ["atk"]=3580000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=17000 }, [69001]={ + ["monster_base"]=10063, ["hp"]=310810000, ["atk"]=3680000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=17000 }, [69101]={ + ["monster_base"]=20046, ["is_boss"]=2, ["hp"]=545450000, ["atk"]=5340000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30153, + 30154, + 30155 + }, + ["skill"]={ + 10135, + 10136 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=22000 }, [69201]={ + ["monster_base"]=10075, ["hp"]=42410000, ["atk"]=2000000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20214, + 20215, + 20216 + }, + ["monster_exp"]=11000 }, [69301]={ + ["monster_base"]=10062, ["hp"]=59150000, ["atk"]=2110000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=11000 }, [69401]={ + ["monster_base"]=10074, ["hp"]=66960000, ["atk"]=2190000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=17000 }, [69501]={ + ["monster_base"]=10064, ["hp"]=89000000, ["atk"]=2300000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=19000 }, [69601]={ + ["monster_base"]=20037, ["is_boss"]=1, ["hp"]=123600000, ["atk"]=2460000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30106, + 30107, + 30108 + }, + ["skill"]={ + 10079 + }, + ["passive_skill"]={ + 10013, + 10009, + 10084 + }, + ["monster_exp"]=18000 }, [69701]={ + ["monster_base"]=10066, ["hp"]=84260000, ["atk"]=2380000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=9000 }, [69801]={ + ["monster_base"]=10074, ["hp"]=94020000, ["atk"]=2670000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=10000 }, [69901]={ + ["monster_base"]=10072, ["hp"]=108530000, ["atk"]=2480000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20205, + 20206, + 20207 + }, + ["monster_exp"]=11000 }, [70001]={ + ["monster_base"]=10063, ["hp"]=123600000, ["atk"]=2750000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=12000 }, [70101]={ + ["monster_base"]=20006, ["is_boss"]=1, ["hp"]=242450000, ["atk"]=2800000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30016, + 30017, + 30018 + }, + ["skill"]={ + 10033 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=12000 }, [70201]={ + ["monster_base"]=10063, ["hp"]=140060000, ["atk"]=2720000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=16000 }, [70301]={ + ["monster_base"]=10071, ["hp"]=158470000, ["atk"]=2800000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20202, + 20203, + 20204 + }, + ["monster_exp"]=18000 }, [70401]={ + ["monster_base"]=10074, ["hp"]=168240000, ["atk"]=2910000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=21000 }, [70501]={ + ["monster_base"]=10062, ["hp"]=182190000, ["atk"]=2990000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=22000 }, [70601]={ + ["monster_base"]=20036, ["is_boss"]=1, ["hp"]=353210000, ["atk"]=3100000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30103, + 30104, + 30105 + }, + ["skill"]={ + 10077, + 10078 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=24000 }, [70701]={ + ["monster_base"]=10062, ["hp"]=243290000, ["atk"]=3390000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=15000 }, [70801]={ + ["monster_base"]=10068, ["hp"]=259190000, ["atk"]=3500000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20193, + 20194, + 20195 + }, + ["monster_exp"]=16000 }, [70901]={ + ["monster_base"]=10071, ["hp"]=284580000, ["atk"]=3580000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20202, + 20203, + 20204 + }, + ["monster_exp"]=17000 }, [71001]={ + ["monster_base"]=10062, ["hp"]=310810000, ["atk"]=3680000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=17000 }, [71101]={ + ["monster_base"]=20044, ["is_boss"]=2, ["hp"]=545450000, ["atk"]=5340000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30147, + 30148, + 30149 + }, + ["skill"]={ + 10130, + 10131 + }, + ["passive_skill"]={ + 10132, + 10013, + 10011 + }, + ["monster_exp"]=22000 }, [71201]={ + ["monster_base"]=10069, ["hp"]=42410000, ["atk"]=2000000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=11000 }, [71301]={ + ["monster_base"]=10064, ["hp"]=59150000, ["atk"]=2110000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=11000 }, [71401]={ + ["monster_base"]=10062, ["hp"]=66960000, ["atk"]=2190000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=17000 }, [71501]={ + ["monster_base"]=10063, ["hp"]=89000000, ["atk"]=2300000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=19000 }, [71601]={ + ["monster_base"]=20021, ["is_boss"]=1, ["hp"]=123600000, ["atk"]=2460000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30061, + 30062, + 30063 + }, + ["skill"]={ + 10034 + }, + ["passive_skill"]={ + 10011, + 10008 + }, + ["monster_exp"]=18000 }, [71701]={ + ["monster_base"]=10062, ["hp"]=84260000, ["atk"]=2380000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=9000 }, [71801]={ + ["monster_base"]=10069, ["hp"]=94020000, ["atk"]=2670000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=10000 }, [71901]={ + ["monster_base"]=10064, ["hp"]=108530000, ["atk"]=2480000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=11000 }, [72001]={ + ["monster_base"]=10074, ["hp"]=123600000, ["atk"]=2750000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=12000 }, [72101]={ + ["monster_base"]=20027, ["is_boss"]=1, ["hp"]=242450000, ["atk"]=2800000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30079, + 30080, + 30081 + }, + ["skill"]={ + 10082 + }, + ["monster_exp"]=12000 }, [72201]={ + ["monster_base"]=10062, ["hp"]=140060000, ["atk"]=2720000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=16000 }, [72301]={ + ["monster_base"]=10071, ["hp"]=158470000, ["atk"]=2800000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20202, + 20203, + 20204 + }, + ["monster_exp"]=18000 }, [72401]={ + ["monster_base"]=10064, ["hp"]=168240000, ["atk"]=2910000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=21000 }, [72501]={ + ["monster_base"]=10065, ["hp"]=182190000, ["atk"]=2990000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20187, + 20188, + 20189 + }, + ["monster_exp"]=22000 }, [72601]={ + ["monster_base"]=20046, ["is_boss"]=1, ["hp"]=353210000, ["atk"]=3100000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30153, + 30154, + 30155 + }, + ["skill"]={ + 10135, + 10136 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=24000 }, [72701]={ + ["monster_base"]=10062, ["hp"]=243290000, ["atk"]=3390000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=15000 }, [72801]={ + ["monster_base"]=10069, ["hp"]=259190000, ["atk"]=3500000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=16000 }, [72901]={ + ["monster_base"]=10072, ["hp"]=284580000, ["atk"]=3580000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20205, + 20206, + 20207 + }, + ["monster_exp"]=17000 }, [73001]={ + ["monster_base"]=10070, ["hp"]=310810000, ["atk"]=3680000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20199, + 20200, + 20201 + }, + ["monster_exp"]=17000 }, [73101]={ + ["monster_base"]=20045, ["is_boss"]=2, ["hp"]=545450000, ["atk"]=5340000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30150, + 30151, + 30152 + }, + ["skill"]={ + 10133, + 10134 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=22000 }, [73201]={ + ["monster_base"]=10076, ["hp"]=42410000, ["atk"]=2000000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20217, + 20218, + 20219 + }, + ["monster_exp"]=11000 }, [73301]={ + ["monster_base"]=10070, ["hp"]=59150000, ["atk"]=2110000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20199, + 20200, + 20201 + }, + ["monster_exp"]=11000 }, [73401]={ + ["monster_base"]=10067, ["hp"]=66960000, ["atk"]=2190000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=17000 }, [73501]={ + ["monster_base"]=10070, ["hp"]=89000000, ["atk"]=2300000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20199, + 20200, + 20201 + }, + ["monster_exp"]=19000 }, [73601]={ + ["monster_base"]=20006, ["is_boss"]=1, ["hp"]=123600000, ["atk"]=2460000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30016, + 30017, + 30018 + }, + ["skill"]={ + 10033 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=18000 }, [73701]={ + ["monster_base"]=10062, ["hp"]=84260000, ["atk"]=2380000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=9000 }, [73801]={ + ["monster_base"]=10073, ["hp"]=94020000, ["atk"]=2670000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20208, + 20209, + 20210 + }, + ["monster_exp"]=10000 }, [73901]={ + ["monster_base"]=10077, ["hp"]=108530000, ["atk"]=2480000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20220, + 20221, + 20222 + }, + ["monster_exp"]=11000 }, [74001]={ + ["monster_base"]=10073, ["hp"]=123600000, ["atk"]=2750000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20208, + 20209, + 20210 + }, + ["monster_exp"]=12000 }, [74101]={ + ["monster_base"]=20038, ["is_boss"]=1, ["hp"]=242450000, ["atk"]=2800000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30109, + 30110, + 30111, + 30112 + }, + ["skill"]={ + 10080, + 10081 + }, + ["passive_skill"]={ + 10083, + 10009, + 10011 + }, + ["monster_exp"]=12000 }, [74201]={ + ["monster_base"]=10063, ["hp"]=140060000, ["atk"]=2720000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=16000 }, [74301]={ + ["monster_base"]=10077, ["hp"]=158470000, ["atk"]=2800000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20220, + 20221, + 20222 + }, + ["monster_exp"]=18000 }, [74401]={ + ["monster_base"]=10068, ["hp"]=168240000, ["atk"]=2910000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20193, + 20194, + 20195 + }, + ["monster_exp"]=21000 }, [74501]={ + ["monster_base"]=10069, ["hp"]=182190000, ["atk"]=2990000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=22000 }, [74601]={ + ["monster_base"]=20044, ["is_boss"]=1, ["hp"]=353210000, ["atk"]=3100000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30147, + 30148, + 30149 + }, + ["skill"]={ + 10130, + 10131 + }, + ["passive_skill"]={ + 10132, + 10013, + 10011 + }, + ["monster_exp"]=24000 }, [74701]={ + ["monster_base"]=10077, ["hp"]=243290000, ["atk"]=3390000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20220, + 20221, + 20222 + }, + ["monster_exp"]=15000 }, [74801]={ + ["monster_base"]=10064, ["hp"]=259190000, ["atk"]=3500000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=16000 }, [74901]={ + ["monster_base"]=10065, ["hp"]=284580000, ["atk"]=3580000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20187, + 20188, + 20189 + }, + ["monster_exp"]=17000 }, [75001]={ + ["monster_base"]=10074, ["hp"]=310810000, ["atk"]=3680000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=17000 }, [75101]={ + ["monster_base"]=20048, ["is_boss"]=2, ["hp"]=545450000, ["atk"]=5340000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30159, + 30160, + 30161 + }, + ["skill"]={ + 10139, + 10140 + }, + ["passive_skill"]={ + 10141, + 10014, + 10009 + }, + ["monster_exp"]=22000 }, [75201]={ + ["monster_base"]=10072, ["hp"]=42410000, ["atk"]=2000000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20205, + 20206, + 20207 + }, + ["monster_exp"]=11000 }, [75301]={ + ["monster_base"]=10069, ["hp"]=59150000, ["atk"]=2110000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=11000 }, [75401]={ + ["monster_base"]=10072, ["hp"]=66960000, ["atk"]=2190000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20205, + 20206, + 20207 + }, + ["monster_exp"]=17000 }, [75501]={ + ["monster_base"]=10063, ["hp"]=89000000, ["atk"]=2300000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=19000 }, [75601]={ + ["monster_base"]=20046, ["is_boss"]=1, ["hp"]=123600000, ["atk"]=2460000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30153, + 30154, + 30155 + }, + ["skill"]={ + 10135, + 10136 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=18000 }, [75701]={ + ["monster_base"]=10076, ["hp"]=84260000, ["atk"]=2380000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20217, + 20218, + 20219 + }, + ["monster_exp"]=9000 }, [75801]={ + ["monster_base"]=10071, ["hp"]=94020000, ["atk"]=2670000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20202, + 20203, + 20204 + }, + ["monster_exp"]=10000 }, [75901]={ + ["monster_base"]=10064, ["hp"]=108530000, ["atk"]=2480000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=11000 }, [76001]={ + ["monster_base"]=10075, ["hp"]=123600000, ["atk"]=2750000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20214, + 20215, + 20216 + }, + ["monster_exp"]=12000 }, [76101]={ + ["monster_base"]=20027, ["is_boss"]=1, ["hp"]=242450000, ["atk"]=2800000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30079, + 30080, + 30081 + }, + ["skill"]={ + 10082 + }, + ["monster_exp"]=12000 }, [76201]={ + ["monster_base"]=10065, ["hp"]=140060000, ["atk"]=2720000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20187, + 20188, + 20189 + }, + ["monster_exp"]=16000 }, [76301]={ + ["monster_base"]=10076, ["hp"]=158470000, ["atk"]=2800000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20217, + 20218, + 20219 + }, + ["monster_exp"]=18000 }, [76401]={ + ["monster_base"]=10062, ["hp"]=168240000, ["atk"]=2910000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=21000 }, [76501]={ + ["monster_base"]=10075, ["hp"]=182190000, ["atk"]=2990000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20214, + 20215, + 20216 + }, + ["monster_exp"]=22000 }, [76601]={ + ["monster_base"]=20037, ["is_boss"]=1, ["hp"]=353210000, ["atk"]=3100000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30106, + 30107, + 30108 + }, + ["skill"]={ + 10079 + }, + ["passive_skill"]={ + 10013, + 10009, + 10084 + }, + ["monster_exp"]=24000 }, [76701]={ + ["monster_base"]=10077, ["hp"]=243290000, ["atk"]=3390000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20220, + 20221, + 20222 + }, + ["monster_exp"]=15000 }, [76801]={ + ["monster_base"]=10074, ["hp"]=259190000, ["atk"]=3500000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=16000 }, [76901]={ + ["monster_base"]=10064, ["hp"]=284580000, ["atk"]=3580000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=17000 }, [77001]={ + ["monster_base"]=10062, ["hp"]=310810000, ["atk"]=3680000, - ["atk_times"]=3 + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=17000 }, [77101]={ + ["monster_base"]=20047, ["is_boss"]=2, ["hp"]=545450000, ["atk"]=5340000, - ["atk_times"]=4 + ["atk_times"]=4, + ["hurt_skill"]={ + 30156, + 30157, + 30158 + }, + ["skill"]={ + 10137, + 10138 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=22000 } } local config = { diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 9f719c73..cd7d0375 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1547,6 +1547,9 @@ local skill = { ["fx_self_mirror"]=400103 }, [1400320]={ + ["buff_id"]={ + "vulnerable" + }, ["energy"]=10, ["link"]=1, ["position"]=1, @@ -2776,7 +2779,7 @@ local skill = { { ["type"]="imprison", ["num"]=0, - ["ratio"]=7000, + ["ratio"]=5000, ["round"]=2 } }, @@ -3018,7 +3021,7 @@ local skill = { ["type"]="weaken", ["num"]=2500, ["ratio"]=1000, - ["round"]=1 + ["round"]=2 } }, ["obj"]=2 @@ -3052,8 +3055,8 @@ local skill = { ["effect"]={ { ["type"]="weaken", - ["num"]=2500, - ["ratio"]=1000, + ["num"]=5000, + ["ratio"]=2000, ["round"]=2 } }, @@ -3186,6 +3189,9 @@ local skill = { ["fx_self_mirror"]=400098 }, [2400320]={ + ["buff_id"]={ + "stun" + }, ["energy"]=10, ["link"]=1, ["position"]=2, @@ -4635,7 +4641,7 @@ local skill = { ["effect"]={ { ["type"]="imprison", - ["num"]=1, + ["num"]=0, ["ratio"]=10000, ["round"]=2 } @@ -6315,6 +6321,9 @@ local skill = { ["name_act"]="attack04" }, [4400320]={ + ["buff_id"]={ + "frozen" + }, ["energy"]=10, ["link"]=1, ["position"]=4, @@ -7857,6 +7866,9 @@ local skill = { ["fx_self_mirror"]=400115 }, [5400320]={ + ["buff_id"]={ + "corrupt" + }, ["energy"]=10, ["link"]=1, ["position"]=5, @@ -12316,6 +12328,405 @@ local skill = { 400 } }, + [10130]={ + ["skill_type"]=8, + ["skill_type_parameter"]={ + 2 + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2 + }, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill01" + }, + [10131]={ + ["skill_type"]=5, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3, + 4 + }, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=1, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill02" + }, + [10132]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="atkp_add", + ["num"]=500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["cd"]=0, + ["cd_start"]=0 + }, + [10133]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 21, + 2 + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=20000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="poison", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill01" + }, + [10134]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="shield", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="self_heal", + ["num"]=50000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=1, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill02" + }, + [10135]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=20000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill01" + }, + [10136]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="counterattack", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="self_heal", + ["num"]=50000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=1, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill02" + }, + [10137]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="ocean_shield", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="self_heal", + ["num"]=50000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=1, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill01" + }, + [10138]={ + ["skill_type"]=9, + ["skill_type_parameter"]={ + 10000 + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="imprison", + ["num"]=0, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3, + 5 + }, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill02" + }, + [10139]={ + ["skill_type"]=5, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill01" + }, + [10140]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 21, + 2 + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=20000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="poison", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=2, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill02" + }, + [10141]={ + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="poison", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="heal", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["cd"]=0, + ["cd_start"]=0 + }, [20001]={ ["effect_type"]=1, ["trigger"]=1, @@ -16924,6 +17335,726 @@ local skill = { ["name_act"]="attack03", ["fx_self"]=100115 }, + [20193]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20194]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20195]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20196]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20197]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20198]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20199]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20200]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20201]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20202]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20203]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20204]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20205]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20206]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20207]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20208]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20209]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20210]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20211]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20212]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20213]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20214]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20215]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20216]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20217]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20218]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20219]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, + [20220]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000024 + }, + ["name_act"]="attack01", + ["fx_self"]=100115 + }, + [20221]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=100115 + }, + [20222]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 80 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=100115 + }, [30001]={ ["effect_type"]=1, ["trigger"]=1, @@ -20750,6 +21881,435 @@ local skill = { ["name_act"]="attack03", ["fx_self"]=200162 }, + [30147]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000021 + }, + ["name_act"]="attack01", + ["fx_self"]=400040 + }, + [30148]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=400041 + }, + [30149]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=400042 + }, + [30150]={ + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="poison", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 2, + 1 + } + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000021 + }, + ["name_act"]="attack01", + ["fx_self"]=400040 + }, + [30151]={ + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="poison", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 2, + 1 + } + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=400041 + }, + [30152]={ + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="poison", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 2, + 1 + } + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=400042 + }, + [30153]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000021 + }, + ["name_act"]="attack01", + ["fx_self"]=400040 + }, + [30154]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=400041 + }, + [30155]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=400042 + }, + [30156]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000021 + }, + ["name_act"]="attack01", + ["fx_self"]=400040 + }, + [30157]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=400041 + }, + [30158]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=400042 + }, + [30159]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000021 + }, + ["name_act"]="attack01", + ["fx_self"]=400040 + }, + [30160]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000022 + }, + ["name_act"]="attack02", + ["fx_self"]=400041 + }, + [30161]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000023 + }, + ["name_act"]="attack03", + ["fx_self"]=400042 + }, [40001]={ ["effect_type"]=1, ["trigger"]=1, @@ -25676,6 +27236,6 @@ local skill = { } } local config = { -data=skill,count=928 +data=skill,count=985 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 4fe3cf1f..d6c45dfc 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1245,6 +1245,9 @@ local skill_rogue = { ["icon"]="191" }, [1400201]={ + ["buff_id"]={ + "burn" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1262,6 +1265,9 @@ local skill_rogue = { ["icon"]="196" }, [1400202]={ + ["buff_id"]={ + "normal_attack_add" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1298,6 +1304,9 @@ local skill_rogue = { ["icon"]="198" }, [1400204]={ + ["buff_id"]={ + "burn" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1442,6 +1451,9 @@ local skill_rogue = { ["icon"]="267" }, [1400305]={ + ["buff_id"]={ + "rebirth" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1476,6 +1488,9 @@ local skill_rogue = { ["icon"]="269" }, [1400307]={ + ["buff_id"]={ + "rebirth" + }, ["unlock"]=1400305, ["cover_unlock"]=1400305, ["limit_times"]=1, @@ -2219,6 +2234,9 @@ local skill_rogue = { ["icon"]="236" }, [2400302]={ + ["buff_id"]={ + "stun" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2231,6 +2249,9 @@ local skill_rogue = { ["icon"]="237" }, [2400303]={ + ["buff_id"]={ + "bleed" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2284,6 +2305,9 @@ local skill_rogue = { ["icon"]="240" }, [2400306]={ + ["buff_id"]={ + "bleed" + }, ["unlock"]=2400203, ["cover_unlock"]=2400203, ["limit_times"]=1, @@ -3008,6 +3032,9 @@ local skill_rogue = { ["icon"]="232" }, [3400301]={ + ["buff_id"]={ + "bleed" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3036,6 +3063,9 @@ local skill_rogue = { ["icon"]="244" }, [3400303]={ + ["buff_id"]={ + "bleed" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3070,6 +3100,9 @@ local skill_rogue = { ["icon"]="246" }, [3400305]={ + ["buff_id"]={ + "thorns" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3101,6 +3134,9 @@ local skill_rogue = { ["icon"]="248" }, [3400307]={ + ["buff_id"]={ + "thorns" + }, ["unlock"]=3400305, ["cover_unlock"]=3400305, ["limit_times"]=1, @@ -3827,6 +3863,9 @@ local skill_rogue = { ["icon"]="252" }, [4400304]={ + ["buff_id"]={ + "frozen" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3839,6 +3878,9 @@ local skill_rogue = { ["icon"]="253" }, [4400305]={ + ["buff_id"]={ + "normal_attack_dec" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -4578,6 +4620,9 @@ local skill_rogue = { ["icon"]="257" }, [5400302]={ + ["buff_id"]={ + "poison" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -4595,6 +4640,9 @@ local skill_rogue = { ["icon"]="258" }, [5400303]={ + ["buff_id"]={ + "corrupt" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -4634,6 +4682,9 @@ local skill_rogue = { ["icon"]="260" }, [5400305]={ + ["buff_id"]={ + "lethargy" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -4674,6 +4725,9 @@ local skill_rogue = { ["icon"]="262" }, [5400307]={ + ["buff_id"]={ + "lethargy" + }, ["unlock"]=5400305, ["cover_unlock"]=5400305, ["limit_times"]=1, diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 917db679..78d00aee 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -42,6 +42,7 @@ local skin = { ["num"]=2000 } }, + ["icon"]="skin_3", ["got"]=1, ["skin_point"]=2, ["hero_id"]=14002, @@ -133,6 +134,7 @@ local skin = { ["num"]=500 } }, + ["icon"]="skin_1", ["got"]=1, ["skin_point"]=2, ["hero_id"]=34001, @@ -214,10 +216,11 @@ local skin = { ["num"]=300000 }, { - ["type"]="attr_hpp_purple", + ["type"]="attr_hp_purple", ["num"]=700000 } }, + ["icon"]="skin_4", ["got"]=1, ["skin_point"]=2, ["hero_id"]=53001, @@ -255,6 +258,7 @@ local skin = { ["num"]=2000 } }, + ["icon"]="skin_2", ["got"]=1, ["skin_point"]=2, ["hero_id"]=54001, diff --git a/lua/app/config/strings/cn/attr.lua b/lua/app/config/strings/cn/attr.lua index dc19bdd7..8c88007b 100644 --- a/lua/app/config/strings/cn/attr.lua +++ b/lua/app/config/strings/cn/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="技能伤害增加{0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="生命提升{0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="生命提升{0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="生命提升{0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="生命提升{0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="生命提升{0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua index db3fafbe..9bbaf16e 100644 --- a/lua/app/config/strings/cn/avatar.lua +++ b/lua/app/config/strings/cn/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="激活闪烁法师后获得。" + }, + [1400201]={ + ["desc"]="激活潘达沙滩王者皮肤获得。" + }, + [3400101]={ + ["desc"]="激活木兰骄阳晨露皮肤获得。" + }, + [5300101]={ + ["desc"]="激活魔女琪琪小红帽皮肤获得。" + }, + [5400101]={ + ["desc"]="激活蝴蝶翩然起舞皮肤获得。" } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 4dfa0e2b..c2018347 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -435,14 +435,16 @@ local localization_global = ["HERO_DESC_12"] = "竞技场{0}解锁", ["SKIN_COLLECT"] = "皮肤收集", ["ACT_DESC_1"] = "贝壳积分", - ["ACT_DESC_2"] = "夏日派对", + ["ACT_DESC_2"] = "沙滩派对", ["ACT_DESC_3"] = "皮肤礼包", ["ACT_DESC_4"] = "英雄礼包", ["ACT_DESC_5"] = "沙滩派对皮肤,限时登场!", - ["ACT_DESC_6"] = "蝴蝶皮肤礼包", + ["ACT_DESC_6"] = "刀姬皮肤礼包", ["ACT_DESC_7"] = "木兰皮肤礼包", ["ACT_DESC_8"] = "蝴蝶限时返场!", ["ACT_DESC_9"] = "S", + ["ACT_DESC_10"] = "完成活动任务获得奖励积分,积分达到一定数量可提升奖励等级领取奖励。付费可解锁更多奖励哦!", + ["ACT_DESC_11"] = "解锁后提升奖励等级,可额外获得以下奖励:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 44e14800..40c75fa6 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -237,7 +237,7 @@ local skill_rogue = { ["desc"]="熊猫爆竹可为团队附加亢奋效果,3回合。" }, [1400203]={ - ["desc"]="熊猫爆竹横向可额外消除4个格。" + ["desc"]="熊猫爆竹横向可额外消除4格。" }, [1400204]={ ["desc"]="潘达普攻时有10%概率附加灼烧效果,2回合。" @@ -360,13 +360,13 @@ local skill_rogue = { ["desc"]="雷神之锤随机消除元素+2。" }, [2400204]={ - ["desc"]="索尔普攻时有10%概率附加虚弱效果,1回合。" + ["desc"]="索尔普攻时有10%概率附加虚弱效果,2回合。" }, [2400205]={ ["desc"]="雷神之锤释放后为团队附加反伤护盾,2回合。" }, [2400206]={ - ["desc"]="索尔普攻附加的虚弱效果,回合数+1。" + ["desc"]="索尔普攻附加虚弱效果的概率提升至20%,虚弱效果提升。" }, [2400207]={ ["desc"]="雷神之锤为团队附加的反伤护盾,反伤效果增加。" diff --git a/lua/app/config/strings/de/attr.lua b/lua/app/config/strings/de/attr.lua index a5649b09..42a5443a 100644 --- a/lua/app/config/strings/de/attr.lua +++ b/lua/app/config/strings/de/attr.lua @@ -202,6 +202,26 @@ local attr = { [51]={ ["id"]=51, ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["name"]="attr_hp_purple" } } local keys = { @@ -256,12 +276,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar.lua b/lua/app/config/strings/de/avatar.lua index e43f949e..d47f7486 100644 --- a/lua/app/config/strings/de/avatar.lua +++ b/lua/app/config/strings/de/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/attr.lua b/lua/app/config/strings/en/attr.lua index 190301a3..34a7d63e 100644 --- a/lua/app/config/strings/en/attr.lua +++ b/lua/app/config/strings/en/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="Skill DMG +{0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="HP +{0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="HP +{0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="HP +{0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="HP +{0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="HP +{0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua index b25eb05e..b2798ba4 100644 --- a/lua/app/config/strings/en/avatar.lua +++ b/lua/app/config/strings/en/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Obtained after activating Twinkling Mage." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index fe519e42..785f015a 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="Mjolnir clears 2 more random elements." }, [2400204]={ - ["desc"]="Thor's normal attack has a 10% chance of inflicting Weak for 1 turn." + ["desc"]="Thor's normal attack has a 10% chance of inflicting Weak for 2 turn." }, [2400205]={ ["desc"]="After Mjolnir is used, the team gains Counter Shield for 2 turns." diff --git a/lua/app/config/strings/es/attr.lua b/lua/app/config/strings/es/attr.lua index 6e00e5a4..7cb74e46 100644 --- a/lua/app/config/strings/es/attr.lua +++ b/lua/app/config/strings/es/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="Daño de habilidad aumenta en {0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="HP +{0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="HP +{0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="HP +{0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="HP +{0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="HP +{0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/avatar.lua b/lua/app/config/strings/es/avatar.lua index 632d1be8..05111ab2 100644 --- a/lua/app/config/strings/es/avatar.lua +++ b/lua/app/config/strings/es/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Se obtiene tras activar Mago Brillante." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skill_rogue.lua b/lua/app/config/strings/es/skill_rogue.lua index e60963b6..0c0cd0b7 100644 --- a/lua/app/config/strings/es/skill_rogue.lua +++ b/lua/app/config/strings/es/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="Martillo de Thor elimina aleatoriamente +2 elementos extras." }, [2400204]={ - ["desc"]="El ataque común de Sol tiene un 10% de chance de aplicar Debilidad durante 1 ronda." + ["desc"]="El ataque común de Sol tiene un 10% de chance de aplicar Debilidad durante 2 ronda." }, [2400205]={ ["desc"]="Al usar el Martillo de Thor, se agrega un Escudo Reflexivo al equipo durante 2 rondas." diff --git a/lua/app/config/strings/fr/attr.lua b/lua/app/config/strings/fr/attr.lua index a5649b09..42a5443a 100644 --- a/lua/app/config/strings/fr/attr.lua +++ b/lua/app/config/strings/fr/attr.lua @@ -202,6 +202,26 @@ local attr = { [51]={ ["id"]=51, ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["name"]="attr_hp_purple" } } local keys = { @@ -256,12 +276,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar.lua b/lua/app/config/strings/fr/avatar.lua index e43f949e..d47f7486 100644 --- a/lua/app/config/strings/fr/avatar.lua +++ b/lua/app/config/strings/fr/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/attr.lua b/lua/app/config/strings/id/attr.lua index 1fc45113..f41a8a68 100644 --- a/lua/app/config/strings/id/attr.lua +++ b/lua/app/config/strings/id/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="Skill DMG +{0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="HP +{0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="HP +{0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="HP +{0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="HP +{0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="HP +{0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua index 2de9688f..903e4765 100644 --- a/lua/app/config/strings/id/avatar.lua +++ b/lua/app/config/strings/id/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Dapat setelah lolos Blink Mage" + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 4ce02dc3..67c74bf9 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="Palu Thor menghapus 2 lebih banyak elemen acak." }, [2400204]={ - ["desc"]="Ada 10% peluang menambahkan efek Lemah pada serangan Thor selama 1 giliran." + ["desc"]="Ada 10% peluang menambahkan efek Lemah pada serangan Thor selama 2 giliran." }, [2400205]={ ["desc"]="Palu Thor menambahkan Perisai Anti-DMG ke tim selama 2 giliran setelah dilepaskan." diff --git a/lua/app/config/strings/ja/attr.lua b/lua/app/config/strings/ja/attr.lua index f845d611..1b1ec8be 100644 --- a/lua/app/config/strings/ja/attr.lua +++ b/lua/app/config/strings/ja/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="スキルダメージが{0}%増加する", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="HPが{0}増加する", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="HPが{0}増加する", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="HPが{0}増加する", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="HPが{0}増加する", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="HPが{0}増加する", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua index 2a429a31..64b7d33f 100644 --- a/lua/app/config/strings/ja/avatar.lua +++ b/lua/app/config/strings/ja/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="トゥインクリングメイジをアクティブ化後獲得できる。" + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 2695f675..7ac8060c 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="「ソーのハンマー」はランダムで+2の元素を消す。" }, [2400204]={ - ["desc"]="ソーの通常攻撃は10%の確率で敵に1ターン弱体効果を付与する。" + ["desc"]="ソーの通常攻撃は10%の確率で敵に2ターン弱体効果を付与する。" }, [2400205]={ ["desc"]="「ソーのハンマー」は全員に2ターン反射シールドを付与する。" diff --git a/lua/app/config/strings/ko/attr.lua b/lua/app/config/strings/ko/attr.lua index c8be25c9..aca1bc1d 100644 --- a/lua/app/config/strings/ko/attr.lua +++ b/lua/app/config/strings/ko/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="스킬 대미지 +{0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="HP +{0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="HP +{0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="HP +{0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="HP +{0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="HP +{0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua index 998ff396..a446213f 100644 --- a/lua/app/config/strings/ko/avatar.lua +++ b/lua/app/config/strings/ko/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="반짝이는 마법사을(를) 활성화한 후, 획득할 수 있습니다." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index e6edcce5..0a8b86da 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="토르의 무작위로 소멸하는 원소 +2" }, [2400204]={ - ["desc"]="토르의 일반 공격은 10% 확률로 1턴 동안 탈진 효과를 부여합니다." + ["desc"]="토르의 일반 공격은 10% 확률로 2턴 동안 탈진 효과를 부여합니다." }, [2400205]={ ["desc"]="토르의 망치를 사용하면 2턴 동안 팀에게 피해 반사 보호막을 부여합니다." diff --git a/lua/app/config/strings/pt/attr.lua b/lua/app/config/strings/pt/attr.lua index d1970b14..d8eded0e 100644 --- a/lua/app/config/strings/pt/attr.lua +++ b/lua/app/config/strings/pt/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="Aumenta o dano de habilidade em {0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="Aumento de Vida {0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="Aumento de Vida {0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="Aumento de Vida {0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="Aumento de Vida {0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="Aumento de Vida {0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua index a9a89dac..50e0e493 100644 --- a/lua/app/config/strings/pt/avatar.lua +++ b/lua/app/config/strings/pt/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Ativar Mago do Brilho para obter." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index 448077aa..e8214a2d 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="Elementos eliminados aleatoriamente pelo Martelo de Thor +2." }, [2400204]={ - ["desc"]="Durante o ataque de Solpu, há uma probabilidade de 10% de adicionar o efeito fraqueza por 1 turno." + ["desc"]="Durante o ataque de Solpu, há uma probabilidade de 10% de adicionar o efeito fraqueza por 2 turno." }, [2400205]={ ["desc"]="Após a liberação do Martelo de Thor, adiciona escudo de retorno de dano à equipe por 2 turnos." diff --git a/lua/app/config/strings/ru/attr.lua b/lua/app/config/strings/ru/attr.lua index a5649b09..42a5443a 100644 --- a/lua/app/config/strings/ru/attr.lua +++ b/lua/app/config/strings/ru/attr.lua @@ -202,6 +202,26 @@ local attr = { [51]={ ["id"]=51, ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["name"]="attr_hp_purple" } } local keys = { @@ -256,12 +276,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar.lua b/lua/app/config/strings/ru/avatar.lua index e43f949e..d47f7486 100644 --- a/lua/app/config/strings/ru/avatar.lua +++ b/lua/app/config/strings/ru/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/attr.lua b/lua/app/config/strings/th/attr.lua index 5ebc0c96..e09c328f 100644 --- a/lua/app/config/strings/th/attr.lua +++ b/lua/app/config/strings/th/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="ดาเมจสกิลเพิ่มขึ้น {0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="HP เพิ่มขึ้น {0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="HP เพิ่มขึ้น {0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="HP เพิ่มขึ้น {0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="HP เพิ่มขึ้น {0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="HP เพิ่มขึ้น {0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua index 4058a8e8..d912b039 100644 --- a/lua/app/config/strings/th/avatar.lua +++ b/lua/app/config/strings/th/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="หลังจากการเปิดใช้งานนักเวทแวบวับจะได้รับ" + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index fe4a45b0..95064ee8 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด 2 ธาตุ" }, [2400204]={ - ["desc"]="เมื่อโซลโจมตีทั่วไปจะมีโอกาส10%เพิ่มเอฟเฟกต์อ่อนแอ 1รอบ" + ["desc"]="เมื่อโซลโจมตีทั่วไปจะมีโอกาส10%เพิ่มเอฟเฟกต์อ่อนแอ 2รอบ" }, [2400205]={ ["desc"]="หลังจากปล่อยค้อนของเทพสายฟ้าจะเพิ่มบโล่สะท้อนดาเมจให้กับทีม 2รอบ" diff --git a/lua/app/config/strings/vi/attr.lua b/lua/app/config/strings/vi/attr.lua index 8b523a55..55271917 100644 --- a/lua/app/config/strings/vi/attr.lua +++ b/lua/app/config/strings/vi/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="Tăng {0}% sát thương kỹ năng", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="Tăng {0} HP", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="Tăng {0} HP", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="Tăng {0} HP", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="Tăng {0} HP", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="Tăng {0} HP", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua index ea55bb98..fe46c89d 100644 --- a/lua/app/config/strings/vi/avatar.lua +++ b/lua/app/config/strings/vi/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Kích hoạt Pháp Sư Blink nhận được." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index a6dbcead..47c94494 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="Búa Thor Tố ngẫu nhiên xua tan Nguyên Tố +2." }, [2400204]={ - ["desc"]="Khi Thor đánh thường có 10% kèm hiệu quảSuy Yếu, 1 hiệp." + ["desc"]="Khi Thor đánh thường có 10% kèm hiệu quảSuy Yếu, 2 hiệp." }, [2400205]={ ["desc"]="Sau khi thi triển Búa Thor kèm Khiên Phản Sát Thương cho đội, 2 hiệp." diff --git a/lua/app/config/strings/zh/attr.lua b/lua/app/config/strings/zh/attr.lua index 28b9d989..7d1c4067 100644 --- a/lua/app/config/strings/zh/attr.lua +++ b/lua/app/config/strings/zh/attr.lua @@ -253,6 +253,31 @@ local attr = { ["id"]=51, ["desc"]="技能傷害增加{0}%", ["name"]="attr_skill_hurtp_purple" + }, + [52]={ + ["id"]=52, + ["desc"]="生命提高{0}", + ["name"]="attr_hp_red" + }, + [53]={ + ["id"]=53, + ["desc"]="生命提高{0}", + ["name"]="attr_hp_yellow" + }, + [54]={ + ["id"]=54, + ["desc"]="生命提高{0}", + ["name"]="attr_hp_green" + }, + [55]={ + ["id"]=55, + ["desc"]="生命提高{0}", + ["name"]="attr_hp_blue" + }, + [56]={ + ["id"]=56, + ["desc"]="生命提高{0}", + ["name"]="attr_hp_purple" } } local keys = { @@ -307,12 +332,17 @@ local keys = { ["attr_skill_hurtp_yellow"]=attr[48], ["attr_skill_hurtp_green"]=attr[49], ["attr_skill_hurtp_blue"]=attr[50], - ["attr_skill_hurtp_purple"]=attr[51] + ["attr_skill_hurtp_purple"]=attr[51], + ["attr_hp_red"]=attr[52], + ["attr_hp_yellow"]=attr[53], + ["attr_hp_green"]=attr[54], + ["attr_hp_blue"]=attr[55], + ["attr_hp_purple"]=attr[56] } } local config = { data=attr, keys=keys, -count=51 +count=56 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua index 7e6b1a40..3c4f60f8 100644 --- a/lua/app/config/strings/zh/avatar.lua +++ b/lua/app/config/strings/zh/avatar.lua @@ -79,9 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="啟動閃爍法師後獲得。" + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=avatar,count=27 +data=avatar,count=31 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 8711ff2a..153500c9 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -360,7 +360,7 @@ local skill_rogue = { ["desc"]="雷神之鎚隨機消除元素+2。" }, [2400204]={ - ["desc"]="索爾普攻時有10%機率附帶虛弱效果,1回合。" + ["desc"]="索爾普攻時有10%機率附帶虛弱效果,2回合。" }, [2400205]={ ["desc"]="雷神之鎚釋放後賦予團隊反傷護盾,2回合。" diff --git a/lua/app/userdata/battle/battle_base_data.lua b/lua/app/userdata/battle/battle_base_data.lua index 401ae443..f4b398db 100644 --- a/lua/app/userdata/battle/battle_base_data.lua +++ b/lua/app/userdata/battle/battle_base_data.lua @@ -263,6 +263,7 @@ function BattleBaseData:clear() self:clearCacheBoardSkill() self.gridEntities = {} + self.gridEdgeEntities = {} self.skillMap = {} self.skillPool = {} self.selectSkillMap = {}