From 72ced428a5f3b82c777b4a59ce0e9d70d163df57 Mon Sep 17 00:00:00 2001 From: Jeme Date: Thu, 7 May 2020 16:25:08 +0300 Subject: [PATCH] map balances --- Eity/maps/Cold Green Eyes/map.lua | 16 +- Eity/maps/FREEDOM DiVE/map.lua | 4 - Eity/maps/Paradigm Shift/map.lua | 91 ++- Eity/maps/Stella-rium/map.lua | 10 +- Eity/maps/The Pressure/map.lua | 12 - Eity/maps/Virtual Paradise/map.lua | 2 +- Eity/maps/Yumeiro Parade/map.lua | 1169 ++++++++++++++-------------- Eity/states/maingame/maingame.lua | 2 +- Eity/states/mainmenu/mainmenu.lua | 5 +- Eity/states/mainmenu/options.lua | 2 - 10 files changed, 665 insertions(+), 648 deletions(-) diff --git a/Eity/maps/Cold Green Eyes/map.lua b/Eity/maps/Cold Green Eyes/map.lua index 28b2d74..61f31fc 100644 --- a/Eity/maps/Cold Green Eyes/map.lua +++ b/Eity/maps/Cold Green Eyes/map.lua @@ -27,7 +27,21 @@ end function map:getNotes() -- (0 = none, 1 = normal, 2 = reverse, 3 = bad), (448 = up, 64 = down, 192 = left, 320 = right), speed, slider length, milliseconds to spawn return { - {1, 256, 600, 0, 16660}, + {3, 252, 600, 0, 4925}, + {3, 293, 600, 0, 6925}, + {3, 32, 600, 0, 8925}, + {3, 321, 600, 0, 10425}, + {3, 184, 600, 0, 11925}, + {3, 424, 600, 0, 12325}, + {3, 92, 600, 0, 14325}, + {3, 188, 600, 0, 15925}, + {3, 256, 600, 0, 16660}, + {3, 20, 600, 0, 17660}, + {3, 213, 600, 0, 18660}, + {3, 45, 600, 0, 19660}, + {3, 256, 600, 0, 20660}, + {3, 13, 600, 0, 21925}, + {3, 144, 600, 0, 22097}, {1, 52, 600, 0, 22177}, {1, 92, 600, 0, 22695}, {1, 240, 600, 0, 23212}, diff --git a/Eity/maps/FREEDOM DiVE/map.lua b/Eity/maps/FREEDOM DiVE/map.lua index fb9fd99..93f1b06 100644 --- a/Eity/maps/FREEDOM DiVE/map.lua +++ b/Eity/maps/FREEDOM DiVE/map.lua @@ -676,14 +676,10 @@ function map:getNotes() {3, 192, 600, 0, 173044}, {1, 64, 600, 0, 173314}, {1, 192, 600, 0, 174394}, - {3, 192, 600, 0, 175407}, - {1, 320, 600, 0, 175474}, - {1, 320, 600, 0, 175609}, {3, 64, 600, 0, 175677}, {1, 448, 600, 0, 176284}, {3, 320, 600, 0, 177027}, {1, 64, 600, 0, 177094}, - {1, 192, 600, 0, 177499}, {1, 448, 600, 0, 177904}, {3, 448, 600, 0, 177972}, {1, 320, 600, 0, 178039}, diff --git a/Eity/maps/Paradigm Shift/map.lua b/Eity/maps/Paradigm Shift/map.lua index ddccbe8..dd05c7f 100644 --- a/Eity/maps/Paradigm Shift/map.lua +++ b/Eity/maps/Paradigm Shift/map.lua @@ -27,6 +27,12 @@ end function map:getNotes() -- (0 = none, 1 = normal, 2 = reverse, 3 = bad), (448 = up, 64 = down, 192 = left, 320 = right), speed, slider length, milliseconds to spawn return { + {1, 320, 700, 0, 3177}, + {1, 448, 700, 0, 5977}, + {1, 64, 700, 0, 9177}, + {1, 320, 700, 0, 12877}, + {1, 448, 700, 0, 14177}, + {1, 192, 700, 0, 17177}, {1, 448, 700, 0, 19177}, {1, 64, 700, 0, 19777}, {1, 192, 700, 0, 20077}, @@ -38,7 +44,7 @@ function map:getNotes() {1, 320, 700, 0, 23077}, {1, 192, 700, 0, 23377}, {1, 448, 700, 0, 23827}, - {1, 320, 700, 0, 23977}, + {1, 448, 700, 0, 23977}, {1, 192, 700, 0, 24577}, {1, 448, 700, 0, 24877}, {1, 192, 700, 0, 25477}, @@ -54,40 +60,44 @@ function map:getNotes() {1, 64, 700, 0, 31627}, {1, 64, 700, 0, 31777}, {1, 320, 700, 0, 32377}, - {1, 192, 700, 0, 32827}, + {1, 64, 700, 0, 32827}, {1, 448, 700, 0, 32977}, {1, 192, 700, 0, 33577}, {1, 448, 700, 0, 34027}, {1, 64, 700, 0, 34477}, - {1, 192, 700, 0, 34777}, + {1, 64, 700, 0, 34777}, {1, 320, 700, 0, 35227}, {1, 448, 700, 0, 35377}, {1, 192, 700, 0, 35977}, {1, 448, 700, 0, 36427}, {1, 320, 700, 0, 36577}, + {3, 448, 700, 0, 36677}, {1, 320, 700, 0, 37177}, {1, 192, 700, 0, 37627}, {1, 64, 700, 0, 37777}, {1, 320, 700, 0, 38377}, {1, 192, 700, 0, 38827}, + {3, 448, 700, 0, 38927}, {1, 320, 700, 0, 39277}, {1, 192, 700, 0, 39577}, {1, 64, 700, 0, 40027}, + {3, 192, 700, 0, 40127}, {1, 448, 700, 0, 40177}, {1, 192, 700, 0, 40777}, {1, 320, 700, 0, 41227}, + {3, 64, 700, 0, 41327}, {1, 192, 700, 0, 41377}, {1, 64, 700, 0, 41977}, - {1, 320, 700, 0, 42427}, {1, 448, 700, 0, 42577}, {1, 64, 700, 0, 43177}, {1, 64, 700, 0, 43627}, - {1, 320, 700, 0, 43777}, + {3, 448, 700, 0, 43727}, {1, 64, 700, 0, 44377}, {1, 64, 700, 0, 44977}, {1, 192, 700, 0, 45427}, {1, 448, 700, 0, 45577}, {1, 192, 700, 0, 46177}, + {3, 64, 700, 0, 46277}, {1, 320, 700, 0, 46477}, {1, 448, 700, 0, 46777}, {1, 64, 700, 0, 47977}, @@ -96,11 +106,13 @@ function map:getNotes() {1, 64, 700, 0, 49177}, {1, 192, 700, 0, 50077}, {1, 448, 700, 0, 50377}, + {3, 192, 700, 0, 50477}, {1, 64, 700, 0, 50827}, {1, 320, 700, 0, 51277}, {1, 192, 700, 0, 51577}, {1, 320, 700, 0, 52027}, {1, 64, 700, 0, 52177}, + {3, 448, 700, 0, 52277}, {1, 192, 700, 0, 52777}, {1, 320, 700, 0, 53227}, {1, 64, 700, 0, 53677}, @@ -111,11 +123,13 @@ function map:getNotes() {1, 192, 700, 0, 55627}, {1, 64, 700, 0, 55777}, {1, 320, 700, 0, 56377}, + {3, 192, 700, 0, 56477}, {1, 320, 700, 0, 57277}, {1, 320, 700, 0, 57577}, {1, 64, 700, 0, 58027}, {1, 320, 700, 0, 58477}, {1, 192, 700, 0, 58777}, + {3, 320, 700, 0, 58877}, {1, 448, 700, 0, 59077}, {1, 64, 700, 0, 59377}, {1, 64, 700, 0, 59977}, @@ -126,17 +140,20 @@ function map:getNotes() {1, 448, 700, 0, 62077}, {1, 64, 700, 0, 62377}, {1, 320, 700, 0, 62827}, + {3, 192, 700, 0, 62927}, {1, 64, 700, 0, 63277}, {1, 448, 700, 0, 63577}, {1, 320, 700, 0, 64777}, {1, 192, 700, 0, 65377}, {1, 192, 700, 0, 65977}, {1, 192, 700, 0, 67177}, + {3, 320, 700, 0, 67277}, {1, 448, 700, 0, 68377}, {1, 320, 700, 0, 68827}, {1, 192, 700, 0, 68977}, {1, 64, 700, 0, 69427}, {1, 320, 700, 0, 69877}, + {3, 448, 700, 0, 69977}, {1, 64, 700, 0, 70177}, {1, 64, 700, 0, 70777}, {1, 448, 700, 0, 71677}, @@ -146,15 +163,19 @@ function map:getNotes() {1, 192, 700, 0, 73177}, {1, 320, 700, 0, 73627}, {1, 192, 700, 0, 73777}, + {3, 448, 700, 0, 73877}, {1, 320, 700, 0, 74227}, {1, 64, 700, 0, 74677}, {1, 192, 700, 0, 74977}, {1, 448, 700, 0, 75577}, + {3, 64, 700, 0, 75677}, {1, 320, 700, 0, 76477}, + {3, 448, 700, 0, 76577}, {1, 64, 700, 0, 76627}, {1, 192, 700, 0, 77077}, {1, 320, 700, 0, 77377}, {1, 192, 700, 0, 77977}, + {3, 64, 700, 0, 78097}, {1, 448, 700, 0, 78427}, {1, 320, 700, 0, 78577}, {1, 192, 700, 0, 79027}, @@ -165,24 +186,29 @@ function map:getNotes() {1, 64, 700, 0, 81427}, {1, 192, 700, 0, 81877}, {1, 320, 700, 0, 82177}, - {1, 64, 700, 0, 82777}, + {3, 64, 700, 0, 82277}, + {3, 64, 700, 0, 82877}, {1, 192, 700, 0, 83227}, {1, 192, 700, 0, 83377}, {1, 64, 700, 0, 83827}, {1, 320, 700, 0, 84277}, {1, 448, 700, 0, 84577}, + {3, 320, 700, 0, 84677}, {1, 448, 700, 0, 85177}, {1, 64, 700, 0, 86077}, {1, 192, 700, 0, 86227}, {1, 448, 700, 0, 86677}, + {3, 320, 700, 0, 86777}, {1, 192, 700, 0, 86977}, {1, 192, 700, 0, 87577}, {1, 448, 700, 0, 97177}, {1, 320, 700, 0, 98977}, {1, 64, 700, 0, 99577}, + {3, 320, 700, 0, 99677}, {1, 192, 700, 0, 100027}, {1, 64, 700, 0, 100477}, {1, 192, 700, 0, 100777}, + {3, 64, 700, 0, 100877}, {1, 320, 700, 0, 101227}, {1, 64, 700, 0, 101677}, {1, 448, 700, 0, 101977}, @@ -193,7 +219,9 @@ function map:getNotes() {1, 192, 700, 0, 103927}, {1, 192, 700, 0, 104077}, {1, 64, 700, 0, 104377}, + {3, 192, 700, 0, 104477}, {1, 320, 700, 0, 104827}, + {3, 64, 700, 0, 104927}, {1, 448, 700, 0, 105277}, {1, 448, 700, 0, 105577}, {1, 320, 700, 0, 106027}, @@ -203,10 +231,12 @@ function map:getNotes() {1, 192, 700, 0, 107227}, {1, 448, 700, 0, 107677}, {1, 64, 700, 0, 109177}, + {3, 192, 700, 0, 109277}, {1, 320, 700, 0, 109627}, {1, 448, 700, 0, 110077}, {1, 320, 700, 0, 110377}, {1, 64, 700, 0, 110827}, + {3, 448, 700, 0, 110927}, {1, 64, 700, 0, 111277}, {1, 64, 700, 0, 111577}, {1, 448, 700, 0, 111877}, @@ -219,6 +249,7 @@ function map:getNotes() {1, 64, 700, 0, 113977}, {1, 64, 700, 0, 114427}, {1, 448, 700, 0, 114877}, + {3, 320, 700, 0, 114977}, {1, 192, 700, 0, 115177}, {1, 320, 700, 0, 115627}, {1, 192, 700, 0, 116077}, @@ -227,14 +258,13 @@ function map:getNotes() {1, 320, 700, 0, 117277}, {1, 64, 700, 0, 117577}, {1, 192, 700, 0, 117727}, + {3, 64, 700, 0, 117827}, {1, 320, 700, 0, 118477}, {1, 192, 700, 0, 118777}, {1, 192, 700, 0, 119377}, - {1, 64, 700, 0, 119827}, - {1, 448, 700, 0, 119977}, + {3, 64, 700, 0, 119927}, {1, 320, 700, 0, 120577}, - {1, 64, 700, 0, 120877}, - {1, 448, 700, 0, 121177}, + {3, 192, 700, 0, 121177}, {1, 320, 700, 0, 122377}, {1, 320, 700, 0, 123127}, {1, 320, 700, 0, 123577}, @@ -246,6 +276,7 @@ function map:getNotes() {1, 64, 700, 0, 125827}, {1, 448, 700, 0, 125977}, {1, 192, 700, 0, 127177}, + {3, 320, 700, 0, 127277}, {1, 64, 700, 0, 127777}, {1, 448, 700, 0, 128077}, {1, 192, 700, 0, 128377}, @@ -254,28 +285,32 @@ function map:getNotes() {1, 320, 700, 0, 129577}, {1, 64, 700, 0, 130177}, {1, 448, 700, 0, 130477}, + {3, 320, 700, 0, 130577}, {1, 64, 700, 0, 130777}, {1, 192, 700, 0, 131977}, {1, 192, 700, 0, 132877}, {1, 192, 700, 0, 133177}, + {3, 448, 700, 0, 133277}, {1, 320, 700, 0, 133777}, {1, 64, 700, 0, 133927}, {1, 192, 700, 0, 134227}, {1, 192, 700, 0, 134377}, {1, 64, 700, 0, 134977}, - {1, 320, 700, 0, 135577}, + {1, 192, 700, 0, 135577}, + {3, 64, 700, 0, 135677}, {1, 448, 700, 0, 136027}, - {1, 448, 700, 0, 136177}, {1, 64, 700, 0, 136777}, {1, 192, 700, 0, 137227}, {1, 320, 700, 0, 137677}, {1, 448, 700, 0, 137977}, {1, 64, 700, 0, 147577}, {1, 320, 700, 0, 148477}, + {3, 64, 700, 0, 148577}, {1, 192, 700, 0, 148777}, {1, 448, 700, 0, 149677}, {1, 192, 700, 0, 149977}, {1, 192, 700, 0, 150877}, + {3, 64, 700, 0, 150977}, {1, 320, 700, 0, 151177}, {1, 64, 700, 0, 151777}, {1, 448, 700, 0, 152227}, @@ -285,60 +320,70 @@ function map:getNotes() {1, 64, 700, 0, 154177}, {1, 448, 700, 0, 154477}, {1, 320, 700, 0, 154777}, + {3, 448, 700, 0, 154977}, {1, 192, 700, 0, 155377}, {1, 448, 700, 0, 155977}, + {3, 320, 700, 0, 156097}, {1, 192, 700, 0, 157177}, {1, 448, 700, 0, 157627}, - {1, 64, 700, 0, 157777}, + {3, 64, 700, 0, 157777}, {1, 320, 700, 0, 158377}, {1, 192, 700, 0, 158827}, {1, 64, 700, 0, 159277}, {1, 192, 700, 0, 159577}, {1, 64, 700, 0, 160027}, + {3, 192, 700, 0, 160127}, {1, 448, 700, 0, 160177}, {1, 320, 700, 0, 160477}, {1, 64, 700, 0, 160777}, + {3, 192, 700, 0, 160877}, {1, 448, 700, 0, 160927}, {1, 192, 700, 0, 161677}, {1, 64, 700, 0, 161977}, {1, 320, 700, 0, 162427}, {1, 448, 700, 0, 162577}, {1, 64, 700, 0, 163177}, + {3, 320, 700, 0, 163277}, {1, 192, 700, 0, 163627}, {1, 320, 700, 0, 164077}, {1, 64, 700, 0, 164377}, {1, 192, 700, 0, 164677}, + {3, 320, 700, 0, 164777}, {1, 448, 700, 0, 164977}, {1, 192, 700, 0, 165277}, - {1, 320, 700, 0, 165577}, + {3, 320, 700, 0, 165577}, {1, 64, 700, 0, 165727}, {1, 192, 700, 0, 166327}, {1, 448, 700, 0, 166777}, {1, 192, 700, 0, 167227}, - {1, 320, 700, 0, 167677}, + {3, 320, 700, 0, 167677}, {1, 192, 700, 0, 167977}, + {3, 448, 700, 0, 167997}, {1, 64, 700, 0, 168427}, {1, 320, 700, 0, 168877}, + {3, 448, 700, 0, 168977}, {1, 192, 700, 0, 169177}, {1, 64, 700, 0, 169477}, {1, 320, 700, 0, 169627}, + {3, 64, 700, 0, 169727}, {1, 448, 700, 0, 170077}, {1, 320, 700, 0, 170377}, - {1, 192, 700, 0, 170677}, + {3, 192, 700, 0, 170677}, {1, 64, 700, 0, 170827}, {1, 448, 700, 0, 171277}, {1, 448, 700, 0, 171577}, + {3, 320, 700, 0, 171677}, {1, 192, 700, 0, 172027}, {1, 64, 700, 0, 172477}, - {1, 320, 700, 0, 172777}, + {3, 320, 700, 0, 172777}, {1, 448, 700, 0, 173227}, - {1, 192, 700, 0, 173377}, + {1, 192, 700, 0, 173497}, {1, 320, 700, 0, 173677}, - {1, 192, 700, 0, 173977}, + {3, 192, 700, 0, 173977}, {1, 448, 700, 0, 174277}, - {1, 320, 700, 0, 174577}, - {1, 448, 700, 0, 175027}, + {1, 64, 700, 0, 175027}, {1, 192, 700, 0, 176377}, + {3, 320, 700, 0, 176497}, {1, 192, 700, 0, 176827}, {1, 448, 700, 0, 176977}, {1, 64, 700, 0, 177577}, @@ -347,6 +392,7 @@ function map:getNotes() {1, 64, 700, 0, 178777}, {1, 64, 700, 0, 179227}, {1, 448, 700, 0, 179377}, + {3, 320, 700, 0, 179477}, {1, 448, 700, 0, 179977}, {1, 64, 700, 0, 180427}, {1, 448, 700, 0, 180877}, @@ -357,6 +403,7 @@ function map:getNotes() {1, 448, 700, 0, 182827}, {1, 64, 700, 0, 182977}, {1, 192, 700, 0, 183577}, + {3, 64, 700, 0, 183699}, {1, 448, 700, 0, 184027}, {1, 448, 700, 0, 184177}, {1, 448, 700, 0, 184777}, @@ -367,6 +414,7 @@ function map:getNotes() {1, 448, 700, 0, 186577}, {1, 448, 700, 0, 187177}, {1, 448, 700, 0, 187627}, + {3, 64, 700, 0, 187727}, {1, 192, 700, 0, 187777}, {1, 448, 700, 0, 188377}, {1, 448, 700, 0, 188827}, @@ -376,6 +424,7 @@ function map:getNotes() {1, 64, 700, 0, 190477}, {1, 448, 700, 0, 190777}, {1, 64, 700, 0, 191227}, + {3, 320, 700, 0, 191327}, {1, 192, 700, 0, 191377}, {1, 192, 700, 0, 191977}, {1, 448, 700, 0, 192427}, diff --git a/Eity/maps/Stella-rium/map.lua b/Eity/maps/Stella-rium/map.lua index 154aa46..fdc6792 100644 --- a/Eity/maps/Stella-rium/map.lua +++ b/Eity/maps/Stella-rium/map.lua @@ -105,7 +105,6 @@ function map:getNotes() {1, 64, 650, 0, 28073}, {1, 448, 650, 0, 28582}, {1, 320, 650, 0, 29090}, - {1, 320, 650, 0, 29260}, {1, 64, 650, 0, 29768}, {1, 64, 650, 0, 30107}, {1, 448, 650, 0, 30446}, @@ -114,25 +113,20 @@ function map:getNotes() {1, 64, 650, 0, 31802}, {1, 64, 650, 0, 31971}, {1, 320, 650, 0, 32480}, - {1, 320, 650, 0, 32819}, {1, 448, 650, 0, 33158}, {1, 64, 650, 0, 33497}, {1, 448, 650, 0, 34005}, {1, 448, 650, 0, 34514}, {1, 64, 650, 0, 34853}, {1, 192, 650, 0, 35192}, - {1, 192, 650, 0, 35361}, {1, 64, 650, 0, 35870}, {1, 192, 650, 0, 36039}, {1, 320, 650, 0, 36548}, {1, 320, 650, 0, 36717}, {1, 448, 650, 0, 36887}, {1, 448, 650, 0, 37226}, - {1, 192, 650, 0, 37395}, {1, 320, 650, 0, 37565}, - {1, 448, 650, 0, 37904}, {1, 64, 650, 0, 38073}, - {1, 320, 650, 0, 38158}, {1, 448, 650, 0, 38243}, {1, 448, 650, 0, 38751}, {1, 192, 650, 0, 38921}, @@ -207,7 +201,6 @@ function map:getNotes() {1, 64, 650, 0, 67226}, {1, 448, 650, 0, 67734}, {1, 192, 650, 0, 67904}, - {1, 192, 650, 0, 68073}, {1, 64, 650, 0, 68243}, {1, 448, 650, 0, 68412}, {1, 320, 650, 0, 68751}, @@ -215,7 +208,7 @@ function map:getNotes() {1, 448, 650, 0, 69429}, {1, 64, 650, 0, 69768}, {1, 64, 650, 0, 69938}, - {1, 448, 650, 0, 70107}, + {1, 64, 650, 0, 70107}, {1, 64, 650, 0, 70446}, {1, 448, 650, 0, 70955}, {1, 448, 650, 0, 71124}, @@ -232,7 +225,6 @@ function map:getNotes() {1, 192, 650, 0, 75022}, {1, 192, 650, 0, 75192}, {1, 448, 650, 0, 75700}, - {1, 320, 650, 0, 75870}, {1, 448, 650, 0, 76209}, {1, 64, 650, 0, 76548}, {1, 448, 650, 0, 76887}, diff --git a/Eity/maps/The Pressure/map.lua b/Eity/maps/The Pressure/map.lua index 674d91f..413852e 100644 --- a/Eity/maps/The Pressure/map.lua +++ b/Eity/maps/The Pressure/map.lua @@ -178,18 +178,15 @@ function map:getNotes() {1, 504, 550, 0, 48497}, {1, 472, 550, 0, 48585}, {1, 415, 550, 0, 48673}, - {1, 366, 550, 0, 48762}, {1, 351, 550, 0, 48851}, {1, 395, 550, 0, 49116}, {1, 64, 550, 0, 49557}, - {1, 268, 550, 0, 49733}, {1, 88, 550, 0, 49910}, {1, 292, 550, 0, 50086}, {1, 180, 550, 0, 50263}, {1, 444, 550, 0, 50616}, {1, 447, 550, 0, 50968}, {1, 343, 550, 0, 51145}, - {1, 341, 550, 0, 51321}, {1, 448, 550, 0, 51498}, {1, 289, 550, 0, 51674}, {1, 500, 550, 0, 51851}, @@ -219,11 +216,8 @@ function map:getNotes() {1, 316, 550, 0, 58733}, {1, 12, 550, 0, 59263}, {1, 296, 550, 0, 59439}, - {1, 108, 550, 0, 59616}, {1, 252, 550, 0, 59792}, - {1, 64, 550, 0, 59969}, {1, 212, 550, 0, 60145}, - {1, 262, 550, 0, 60233}, {1, 364, 550, 0, 60409}, {1, 364, 550, 0, 60851}, {1, 143, 550, 0, 61204}, @@ -249,26 +243,20 @@ function map:getNotes() {1, 60, 550, 0, 66498}, {1, 216, 550, 0, 66851}, {1, 244, 550, 0, 67027}, - {1, 352, 550, 0, 67204}, {1, 380, 550, 0, 67380}, {1, 480, 550, 0, 67557}, - {1, 508, 550, 0, 67733}, {1, 272, 550, 0, 67910}, {1, 212, 550, 0, 68439}, - {1, 292, 550, 0, 68616}, {1, 144, 550, 0, 68968}, {1, 386, 550, 0, 69321}, {1, 492, 550, 0, 69851}, {1, 320, 550, 0, 70027}, - {1, 488, 550, 0, 70204}, {1, 320, 550, 0, 70380}, {1, 48, 550, 0, 70733}, {1, 201, 550, 0, 70998}, {1, 251, 550, 0, 71086}, {1, 380, 550, 0, 71263}, - {1, 335, 550, 0, 71351}, {1, 288, 550, 0, 71439}, - {1, 266, 550, 0, 71527}, {1, 284, 550, 0, 71615}, {1, 329, 550, 0, 71704}, {1, 375, 550, 0, 71792}, diff --git a/Eity/maps/Virtual Paradise/map.lua b/Eity/maps/Virtual Paradise/map.lua index c46a8f7..616697b 100644 --- a/Eity/maps/Virtual Paradise/map.lua +++ b/Eity/maps/Virtual Paradise/map.lua @@ -28,7 +28,7 @@ function map:getNotes() -- (0 = none, 1 = normal, 2 = reverse, 3 = bad), (448 = up, 64 = down, 192 = left, 320 = right), speed, slider length, milliseconds to spawn return { {1, 323, 420, 420, 2925}, - {1, 36, 420, 420, 8925}, + {1, 36, 420, 420, 8825}, {1, 192, 420, 420, 11925}, {1, 79, 420, 420, 15925}, {1, 378, 420, 0, 21925}, diff --git a/Eity/maps/Yumeiro Parade/map.lua b/Eity/maps/Yumeiro Parade/map.lua index 593ceaa..e116ba0 100644 --- a/Eity/maps/Yumeiro Parade/map.lua +++ b/Eity/maps/Yumeiro Parade/map.lua @@ -42,602 +42,579 @@ function map:getNotes() {1, 268, 400, 0, 5476}, {1, 216, 400, 0, 5875}, {1, 163, 400, 0, 6042}, - {1, 4, 440, 0, 6742}, - {1, 124, 440, 0, 7042}, - {1, 292, 440, 0, 7375}, - {1, 192, 440, 0, 7709}, - {1, 288, 440, 0, 8042}, - {1, 476, 440, 0, 8542}, - {1, 416, 440, 0, 8709}, - {1, 180, 440, 0, 9209}, - {1, 40, 440, 0, 9742}, - {1, 136, 440, 0, 10042}, - {1, 332, 440, 0, 10542}, - {1, 332, 440, 0, 11042}, - {1, 252, 440, 0, 11375}, - {1, 236, 440, 0, 11875}, - {1, 180, 440, 0, 12209}, - {1, 104, 440, 0, 12415}, - {1, 152, 440, 0, 12709}, - {1, 385, 440, 0, 13209}, - {1, 393, 440, 0, 13375}, - {1, 184, 440, 0, 13709}, - {1, 252, 440, 0, 13875}, - {1, 252, 440, 0, 14042}, - {1, 36, 440, 0, 14542}, - {1, 128, 440, 0, 14875}, - {1, 277, 440, 0, 15209}, - {1, 277, 440, 0, 15375}, - {1, 440, 440, 0, 15875}, - {1, 476, 440, 0, 16375}, - {1, 392, 440, 0, 16709}, - {1, 220, 440, 0, 17375}, - {1, 72, 440, 0, 17709}, - {1, 168, 440, 0, 18042}, - {1, 72, 440, 0, 18375}, - {1, 293, 440, 0, 18709}, - {1, 293, 440, 0, 19042}, - {1, 244, 440, 0, 19542}, - {1, 344, 440, 0, 20042}, - {1, 237, 440, 0, 20375}, - {1, 316, 440, 0, 20709}, - {1, 452, 440, 0, 21042}, - {1, 316, 440, 0, 21209}, - {1, 442, 440, 0, 21375}, - {1, 442, 440, 0, 21709}, - {1, 352, 440, 0, 22209}, - {1, 132, 440, 0, 22709}, - {1, 132, 440, 0, 22875}, - {1, 200, 440, 0, 23209}, - {1, 280, 440, 0, 23542}, - {1, 408, 440, 0, 24042}, - {1, 480, 440, 0, 24375}, - {1, 480, 440, 0, 24542}, - {1, 316, 440, 0, 24875}, - {1, 400, 440, 0, 25375}, - {1, 328, 440, 0, 25709}, - {1, 184, 440, 0, 26042}, - {1, 104, 440, 0, 26542}, - {1, 104, 440, 0, 26709}, - {1, 348, 440, 0, 27209}, - {1, 348, 440, 0, 27375}, - {1, 328, 440, 0, 27542}, - {1, 104, 440, 0, 28042}, - {1, 198, 440, 0, 28375}, - {1, 304, 440, 0, 28709}, - {1, 288, 440, 0, 29042}, - {1, 388, 440, 0, 29209}, - {1, 488, 440, 0, 29375}, - {1, 488, 440, 0, 29709}, - {1, 388, 440, 0, 29875}, - {1, 400, 440, 0, 30209}, - {1, 184, 440, 0, 30709}, - {1, 62, 440, 0, 31042}, - {1, 224, 440, 0, 31375}, - {1, 444, 440, 0, 31709}, - {1, 388, 440, 0, 31876}, - {1, 340, 440, 0, 32042}, - {1, 340, 440, 0, 32375}, - {1, 451, 440, 0, 32542}, - {1, 372, 440, 0, 32875}, - {1, 128, 440, 0, 33375}, - {1, 128, 440, 0, 33542}, - {1, 48, 440, 0, 33875}, - {1, 124, 440, 0, 34209}, - {1, 252, 440, 0, 34709}, - {1, 444, 440, 0, 35042}, - {1, 351, 440, 0, 35209}, - {1, 411, 440, 0, 35542}, - {1, 296, 440, 0, 36042}, - {1, 172, 440, 0, 36375}, - {1, 276, 440, 0, 36709}, - {1, 208, 440, 0, 37209}, - {1, 208, 440, 0, 37375}, - {1, 440, 440, 0, 37875}, - {1, 440, 440, 0, 38042}, - {1, 356, 440, 0, 38209}, - {1, 280, 440, 0, 38542}, - {1, 384, 440, 0, 38875}, - {1, 468, 440, 0, 39209}, - {1, 411, 440, 0, 39375}, - {1, 212, 440, 0, 39875}, - {1, 36, 440, 0, 40209}, - {1, 293, 440, 0, 40875}, - {1, 369, 440, 0, 41208}, - {1, 265, 440, 0, 41541}, - {1, 142, 440, 0, 41875}, - {1, 65, 440, 0, 42042}, - {1, 145, 440, 0, 42542}, - {1, 227, 440, 0, 42709}, - {1, 436, 440, 0, 43209}, - {1, 436, 440, 0, 43375}, - {1, 367, 440, 0, 43542}, - {1, 291, 440, 0, 43875}, - {1, 395, 440, 0, 44208}, - {1, 228, 440, 0, 44542}, - {1, 161, 440, 0, 44709}, - {1, 30, 440, 0, 45209}, - {1, 190, 440, 0, 45542}, - {1, 50, 440, 0, 46209}, - {1, 50, 440, 0, 46375}, - {1, 59, 440, 0, 46542}, - {1, 12, 440, 0, 46709}, - {1, 141, 440, 0, 46875}, - {1, 141, 440, 0, 47209}, - {1, 163, 440, 0, 47375}, - {1, 363, 440, 0, 47875}, - {1, 363, 440, 0, 48042}, - {1, 320, 440, 0, 48209}, - {1, 236, 440, 0, 48542}, - {1, 400, 440, 0, 48875}, - {1, 400, 440, 0, 49209}, - {1, 140, 440, 0, 49709}, - {1, 140, 440, 0, 49875}, - {1, 220, 440, 0, 50042}, - {1, 136, 440, 0, 50542}, - {1, 208, 440, 0, 50875}, - {1, 208, 440, 0, 51042}, - {1, 296, 440, 0, 51209}, - {1, 412, 440, 0, 51375}, - {1, 412, 440, 0, 51542}, - {1, 504, 440, 0, 51875}, - {1, 504, 440, 0, 52375}, - {1, 428, 440, 0, 52542}, - {1, 176, 440, 0, 52709}, - {1, 24, 440, 0, 53375}, - {1, 108, 440, 0, 53709}, - {1, 52, 440, 0, 54042}, - {1, 52, 440, 0, 54209}, - {1, 200, 440, 0, 54542}, - {1, 380, 440, 0, 54875}, - {1, 348, 440, 0, 55209}, - {1, 348, 440, 0, 55375}, - {1, 200, 440, 0, 55875}, - {1, 299, 440, 0, 56042}, - {1, 408, 440, 0, 56542}, - {1, 440, 440, 0, 56875}, - {1, 424, 440, 0, 57209}, - {1, 292, 440, 0, 57542}, - {1, 292, 440, 0, 57875}, - {1, 72, 440, 0, 58042}, - {1, 92, 440, 0, 58542}, - {1, 92, 440, 0, 58709}, - {1, 188, 440, 0, 59042}, - {1, 376, 440, 0, 59209}, - {1, 376, 440, 0, 59542}, - {1, 336, 440, 0, 59875}, - {1, 300, 440, 0, 60375}, - {1, 68, 440, 0, 60709}, - {1, 136, 440, 0, 61209}, - {1, 136, 440, 0, 61542}, - {1, 220, 440, 0, 61709}, - {1, 380, 440, 0, 61875}, - {1, 380, 440, 0, 62209}, - {1, 444, 440, 0, 62542}, - {1, 328, 440, 0, 63042}, - {1, 68, 440, 0, 63209}, - {1, 200, 440, 0, 63875}, - {1, 368, 440, 0, 64042}, - {1, 200, 440, 0, 64542}, - {1, 28, 440, 0, 64875}, - {1, 28, 440, 0, 65209}, - {1, 25, 440, 0, 65542}, - {1, 114, 440, 0, 65875}, - {1, 355, 440, 0, 66042}, - {1, 452, 440, 0, 66542}, - {1, 492, 440, 0, 66709}, - {1, 376, 440, 0, 67209}, - {1, 272, 440, 0, 67542}, - {1, 272, 440, 0, 67875}, - {1, 368, 440, 0, 68209}, - {1, 460, 440, 0, 68542}, - {1, 460, 440, 0, 68709}, - {1, 236, 440, 0, 69375}, - {1, 36, 440, 0, 69709}, - {1, 232, 440, 0, 70209}, - {1, 232, 440, 0, 70709}, - {1, 310, 440, 0, 71209}, - {1, 180, 440, 0, 71709}, - {1, 180, 440, 0, 71875}, - {1, 109, 440, 0, 72209}, - {1, 132, 440, 0, 72542}, - {1, 44, 440, 0, 72875}, - {1, 248, 440, 0, 73375}, - {1, 136, 440, 0, 73875}, - {1, 432, 440, 0, 74209}, - {1, 88, 440, 0, 74542}, - {1, 412, 440, 0, 74875}, - {1, 276, 440, 0, 75375}, - {1, 412, 440, 0, 75875}, - {1, 280, 440, 0, 76375}, - {1, 88, 440, 0, 76709}, - {1, 8, 440, 0, 77042}, - {1, 64, 440, 0, 77375}, - {1, 364, 440, 0, 78042}, - {1, 304, 440, 0, 78542}, - {1, 64, 440, 0, 79042}, - {1, 8, 440, 0, 79375}, - {1, 319, 440, 0, 80042}, - {1, 264, 440, 0, 80375}, - {1, 264, 440, 0, 80709}, - {1, 100, 440, 0, 81209}, - {1, 189, 440, 0, 81542}, - {1, 380, 440, 0, 81875}, - {1, 204, 440, 0, 82042}, - {1, 281, 440, 0, 82542}, - {1, 252, 440, 0, 82709}, - {1, 204, 440, 0, 83209}, - {1, 144, 440, 0, 83375}, - {1, 52, 440, 0, 83875}, - {1, 72, 440, 0, 84209}, - {1, 375, 440, 0, 84542}, - {1, 39, 440, 0, 84709}, - {1, 450, 440, 0, 85209}, - {1, 177, 440, 0, 85375}, - {1, 288, 440, 0, 85875}, - {1, 212, 440, 0, 86042}, - {1, 252, 440, 0, 86209}, - {1, 304, 440, 0, 86709}, - {1, 460, 440, 0, 87042}, - {1, 272, 440, 0, 87375}, - {1, 385, 440, 0, 87875}, - {1, 212, 440, 0, 88042}, - {1, 476, 440, 0, 88375}, - {1, 104, 440, 0, 88875}, - {1, 476, 440, 0, 89375}, - {1, 336, 440, 0, 89709}, - {1, 100, 440, 0, 90042}, - {1, 291, 440, 0, 90709}, - {1, 252, 440, 0, 91042}, - {1, 421, 440, 0, 91542}, - {1, 512, 440, 0, 92542}, - {1, 480, 440, 0, 93375}, - {1, 68, 440, 0, 93875}, - {1, 263, 440, 0, 94709}, - {1, 69, 440, 0, 95375}, - {1, 76, 440, 0, 95875}, - {1, 171, 440, 0, 96542}, - {1, 317, 440, 0, 96875}, - {1, 256, 440, 0, 97375}, - {1, 364, 440, 0, 97709}, - {1, 96, 440, 0, 98042}, - {1, 364, 440, 0, 98542}, - {1, 164, 440, 0, 98709}, - {1, 96, 440, 0, 99042}, - {1, 156, 440, 0, 99542}, - {1, 164, 440, 0, 100042}, - {1, 280, 440, 0, 100375}, - {1, 340, 440, 0, 100709}, - {1, 40, 440, 0, 101209}, - {1, 152, 440, 0, 101709}, - {1, 196, 440, 0, 102209}, - {1, 64, 440, 0, 102709}, - {1, 75, 440, 0, 103209}, - {1, 134, 440, 0, 103542}, - {1, 13, 440, 0, 104042}, - {1, 341, 440, 0, 104542}, - {1, 126, 440, 0, 104875}, - {1, 328, 440, 0, 105375}, - {1, 348, 440, 0, 105709}, - {1, 356, 440, 0, 106042}, - {1, 252, 440, 0, 106542}, - {1, 12, 440, 0, 106709}, - {1, 200, 440, 0, 107875}, - {1, 336, 440, 0, 108209}, - {1, 336, 440, 0, 108542}, - {1, 96, 440, 0, 109200}, - {1, 66, 440, 0, 109542}, - {1, 272, 440, 0, 110209}, - {1, 248, 440, 0, 110542}, - {1, 416, 440, 0, 111209}, - {1, 44, 440, 0, 111375}, - {1, 344, 440, 0, 111875}, - {1, 272, 440, 0, 112209}, - {1, 120, 440, 0, 112875}, - {1, 131, 440, 0, 113208}, - {1, 172, 440, 0, 113542}, - {1, 200, 440, 0, 114042}, - {1, 364, 440, 0, 114542}, - {1, 304, 440, 0, 115542}, - {1, 416, 440, 0, 115709}, - {1, 200, 440, 0, 116042}, - {1, 172, 440, 0, 116375}, - {1, 128, 440, 0, 116709}, - {1, 280, 440, 0, 117208}, - {1, 348, 440, 0, 117542}, - {1, 216, 440, 0, 117875}, - {1, 320, 440, 0, 118209}, - {1, 264, 440, 0, 118542}, - {1, 120, 440, 0, 119042}, - {1, 96, 440, 0, 119375}, - {1, 319, 440, 0, 119875}, - {1, 408, 440, 0, 120209}, - {1, 160, 440, 0, 120542}, - {1, 28, 440, 0, 120875}, - {1, 240, 440, 0, 121209}, - {1, 76, 440, 0, 121709}, - {1, 324, 440, 0, 122042}, - {1, 296, 440, 0, 122542}, - {1, 364, 440, 0, 122709}, - {1, 383, 440, 0, 123042}, - {1, 323, 440, 0, 123542}, - {1, 470, 440, 0, 123709}, - {1, 121, 440, 0, 123875}, - {1, 440, 440, 0, 124209}, - {1, 121, 440, 0, 124542}, - {1, 204, 440, 0, 124709}, - {1, 308, 440, 0, 125209}, - {1, 99, 440, 0, 125875}, - {1, 100, 440, 0, 126209}, - {1, 244, 440, 0, 126542}, - {1, 108, 440, 0, 126875}, - {1, 292, 440, 0, 127209}, - {1, 324, 440, 0, 127875}, - {1, 284, 440, 0, 128042}, - {1, 332, 440, 0, 128375}, - {1, 104, 440, 0, 128875}, - {1, 212, 440, 0, 129209}, - {1, 284, 440, 0, 129709}, - {1, 264, 440, 0, 129875}, - {1, 104, 440, 0, 130042}, - {1, 44, 440, 0, 130542}, - {1, 23, 440, 0, 130875}, - {1, 19, 440, 0, 131209}, - {1, 30, 440, 0, 131542}, - {1, 372, 440, 0, 131875}, - {1, 98, 440, 0, 132375}, - {1, 65, 440, 0, 132709}, - {1, 251, 440, 0, 133209}, - {1, 152, 440, 0, 133709}, - {1, 256, 440, 0, 134209}, - {1, 279, 440, 0, 134542}, - {1, 419, 440, 0, 134875}, - {1, 152, 440, 0, 135209}, - {1, 232, 440, 0, 135375}, - {1, 253, 440, 0, 135875}, - {1, 271, 440, 0, 136042}, - {1, 75, 440, 0, 136542}, - {1, 135, 440, 0, 136875}, - {1, 131, 440, 0, 137209}, - {1, 14, 440, 0, 137542}, - {1, 63, 440, 0, 137875}, - {1, 69, 440, 0, 138042}, - {1, 53, 440, 0, 138542}, - {1, 63, 440, 0, 139042}, - {1, 39, 440, 0, 139542}, - {1, 396, 440, 0, 140042}, - {1, 456, 440, 0, 140542}, - {1, 142, 440, 0, 141042}, - {1, 67, 440, 0, 141542}, - {1, 98, 440, 0, 141875}, - {1, 90, 440, 0, 142209}, - {1, 86, 440, 0, 142709}, - {1, 325, 440, 0, 143209}, - {1, 420, 440, 0, 143875}, - {1, 69, 440, 0, 144209}, - {1, 51, 440, 0, 144542}, - {1, 23, 440, 0, 144709}, - {1, 231, 440, 0, 145209}, - {1, 57, 440, 0, 145542}, - {1, 84, 440, 0, 145875}, - {1, 200, 440, 0, 146042}, - {1, 332, 440, 0, 146542}, - {1, 299, 440, 0, 146875}, - {1, 196, 440, 0, 147209}, - {1, 178, 440, 0, 147375}, - {1, 188, 440, 0, 147709}, - {1, 45, 440, 0, 148042}, - {1, 272, 440, 0, 148375}, - {1, 285, 440, 0, 148709}, - {1, 331, 440, 0, 149209}, - {1, 108, 440, 0, 149709}, - {1, 40, 440, 0, 150542}, - {1, 316, 440, 0, 150875}, - {1, 121, 440, 0, 151375}, - {1, 26, 440, 0, 152042}, - {1, 173, 440, 0, 152375}, - {1, 32, 440, 0, 152709}, - {1, 296, 440, 0, 153542}, - {1, 48, 440, 0, 153875}, - {1, 75, 440, 0, 154042}, - {1, 216, 440, 0, 154542}, - {1, 112, 440, 0, 155042}, - {1, 85, 440, 0, 155792}, - {1, 142, 440, 0, 156209}, - {1, 228, 440, 0, 157042}, - {1, 112, 440, 0, 157375}, - {1, 268, 440, 0, 157875}, - {1, 288, 440, 0, 158042}, - {1, 264, 440, 0, 158542}, - {1, 16, 440, 0, 158875}, - {1, 69, 440, 0, 159209}, - {1, 53, 440, 0, 159375}, - {1, 320, 440, 0, 159709}, - {1, 228, 440, 0, 160042}, - {1, 460, 440, 0, 160375}, - {1, 60, 440, 0, 160709}, - {1, 74, 440, 0, 161209}, - {1, 132, 440, 0, 161542}, - {1, 163, 440, 0, 162042}, - {1, 13, 440, 0, 162542}, - {1, 72, 440, 0, 162875}, - {1, 41, 440, 0, 163375}, - {1, 84, 440, 0, 163875}, - {1, 123, 440, 0, 164209}, - {1, 132, 440, 0, 164542}, - {1, 373, 440, 0, 164709}, - {1, 72, 440, 0, 165375}, - {1, 400, 440, 0, 165709}, - {1, 196, 440, 0, 165875}, - {1, 324, 440, 0, 166209}, - {1, 273, 440, 0, 166542}, - {1, 31, 440, 0, 166875}, - {1, 42, 440, 0, 167375}, - {1, 86, 440, 0, 168042}, - {1, 86, 440, 0, 168542}, - {1, 65, 440, 0, 168875}, - {1, 72, 440, 0, 169209}, - {1, 3, 440, 0, 169542}, - {1, 29, 440, 0, 169875}, - {1, 123, 440, 0, 170042}, - {1, 272, 440, 0, 170542}, - {1, 116, 440, 0, 171209}, - {1, 138, 440, 0, 171542}, - {1, 332, 440, 0, 172042}, - {1, 96, 440, 0, 172209}, - {1, 156, 440, 0, 172875}, - {1, 236, 440, 0, 173375}, - {1, 232, 440, 0, 173542}, - {1, 328, 440, 0, 173875}, - {1, 368, 440, 0, 174209}, - {1, 412, 440, 0, 174542}, - {1, 228, 440, 0, 174709}, - {1, 368, 440, 0, 175375}, - {1, 32, 440, 0, 175875}, - {1, 120, 440, 0, 176292}, - {1, 88, 440, 0, 176375}, - {1, 280, 440, 0, 176542}, - {1, 288, 440, 0, 176875}, - {1, 296, 440, 0, 177209}, - {1, 144, 440, 0, 177709}, - {1, 132, 440, 0, 177875}, - {1, 297, 440, 0, 178375}, - {1, 460, 440, 0, 178542}, - {1, 156, 440, 0, 178875}, - {1, 363, 440, 0, 179209}, - {1, 112, 440, 0, 179709}, - {1, 88, 440, 0, 180209}, - {1, 420, 440, 0, 180542}, - {1, 420, 440, 0, 180709}, - {1, 69, 440, 0, 181209}, - {1, 36, 440, 0, 182209}, - {1, 304, 440, 0, 182542}, - {1, 1, 440, 0, 183042}, - {1, 3, 440, 0, 183375}, - {1, 4, 440, 0, 183875}, - {1, 384, 440, 0, 184042}, - {1, 148, 440, 0, 184542}, - {1, 56, 440, 0, 184875}, - {1, 291, 440, 0, 185209}, - {1, 56, 440, 0, 185375}, - {1, 332, 440, 0, 185875}, - {1, 148, 440, 0, 186042}, - {1, 200, 440, 0, 186375}, - {1, 148, 440, 0, 186709}, - {1, 56, 440, 0, 187375}, - {1, 234, 440, 0, 187709}, - {1, 32, 440, 0, 188209}, - {1, 64, 440, 0, 194209}, - {1, 75, 440, 0, 194542}, - {1, 332, 440, 0, 194875}, - {1, 42, 440, 0, 195209}, - {1, 53, 440, 0, 195875}, - {1, 12, 440, 0, 196042}, - {1, 46, 440, 0, 196375}, - {1, 57, 440, 0, 196709}, - {1, 153, 440, 0, 196875}, - {1, 251, 440, 0, 197209}, - {1, 78, 440, 0, 197542}, - {1, 13, 440, 0, 198042}, - {1, 64, 440, 0, 198542}, - {1, 132, 440, 0, 198875}, - {1, 53, 440, 0, 199209}, - {1, 78, 440, 0, 199542}, - {1, 123, 440, 0, 200209}, - {1, 61, 440, 0, 200542}, - {1, 356, 440, 0, 201209}, - {1, 432, 440, 0, 201542}, - {1, 69, 440, 0, 201709}, - {1, 78, 440, 0, 201875}, - {1, 256, 440, 0, 202042}, - {1, 108, 440, 0, 202542}, - {1, 68, 440, 0, 203042}, - {1, 344, 440, 0, 203875}, - {1, 443, 440, 0, 204042}, - {1, 428, 440, 0, 204375}, - {1, 220, 440, 0, 204542}, - {1, 56, 440, 0, 204875}, - {1, 92, 440, 0, 205209}, - {1, 236, 440, 0, 206042}, - {1, 116, 440, 0, 206542}, - {1, 72, 440, 0, 206709}, - {1, 72, 440, 0, 207209}, - {1, 100, 440, 0, 207542}, - {1, 252, 440, 0, 207875}, - {1, 476, 440, 0, 208209}, - {1, 380, 440, 0, 208542}, - {1, 136, 440, 0, 208709}, - {1, 352, 440, 0, 209209}, - {1, 140, 440, 0, 209709}, - {1, 216, 440, 0, 209875}, - {1, 324, 440, 0, 210209}, - {1, 184, 440, 0, 210542}, - {1, 160, 440, 0, 211042}, - {1, 370, 440, 0, 211209}, - {1, 404, 440, 0, 211875}, - {1, 42, 440, 0, 212209}, - {1, 69, 440, 0, 212542}, - {1, 312, 440, 0, 212875}, - {1, 24, 440, 0, 213209}, - {1, 260, 440, 0, 213709}, - {1, 56, 440, 0, 214042}, - {1, 204, 440, 0, 214542}, - {1, 208, 440, 0, 214709}, - {1, 300, 440, 0, 215209}, - {1, 88, 440, 0, 215542}, - {1, 388, 440, 0, 215875}, - {1, 131, 440, 0, 216209}, - {1, 300, 440, 0, 216542}, - {1, 260, 440, 0, 217209}, - {1, 480, 440, 0, 217375}, - {1, 464, 440, 0, 217875}, - {1, 411, 440, 0, 218209}, - {1, 191, 440, 0, 218542}, - {1, 272, 440, 0, 218875}, - {1, 168, 440, 0, 219209}, - {1, 192, 440, 0, 219375}, - {1, 374, 440, 0, 220042}, - {1, 92, 440, 0, 220375}, - {1, 88, 440, 0, 220542}, - {1, 255, 440, 0, 220875}, - {1, 266, 440, 0, 221375}, - {1, 216, 440, 0, 221875}, - {1, 148, 440, 0, 222375}, - {1, 188, 440, 0, 222875}, - {1, 24, 440, 0, 223209}, - {1, 140, 440, 0, 224042}, - {1, 308, 440, 0, 224542}, - {1, 72, 440, 0, 225042}, - {1, 64, 440, 0, 225542}, - {1, 200, 440, 0, 226042}, - {1, 292, 440, 0, 226542}, - {1, 112, 440, 0, 226875}, - {1, 308, 440, 0, 227042}, - {1, 72, 440, 0, 227375}, - {1, 76, 440, 0, 227709}, - {1, 60, 440, 0, 228042}, - {1, 368, 440, 0, 228709}, - {1, 204, 440, 0, 229209}, - {1, 56, 440, 0, 229542}, - {1, 152, 440, 0, 230042}, - {1, 332, 440, 0, 230542}, - {1, 153, 440, 0, 231042}, - {1, 247, 440, 0, 231375}, - {1, 96, 440, 0, 231875}, - {1, 32, 440, 0, 232209}, - {1, 124, 440, 0, 232375}, - {1, 228, 440, 0, 232709}, - {1, 64, 440, 0, 233375}, - {1, 107, 440, 0, 233709}, - {1, 8, 440, 0, 234042}, - {1, 6, 440, 0, 234542}, - {1, 12, 440, 0, 235209}, - {1, 172, 440, 0, 235375}, - {1, 248, 440, 0, 236042}, - {1, 96, 440, 0, 236375}, - {1, 66, 440, 0, 236542}, - {1, 332, 440, 0, 236875}, - {1, 344, 440, 0, 237459}, + {1, 4, 490, 0, 6742}, + {1, 124, 490, 0, 7042}, + {1, 292, 490, 0, 7375}, + {1, 192, 490, 0, 7709}, + {1, 288, 490, 0, 8042}, + {1, 476, 490, 0, 8542}, + {1, 416, 490, 0, 8709}, + {1, 180, 490, 0, 9209}, + {1, 40, 490, 0, 9742}, + {1, 136, 490, 0, 10042}, + {1, 332, 490, 0, 10542}, + {1, 332, 490, 0, 11042}, + {1, 252, 490, 0, 11375}, + {1, 236, 490, 0, 11875}, + {1, 180, 490, 0, 12209}, + {1, 104, 490, 0, 12415}, + {1, 152, 490, 0, 12709}, + {1, 385, 490, 0, 13209}, + {1, 393, 490, 0, 13375}, + {1, 184, 490, 0, 13709}, + {1, 252, 490, 0, 13875}, + {1, 252, 490, 0, 14042}, + {1, 36, 490, 0, 14542}, + {1, 128, 490, 0, 14875}, + {1, 277, 490, 0, 15209}, + {1, 277, 490, 0, 15375}, + {1, 440, 490, 0, 15875}, + {1, 476, 490, 0, 16375}, + {1, 392, 490, 0, 16709}, + {1, 220, 490, 0, 17375}, + {1, 72, 490, 0, 17709}, + {1, 168, 490, 0, 18042}, + {1, 72, 490, 0, 18375}, + {1, 293, 490, 0, 18709}, + {1, 293, 490, 0, 19042}, + {1, 244, 490, 0, 19542}, + {1, 344, 490, 0, 20042}, + {1, 237, 490, 0, 20375}, + {1, 316, 490, 0, 20709}, + {1, 452, 490, 0, 21042}, + {1, 442, 490, 0, 21375}, + {1, 442, 490, 0, 21709}, + {1, 352, 490, 0, 22209}, + {1, 132, 490, 0, 22709}, + {1, 200, 490, 0, 23209}, + {1, 280, 490, 0, 23542}, + {1, 408, 490, 0, 24042}, + {1, 480, 490, 0, 24375}, + {1, 480, 490, 0, 24542}, + {1, 316, 490, 0, 24875}, + {1, 400, 490, 0, 25375}, + {1, 328, 490, 0, 25709}, + {1, 184, 490, 0, 26042}, + {1, 104, 490, 0, 26542}, + {1, 104, 490, 0, 26709}, + {1, 348, 490, 0, 27209}, + {1, 348, 490, 0, 27375}, + {1, 328, 490, 0, 27542}, + {1, 104, 490, 0, 28042}, + {1, 198, 490, 0, 28375}, + {1, 304, 490, 0, 28709}, + {1, 288, 490, 0, 29042}, + {1, 388, 490, 0, 29209}, + {1, 488, 490, 0, 29375}, + {1, 488, 490, 0, 29709}, + {1, 388, 490, 0, 29875}, + {1, 400, 490, 0, 30209}, + {1, 184, 490, 0, 30709}, + {1, 62, 490, 0, 31042}, + {1, 224, 490, 0, 31375}, + {1, 444, 490, 0, 31709}, + {1, 388, 490, 0, 31876}, + {1, 340, 490, 0, 32042}, + {1, 340, 490, 0, 32375}, + {1, 451, 490, 0, 32542}, + {1, 372, 490, 0, 32875}, + {1, 128, 490, 0, 33375}, + {1, 128, 490, 0, 33542}, + {1, 48, 490, 0, 33875}, + {1, 124, 490, 0, 34209}, + {1, 252, 490, 0, 34709}, + {1, 444, 490, 0, 35042}, + {1, 351, 490, 0, 35209}, + {1, 411, 490, 0, 35542}, + {1, 296, 490, 0, 36042}, + {1, 172, 490, 0, 36375}, + {1, 276, 490, 0, 36709}, + {1, 208, 490, 0, 37209}, + {1, 208, 490, 0, 37375}, + {1, 440, 490, 0, 37875}, + {1, 440, 490, 0, 38042}, + {1, 280, 490, 0, 38542}, + {1, 384, 490, 0, 38875}, + {1, 411, 490, 0, 39375}, + {1, 212, 490, 0, 39875}, + {1, 36, 490, 0, 40209}, + {1, 293, 490, 0, 40875}, + {1, 369, 490, 0, 41208}, + {1, 265, 490, 0, 41541}, + {1, 142, 490, 0, 41875}, + {1, 65, 490, 0, 42042}, + {1, 145, 490, 0, 42542}, + {1, 227, 490, 0, 42709}, + {1, 436, 490, 0, 43209}, + {1, 436, 490, 0, 43375}, + {1, 367, 490, 0, 43542}, + {1, 291, 490, 0, 43875}, + {1, 395, 490, 0, 44208}, + {1, 228, 490, 0, 44542}, + {1, 161, 490, 0, 44709}, + {1, 30, 490, 0, 45209}, + {1, 190, 490, 0, 45542}, + {1, 50, 490, 0, 46209}, + {1, 50, 490, 0, 46375}, + {1, 59, 490, 0, 46542}, + {1, 12, 490, 0, 46709}, + {1, 141, 490, 0, 46875}, + {1, 141, 490, 0, 47209}, + {1, 163, 490, 0, 47375}, + {1, 363, 490, 0, 47875}, + {1, 363, 490, 0, 48042}, + {1, 320, 490, 0, 48209}, + {1, 236, 490, 0, 48542}, + {1, 400, 490, 0, 48875}, + {1, 400, 490, 0, 49209}, + {1, 140, 490, 0, 49709}, + {1, 140, 490, 0, 49875}, + {1, 220, 490, 0, 50042}, + {1, 136, 490, 0, 50542}, + {1, 208, 490, 0, 50875}, + {1, 208, 490, 0, 51042}, + {1, 296, 490, 0, 51209}, + {1, 412, 490, 0, 51375}, + {1, 412, 490, 0, 51542}, + {1, 504, 490, 0, 51875}, + {1, 504, 490, 0, 52375}, + {1, 428, 490, 0, 52542}, + {1, 176, 490, 0, 52709}, + {1, 24, 490, 0, 53375}, + {1, 108, 490, 0, 53709}, + {1, 52, 490, 0, 54042}, + {1, 200, 490, 0, 54542}, + {1, 380, 490, 0, 54875}, + {1, 348, 490, 0, 55375}, + {1, 299, 490, 0, 56042}, + {1, 408, 490, 0, 56542}, + {1, 440, 490, 0, 56875}, + {1, 424, 490, 0, 57209}, + {1, 292, 490, 0, 57542}, + {1, 292, 490, 0, 57875}, + {1, 72, 490, 0, 58042}, + {1, 92, 490, 0, 58542}, + {1, 92, 490, 0, 58709}, + {1, 376, 490, 0, 59209}, + {1, 336, 490, 0, 59875}, + {1, 300, 490, 0, 60375}, + {1, 68, 490, 0, 60709}, + {1, 136, 490, 0, 61209}, + {1, 136, 490, 0, 61542}, + {1, 220, 490, 0, 61709}, + {1, 380, 490, 0, 62209}, + {1, 444, 490, 0, 62542}, + {1, 328, 490, 0, 63042}, + {1, 68, 490, 0, 63209}, + {1, 200, 490, 0, 63875}, + {1, 368, 490, 0, 64042}, + {1, 200, 490, 0, 64542}, + {1, 28, 490, 0, 64875}, + {1, 28, 490, 0, 65209}, + {1, 25, 490, 0, 65542}, + {1, 355, 490, 0, 66042}, + {1, 452, 490, 0, 66542}, + {1, 492, 490, 0, 66709}, + {1, 376, 490, 0, 67209}, + {1, 272, 490, 0, 67542}, + {1, 272, 490, 0, 67875}, + {1, 368, 490, 0, 68209}, + {1, 460, 490, 0, 68542}, + {1, 460, 490, 0, 68709}, + {1, 236, 490, 0, 69375}, + {1, 36, 490, 0, 69709}, + {1, 232, 490, 0, 70209}, + {1, 232, 490, 0, 70709}, + {1, 310, 490, 0, 71209}, + {1, 180, 490, 0, 71709}, + {1, 180, 490, 0, 71875}, + {1, 109, 490, 0, 72209}, + {1, 132, 490, 0, 72542}, + {1, 44, 490, 0, 72875}, + {1, 248, 490, 0, 73375}, + {1, 136, 490, 0, 73875}, + {1, 432, 490, 0, 74209}, + {1, 88, 490, 0, 74542}, + {1, 412, 490, 0, 74875}, + {1, 276, 490, 0, 75375}, + {1, 412, 490, 0, 75875}, + {1, 280, 490, 0, 76375}, + {1, 88, 490, 0, 76709}, + {1, 8, 490, 0, 77042}, + {1, 64, 490, 0, 77375}, + {1, 364, 490, 0, 78042}, + {1, 304, 490, 0, 78542}, + {1, 64, 490, 0, 79042}, + {1, 8, 490, 0, 79375}, + {1, 319, 490, 0, 80042}, + {1, 264, 490, 0, 80375}, + {1, 264, 490, 0, 80709}, + {1, 100, 490, 0, 81209}, + {1, 189, 490, 0, 81542}, + {1, 380, 490, 0, 81875}, + {1, 204, 490, 0, 82042}, + {1, 281, 490, 0, 82542}, + {1, 252, 490, 0, 82709}, + {1, 204, 490, 0, 83209}, + {1, 144, 490, 0, 83375}, + {1, 52, 490, 0, 83875}, + {1, 72, 490, 0, 84209}, + {1, 375, 490, 0, 84542}, + {1, 39, 490, 0, 84709}, + {1, 450, 490, 0, 85209}, + {1, 177, 490, 0, 85375}, + {1, 288, 490, 0, 85875}, + {1, 212, 490, 0, 86042}, + {1, 252, 490, 0, 86209}, + {1, 304, 490, 0, 86709}, + {1, 460, 490, 0, 87042}, + {1, 272, 490, 0, 87375}, + {1, 385, 490, 0, 87875}, + {1, 212, 490, 0, 88042}, + {1, 476, 490, 0, 88375}, + {1, 104, 490, 0, 88875}, + {1, 476, 490, 0, 89375}, + {1, 336, 490, 0, 89709}, + {1, 100, 490, 0, 90042}, + {1, 291, 490, 0, 90709}, + {1, 252, 490, 0, 91042}, + {1, 421, 490, 0, 91542}, + {1, 512, 490, 0, 92542}, + {1, 480, 490, 0, 93375}, + {1, 68, 490, 0, 93875}, + {1, 263, 490, 0, 94709}, + {1, 69, 490, 0, 95375}, + {1, 76, 490, 0, 95875}, + {1, 171, 490, 0, 96542}, + {1, 317, 490, 0, 96875}, + {1, 256, 490, 0, 97375}, + {1, 364, 490, 0, 97709}, + {1, 96, 490, 0, 98042}, + {1, 364, 490, 0, 98542}, + {1, 96, 490, 0, 99042}, + {1, 156, 490, 0, 99542}, + {1, 164, 490, 0, 100042}, + {1, 280, 490, 0, 100375}, + {1, 340, 490, 0, 100709}, + {1, 40, 490, 0, 101209}, + {1, 196, 490, 0, 102209}, + {1, 64, 490, 0, 102709}, + {1, 75, 490, 0, 103209}, + {1, 134, 490, 0, 103542}, + {1, 13, 490, 0, 104042}, + {1, 341, 490, 0, 104542}, + {1, 126, 490, 0, 104875}, + {1, 328, 490, 0, 105375}, + {1, 348, 490, 0, 105709}, + {1, 356, 490, 0, 106042}, + {1, 12, 490, 0, 106709}, + {1, 200, 490, 0, 107875}, + {1, 336, 490, 0, 108209}, + {1, 336, 490, 0, 108542}, + {1, 96, 490, 0, 109200}, + {1, 66, 490, 0, 109542}, + {1, 272, 490, 0, 110209}, + {1, 248, 490, 0, 110542}, + {1, 416, 490, 0, 111209}, + {1, 44, 490, 0, 111375}, + {1, 344, 490, 0, 111875}, + {1, 272, 490, 0, 112209}, + {1, 120, 490, 0, 112875}, + {1, 131, 490, 0, 113208}, + {1, 172, 490, 0, 113542}, + {1, 200, 490, 0, 114042}, + {1, 364, 490, 0, 114542}, + {1, 304, 490, 0, 115542}, + {1, 416, 490, 0, 115709}, + {1, 200, 490, 0, 116042}, + {1, 172, 490, 0, 116375}, + {1, 128, 490, 0, 116709}, + {1, 280, 490, 0, 117208}, + {1, 348, 490, 0, 117542}, + {1, 216, 490, 0, 117875}, + {1, 320, 490, 0, 118209}, + {1, 264, 490, 0, 118542}, + {1, 120, 490, 0, 119042}, + {1, 96, 490, 0, 119375}, + {1, 319, 490, 0, 119875}, + {1, 408, 490, 0, 120209}, + {1, 160, 490, 0, 120542}, + {1, 28, 490, 0, 120875}, + {1, 240, 490, 0, 121209}, + {1, 76, 490, 0, 121709}, + {1, 324, 490, 0, 122042}, + {1, 296, 490, 0, 122542}, + {1, 364, 490, 0, 122709}, + {1, 383, 490, 0, 123042}, + {1, 323, 490, 0, 123542}, + {1, 470, 490, 0, 123709}, + {1, 121, 490, 0, 123875}, + {1, 440, 490, 0, 124209}, + {1, 121, 490, 0, 124542}, + {1, 204, 490, 0, 124709}, + {1, 308, 490, 0, 125209}, + {1, 99, 490, 0, 125875}, + {1, 100, 490, 0, 126209}, + {1, 244, 490, 0, 126542}, + {1, 108, 490, 0, 126875}, + {1, 292, 490, 0, 127209}, + {1, 324, 490, 0, 127875}, + {1, 284, 490, 0, 128042}, + {1, 332, 490, 0, 128375}, + {1, 104, 490, 0, 128875}, + {1, 212, 490, 0, 129209}, + {1, 284, 490, 0, 129709}, + {1, 264, 490, 0, 129875}, + {1, 104, 490, 0, 130042}, + {1, 44, 490, 0, 130542}, + {1, 23, 490, 0, 130875}, + {1, 19, 490, 0, 131209}, + {1, 30, 490, 0, 131542}, + {1, 372, 490, 0, 131875}, + {1, 98, 490, 0, 132375}, + {1, 65, 490, 0, 132709}, + {1, 251, 490, 0, 133209}, + {1, 152, 490, 0, 133709}, + {1, 256, 490, 0, 134209}, + {1, 279, 490, 0, 134542}, + {1, 419, 490, 0, 134875}, + {1, 152, 490, 0, 135209}, + {1, 232, 490, 0, 135375}, + {1, 253, 490, 0, 135875}, + {1, 271, 490, 0, 136042}, + {1, 75, 490, 0, 136542}, + {1, 135, 490, 0, 136875}, + {1, 131, 490, 0, 137209}, + {1, 14, 490, 0, 137542}, + {1, 63, 490, 0, 137875}, + {1, 69, 490, 0, 138042}, + {1, 53, 490, 0, 138542}, + {1, 63, 490, 0, 139042}, + {1, 39, 490, 0, 139542}, + {1, 396, 490, 0, 140042}, + {1, 456, 490, 0, 140542}, + {1, 142, 490, 0, 141042}, + {1, 67, 490, 0, 141542}, + {1, 98, 490, 0, 141875}, + {1, 90, 490, 0, 142209}, + {1, 86, 490, 0, 142709}, + {1, 325, 490, 0, 143209}, + {1, 420, 490, 0, 143875}, + {1, 69, 490, 0, 144209}, + {1, 51, 490, 0, 144542}, + {1, 23, 490, 0, 144709}, + {1, 231, 490, 0, 145209}, + {1, 57, 490, 0, 145542}, + {1, 84, 490, 0, 145875}, + {1, 200, 490, 0, 146042}, + {1, 332, 490, 0, 146542}, + {1, 299, 490, 0, 146875}, + {1, 196, 490, 0, 147209}, + {1, 178, 490, 0, 147375}, + {1, 188, 490, 0, 147709}, + {1, 45, 490, 0, 148042}, + {1, 272, 490, 0, 148375}, + {1, 285, 490, 0, 148709}, + {1, 331, 490, 0, 149209}, + {1, 108, 490, 0, 149709}, + {1, 40, 490, 0, 150542}, + {1, 316, 490, 0, 150875}, + {1, 121, 490, 0, 151375}, + {1, 26, 490, 0, 152042}, + {1, 173, 490, 0, 152375}, + {1, 32, 490, 0, 152709}, + {1, 296, 490, 0, 153542}, + {1, 48, 490, 0, 153875}, + {1, 75, 490, 0, 154042}, + {1, 216, 490, 0, 154542}, + {1, 112, 490, 0, 155042}, + {1, 85, 490, 0, 155792}, + {1, 142, 490, 0, 156209}, + {1, 228, 490, 0, 157042}, + {1, 112, 490, 0, 157375}, + {1, 268, 490, 0, 157875}, + {1, 288, 490, 0, 158042}, + {1, 264, 490, 0, 158542}, + {1, 16, 490, 0, 158875}, + {1, 69, 490, 0, 159209}, + {1, 53, 490, 0, 159375}, + {1, 320, 490, 0, 159709}, + {1, 228, 490, 0, 160042}, + {1, 460, 490, 0, 160375}, + {1, 60, 490, 0, 160709}, + {1, 74, 490, 0, 161209}, + {1, 132, 490, 0, 161542}, + {1, 163, 490, 0, 162042}, + {1, 13, 490, 0, 162542}, + {1, 41, 490, 0, 163375}, + {1, 84, 490, 0, 163875}, + {1, 123, 490, 0, 164209}, + {1, 373, 490, 0, 164709}, + {1, 72, 490, 0, 165375}, + {1, 400, 490, 0, 165709}, + {1, 196, 490, 0, 165875}, + {1, 324, 490, 0, 166209}, + {1, 273, 490, 0, 166542}, + {1, 31, 490, 0, 166875}, + {1, 42, 490, 0, 167375}, + {1, 86, 490, 0, 168042}, + {1, 86, 490, 0, 168542}, + {1, 65, 490, 0, 168875}, + {1, 72, 490, 0, 169209}, + {1, 3, 490, 0, 169542}, + {1, 29, 490, 0, 169875}, + {1, 123, 490, 0, 170042}, + {1, 272, 490, 0, 170542}, + {1, 116, 490, 0, 171209}, + {1, 138, 490, 0, 171542}, + {1, 332, 490, 0, 172042}, + {1, 156, 490, 0, 172875}, + {1, 236, 490, 0, 173375}, + {1, 232, 490, 0, 173542}, + {1, 328, 490, 0, 173875}, + {1, 368, 490, 0, 174209}, + {1, 412, 490, 0, 174542}, + {1, 228, 490, 0, 174709}, + {1, 368, 490, 0, 175375}, + {1, 32, 490, 0, 175875}, + {1, 88, 490, 0, 176375}, + {1, 280, 490, 0, 176542}, + {1, 288, 490, 0, 176875}, + {1, 296, 490, 0, 177209}, + {1, 144, 490, 0, 177709}, + {1, 297, 490, 0, 178375}, + {1, 460, 490, 0, 178542}, + {1, 156, 490, 0, 178875}, + {1, 363, 490, 0, 179209}, + {1, 112, 490, 0, 179709}, + {1, 88, 490, 0, 180209}, + {1, 420, 490, 0, 180542}, + {1, 420, 490, 0, 180709}, + {1, 69, 490, 0, 181209}, + {1, 36, 490, 0, 182209}, + {1, 304, 490, 0, 182542}, + {1, 1, 490, 0, 183042}, + {1, 3, 490, 0, 183375}, + {1, 4, 490, 0, 183875}, + {1, 384, 490, 0, 184042}, + {1, 148, 490, 0, 184542}, + {1, 56, 490, 0, 184875}, + {1, 291, 490, 0, 185209}, + {1, 56, 490, 0, 185375}, + {1, 332, 490, 0, 185875}, + {1, 148, 490, 0, 186042}, + {1, 200, 490, 0, 186375}, + {1, 148, 490, 0, 186709}, + {1, 56, 490, 0, 187375}, + {1, 234, 490, 0, 187709}, + {1, 32, 490, 0, 188209}, + {1, 64, 490, 0, 194209}, + {1, 75, 490, 0, 194542}, + {1, 332, 490, 0, 194875}, + {1, 42, 490, 0, 195209}, + {1, 12, 490, 0, 196042}, + {1, 46, 490, 0, 196375}, + {1, 57, 490, 0, 196709}, + {1, 153, 490, 0, 196875}, + {1, 251, 490, 0, 197209}, + {1, 78, 490, 0, 197542}, + {1, 13, 490, 0, 198042}, + {1, 64, 490, 0, 198542}, + {1, 132, 490, 0, 198875}, + {1, 53, 490, 0, 199209}, + {1, 78, 490, 0, 199542}, + {1, 123, 490, 0, 200209}, + {1, 61, 490, 0, 200542}, + {1, 356, 490, 0, 201209}, + {1, 432, 490, 0, 201542}, + {1, 69, 490, 0, 201709}, + {1, 78, 490, 0, 201875}, + {1, 256, 490, 0, 202042}, + {1, 108, 490, 0, 202542}, + {1, 68, 490, 0, 203042}, + {1, 344, 490, 0, 203875}, + {1, 443, 490, 0, 204042}, + {1, 220, 490, 0, 204542}, + {1, 56, 490, 0, 204875}, + {1, 92, 490, 0, 205209}, + {1, 236, 490, 0, 206042}, + {1, 116, 490, 0, 206542}, + {1, 72, 490, 0, 206709}, + {1, 72, 490, 0, 207209}, + {1, 100, 490, 0, 207542}, + {1, 252, 490, 0, 207875}, + {1, 476, 490, 0, 208209}, + {1, 380, 490, 0, 208542}, + {1, 352, 490, 0, 209209}, + {1, 140, 490, 0, 209709}, + {1, 324, 490, 0, 210209}, + {1, 184, 490, 0, 210542}, + {1, 160, 490, 0, 211042}, + {1, 370, 490, 0, 211209}, + {1, 404, 490, 0, 211875}, + {1, 42, 490, 0, 212209}, + {1, 69, 490, 0, 212542}, + {1, 312, 490, 0, 212875}, + {1, 24, 490, 0, 213209}, + {1, 260, 490, 0, 213709}, + {1, 56, 490, 0, 214042}, + {1, 204, 490, 0, 214542}, + {1, 208, 490, 0, 214709}, + {1, 300, 490, 0, 215209}, + {1, 88, 490, 0, 215542}, + {1, 388, 490, 0, 215875}, + {1, 131, 490, 0, 216209}, + {1, 300, 490, 0, 216542}, + {1, 260, 490, 0, 217209}, + {1, 480, 490, 0, 217375}, + {1, 464, 490, 0, 217875}, + {1, 411, 490, 0, 218209}, + {1, 191, 490, 0, 218542}, + {1, 272, 490, 0, 218875}, + {1, 168, 490, 0, 219209}, + {1, 192, 490, 0, 219375}, + {1, 374, 490, 0, 220042}, + {1, 92, 490, 0, 220375}, + {1, 88, 490, 0, 220542}, + {1, 255, 490, 0, 220875}, + {1, 266, 490, 0, 221375}, + {1, 216, 490, 0, 221875}, + {1, 148, 490, 0, 222375}, + {1, 188, 490, 0, 222875}, + {1, 24, 490, 0, 223209}, + {1, 140, 490, 0, 224042}, + {1, 308, 490, 0, 224542}, + {1, 72, 490, 0, 225042}, + {1, 64, 490, 0, 225542}, + {1, 200, 490, 0, 226042}, + {1, 292, 490, 0, 226542}, + {1, 112, 490, 0, 226875}, + {1, 308, 490, 0, 227042}, + {1, 72, 490, 0, 227375}, + {1, 76, 490, 0, 227709}, + {1, 60, 490, 0, 228042}, + {1, 368, 490, 0, 228709}, + {1, 204, 490, 0, 229209}, + {1, 56, 490, 0, 229542}, + {1, 152, 490, 0, 230042}, + {1, 332, 490, 0, 230542}, + {1, 153, 490, 0, 231042}, + {1, 247, 490, 0, 231375}, + {1, 96, 490, 0, 231875}, + {1, 32, 490, 0, 232209}, + {1, 124, 490, 0, 232375}, + {1, 228, 490, 0, 232709}, + {1, 64, 490, 0, 233375}, + {1, 107, 490, 0, 233709}, + {1, 8, 490, 0, 234042}, + {1, 6, 490, 0, 234542}, + {1, 12, 490, 0, 235209}, + {1, 172, 490, 0, 235375}, + {1, 248, 490, 0, 236042}, + {1, 96, 490, 0, 236375}, + {1, 66, 490, 0, 236542}, + {1, 332, 490, 0, 236875}, + {1, 344, 490, 0, 237459}, } end diff --git a/Eity/states/maingame/maingame.lua b/Eity/states/maingame/maingame.lua index fcb9eab..d495897 100644 --- a/Eity/states/maingame/maingame.lua +++ b/Eity/states/maingame/maingame.lua @@ -114,7 +114,7 @@ function Maingame:draw() maingame_UI:draw() love.graphics.setFont(defaultFont) - --love.graphics.print(gameManager.gametime, 0, 60) + love.graphics.print(gameManager.gametime, 0, 60) end function Maingame:mousepressed(x, y,button) diff --git a/Eity/states/mainmenu/mainmenu.lua b/Eity/states/mainmenu/mainmenu.lua index 31d9008..c6d116f 100644 --- a/Eity/states/mainmenu/mainmenu.lua +++ b/Eity/states/mainmenu/mainmenu.lua @@ -117,7 +117,10 @@ function Mainmenu:keypressed(key) elseif key == "escape" and menustate == "Options" then saveManager:saveSettings() menustate = "Startmenu" - simpleScale.updateWindow(resolutionList[saveManager.settings.resolutionIndex][1], resolutionList[saveManager.settings.resolutionIndex][2]) + if (changedResolution) then + changedResolution = false + simpleScale.updateWindow(resolutionList[saveManager.settings.resolutionIndex][1], resolutionList[saveManager.settings.resolutionIndex][2]) + end end end diff --git a/Eity/states/mainmenu/options.lua b/Eity/states/mainmenu/options.lua index b7e55c8..ec300d3 100644 --- a/Eity/states/mainmenu/options.lua +++ b/Eity/states/mainmenu/options.lua @@ -3,8 +3,6 @@ require 'objects/button' Options = {} -local changedResolution - local isMouseOnEnableFPS, isMouseOnEnableVSync local backButton, generalButton, volumeButton, mainButton, musicButton, effectButton, slidertickButton