summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--graphics/particles/fountain.xml9
-rw-r--r--help/test-server.txt18
-rw-r--r--maps/001-1.tmx38
-rw-r--r--maps/001-2-31.tmx6
-rw-r--r--maps/001-2-4.tmx2
-rw-r--r--quests.xml3
-rw-r--r--skills.xml7
8 files changed, 59 insertions, 28 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55657dae..22fda54c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,8 @@ ok_job:
- pwd
- echo $CI_BUILD_REF_NAME
when: on_success
+ variables:
+ GIT_STRATEGY: none
fail_job:
stage: fail
@@ -59,3 +61,5 @@ fail_job:
- pwd
- echo $CI_BUILD_REF_NAME
when: on_failure
+ variables:
+ GIT_STRATEGY: none
diff --git a/graphics/particles/fountain.xml b/graphics/particles/fountain.xml
index 9bba33a5..e3fb28c0 100644
--- a/graphics/particles/fountain.xml
+++ b/graphics/particles/fountain.xml
@@ -4,8 +4,8 @@ Copyright (C) 2016 Evol Online -->
<effect>
<particle position-x="16"
- position-y="128"
- position-z="116">
+ position-y="108"
+ position-z="96">
<emitter>
<property name="output" value="2"/>
<property name="power" min="3" max="5"/>
@@ -14,7 +14,7 @@ Copyright (C) 2016 Evol Online -->
<property name="image" value="graphics/particles/orb-large.png|W:#6fa1b1"/>
<property name="gravity" value="0.13"/>
<property name="lifetime" value="80"/>
- <property name="fade-out" value="20"/>
+ <property name="fade-out" value="70"/>
</emitter>
<emitter>
<property name="output" value="2"/>
@@ -30,10 +30,11 @@ Copyright (C) 2016 Evol Online -->
<property name="output" value="2"/>
<property name="power" min="4" max="5"/>
<property name="horizontal-angle" min="-60" max="240"/>
- <property name="vertical-angle" min="76" max="80"/>
+ <property name="vertical-angle" min="72" max="77"/>
<property name="image" value="graphics/particles/orb-small.png|W:#e3f3ec"/>
<property name="gravity" value="0.15"/>
<property name="lifetime" min="80" max="150"/>
+ <property name="fade-in" value="30"/>
<property name="fade-out" value="25"/>
<property name="bounce" value="0.1"/>
</emitter>
diff --git a/help/test-server.txt b/help/test-server.txt
new file mode 100644
index 00000000..13d22586
--- /dev/null
+++ b/help/test-server.txt
@@ -0,0 +1,18 @@
+##3 === <<TEST SERVER>> ===
+ <<##9The ##2test server##9 allows players to test new content before
+ it gets released. It can also be used to test custom
+ character builds and stats.>>
+
+ <<You can perform most debug actions through the ##2Super Menu##9:>>
+ <<##BWrite ##3@super##9 in the chat and press enter.##b>>
+
+ <<You can also access the ##2Super Menu##9 from the ##2Skills##9 window:>>
+ <<##BPress the ##3###keyWindowSkill;##9 key. Go to the ##3Restricted##9 tab.##b>>
+
+ <<To get money: ##3@esp (amount)##9>>
+
+ <<To get items: ##3/createitems>>
+
+ \t10;@@https://www.themanaworld.org/index.php/Dev:Testing_Server|##6<<Click here for the test server documentation>>@@.
+
+
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 696c9652..4842a763 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -200,19 +200,19 @@
198,198,198,198,198,198,198,198,198,198,198,198,198,195,179,195,230,220,239,392,397,153,153,153,153,385,380,409,238,250,251,233,195,198,198,198,206,198,198,198,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1174,179,195,195,1186,1170,1203,179,179,1220,1268,1268,1268,1268,1268,1268,1268,508,508,512,532,198,198,198,198,198,198,198,198,179,195,195,198,198,198,179,195,195,179,195,195,179,179,179,179,195,195,179,195,198,198,198,198,198,198,198,198,198,198,198,179,179,1251,1268,1208,723,1505,722,723,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1219,195,1204,1268,1268,1249,195,1251,1268,1268,1249,195,1251,1268,1268,1249,195,1251,1192,1193,1249,195,1251,1208,1268,1268,839,855,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
198,198,198,198,198,198,198,198,198,198,198,198,198,195,179,214,200,236,377,396,401,153,153,153,153,399,394,256,254,218,234,179,195,198,1223,1223,206,198,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1217,1221,1174,195,195,1189,1236,195,1171,1218,1268,1268,1268,1268,1268,1268,1268,524,518,515,532,198,198,198,198,198,198,198,198,179,195,179,195,198,195,179,179,195,179,179,195,195,195,179,179,179,179,179,198,198,198,198,198,198,198,198,198,198,198,198,195,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1217,1221,1267,1268,1268,1265,1266,1267,1268,1268,1265,1266,1267,1268,1268,1265,1266,1267,1208,1209,1265,1266,1267,1268,790,839,855,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
198,198,198,198,198,198,198,198,198,198,198,198,179,179,195,230,220,239,392,397,153,153,153,153,385,380,409,238,235,251,219,179,195,1192,1192,1223,198,198,198,198,206,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1217,1201,195,179,195,195,1220,1268,1268,1268,1268,1268,1268,1268,1268,502,503,531,532,198,198,198,198,198,198,198,198,198,195,179,195,179,195,195,195,198,198,195,179,195,179,195,195,195,198,198,198,198,198,198,198,198,198,198,198,198,198,198,195,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,790,791,839,806,855,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,771,771,869,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,198,179,179,195,214,200,236,377,396,401,153,153,153,153,399,394,256,254,218,217,195,195,1192,1208,1208,1192,1223,198,1223,1192,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1217,1172,179,195,1171,1218,1268,1268,1268,1268,1268,1268,1268,1268,518,535,615,536,1268,1268,198,198,198,198,198,198,198,179,179,179,195,195,195,198,198,198,198,195,195,195,179,179,195,195,198,198,198,198,198,198,198,198,198,198,198,198,198,179,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,790,791,839,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,855,153,153,153,438,153,153,153,1268,1268,1268,1268,1268,1268,1268,870,870,885,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,198,179,179,214,200,220,239,392,397,153,153,153,153,153,399,394,238,217,235,249,195,195,1192,1177,1281,1191,1192,198,1192,1191,198,198,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1249,179,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,658,551,524,552,1268,1268,198,198,198,198,198,198,198,198,195,179,195,195,195,198,198,198,198,198,198,179,195,179,195,195,179,179,198,198,198,198,198,198,198,198,198,198,198,179,179,1251,1268,1268,1268,1268,1268,1268,1268,839,806,807,855,153,153,398,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,398,441,438,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,887,887,872,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,198,195,195,230,235,236,377,396,401,153,153,153,153,153,399,394,238,219,219,219,219,198,1192,1192,1177,1192,1223,198,1192,1207,1223,198,198,530,515,532,707,707,707,707,707,707,707,707,1268,1268,1219,195,195,1220,1268,1268,707,707,707,707,707,707,707,707,567,524,568,1268,1268,198,198,198,198,198,198,198,198,195,179,195,179,195,179,198,198,198,198,198,198,195,179,195,195,195,179,195,195,198,198,198,198,198,198,198,198,198,179,195,1251,1268,1268,1268,1268,1268,1268,839,855,153,153,153,153,153,153,153,153,153,153,153,153,438,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,179,179,214,200,220,239,392,397,153,153,153,153,153,153,399,394,238,218,233,233,218,198,198,1223,1223,1223,1223,198,1223,1177,1192,195,195,530,515,532,707,707,707,707,707,707,707,707,1268,1268,1217,1172,1171,1218,1268,1268,707,707,707,707,707,707,707,707,524,524,524,1268,1268,1268,198,198,198,198,198,198,198,195,179,179,179,179,179,198,198,198,198,198,198,198,198,195,195,179,179,195,195,195,198,198,198,198,198,198,198,198,195,179,1251,1268,1169,1205,1235,1268,839,855,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,1123,153,153,1123,153,153,1123,153,153,153,153,153,153,153,153,153,153,1125,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,179,195,230,218,236,377,396,401,153,153,153,153,153,153,399,394,238,234,217,251,250,217,198,198,1223,1223,198,198,198,1192,1223,195,195,530,515,532,707,707,707,1489,707,707,707,707,1268,1268,1268,1249,1251,1268,1268,1268,707,707,707,707,1489,707,707,709,658,658,658,1268,1268,1268,198,198,198,198,198,198,179,195,195,195,195,179,179,179,198,198,198,198,198,198,198,198,179,195,195,195,195,195,179,179,198,198,198,198,198,198,195,179,1251,1268,1203,195,1220,839,855,153,153,153,153,153,153,153,1268,1268,1268,1268,1233,1234,1235,1268,1268,1169,1205,1235,1268,1268,1233,1234,1235,1268,1268,1233,1234,1235,1268,1268,1233,1206,1170,1268,1268,1268,1268,524,524,524,524,524,524,524,524,524,524,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,1139,153,153,1139,153,153,1139,153,153,153,153,153,153,153,153,153,153,1141,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,179,179,214,200,234,236,392,397,153,153,153,153,153,153,153,399,394,238,251,234,251,233,249,218,198,198,179,179,198,198,1223,1192,179,179,530,515,532,726,723,723,1505,722,723,723,722,198,1268,1268,1249,1251,1268,1268,1268,722,723,723,722,1505,722,722,725,707,707,707,1268,1268,1268,198,198,198,198,198,198,179,179,179,195,179,179,179,195,179,198,198,198,198,198,198,198,198,198,195,179,195,179,195,195,179,198,198,198,198,198,179,195,1251,1268,1265,1222,1218,855,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1249,195,1251,1268,1268,1203,195,1220,1268,1268,1249,195,1251,1268,1268,1249,195,1251,1268,1268,1219,195,1204,1268,1268,1268,1268,658,659,658,658,658,658,658,658,659,658,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,195,179,230,249,250,236,392,397,153,153,153,153,153,153,153,399,394,238,251,234,233,235,219,251,198,198,179,179,195,198,198,195,179,179,530,515,532,1268,1268,1268,1268,1268,198,198,198,198,198,1169,1188,1187,1170,1268,1268,198,1268,1268,1268,1268,1268,1268,1268,707,707,707,1268,1268,1268,198,198,198,198,198,195,195,179,195,179,179,195,179,179,195,179,198,198,198,198,198,198,198,198,198,195,195,179,179,195,195,179,179,195,198,198,195,179,1251,1268,1268,1268,839,153,153,438,441,153,153,1268,1268,1268,1268,1268,1268,1268,1265,1266,1267,1268,1268,1265,1222,1218,1268,1268,1265,1266,1267,1268,1268,1265,1266,1267,1268,1268,1217,1221,1267,1268,1268,1268,1268,707,707,707,707,707,707,707,707,674,1489,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,195,179,230,217,218,236,392,397,153,153,153,153,153,153,153,399,394,240,222,218,219,250,235,219,198,198,195,179,179,198,198,195,195,198,530,515,532,1268,1268,1268,1268,1268,198,198,206,198,198,1203,179,179,1204,1268,198,198,1268,1268,1268,1268,1268,1268,1268,707,707,707,1268,1268,1268,1268,198,198,198,198,179,195,195,195,195,195,195,179,179,179,179,195,195,198,198,198,198,198,198,198,198,198,179,179,195,179,179,195,195,179,195,179,179,1251,1268,1268,1268,855,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1169,1205,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1206,1170,1268,1268,723,723,722,723,723,722,722,723,723,1505,1268,1268,1268,1268,1268,1268,153,153,153,153,153,1123,153,1125,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,195,179,230,233,234,236,407,381,386,153,153,153,153,153,153,400,395,379,238,235,233,217,219,235,198,198,198,198,195,179,195,195,195,198,530,515,532,1268,1268,1268,1268,198,198,198,206,206,198,1188,195,179,1187,1170,198,198,198,1268,1268,1268,1268,1268,1268,723,723,723,1268,1268,1268,1268,198,198,198,195,195,195,179,179,198,198,195,195,179,179,195,195,195,179,195,179,179,195,179,179,179,195,195,195,195,195,195,179,179,179,179,195,179,1251,1233,1234,1235,153,153,153,153,153,153,1268,524,524,524,524,524,518,530,531,532,1268,1203,195,179,195,179,179,195,195,195,195,179,179,179,179,179,195,179,179,195,179,195,1204,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,1139,153,1141,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,195,179,246,184,250,252,255,392,397,153,153,153,153,153,153,153,399,394,238,249,250,234,218,198,198,198,198,195,179,195,195,195,198,198,530,515,532,1268,1268,1268,1268,1268,198,206,206,206,198,198,195,179,179,1189,1234,179,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,198,198,195,195,195,179,179,198,198,198,195,179,195,179,179,195,195,179,195,179,179,179,195,195,179,179,179,195,198,198,198,179,179,195,179,179,179,1251,1249,195,1251,153,153,153,153,153,1268,1268,658,658,589,590,591,530,530,531,532,1268,1249,179,179,179,179,179,179,179,195,195,195,195,195,195,195,195,179,195,195,195,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,195,179,230,218,219,236,392,397,153,153,153,153,153,153,153,399,394,240,222,183,198,198,198,198,198,179,195,179,179,179,198,198,198,530,515,532,1268,1268,1268,1268,1268,198,198,206,206,198,198,179,195,195,195,179,179,198,198,198,198,198,198,1268,1268,1268,1268,1268,1268,1268,198,198,179,195,179,195,179,195,198,198,198,195,179,179,179,179,198,198,198,198,1268,1268,1268,1268,1268,1268,198,198,198,198,198,198,198,198,179,195,195,179,1251,1265,1266,1267,153,153,153,153,153,1268,1268,707,707,679,697,591,530,530,531,532,1268,1249,195,195,195,1253,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1252,195,195,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,195,179,246,184,235,236,407,381,386,153,153,153,153,153,153,400,395,379,238,232,179,179,179,195,195,195,195,195,195,195,198,198,198,530,515,532,198,198,1268,1268,1268,1268,198,198,198,198,198,198,179,179,179,179,179,195,198,198,198,198,198,1268,1268,1268,1268,1268,1268,1268,198,198,179,195,195,179,179,198,198,198,198,198,195,179,195,198,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,198,198,198,195,195,179,1251,1268,1268,1268,153,153,153,153,153,1268,1268,722,722,695,697,697,530,530,531,532,1268,1249,195,195,195,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1249,179,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-198,198,198,198,198,198,198,198,198,198,195,179,179,230,251,252,255,392,397,153,153,153,153,153,153,153,399,394,240,222,179,179,179,195,195,179,198,179,195,195,198,198,206,530,515,532,198,198,198,198,1268,1268,198,198,198,198,198,195,195,195,195,195,179,179,195,195,198,198,198,198,198,198,1268,1268,1268,198,179,195,179,179,179,179,179,198,198,198,198,198,195,179,195,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,198,198,179,179,1251,1268,1268,1268,153,153,153,153,153,1268,1268,1268,1268,1268,712,697,696,530,531,532,1268,1249,179,179,195,1251,1268,658,709,531,710,658,1268,1268,771,771,770,771,1268,1249,195,179,1251,1268,770,1268,1268,1268,1268,1268,1268,1268,772,773,773,771,771,771,771,771,869,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,198,179,179,195,214,200,236,377,396,401,153,153,153,153,399,394,256,254,218,217,195,195,1192,1208,1208,1192,1223,198,1223,1192,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1217,1172,179,195,1171,1218,1268,1268,1268,1268,1268,1268,1268,1268,518,535,615,536,1192,1192,198,198,198,198,198,198,198,179,179,179,195,195,195,198,198,198,198,195,195,195,179,179,195,195,198,198,198,198,198,198,198,198,198,198,198,198,198,179,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,790,791,839,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,806,807,855,153,153,153,438,153,153,153,1268,1268,1268,1268,1268,1268,1268,870,870,885,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,198,179,179,214,200,220,239,392,397,153,153,153,153,153,399,394,238,217,235,249,195,195,1192,1177,1281,1191,1192,198,1192,1191,198,198,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1249,179,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,658,551,524,552,1268,1192,198,198,198,198,198,198,198,198,195,179,195,195,195,198,198,198,198,198,198,179,195,179,195,195,179,179,198,198,198,198,198,198,198,198,198,198,198,179,179,1251,1268,1268,1268,1268,1268,1268,1268,839,806,807,855,153,153,398,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,398,441,438,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,887,887,872,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,198,195,195,230,235,236,377,396,401,153,153,153,153,153,399,394,238,219,219,219,219,198,1192,1192,1177,1192,1223,198,1192,1207,1223,198,198,530,515,532,707,707,707,707,707,707,707,707,1268,1268,1219,195,195,1220,1268,1268,707,707,707,707,707,707,707,707,567,524,568,1268,1192,198,198,198,198,198,198,198,198,195,179,195,179,195,179,198,198,198,198,198,198,195,179,195,195,195,179,195,195,198,198,198,198,198,198,198,198,198,179,195,1251,1268,1268,1268,1268,1268,1268,839,855,153,153,153,153,153,153,153,153,153,153,153,153,438,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,179,179,214,200,220,239,392,397,153,153,153,153,153,153,399,394,238,218,233,233,218,198,198,1223,1223,1223,1223,198,1223,1177,1192,195,195,530,515,532,707,707,707,707,707,707,707,707,1268,1268,1217,1172,1171,1218,1268,1268,707,707,707,707,707,707,707,707,524,524,524,1268,1207,1192,198,198,198,198,198,198,198,195,179,179,179,179,179,198,198,198,198,198,198,198,198,195,195,179,179,195,195,195,198,198,198,198,198,198,198,198,195,179,1251,1268,1169,1205,1235,1268,839,855,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,1123,153,153,1123,153,153,1123,153,153,153,153,153,153,153,153,153,153,1125,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,179,195,230,218,236,377,396,401,153,153,153,153,153,153,399,394,238,234,217,251,250,217,198,198,1223,1223,198,198,198,1192,1223,195,195,530,515,532,707,707,707,1489,707,707,707,707,1192,1177,1268,1249,1251,1268,1268,1268,707,707,707,707,1489,707,707,709,658,658,658,1268,1268,1192,198,198,198,198,198,198,179,195,195,195,195,179,179,179,198,198,198,198,198,198,198,198,179,195,195,195,195,195,179,179,198,198,198,198,198,198,195,179,1251,1268,1203,195,1220,839,855,153,153,153,153,153,153,153,1268,1268,1268,1268,1233,1234,1235,1268,1268,1169,1205,1235,1268,1268,1233,1234,1235,1268,1268,1233,1234,1235,1268,1268,1233,1206,1170,1268,1268,1268,1268,524,524,524,524,524,524,524,524,524,524,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,1139,153,153,1139,153,153,1139,153,153,153,153,153,153,153,153,153,153,1141,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,179,179,214,200,234,236,392,397,153,153,153,153,153,153,153,399,394,238,251,234,251,233,249,218,198,198,179,179,198,198,1223,1192,179,179,530,515,532,726,723,723,1505,722,723,723,722,198,1192,1268,1249,1251,1192,1177,1268,722,723,723,722,1505,722,722,725,707,707,707,1268,1268,1192,198,198,198,198,198,198,179,179,179,195,179,179,179,195,179,198,198,198,198,198,198,198,198,198,195,179,195,179,195,195,179,198,198,198,198,198,179,195,1251,1268,1265,1222,1218,855,153,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1249,195,1251,1268,1268,1203,195,1220,1268,1268,1249,195,1251,1268,1268,1249,195,1251,1268,1268,1219,195,1204,1268,1268,1268,1268,658,659,658,658,658,658,658,658,659,658,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,195,179,230,249,250,236,392,397,153,153,153,153,153,153,153,399,394,238,251,234,233,235,219,251,198,198,179,179,195,198,198,195,179,179,530,515,532,1268,1268,1268,1268,1223,198,198,198,198,1192,1169,1188,1187,1170,1191,1192,198,1192,1268,1268,1268,1175,1176,1177,707,707,707,1268,1268,1192,198,198,198,198,198,195,195,179,195,179,179,195,179,179,195,179,198,198,198,198,198,198,198,198,198,195,195,179,179,195,195,179,179,195,198,198,195,179,1251,1268,1268,1268,839,153,153,438,441,153,153,1268,1268,1268,1268,1268,1268,1268,1265,1266,1267,1268,1268,1265,1222,1218,1268,1268,1265,1266,1267,1268,1268,1265,1266,1267,1268,1268,1217,1221,1267,1268,1268,1268,1268,707,707,707,707,707,707,707,707,674,1489,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,195,179,230,217,218,236,392,397,153,153,153,153,153,153,153,399,394,240,222,218,219,250,235,219,198,198,195,179,179,198,198,195,195,198,530,515,532,1268,1268,1268,1191,1223,198,198,206,198,198,1203,179,179,1204,1192,198,198,1192,1177,1268,1268,1191,1192,1193,707,707,707,1268,1268,1207,1192,198,198,198,198,179,195,195,195,195,195,195,179,179,179,179,195,195,198,198,198,198,198,198,198,198,198,179,179,195,179,179,195,195,179,195,179,179,1251,1268,1268,1268,855,153,153,153,153,153,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1169,1205,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1206,1170,1268,1268,723,723,722,723,723,722,722,723,723,1505,1268,1268,1268,1268,1268,1268,153,153,153,153,153,1123,153,1125,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,195,179,230,233,234,236,407,381,386,153,153,153,153,153,153,400,395,379,238,235,233,217,219,235,198,198,198,198,195,179,195,195,195,198,530,515,532,1268,1268,1268,1192,198,198,198,206,206,198,1188,195,179,1187,1170,198,198,198,1192,1177,1268,1207,1208,1209,723,723,723,1268,1268,1268,1192,198,198,198,195,195,195,179,179,198,198,195,195,179,179,195,195,195,179,195,179,179,195,179,179,179,195,195,195,195,195,195,179,179,179,179,195,179,1251,1233,1234,1235,153,153,153,153,153,153,1268,524,524,524,524,524,518,530,531,532,1268,1203,195,179,195,179,179,195,195,195,195,179,179,179,179,179,195,179,179,195,179,195,1204,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,1139,153,1141,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,195,179,246,184,250,252,255,392,397,153,153,153,153,153,153,153,399,394,238,249,250,234,218,198,198,198,198,195,179,195,195,195,198,198,530,515,532,1176,1176,1192,1192,1223,198,206,206,206,198,198,195,179,179,1189,1234,179,198,198,1223,1192,1192,1192,1192,1209,1268,1268,1268,1268,1175,1192,198,198,195,195,195,179,179,198,198,198,195,179,195,179,179,195,195,179,195,179,179,179,195,195,179,179,179,195,198,198,198,179,179,195,179,179,179,1251,1249,195,1251,153,153,153,153,153,1268,1268,658,658,589,590,591,530,530,531,532,1268,1249,179,179,179,179,179,179,179,195,195,195,195,195,195,195,195,179,195,195,195,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,195,179,230,218,219,236,392,397,153,153,153,153,153,153,153,399,394,240,222,183,198,198,198,198,198,179,195,179,179,179,198,198,198,530,515,532,1268,1223,1223,1192,1223,198,198,206,206,198,198,179,195,195,195,179,179,198,198,198,198,198,198,1223,1192,1268,1268,1268,1268,1192,198,198,179,195,179,195,179,195,198,198,198,195,179,179,179,179,198,198,198,198,1268,1268,1268,1268,1268,1268,198,198,198,198,198,198,198,198,179,195,195,179,1251,1265,1266,1267,153,153,153,153,153,1268,1268,707,707,679,697,591,530,530,531,532,1268,1249,195,195,195,1253,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1266,1252,195,195,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,195,179,246,184,235,236,407,381,386,153,153,153,153,153,153,400,395,379,238,232,179,179,179,195,195,195,195,195,195,195,198,198,198,530,515,532,198,198,1223,1223,1223,1223,198,198,198,198,198,198,179,179,179,179,179,195,198,198,198,198,198,1223,1223,1192,1177,1268,1175,1192,198,198,179,195,195,179,179,198,198,198,198,198,195,179,195,198,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,198,198,198,195,195,179,1251,1268,1268,1268,153,153,153,153,153,1268,1268,722,722,695,697,697,530,530,531,532,1268,1249,195,195,195,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1249,179,179,1251,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+198,198,198,198,198,198,198,198,198,198,195,179,179,230,251,252,255,392,397,153,153,153,153,153,153,153,399,394,240,222,179,179,179,195,195,179,198,179,195,195,198,198,206,530,515,532,198,198,198,198,1223,1223,198,198,198,198,198,195,195,195,195,195,179,179,195,195,198,198,198,198,198,198,1192,1192,1192,198,179,195,179,179,179,179,179,198,198,198,198,198,195,179,195,198,198,198,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,198,198,179,179,1251,1268,1268,1268,153,153,153,153,153,1268,1268,1268,1268,1268,712,697,696,530,531,532,1268,1249,179,179,195,1251,1268,658,709,531,710,658,1268,1268,771,771,770,771,1268,1249,195,179,1251,1268,770,1268,1268,1268,1268,1268,1268,1268,772,773,773,771,771,771,771,771,869,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
198,198,198,198,198,198,198,198,198,198,198,195,179,246,184,217,236,392,397,153,153,153,153,153,153,153,400,395,379,238,770,773,198,198,198,198,198,179,195,198,198,206,206,530,510,506,508,198,198,198,198,198,198,198,198,179,179,195,179,195,179,195,179,179,195,195,195,195,179,198,198,198,198,198,198,179,179,195,179,195,179,195,198,198,198,198,198,198,179,195,195,198,198,198,1268,1281,502,502,502,502,502,502,502,502,502,518,530,515,532,1268,198,198,195,195,1251,1233,1234,1235,153,153,153,153,153,1233,1234,1235,1268,1268,1268,712,696,530,531,532,1268,1249,195,179,179,1251,1268,707,709,531,710,707,1268,1268,871,870,871,870,871,870,870,871,870,871,871,870,871,870,870,870,871,870,870,871,870,871,871,871,871,871,885,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
198,198,198,198,198,198,198,198,198,198,198,179,179,179,230,233,236,407,381,386,153,153,153,153,153,153,153,399,394,240,222,233,198,198,198,198,198,198,179,179,198,206,206,530,515,521,524,198,198,198,198,198,195,179,195,179,195,179,195,195,195,198,198,195,195,179,179,195,179,195,195,195,195,179,179,195,179,179,179,179,198,198,198,198,198,198,198,198,195,195,179,198,198,198,1268,1268,659,658,658,658,658,659,658,658,658,709,530,515,532,1268,1268,198,195,195,1251,1249,195,1251,153,153,153,153,153,1249,195,1251,1268,1268,1268,1268,712,535,615,536,1268,1249,179,179,195,1251,1268,508,508,508,508,508,1268,1268,887,886,887,886,887,886,886,887,886,887,887,886,887,886,886,886,887,886,886,887,886,887,887,887,887,887,872,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
198,198,198,198,198,198,198,198,198,198,198,198,179,195,230,249,252,255,392,397,153,153,153,153,153,153,153,400,395,379,238,251,198,198,198,195,179,198,195,179,198,198,206,530,515,504,505,198,198,198,195,195,179,179,179,195,195,195,179,179,198,198,198,198,198,179,179,179,179,195,179,179,195,179,179,179,179,195,195,198,198,198,206,206,206,198,198,198,195,195,179,198,198,198,1268,1268,707,675,707,707,707,1489,707,707,707,709,530,515,532,1268,1268,198,195,195,1251,1265,1266,1267,153,398,153,153,153,1265,1266,1267,1268,1268,1268,1268,1268,551,524,552,1268,1249,195,195,195,1251,1268,524,524,524,524,524,1268,1268,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,1765,1766,1767,1767,1769,153,153,153,153,1773,1773,1773,1773,1773,1774,1774,1776,1777,1778,1779,1780,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
@@ -743,8 +743,8 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1666,0,0,0,0,0,0,0,1669,0,0,0,0,0,1666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1666,0,1668,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1666,0,0,1668,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1662,1659,1660,1662,1659,1660,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1665,0,0,0,0,0,0,0,1670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1665,0,0,0,0,1667,0,0,0,0,1665,0,0,0,0,1670,0,0,0,0,1667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1669,0,0,0,0,1670,0,0,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1666,0,0,1666,0,0,0,0,0,0,0,0,0,0,0,0,0,1604,1605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1670,0,0,0,0,1670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1669,0,0,0,0,1670,0,0,180,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1666,0,0,1666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1670,0,0,0,0,1670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1667,0,0,1669,0,0,0,0,1668,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1665,0,0,0,0,0,0,0,0,0,1665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1668,0,0,0,0,0,0,1671,1666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1669,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1098,7 +1098,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,530,515,532,521,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,530,515,532,537,658,658,658,658,658,658,658,540,540,540,540,540,540,540,540,658,658,658,658,658,658,658,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,508,508,508,508,508,508,508,508,508,508,509,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,0,0,1110,0,0,1110,0,0,1110,0,0,1110,0,0,1110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,524,524,524,524,524,524,524,524,524,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,524,524,524,524,524,524,524,524,524,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,524,524,524,524,524,524,524,524,524,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1591,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1591,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1945,1946,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,831,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,555,556,557,508,508,508,508,501,520,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,658,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1960,1961,1962,1963,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,551,524,524,524,524,524,518,515,516,517,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1591,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1976,1977,1978,1979,0,1981,1982,1983,1984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1459,8 +1459,8 @@
2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,0,0,0,0,2663,2663,2662,2662,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,2662,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,2663,2664,2664,2664,2664,2664,2664,2664,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,2663,0,0,0,0,0,0,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2662,2664,2664,2662,2664,2664,2662,2664,2664,2662,2664,2664,2662,2664,2664,2662,2664,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,0,0,0,0,0,2663,2662,0,0,0,2662,0,2662,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,2663,2664,2664,2664,2664,2664,2664,2663,2663,0,0,2665,2665,0,0,0,2665,2665,0,0,0,2665,2665,0,0,0,2665,2665,0,0,0,2665,2665,0,0,0,2665,2665,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,0,0,0,0,0,0,2662,0,2662,0,0,2662,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,0,2662,2662,2662,2662,2662,0,2662,0,0,2662,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,2663,2664,2664,2664,2664,2664,2663,0,0,0,0,0,0,0,2662,0,0,0,0,2662,0,0,0,0,2662,0,0,0,0,2662,0,0,0,0,2662,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
-2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,0,0,0,0,0,0,2662,0,2662,0,0,0,0,2662,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,2663,2664,2664,2664,2664,2664,2663,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
-2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,0,0,0,0,0,0,2662,0,0,2662,0,0,2662,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2663,2664,2664,2664,2664,2663,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,2662,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
+2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,0,0,0,0,0,0,2662,0,2662,0,0,0,0,2662,0,0,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,2663,2664,2664,2664,2664,2664,2663,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
+2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,0,0,0,0,0,0,2662,0,0,2662,0,0,2662,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2663,2664,2664,2664,2664,2663,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,2662,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,2664,0,0,0,0,0,2662,2662,2665,2665,2662,0,0,0,0,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2663,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,2662,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2663,2664,2664,2664,2664,2663,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,2664,0,0,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2663,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2663,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,2662,0,2663,2664,2664,2664,2663,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2664,2664,2664,2664,0,0,2662,2662,2662,2662,2662,0,0,0,0,0,0,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2663,2663,0,0,0,0,0,0,0,0,0,0,2663,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2663,2664,2664,2664,2663,0,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2662,2662,0,0,0,0,0,0,2662,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2664,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,2662,
@@ -1802,7 +1802,7 @@
<properties>
<property name="dest_map" value="001-2-28"/>
<property name="dest_x" value="29"/>
- <property name="dest_y" value="39"/>
+ <property name="dest_y" value="42"/>
<property name="npc_id" value="NPC_ARTIS_DOOR"/>
<property name="trigger_x" value="2"/>
<property name="trigger_y" value="3"/>
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index b01f8d52..83acf99b 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -416,7 +416,7 @@
910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,913,913,913,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,913,913,913,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
-910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,910,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
@@ -480,8 +480,8 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,896,896,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,895,895,895,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,894,894,894,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,893,893,893,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index a14a1878..4413f485 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -473,7 +473,7 @@
<properties>
<property name="dest_map" value="001-2-6"/>
<property name="dest_x" value="57"/>
- <property name="dest_y" value="34"/>
+ <property name="dest_y" value="36"/>
</properties>
</object>
<object id="3" name="To Library Warehouse" type="ani_warp" x="1664" y="864" width="32" height="32">
diff --git a/quests.xml b/quests.xml
index 980866e8..baedff9e 100644
--- a/quests.xml
+++ b/quests.xml
@@ -572,7 +572,7 @@ Copyright (C) 2012-2013 Evol Online -->
<questgiver>Rumly</questgiver>
<coordinates x="35" y="125">Artis, Market Place. (35,125)</coordinates>
</quest>
- <quest name="Plushroom Addict" group="Artis" complete="2">
+ <quest name="Plushroom Addict" group="Artis" incomplete="2">
<name>Plushroom Addict</name>
<text text1="[Plushroom]">Rumly is waiting for you to bring him some {@@1}s.</text>
<text></text>
@@ -604,6 +604,7 @@ Copyright (C) 2012-2013 Evol Online -->
<effect map="001-1.tmx" npc="140" value="7" effect="14"/>
<effect map="001-1.tmx" npc="119" value="8" effect="13"/>
<effect map="001-2-26.tmx" npc="127" value="8" effect="12"/>
+ <effect map="001-1.tmx" npc="119" value="9" effect="13"/>
<quest name="Newby Quest" group="Artis" incomplete="1">
<name>Newby Quest</name>
<text>You are charged to visit Chelios and bring back Enora's package.</text>
diff --git a/skills.xml b/skills.xml
index da86c6e9..d4aff23a 100644
--- a/skills.xml
+++ b/skills.xml
@@ -47,4 +47,11 @@ Copyright (C) 2010-2013 Evol Online -->
description="Draw text on ground."
useTextParameter="true"/>
</set>
+ <set name="Restricted">
+ <skill
+ id="20002"
+ name="Super Menu"
+ description="Gives access to all debug and administrative options"
+ invokeCmd="@numa"/>
+ </set>
</skills>
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-03 04:13:37 +0000