aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java3
-rw-r--r--src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/temple-3.skeletonbin66367 -> 67613 bytes
-rw-r--r--src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/zodd-1.skeleton4
-rw-r--r--src/main/resources/assets/skyblocker/dungeons/dungeonrooms.json9
-rw-r--r--src/main/resources/assets/skyblocker/dungeons/secretlocations.json171
-rw-r--r--src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json63
-rw-r--r--src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeletonbin72491 -> 73991 bytes
-rw-r--r--src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Zodd-1.skeletonbin0 -> 68718 bytes
-rw-r--r--src/test/resources/assets/skyblocker/dungeons/secretlocations.json716
9 files changed, 871 insertions, 95 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
index d5d57e70..4f5da8de 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
@@ -86,7 +86,7 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit
public class DungeonManager {
protected static final Logger LOGGER = LoggerFactory.getLogger(DungeonManager.class);
private static final String DUNGEONS_PATH = "dungeons";
- private static final Path CUSTOM_WAYPOINTS_DIR = SkyblockerMod.CONFIG_DIR.resolve("custom_secret_waypoints.json");
+ private static Path CUSTOM_WAYPOINTS_DIR;
private static final Pattern KEY_FOUND = Pattern.compile("^(?:\\[.+] )?(?<name>\\w+) has obtained (?<type>Wither|Blood) Key!$");
/**
* Maps the block identifier string to a custom numeric block id used in dungeon rooms data.
@@ -214,6 +214,7 @@ public class DungeonManager {
* Use {@link #isRoomsLoaded()} to check for completion of loading.
*/
public static void init() {
+ CUSTOM_WAYPOINTS_DIR = SkyblockerMod.CONFIG_DIR.resolve("custom_secret_waypoints.json");
if (!SkyblockerConfigManager.get().locations.dungeons.secretWaypoints.enableRoomMatching) {
return;
}
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/temple-3.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/temple-3.skeleton
index be716268..9e7d3e45 100644
--- a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/temple-3.skeleton
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/temple-3.skeleton
Binary files differ
diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/zodd-1.skeleton b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/zodd-1.skeleton
new file mode 100644
index 00000000..280dd405
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/1x1/zodd-1.skeleton
@@ -0,0 +1,4 @@
+xI쳲*ˬzEѨ@hGo3<n<uǃ787K|}_<5O?gOo'~O}gzzWz_FoNAIE_M~C/O> ;`v;`v;`v;`O>艹^^~;}'}}7MC?y$dCv!;dCv!;dCv!;dCv;bG#vĎ;bG#vĎ;bG#vĎ;bG#vĎ1;fcv̎1;fcw}߱;fcv̎1;fcvN ;a'석vN ;a'석vN ;a'석vN ;a'석{^{^{^Ň7Oœ{g`/ `/ `/ d/Kd/Kd/KxKޒ-yKޒ-yKޒ-y+ފx+ފx+ފx+ʵ\ߊx+ފx+ފx+ފykޚykޚykޚ]ykޚykޚykޚyކmxކmxކmxކmxކmxކmxކmx[ޖmy[ޖmy[ޖmy[zvY햽eo[eo[eo[c;c;c;c[b[c;c;c;c{g{g{g{g{g{g{g{SvN);e씝SvN);e씝SvN);e씝SvN);e쌝3v;cg쌝3v;cg쌝3v;cg쌝3v;c윝sv9;g윝sv9;g윝sv9;g윝sv9`] v.`] v.`] v.`] v.%d]Kv.%d]Kv.%d]Kv.%d]Kv>>>>>>>>bW]+vŮbW]+vŮbW]+vŮbW]+vŮ5f]kvͮ5f]kvͮ5f]kvͮ5f]kv>#>#>#>#>#>#>#>#>O>O>O>O>O>O>O>O3>3>3>3>3>3>3>3>vn a7ݰvn a7ݰvn a7ݰvn a7ݲ[vn-eݲ[vn-eݲ[vn-eݲ[vn-e ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾;vcwݱ;vcwݱ;vcwݱ;vcwݳ{v=gݳ{v=gݳ{v=gݳ{v=g={`={`={`={`_W}e_W}e_W}e_W}e_W}e_W}e_W}e_W}c7}c7}c7}c7}c7}c7}c7}c7}gw}gw}gw}gw}gw}gw}gw}g#{d=G#{d=G#{d=G#{d=GȞ{bO='Ğ{bO='Ğ{bO='Ğ{bO='̞3{f=g̞3{f=g̞3{f=g̞3{f=vy8ᜇsy8ᜇsy8ӧ>yߧzzzEoV^QY_U7?Ӏv;`v;`v;`v;`Ꙟ^^[{}G}g}W}ӯПK?S<}Cv!;dCv!;dCv!;dCv!;d#vĎ;bG#vĎ;bG#vĎ;bG#vĎ;bcv̎1;fcv̎}߱;}Ǿcv̎1;fcv̎1;a'석vN ;a'석vN ;a'석vN ;a'석vN `/ `/ `/ ÛG`/ `/ `/ d/Kd/Kd/K钳,9KΒ,9KΒ,9KΊ8+Ί8+Ί8+ʵ+Ɗb+Ɗb+ƊbkƚfkƚfkƚfyfkƚfkƚfkƚalƆalƆalƆy惾}6 o6 o6 o-o-o-o~ݖl9[Ζl9[Ζl9[Ύ8;Ύ8;Ύ8;Ύ>~~;c;c;c{g{g{g{7goߜ={޳={޳={޳={N);e씝SvN);e씝SvN);e씝SvN);e씝Sv;cg쌝3v;cg쌝3v;cg쌝3v;cg쌝sv9;g윝sv9;g윝sv9;g윝sv9;g] v.`] v.`] v.`] v.`]Kv.%d]Kv.%d]Kv.%d]Kv.%d}`}`}`}`}`}`}`]+vŮbW]+vŮbW]+vŮbW]+vŮbW]kvͮ5f]kvͮ5f]kvͮ5f]kvͮ5fG}dG}dG}dG}dG}dG}dG}dG}b'}b'}b'}b'}b'}b'}b'}b'}fg}fg}fg}fg}fg}fg}fg}f a7ݰvn a7ݰvn a7ݰvn a7ݰvn-eݲ[vn-eݲ[vn-eݲ[vn-eݲ[}a_}a_}a_}a_}a_}a_}a_}a_cwݱ;vcwݱ;vcwݱ;vcwݱ;v=gݳ{v=gݳ{v=gݳ{v=gݳ{{`={`={`={`=+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾoƾoƾoƾoƾoƾoƾoƾoξ;ξ;ξ;ξ;ξ;ξ;ξ;ξ=G#{d=G#{d=G#{d=G#{dO='Ğ{bO='Ğ{bO='Ğ{bO='Ğ{f=g̞3{f=g̞3{f=g̞3{f=g̞>H>g>3= +/zz_]w?~?ov;`v;`v;`v'OT\/RZ>>닾~w_[y!;dCv!;dCv!;dCv!;d#vĎ;bG#vĎ;bG#vĎ;bG#vĎ;bGcv̎1;fcv̎1;}Ǿcw̎1;fcv̎1;f석vN ;a'석vN ;a'석vN ;a'석vN ;a/ ٛgzzEoV^/>9~{˳7?*`/ ⇟`/Ku/Kd/Ku/w-]ҵ-7?/]/וr_W}]++ue~lՏ/V6W6W666666666666~׵͵͵͵__nnnnnnnnnnnno_mo͟ｱm:~ӯ_m]ǖl9[ױl9[Ζ8;Ύ8;Ύ8;Ύ;<;ε;wcX;lڱ=kڳ=kڳ=kڳi|lI˳3̽l?7׹g]㞻ܔrSnM)7ܔrSkMw&w*w*Τ5妞锛zgRL}M3g:Lה3v;cg쌝3v;cg쌝3v;cg쌝3v;cg쌝sv9;g윝sv9;g윝sv9;g윝sv9;g] v.`] v.`] v.`] v.`]Kv.%d]Kv.%d]Kv.%d]Kv.%>>>>>>>>]+vŮbW]+vŮbW]+vŮbW]+vŮb]kvͮ5f]kvͮ5f]kvͮ5f]kvͮ5>#>#>#>#>#>#>#>>O>O>O>O>O>O>O>3>3>3>3>3>3>3>3n a7ݰvn a7ݰvn a7ݰvn a7ݰvn-eݲ[vn-eݲ[vn-eݲ[vn-eݲ/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ cwݱ;vcwݱ;vcwݱ;vcwݱ;v=gݳ{v=gݳ{v=gݳ{v=gݳ{`={`={`={`}e_W}e_W}e_W}e_W}e_W}e_W}e_W}e_W}c7}c7}c7}c7}c7}c7}c7}cw}gw}gw}gw}gw}gw}gw}gw}g=G#{d=G#{d=G#{d=G#{bO='Ğ{bO='Ğ{bO='Ğ{bO='Ğ3{f=g̞3{f=g̞3{f=g̞3{f=g~p|0aaaaaaaaaaa>yߧzzzEoV^QY_U7?v;`v;`v;`v;`Ꙟ^^[{}G}g}W}ӯПK?S=!;dCv!;dCv!;dCv!;dCvĎ;bG#vĎ;bG#vĎ;bG#vĎ;bGcv̎1;fcv̎1;fcv̎1;fcv̎1;f옝vN ;a'석vN ;a'석vN ;a'석vN ;a'{^<_/ً׎G_/>8~'}7?M9? d/ytK|%o7ҵ-K?SvvWvWvWiewew~\\rM++VVVU6׮}msmsw\\=7}yq?7~ύ͍ͭͭͭͭͭͭͭͭͭͭͭ/Ϸ??~wϷ_=?[Ζlu [emY;֎cX;֎cX;֎c8;Ύ*Ǝc8;Ύ9{Ξ9{Ξ9{}ڳ~ys=ww/ދ{߸{nM)7ܔrSnM)7N;z'SdL{z'SdMw2NkN٩1e쌝3v;cg쌝3v;cg쌝3v;cg쌝3v;c윝sv9;g윝sv9;g윝sv9;g윝sv9`] v.`] v.`] v.`] v.%d]Kv.%d]Kv.%d]Kv.%d]Kv>>>>>>>>bW]+vŮbW]+vŮbW]+vŮbW]+vŮ5f]kvͮ5f]kvͮ5f]kvͮ5f]kv>#>#>#>#>#>#>#>#>O>O>O>O>O>O>O>O3>3>3>3>3>3>3>3>vn a7ݰvn a7ݰvn a7ݰvn a7ݲ[vn-eݲ[vn-eݲ[vn-eݲ[vn-e ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾;vcwݱ;vcwݱ;vcwݱ;vcwݳ{v=gݳ{v=gݳ{v=gݳ{v=g={`={`={`={`_W}e_W}e_W}e_W}e_W}e_W}e_W}e_W}c7}c7}c7}c7}c7}c7}c7}c7}gw}gw}gw}gw}gw}gw}gw}g#{d=G#{d=G#{d=G#{d=GȞ{bO='Ğ{bO='Ğ{bO='Ğ{bO='̞3{f=g̞3{f=g̞3{f=g̞3{f=}0{zzzzzzzzzzzſO޾^^~;}'}}7MC?y"`v;`v;`v;`v=y⿧zzzEoV^QY_U7?rCv!;dCv!;dCv!;dCv!;d#vĎ;bG#vĎ;bG#vĎ;bG#vĎ;bGcv̎1;fcv̎1;fcv̎1;fcv̎1;f'석vN ;a'석vN ;a'석vN ;a'석vN {^޼X<{ґx>9_|q*Wb/~wd/؋C?^%{^/^%{麗/X~poU~\+״r?WvW\]w_^~+篜vk篝vk篝vk^k׽koqoqoqo\;}G<ۏ_^lں_[ikwkwkwgwgwgwgwgwgwgwgwgwgwgwgwgww}'.v߿fZv͎c{枹g{枹g{枹{枹g?bwܻν3̔2SfL)3e̔2SfJ_zSWJ_+ޯzSWO=+u+e쌝3v;cg쌝3v;cg쌝3v;cg쌝3v;c윝sv9;g윝sv9;g윝sv9;g윝sv9`] v.`] v.`] v.`] v.%d]Kv.%d]Kv.%d]Kv.%d]Kv>>>>>>>>bW]+vŮbW]+vŮbW]+vŮbW]+vŮ5f]kvͮ5f]kvͮ5f]kvͮ5f]kv>#>#>#>#>#>#>#>#>O>O>O>O>O>O>O>O3>3>3>3>3>3>3>3>vn a7ݰvn a7ݰvn a7ݰvn a7ݲ[vn-eݲ[vn-eݲ[vn-eݲ[vn-e ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾;vcwݱ;vcwݱ;vcwݱ;vcwݳ{v=gݳ{v=gݳ{v=gݳ{v=g={`={`={`={`_W}e_W}e_W}e_W}e_W}e_W}e_W}e_W}c7}c7}c7}c7}c7}c7}c7}c7}gw}gw}gw}gw}gw}gw}gw}g#{d=G#{d=G#{d=G#{d=GȞ{bO='Ğ{bO='Ğ{bO='Ğ{bO='̞3{f=g̞3{f=g̞3{f=g̞3{f=}0x0x0x0x0x0<}/}gzzWz_FoNAIE_M~C/O޾ ;`v;`v;`v;`O艹^^~;}'}}7MC?Cv!;dCv!;dCv!;dCv!;dG#vĎ;bG#vĎ;bG#vĎ;bG#vĎ;fcv̎1;fcv̎1;fcv̎1;fcv̎ ;a'석vN ;a'석vN ;a'석vN ;a'석v^ų7/B{Ƿb/؋~(g#{78?{^^^|r^/~f/]r-K{K{+{+{+{+{+{+ײr-+qeoZV6V6V6V6V666666];wܵs~s]s8w܍s78o㼍68oGױq);;[;[;[;[;[ݗ[ckkIesks۹;|ǻvw_ܹݯ_X;֞gY{֞gY{֞gY{×{֞w {װwޞ]=o=/奼R^Ky)/奼SזzwRNM=w'zwRNM;7ޝԳSv;cg쌝3v;cg쌝3v;cg쌝3v;cg쌝sv9;g윝sv9;g윝sv9;g윝sv9;g] v.`] v.`] v.`] v.`]Kv.%d]Kv.%d]Kv.%d]Kv.%d}`}`}`}`}`}`}`]+vŮbW]+vŮbW]+vŮbW]+vŮbW]kvͮ5f]kvͮ5f]kvͮ5f]kvͮ5fG}dG}dG}dG}dG}dG}dG}dG}b'}b'}b'}b'}b'}b'}b'}b'}fg}fg}fg}fg}fg}fg}fg}f a7ݰvn a7ݰvn a7ݰvn a7ݰvn-eݲ[vn-eݲ[vn-eݲ[vn-eݲ[}a_}a_}a_}a_}a_}a_}a_}a_cwݱ;vcwݱ;vcwݱ;vcwݱ;v=gݳ{v=gݳ{v=gݳ{v=gݳ{{`={`={`={`=+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾoƾoƾoƾoƾoƾoƾoƾoξ;ξ;ξ;ξ;ξ;ξ;ξ;ξ=G#{d=G#{d=G#{d=G#{dO='Ğ{bO='Ğ{bO='Ğ{bO='Ğ{f=g̞3{f=g̞3{f=g̞3{f=g̞>>`>`>`>`>`>W>3= +/zz_]w?~?o_v;`v;`v;`v'O_T\/RZ>>닾~w_[y!;dCv!;dCv!;dCv!;d#vĎ;bG#vĎ;bG#vĎ;bG#vĎ;bGcv̎1;fcv̎1;fcv̎1;fcv̎1;f석vN ;a'석vN ;a'석vN ;a'석vN ;a/ ٛW #{؋7o{o#{Wo~Uo?{^%{^{麗^/?ܥsW]9w垭ٕϮ~)[>?>Zg>l|fcgsݗWO^m}~o|~[u9[l}~}r/-wkgkgkgggggggggwvvv띝{gW}ןKOG;{{{{{}ݻ{ƞg{Ҟ˫'}~jw޳߾ڳY{5}{֞RVJY)+eRVJ]OK=?g7Ե=J='즞Գz~RO:SON;cg쌝3v;cg쌝3v;cg쌝3v;cg쌝3v9;g윝sv9;g윝sv9;g윝sv9;g윝sv.`] v.`] v.`] v.`]Kv.%d]Kv.%d]Kv.%d]Kv.%d}`}`}`}`}`}`}`}`vŮbW]+vŮbW]+vŮbW]+vŮbW]kvͮ5f]kvͮ5f]kvͮ5f]kvͮ5f}dG}dG}dG}dG}dG}dG}dG}dG}b'}b'}b'}b'}b'}b'}b'}bg}fg}fg}fg}fg}fg}fg}fg}f7ݰvn a7ݰvn a7ݰvn a7ݰvn eݲ[vn-eݲ[vn-eݲ[vn-eݲ[vn}a_}a_}a_}a_}a_}a_}a_}awݱ;vcwݱ;vcwݱ;vcwݱ;vgݳ{v=gݳ{v=gݳ{v=gݳ{v{`={`={`={`=+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ƾoƾoƾoƾoƾoƾoƾoƾo;ξ;ξ;ξ;ξ;ξ;ξ;ξ;ξG#{d=G#{d=G#{d=G#{d='Ğ{bO='Ğ{bO='Ğ{bO='Ğ{bO=g̞3{f=g̞3{f=g̞3{f=g̞3{f?>`>`>`>`>`>`>y'o_T\/RZ>>닾~w_[}v;`v;`v;`Q\_m$Fh22k {(UpkƮk?ygޛdṋ3&0Sh>/f2q:ή:ή:ή:ή:ή:ή:ή:nnnnnnnnn&n&n&n&n&n&n&nn[n[n[n[n[n[n[n6n6}cn͝777mvwemvvgv۟amv~b?yzoO:'~b?~=<6og?;yv}<7??߳ߋϋ݋߽ݫ߽ݫ߽뗇WW7s}8oyxK7oay4c7vqlDZ׶;8y8ǭ::븮㺎.]Iu.]{tӵo[t]|3?t9]N8=N8=N8=yzuy{]syz>>>>>>>>{{{{{{{{!{!{!{!{!{!{!{{G{G{G{G{G{G{G{1{1{1{1{1{1{1{1{̞' {ž' {ž' {ž' {ž' {ž' {ž' {ž' {ʞ){ʞ){ʞ){ʞ){ʞ){ʞ){ʞ){ʞ{ƞg{ƞg{ƞg{ƞg{ƞg{ƞg{ƞg{ƞ9{Ξ9{Ξ9{Ξ9{Ξ9{Ξ9{Ξ9{Ξ9{^{^{^{^{^{^{^{^{^%{^%{^%{^%{^%{^%{^%{^{^W{^W{^W{^W{^W{^W{^W{^5{^5{^5{^5{^5{^5{^5{^5{ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {޲-{޲-{޲-{޲-{޲-{޲-{޲-{޲{ޱw{ޱw{ޱw{ޱw{ޱw{ޱw{ޱw{ޱ={޳={޳={޳={޳={޳={޳={޳={>>>>>>>>>#>#>#>#>#>#>#>>O>O>O>O>O>O>O>3>3>3>3>3>3>3>3̾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ʽr+ʽr+ʼ2+ʼ2+ʼ2+ʼ2+ʼ2+߿neޙh>sk̽I&L6T<jo4oc{[c5v]c5v]c5v]c5v]c5v]c5v]c5v]c5߿;|0'scn͝7Ʉɦ<G|1_7m~mk^guv]guv]guv]guv]guv]guv]guv]guv`7 v`7 v`7 v`7 v`7 v`7 v`7 v`7Mvd7Mvd7Mvd7Mvd7Mvd7Mvd7Mvd7Mvd-vb-vb-vb-vb-vb-vb-vb-vfwwh>n߹em;LmW?n6?O6 }>q9?qOܧ[}7n>9ٱώ}v|g{{W{W{uN뗇WyuWys7ys7ysx}+7Ǽ91t:q|w<_w<v>v<?n=':ίcWǮ]]vuMеkwpۍnv[nny~opet=Fc=Fc=Fc=+2myOzy[}n}n}n}w>`<}vg}vg}vg}=`=`=`9\{8{vy{{{!{!{!wr|9dC9dC9d#9b#9b#9b#y3e#9b#9b#9b#9fc9fc9fcxlo>̱՘;v}1ws1ws1w̝p'ɻɝ{Û8ωk;q9aN\ s\'_=39aN9aN9eN`>Oܚ;so M1y0boaOS=eOS=c3=c3=c3=c3=c3=c3=c3=c3=gs=gs=gs=gs=gs=gs=gs=g `/ `/ `/ `/ `/ `/ `/ `/Kd/Kd/Kd/Kd/Kd/Kd/Kd/Kb+b+b+b+b+b+b+b+fkfkfkfkfkfkfkfaoaoaoaoaoaoaoao[eo[eo[eo[eo[eo[eo[eo[c;c;c;c;c;c;c;c;g{g{g{g{g{g{g{g}`}`}`}`}`}`}`}`G}dG}dG}dG}dG}dG}dG}dG}b'ߛ'ߛ'ߛ'ߛ'_'ߛ'ߛ'ߛ'ߛ'O|o|_||wmrE'|w|w|w'}b'}bg}fg}fg}fg}fg}fg}fg}fg}a_}a_}a_}a_}a_}a_}a_}a_ޫW{^{jޫW{^{jޫW{^w`>Oܚ;so M1y0bo0?/15v]c5v]c5v]c5v]c5v]c5v]c5v]c5v/μ7Gܘ[sgM2a)2|6_W|7e~?uv]guv]guv]guv]guv]guv]guv]guv`7 v`7 v`7 v`7 v`7 v`7 v`7 v`7 vd7Mvd7Mvd7Mvd7Mvd7Mvd7Mvd7Mvd7-vb-vb-vb-v*wwʰ[n[n[n[n|27v;eۏwkmxn^[^{=xOɹ>dܞmzٮg]gzzٞg>;g=;q/{q܋^//^8/wWߌWǼ:1oys̛co7Ǿyފ탱s<ovձcWǮ]:γ8ߎ;ηcocoގ:_70^^]uy]^uy]^uy]^u.]ev>uevyofev=fc=fc=fc]1{=x=Ǟ1{^=zyzs>s>sܾkg}׶}n}n}n};;;{aw|~x ;;;C;C;C;C;|xyZC=dC=dC=b#=b#=b#=b#=b#=b#=b#=b#=fc=fc=fc;=c;掹c;掹c;掹c;N`>Onnro&܉ϔ;>0'̉h};aN9aN9eNS9wӏ擹15V~~0b۔3gΔ3L9SΔ3L93Ό3s^3Ό383s8sN3Ό38383Ό383Ό383Μ3]9kΚ9kΚ s޼9gΙs9gysޜ7ysޜ7y ނ-x ނ-x ނ7q\d?sw]pw`/ `/ `/Kݒd/Kd/K<.Kd/Kd/]%{^%{^%{^Ww]qWw]qW^?+⮸+⮸+r+⮸+⮸+]5{^5{^5s\35s\3̵s]35s\35s\37 s07 s07 sx]maoao7 {ް7 {ް-{h޲-{޲-{9޲-{޲-{:-wr-wr-wqwwqwwqwwqwwqwww{ޱw{ޱw{޳={޳={޳={o={޳={޳={޳={޳={>>>>xO}`}{{G{dGydGy::#<2#<2=r#=r#=rOZ||ם|ם|ם|ם|ם|ם|םO{{{{oEO8N8y/|ߝ'}b'}bg}fg}fg}fg}fg}fg}fg}fg}a_}a_}a_}a_}a_}a_}a_}a_}e_W}e_W}e_W}e_W}e_W}e_W}e_W}e_s;|0'scn͝7Ʉɦ<G|1_7m~mkƮkƮkƮkƮkƮkƮkƮk?ygޛdṋ3&0Sh>/f2q:ή:ή:ή:ή:ή:ή:ή:nnnnnnnnn&n&n&n&n&n&n&nn{o7[7n̽ Mo=G?sZ_܏8-N8-N8mNf?Ӿ5wmV;^boo7o߿c'r O''\)WOxc{پg]g?<?l׳=o/s9|qNjkjy}uW5~u+c{u7Ǿ1ޜ[zs[1y0979zͮ]:Kx,q:;ιckcoގ{;ߌ@۟0:2umZkr.]o߆etKt9]N<=N8=N-^=NOzyk|z^s=\kyyMx=^Y}V\>\>y{^}ߵ>>>k^y <Gր5kmooo!o9~|:Ϡ!graw>!gr!gr!gr!gqF8rn#67rn#6rG>FsF^#ވ7x#ވ7x#ވ7x#ޘ7yc1ov{F1w\u;掹c;掹c;掹c;N8Z8 s3}™k~3}Rg5aM>O& g™p& g™p&)gʙzLcO?GxS響7ojԾ}SM7oz?9sfΙ7sf7of̾}3f7wv5w{sqv9snιs;v.\ع.]ػwqc~/X0ǽpcX0cX0%cX2%cX2,+%gYre\%gYr%gYrgYqVcX1V՝7Uv[ s\1WsVs\1Ws\1Ws\35s5w]s5w殹k殹kڹk殹k殹kn߯憹an憹Yp7 wp7 w|7 wp7 wp7 wr'ݲ-{޲7Öeo[eo[[eo[eo[c;zg``|ޱw{y;c|&|W\wqwwqwws=wݻ{g{E{{y{{E{3=s3=s3<8y`|y9{w`;8;;;>yGޑwyGGytGޑwtGx=G{G{G{➸'{||~]vyY9y-\ߓs=oOӓ>O>O3>3>3>3>3>3>3>3>/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾJ}_yo>擹1ܛddSLẹln6?O6?ƮkƮkƮkƮkƮkƮkƮkƮkW/μ7Gܘ[sgM2a)2|6_W|7e~?uv]guv]guv]guv]guv]guv]guv]guv`7 v`7 v`7 v`7 v`7 v`7 v`7 v`7 vd7ݥ&-a7Mv ny0d7Mvd7Mvd7Mvbحw|4̍5Vrͣew-[vnݲewmSCj߶mvR0m{>dOv>1iӓ}Oww?2ǭ]Ov=l׳پg{Ggٮg?;ٱώ}vc_ڽx^><Ǿ8q/ymǼ:1ye~5z+1c^7Ǽ9c|q~z\9ͱo? ͎7͎7;:vtѱ\Sc|{L:O/?{Lz?Oz?S>Sޮ]SkE'M4}I'M4}٥S.MzvivO=WgvO=iݓvO=iݓvO=ooﵢS?}K0^rt{껶}עI'ݞt{I'ݞt{IguݓvO= fO= VOӓNO:=ӓNO:=kt1 ޻uuzf?[ӓNOCk C'4zI'4zIFO=<~myqF:myi<FcZi͓6O<i͓6O<iع9ccjiIsifφ7ycɓ&O<iɓ&O<iɓ&O˓&OirkӉIK<M߄7i4q~<i͓6O<i͓6O<M4}g\)ojsnI'M4yI'M4y3g5̮u1٥ǓOz<ǓOz<ǓOsvͽ~`nO:<I'txI'txI] g®]z;-ZإNz;Nz;NKv.tvZzh촴{-vk줱N;i줱N;i줱;Ic']Vv餧~=V~=tIO'=tIO'=tZۿtIO'=֬חNZ:i餥ӚNkNZ:i餥NZ:i餥NZ:mN-tIK'-6̍IK'-tiiptIK'-tIK'-tirUKGl-tIK'ttIG'ttrutr\ttIG'ttIG'tti9WGWG'ttIG'ttIG'vߎ褣N::褣N::褣N{:-ܙ{{n>;[LG=SK=WK'-tIK'-tIK'-t:pup>Ńk}`}`غ::iꤩN:iꤩN:iꤩӑ9ktG{tdGydjꤩӑNz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧Nz:餧CO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:tӡCO=z:th7G<Dm4onfŰt4n=z:tӡCO=z:t=FChԡ_uN/nѡCG::ttѡCGGC]K폏C;Gv9s܆v7cΡ鯇1sxC3NOyǡC /~qйsC΍WYƫ߽ަxu=5o^=?nsC oѹ77c9V ooԻwC wcWw㜵ntҺq:7tnйsCF9hиѵC߆fݿQFczG:7tnйѳOF{g =Fۆ m6mhжmCۆ m6v_c/]ט 64lhаaCÆ 6 V WC^ z5jЫWCЮ]z5ЫMcԧ1iЧOC> }4iЦMc亍ԦMcM1{whЦKC. ]4tiХKC.<_~=z4>h}>?GC1G =z4hУGC gѣ14&<M{wICƄ9yIcœxiФIC& M44ihФIC& Mkecʛޙ{|vOn_n֩SCN :5tjЩScfn3fvҩSCN :5tjЩSCN s}ncۥSCN :5tjЩSCN :5v-\} ? M^z5jЫWC^ z5jЫWci^}Kv-ҧOC> }4iЧOC> }+i6}44iԤIC& M44ihФIC& Mk;5iԠAcmu\{^Н;Cw 3tgН;Cw{gl֞=Cs Z36,ֆ5Ck Z3fhК5Ck Z3,[֖5Ck [ [ z3flz3flz3fЛ7Co z3fЛ7c֛7c֛7Co z3fЛ7c֚5Ck Z3fhК5Ck Z3Vћ7Ck Z3fyZ3fhК=3Cg :3tfЙ3Cg :3L:34fhИ1ӗ/C_ m2>eЗ/C_ }2eЗ/C_Ƒ/C_u՗/C_ԗ/C_sԗqdЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }2eЗ/C_ }e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}e֗Y_f}ܼ|L&LŰen>2ˬ/2ˬ/Mw|ˬ/syˬ/̭Ǭ)s뫱KWf]ue֕YWf][vj٥+̺2ҕmZ2ka%smn:hɬ%d֓YGfud֑wYCf =f 91k<c֎Y3f͘5c~_N:1jF1kĬ z0oq9F f-u`p:v_e헵_~h/keu]tuL1:/w=.Keu^yYeu^ݥr.k.k.k}1ۡr=\sYe=\sYe=\A--\rYe-\rYe-\rYЮ?5viᲆ.kᲆ.k. [٣߲~-<z4~-<V 5\pYe 5\pYe 5\pyu6v:.oRqyqyW3oYe[oYe[oYe[oyzL>}vv˓dߵ[nY]QǬݲv-kݲv-kݲv-k<<ݖu[lYeZkYeZkYeZkYeZjy=.ZkYeZkYeZkYeZkYeviղVZ-kղVZ-kղVZ-kղV:-/nHeuZiYeuZiYeuZiYeuZiYcc[nXڻٿlYe͖5[lYe͖5[lYe͖5[lY啽+{u[^]٫^ݖu[mYeݖu[mYeݖu[mYeݖu[mymnk@n[^ۯ߲~-뷬߲~-뷬߲~-뷬߲~-ooY C-oF7kٲf˚-kٲf˚-kٲf˚-kٲf[5[kYeEeZky뽱\赼구ײ^z-뵬ײ^z-뵬ײ^z-뵬ײ^;y鵬ײ^; ײ^z-^;۲n˺-붬۲n˺-붬۲n˺-붬۲n{{n˺-붬۲n˺-붬ݲv-kݲv-kݲv-kݲvvݲv--뷬߲~p=8_ 5\pYe 5\pYe 5\pYe 5\>r5\p=ᲆ.k|tu\qYs>>>fl-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rYe-\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\rE-W\i~-s{ኆ+4hኆ+hኆ+hኆ+hJCo8^Vt[mEVt[mEVt[mEVZjOo<ZjEVZjEMV[=VXyhŊ+Z?UW^E{oo߿4W\EsλǢJǹuqOv?cYEg}UoKa髢*諢*z詢*z詢*zjX:訢*:訢*:訢کh2p.ϓv*کhv*کhv*کhZhV*ZhV*ZhV*#oXTtQDe2CE=TPCE=TPCeCETtO<e<hy)hy)hyc|X&=:LxO29exO2aL):蜢s):蜢s):蜢e)Zhe)Zhe)Zhef)hYf)hYf)hYf)蓢O>)蓢O>)蓢O>)蓲PtI$EMR4I$EMR4I$EMR4I$EMRhKRtH!ERtH!ERtH!ERtH!eeطz|,hA)hA)hA)hA)hA萢Cʺ2>oH!ERtH!ERtH!ERtH!ERtH!eptHp6=R6=R6G)z葢G)z葢G)z葢G)z葲葲葢E):lY[(菢?(菢?(菢?(菢?(;(<菲鏢?(;菲c돲c돢?(菢?(菢?(菢?({[{)菢?(菲ꏢ?TQGEQGEQGEQGE<xGEEAQGEQGEQGEQG9rGZ돢?(G?(G(G?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢?(菢=(ڣh=(ڣh=(ڣh=(ڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TڣG=*QiJ{TakJ{T;so U󳟿tG;*QJwTtG;*Q鎪|0׻ء=*QiJ{TڣG=*Q=V]=2iq<G=*QiJsTϮިF7EoTzz;QiJkTZz5Q\gInn%w]UL*)(*5dv׬?C$"uY3g4h7~/W4h\Ѹ=oWqE-ϓ+W4h8뗰\ѸqE+W4h\Ѹ+W4h\ѸqE+W4h\Ѹ{[ۖ;٢Ec-[4hlآEc7gEs/_4h|E/_4hg3E/_4h|Eô\g}pg1Fc1c4h1FcY>:--glآ}wGُ+W4h\ѸqE+߽hlآEc-[4hlآEc-[4hlآEc-[4hlآEc-[4hlآEc-[4h,XDc%K4h,XDc;4vhءCc;4vhءCc '4Nh8qB '4Nh8qB 'jsAc 46hlؠAc 46hlؠqAza}g9 glؠAc 46hlؠAc 46hlؠA2ά;qsά;ｻv1Bc#4Fh1Bc#4Fh1B7n{sA4>h|A4>h|A:\d#Fc#4Fh1Bc#4Fh1Bc#4Fhhٜ8= ڣٜ8= '4Nh8qB '4Nh8qBd6#'sAzA{246hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 46hlؠAc 4.h\иqA 4.h\иqALИ1Ac 4&hLИ1Ac:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<y@:t<yߘ}cW:t7ߺ5<yߘ:t9s@:t9s@
+&+LV0Yad
+}1&3Lf0a2d &3?ϋ?&?L~0aO4Oz#&GL19br#&G̿޿y})&SLL1b2d)&S̿m5c1&cLƘ1c2d>OOZ^=ə\'Ϗ=&{L1cd=&{}r߸ܚٜ|6L<2yd#G&Lwܙsww{̝;3dNkn͸}rgƝks-<2yd#G&L<2ydȼ7k}Z:8drȼ!w{]׽{3!C&L29dr!C3e3l 2|03|0?&L1c?&LѬGz4ѬGc>G3c>h棙f>G=&{L1cd=&{'sGO>w;6xr|2ɼ'{2; wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;&wL1cr;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,Xܱcq;w,X7_<_7_Z_Y_?[7ߺjV5-sxc7o,Xxc7o,X?~eMk9s,X̱c1b9s,X̱c~9ryܞtk?s,Xm9Kc49륹/yOgײC,Y?=?]?-r%Kq?;g+W֫/_W{,^YWuxvYezexYyys1c,Yf3gg0sͿ۲g,YogϬ~,z8f50a,Y f1Y ~Z3b0a,Y f1 f1c,Y8fq1c,YＶ|g,Y,Xfb2e,Ygoos3g,Y<xf3g2e,Y,Xfb2e,Y,Xf}p,Y8fq1c,Y8fq1cGgp8|}ܖ>Y8fq1c,Y8fq}Xg,Y,Xfb2e,Y,Xfb2e,Y,Xfb2eˬ?=3b0a,Y f1b0O?/_,~Ye/_|3aìe/_,~Yei~Y=~v߮_,~Ye/_,~Ysa[[r' f1b0a,Y f1b03eϾG>?sjeg.],vYeb.];3;ϛ[-w?,fY̲e1b,Y,fY̲e2bu|nYܲ=nY/=˵0b,Y{ fY̲e1b,Y,fY̲e=fYf+?z0.se=trzp/_,~Ye/_GGsez|web.=,vY_,~Ye/_,~Y\/,~YO^cYOZaì's,YOcǬ'15s1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1c,Y8fq1cl9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs1c6l9fs}c6l7_[Xfߘ0_|e/_6l~e/_6l~j[gf.]6lvef.]xm6ʺZ-[6_-/Lv/|iK^.]6lv?}96ޟޟޟ^Lf3f4g~g~g~g~o6l|_y+<dz~<79|_ھ}{mkf7g{ƞ7=oyclLf5}o{kg[4i6lٿe/bl,Yff2e6_{=6_1c6l9fs1w~g;yf3g6l<yf߾zsos9i6lLf3f4i6i{i6lLf3f4i6l}Lf3f4i6lLfhGyf~?}3g6l<yfۿa6l f3f0a6x<lvef.]6lvx,lnܲes-[6lnz_XDzY6lf̲e3f,Y_e_p)S6lNٜ9es=ֶ%K6l.\ds%d'{?=6{lcf=g{?_Y{k3?;76olؼyc76o;g9Ιwμrnٴ̸3 ܱcs;6wlܱcߛqoƽfܛq2;wYϺe潙fޛyo&wlܱcs;6wlܱx|_=z}[|W>ߕ|=twôlcf=6{lc?hُf?h]3{G~4G~4?c?6lc~2'~2'c~n'sc?dO>\cf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf=6{lcf={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qa={8qǹٹ[jV7A9 r0a A9 rp;w8qp;w/0ǹ9s[ncso>8q㼴9s8q0a9s8q0a5k8qXa5k8qXa5k8qXa=qx7o8qx5k8qXa5k8q|1Λ_7^8q0a9s8q0yk[{p;w8qp;/bw8qp;w8q~Wz}a={8qa=;{;w8qp;w8q~5k8qXa5k8q>8q0a1c8q0a+_8|q/_8|qe?[7-[8lqa-[߿zqa-[8lqa-[8lqa-[?ec8q0a1c8q0a1c8q0a1c8q0a1c8q0a1c8q0a1c8q0~><3ga={8qa={8q>?q|;[?X2E9,rXa"E9,rXa"Eo-0ɹ{a&MΝk3i(QF9r0a(QF9r0a(Q{s1νdso.gr)SN9r8p)SN9r8p)SN9k~p͜r8<5)SF9r0a(QF9r0a(QF9r_]/G3<h&>9|r'O>9|r'O>9|r'>y<y0y}2QF9rf(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF9r0a(QF97_<o̾oso̽ucp>s%%%%%%%%%%%%%~Ǐ_Z_YYm9YYYYYYYYYYYY{σ[[i˲[[[[r`````````````ޟe````````````^ W_xe/k&&&&&&&&&&&&222222222222k> _<_\/LLLLLLLLLLLLLj/;o3M0M0M0M0M0M0M0M0M0M0M0M0M75l h>Ӄmmmmmmmmmmm/^mX1N0N0N0N0N0N0N0N0NǾ::::::::::::::::::::::::::::::::::::::חֶe````````````|zփ}}Ssۭ???????????????ks|
+?la`````````````````vĝkoxpڸ'w{3]#ă/''w,<<<{{{{{{{{{{{{{{{{{}t͏fOO<>hOf>KxNNN<i IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIo|7_Y_?Kɛg̻ϚO3{{{{{{{{{{{{{{{{yyyyyyyyyyyyyyy̓̓̓̓̓{k^IIɗ2ONNNNNNNNNNNNu^IIIIIIIIIIIIIW/GNNNNNNNNNNNNNNNNNNNNNNNNNNNbGIIIIIIIIIIIIIɷ{{{{{{{{{{{{{{yyyyyyyyyyyyyywwwwwwwwwwww}k99999999999999777777777777MMMMMMMMMMMMM~mִ匏dddddddddddddddddddddddddddddddddddddddK뛞k IIIIIIIIIIIIɿ׷#UIIIIIIIIIIIIIIɿ@3s{3y(y(y(y(y(y(y(y(y(y(y(y(y(y(y(?y^<<<<<<<<<<<<<<<<<<DDeggs(((((((((((((((((((̺3DyfuL&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&{3ͻ7{߫\rQrQޛEEEEEEEEEEEEEEEEEEE;>ܿaFFe\\LLLLLLLLLLLLLLLLL&G3(uģ壙f>CCCCCCCCCCCCCCCCCCCZ}2\.'Dd&%哿1.J.ʧ=kol62f]YLTLTLTLTLTLTLTLTLTLTLTLTLTLTLT?~m5kXZHHHHHHHHHHHHu5</F[{n/럖TTTTTTT/lV*V*V*V*V*V*V*V*V*V*V*Vgbbbbbbbbbbbbb^Vٵ3S1S1S1S1S1S1S1S1S1S1S1S1Sb+ggbbbbbbbbbbbzc/;=?????????????[ߚ˗WUUUUUUUUUUUU]sTqTqTqTqTqTqTqTqTqTqTqTqTs\;SSSSSSSSSSSSSSk53U1U1U1U1U1U1U1U1U1U1U1Uw=***********>ccccccccccccG~8,=rkkkkkkkkkkk_Z_o3ثثثثثثثثثثx>YgYLVLVLVLVLVLVLVLVLVLVLVLVLV8?|N+N+N+N+N+N+N+N+N+N+N+N+N+N?}so{-ϋيييييييييييييي꯯,n3r_ϝoooooooooooooooppww쿝qqqqqqqqqqqqqqqqq,W;kq,W,W,W,W,W,W,W,W,W,W,W,W,W,W,W,W,W&,W,WWW}/2\}̸d{ϭXq\}V\՝cbbbbbbbbbbbbbbbb7w<W<W<W<W<W<Wf\\ݛsu-ՃzhLWf3]=z4\+ebz4\+++++++++++++++''3ebzr\W\W\WOr]q]=uttttttttttttttttttttttttttt^+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.uc7f|f<1]7?ye&]lwv]lwv]lwv]lwh&]?0]]?.u]\wqu]\wqu]\w:qzθ]ֶx]aYx]w19/=y霗a.ֻ++It˗\QjphÜ8D~Z/^hzB Z/^tz/^{B z/^{B ]ֺ/t_}B /t_}ѳKE./_h~B /_h~BE=B /_B a8 /_B /_0t=w=CE =z0`ЃC =z0Fk#Fv#ߝC> }0aЇC> }cv5k}iЌC3f 14chЌC3f &vMюC;v 1chЎC;v 1=S{.StdБ#CG :2tdБ#c=}3fvГ'CO =z2dГ'CO =sd3g:Е+CW ]2teЕ+CW ] i\], uf,vЙ3Cg :3tfЙ3c-^~oK;ugН;Cw 3tgН;Cw +;gG+ghО=C{ 3ghО=C{ kiРsm :4thСCC :4thСCcc -;7νS -Z4hhТEC -Z4hhТSРAC 44hhРAC 44h켷_cwghО=C{ 3ghО=C{ {q=3}5ghМ9Cs 34ghМ9Cs {f~Gc^5Cs 34ghМ9Cs 34ghМqd}fGΑ9Cs Gќ9CsƑ9CsuӜ9Cs 34ghМ9Cs 34gؚ3N[s 3NΪ9Cs[s[o z3fЛ7Co z3fК5?KWk ş1ϞgyZ3fhК5Ck Z3fhК5CgΌ Wk Z3.\Z3f\Z3f\<fhК5Ck Z3fhК5Ck֌k3ԙ3Cg :3tf̸2zu^W:3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tf̸nЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3Cg :3tfЙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3SgL:3ufԙ3?d?z3?z3?7SoLz3fԛ7SoLz3?z3?5{iaן?SL3gԟ?S̖wcM-Z4[)hml٩ESM-Z4hjlvg=m{ۮ.M]4uiԥKS.M]4uiԥKcgۗױG6Mm4ijԦMS6Mm4iv]Km4ivjԨٵSFM55jjԨQSFM55jj١QSFM55jjԨQSFM55jMf{ۣU^ѪUSVMZ5jjԪUSVM{s`]s}iԮ]SvM5kjԮ]SvM5k95lj԰aSæM 65lj԰aSæ͑6G>K #;GvO-#;ljԲeS˦M-Z6ljԲeS˦M-Z6>ױc{umԴiSӦMM65mjԴiSӦMM65mN7OmԷoSߦM}6mԷoSߦ7mNlպuSMZ7njԺuSMZ7njݜgM3g;wfM͛75ojԼySM͛75ojԼySuo;wnNsN:8upSN:8upj\ػWGa77_ G/2M85qjĩS&NM8K/ӸZ8pj©S N-Z8pj©seΕ{U5pjSN 85pjS͵J͵{SMݛ7uoԽ{SMݛ77w/q6nԻwSMz7nԻwSM?뵵SM͛75ojԼySM͛75org/׌C玡SN 85pjSN 8 {s3? K77=s3)}8qǩS>N}8qy>8ӁSwb95W/^=pΪS3fN͜95sj̩S3fN͜9Ϊ>5sj̩S3ѵ̩S3f#s<_r˩S/^Nz9r˩S/牫S/牫S/^N'˩S/^N'^N'g̩S3fN͜95sj̩S3fN͜g.ݜ9uszͩS7NgnNݜ9usͩS7nNݜ9uspusͩͩS7nNݜn ΩS;vN9sjΩS;vNWgyjΩS;vΫjΩS;{j:~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϩS?~N9sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\sϥK?~.\>Tߚ [?~.\_O~aϥK?~.\sϥK?~Ͽ-\ߙ̏槗b~Wݼ?̟KK.-]ZtiҥKK.-]o^JKOOW뫱[SWOnM]-5uc¤[S.M]4uij4uiն<mFfhץK_.}]uץK_.}]󍱿Ku{;&4wiܥKs.]4wiܥk.]Zvu}.]ZviڥKk.]ZvRo}=z߳S{C{.]ڻwiޥK{.]ڻ_߹}{wf-^}/-^ZxiK/-^Zxi5^\ρu`&K&/M^4yiK&/M^4yi5tK}K/=^zxK/=^zx٩k0wKG=^zxK/=^zxKvZxiK/-^ZxiK/-^g7\kb/=^zxK/=^zx;w8wjK6/m^ڼyiK6/m^ڼyi5c3+}^3c{;14ziKF/^4ziKF/^4z;wn4ziۭKF/^4ziKF/^ 7:tz-b~6_o5^tzKN/^:tzd-YKXR͗ky4{iKf/^4{iZٻwy^ٻwe>^+Vޫ~/^{K~/^k;Z۹slnM_k{|Kϗ/=_z|ػ^|ػw6^ۿ_痾/}_}Kߗ/}_[>ǭkWwc֯[{~mw_Z~iK/_Zv뼳_ίtttK/_t>_{g3ukkK=[3cK/_>8}9}`K/_\_E_ڿiK/_ڿ̣gK/_ڿiK#=ڿiK/_ڿi:qOܓ|jKW/_ڿi:qO ڿtK/_tuvu:/_tuK/:;K/_tK ^/l_ڿiK/_ڿi]K/_ڿiK}KוK/_άK/_ڿ+K/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/_tK/F7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otF7otototo>غ[7otF7ot^|:?6_ow̟x~r?O'䶸-nⶾ3߿4~2mj~3⶜n?5n+?-n涹mnv6msۼ6k;gi;cv6mV۬6:i:η_{:㜝78WauXVauXVauY]V׹.꺇O/M׽u=.r_t9]Nt9]N8=Nϙz|v=NL=Vs-{eg=vc=vc=vc=vg}new-վk}nwm>s>s>s>p܁k;8up?gvpwooo!o?߾4Cސ5d ]!kz 9C5r!gr!gr!gqF5bXk:r=G{eqF{t9ȹFoFoFoƼo Ǽ1o|cg~coƼ1oƼ1oƼ1oƼ1ơ&Mo|r^&8q w8;aN50' sœ0' sœ0' sʜ2)sS̩pʜ~;<zLuʝrܩs|ʝr)wʝr)wʝrgwƝ39cΜs1s1g9cΘ3̵foƛfoƛfoΛ漹sޘ,9s90w9sΜsYܹsιs9gΙs9gΙs9g. 悷-| o[8sg.xfX >?3cX0cX0%cX:גf`~4?,Βݟ}5/-i5s\2%s\2s\1W>s\1WsZqVgYqVgYqVgYqVgYs֜5glkΚ9k'Z;7k暹fk暹fk暹fk暹fn憹07 s07>p7zް7 {ް7~'n/aoaoeoj[eo[eoyi-wr-w:֙-wr-wrw9;;εy;c;c;c;c;g{{]k{{g{枹g{枹gy`y`y`y`y<8p=p=p#=}rdG}dG}>#>#:r#=r#=rO<1O<1O=N<1O<O<1O<1O3<?5gp`4Y#5u>;W3p~1qO]3>3>3¾/ ¾/ ¾/3_}a_}a_ ¾/ ¾/ ʾWϏ+ʾ+ʾ+ʾ+ʾ+W}e_W}e_W}c797o~t97sn7n{ӄ7rG7n{wݍ}c7}c7}gw}gw}gw}gw}gw}gw}gw}g`?`?`?`?`?`?`?`?Od?Od?Od?Od?Od?Od?Od?O_7w|g7?Ob~5Wb00i4//_ٯW+~e_ٯW+~e_ٯW+~e_ٯW+_7w|g7?Ob~5Wb00i4/㚿o7~co7~co7~co7~gw;~gw;~gw;~gw;`?`?`?`?d?ٟO'd?ٟO'd?ٟO'd?ٟOvb-vb-vb-vb-vb-vb-vb-vbmvfmvfmvf_^jj~Wwռvfmvfmvfmvawvawvawvǹ;qގvfavfavfav]fev]fev]fev]f׵2.2.2.2.1{1{1{1{>ߞ=vc=vc=vc=vg}vg}vg}vg}vg}vg}vg}vg}=`=`=`=`=`=`=`=`C=dC=dC=dC=dC=dC=dC=dC=d#=b#=b#=b#=b#=b#=b#=b#=fc=fc=fc=fc=fc=fc=fc=fc=aO=aO=aO=aO=aO=aO=aO=aOS=eOS=eOS=eOS=eOS=eOS=eOS=eOS=e3=c3=c3=c3=c3=c3=c3=c3=gs=gs=gs=gs=gs=gs=gs=gs`/ `/ `/ `/ `/ `/ `/ `/Kd/ok`~4?/d/7j^O^%{^%{^{^W{^W{^W{^W{^W{^W{^W{^5{^5{^5{^5{^5{^5{^5{^5{ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {޲-{޲-{޲-{޲-{޲-{޲-{޲-{޲{ޱw{ޱw{ޱw{ޱw{ޱw{ޱw{ޱw{ޱ={޳={޳={޳={޳={޳={޳={޳={>>>>>>>>>#>#>#>#>#>#>#>>Osv\;y<Nk'}\;y<Nk'ϵs>O>O>O3>3>3>3>3>3>3>3>/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ƾoƾoƾoƾoƾoƾoƾoƾo;ξ;ξ;ξ;ξ;ξ;ξ;ξ;ξ~~~~~~~~'~'~'~'~'~'~'~/߿o̷;h~2_nDŽIS1~+~e_ٯW+~e_ٯW+~e_ٯW+~e_ٯfn1ߚ|1?_̯7j^OO/o&Me\7~co7~co7~co7~cw;~gw;~gw;~gw;~g?`?`?`?`?ٟO'd?ٟO'd?ٟO'd?ٟO'n[n[n[n[n[n[n[n[n6n6n6n6n6n6n6n;;;;;;;........{{{{{{{{>>>>>>>{{{{{{{{!{!{!{!{!{!{!{!{G{G{G{G{G{G{G{G{1{1{1{1{1{1{1{ {ž' {ž' {ž' {ž' {ž' {ž' {ž' {ž){ʞ){ʞ){ʞ){ʞ){ʞ){ʞ){ʞ){ʞg{ƞg{ƞg{ƞg{ƞg{ƞg{ƞg{ƞg{Ξ9{Ξ9{Ξ9{Ξ9{Ξ9{Ξ9{Ξ9{Ξ{^{^{^{^{^{^{^{^%{^%{^%{^%{^%{^%{^%{^%{^W{^W{^W{^W{^W{^W{^W{^W{^5{^5{^5{^5{^5{^5{^5{^ {ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {ް7 {ް-{޲-{޲-{޲-{޲-{޲-{޲-{޲-{ޱw{ޱw{ޱw{ޱw{ޱw{ޱw{ޱw{ޱw{޳={޳={޳={޳={޳={޳={޳={޳>>>>>>>>#>#>#>#>#>#>#>#>O>O>O>O>O>O>O>O>3>3>3>3>3>3>3> ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾/ ¾+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾ+ʾoƾoƾoƾoƾoƾoƾoƾoξ;ξ;ξ;ξ;ξ;ξ;ξ;ξ~~~~~~~~'}r'}r'}r'|2'|2'|2'|27 \ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/dungeons/dungeonrooms.json b/src/main/resources/assets/skyblocker/dungeons/dungeonrooms.json
index 5303f6b3..f626623d 100644
--- a/src/main/resources/assets/skyblocker/dungeons/dungeonrooms.json
+++ b/src/main/resources/assets/skyblocker/dungeons/dungeonrooms.json
@@ -940,5 +940,12 @@
"secrets": 1,
"fairysoul": false,
"sbp": "four-banner"
+ },
+ "Zodd-1": {
+ "category": "1x1",
+ "secrets": 1,
+ "fairysoul": false,
+ "dsg": "null",
+ "sbp": null
}
-} \ No newline at end of file
+}
diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
index 760e72d9..3815e759 100644
--- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
+++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
@@ -263,12 +263,12 @@
"z":21
},
{
- "secretName":"1 - Pearl",
- "category":"pearl",
- "x":25,
- "y":75,
- "z":27
- },
+ "secretName":"1 - Pearl",
+ "category":"pearl",
+ "x":25,
+ "y":75,
+ "z":27
+ },
{
"secretName":"1 - Item",
"category":"item",
@@ -842,12 +842,12 @@
"z":21
},
{
- "secretName":"2 - AOTV",
- "category":"aotv",
- "x":25,
- "y":76,
- "z":22
- },
+ "secretName":"2 - AOTV",
+ "category":"aotv",
+ "x":25,
+ "y":76,
+ "z":22
+ },
{
"secretName":"2 - Stonk",
"category":"stonk",
@@ -3073,12 +3073,12 @@
"z":5
},
{
- "secretName":"2 - AOTV",
- "category":"aotv",
- "x":77,
- "y":82,
- "z":16
- },
+ "secretName":"2 - AOTV",
+ "category":"aotv",
+ "x":77,
+ "y":82,
+ "z":16
+ },
{
"secretName":"2 - Wither Essence",
"category":"wither",
@@ -3131,12 +3131,12 @@
"z":9
},
{
- "secretName":"3 - AOTV",
- "category":"aotv",
- "x":7,
- "y":80,
- "z":15
- },
+ "secretName":"3 - AOTV",
+ "category":"aotv",
+ "x":7,
+ "y":80,
+ "z":15
+ },
{
"secretName":"3 - Superboom",
"category":"superboom",
@@ -3254,12 +3254,12 @@
"z":24
},
{
- "secretName":"1/2 - AOTV",
- "category":"aotv",
- "x":84,
- "y":91,
- "z":26
- },
+ "secretName":"1/2 - AOTV",
+ "category":"aotv",
+ "x":84,
+ "y":91,
+ "z":26
+ },
{
"secretName":"1 - Bat",
"category":"bat",
@@ -3835,12 +3835,12 @@
"z":51
},
{
- "secretName":"5 - AOTV",
- "category":"aotv",
- "x":16,
- "y":81,
- "z":53
- },
+ "secretName":"5 - AOTV",
+ "category":"aotv",
+ "x":16,
+ "y":81,
+ "z":53
+ },
{
"secretName":"5 - Chest",
"category":"chest",
@@ -4114,12 +4114,12 @@
"z":30
},
{
- "secretName":"5 - AOTV",
- "category":"aotv",
- "x":52,
- "y":78,
- "z":9
- },
+ "secretName":"5 - AOTV",
+ "category":"aotv",
+ "x":52,
+ "y":78,
+ "z":9
+ },
{
"secretName":"5 - Crypt",
"category":"superboom",
@@ -4895,12 +4895,12 @@
"z":52
},
{
- "secretName":"2 - AOTV",
- "category":"aotv",
- "x":45,
- "y":78,
- "z":47
- },
+ "secretName":"2 - AOTV",
+ "category":"aotv",
+ "x":45,
+ "y":78,
+ "z":47
+ },
{
"secretName":"2 - Chest",
"category":"chest",
@@ -4937,12 +4937,12 @@
"z":41
},
{
- "secretName":"5 - Pearl",
- "category":"pearl",
- "x":15,
- "y":84,
- "z":56
- },
+ "secretName":"5 - Pearl",
+ "category":"pearl",
+ "x":15,
+ "y":84,
+ "z":56
+ },
{
"secretName":"5 - Stonk",
"category":"stonk",
@@ -5144,12 +5144,12 @@
"z":61
},
{
- "secretName": "7 - AOTV",
- "category":"aotv",
- "x":39,
- "y":84,
- "z":58
- },
+ "secretName": "7 - AOTV",
+ "category":"aotv",
+ "x":39,
+ "y":84,
+ "z":58
+ },
{
"secretName":"7 - Chest",
"category":"chest",
@@ -5402,12 +5402,12 @@
"z":43
},
{
- "secretName":"3/4 - AOTV",
- "category":"aotv",
- "x":49,
- "y":83,
- "z":36
- },
+ "secretName":"3/4 - AOTV",
+ "category":"aotv",
+ "x":49,
+ "y":83,
+ "z":36
+ },
{
"secretName":"3 - Chest",
"category":"chest",
@@ -5581,7 +5581,7 @@
"z":24
},
{
- "secretName":"3 - Stonk (may locked)",
+ "secretName":"3 - Stonk",
"category":"stonk",
"x":63,
"y":55,
@@ -5598,7 +5598,7 @@
"secretName":"3 - Entrance",
"category":"entrance",
"x":63,
- "y":55,
+ "y":54,
"z":7
},
{
@@ -5630,12 +5630,12 @@
"z":15
},
{
- "secretName":"5 - Pearl",
- "category":"pearl",
- "x":8,
- "y":59,
- "z":14
- },
+ "secretName":"5 - Pearl",
+ "category":"pearl",
+ "x":8,
+ "y":59,
+ "z":14
+ },
{
"secretName":"5 - Entrance",
"category":"entrance",
@@ -5919,13 +5919,13 @@
}
],
"Double-Stair-3":[
- {
- "secretName":"1 - Pearl",
- "category":"pearl",
- "x":24,
- "y":72,
- "z":11
- },
+ {
+ "secretName":"1 - Pearl",
+ "category":"pearl",
+ "x":24,
+ "y":72,
+ "z":11
+ },
{
"secretName":"1 - Wither Essence",
"category":"wither",
@@ -6072,5 +6072,14 @@
"y":94,
"z":26
}
+ ],
+ "Zodd-1": [
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":7,
+ "y":70,
+ "z":3
+ }
]
}
diff --git a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json
index f7d50d36..f626623d 100644
--- a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json
+++ b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms.json
@@ -886,5 +886,66 @@
"fairysoul": false,
"dsg": "/channels/727426780381577291/732154637506969650/733875583536201820",
"sbp": "spider"
+ },
+ "Redstone-Skull-3": {
+ "category": "1x1",
+ "secrets": 3,
+ "fairysoul": false,
+ "sbp": "redstone-skull"
+ },
+ "Sewer-7": {
+ "category": "1x4",
+ "secrets": 7,
+ "fairysoul": false,
+ "sbp": "sewer"
+ },
+ "Altar-6": {
+ "category": "L-shape",
+ "secrets": 6,
+ "fairysoul": false,
+ "sbp": "altar"
+ },
+ "Slime-5": {
+ "category": "1x3",
+ "secrets": 5,
+ "fairysoul": false,
+ "sbp": "slime"
+ },
+ "Crypts-1": {
+ "category": "1x1",
+ "secrets": 1,
+ "fairysoul": false,
+ "sbp": "crypts"
+ },
+ "Draw-Bridge-6": {
+ "category": "1x1",
+ "secrets": 6,
+ "fairysoul": false,
+ "sbp": "draw-bridge"
+ },
+ "Double-Stair-3": {
+ "category": "1x1",
+ "secrets": 3,
+ "fairysoul": false,
+ "sbp": "double-stair"
+ },
+ "Lava-Skulls-3": {
+ "category": "1x1",
+ "secrets": 3,
+ "fairysoul": false,
+ "sbp": "lava-skulls"
+ },
+ "Four-Banner-1": {
+ "category": "1x1",
+ "secrets": 1,
+ "fairysoul": false,
+ "sbp": "four-banner"
+ },
+ "Zodd-1": {
+ "category": "1x1",
+ "secrets": 1,
+ "fairysoul": false,
+ "dsg": "null",
+ "sbp": null
}
-} \ No newline at end of file
+}
diff --git a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton
index a0be54e0..b2193e71 100644
--- a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton
+++ b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Temple-3.skeleton
Binary files differ
diff --git a/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Zodd-1.skeleton b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Zodd-1.skeleton
new file mode 100644
index 00000000..099d5547
--- /dev/null
+++ b/src/test/resources/assets/skyblocker/dungeons/dungeonrooms/catacombs/1x1/Zodd-1.skeleton
Binary files differ
diff --git a/src/test/resources/assets/skyblocker/dungeons/secretlocations.json b/src/test/resources/assets/skyblocker/dungeons/secretlocations.json
index 031e1d03..3815e759 100644
--- a/src/test/resources/assets/skyblocker/dungeons/secretlocations.json
+++ b/src/test/resources/assets/skyblocker/dungeons/secretlocations.json
@@ -263,6 +263,13 @@
"z":21
},
{
+ "secretName":"1 - Pearl",
+ "category":"pearl",
+ "x":25,
+ "y":75,
+ "z":27
+ },
+ {
"secretName":"1 - Item",
"category":"item",
"x":27,
@@ -835,6 +842,13 @@
"z":21
},
{
+ "secretName":"2 - AOTV",
+ "category":"aotv",
+ "x":25,
+ "y":76,
+ "z":22
+ },
+ {
"secretName":"2 - Stonk",
"category":"stonk",
"x":23,
@@ -1419,6 +1433,13 @@
"z":9
},
{
+ "secretName":"3 - Stonk",
+ "category":"stonk",
+ "x":2,
+ "y":77,
+ "z":15
+ },
+ {
"secretName":"3 - Superboom (not the chest in front)",
"category":"superboom",
"x":11,
@@ -1706,11 +1727,11 @@
],
"Redstone-Key-3":[
{
- "secretName":"1 - Redstone Skull (right click)",
- "category":"lever",
- "x":10,
- "y":70,
- "z":26
+ "secretName":"1 - Superboom",
+ "category":"superboom",
+ "x":20,
+ "y":68,
+ "z":7
},
{
"secretName":"1 - Lever behind Crypt",
@@ -1727,6 +1748,20 @@
"z":6
},
{
+ "secretName":"2 - Redstone Skull (right click)",
+ "category":"lever",
+ "x":10,
+ "y":70,
+ "z":26
+ },
+ {
+ "secretName":"2 - Redstone Skull (right click)",
+ "category":"lever",
+ "x":19,
+ "y":66,
+ "z":7
+ },
+ {
"secretName":"2 - Place Skull",
"category":"lever",
"x":27,
@@ -2138,7 +2173,7 @@
},
{
"secretName":"3 - Lever 2",
- "category":"Lever",
+ "category":"lever",
"x":31,
"y":53,
"z":24
@@ -2340,7 +2375,7 @@
},
{
"secretName":"2 - Item",
- "category":"Item",
+ "category":"item",
"x":27,
"y":56,
"z":19
@@ -2924,9 +2959,9 @@
{
"secretName":"6 - Stonk",
"category":"stonk",
- "x":17,
+ "x":18,
"y":70,
- "z":15
+ "z":14
},
{
"secretName":"6 - Pressure Plate 2",
@@ -3038,6 +3073,13 @@
"z":5
},
{
+ "secretName":"2 - AOTV",
+ "category":"aotv",
+ "x":77,
+ "y":82,
+ "z":16
+ },
+ {
"secretName":"2 - Wither Essence",
"category":"wither",
"x":79,
@@ -3089,6 +3131,13 @@
"z":9
},
{
+ "secretName":"3 - AOTV",
+ "category":"aotv",
+ "x":7,
+ "y":80,
+ "z":15
+ },
+ {
"secretName":"3 - Superboom",
"category":"superboom",
"x":6,
@@ -3205,6 +3254,13 @@
"z":24
},
{
+ "secretName":"1/2 - AOTV",
+ "category":"aotv",
+ "x":84,
+ "y":91,
+ "z":26
+ },
+ {
"secretName":"1 - Bat",
"category":"bat",
"x":81,
@@ -3779,6 +3835,13 @@
"z":51
},
{
+ "secretName":"5 - AOTV",
+ "category":"aotv",
+ "x":16,
+ "y":81,
+ "z":53
+ },
+ {
"secretName":"5 - Chest",
"category":"chest",
"x":31,
@@ -3873,7 +3936,7 @@
},
{
"secretName":"4/5/6 - Entrance 3",
- "category":"",
+ "category":"entrance",
"x":31,
"y":142,
"z":39
@@ -4051,6 +4114,13 @@
"z":30
},
{
+ "secretName":"5 - AOTV",
+ "category":"aotv",
+ "x":52,
+ "y":78,
+ "z":9
+ },
+ {
"secretName":"5 - Crypt",
"category":"superboom",
"x":52,
@@ -4660,7 +4730,7 @@
"z":15
},
{
- "secretName":"2 - Stonk",
+ "secretName":"1 - Stonk",
"category":"stonk",
"x":26,
"y":112,
@@ -4825,6 +4895,13 @@
"z":52
},
{
+ "secretName":"2 - AOTV",
+ "category":"aotv",
+ "x":45,
+ "y":78,
+ "z":47
+ },
+ {
"secretName":"2 - Chest",
"category":"chest",
"x":46,
@@ -4860,6 +4937,13 @@
"z":41
},
{
+ "secretName":"5 - Pearl",
+ "category":"pearl",
+ "x":15,
+ "y":84,
+ "z":56
+ },
+ {
"secretName":"5 - Stonk",
"category":"stonk",
"x":18,
@@ -5060,6 +5144,13 @@
"z":61
},
{
+ "secretName": "7 - AOTV",
+ "category":"aotv",
+ "x":39,
+ "y":84,
+ "z":58
+ },
+ {
"secretName":"7 - Chest",
"category":"chest",
"x":41,
@@ -5311,6 +5402,13 @@
"z":43
},
{
+ "secretName":"3/4 - AOTV",
+ "category":"aotv",
+ "x":49,
+ "y":83,
+ "z":36
+ },
+ {
"secretName":"3 - Chest",
"category":"chest",
"x":49,
@@ -5387,5 +5485,601 @@
"y":91,
"z":39
}
+ ],
+ "Redstone-Skull-3":[
+ {
+ "secretName":"1 - Superboom",
+ "category":"superboom",
+ "x":22,
+ "y":70,
+ "z":24
+ },
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":21,
+ "y":69,
+ "z":27
+ },
+ {
+ "secretName":"2/3 - Superboom",
+ "category":"superboom",
+ "x":24,
+ "y":70,
+ "z":26
+ },
+ {
+ "secretName":"2/3 - Redstone Skull (right click)",
+ "category":"lever",
+ "x":26,
+ "y":71,
+ "z":26
+ },
+ {
+ "secretName":"2/3 - Place Skull",
+ "category":"lever",
+ "x":4,
+ "y":73,
+ "z":24
+ },
+ {
+ "secretName":"3 - Entrance",
+ "category":"entrance",
+ "x":18,
+ "y":70,
+ "z":15
+ },
+ {
+ "secretName":"3 - Lever",
+ "category":"lever",
+ "x":15,
+ "y":68,
+ "z":15
+ },
+ {
+ "secretName":"3 - Entrance",
+ "category":"entrance",
+ "x":5,
+ "y":70,
+ "z":15
+ },
+ {
+ "secretName":"3 - Chest",
+ "category":"chest",
+ "x":1,
+ "y":70,
+ "z":15
+ }
+ ],
+ "Sewer-7":[
+ {
+ "secretName":"1 - Superboom",
+ "category":"superboom",
+ "x":120,
+ "y":48,
+ "z":14
+ },
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":119,
+ "y":42,
+ "z":27
+ },
+ {
+ "secretName":"2 - Under Crypt",
+ "category":"superboom",
+ "x":93,
+ "y":43,
+ "z":24
+ },
+ {
+ "secretName":"2 - Item",
+ "category":"item",
+ "x":77,
+ "y":32,
+ "z":24
+ },
+ {
+ "secretName":"3 - Stonk",
+ "category":"stonk",
+ "x":63,
+ "y":55,
+ "z":7
+ },
+ {
+ "secretName":"3 - Lever",
+ "category":"lever",
+ "x":74,
+ "y":94,
+ "z":15
+ },
+ {
+ "secretName":"3 - Entrance",
+ "category":"entrance",
+ "x":63,
+ "y":54,
+ "z":7
+ },
+ {
+ "secretName":"3 - Chest",
+ "category":"chest",
+ "x":63,
+ "y":55,
+ "z":4
+ },
+ {
+ "secretName":"4 - Stonk",
+ "category":"stonk",
+ "x":20,
+ "y":46,
+ "z":15
+ },
+ {
+ "secretName":"4 - Entrance",
+ "category":"entrance",
+ "x":8,
+ "y":45,
+ "z":24
+ },
+ {
+ "secretName":"4 - Chest",
+ "category":"chest",
+ "x":19,
+ "y":45,
+ "z":15
+ },
+ {
+ "secretName":"5 - Pearl",
+ "category":"pearl",
+ "x":8,
+ "y":59,
+ "z":14
+ },
+ {
+ "secretName":"5 - Entrance",
+ "category":"entrance",
+ "x":25,
+ "y":62,
+ "z":25
+ },
+ {
+ "secretName":"5 - Chest",
+ "category":"chest",
+ "x":9,
+ "y":62,
+ "z":4
+ },
+ {
+ "secretName":"6 - Superboom",
+ "category":"superboom",
+ "x":16,
+ "y":55,
+ "z":25
+ },
+ {
+ "secretName":"6 - Chest",
+ "category":"chest",
+ "x":7,
+ "y":54,
+ "z":25
+ },
+ {
+ "secretName":"7 - Superboom",
+ "category":"superboom",
+ "x":7,
+ "y":56,
+ "z":22
+ },
+ {
+ "secretName":"7 - Bat",
+ "category":"bat",
+ "x":4,
+ "y":57,
+ "z":11
+ }
+ ],
+ "Altar-6":[
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":19,
+ "y":83,
+ "z":43
+ },
+ {
+ "secretName":"2 - Item",
+ "category":"item",
+ "x":14,
+ "y":71,
+ "z":48
+ },
+ {
+ "secretName":"3 - Entrance",
+ "category":"entrance",
+ "x":25,
+ "y":87,
+ "z":22
+ },
+ {
+ "secretName":"3 - Entrance",
+ "category":"entrance",
+ "x":51,
+ "y":80,
+ "z":45
+ },
+ {
+ "secretName":"3 - Chest",
+ "category":"chest",
+ "x":51,
+ "y":88,
+ "z":45
+ },
+ {
+ "secretName":"4 - Entrance",
+ "category":"entrance",
+ "x":25,
+ "y":94,
+ "z":19
+ },
+ {
+ "secretName":"4 - Wither Essence",
+ "category":"wither",
+ "x":17,
+ "y":93,
+ "z":27
+ },
+ {
+ "secretName":"5 - Entrance",
+ "category":"entrance",
+ "x":30,
+ "y":58,
+ "z":38
+ },
+ {
+ "secretName":"5 - Bat",
+ "category":"bat",
+ "x":36,
+ "y":55,
+ "z":35
+ },
+ {
+ "secretName":"6 - Chest",
+ "category":"chest",
+ "x":11,
+ "y":44,
+ "z":39
+ }
+ ],
+ "Slime-5":[
+ {
+ "secretName":"1/2 - Superboom",
+ "category":"superboom",
+ "x":88,
+ "y":71,
+ "z":22
+ },
+ {
+ "secretName":"1 - Wither Essence",
+ "category":"wither",
+ "x":74,
+ "y":86,
+ "z":15
+ },
+ {
+ "secretName":"2 - Item",
+ "category":"item",
+ "x":91,
+ "y":86,
+ "z":20
+ },
+ {
+ "secretName":"3 - Entrance",
+ "category":"entrance",
+ "x":71,
+ "y":53,
+ "z":18
+ },
+ {
+ "secretName":"3 - Bat",
+ "category":"bat",
+ "x":80,
+ "y":52,
+ "z":16
+ },
+ {
+ "secretName":"4 - Chest",
+ "category":"chest",
+ "x":65,
+ "y":87,
+ "z":16
+ },
+ {
+ "secretName":"5 - Entrance",
+ "category":"entrance",
+ "x":12,
+ "y":70,
+ "z":15
+ },
+ {
+ "secretName":"5 - Entrance",
+ "category":"entrance",
+ "x":20,
+ "y":59,
+ "z":12
+ },
+ {
+ "secretName":"5 - Item",
+ "category":"item",
+ "x":4,
+ "y":57,
+ "z":15
+ }
+ ],
+ "Crypts-1":[
+ {
+ "secretName":"1 - Lever behind Crypt",
+ "category":"lever",
+ "x":29,
+ "y":75,
+ "z":15
+ },
+ {
+ "secretName":"1 - Entrance",
+ "category":"entrance",
+ "x":17,
+ "y":67,
+ "z":15
+ },
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":6,
+ "y":66,
+ "z":15
+ }
+ ],
+ "Draw-Bridge-6":[
+ {
+ "secretName":"1 - Item",
+ "category":"item",
+ "x":4,
+ "y":60,
+ "z":58
+ },
+ {
+ "secretName":"2/3 - Superboom",
+ "category":"superboom",
+ "x":16,
+ "y":61,
+ "z":41
+ },
+ {
+ "secretName":"2 - Chest",
+ "category":"chest",
+ "x":15,
+ "y":60,
+ "z":46
+ },
+ {
+ "secretName":"3 - Bat",
+ "category":"bat",
+ "x":15,
+ "y":62,
+ "z":45
+ },
+ {
+ "secretName":"4 - Entrance",
+ "category":"entrance",
+ "x":5,
+ "y":61,
+ "z":20
+ },
+ {
+ "secretName":"4 - Wither Essence",
+ "category":"wither",
+ "x":19,
+ "y":60,
+ "z":4
+ },
+ {
+ "secretName":"5 - Lever",
+ "category":"lever",
+ "x":15,
+ "y":82,
+ "z":19
+ },
+ {
+ "secretName":"5 - Entrance",
+ "category":"entrance",
+ "x":16,
+ "y":83,
+ "z":56
+ },
+ {
+ "secretName":"5 - Chest",
+ "category":"chest",
+ "x":17,
+ "y":83,
+ "z":60
+ },
+ {
+ "secretName":"6 - Entrance",
+ "category":"entrance",
+ "x":41,
+ "y":60,
+ "z":55
+ },
+ {
+ "secretName":"6 - Chest",
+ "category":"chest",
+ "x":46,
+ "y":84,
+ "z":57
+ }
+ ],
+ "Double-Stair-3":[
+ {
+ "secretName":"1 - Pearl",
+ "category":"pearl",
+ "x":24,
+ "y":72,
+ "z":11
+ },
+ {
+ "secretName":"1 - Wither Essence",
+ "category":"wither",
+ "x":22,
+ "y":75,
+ "z":2
+ },
+ {
+ "secretName":"2 - Item",
+ "category":"item",
+ "x":11,
+ "y":78,
+ "z":27
+ },
+ {
+ "secretName":"3 - Superboom",
+ "category":"superboom",
+ "x":24,
+ "y":66,
+ "z":6
+ },
+ {
+ "secretName":"3 - Chest",
+ "category":"chest",
+ "x":28,
+ "y":66,
+ "z":3
+ }
+ ],
+ "Lava-Skulls-3":[
+ {
+ "secretName":"1 - Entrance",
+ "category":"entrance",
+ "x":5,
+ "y":71,
+ "z":26
+ },
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":3,
+ "y":69,
+ "z":28
+ },
+ {
+ "secretName":"2/3 - Entrance",
+ "category":"entrance",
+ "x":23,
+ "y":73,
+ "z":15
+ },
+ {
+ "secretName":"2/3 - Entrance",
+ "category":"entrance",
+ "x":7,
+ "y":73,
+ "z":15
+ },
+ {
+ "secretName":"2 - Chest",
+ "category":"chest",
+ "x":15,
+ "y":80,
+ "z":27
+ },
+ {
+ "secretName":"3 - Bat",
+ "category":"bat",
+ "x":13,
+ "y":89,
+ "z":4
+ }
+ ],
+ "Four-Banner-1":[
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":15,
+ "y":85,
+ "z":15
+ }
+ ],
+ "Trinity-4":[
+ {
+ "secretName":"1 - Entrance",
+ "category":"entrance",
+ "x":19,
+ "y":76,
+ "z":29
+ },
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":14,
+ "y":75,
+ "z":27
+ },
+ {
+ "secretName":"2/3/4 - Entrance",
+ "category":"entrance",
+ "x":10,
+ "y":77,
+ "z":22
+ },
+ {
+ "secretName":"2 - Item",
+ "category":"item",
+ "x":7,
+ "y":74,
+ "z":27
+ },
+ {
+ "secretName":"3 - Entrance",
+ "category":"entrance",
+ "x":11,
+ "y":86,
+ "z":22
+ },
+ {
+ "secretName":"3 - Bat",
+ "category":"bat",
+ "x":8,
+ "y":87,
+ "z":18
+ },
+ {
+ "secretName":"4 - Entrance",
+ "category":"entrance",
+ "x":7,
+ "y":92,
+ "z":16
+ },
+ {
+ "secretName":"4 - Superboom",
+ "category":"superboom",
+ "x":17,
+ "y":91,
+ "z":24
+ },
+ {
+ "secretName":"4 - Bat",
+ "category":"bat",
+ "x":2,
+ "y":94,
+ "z":26
+ }
+ ],
+ "Zodd-1": [
+ {
+ "secretName":"1 - Chest",
+ "category":"chest",
+ "x":7,
+ "y":70,
+ "z":3
+ }
]
}
generated by cgit (git 2.46.0) at 2025-02-06 17:55:15 +0000