diff --git a/lua/app/config/arena_board.lua b/lua/app/config/arena_board.lua index 0286d318..7c99295b 100644 --- a/lua/app/config/arena_board.lua +++ b/lua/app/config/arena_board.lua @@ -1422,7 +1422,7 @@ local arena_board = { [6]={ ["board"]={ { - 35, + 9, 0 }, { @@ -1446,11 +1446,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1474,11 +1474,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1502,11 +1502,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1530,11 +1530,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1558,11 +1558,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1586,11 +1586,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1614,11 +1614,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1642,11 +1642,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1670,11 +1670,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1698,7 +1698,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -1706,7 +1706,7 @@ local arena_board = { [7]={ ["board"]={ { - 35, + 9, 0 }, { @@ -1730,7 +1730,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1738,7 +1738,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1754,7 +1754,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1770,15 +1770,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1798,15 +1798,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1830,7 +1830,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1858,7 +1858,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1882,15 +1882,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1910,15 +1910,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -1934,7 +1934,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1950,7 +1950,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1958,7 +1958,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -1982,7 +1982,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -2022,7 +2022,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2030,7 +2030,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2038,7 +2038,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2218,7 +2218,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2226,7 +2226,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2234,7 +2234,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2334,7 +2334,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2342,7 +2342,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2350,7 +2350,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2358,7 +2358,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2366,7 +2366,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2374,7 +2374,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2382,7 +2382,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2442,7 +2442,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2450,7 +2450,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2458,7 +2458,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2466,7 +2466,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2474,7 +2474,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2482,7 +2482,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2490,7 +2490,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2558,7 +2558,7 @@ local arena_board = { [10]={ ["board"]={ { - 35, + 9, 0 }, { @@ -2582,7 +2582,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2614,7 +2614,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2622,15 +2622,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -2638,7 +2638,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2670,7 +2670,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2694,11 +2694,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -2722,7 +2722,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2754,7 +2754,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2762,15 +2762,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -2778,7 +2778,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2810,7 +2810,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -2834,7 +2834,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -5682,7 +5682,7 @@ local arena_board = { [21]={ ["board"]={ { - 35, + 9, 0 }, { @@ -5706,15 +5706,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -5722,7 +5718,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -5730,15 +5730,15 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -5762,39 +5762,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -5818,11 +5790,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -5846,11 +5818,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -5858,7 +5830,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -5866,7 +5838,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -5874,11 +5846,39 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, 0 }, { @@ -5902,15 +5902,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -5918,7 +5914,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -5926,15 +5926,15 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -5958,7 +5958,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -5966,7 +5966,7 @@ local arena_board = { [22]={ ["board"]={ { - 35, + 9, 0 }, { @@ -5990,7 +5990,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -5998,7 +5998,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6014,7 +6014,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6030,15 +6030,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -6058,15 +6058,39 @@ local arena_board = { 0 }, { - 3, + 9, 0 }, { - 3, + 9, 0 }, { - 3, + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -6094,7 +6118,7 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { @@ -6118,15 +6142,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 0, + 9, 0 }, { - 0, + 9, 0 }, { @@ -6146,39 +6170,15 @@ local arena_board = { 0 }, { - 3, + 9, 0 }, { - 3, + 9, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -6194,7 +6194,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6210,7 +6210,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6218,7 +6218,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6242,7 +6242,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -6282,7 +6282,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6290,7 +6290,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6298,7 +6298,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6478,7 +6478,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6486,7 +6486,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6494,7 +6494,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6590,11 +6590,11 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { @@ -6602,7 +6602,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6610,15 +6610,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -6626,7 +6618,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6634,7 +6626,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6642,7 +6634,15 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -6702,7 +6702,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6710,7 +6710,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6718,7 +6718,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6726,15 +6726,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -6742,7 +6734,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6750,11 +6742,19 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 0, + 0 + }, + { + 9, + 0 + }, + { + 0, 0 }, { @@ -6818,7 +6818,7 @@ local arena_board = { [25]={ ["board"]={ { - 35, + 9, 0 }, { @@ -6842,7 +6842,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6874,7 +6874,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6882,11 +6882,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 9, 0 }, { @@ -6894,11 +6898,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -6910,7 +6910,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -6918,7 +6918,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -6930,7 +6930,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6954,11 +6954,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -6982,7 +6982,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -6994,7 +6994,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -7002,7 +7002,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -7014,7 +7014,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -7022,11 +7022,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 9, 0 }, { @@ -7034,11 +7038,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -7070,7 +7070,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -7094,7 +7094,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -9942,7 +9942,7 @@ local arena_board = { [36]={ ["board"]={ { - 35, + 9, 0 }, { @@ -9966,15 +9966,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -9982,7 +9978,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -9990,15 +9990,15 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -10022,39 +10022,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -10078,11 +10050,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -10106,11 +10078,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -10118,7 +10090,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -10126,7 +10098,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -10134,11 +10106,39 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, 0 }, { @@ -10162,15 +10162,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -10178,7 +10174,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -10186,15 +10186,15 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -10218,7 +10218,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -10226,7 +10226,7 @@ local arena_board = { [37]={ ["board"]={ { - 35, + 9, 0 }, { @@ -10250,7 +10250,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10258,7 +10258,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10274,7 +10274,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10290,15 +10290,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -10318,15 +10318,39 @@ local arena_board = { 0 }, { - 3, + 9, 0 }, { - 3, + 9, 0 }, { - 3, + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -10354,7 +10378,7 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { @@ -10378,15 +10402,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 0, + 9, 0 }, { - 0, + 9, 0 }, { @@ -10406,39 +10430,15 @@ local arena_board = { 0 }, { - 3, + 9, 0 }, { - 3, + 9, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -10454,7 +10454,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10470,7 +10470,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10478,7 +10478,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10502,7 +10502,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -10542,7 +10542,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10550,7 +10550,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10558,7 +10558,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10738,7 +10738,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10746,7 +10746,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10754,7 +10754,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10850,11 +10850,11 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { @@ -10862,7 +10862,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10870,15 +10870,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -10886,7 +10878,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10894,7 +10886,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10902,7 +10894,15 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -10962,7 +10962,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10970,7 +10970,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10978,7 +10978,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -10986,15 +10986,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -11002,7 +10994,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -11010,11 +11002,19 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 0, + 0 + }, + { + 9, + 0 + }, + { + 0, 0 }, { @@ -11078,7 +11078,7 @@ local arena_board = { [40]={ ["board"]={ { - 35, + 9, 0 }, { @@ -11102,7 +11102,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -11134,7 +11134,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -11142,11 +11142,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 9, 0 }, { @@ -11154,11 +11158,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -11170,7 +11170,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -11178,7 +11178,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -11190,7 +11190,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -11214,11 +11214,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -11242,7 +11242,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -11254,7 +11254,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -11262,7 +11262,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -11274,7 +11274,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -11282,11 +11282,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 9, 0 }, { @@ -11294,11 +11298,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -11330,7 +11330,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -11354,7 +11354,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -14202,7 +14202,7 @@ local arena_board = { [51]={ ["board"]={ { - 35, + 9, 0 }, { @@ -14226,15 +14226,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -14242,7 +14238,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -14250,15 +14250,15 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -14282,39 +14282,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -14338,11 +14310,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -14366,11 +14338,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -14378,7 +14350,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -14386,7 +14358,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -14394,11 +14366,39 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, 0 }, { @@ -14422,15 +14422,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -14438,7 +14434,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 2, 0 }, { @@ -14446,15 +14446,15 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -14478,7 +14478,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -14486,7 +14486,7 @@ local arena_board = { [52]={ ["board"]={ { - 35, + 9, 0 }, { @@ -14510,7 +14510,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14518,7 +14518,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14534,7 +14534,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14550,15 +14550,15 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -14578,15 +14578,39 @@ local arena_board = { 0 }, { - 3, + 9, 0 }, { - 3, + 9, 0 }, { - 3, + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -14614,7 +14638,7 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { @@ -14638,15 +14662,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 0, + 9, 0 }, { - 0, + 9, 0 }, { @@ -14666,39 +14690,15 @@ local arena_board = { 0 }, { - 3, + 9, 0 }, { - 3, + 9, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -14714,7 +14714,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14730,7 +14730,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14738,7 +14738,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14762,7 +14762,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -14802,7 +14802,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14810,7 +14810,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14818,7 +14818,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -14998,7 +14998,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15006,7 +15006,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15014,7 +15014,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15110,11 +15110,11 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 9, 0 }, { @@ -15122,7 +15122,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15130,15 +15130,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -15146,7 +15138,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15154,7 +15146,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15162,7 +15154,15 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -15222,7 +15222,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15230,7 +15230,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15238,7 +15238,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15246,15 +15246,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -15262,7 +15254,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15270,11 +15262,19 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 0, + 0 + }, + { + 9, + 0 + }, + { + 0, 0 }, { @@ -15338,7 +15338,7 @@ local arena_board = { [55]={ ["board"]={ { - 35, + 9, 0 }, { @@ -15362,7 +15362,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15394,7 +15394,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15402,11 +15402,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 9, 0 }, { @@ -15414,11 +15418,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -15430,7 +15430,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -15438,7 +15438,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -15450,7 +15450,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15474,11 +15474,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -15502,7 +15502,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15514,7 +15514,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -15522,7 +15522,7 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { @@ -15534,7 +15534,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15542,11 +15542,15 @@ local arena_board = { 0 }, { - 0, + 9, 0 }, { - 35, + 9, + 0 + }, + { + 9, 0 }, { @@ -15554,11 +15558,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -15590,7 +15590,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -15614,7 +15614,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 } } @@ -18462,7 +18462,7 @@ local arena_board = { [66]={ ["board"]={ { - 35, + 9, 0 }, { @@ -18486,39 +18486,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -18530,7 +18502,7 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { @@ -18542,11 +18514,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -18554,7 +18526,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -18562,7 +18534,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -18570,11 +18542,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -18598,11 +18570,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, + 9, 0 }, { @@ -18626,95 +18598,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -18738,7 +18626,119 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 } } @@ -18746,79 +18746,7 @@ local arena_board = { [67]={ ["board"]={ { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -18842,7 +18770,107 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -18870,7 +18898,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -18893,12 +18921,84 @@ local arena_board = { 0, 0 }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, { 0, 0 }, { - 35, + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 9, 0 }, { @@ -18922,107 +19022,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, + 9, 0 } } @@ -19030,11 +19030,11 @@ local arena_board = { [68]={ ["board"]={ { - 35, + 2, 0 }, { - 35, + 3, 0 }, { @@ -19042,7 +19042,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -19050,15 +19050,19 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 35, + 2, 0 }, { - 35, + 2, + 0 + }, + { + 9, 0 }, { @@ -19066,7 +19070,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19074,7 +19078,19 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 }, { @@ -19082,15 +19098,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 3, 0 }, { @@ -19098,23 +19106,15 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 0, + 2, 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 2, 0 }, { @@ -19138,11 +19138,11 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 35, + 2, 0 }, { @@ -19166,11 +19166,11 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 35, + 2, 0 }, { @@ -19194,11 +19194,11 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 35, + 2, 0 }, { @@ -19222,15 +19222,15 @@ local arena_board = { 0 }, { - 35, + 2, 0 }, { - 35, + 2, 0 }, { - 35, + 3, 0 }, { @@ -19238,7 +19238,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -19246,15 +19246,19 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 35, + 2, 0 }, { - 35, + 2, + 0 + }, + { + 9, 0 }, { @@ -19262,7 +19266,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19270,7 +19274,19 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, 0 }, { @@ -19278,15 +19294,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, + 3, 0 }, { @@ -19294,19 +19302,11 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, + 2, 0 } } @@ -19314,7 +19314,7 @@ local arena_board = { [69]={ ["board"]={ { - 35, + 0, 0 }, { @@ -19338,11 +19338,11 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 3, 0 }, { @@ -19350,7 +19350,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -19358,7 +19358,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -19366,11 +19366,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, + 3, 0 }, { @@ -19378,11 +19374,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -19390,15 +19382,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -19406,7 +19390,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19414,7 +19398,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19422,7 +19406,23 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 }, { @@ -19482,7 +19482,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19490,7 +19490,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19498,7 +19498,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19506,11 +19506,7 @@ local arena_board = { 0 }, { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -19518,11 +19514,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -19530,15 +19522,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, + 9, 0 }, { @@ -19546,7 +19530,7 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { @@ -19554,7 +19538,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -19562,11 +19546,23 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 35, + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -19590,7 +19586,11 @@ local arena_board = { 0 }, { - 35, + 0, + 0 + }, + { + 0, 0 } } @@ -19598,51 +19598,7 @@ local arena_board = { [70]={ ["board"]={ { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -19666,7 +19622,11 @@ local arena_board = { 0 }, { - 35, + 9, + 0 + }, + { + 3, 0 }, { @@ -19674,15 +19634,7 @@ local arena_board = { 0 }, { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, + 3, 0 }, { @@ -19690,7 +19642,7 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { @@ -19698,19 +19650,39 @@ local arena_board = { 0 }, { - 35, + 3, + 0 + }, + { + 9, 0 }, { 0, 0 }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, { 0, 0 }, { - 35, + 9, + 0 + }, + { + 3, 0 }, { @@ -19734,11 +19706,11 @@ local arena_board = { 0 }, { - 35, + 3, 0 }, { - 35, + 9, 0 }, { @@ -19762,27 +19734,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, + 9, 0 }, { @@ -19806,51 +19762,11 @@ local arena_board = { 0 }, { - 35, + 9, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, + 3, 0 }, { @@ -19870,11 +19786,95 @@ local arena_board = { 0 }, { - 35, + 0, 0 }, { - 35, + 3, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, 0 } } diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 0ea81de0..f56993f1 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -496,9 +496,15 @@ local const = { ["num_for_nothing"]="Vw==" } } + }, + ["summon_skip_1"]={ + ["value"]=10 + }, + ["summon_skip_2"]={ + ["value"]=100 } } local config = { -data=const,count=81 +data=const,count=83 } return config \ No newline at end of file diff --git a/lua/app/config/grid_type.lua b/lua/app/config/grid_type.lua index f0a2479a..ec9c3ab6 100644 --- a/lua/app/config/grid_type.lua +++ b/lua/app/config/grid_type.lua @@ -140,6 +140,19 @@ local grid_type = { ["cant_upset"]=1, ["break_sfx"]="sfx_piece_za_b07" }, + [13]={ + ["icon"]="battle_obstacle_stone_3", + ["next_type"]=8, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["cant_upset"]=1, + ["break_sfx"]="sfx_piece_za_b03" + }, [14]={ ["icon"]="battle_obstacle_shenxiang", ["next_type"]=0, @@ -211,9 +224,131 @@ local grid_type = { ["cant_link"]=1, ["element_invalid"]=1, ["cant_upset"]=1 + }, + [18]={ + ["icon"]="battle_obstacle_rocket_up", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["cant_upset"]=1, + ["effect"]=1, + ["effect_sfx"]="sfx_piece_huojian_b01", + ["sfx_flow"]=1, + ["effect_params"]={ + 1 + }, + ["effect_trigger"]=2 + }, + [19]={ + ["icon"]="battle_obstacle_rocket_down", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["cant_upset"]=1, + ["effect"]=1, + ["effect_sfx"]="sfx_piece_huojian_b01", + ["sfx_flow"]=1, + ["effect_params"]={ + 2 + }, + ["effect_trigger"]=2 + }, + [20]={ + ["icon"]="battle_obstacle_rocket_left", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["cant_upset"]=1, + ["effect"]=1, + ["effect_sfx"]="sfx_piece_huojian_b01", + ["sfx_flow"]=1, + ["effect_params"]={ + 3 + }, + ["effect_trigger"]=2 + }, + [21]={ + ["icon"]="battle_obstacle_rocket_right", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["cant_upset"]=1, + ["effect"]=1, + ["effect_sfx"]="sfx_piece_huojian_b01", + ["sfx_flow"]=1, + ["effect_params"]={ + 4 + }, + ["effect_trigger"]=2 + }, + [22]={ + ["icon"]="battle_obstacle_jelly", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["break_stay_element"]=1, + ["can_fall"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["cant_upset"]=1, + ["break_sfx"]="sfx_piece_guodong_b01", + ["effect"]=5, + ["effect_sfx"]="sfx_piece_guodong_b02", + ["effect_trigger"]=1 + }, + [23]={ + ["icon"]="battle_obstacle_leaf", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["break_stay_element"]=1, + ["can_fall"]=1, + ["cant_link"]=1, + ["cant_upset"]=1, + ["break_sfx"]="sfx_piece_kucao_b01" + }, + [24]={ + ["icon"]="battle_obstacle_firesnake", + ["next_type"]=0, + ["spine_name"]="ui_battle_obstacle_firesnake", + ["zoom"]=1.0, + ["spine_idle"]="idle", + ["can_fall"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["cant_upset"]=1, + ["break_sfx"]="sfx_piece_rongyan_b01", + ["effect"]=6, + ["effect_trigger"]=1 } } local config = { -data=grid_type,count=17 +data=grid_type,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 816cb49f..b90d9f09 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -836,6 +836,12 @@ local skill = { ["ratio"]=10000, ["round"]=0 }, + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, { ["type"]="hurt_red", ["num"]=10000, @@ -857,7 +863,8 @@ local skill = { 1, 2, 3, - 4 + 4, + 5 }, ["skill_position"]={ 2, @@ -871,6 +878,7 @@ local skill = { "suffer01", "suffer02", "suffer01", + "suffer02", "suffer03" }, ["fx_self"]=300043, @@ -915,6 +923,12 @@ local skill = { ["ratio"]=10000, ["round"]=0 }, + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, { ["type"]="hurt_red", ["num"]=10000, @@ -936,7 +950,8 @@ local skill = { 1, 2, 3, - 4 + 4, + 5 }, ["skill_position"]={ 2, @@ -950,6 +965,7 @@ local skill = { "suffer01", "suffer02", "suffer01", + "suffer02", "suffer03" }, ["fx_self"]=300043, @@ -994,6 +1010,12 @@ local skill = { ["ratio"]=10000, ["round"]=0 }, + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, { ["type"]="hurt_red", ["num"]=10000, @@ -1015,7 +1037,8 @@ local skill = { 1, 2, 3, - 4 + 4, + 5 }, ["skill_position"]={ 2, @@ -1029,6 +1052,7 @@ local skill = { "suffer01", "suffer02", "suffer01", + "suffer02", "suffer03" }, ["fx_self"]=300043, @@ -1073,6 +1097,12 @@ local skill = { ["ratio"]=10000, ["round"]=0 }, + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, { ["type"]="hurt_red", ["num"]=10000, @@ -1094,7 +1124,8 @@ local skill = { 1, 2, 3, - 4 + 4, + 5 }, ["skill_position"]={ 2, @@ -1108,6 +1139,7 @@ local skill = { "suffer01", "suffer02", "suffer01", + "suffer02", "suffer03" }, ["fx_self"]=300043, @@ -1479,6 +1511,7 @@ local skill = { ["shake_time"]=150, ["shake_type"]=6, ["sound"]=1500205, + ["sound_delay"]=-0.1, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1597,6 +1630,7 @@ local skill = { ["shake_time"]=150, ["shake_type"]=6, ["sound"]=1500205, + ["sound_delay"]=-0.1, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1673,6 +1707,7 @@ local skill = { ["shake_time"]=150, ["shake_type"]=6, ["sound"]=1500205, + ["sound_delay"]=-0.1, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1749,6 +1784,7 @@ local skill = { ["shake_time"]=150, ["shake_type"]=6, ["sound"]=1500205, + ["sound_delay"]=-0.1, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1975,7 +2011,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=1600101, + ["sound"]=3500201, ["name_act"]="attack02", ["name_hit"]={ "suffer01" @@ -2002,7 +2038,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=1600102, + ["sound"]=3500201, ["name_act"]="attack02", ["name_hit"]={ "suffer01" @@ -2029,7 +2065,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=1600103, + ["sound"]=3500201, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -2056,7 +2092,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=1600104, + ["sound"]=3500201, ["name_act"]="attack04", ["name_hit"]={ "suffer01" @@ -2128,7 +2164,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, - ["sound"]=1600105, + ["sound"]=3500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -2237,7 +2273,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, - ["sound"]=1600105, + ["sound"]=3500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -2624,6 +2660,7 @@ local skill = { ["shake_time"]=250, ["shake_type"]=6, ["sound"]=2300105, + ["sound_delay"]=0.13, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -4091,7 +4128,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=2600101, + ["sound"]=2500201, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -4118,7 +4155,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=2600102, + ["sound"]=2500202, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -4145,7 +4182,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=2600103, + ["sound"]=2500203, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -4172,7 +4209,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=2600104, + ["sound"]=2500204, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -4221,7 +4258,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, - ["sound"]=2600105, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4278,7 +4315,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, - ["sound"]=2600105, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4344,7 +4381,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, - ["sound"]=2600105, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4410,7 +4447,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, - ["sound"]=2600105, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -11120,6 +11157,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20007001, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -11144,6 +11182,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20007001, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -11168,6 +11207,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20007001, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -11192,6 +11232,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20007001, ["name_act"]="attack04", ["name_hit"]={ "suffer01" @@ -11241,6 +11282,7 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, + ["sound"]=20007005, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -11272,6 +11314,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20008001, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -11296,6 +11339,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20008001, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -11320,6 +11364,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20008001, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -11369,6 +11414,7 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=20008004, ["name_act"]="skill01", ["name_hit"]={ "suffer01", diff --git a/lua/app/config/summon.lua b/lua/app/config/summon.lua index 774b5f5d..46897b21 100644 --- a/lua/app/config/summon.lua +++ b/lua/app/config/summon.lua @@ -159,6 +159,40 @@ local summon = { ["weight"]=200 } }, + ["guarantee50_summon"]={ + { + ["id"]=15002, + ["weight"]=200 + }, + { + ["id"]=25001, + ["weight"]=200 + }, + { + ["id"]=25002, + ["weight"]=200 + }, + { + ["id"]=35001, + ["weight"]=200 + }, + { + ["id"]=45001, + ["weight"]=200 + }, + { + ["id"]=45002, + ["weight"]=200 + }, + { + ["id"]=55001, + ["weight"]=200 + }, + { + ["id"]=55002, + ["weight"]=200 + } + }, ["show"]={ { 3,