diff --git a/.gitignore b/.gitignore index 67c0356..8bfc9e3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ __pycache__/ tiled_map/__pycache__/ idk/__pycache__/ idk/dlc_idk.py -notes \ No newline at end of file diff --git a/gen_sce b/gen_sce index 82b3d66..14a670c 100755 --- a/gen_sce +++ b/gen_sce @@ -20,6 +20,7 @@ def nouveau_scenario(nom): "h_20_npc", "vanaheim_po", "vanaheim_npc", + "h_21_npc", "h_22_npc", "alfheim_po", "alfheim_npc", diff --git a/idk/alfheim.py b/idk/alfheim.py index 5730a66..ffbfe7e 100644 --- a/idk/alfheim.py +++ b/idk/alfheim.py @@ -7,42 +7,42 @@ alfheim = (r""" ~~~~~ ~~~~~~~ #### ~~~~~~~ ## ~~~~~~~~ ~~~ ~~~~~ || ~~~~~~~ #### __ ## ~~~~~~~ ~~~ ~~~~~~~~ ## ~~~~~ ## || /[]\ #### ~~~~~ -~~~ ~~~~~~~~~~~~ #### ## ## #### ` ' |__| || __ ~~~ +~~~ ~~~~~~~~~~~~ #### ## ## #### ` ' |^_| || __ ~~~ ~~~ ~~~~~~~~~~~~ ## || #### #### || ,' '.' / \ ~~~ -~~~ ~~~~~ ~~~~ #### || || ` ' __ '`' . ` |__| ~~ +~~~ ~~~~~ ~~~~ #### || || ` ' __ '`' . ` |^_| ~~ ~~~ ## ~~~ || '' /[]\ ' . ## ~~ -~~ #### ## _ _________________ |__| ## `.` #### ~~ +~~ #### ## _ _________________ |_^| ## `.` #### ~~ ~~ || #### / \ / |]O[| |]O[| \ #### __ || ~~ -~~~~ || |_| /___________________\ ## ## || /[]\ ~~ -~~~~ ## _ |_/ \_/ _ \_/ \_| ## ## |__| ## ~~~~ +~~~~ || |^| /___________________\ ## ## || /[]\ ~~ +~~~~ ## _ |_/ \_/ _ \_/ \_| ## ## |^_| ## ~~~~ ~~~~ #### / \ |_| |_|/^\|_| |_| __ #### ~~~~ -~~~~ || _ |_| ## ## / \ `' || ~~~~ -~~~~ / \ ### ### ## ## |__| . , ~~~~ -~~~~~~~~~ |_| _ ##### ##### `' `_ ,, , ~~~ +~~~~ || _ |^| ## ## / \ `' || ~~~~ +~~~~ / \ ### ### ## ## |^_| . , ~~~~ +~~~~~~~~~ |^| _ ##### ##### `' `_ ,, , ~~~ ~~~~~~~~~ /o\ ### ### ' _ ``' / \ ~~~ -~~~~~~~~~~~ |_| /-\ /-\ , / \ |_| ~~~~ ~~~ -~~~~~~~~~~~~ ### ### ' ,|_| .' _ ~~~~~ ~~~ +~~~~~~~~~~~ |^| /-\ /-\ , / \ |^| ~~~~ ~~~ +~~~~~~~~~~~~ ### ### ' ,|^| .' _ ~~~~~ ~~~ ~~~~~~ ~~~~~~~ ### ##### ` ##### . ` .,. / \ ~~~~~ ~~~ -~~~~~ ~~~~~~~ ##### ### ' ### _ ` , _ |_| _ ~~~~~~ ~~~ +~~~~~ ~~~~~~~ ##### ### ' ### _ ` , _ |^| _ ~~~~~~ ~~~ ~~~~~ __ ~~ ### /-\ /-\ ` / \ , /o\ / \ ~~~~~~~~~~ -~~~~~~ / \ /-\ ' . '``,'' |_|` |_| |_| ~~~~~~~~~~ -~~~~~~ |__| ,. ' .` ', ~~~~~~~~~~ +~~~~~~ / \ /-\ ' . '``,'' |^|` |^| |^| ~~~~~~~~~~ +~~~~~~ |_^| ,. ' .` ', ~~~~~~~~~~ ~~~~~~ __ ### ., _ . , _ ,. ~~~~~~~~~~ ~~~~~~~~ / \ ##### ### / \ ` ' /o\__ `. ~~~~~~~~~ -~~~~~~~~~ |__| ### ##### ### |_| . |_ o \==| .'`. ~~~~~~~ +~~~~~~~~~ |^_| ### ##### ### |^| . |_ o \==| .'`. ~~~~~~~ ~~~~~~~~~~~~ ### /-\ ### ##### ,.` ||^|__| | . . ~~~~~~~ ~~~~~~~~~~~~ ##### /-\ ### | .' ~~~~~~ ~~~~~~~~~~~~~ ##### ### /-\ ### ### | ,`','` '',, ~~~~~~ ~~~~~~~~~~~ ### ##### ### ##### ##### |==|==|==| ~~~~~ ~~~~~~~~~~ ### |_| ##### ##### ### ### _ ~~~~~ ~~~~~~~~~ ##### ### ##### /-\ /-\ ### _ / \ _ ~~~~ -~~~~~~~~~ ##### |_| ### ### ##### / \ |_| / \ ~~~~ -~~~~~~~~~ ### |_| ##### ### ### |_| |_| ~~~~ +~~~~~~~~~ ##### |_| ### ### ##### / \ |^| / \ ~~~~ +~~~~~~~~~ ### |_| ##### ### ### |^| |^| ~~~~ ~~~~~~~ |_| ~~~~~~~ ##### ##### /-\ _ ~~~~ ~~~~~~~ ~~~~~~~~~~~~~~~~~~ ### ##### / \ _ ~~~~ -~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ |_| ### |_| / \ _ ~~~~ -~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ |_| |_| / \ ~~~~ -~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~ |_| ~~~~ +~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ |_| ### |^| / \ _ ~~~~ +~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ |_| |^| / \ ~~~~ +~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~ |^| ~~~~ ~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~ ~~~ ~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~ ~~~~~~ ~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~ @@ -50,14 +50,14 @@ alfheim = (r""" ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~ ### ### ~~~~~~~~~~~~ ~~~~~~~~~~ __ ~~~~~~~~~~~~~~~~~~~~ __ ### ## ## ~~~~~~~~~~~~ ~~~~~~~~~~ / \ ~~~~~~~~~~~~~~~~~~~~ / \ ##### ~~~~~~ ~~~~ -~~~~~~~~~~ |__| ~~~~~~~~~~~~~ |__| ##### ## ## ~~~~~ ~~~~ +~~~~~~~~~~ |^_| ~~~~~~~~~~~~~ |_^| ##### ## ## ~~~~~ ~~~~ ~~~~~~~~~~ ### ~~~~~~~~ ### ### ### ~~ ~~~~ ~~~~~~~~~ ##### ,'' |_| #### #### ~~~ ~~~~~~~~ ##### ' ### ,,,. ### ~~~ ~~~~~~~~ ### ### ##### `,, ##### ~~~ ~~~~~~~ |_| . ##### ##### ',, __ ### ##### ~~~ ~~~~~~ ### ,##### ### ` / \ ### ##### ### ~~~ -~~~~~~ ##### ### , ### |_|`' ### |__| ##### ##### |_| ~~~ +~~~~~~ ##### ### , ### |_|`' ### |_^| ##### ##### |_| ~~~ ~~~~~~ ##### #####``|_| ### ` ##### ##### ### ~~~ ~~~~~~ ### ##### ' ##### ##### ### |_| ### ~~~ ~~~~~~ |_| ### ,' ##### ### |_| ##### ~~~ @@ -67,7 +67,7 @@ alfheim = (r""" ~~~~~ ## || ,` ' ~~~~~~~~~~~~~~~ ~~~~~~ ~~~~~~~~ ~~~ ~~~~ #### _ ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~ ~~~~~~~~~~~ ~~~ ~~~~~ || /-\ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~ ~~~~ -~~~~~~ ~ |_| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~ ~~~~~ +~~~~~~ ~ |^| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~ ~~~~~ ~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -80,6 +80,34 @@ alfheim = (r""" # Maisons (34, 16, 23, 25, 19), (52, 31, 24, 20, 19), # Librairie + + (56, 8, 55, 3, 9), + (65, 10, 56, 3, 9), + (51, 12, 57, 11, 9), + (15, 14, 58, 4, 4), + (61, 15, 59, 3, 9), + (19, 17, 60, 4, 4), + (55, 18, 61, 3, 9), + (14, 19, 62, 4, 4), + (19, 21, 63, 4, 4), + (61, 21, 64, 4, 4), + (49, 22, 65, 4, 4), + (58, 24, 66, 4, 4), + (46, 26, 67, 4, 4), + (52, 26, 68, 4, 4), + (61, 26, 69, 4, 4), + (9, 27, 70, 11, 9), + (14, 30, 71, 3, 9), + (41, 30, 72, 4, 4), + (63, 37, 73, 4, 4), + (59, 38, 74, 4, 4), + (67, 38, 75, 4, 4), + (56, 41, 76, 4, 4), + (63, 42, 77, 4, 4), + (67, 43, 78, 4, 4), + (13, 51, 79, 3, 9), + (40, 51, 80, 11, 9), + (43, 58, 81, 11, 9), ) @@ -130,8 +158,327 @@ h_24 = (r""" |====|^|====| """, (20, 19, 2, 52, 31)) + +h_55 = (r""" +|=======|-|===| +| _ /___\ | +| |_| |+++| | +| |_| | +| |_| | +| | +| _ | +| (_) | +| /=\ | +|=/^\=========|""", + (3, 9, 1, 56, 8), +) + + +h_56 = (r""" +|/=\/=\/=\/=\/| +| | +| +--+ | +| | | | +| | | | +| +--+ | +| | +| | +| | +|=|^|/=\/=\/=\|""", + (3, 9, 1, 65, 10), +) + + +h_57 = (r""" +|=============| +| | +| [=] [=] | +| /-\ /-\ | +| | +| [=] [=] | +| /-\ /-\ | +| | +| | +|=========/^\=|""", + (11, 9, 1, 0, 0), +) + + +h_58 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 15, 14), +) + + +h_59 = (r""" +|======|======| +| /=\ | +| | +| +--+ | +| | | | +| +--+ | +| (_) | +| [I] | +| | +|=/^\=========|""", + (3, 9, 1, 61, 15), +) + +h_60 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 19, 17), +) + + +h_61 = (r""" +|=========||==| +| /__\ | +| | +| |-| | +| |-| | +| |-| | +| | +| | +| | +|=/^\=========|""", + (3, 9, 1, 55, 18), +) + + +h_62 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 14, 19), +) + + +h_63 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 19, 21), +) + + +h_64 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 61, 21), +) + + +h_65 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 49, 22), +) + + +h_66 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 58, 24), +) + + +h_67 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 46, 26), +) + + +h_68 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 52, 26), +) + + +h_69 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 61, 26), +) + + +h_70 = (r""" +|========|-|==| +| /---\ | +| |###| | +| | +| +---+ | +| | | | +| | | | +| | | | +| +---+ | +|=========/^\=|""", + (11, 9, 1, 9, 27), +) + + +h_71 = (r""" +|-------------| +| [===] [===] | +| | +| [===] [===] | +| | +| [===] [===] | +| | +| [===] [===] | +| | +|-|^|---------|""", + (3, 9, 1, 14, 30), +) + + +h_72 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 41, 30), +) + + +h_73 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 63, 37), +) + + +h_74 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 59, 38), +) + + +h_75 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 57, 38), +) + + +h_76 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 56, 41), +) + + +h_77 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 63, 42), +) + + +h_78 = (r""" + /======\ +/ \ +| | +| | +|==|^[|==|""", + (4, 4, 1, 67, 43), +) + +h_79 = (r""" +|====|-|======| +| /___\ | +| |###| | +| | +| +---+ | +| | | | +| | | | +| +---+ | +| | +|=/^\=========|""", + (3, 9, 1, 13, 51), +) + + +h_80 = (r""" +|=============| +| _ _ _ | +| |_| |_| |_| | +| |_| |_| |_| | +| | +| +---+ | +| | | | +| +---+ | +| | +|=========/^\=|""", + (11, 9, 1, 40, 51), +) + + +h_81 = (r""" +|===|_|=======| +|===|_|=======| +| /{O}\ | +| |###| | +| | +| | +| | +| | +| | +|=========/^\=|""", + (11, 9, 1, 43, 58), +) + + + alfheim_entities = ( - [0, '?', 2, 34, 20, 'stand by'], [0, '*', 2, 23, 17, 'stand by'], [0, '*', 2, 11, 4, 'stand by'], [0, '*', 2, 46, 6, 'stand by'], diff --git a/idk/asci.py b/idk/asci.py index 8fde004..3e31ba2 100644 --- a/idk/asci.py +++ b/idk/asci.py @@ -1,9 +1,12 @@ -# Asci (1.9.0) +# Asci (1.9.3) from math import floor, ceil +SCREEN_WIDTH = 21 +SCREEN_HEIGHT = 7 + class Asci: - def __init__(self, maps, entities, events_mapping, keys_mapping, behaviors=None, screen_width=21, screen_height=7): + def __init__(self, maps, entities, events_mapping, keys_mapping, behaviors=None): # Load maps and entities self.maps = [Map(*i) for i in maps] self.entities = {} @@ -27,7 +30,7 @@ class Asci: for i in behaviors: self._behaviors[i] = behaviors[i] # Screen initialisation - self.screen = Screen(screen_width, screen_height) + self.screen = Screen() self.current_map = None def _looked_case(self, direction): @@ -184,7 +187,7 @@ class Asci: data_copy = self.data[:] for entity in self.current_map.entities.values(): self._behaviors[entity.behavior](entity, data_copy, self.stat, self.screen, walkable) - if entity.map_id == self.data[1] and (0 <= entity.pos_x - self.data[2] + self.screen.pos_player[0] < self.screen.screen_width) and (0 <= entity.pos_y - self.data[3] + self.screen.pos_player[1] < self.screen.screen_height): + if entity.map_id == self.data[1] and (0 <= entity.pos_x - self.data[2] + self.screen.pos_player[0] < SCREEN_WIDTH) and (0 <= entity.pos_y - self.data[3] + self.screen.pos_player[1] < SCREEN_HEIGHT): self.screen.set_cell(entity.pos_x, entity.pos_y, entity.symbol) self.screen.set_cell(self.data[2], self.data[3], player) @@ -219,12 +222,10 @@ class Asci: # Classes used by Asci class Screen: - def __init__(self, screen_width=21, screen_height=7): + def __init__(self): # Screen configuration - self.screen_width = screen_width - self.screen_height = screen_height - self.pos_player = (screen_width // 2, screen_height // 2) - self._on_screen = [[" " for _ in range(screen_width)] for _ in range(screen_height)] + self.pos_player = (SCREEN_WIDTH // 2, SCREEN_HEIGHT // 2) + self._on_screen = [[" " for _ in range(SCREEN_WIDTH)] for _ in range(SCREEN_HEIGHT)] self._asci_data = [] def load_data(self, data): @@ -240,8 +241,8 @@ class Screen: def set_screen(self): x = self._asci_data[2] - self.pos_player[0] ; y = self._asci_data[3] - self.pos_player[1] - for x_map in range(x, x + self.screen_width): - for y_map in range(y, y + self.screen_height): + for x_map in range(x, x + SCREEN_WIDTH): + for y_map in range(y, y + SCREEN_HEIGHT): self._on_screen[y_map - y][x_map - x] = " " if 0 <= x_map < self.map_width and 0 <= y_map < self.map_height: try: self._on_screen[y_map - y][x_map - x] = self._world[y_map][x_map] @@ -250,7 +251,7 @@ class Screen: def display(self, return_input=True, low_bar=None): for line_no in range(len(self._on_screen)): line = "".join(self._on_screen[line_no]) - if line_no + 1 == self.screen_height and return_input: + if line_no + 1 == SCREEN_HEIGHT and return_input: if not low_bar: line = line[:-6] + ">" else: line = low_bar + ">" print(line, end="") @@ -259,10 +260,10 @@ class Screen: print(line) def clear(self): - print("\n" * self.screen_height) + print("\n" * SCREEN_HEIGHT) def display_text(self, string): - paragraphs = [i for i in text_formater(string, self.screen_width, self.screen_height) if i] + paragraphs = [i for i in text_formater(string) if i] nb_par = len(paragraphs) for index in range(nb_par): self.clear() @@ -273,13 +274,13 @@ class Screen: def set_cell(self, x, y, value): x = x - (self._asci_data[2] - self.pos_player[0]) y = y - (self._asci_data[3] - self.pos_player[1]) - if 0 <= x < self.screen_width and 0 <= y < self.screen_height: + if 0 <= x < SCREEN_WIDTH and 0 <= y < SCREEN_HEIGHT: self._on_screen[y][x] = value def get_cell(self, x, y): x = x - (self._asci_data[2] - self.pos_player[0]) y = y - (self._asci_data[3] - self.pos_player[1]) - if 0 <= x < self.screen_width and 0 <= y < self.screen_height: + if 0 <= x < SCREEN_WIDTH and 0 <= y < SCREEN_HEIGHT: return self._on_screen[y][x] else: return " " @@ -309,11 +310,13 @@ class Entity: self.behavior = behavior self.args = list(args) - def change_behavior(self, new_behavior): - if self.behavior != "permanent": self.behavior = new_behavior + def change_behavior(self, new_behavior, *args): + if self.behavior != "permanent": + self.behavior = new_behavior + self.args = list(args) def teleport(self, map_id, x, y): - if self.behavio != "permanent": self.map_id, self.pos_x, self.pos_y = map_id, x, y + if self.behavior != "permanent": self.map_id, self.pos_x, self.pos_y = map_id, x, y # Functions used by Asci @@ -324,34 +327,35 @@ def convert(string, force_int=False): else: return string -def text_formater(string, screen_width=21, screen_height=6): +def text_formater(string): + screen_displayable_height = SCREEN_HEIGHT - 1 - def line_formater(string, screen_width): + def line_formater(string): string_result = "" - while len(string) > screen_width: - stop_index = screen_width + while len(string) > SCREEN_WIDTH: + stop_index = SCREEN_WIDTH while stop_index > 0 and not string[stop_index].isspace(): stop_index -= 1 - if not stop_index: stop_index = screen_width + if not stop_index: stop_index = SCREEN_WIDTH string_result += string[:stop_index].strip() + "\n" string = string[stop_index:].strip() return string_result + string - def paragraph_formater(lines, screen_height): + def paragraph_formater(lines): paragraphs = "" - while len(lines) >= screen_height: - paragraphs += "\n".join(lines[:screen_height]) + "\n\n" - lines = lines[screen_height:] + while len(lines) >= screen_displayable_height: + paragraphs += "\n".join(lines[:screen_displayable_height]) + "\n\n" + lines = lines[screen_displayable_height:] return paragraphs + "\n".join(lines) lines = [] for line in string.split("\n"): - for formated_line in line_formater(line, screen_width).split("\n"): + for formated_line in line_formater(line).split("\n"): lines.append(formated_line) - return paragraph_formater(lines, screen_height).split("\n\n") + return paragraph_formater(lines).split("\n\n") def read_event(data, event, quest): @@ -402,10 +406,26 @@ def follow(entity, data, stat, screen, walkable): entity.pos_x, entity.pos_y = data[2], data[3] elif data[4] in (1, 2, 3, 5): + direction = (data[4] - 1) if data[4] != 5 else 3 + if entity.args: walkable += entity.args[0] - cases = ((data[2] + 1, data[3]), (data[2], data[3] - 1), (data[2] - 1, data[3]), 0, (data[2], data[3] + 1))[data[4] - 1] - if not (0 <= cases[0] < screen.map_width and 0 <= cases[1] < screen.map_height): entity.pos_x, entity.pos_y = data[2], data[3] - elif screen.get_cell(cases[0], cases[1]) in walkable: entity.pos_x, entity.pos_y = cases + + cases = [(data[2] + 1, data[3]), (data[2], data[3] - 1), (data[2] - 1, data[3]), (data[2], data[3] + 1)] + pos = cases[direction] + + if not (0 <= pos[0] < screen.map_width and 0 <= pos[1] < screen.map_height) or (not screen.get_cell(pos[0], pos[1]) in walkable): + find = False + cases.remove(cases[(direction + 2) % 4]) + for pos in cases: + if (0 <= pos[0] < screen.map_width and 0 <= pos[1] < screen.map_height) and (screen.get_cell(pos[0], pos[1]) in walkable): + find = True + entity.pos_x, entity.pos_y = pos + break + if not find: + entity.pos_x, entity.pos_y = data[2], data[3] + + else: + entity.pos_x, entity.pos_y = pos def walk_between(entity, data, stat, screen, walkable): @@ -413,11 +433,12 @@ def walk_between(entity, data, stat, screen, walkable): new_x, new_y = _walk_engine(entity, frame) if screen.get_cell(new_x, new_y) in walkable: entity.pos_x, entity.pos_y = new_x, new_y - entity.args[0] = frame + if (entity.pos_x, entity.pos_y) == entity.args[1][frame]: entity.args[0] = frame def walk_to(entity, data, stat, screen, walkable): frame = entity.args[0] + print(frame, len(entity.args[1]), entity.args) if len(entity.args[1]) == frame: entity.behavior = "stand by" entity.args = [] @@ -427,7 +448,7 @@ def walk_to(entity, data, stat, screen, walkable): if screen.get_cell(new_x, new_y) in walkable: entity.pos_x, entity.pos_y = new_x, new_y - entity.args[0] += 1 + if (entity.pos_x, entity.pos_y) == entity.args[1][frame]: entity.args[0] += 1 def follow_by_player(entity, data, stat, screen, walkable): @@ -454,8 +475,8 @@ def _walk_engine(entity, frame): # Extra functions -def print_text(text, min_value=0, max_value=0, default_value=0, screen_width=21, screen_height=7): - paragraphs = [i for i in text_formater(text, screen_width, screen_height) if i] +def print_text(text, min_value=0, max_value=0, default_value=0): + paragraphs = [i for i in text_formater(text) if i] nb = len(paragraphs) for index in range(nb): print("\n" * 7) diff --git a/idk/asgard.py b/idk/asgard.py index 43ee60b..4aae596 100644 --- a/idk/asgard.py +++ b/idk/asgard.py @@ -50,30 +50,30 @@ asgard = (r""" #### _ ### /-\ ### ### ### ~(~)~ ### /_____________\ _ ~~~~~~~~~~~~~~ ### / \ \ || /o\ ##### /-\ /-\ /-\ /~(___)~\ /-\ |_/ \_/ \_| ### ### /o\ ~~~~~~~~~~~ ##### / \ /\ ## |_| ### \~~~~~~~/ |_| |^| |_| ##### ##### |_| ~~~~~~~~~~ ### / \ / \ -~ #### /-\ ### ### ### ~~~~~~~~~~ /|\ ### / \ -~###### ____________ #### #### ### /-\ /|\ ### ##### ~~~~~~~~~~ ### ##### /\ \ -~###### / Himinbjorg \ #### #### ##### ### ### ##### ### ~~~~~~~~ ##### ### / \ -~ #### /______________\ ### ### ### ##### ##### ### ### /|\ ~~~~~~~~~ _ ### /|\ / \ / -~ || ### | ]O[ __ ]O[ | /-\ ### ### _ ##### _ /|\ ~~~~~~~~~ /o\ /|\ / \ / -~ _ ##### |_____|^^|_____| ### ### ### /-\ /-\ ### /o\ ### /o\ ------------- |_| ### / -~ /o\ ### ##### #### #### ##### |_| /|\ |_| ### ##### ###/ -~ |_| /-\ ### #### #### ### ### ##### ### ##### -~ /-\ ##### ### /-\ ### ### ------------- /|\ ### -~~ ### ### _ ### ### ##### ##### /|\ ~~~~~~~ ### /|\ ### -~~ ##### ##### ### ### ### /o\ /-\ ##### ### ### ### ~~~~~~~ ### ##### #### -~~ ### ### ##### ##### ##### |_| ### ### /-\ ##### ### /|\ ### ~~~~~~ ### ##### ### ### -~~ /-\ /-\ ### ### ### ___________ /-\ ##### ### ##### ##### ~~~~~ ##### ### /|\ /|\ -~~ |_| |_| |_| /Sokkvabekkr\ ### /|\ ### ### ~~~~~~ ### /|\ ### -~~ /_____________\ /-\ ### /|\ /|\ ~~~~~~~ /|\ ### ##### -~~ ________ ### ### ### _ /_|_/__\_/__\_|_\ ##### ### ### ~~~~~~~~ ##### ### -~~ /Alfheimr\ ##### ##### ##### /o\ |_| |^| |_| _ ### ##### ### ##### ~~~~~~~~ ### /|\ -~~~ |]O[__]O[| ### ### ### |_| /o\ /-\ ### ##### ### ~~~~~~~~~ _ /|\ ### -~~~ |__|^^|__| |_| |_| |_| ##### ##### |_| /-\ ### /|\ ~~~~~~~~~~ _ /o\ ##### -~~~ ##### ##### /|\ ~~~~~~~~~~ /-\ |_| ### ~ -~~~ ~~~~~~~~~~~~ |_| /|\ ~~ -~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~ -~~~~~~~~~~~ ~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~""", + #### /-\ ### ### ### ~~~~~~~~~~ /|\ ### / \ + ###### ____________ #### #### ### /-\ /|\ ### ##### ~~~~~~~~~~ ### ##### /\ \ + ###### / Himinbjorg \ #### #### ##### ### ### ##### ### ~~~~~~~~ ##### ### / \ + #### /______________\ ### ### ### ##### ##### ### ### /|\ ~~~~~~~~~ _ ### /|\ / \ / + || ### | ]O[ __ ]O[ | /-\ ### ### _ ##### _ /|\ ~~~~~~~~~ /o\ /|\ / \ / + # _ ##### |_____|^^|_____| ### ### ### /-\ /-\ ### /o\ ### /o\ ------------- |_| ### / + ### /o\ ### ##### #### #### ##### |_| /|\ |_| ### ##### ###/ + ##### |_| /-\ ### #### #### ### ### ##### ### ##### + ### /-\ ##### ### /-\ ### ### ------------- /|\ ### + /-\ ### ### _ ### ### ##### ##### /|\ ~~~~~~~ ### /|\ ### + ##### ##### ### ### ### /o\ /-\ ##### ### ### ### ~~~~~~~ ### ##### #### + ### ### ##### ##### ##### |_| ### ### /-\ ##### ### /|\ ### ~~~~~~ ### ##### ### ### + ###/-\ /-\ ### ### ### ___________ /-\ ##### ### ##### ##### ~~~~~ ##### ### /|\ /|\ + ##### |_| |_| |_| /Sokkvabekkr\ ### /|\ ### ### ~~~~~~ ### /|\ ### + ### /_____________\ /-\ ### /|\ /|\ ~~~~~~~ /|\ ### ##### + /-\ ________ ### ### ### _ /_|_/__\_/__\_|_\ ##### ### ### ~~~~~~~~ ##### ### ~ + /Alfheimr\ ##### ##### ##### /o\ |_| |^| |_| _ ### ##### ### ##### ~~~~~~~~ ### /|\ ~ + ### |]O[__]O[| ### ### ### |_| /o\ /-\ ### ##### ### ~~~~~~~~~ _ /|\ ### ~ + #####|__|^^|__| |_| |_| |_| ##### ##### |_| /-\ ### /|\ ~~~~~~~~~~ _ /o\ ##### ~ + ### ##### ##### ~~~~~~~~~ /|\ ~~~~~~~~~~ /-\ |_| ### ~~ + /-\ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~ |^| /|\ ~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~""", # Autres mondes (Asgard = 0) (126, 71, 3, 72, 6), # Midgard @@ -393,8 +393,6 @@ h_20 = (r""" (35, 24, 0, 11, 69)) asgard_entities = ( - [0, '?', 0, 120, 26, 'stand by'], - [0, '?', 0, 51, 55, 'stand by'], [0, '*', 0, 34, 7, 'stand by'], [0, '*', 0, 121, 21, 'stand by'], [0, '*', 0, 117, 32, 'stand by'], @@ -420,7 +418,7 @@ asgard_entities = ( [0, '*', 13, 21, 8, 'stand by'], [0, '*', 14, 26, 2, 'stand by'], ["Vidar", '*', 15, 10, 6, 'stand by'], - [0, '*', 16, 50, 14, 'stand by'], + ["Baldr", '*', 16, 50, 14, 'stand by'], [0, '*', 17, 36, 14, 'stand by'], [0, '*', 18, 30, 9, 'stand by'], [0, '*', 19, 28, 7, 'stand by'], diff --git a/idk/hypo.py b/idk/hypo.py new file mode 100644 index 0000000..659cd53 --- /dev/null +++ b/idk/hypo.py @@ -0,0 +1,440 @@ +from idk_lib import * + + +# Game +def npc(data, stat, entities, identifiant): + npc_data = ( + asgard_npc, + vanaheim_npc, + alfheim_npc, + midgard_npc, + niflheim_npc, + jotunheim_npc, + nidavellir_npc, + muspellheim_npc, + svartalfheim_npc, + h_9_npc, h_10_npc, h_11_npc, h_12_npc, h_13_npc, h_14_npc, h_15_npc, h_16_npc, h_17_npc, h_18_npc, h_19_npc, h_20_npc, + h_21_npc, h_22_npc, + h_23_npc, h_24_npc, + h_25_npc, h_26_npc, h_27_npc, h_28_npc, + h_29_npc, h_30_npc, + h_31_npc, h_32_npc, h_33_npc, h_34_npc, h_35_npc, h_36_npc, + h_37_npc, h_38_npc, h_39_npc, h_40_npc, h_41_npc, + h_42_npc, h_43_npc, h_44_npc, + h_45_npc, h_46_npc, h_47_npc, h_48_npc, + ) + + if identifiant == "Kvasir": return kvasir(data, stat, entities) + elif identifiant == 12: return frigg(data, stat, entities) + elif identifiant == "Freyja": return freyja(data, stat, entities) + else: return npc_core(npc_data[data[1]], data, stat, entities, identifiant) + + +def point_of_interest(data, stat, entities, identifiant): + po_data = ( + asgard_po, + vanaheim_po, + alfheim_po, + midgard_po, + niflheim_po, + jotunheim_po, + nidavellir_po, + muspellheim_po, + svartalfheim_po, + ) + + coords = data[2], data[3] + event = po_data[data[1]](coords, identifiant) + + if not event: return [0, "Il n'y a rien à voir ici."] + else: return event + + +entities = asgard_entities + vanaheim_entities + alfheim_entities + midgard_entities + niflheim_entities + jotunheim_entities + nidavellir_entities + muspellheim_entities + svartalfheim_entities + dlc_entities + (["Kvasir", "*", 3, 46, 66, "stand by"], ) + +print(center("L'Hydromel poetique", 21, " ")) +print("---------------------") +print() +print("Entrez 'hypo()' pour\nune nouvelle partie.") +events = {"*": npc, "?": point_of_interest} +keys = {4: display_stat, 7: spell, 8: misc_stat, 6: inventory, 9: sleep, "s": quick_save} + + +def hypo(save_code=None): + # stat = [0 - PV, 1 - pièces d'or, 2 - [vitesse, agilité, attaque, defense, magie], 3 - [arme, armure], 4 - ticks, 5 - nom, 6 - classe, 7 - sorts connus : (id, level), 8 - sous-quêtes terminées, 9 - misc] + if not save_code: + stat = init_stat() + name = stat[5] + data = [{"main": 0}, 3, 44, 66] + + print_text("A l'issue de la guerre qui opposa Ases et Vanes, Odin et Freyja conclurent un accord de paix durant lequel ils cracherent dans une meme cuve. De cette cuve naquit Kvasir, l'etre le plus sage qui soit. Venere par tous, Kvasir est tres souvent appelle au chevet des Dieux pour prodiguer ses precieux conseils. Odin et Freyja vous ont missionne pour escorter et assister Kvasir dans ses deplacements.") + else: + stat, data = decode_save(save_code) + + idk_game = Asci(maps, entities, events, keys) + npc_init_position(idk_game.entities, data[0]["main"]) + + stat, data = idk_game.mainloop(100, stat, data, routine=routine, low_bar=low_bar, door="^_", walkable=".,`' ", exit_key="q") + + if data[0]["main"] == 100: + print_text("conclusion") + else: + print("hypo(\"{}\")".format(encode_save(data, stat))) + + +def npc_init_position(entites, xp): + if xp < 2: entites["Kvasir"].change_behavior("follow") + elif xp < 11: entites["Kvasir"].teleport(16, 50, 16) + elif xp < 13: entites["Kvasir"].teleport(16, 29, 28) + elif xp < 24: entites["Kvasir"].teleport(16, 30, 28) + else: + entites["Kvasir"].teleport(16, 50, 16) + entites["Freyja"].teleport(16, 48, 14) + + if 16 < xp < 17: entites[12].teleport(4, 79, 20) + elif 17 <= xp < 21: entites[12].teleport(4, 71, 32) + + + +def kvasir(data, stat, entites): + if data[0]["main"] == 13: entites["Kvasir"].teleport(16, 30, 28) + + return { + "base": [0, "Je suis Kvasir."], + 0: [1, "Baldr m'a confie etre preoccupe par de recents reves premonitoires. Nous devrions aller le voir."], + 1: [0, "Nous devrions aller voir Baldr. Il habite dans le Breidablik, a Asgard."], + 2: [0, "Je vais rester ici pour veiller sur Baldr, va chercher Freyja et reviens vite !"], + + 13: [1, "En partant, pense a prevenir la mere de Baldr. [KVASIR SE DECALA POUR VOUS CEDER LE PASSAGE.]"], + + 25: [0, "Grace a toi et a Hel, Baldr est maintenant invincible ! [POUR APPUYER SES PROPOS, KVASIR DEGAINA UNE PETITE DAGUE QU'IL PORTAIT A LA TAILLE ET L'ENFONCA DANS LE VENTRE DE BALDR. LA BLESSURE NE SEMBLAIT PAS LE FAIRE SOUFFRIR LE MOINDRE DU MONDE ET CICATRISA AU FUR ET A MESURE QUE KVASIR RECUPERAIT SON ARME.]"], + 28: [0, "Il me semble que Baldr a une petite commission a te demander."] + } + + +def frigg(data, stat, entites): + if data[0]["main"] == 16: entites[12].teleport(4, 79, 20) + elif data[0]["main"] == 17: entites[12].change_behavior("follow by player", 0, ((82, 20), (82, 32), (71, 32))) + elif data[0]["main"] == 18: + if stat[9] == -1: return [0, "[FRIGG SE TOURNA, VERS VOUS, UNE POINTE D'EMOTION DANS LA VOIX.] Nous voila devant le palais de Hel.\n1. Mais pourquoi sommes nous ici ?\n2. Que faisons-nous maintenant ?", 2] + else: return [0, "[FRIGG SE TOURNA, VERS VOUS, UNE POINTE D'EMOTION DANS LA VOIX.] Nous voila devant le palais de Hel.\n1. Mais pourquoi sommes nous ici ?\n2. Que faisons-nous maintenant ?\n3. Souhaitez-moi bonne chance !", 3] + elif data[0]["main"] == 21: + stat[9] = -1 + entites[12].teleport(0, 8, 44) + + return { + "base": [0, "Je suis Frigg, deesse du mariage et de la maternite."], + 14: [0, "Frigg, deesse du mariage et de la maternite, que puis-je pour toi ?\n1. Pour moi rien, c'est votre fils, Baldr.", 1], + 15: [0, "Que lui arrive-t-il ?\n1. Il reve de sa mort. Freyja va tenter de voir son avenir grace au Seidr.", 1], + 16: [1, "Le Seidr ne fait pas tout, c'est Hel qu'il faut aller voir. On se retrouve a Helheim."], + 17: [1, "Je savais que tu viendrais, suis-moi."], + 19: [-1, "Les reves premonitoires ne sont jamais bon signe. Si Baldr reve de sa mort, le meilleur moyen de l'empecher de passer de l'autre cote est encore de convaincre Hel de le rendre immortel."], + 20: [-2, "Il va te falloir convaincre Hel pour qu'elle rende Baldr immortel. Aucun Dieu, aucun humain, aucun animal, aucune plante ni aucune chose ne doit pouvoir le blesser ni le tuer.", 0, (9, 1)], + 21: [1, "Bon courage {}. Et merci ! Pour ma part je vais retourner au chevet de mon fils.".format(stat[5])], + } + + +def freyja(data, stat, entites): + if data[0]["main"] == 10: data[1], data[2], data[3] = 16, 29, 28 + + return { + "base": [0, "Je suis Freyja, la reine des Vanes."], + 7: [0, "Tu n'as pas l'air tres frais {}...\n1. Desole, je viens d'Asgard, le voyage a ete... brutal.\n2. Baldr m'envoie requerir votre aide.".format(stat[5]), 2], + 8: [-1, "C'est Freyr qui t'as teleporte ? Pourtant je lui ai fait repeter le sort des dizaines de fois..."], + 9: [0, "Baldr ?! Que lui arrive-t-il ?\n1. Il reve de sa propre mort, et voudrais que le Seidr eclaire son avenir.", 1], + 10: [1, "Hmm... Je vais voir ce que je peux faire. As-tu prevenu Frigg, sa mere ? Tu la trouveras non loin du Breidablik. [UNE DOUCE CHALEUR VOUS ENVELOPPA, VOUS FERMEZ LES YEUX ET TOMBEZ DANS UN SOMMEIL PROFOND.]"], + + 25: [0, "Baldr savoure sa jeune immortalite, et ignore les avertissements du Seidr.\n1. Comment cela ?\n2. Cela n'a guere d'importance : il est immortel.", 2], + 26: [2, "Il m'accuse de jouer les rabas-joie, mais je sais ce que j'ai vu, et Baldr est aussi immortel et toi et moi... enfin... surtout toi."], + 27: [1, "Tu seras moins sur de toi quand il mourra."], + 28: [0, "Baldr mourra. Et plus tot qu'on ne le pense."], + } + + +# - - - Asgard - - - # +def asgard_po(coords, identifiant): + pass + + +def asgard_npc(data, stat, entites, identifiant): + pass + + +def h_9_npc(data, stat, entites, identifiant): + pass + + +def h_10_npc(data, stat, entites, identifiant): + if identifiant == "Odin": + return { + "base": [0, "Je suis Odin, le plus puissant des Ases."], + 29: [], + } + + +def h_11_npc(data, stat, entites, identifiant): + pass + + +def h_12_npc(data, stat, entites, identifiant): + pass + + +def h_13_npc(data, stat, entites, identifiant): + coords = data[2], data[3] + + if coords == (21, 8): + if data[0]["main"] == 6: data[1], data[2], data[3] = 1, 54, 29 + + return { + "base": [0, "Freyr, pour te servir."], + 2: [0, "[FREYR SE RETOURNE VERS VOUS.] Oh, bonjour {}. Que puis-je faire pour toi ?\n1. Baldr reve de sa mort et aimerait en savoir plus sur son destin.\n2. Je cherche Freyja.\n3. Que faites-vous ici ?\n4. Pouvez-vous m'envoyer a Vanaheim s'il vous plait ?".format(stat[5]), 4], + 3: [-1, "Hum, je comprends... Pour ce genre de question, Freyja est plus douee que moi."], + 4: [-2, "La derniere fois que je l'ai vue elle etait a Vanaheim."], + 5: [-3, "Depuis la fin de la Premiere Guerre, Ases et Vanes ont echanges des Dieux en signe d'appaisement. Je suis ainsi arrive chez les Ases. Freyja vient de temps en temps me rendre visite."], + 6: [1, "Mais bien sur {} ! [L'HABITUELLE TORPEUR VOUS PRIT, VOTRE VISION D'ESTOMPA DANS UNE SENSATION NAUSEEUSE DE FLOTTEMENT. LE CHOC BRUTAL CONTRE LA TERRE VOUS REVEILLA COMME D'UN MAUVAIS REVE.]".format(stat[5])], + } + + +def h_14_npc(data, stat, entites, identifiant): + pass + + +def h_15_npc(data, stat, entites, identifiant): + pass + + +def h_16_npc(data, stat, entites, identifiant): + if identifiant == "Baldr": + + if data[0]["main"] == 1: + entites["Kvasir"].change_behavior("stand by") + entites["Kvasir"].teleport(16, 50, 16) + elif data[0]["main"] == 11: + entites["Kvasir"].change_behavior("walk to", 0, ((50, 25), (29, 25), (29, 28))) + + return { + "base": [0, "Baldr, fils d'Odin et de Frigg. Dieu de la lumiere, de la jeunesse, de l'amour et de la beaute."], + 1: [0, "Ah ! Vous voila enfin ! Depuis quelques temps, je fais des reves etranges dans lesquels je me vois mourir. Maintenant, j'ai meme peur de sortir du Breidablik !\n1. Nous pouvons vous aider ?", 1], + 2: [0, "Si vous pouviez demander de l'aide à Freyja, je vous en serais reconnaissant.\n1. En quoi Freyja peut vous aider ?\n2. Ou pouvons-nous la trouver ?", 2], + 3: [-1, "Freyja pratique le Seidr, et, avec Odin, elle est la meilleure seidr de tout l'Yggdrasil. Avant que tu ne me demandes, le Seidr est une forme de magie divinatoire. Nous autres, Dieux, la pratiquons et pour certains avec beaucoup de puissance. Mais les humains peuvent aussi en faire."], + 4: [-2, "Habituellement, elle reside dans son palais a Vanaheim, mais depuis la treve et en signe de paix, elle se rend regulierement au Folkvangr."], + + 11: [0, "Ah {} deja de retour !\n1. Freyja m'a dit qu'elle allait faire son possible.".format(stat[5]), 1], + 12: [1, "Très bien ! Merci beaucoup de ton aide ! Voici quelques pieces. [+15 PO]", 0, (1, 15)], + + 25: [0, "Ah merci {} ! Grace a toi je ne crains plus la mort ! Odin, mon pere, n'a plus besoin de s'inquieter de rien !".format(stat[5])], + 28: [1, "{}, mon ami ! Va porter ce plis a mon pere, Odin.".format(stat[5])], + + } + + +def h_17_npc(data, stat, entites, identifiant): + pass + + +def h_18_npc(data, stat, entites, identifiant): + pass + + +def h_19_npc(data, stat, entites, identifiant): + pass + + +def h_20_npc(data, stat, entites, identifiant): + pass + + +# - - - Vanaheim - - - # +def vanaheim_po(coords, identifiant): + pass + + +def vanaheim_npc(data, stat, entites, identifiant): + pass + + +def h_21_npc(data, stat, entites, identifiant): + pass + + +def h_22_npc(data, stat, entites, identifiant): + pass + + +# - - - Alfheim - - - # +def alfheim_po(coords, identifiant): + pass + + +def alfheim_npc(data, stat, entites, identifiant): + pass + + +def h_23_npc(data, stat, entites, identifiant): + pass + + +def h_24_npc(data, stat, entites, identifiant): + pass + + +# - - - Midgard - - - # +def midgard_po(coords, identifiant): + pass + + +def midgard_npc(data, stat, entites, identifiant): + pass + + +def h_25_npc(data, stat, entites, identifiant): + pass + + +def h_26_npc(data, stat, entites, identifiant): + pass + + +def h_27_npc(data, stat, entites, identifiant): + pass + + +def h_28_npc(data, stat, entites, identifiant): + pass + + +# - - - Niflheim - - - # +def niflheim_po(coords, identifiant): + pass + + +def niflheim_npc(data, stat, entites, identifiant): + pass + + +def h_29_npc(data, stat, entites, identifiant): + pass + + +def h_30_npc(data, stat, entites, identifiant): + if identifiant == "Hel": + if data[0]["main"] == 24: + entites["Kvasir"].teleport(16, 50, 16) + entites["Freyja"].teleport(16, 48, 14) + + return { + "base": [0, "Je suis Hel, deesse de la mort et reine de Niflheim"], + 22: [0, "Un humain !? C'est chose rare ici... surtout vivant.\n1. Je viens de la part de Frigg", 1], + 23: [0, "[HEL LEVA LES YEUX D'UN AIR EXASPÉRÉ.] Que veux-t-elle ?\n1. Baldr reve de sa mort et Frigg aimerait lui garantir la vie eternelle.", 1], + 24: [1, "Encore !? Bon d'accord, cette fois-ci je le ferai."], + 25: [0, "Oui, oui c'est bon je m'en occupe !"], + } + + +# - - - Jotunheim - - - # +def jotunheim_po(coords, identifiant): + pass + + +def jotunheim_npc(data, stat, entites, identifiant): + pass + + +def h_31_npc(data, stat, entites, identifiant): + pass + + +def h_32_npc(data, stat, entites, identifiant): + pass + + +def h_33_npc(data, stat, entites, identifiant): + pass + + +def h_34_npc(data, stat, entites, identifiant): + pass + + +def h_35_npc(data, stat, entites, identifiant): + pass + + +def h_36_npc(data, stat, entites, identifiant): + pass + + +# - - - Nidavellir - - - # +def nidavellir_po(coords, identifiant): + pass + + +def nidavellir_npc(data, stat, entites, identifiant): + pass + + +def h_37_npc(data, stat, entites, identifiant): + pass + + +def h_38_npc(data, stat, entites, identifiant): + pass + + +def h_39_npc(data, stat, entites, identifiant): + pass + + +def h_40_npc(data, stat, entites, identifiant): + pass + + +def h_41_npc(data, stat, entites, identifiant): + pass + + +# - - - Muspellheim - - - # +def muspellheim_po(coords, identifiant): + pass + + +def muspellheim_npc(data, stat, entites, identifiant): + pass + + +def h_42_npc(data, stat, entites, identifiant): + pass + + +def h_43_npc(data, stat, entites, identifiant): + pass + + +def h_44_npc(data, stat, entites, identifiant): + pass + + +# - - - Svartalfheim - - - # +def svartalfheim_po(coords, identifiant): + pass + + +def svartalfheim_npc(data, stat, entites, identifiant): + pass + + +def h_45_npc(data, stat, entites, identifiant): + pass + + +def h_46_npc(data, stat, entites, identifiant): + pass + + +def h_47_npc(data, stat, entites, identifiant): + pass + + +def h_48_npc(data, stat, entites, identifiant): + pass \ No newline at end of file diff --git a/idk/idk.py b/idk/idk.py index 5e60af8..939de04 100644 --- a/idk/idk.py +++ b/idk/idk.py @@ -1,18 +1,5 @@ from idk_lib import * -try: - import dlc_idk as dlc - spells = dlc.dlc_spells - spells_level = dlc.dlc_spells_level - spells_effect = dlc.dlc_spells_effect - weapons = dlc.dlc_weapons - armors = dlc.dlc_armors - dlc_entities = dlc.dlc_entities -except: - dlc = None - dlc_entities = () - - # Game def npc(data, stat, entities, identifiant): @@ -36,11 +23,6 @@ def npc(data, stat, entities, identifiant): h_42_npc, h_43_npc, h_44_npc, h_45_npc, h_46_npc, h_47_npc, h_48_npc) - - if dlc: - event = dlc.dlc_npc(data, stat, entities, identifiant) - if event: return "dlc", event - return npc_core(npc_data[data[1]], data, stat, entities, identifiant) @@ -64,14 +46,34 @@ def point_of_interest(data, stat, entities, identifiant): else: return event -entities = asgard_entities + vanaheim_entities + alfheim_entities + midgard_entities + niflheim_entities + jotunheim_entities + nidavellir_entities + muspellheim_entities + svartalfheim_entities + dlc_entities +poi = ( + [0, '?', 0, 120, 26, 'stand by'], + [0, '?', 0, 51, 55, 'stand by'], + [0, '?', 1, 42, 20, 'stand by'], + [0, '?', 2, 34, 20, 'stand by'], + [0, '?', 3, 29, 9, 'stand by'], + [0, '?', 3, 53, 24, 'stand by'], + [0, '?', 3, 66, 45, 'stand by'], + [0, '?', 3, 52, 79, 'stand by'], + [0, '?', 4, 88, 32, 'stand by'], + [0, '?', 5, 60, 57, 'stand by'], + [0, '?', 5, 23, 70, 'stand by'], + [0, '?', 5, 60, 86, 'stand by'], + [0, '?', 6, 65, 7, 'stand by'], + [0, '?', 6, 66, 58, 'stand by'], + [0, '?', 7, 66, 8, 'stand by'], + [0, '?', 7, 65, 97, 'stand by'], + [0, '?', 8, 113, 37, 'stand by'] + ) + +entities = asgard_entities + vanaheim_entities + alfheim_entities + midgard_entities + niflheim_entities + jotunheim_entities + nidavellir_entities + muspellheim_entities + svartalfheim_entities + poi print(center("Island of the Dead", 21, " ")) print(center("* Kings *", 21, " ")) print("---------------------") -if dlc: print(center("DLC : {}".format(dlc.dlc_title), 21, " ")) -else: print() +print() print("Entrez 'idk()' pour\nune nouvelle partie.") + events = {"*": npc, "?": point_of_interest} keys = {4: display_stat, 7: spell, 8: misc_stat, 6: inventory, 9: sleep, "s": quick_save} diff --git a/idk/idk_lib.py b/idk/idk_lib.py index 6d59b78..e969f3d 100644 --- a/idk/idk_lib.py +++ b/idk/idk_lib.py @@ -1,5 +1,7 @@ from asci import Asci, print_text, center, enumerate +import asci from random import randint, choice +from math import floor from asgard import * from vanaheim import * @@ -21,20 +23,27 @@ maps = ( nidavellir, muspellheim, svartalfheim, - h_9, h_10, h_11, h_12, h_13, h_14, h_15, h_16, h_17, h_18, h_19, h_20, - h_21, h_22, - h_23, h_24, + + h_9, h_10, h_11, h_12, h_13, h_14, h_15, h_16, h_17, h_18, h_19, h_20, # asgard's houses + h_21, h_22, # vanaheim's houses + h_23, h_24, # alfheim's houses h_25, h_26, h_27, h_28, h_29, h_30, h_31, h_32, h_33, h_34, h_35, h_36, h_37, h_38, h_39, h_40, h_41, h_42, h_43, h_44, - h_45, h_46, h_47, h_48 - ) + h_45, h_46, h_47, h_48, -spells = ("Soin", "Flammes", "Givre", "Etincelles", "Fatigue") + h_49, h_50, h_51, h_52, h_53, h_54, # vanaheim's extra houses + h_55, h_56, h_57, h_58, h_59, h_60, h_61, h_62, h_63, h_64, h_65, h_66, h_67, h_68, h_69, h_70, h_71, h_72, h_73, h_74, h_75, h_76, h_77, h_78, h_79, h_80, h_81, # alfheim's extra house + h_82, h_83, h_84, h_85, h_86, h_87, h_88, h_89, h_90, h_91, h_92, h_93, h_94, h_95, h_96, h_97, # midgard's extra houses + h_98, h_99, h_100, h_101, h_102, h_103, h_104, h_105, h_106, h_107, h_108, h_109, h_110, # niflheim's extra houses + + +) + +spells = (("Soin", 4, 1, True), ("Flammes", 4, -1, False), ("Givre", 4, -1, False), ("Etincelles", 4, -1, False), ("Fatigue", 0, -1, False)) # (capacity, factor, True on player; False on opponent) spells_level = ("I", "II", "III", "IV", "V") -spells_effect = ((4, 1, True), (4, -1, False), (4, -1, False), (4, -1, False), (0, -1, False)) # (capacity, factor, True on player; False on opponent) weapons = ("", "Dague", "Marteau", "Masse", "Fleau", "Hache", "Epee", "Espadon", "Hache double") armors = ("", "Rondache", "Pavois", "Cote de maille", "Broigne", "Harnois") @@ -48,7 +57,7 @@ def inn_interaction(data, stat, nb_choice, text, *events): def spell_selection(text, spells_to_display): - message = text + "\n" + "\n".join(["{0}. {1} {2}".format(nb + 1, spells[spells_to_display[nb][0]], spells_level[spells_to_display[nb][1] - 1]) for nb in range(len(spells_to_display))]) + message = text + "\n" + "\n".join(["{0}. {1} {2}".format(nb + 1, spells[spells_to_display[nb][0]][0], spells_level[spells_to_display[nb][1] - 1]) for nb in range(len(spells_to_display))]) return print_text(message, 1, len(spells_to_display), 0) - 1 @@ -166,8 +175,8 @@ def npc_core(event_fn, data, stat, entities, identifiant): event = event_fn(data, stat, entities, identifiant) if not event: - msg = ("Hmm ?", "Besoin de quelque chose ?", "Vous cherchez quelqu'un ?", "Vous etes... ?", "Oui ?", "He ! Regarde ou tu vas.") - sel_choice = print_text("{0}\n1. Attaquer\n2. Voler\n3. Ne rien faire".format(choice(msg)), 1, 3, 3) + msg = ("Hmm ?", "Besoin de quelque chose ?", "Vous cherchez quelqu'un ?", "Vous etes... ?", "Oui ?", "He ! Regarde ou tu vas.", "Un probleme ?") + sel_choice = print_text("{0}\n1. Attaquer\n2. Voler".format(choice(msg)), 1, 2, 0) if sel_choice == 1: opponent_stat = [randint(5, stat[2][i] + 5) for i in range(4)] @@ -181,7 +190,7 @@ def npc_core(event_fn, data, stat, entities, identifiant): else: return [0, "Votre victime vous a vu et vous a mis une raclee.", 0, (0, -10)] - elif sel_choice == 3: + else: return None elif type(event) == tuple and len(event) > 2: @@ -237,8 +246,6 @@ def routine(data, stat): if stat[2][4] > 99: stat[2][4] = 99 - - def low_bar(data, stat): h = stat[4] // 60 m = stat[4] % 60 @@ -274,7 +281,7 @@ def fight(stat, opponent_stat, opponent_name): print("\n" * 6 + "Sort(s) connu(s) :") count = 0 for spell_id, level in stat[7]: - print("{0}. {1} {2}".format(count + 1, spells[spell_id], spells_level[level - 1])) + print("{0}. {1} {2}".format(count + 1, spells[spell_id][0], spells_level[level - 1])) count += 1 spell_choice = get_input() if spell_choice < 0 or spell_choice > len(stat[7]): spell_choice = 0 @@ -283,11 +290,11 @@ def fight(stat, opponent_stat, opponent_name): spell_id, level = stat[7][spell_choice][0], stat[7][spell_choice][1] if stat[2][4] >= level * 10: - msg += "\nVous lancez {0} de niveau {1} [-{2} PM].".format(spells[spell_id], spells_level[level - 1], level * 10) + msg += "\nVous lancez {0} de niveau {1} [-{2} PM].".format(spells[spell_id][0], spells_level[level - 1], level * 10) stat[2][4] -= level * 10 pts = 12 * level + randint(-5, 5) - capacity, factor, apply_on_player = spells_effect[spell_id] + capacity, factor, apply_on_player = spells[spell_id][1:] if apply_on_player: player_stat[capacity] += factor * pts @@ -323,8 +330,7 @@ def fight(stat, opponent_stat, opponent_name): print_text(msg) - # opponent_stat = [vitesse, agilité, attaque, défense, vie] - # player_stat = [vitesse, agilité, attaque, défense, vie] + # *_stat = [vitesse, agilité, attaque, défense, vie] player_stat = [stat[2][0], stat[2][1], stat[2][2] + stat[3][0] * 5, stat[2][3] + stat[3][1] * 5, stat[0]] end = False @@ -369,7 +375,7 @@ def fight(stat, opponent_stat, opponent_name): # Fight if player > opponent: end = player_turn() - if end: return 2 + if end: return 2, player_stat[4] if opponent_stat[4] <= 0: return 0, player_stat[4] opponent_turn() @@ -481,7 +487,7 @@ def spell(data, stat): if i < len(stat[7]): spell_id, level = stat[7][i] if spell_id >= 0: - to_disp = "{0} {1}".format(spells[spell_id], spells_level[level - 1]) + to_disp = "{0} {1}".format(spells[spell_id][0], spells_level[level - 1]) print(" |{}.".format(i + 1) + to_disp + " " * (14 - len(to_disp)) + "|") else: print(" | |") @@ -492,7 +498,7 @@ def spell(data, stat): if spell_choice: spell_choice -= 1 spell_id, level = stat[7][spell_choice][0], stat[7][spell_choice][1] - capacity, factor, apply_on_player = spells_effect[spell_id] + spell_name, capacity, factor, apply_on_player = spells[spell_id] if not apply_on_player: print_text("Vous ne pouvez pas lancer ce sort.") @@ -502,18 +508,20 @@ def spell(data, stat): stat[2][4] -= level * 10 pts = 12 * level + randint(-5, 5) - if capacity == 4: + if capacity == 4: # Health stat[0] += factor * pts else: stat[2][capacity] += factor * pts - print_text("Vous lancez {0} de niveau {1} [-{2} PM] et {3} {4} points de {5}".format(spells[spell_id], spells_level[level - 1], level * 10, ("perdez", "gagnez")[factor > 0], pts, ("vitesse", "agilité", "attaque", "défense", "vie")[capacity])) + cost = level * 10 + if stat[6] == 3: cost = level * 8 + print_text("Vous lancez {0} de niveau {1} [-{2} PM] et {3} {4} points de {5}".format(spell_name, spells_level[level - 1], level * 10, ("perdez", "gagnez")[factor > 0], pts, ("vitesse", "agilité", "attaque", "défense", "vie")[capacity])) else: print_text("Vous n'avez plus assez de points de Magie.") def quick_save(data, stat): data_copy = data[:] - stat_copy = stat[:-1] + stat_copy = stat[:] print_text("\"{}\"".format(encode_save(data_copy, stat_copy))) @@ -546,17 +554,22 @@ def init_stat(): if player_class == 1: stat = [6, 6, 10, 6, 6] elif player_class == 2: - stat = [6, 10, 6, 6, 6] + stat = [6, 20, 6, 6, 6] elif player_class == 3: - stat = [6, 6, 6, 10, 6] + stat = [6, 6, 6, 20, 6] elif player_class == 4: - stat = [6, 6, 6, 6, 20] + stat = [6, 6, 6, 6, 12] elif player_class == 5: stat = [10, 6, 6, 6, 6] stat = [100, 10, stat, [0, 0], 360, name, player_class - 1, [], 1, -1] - if player_class == 4: + + if player_class == 1: + stat[3][1] = 1 + elif player_class == 4: stat[7].append((1, 1)) + elif player_class == 5: + stat[3][0] = 1 return stat @@ -583,7 +596,7 @@ def decode_save(save_code): encoded_stat = stat.split(",") encoded_data = data.split(",") - encoded_stat = [encoded_stat[0], encoded_stat[1], encoded_stat[2: 7], encoded_stat[7: 9], encoded_stat[9], 0, encoded_stat[11], encoded_stat[12: -1], encoded_stat[-1], -1] + encoded_stat = [encoded_stat[0], encoded_stat[1], encoded_stat[2: 7], encoded_stat[7: 9], encoded_stat[9], 0, encoded_stat[11], encoded_stat[12: -2], encoded_stat[-2], encoded_stat[-1]] if encoded_stat[7] == ["0"]: encoded_stat[7] = [] diff --git a/idk/jotunheim.py b/idk/jotunheim.py index 8e58a08..56a7493 100644 --- a/idk/jotunheim.py +++ b/idk/jotunheim.py @@ -294,9 +294,6 @@ h_36 = (r""" (20, 14, 5, 23, 88)) jotunheim_entities = ( - [0, '?', 5, 60, 57, 'stand by'], - [0, '?', 5, 23, 70, 'stand by'], - [0, '?', 5, 60, 86, 'stand by'], ["Utarg", '*', 5, 34, 56, 'stand by'], [0, '*', 5, 25, 10, 'stand by'], [0, '*', 5, 39, 20, 'stand by'], diff --git a/idk/midgard.py b/idk/midgard.py index 2386469..c2638c6 100644 --- a/idk/midgard.py +++ b/idk/midgard.py @@ -5,7 +5,7 @@ midgard = (r""" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~ ~~ ~~~~~~ ~~~ _ ~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~ ~~~ ~~~ ~~~ /-\ ~~~~~~~ ~~~~~~~~~~~~~~ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~ ~~~~~ ~~~ ~~~~ ~~~ |_| ~~~~~~~ ~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~ ~~~~~ ~~~ ~~~~ ~~~ |^| ~~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~~~~~~ ~~ ~~~~ ~~ ~~ ~~~~~ ~ ~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~ ~~~ ~ ~~~~~ ~~ ~~~ ~~~ ~~~~ ~~~~~ ~ ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~ ~ ~~ ~~~~~ ~~~ ~~ ~~~~ ~~~ ~ ~~~~~~~~~ @@ -50,31 +50,31 @@ midgard = (r""" ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ##### |_ o o \ ### _ ##### ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~~~~ ### |^|_____| /-\ _ /o\___ ### ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~ /-\ /o\ |_ ]O[\ /-\ ~~~~~~ -~~~~~~~~~~~~~~~~~~~~~~~~~ |_| |^|___| ~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~ |^| |^|___| ~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ### ' __ , ### _ ~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ##### / \ ##### / \ ~~~~~~~ -~~~~~~~~~~~~~~~~~ ### ### ' |__| , ### |_| _ ~~~~~~ +~~~~~~~~~~~~~~~~~ ### ### ' |^_| , ### |^| _ ~~~~~~ ~~~~~~~~ ##### /-\ ### /-\ /o\ ~~~~~~ -~~~~~~~~ _ ### ##### . , , |_| ~~~~~~ +~~~~~~~~ _ ### ##### . , , |^| ~~~~~~ ~~~~~ /-\ ### /-\ ### . , . __ _ ~~~~~~ -~~~~~~~ |_| ##### /-\ ,. ' /[]\ / \ ~~~~~~~ -~~~~~~ ### ' . |__| |_| ~~~~~~~~~~ +~~~~~~~ |^| ##### /-\ ,. ' /[]\ / \ ~~~~~~~ +~~~~~~ ### ' . |^_| |^| ~~~~~~~~~~ ~~~~~~~~~~~~~~ /-\ . ' . __ _ ~~~~~~~~~~~ ~~~~~~~~~~~~~~~~ /<>\ _ /-\ ~~~~~~~~~~~ -~~~~~~~~~~~~~~~~ __ ' ' . |__| /o\ |_| ~~~~~~~~~~~ -~~~~~~~~~~~~~~~~~~ /<>\ ' ___ |_| _ ~~~~~~~~~~ -~~~~~~~~~~~~~~~~~~~ |__| / _\ .. /o\ ~~~~~~~~ -~~~~~~~~~~~~~~~~~~~~ ' . |_|^| . _ _ |_| ~~~~~~~ +~~~~~~~~~~~~~~~~ __ ' ' . |_^| /o\ |^| ~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~ /<>\ ' ___ |^| _ ~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~ |^_| / _\ .. /o\ ~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~ ' . |_|^| . _ _ |^| ~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ' /o\____/o\ ~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ' ' __ |==|==| o o |==|==| __ ~~~~~ ~~~~~~~~~~~~~~~~~~~~ ' /[]\ | | __ | | /<>\ ~~~~~ -~~~~~~~~~~~~~~~ ' |__| | |__|^^|__| | |__| ~~~~ +~~~~~~~~~~~~~~~ ' |^_| | |__|^^|__| | |_^| ~~~~ ~~~~~~~~~~~~~~~~~ ___ | | ~~~~~ ~~~~~~~~~~~~~~~~~~~ . /]O[\ | #### #### | ~~~~~~~ -~~~~~~~~~~~~~~~~~~~ . |___| | #### #### | ~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~ . |__^| | #### #### | ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ' , __ | #### #### | ~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ / \ | | ~~~~~~~~~~~~~~ -~~~~~~~~~~~~~~ . |__| | #### #### | ~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~ . |_^| | #### #### | ~~~~~~~~~~~~~~~ ~~~~~~~~~~ | #### #### | ~~~~~~~~~~~~~~ ~~~~~~~~~~~ | #### #### | ~~~~~~~~~~~~ ~~~~~~~ ### ### | | ~~~~~~~~~~~ @@ -89,10 +89,10 @@ midgard = (r""" ~~~~~~~~~~~ ##### ### ##### /|\ /|\ |--|--|--|~~~~ ~~~~~~~~~~~~~ ### _ /|\ ##### ### ### ~~~~~~~~~~~ ~~~~~~~~~~~~~~~ /|\ /-\ ### ### ##### ##### ~~~~~~~~~~~~ -~~~~~~~~~~~~~~~~ |_| _ /|\ ##### ##### ##### ### ~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ |^| _ /|\ ##### ##### ##### ### ~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ / \ _ ##### ### ### ### ##### ~~~~~~~~~~~~~~ -~~~~~~~~~~~~~~~~~~~~ |_| / \ ### /|\ ##### /|\ ### ~~~~~~~~~~~~~~~~ -~~~~~~~~~~~~~~~~~~~~~~ |_| /|\ ### /|\ ~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~ |^| / \ ### /|\ ##### /|\ ### ~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~ |^| /|\ ### /|\ ~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /|\ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -111,6 +111,23 @@ midgard = (r""" (44, 65, 27, 9, 16), # Maison du joueur (60, 69, 28, 24, 14), # Mesnie fortifiée (1/2) (61, 69, 28, 25, 14), # Mesnie fortifiée (2/2) + + (58, 51, 82, 5, 4), + (51, 54, 83, 4, 9), + (69, 54, 84, 5, 4), + (89, 56, 85, 5, 4), + (71, 59, 86, 4, 9), + (81, 59, 87, 5, 4), + (61, 62, 88, 5, 4), + (69, 63, 89, 5, 4), + (29, 64, 90, 4, 9), + (82, 65, 91, 5, 4), + (36, 69, 92, 4, 9), + (88, 69, 93, 10, 9), + (32, 72, 94, 10, 9), + (42, 75, 95, 10, 9), + (33, 92, 96, 5, 4), + (38, 93, 97, 5, 4), ) @@ -192,11 +209,187 @@ h_28 = (r""" (24, 14, 3, 60, 69), (25, 14, 3, 61, 69)) + +h_82 = (r""" +|==|=====| +| /#\ | +| | +| | +|===|^|==|""", + (5, 4, 3, 58, 51)) + + +h_83 = (r""" +|<><><>|~|<><>| +| |~| | +| /{O}\ | +| |###| | +| +--+ | +| | | | +| | | | +| +--+ | +| | +|<>|^|<><><><>|""", + (4, 9, 3, 51, 54)) + + +h_84 = (r""" +|========| +| [=]| +| /-\| +| | +|===|^|==|""", + (5, 4, 3, 69, 54)) + + +h_85 = (r""" +|<><><><>| +|[===] | +| | +| | +||^|<>|""", + (5, 4, 3, 89, 56)) + + +h_86 = (r""" +|=-=-=-=-=-=-=| +|[====] _ | +| (_) | +|[====] [I] | +| | +|[====] _ | +| (_) | +|[====] [I] | +| | +|<>|^|<><><><>|""", + (4, 9, 3, 71, 59)) + + +h_87 = (r""" +|==|=====| +| /_\ | +| | +| | +|===|^|==|""", + (5, 4, 3, 81, 59)) + + +h_88 = (r""" +|========| +|+-+ | +|| | | +|+-+ | +|===|^|==|""", + (5, 4, 3, 61, 62)) + + +h_89 = (r""" +|========| +| | +| | +| | +|===|^|==|""", + (5, 4, 3, 69, 63)) + + +h_90 = (r""" +|=======|_|====| +| /###\ | +| | +| +---+ | +| | | | +| | | | +| | | | +| +---+ | +| | +|==|^|========|""", + (4, 9, 3, 29, 64)) + + +h_91 = (r""" +|==|=====| +| /#\ | +| | +| | +|===|^|==|""", + (5, 4, 3, 82, 65)) + + +h_92 = (r""" +|<><><[I]><><>| +| [I] | +| /-\ [====]| +| | +| [====]| +| [I] | +| /-\ [====]| +| | +| [====]| +|<>|^|<><><><>|""", + (4, 9, 3, 36, 69)) + + +h_93 = (r""" +|/\/\/\|/\/\/\| +|\/\/\/|\/\/\/| +| [I] | +| _ /-\ _ | +| |_| |_| | +| |_| |_| | +| |_| |_| | +| | +| | +|========|^|==|""", + (10, 9, 3, 88, 69)) + + +h_94 = (r""" +|<><><><><><><><>| +| | +| | +| | +| | +| | +| | +| | +| | +|<><><><>|^|<><><><>|""", + (10, 9, 3, 32, 72)) + + +h_95 = (r""" +|<><><>|<><><>| +| | +| | +| | +| | +| | +| | +| | +| | +|<><><><>|^|<>|""", + (10, 9, 3, 42, 75)) + + +h_96 = (r""" +|========| +| +-+| +| | || +| +-+| +|===|^|==|""", + (5, 4, 3, 33, 92)) + + +h_97 = (r""" +|=====|==| +| /-\ | +| | +| | +|===|^|==|""", + (5, 4, 3, 38, 93)) + + midgard_entities = ( - [0, '?', 3, 29, 9, 'stand by'], - [0, '?', 3, 53, 24, 'stand by'], - [0, '?', 3, 66, 45, 'stand by'], - [0, '?', 3, 52, 79, 'stand by'], [0, '*', 3, 39, 49, 'stand by'], [0, '*', 3, 8, 59, 'stand by'], [0, '*', 3, 66, 56, "stand by"], diff --git a/idk/muspellheim.py b/idk/muspellheim.py index c896753..ab98684 100644 --- a/idk/muspellheim.py +++ b/idk/muspellheim.py @@ -198,8 +198,6 @@ h_44 = (r""" (25, 24, 7, 68, 89)) muspellheim_entities = ( - [0, '?', 7, 66, 8, 'stand by'], - [0, '?', 7, 65, 97, 'stand by'], [0, '*', 7, 20, 12, 'stand by'], [0, '*', 7, 78, 14, 'stand by'], [0, '*', 7, 54, 80, 'stand by'], diff --git a/idk/nidavellir.py b/idk/nidavellir.py index 6769b03..ec0bea9 100644 --- a/idk/nidavellir.py +++ b/idk/nidavellir.py @@ -199,8 +199,6 @@ h_41 = (r""" (10, 19, 6, 23, 51)) nidavellir_entities = ( - [0, '?', 6, 65, 7, 'stand by'], - [0, '?', 6, 66, 58, 'stand by'], [0, '*', 6, 49, 21, 'stand by'], [0, '*', 6, 25, 31, 'stand by'], [0, '*', 6, 74, 46, 'stand by'], diff --git a/idk/niflheim.py b/idk/niflheim.py index 4982939..12eb9ad 100644 --- a/idk/niflheim.py +++ b/idk/niflheim.py @@ -13,16 +13,16 @@ _\ ### ##### ### ##### /_\ ### ##### ##### /_\ ##### /_ #### ### ##### ### |+| |_| ##### /_\##### /_\ |+| ######### #### /_\ ##### /_\ |_| ##### ##### _ |_| ### #### ### ### ### ### |+| ___ ### /_\ ### -/_\ /_\ _ /_\ /_\ |_| / \ ##### /_\ - ### ### |+| |___| ##### ### +/_\ /_\ _ /_\ /_\ |_| / _\ ##### /_\ + ### ### |+| |_|^| ##### ### ##### ##### ' ' |_| ___ _ ### ##### - ##### ##### __ / \ ` ' _ |+| /_\ ##### - ### ### _ .' ,` /()\ |___| /-\ |_| ### ### + ##### ##### __ / _\ ` ' _ |+| /_\ ##### + ### ### _ .' ,` /()\ |_|^| /-\ |_| ### ### /_\ /_\ |+| .` | |____ |^| _ ##### /_\ ### ### |_| '' |_ () \ _ `' ` |+| ##### #### ##### ,, |^|_____| |+| ___ , |_| ### -#### ##### , `` |_| / \ , ,., /_\ ### -### ### ,` ` |___| ,, ##### +#### ##### , `` |_| /_ \ , ,., /_\ ### +### ### ,` ` |^|_| ,, ##### /_\ /_\ _ ' .` _ , _ ##### ### |+| _ , |+| .., |+| ### ##### |_| _ |+| , |_| __ __ . |_| /_\ @@ -30,8 +30,8 @@ _\ ### ##### ### ##### /_\ ### ##### ##### /_\ ##### /_ ### |_| , , ' | |____/O O\____| | ' _ ##### ### /_\ '' ' |[]| [] | | [] |[]| , |+| ##### #### ### ___ `` '' | | | __ | | | ,'. |_| ### ### #### - ##### ### / \ ` . |__|____|/^^\|____|__| ,`` #####/_\ ### -# ########## _ |___| ' ',, ` , ##### /_\ + ##### ### /_ \ ` . |__|____|/^^\|____|__| ,`` #####/_\ ### +# ########## _ |^|_| ' ',, ` , ##### /_\ ## ### ##### |+| '` ` `' , ### ## /_\ ### |_| `` _ ` _ .. _ ` /_\ ### # /_\ |+| . (o) ',',, (o) ``` _ ### ##### @@ -40,25 +40,25 @@ _\ ### ##### ### ##### /_\ ### ##### ##### /_\ ##### /_ ##### ##### |+| ` ,` , '' . ` ` ` . ### /_\ ##### ### |_| _ _ ' .' _ ,'., ,, /_\ # ### /_\ . |+| ___ (o) . (o) .`. ___ ### ## - /_\ ### ` |_| / \ /-\ '', /-\ ', , / \ ##### ## - ##### ### , |___| , |___| ##### # + /_\ ### ` |_| / _\ /-\ '', /-\ ', , /_ \ ##### ## + ##### ### , |_|^| , |^|_| ##### # ##### ##### , ___ _ . _ `,.,`. ### / - ### #### ##### .`.` , , / \ (o) ' (o) ' . /_\ ### -##### /_\ ### ', , |___| /-\ ,.` /-\ .. ___ _ ##### -##### /_\ _ `, ','. , `. / \ ` |+| ##### - ### ### |+| '' _ ___ . . ` |___| ` |_| ### - /_\ ##### |_| ' |+| / \ , , ___ ... ### /_\ - ### ##### _ ', |_| |___| ', / \ ', ,''`' ##### - ##### ### ___ |+| , |___| ` ##### - ##### /_\ ___ / \ |_| '.` '` _ , ### - ### / \ |___| ,. ` ' ``', , |+| , ### /_\### -## /_\ ### |___| _ . _ ` _ |_| . ##### ##### + ### #### ##### .`.` , , / _\ (o) ' (o) ' . /_\ ### +##### /_\ ### ', , |_|^| /-\ ,.` /-\ .. ___ _ ##### +##### /_\ _ `, ','. , `. / _\ ` |+| ##### + ### ### |+| '' _ ___ . . ` |_|^| ` |_| ### + /_\ ##### |_| ' |+| /_ \ , , ___ ... ### /_\ + ### ##### _ ', |_| |^|_| ', /_ \ ', ,''`' ##### + ##### ### ___ |+| , |^|_| ` ##### + ##### /_\ ___ /[] \ |_| '.` '` _ , ### + ### /_ \ |___| ,. ` ' ``', , |+| , ### /_\### +## /_\ ### |^|_| _ . _ ` _ |_| . ##### ##### ### ##### , ___ |+| _ |+| . |+| ##### ##### -### ##### ., / \ |_| ' |+| |_| . |_| , ### ### -## ### ., |___| _ ' |_| .`,` . /_\ /_\ +### ##### ., / _\ |_| ' |+| |_| . |_| , ### ### +## ### ., |_|^| _ ' |_| .`,` . /_\ /_\ _\ /_\ ### ', |+| ___ ' '. ``,..' '.`.``` ,`..`'' ,, ### - ### ##### , |_| / \ `.`` ' ,..' ``'` .' ` , . ##### ### - ##### ##### . , |___| ' _ _ ########## + ### ##### , |_| / _\ `.`` ' ,..' ``'` .' ` , . ##### ### + ##### ##### . , |_|^| ' _ _ ########## ##### ### '`` ,` |+| |+| ### ### ##### ### ### /_\ , ,' `` _ |_| |_| ### ##### /_\ ### /_\##### '. '``, ,.. ``, |+| ##### ##### ### /_\ @@ -81,6 +81,20 @@ _\ /_\ ### ', |+| ___ ' '. ``,..' '.`.` (38, 21, 29, 15, 14), # Librairie (70, 31, 30, 24, 19), (71, 31, 30, 25, 19), + + (73, 15, 98, 11, 9), + (66, 18, 99, 11, 9), + (68, 23, 100, 3, 9), + (31, 32, 101, 3, 9), + (37, 42, 102, 11, 9), + (96, 42, 103, 3, 9), + (54, 45, 104, 11, 9), + (93, 47, 105, 11, 9), + (52, 49, 106, 3, 9), + (82, 50, 107, 3, 9), + (18, 53, 108, 11, 9), + (25, 56, 109, 11, 9), + (43, 59, 110, 11, 9), ) @@ -125,10 +139,190 @@ h_30 = (r""" | |========| |========| | |=============| |^^| |=============|""", (24, 19, 4, 70, 31), - (25, 19, 4, 71, 31)) + (25, 19, 4, 71, 31)) + +h_98 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 73, 15)) + + +h_99 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 66, 18)) + + +h_100 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=|^|=========|""", + (3, 9, 4, 68, 23)) + + +h_101 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=|^|=========|""", + (3, 9, 4, 31, 32)) + +h_102 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 37, 42)) + + +h_103 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=|^|=========|""", + (3, 9, 4, 96, 42)) + + +h_104 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 54, 45)) + + +h_105 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 93, 47)) + + +h_106 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=|^|=========|""", + (3, 9, 4, 52, 49)) + + +h_107 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=|^|=========|""", + (3, 9, 4, 82, 50)) + + +h_108 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 18, 53)) + + +h_109 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 25, 56)) + + +h_110 = (r""" +|=============| +| | +| | +| | +| | +| | +| | +| | +| | +|=========|^|=|""", + (11, 9, 4, 43, 59)) + niflheim_entities = ( - [0, '?', 4, 88, 32, 'stand by'], [0, '*', 4, 95, 30, 'stand by'], [0, '*', 4, 57, 31, 'stand by'], [0, '*', 4, 39, 60, 'stand by'], diff --git a/idk/svartalfheim.py b/idk/svartalfheim.py index 6e8618e..54ee68f 100644 --- a/idk/svartalfheim.py +++ b/idk/svartalfheim.py @@ -161,7 +161,6 @@ h_48 = (r""" (19, 14, 8, 57, 59)) svartalfheim_entities = ( - [0, '?', 8, 113, 37, 'stand by'], [0, '*', 8, 104, 30, 'stand by'], [0, '*', 8, 120, 49, 'stand by'], [0, '*', 8, 105, 46, 'stand by'], [0, '*', 8, 22, 50, 'stand by'], diff --git a/idk/vanaheim.py b/idk/vanaheim.py index 6db6784..2cefd0d 100644 --- a/idk/vanaheim.py +++ b/idk/vanaheim.py @@ -11,10 +11,10 @@ vanaheim = (r""" /\ / \ / \ / \_ / / \ / \ / \ /\ / \ __ |_ o\ /\ / \ / \ / \ _ /<>\ |^|_| / \ -/ \ /\ / \ /o\ |__| / \ /\ - / \ / \ |_| _ / \ / \ +/ \ /\ / \ /o\ |_^| / \ /\ + / \ / \ |^| _ / \ / \ /\ / \ /\ ### . ###### ###### /o\ /\ / - \ / / \ ##### ### ###### ###### |_| / \ / + \ / / \ ##### ### ###### ###### |^| / \ / \ /\ / \ ### '. ##### ##### ##### / \ /\ \ / \ / \ /|\ ` ### #### #### ### / \ / \ / \ __ /|\ ##### /\ / \ @@ -25,11 +25,11 @@ vanaheim = (r""" / \ / \ ### ``' ##### / \ / /\ / \ / \ ##### _ __ ### /\ / \ / \ / \ /\ / ### / \ ' /<>\ ` /|\ / \ / - \ / \ /|\ |_| . |__| .' / \ /\ / + \ / \ /|\ |^| . |^_| .' / \ /\ / \ /\ / \ ` ``' ### , _ / \ / \ / \ / \ /\ _ ##### ', /-\ / \ - / \ / \ . / \ ### , |_| /\ \ / - / \ /\ / \ |_| /|\ , ` / \ / + / \ / \ . / \ ### , |^| /\ \ / + / \ /\ / \ |^| /|\ , ` / \ / / \ / \ ,. _ ',` '' / \ /\ / \ ### _/ \ ### _____ ' / \ / \ / \ /\ ##### /o | ##### /_____\ `' /\ / \ @@ -41,7 +41,7 @@ vanaheim = (r""" /\ / \ /\ ' ### ##### /\ \ / \ / \ ` /|\ _ ### _ / \ / \ / \ /\ .. /o\ ./|\ /o\ / \ /\ - / \ /\ / \ / \ .'' |_| ,'`' ',` |_| /\ / \ / + / \ /\ / \ / \ .'' |^| ,'`' ',` |^| /\ / \ / / \ / \ ,., .,`, /\ ', ,` / \ / /\ / \ /\ / \ /\ / \ / \ /\ / / \ / \ / \ / \ /\ / \ /\ / \ / \ @@ -56,7 +56,13 @@ vanaheim = (r""" # Maisons (44, 11, 21, 5, 9), # Auberge - (52, 35, 22, 20, 19), + (52, 35, 22, 20, 19), # Palais de Hel + (58, 15, 49, 7, 14), + (36, 12, 50, 15, 14), + (33, 26, 51, 5, 9), + (42, 26, 52, 4, 14), + (34, 30, 53, 5, 9), + (41, 42, 54, 10, 9), ) @@ -98,9 +104,112 @@ h_22 = (r""" |\/=\/=\/=\/=\/=\/=]^[=\/=\/=\/=\/=\/==|""", (20, 19, 1, 52, 35)) + +h_49 = (r""" + + |--|--|--|--| + | | + | ### | + | #####| + | [O] | + | | +/==] [=======\ +| | +| +-+ | +| | | | +| +-+ | +| | +| | +\=====|^|=====/""", + (7, 14, 1, 58, 15), +) + + +h_50 = (r""" +/-------------||---\ +| /__\ | +| |==| | +| | +| +---+ | +| | | | +| | | | +| +---+ | +| | +| | +| | +|=/ \========/ \=| +| | +| | +\-------------|^|--/""", + (15, 14, 1, 36, 12), +) + + +h_51 = (r""" +|--------| +|[==][==]| +| | +| | +| | +| +-+ | +| | | | +| +-+ | +| | +|---|^|--|""", + (5, 9, 1, 33, 26), +) + + +h_52 = (r""" +/====[O]====[O]====\ +| | | | +| |_ | | _| | +| |_| | | |_| | +| | +|-------] [-------| +| [=]| +| | | /_\| +| |_ | | | +| |_| | | | +| | | | +|-------/ \-------| +| | +| | +\==|^|======[O]====/""", + (4, 14, 1, 42, 26), +) + + +h_53 = (r""" +|--------| +| | +| +-+| +| | || +| +-+| +| | +|[=] | +|/-\ | +| | +|---|^|--|""", + (5, 9, 1, 34, 30), +) + + +h_54 = (r""" + |======_=| +|-|--| /_\| +|# ##| |=|| +|# ##| | +|# ##/ +--+ | +|# | | | +|# ##\ +--+ | +|-|--| | + | | + |===|^|==|""", + (10, 9, 1, 41, 42), +) + vanaheim_entities = ( - [0, '?', 1, 42, 20, 'stand by'], - [0, '?', 1, 26, 29, 'stand by'], [0, '*', 1, 45, 39, 'stand by'], [0, '*', 1, 31, 12, 'stand by'], [0, '*', 1, 41, 45, 'stand by'], @@ -110,4 +219,15 @@ vanaheim_entities = ( [0, '*', 21, 21, 6, 'stand by'], ["Freyja", '*', 22, 2, 8, 'stand by'], ["Freyr", '*', 22, 36, 3, 'stand by'], + [0, '*', 49, 9, 10, 'stand by'], + [0, '*', 49, 9, 11, 'stand by'], + [0, '*', 50, 8, 5, 'stand by'], + [0, '*', 50, 8, 9, 'stand by'], + [0, '*', 51, 7, 3, 'stand by'], + [0, '*', 51, 2, 4, 'stand by'], + [0, '*', 52, 16, 9, 'stand by'], + [0, '*', 53, 5, 2, 'stand by'], + [0, '*', 54, 7, 2, 'stand by'], + [0, '*', 54, 2, 3, 'stand by'], + ) \ No newline at end of file diff --git a/notes b/notes new file mode 100644 index 0000000..5e02590 --- /dev/null +++ b/notes @@ -0,0 +1,12 @@ +Hydromel poétique +- Création de Kvasir (scène d'introduction) +- Mort de Baldr (avec les explications : rêves sur sa mort; peur des Ases, inquiétude d'Odin; serment de Frigg à Helheim; jalousie de Loki; meutre de Baldr avec le gui par Höd) +- Incinération de Baldr pendant qu'Hermod demande à Hel de ramener Baldr parmis les vivants +- Hel accepte à condition que tout le monde pleure : Thokk (une géante) ne pleura pas : Baldr restera à Helheim +- Les Ases reconnaissant la culpabilité de Loki, Kvasir les aide (épisode du filet; fuite dans les montagnes +- Kvasir se rend chez les nains où il est tué, son sang forme l'Hydromel Poétique. +- Assassinat par les nains des géants Gilling (noyé) puis de sa femme (écrasée par une meule de moulin) +- Vengeance de Suttung (fils de Gilling) qui récupère l'Hydromel Poétique +- Épisode des neufs esclaves qui fauchaient du foin et Odin avec sa pierre à aiguiser. +- Odin creuse la montagne avec le forêt, s'empare de l'Hydromel Poétique et le ramène à Asgard, poursuivit par Suttung. +- Don de l'Hydromel Poétique aux Ases et aux hommes doués de poésie (scène de conclusion) \ No newline at end of file diff --git a/tiled_map/alfheim.tmx b/tiled_map/alfheim.tmx index b79b03e..b64ecb2 100644 --- a/tiled_map/alfheim.tmx +++ b/tiled_map/alfheim.tmx @@ -1,5 +1,5 @@ - + @@ -11,42 +11,42 @@ 95,95,95,95,95,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,0,0,4,4,4,4,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95, 95,95,95,0,0,0,0,0,0,0,0,0,95,95,95,95,95,0,0,0,0,0,0,93,93,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,11,0,4,4,4,4,0,0,0,0,64,64,0,0,0,4,4,0,0,0,0,0,95,95,95,95,95,95,95, 95,95,95,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,4,4,0,0,0,0,0,0,95,95,95,95,95,0,0,4,4,0,0,0,0,0,93,93,0,0,0,0,16,60,62,61,0,4,4,4,4,0,0,0,0,0,0,95,95,95,95,95, -95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,0,0,4,4,0,0,0,4,4,0,0,4,4,4,4,0,0,65,1,0,0,0,8,0,0,93,64,64,93,0,0,93,93,0,0,64,64,0,0,0,0,0,95,95,95, +95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,0,0,4,4,0,0,0,4,4,0,0,4,4,4,4,0,0,65,1,0,0,0,8,0,0,93,63,64,93,0,0,93,93,0,0,64,64,0,0,0,0,0,95,95,95, 95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,4,4,0,0,0,93,93,0,0,4,4,4,4,0,4,4,4,4,0,0,93,93,0,0,0,13,8,0,0,0,0,8,15,8,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,95,95,95, -95,95,95,0,0,0,0,0,0,95,95,95,95,95,0,0,95,95,95,95,0,4,4,4,4,0,0,0,0,0,0,0,93,93,0,0,0,93,93,0,0,0,0,0,0,65,96,8,0,0,64,64,0,0,0,8,65,8,1,15,1,65,0,0,93,64,64,93,0,0,0,0,0,95,95, +95,95,95,0,0,0,0,0,0,95,95,95,95,95,0,0,95,95,95,95,0,4,4,4,4,0,0,0,0,0,0,0,93,93,0,0,0,93,93,0,0,0,0,0,0,65,96,8,0,0,64,64,0,0,0,8,65,8,1,15,1,65,0,0,93,63,64,93,0,0,0,0,0,95,95, 95,95,95,0,0,4,4,0,0,0,0,0,0,0,0,0,95,95,95,0,0,0,93,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,8,0,0,0,16,60,62,61,0,0,0,0,0,0,0,0,8,96,15,0,0,0,0,0,4,4,0,0,95,95, -95,95,0,0,4,4,4,4,0,0,4,4,0,0,0,64,0,0,0,0,0,0,0,0,0,0,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,0,0,0,0,0,0,93,64,64,93,0,0,0,4,4,0,0,0,0,0,65,15,65,0,0,4,4,4,4,0,95,95, +95,95,0,0,4,4,4,4,0,0,4,4,0,0,0,64,0,0,0,0,0,0,0,0,0,0,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,0,0,0,0,0,0,93,64,63,93,0,0,0,4,4,0,0,0,0,0,65,15,65,0,0,4,4,4,4,0,95,95, 95,95,0,0,0,93,93,0,0,4,4,4,4,0,16,0,61,0,0,0,0,0,0,0,0,16,0,0,93,62,48,60,93,0,0,0,93,62,48,60,93,0,0,61,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,0,0,64,64,0,0,0,0,0,0,93,93,0,0,95,95, -95,95,95,95,0,0,0,0,0,0,93,93,0,0,93,64,93,0,0,0,0,0,0,0,16,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,61,0,0,4,4,0,0,4,4,0,0,0,93,93,0,0,16,60,62,61,0,0,0,0,0,0,0,0,0,95,95, -95,95,95,95,0,0,4,4,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,93,64,16,0,0,0,61,64,16,0,64,0,61,64,16,0,0,0,61,64,93,0,0,4,4,0,0,4,4,0,0,0,0,0,0,0,93,64,64,93,0,0,4,4,0,0,0,95,95,95,95, +95,95,95,95,0,0,0,0,0,0,93,93,0,0,93,63,93,0,0,0,0,0,0,0,16,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,61,0,0,4,4,0,0,4,4,0,0,0,93,93,0,0,16,60,62,61,0,0,0,0,0,0,0,0,0,95,95, +95,95,95,95,0,0,4,4,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,93,64,16,0,0,0,61,64,16,0,64,0,61,64,16,0,0,0,61,64,93,0,0,4,4,0,0,4,4,0,0,0,0,0,0,0,93,63,64,93,0,0,4,4,0,0,0,95,95,95,95, 95,95,95,95,0,4,4,4,4,0,0,0,0,0,0,0,0,0,16,0,61,0,0,0,93,64,93,0,0,0,93,64,93,16,63,61,93,64,93,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,0,4,4,4,4,0,0,95,95,95,95, -95,95,95,95,0,0,93,93,0,0,0,0,0,0,64,0,0,0,93,64,93,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,0,0,4,4,0,16,0,0,61,0,0,1,1,65,8,0,0,93,93,0,0,0,95,95,95,95, -95,95,95,95,0,0,0,0,0,0,0,0,0,16,0,61,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,0,0,4,4,0,93,64,64,93,0,0,15,0,0,13,0,0,0,0,0,0,0,95,95,95,95, -95,95,95,95,95,95,95,95,95,0,0,0,0,93,64,93,0,0,0,64,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,65,8,1,65,64,0,13,13,1,1,13,96,1,0,0,95,95,95, +95,95,95,95,0,0,93,93,0,0,0,0,0,0,64,0,0,0,93,63,93,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,0,0,4,4,0,16,0,0,61,0,0,1,1,65,8,0,0,93,93,0,0,0,95,95,95,95, +95,95,95,95,0,0,0,0,0,0,0,0,0,16,0,61,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,0,0,4,4,0,93,63,64,93,0,0,15,0,0,13,0,0,0,0,0,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,95,0,0,0,0,93,63,93,0,0,0,64,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,65,8,1,65,64,0,13,13,1,1,13,96,1,0,0,95,95,95, 95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,16,80,61,0,0,0,0,4,4,4,0,0,0,0,0,0,32,0,0,0,0,0,0,4,4,4,0,8,1,0,0,64,0,0,0,0,0,65,65,8,0,0,16,0,61,0,0,0,0,0,0,96,0,0,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,93,64,93,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,96,13,0,0,16,0,61,0,0,0,96,0,0,0,0,0,93,64,93,0,0,95,95,95,95,0,0,0,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,96,1,8,1,13,93,64,93,0,0,15,8,0,0,0,64,0,0,0,0,0,0,95,95,95,95,95,0,0,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,93,63,93,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,96,13,0,0,16,0,61,0,0,0,96,0,0,0,0,0,93,63,93,0,0,95,95,95,95,0,0,0,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,96,1,8,1,13,93,63,93,0,0,15,8,0,0,0,64,0,0,0,0,0,0,95,95,95,95,95,0,0,95,95,95, 95,95,95,95,95,95,0,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,4,4,0,65,0,4,4,4,4,4,0,0,15,0,0,0,65,96,0,15,13,15,0,0,0,0,16,0,61,0,0,0,0,0,95,95,95,95,95,0,0,95,95,95, -95,95,95,95,95,0,0,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,0,0,8,0,0,4,4,4,0,0,1,1,0,0,64,0,65,1,13,0,64,0,0,0,0,93,64,93,0,64,0,0,0,95,95,95,95,95,95,0,95,95,95, +95,95,95,95,95,0,0,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,0,0,8,0,0,4,4,4,0,0,1,1,0,0,64,0,65,1,13,0,64,0,0,0,0,93,63,93,0,64,0,0,0,95,95,95,95,95,95,0,95,95,95, 95,95,95,95,95,0,0,0,64,64,0,0,95,95,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,16,14,61,0,1,1,0,0,16,14,61,0,0,65,0,0,16,0,61,0,13,0,16,80,61,0,0,0,0,0,0,16,0,61,0,0,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,0,16,0,0,61,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,8,96,15,0,0,8,65,65,13,8,8,0,93,64,93,65,1,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,0,93,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,15,96,96,1,8,0,0,0,0,1,15,65,0,0,8,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,0,16,0,0,61,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,8,96,15,0,0,8,65,65,13,8,8,0,93,63,93,65,1,0,93,63,93,0,0,0,0,0,0,93,63,93,0,0,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,0,93,64,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,15,96,96,1,8,0,0,0,0,1,15,65,0,0,8,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,1,15,13,0,0,0,0,64,0,0,0,96,15,0,1,13,0,0,64,0,0,0,0,0,0,0,13,15,96,0,0,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,0,0,0,0,0,16,0,0,61,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,0,0,0,0,0,0,0,0,16,0,61,0,0,96,65,0,8,0,0,16,80,61,64,64,0,0,0,0,65,15,96,0,0,0,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,0,0,0,0,93,64,64,93,0,0,0,0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,4,4,4,0,0,93,64,93,0,0,1,96,15,1,0,0,93,64,0,80,0,61,30,30,93,0,15,8,65,15,0,0,0,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,0,0,0,0,93,63,64,93,0,0,0,0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,4,4,4,0,0,93,63,93,0,0,1,96,15,1,0,0,93,64,0,80,0,61,30,30,93,0,15,8,65,15,0,0,0,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,4,4,4,0,16,14,61,0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,0,0,0,0,13,15,65,0,0,93,93,63,93,64,64,93,0,0,93,0,15,96,0,15,0,0,0,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,16,14,61,0,0,0,4,4,4,0,0,0,0,0,0,96,1,0,0,0,0,93,0,96,0,0,0,0,0,0,0,0,1,15,8,96,0,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,0,0,0,0,0,0,0,16,14,61,0,4,4,4,0,0,0,4,4,4,0,0,93,0,13,65,8,13,8,65,1,8,8,13,13,0,0,0,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,4,4,4,4,4,0,93,30,30,93,30,30,93,30,30,93,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,0,4,4,4,0,0,0,0,0,93,64,93,0,0,4,4,4,4,4,0,4,4,4,4,4,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,0,0,16,14,61,0,0,0,16,14,61,0,0,4,4,4,0,0,0,0,0,0,64,0,0,16,0,61,0,0,64,0,0,0,95,95,95,95, -95,95,95,95,95,95,95,95,95,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,16,0,61,0,93,64,93,0,16,0,61,0,0,95,95,95,95, -95,95,95,95,95,95,95,95,95,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,93,64,93,0,0,0,0,0,93,64,93,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,95,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,16,0,61,0,93,63,93,0,16,0,61,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,95,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,93,63,93,0,0,0,0,0,93,63,93,0,0,95,95,95,95, 95,95,95,95,95,95,95,0,0,0,0,93,64,93,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0,0,16,14,61,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95, 95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,16,0,61,0,0,0,0,0,64,0,0,0,0,0,0,0,95,95,95,95, -95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,93,64,93,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,16,0,61,0,0,64,0,0,0,95,95,95,95, -95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,16,0,61,0,0,95,95,95,95, -95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,93,64,93,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,93,63,93,0,0,0,0,16,0,61,0,0,64,0,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,16,0,61,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,0,95,95,95,95, 95,95,95,95,95,95,95,95,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,95,95,95, 95,95,95,95,95,95,95,95,95,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95, @@ -54,14 +54,14 @@ 95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,0,0,0,64,64,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,64,64,0,0,0,0,4,4,4,0,0,0,0,4,4,0,0,0,0,0,0,4,4,0,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,0,0,16,0,0,61,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,16,0,0,61,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,0,0,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,0,0,93,64,64,93,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,0,93,64,64,93,0,0,4,4,4,4,4,0,0,0,4,4,0,0,0,0,0,0,4,4,0,95,95,95,95,95,0,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,0,0,93,63,64,93,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,0,93,64,63,93,0,0,4,4,4,4,4,0,0,0,4,4,0,0,0,0,0,0,4,4,0,95,95,95,95,95,0,0,0,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,0,95,95,0,0,0,0,95,95,95,95, 95,95,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,4,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,1,96,96,13,8,8,0,0,0,0,93,64,93,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,0,0,0,0,0,95,95,95, 95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,4,4,96,8,1,0,0,0,0,0,11,0,0,4,4,4,0,0,0,0,13,13,13,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,95,95,95, 95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,4,4,4,0,1,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,1,65,13,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,95,95,95, 95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,93,64,93,0,15,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0,8,13,13,0,0,0,0,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,95,95,95, 95,95,95,95,95,95,0,0,0,0,4,4,4,0,0,0,0,0,0,96,1,13,4,4,4,4,4,0,0,0,4,4,4,0,96,65,0,0,0,0,0,16,0,0,61,0,0,4,4,4,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,95,95,95, -95,95,95,95,95,95,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,13,0,4,4,4,0,0,0,0,93,64,93,65,8,0,4,4,4,0,0,93,64,64,93,0,4,4,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,0,93,64,93,0,0,0,0,0,95,95,95, +95,95,95,95,95,95,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,13,0,4,4,4,0,0,0,0,93,64,93,65,8,0,4,4,4,0,0,93,64,63,93,0,4,4,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,0,93,64,93,0,0,0,0,0,95,95,95, 95,95,95,95,95,95,0,0,0,4,4,4,4,4,0,0,4,4,4,4,4,65,65,93,64,93,0,4,4,4,0,0,0,65,0,4,4,4,4,4,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95, 95,95,95,95,95,95,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,8,0,0,0,4,4,4,4,4,0,0,1,0,4,4,4,4,4,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,4,4,4,0,0,95,95,95, 95,95,95,95,95,95,0,0,0,0,93,64,93,0,0,0,0,4,4,4,0,13,8,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,95,95,95, @@ -71,7 +71,7 @@ 95,95,95,95,95,0,4,4,0,93,93,0,0,0,0,0,13,65,1,8,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,95,95,95, 95,95,95,95,0,4,4,4,4,0,0,0,0,0,64,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,95,95,95,95,95,95,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,95,95,95, 95,95,95,95,95,0,93,93,0,0,0,0,0,16,14,61,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,95,95,95,95, -95,95,95,95,95,95,0,0,95,0,0,0,0,93,64,93,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,95,95,95,95,95, +95,95,95,95,95,95,0,0,95,0,0,0,0,93,63,93,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, diff --git a/tiled_map/asgard.tmx b/tiled_map/asgard.tmx index 790d5f8..419284d 100644 --- a/tiled_map/asgard.tmx +++ b/tiled_map/asgard.tmx @@ -1,5 +1,5 @@ - + @@ -54,29 +54,29 @@ 0,0,4,4,4,4,0,0,0,64,0,0,0,0,4,4,4,0,0,16,14,61,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,95,9,95,10,95,0,0,0,0,0,0,0,0,4,4,4,0,0,0,16,64,64,64,64,64,64,64,64,64,64,64,64,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,4,4,4,0,0,0,0,16,0,0,61,0,0,0,0,0,0,61,0,0,0,0, 0,0,0,93,93,0,0,0,16,80,61,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,16,14,61,0,0,0,16,14,61,0,0,0,0,16,95,9,64,64,64,10,95,61,0,0,0,0,0,0,16,14,61,0,0,0,0,93,64,16,0,0,61,64,16,0,0,61,64,93,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,16,80,61,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,0,0,4,4,4,4,4,0,0,16,0,0,0,0,61,0,0,0,0,0,16,61,0,0,0, 0,0,0,4,4,0,0,0,93,64,93,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,61,95,95,95,95,95,95,95,16,0,0,11,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,93,63,93,0,0,93,64,93,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,4,4,4,0,0,16,0,0,0,0,0,0,61,0,0,0,16,0,0,61,0,0, -95,0,4,4,4,4,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,16,93,61,0,0,0,0,0,4,4,4,0,0,0,0,16,0,0,0,0,61,0, -95,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,64,64,64,64,64,64,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,16,93,61,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,0,4,4,4,4,4,0,0,16,61,0,0,0,0,0,61, -95,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,41,74,78,74,79,67,75,80,83,72,0,61,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,4,4,4,4,4,0,4,4,4,0,0,16,0,0,61,0,0,0,0,0, -95,0,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,64,64,64,64,64,64,64,64,64,64,64,64,64,61,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,16,93,61,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,0,64,0,0,4,4,4,0,0,16,93,61,0,16,0,0,0,0,61,0,0,0,16, -95,0,0,93,93,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,93,0,62,48,60,0,0,64,64,0,0,62,48,60,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,64,0,4,4,4,4,4,0,0,0,64,0,16,93,61,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,16,80,61,0,16,93,61,0,0,0,0,0,16,0,0,0,0,0,0,61,0,16,0, -95,0,0,0,0,0,0,0,64,0,0,0,0,4,4,4,4,4,0,0,93,64,64,64,64,64,93,63,63,93,64,64,64,64,64,93,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,16,14,61,0,0,4,4,4,0,0,0,16,80,61,0,4,4,4,0,0,0,16,80,61,0,0,0,0,0,0,0,0,0,0,14,14,14,14,14,14,14,14,14,14,14,14,14,0,0,93,64,93,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,16,0,0, -95,0,0,0,0,0,0,16,80,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,93,64,93,0,16,93,61,0,0,0,93,64,93,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,16,0,0,0, -95,0,0,0,0,0,0,93,64,93,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0, -95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,14,14,14,14,14,14,14,14,14,14,14,14,14,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,4,4,4,0,0,0,0, -95,95,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,16,93,61,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,16,93,61,0,4,4,4, -95,95,0,0,0,4,4,4,4,4,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,16,80,61,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4, -95,95,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,16,14,61,0,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,0,16,93,61,0,0,0,0,0,4,4,4,0,0,0,0,95,95,95,95,95,95,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4, -95,95,0,0,0,0,16,14,61,0,0,0,16,14,61,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,64,64,64,64,64,64,64,64,0,0,0,0,16,14,61,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,0,0,11,0,0,4,4,4,4,4,0,0,0,95,95,95,95,95,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,16,93,61,0,0,0,0,0,0,16,93,61, -95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,16,52,80,76,76,87,66,67,70,76,76,83,61,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,95,95,95,95,95,95,0,0,0,4,4,4,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0, -95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,16,64,64,64,64,64,64,64,64,64,64,64,64,64,61,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,16,93,61,0,0,95,95,95,95,95,95,95,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,4,4,0, -95,95,0,0,0,0,0,64,64,64,64,64,64,64,64,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,64,0,0,0,0,0,16,64,93,64,16,64,64,61,64,16,64,64,61,64,93,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,4,4,4,0,0, -95,95,0,0,0,0,16,34,77,71,73,70,74,78,83,61,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,16,80,61,0,0,0,0,0,0,93,64,93,0,0,93,63,93,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,16,93,61,0,0, -95,95,95,0,0,0,93,62,48,60,64,64,62,48,60,93,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,0,0,0,0,16,14,61,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,0,0,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,16,93,61,0,0,0,0,4,4,4,0,0,0,0,0, -95,95,95,0,0,0,93,64,64,93,63,63,93,64,64,93,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,4,4,4,0,0,0,16,93,61,0,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,64,0,0,0,0,16,80,61,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0, -95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,16,14,61,0,0,0,93,64,93,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,95, -95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,11,0,0,0,16,93,61,0,0,0,95,95, -95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95, +0,0,4,4,4,4,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,16,93,61,0,0,0,0,0,4,4,4,0,0,0,0,16,0,0,0,0,61,0, +0,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,64,64,64,64,64,64,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,16,93,61,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,0,4,4,4,4,4,0,0,16,61,0,0,0,0,0,61, +0,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,41,74,78,74,79,67,75,80,83,72,0,61,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,4,4,4,4,4,0,4,4,4,0,0,16,0,0,61,0,0,0,0,0, +0,0,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,64,64,64,64,64,64,64,64,64,64,64,64,64,61,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,16,93,61,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,0,64,0,0,4,4,4,0,0,16,93,61,0,16,0,0,0,0,61,0,0,0,16, +0,0,0,93,93,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,93,0,62,48,60,0,0,64,64,0,0,62,48,60,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,64,0,4,4,4,4,4,0,0,0,64,0,16,93,61,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,16,80,61,0,16,93,61,0,0,0,0,0,16,0,0,0,0,0,0,61,0,16,0, +0,0,0,4,0,0,0,0,64,0,0,0,0,4,4,4,4,4,0,0,93,64,64,64,64,64,93,63,63,93,64,64,64,64,64,93,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,16,14,61,0,0,4,4,4,0,0,0,16,80,61,0,4,4,4,0,0,0,16,80,61,0,0,0,0,0,0,0,0,0,0,14,14,14,14,14,14,14,14,14,14,14,14,14,0,0,93,64,93,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,16,0,0, +0,0,4,4,4,0,0,16,80,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,93,64,93,0,16,93,61,0,0,0,93,64,93,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,16,0,0,0, +0,4,4,4,4,4,0,93,64,93,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,4,0,0,0,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0, +0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,14,14,14,14,14,14,14,14,14,14,14,14,14,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,4,4,4,0,0,0,0, +0,0,16,14,61,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,16,93,61,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,16,93,61,0,4,4,4, +0,0,0,0,0,4,4,4,4,4,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,16,80,61,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4, +0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,16,14,61,0,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,0,16,93,61,0,0,0,0,0,4,4,4,0,0,0,0,95,95,95,95,95,95,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4, +0,0,0,4,4,4,16,14,61,0,0,0,16,14,61,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,64,64,64,64,64,64,64,64,0,0,0,0,16,14,61,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,0,0,11,0,0,4,4,4,4,4,0,0,0,95,95,95,95,95,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,16,93,61,0,0,0,0,0,0,16,93,61, +0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,16,52,80,76,76,87,66,67,70,76,76,83,61,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,95,95,95,95,95,95,0,0,0,4,4,4,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0, +0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,16,64,64,64,64,64,64,64,64,64,64,64,64,64,61,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,16,93,61,0,0,95,95,95,95,95,95,95,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,4,4,0, +0,0,0,16,14,61,0,64,64,64,64,64,64,64,64,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,64,0,0,0,0,0,16,64,93,64,16,64,64,61,64,16,64,64,61,64,93,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,4,4,4,0,95, +0,0,0,0,0,0,16,34,77,71,73,70,74,78,83,61,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,16,80,61,0,0,0,0,0,0,93,64,93,0,0,93,63,93,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,0,0,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,16,93,61,0,95, +0,0,4,4,4,0,93,62,48,60,64,64,62,48,60,93,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,4,4,4,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,0,0,0,0,16,14,61,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,0,0,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,16,93,61,0,0,0,0,4,4,4,0,0,0,0,95, +0,4,4,4,4,4,93,64,64,93,63,63,93,64,64,93,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,4,4,4,0,0,0,16,93,61,0,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,64,0,0,0,0,16,80,61,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,95, +0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,16,14,61,0,0,0,93,64,93,0,0,0,0,0,0,0,0,4,4,4,0,0,0,95,95, +0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,0,11,0,0,0,16,93,61,0,0,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95 diff --git a/tiled_map/converter b/tiled_map/converter index a117e98..c8dd2ad 100755 --- a/tiled_map/converter +++ b/tiled_map/converter @@ -42,11 +42,11 @@ def convert_to_string(filename, doors, entities): file.write(f"{output_filename} = (r\"\"\"\n{output[:-1]}\"\"\",\n{doors_coords}\n)\n\n{output_filename}_entities = {entities_data}") -filename, doors, misc = argv[1], "", "" +filename, doors, entities = argv[1], "", "" for arg in argv[2:]: if arg.startswith("door"): doors = arg.split("=", 1)[1] elif arg.startswith("entities"): entities = arg.split("=", 1)[1] -convert_to_string(filename, doors, entities) \ No newline at end of file +convert_to_string(filename, doors, entities) diff --git a/tiled_map/midgard.tmx b/tiled_map/midgard.tmx index 8fe51d0..0077a88 100644 --- a/tiled_map/midgard.tmx +++ b/tiled_map/midgard.tmx @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,95,95,95,95,95,95,0,0,0,0,95,95,95,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,95,95,95,95,95,95,0,95,95,0,0,0,95,95,95,95,95,95,0,0,0,0,95,95,95,0,64,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,95,95,95,95,95,0,95,95,95,0,0,0,0,95,95,95,0,0,0,0,95,95,95,0,16,14,61,0,95,95,95,95,95,95,95,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,95,95,0,0,95,95,95,95,95,0,95,95,95,0,0,0,95,95,95,95,0,0,0,0,95,95,95,0,93,64,93,0,95,95,95,95,95,95,95,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,95,95,0,0,95,95,95,95,95,0,95,95,95,0,0,0,95,95,95,95,0,0,0,0,95,95,95,0,93,63,93,0,95,95,95,95,95,95,95,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,95,0,0,95,95,95,95,95,95,0,95,95,0,0,0,95,95,95,95,0,0,0,95,95,0,0,0,0,0,0,95,95,0,0,95,95,95,95,95,0,0,0,0,95,0,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,95,95,95,95,95,95,95,95,0,0,95,95,95,0,95,0,0,95,95,95,95,95,0,0,95,95,0,0,0,95,95,95,0,0,0,0,95,95,95,0,0,0,95,95,95,95,0,0,0,95,95,95,95,95,0,0,0,95,0,0,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,32,0,95,95,95,95,95,95,95,0,0,0,0,95,0,95,95,0,0,95,95,95,95,95,0,0,0,0,0,0,95,95,95,0,0,0,0,95,95,0,0,0,0,95,95,95,95,0,0,0,0,95,95,95,0,0,0,0,95,0,0,0,95,95,95,95,95,95,95,95,95, @@ -54,31 +54,31 @@ 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,4,4,0,0,0,93,64,0,0,80,0,80,0,61,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,95,95,95,95,0,0,0,0,0,0,0,4,4,4,0,0,11,0,93,63,93,64,64,64,64,64,93,0,0,16,14,61,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,64,64,64,0,0,0,0,0,4,4,4,0,0,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,0,62,48,60,61,0,0,0,0,16,14,61,0,0,0,0,0,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,64,64,0,0,0,13,0,0,0,0,4,4,4,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,4,4,4,4,4,0,0,0,16,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,93,64,64,93,0,0,13,0,0,0,0,4,4,4,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,93,63,64,93,0,0,13,0,0,0,0,4,4,4,0,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,16,14,61,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,0,0,0,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,15,0,0,13,0,0,0,13,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,15,0,0,13,0,0,0,13,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,0,0,0,0,16,14,61,0,0,0,0,0,0,4,4,4,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,15,0,0,0,0,0,0,13,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95, -95,95,95,95,95,95,95,0,0,93,64,93,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,13,15,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,60,62,61,0,0,0,0,0,0,16,0,61,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, -95,95,95,95,95,95,0,0,11,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,0,0,93,63,93,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,13,15,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,60,62,61,0,0,0,0,0,0,16,0,61,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, +95,95,95,95,95,95,0,0,11,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,64,93,0,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,8,0,15,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,29,31,61,0,0,0,0,0,0,64,0,0,0,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,8,0,0,0,8,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,93,64,64,93,0,0,0,0,0,16,80,61,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,16,29,31,61,0,0,0,0,0,8,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,93,64,64,93,0,0,0,0,0,0,0,0,0,16,0,0,64,61,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,15,0,0,93,64,93,63,93,0,0,0,0,0,15,0,0,0,0,0,64,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,8,0,0,0,8,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,93,64,63,93,0,0,0,0,0,16,80,61,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,16,29,31,61,0,0,0,0,0,8,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,93,63,64,93,0,0,0,0,0,0,0,0,0,16,0,0,64,61,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,15,0,0,93,64,93,63,93,0,0,0,0,0,15,0,0,0,0,0,64,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,80,61,64,64,64,64,16,80,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,8,0,0,0,0,8,0,0,0,0,64,64,0,0,0,0,0,0,0,0,0,0,0,0,93,30,30,93,30,30,93,0,80,0,0,0,0,80,0,93,30,30,93,30,30,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,16,60,62,61,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,93,0,0,0,64,64,0,0,0,93,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,29,31,61,0,0,0,0,0,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,93,64,64,93,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,93,64,64,93,63,63,93,64,64,93,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,93,0,0,0,0,0,0,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,93,63,64,93,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,93,64,64,93,63,63,93,64,64,93,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,63,93,0,0,0,0,0,0,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,15,0,0,0,16,62,48,60,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,11,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,15,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,15,0,0,0,0,93,64,64,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,8,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,93,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,63,93,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,4,4,4,4,0,0,4,4,4,4,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95, @@ -93,10 +93,10 @@ 95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,93,14,14,93,14,14,93,14,14,93,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,4,4,4,0,0,0,0,64,0,0,0,0,0,0,0,16,93,61,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,16,93,61,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,64,0,0,0,0,0,16,93,61,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,64,0,0,0,0,0,16,93,61,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,61,0,0,0,64,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,16,0,61,0,0,0,0,0,4,4,4,0,0,0,0,16,93,61,0,0,4,4,4,4,4,0,0,0,16,93,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, -95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,0,16,0,61,0,0,0,0,0,4,4,4,0,0,0,0,16,93,61,0,0,4,4,4,4,4,0,0,0,16,93,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, +95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, diff --git a/tiled_map/niflheim.tmx b/tiled_map/niflheim.tmx index 42dd1ab..db1e3df 100644 --- a/tiled_map/niflheim.tmx +++ b/tiled_map/niflheim.tmx @@ -1,5 +1,5 @@ - + @@ -17,16 +17,16 @@ 4,4,4,4,0,0,4,4,4,0,4,4,4,4,4,0,4,4,4,0,0,0,93,12,93,0,0,0,0,0,93,64,93,0,0,0,0,0,0,4,4,4,4,4,0,0,16,64,61,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4, 4,4,4,4,0,0,16,64,61,0,4,4,4,4,4,0,16,64,61,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,4,4,4,0,4,4,4,4, 4,4,4,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,16,64,61,0,0,4,4,4, -16,64,61,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,16,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,16,64,61, -0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0, +16,64,61,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,16,0,0,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,16,64,61, +0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0, 0,0,4,4,4,4,4,0,4,4,4,4,4,0,0,0,0,0,0,0,8,96,8,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0, -0,0,4,4,4,4,4,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,96,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,61,0,0,0,65,96,8,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,4,4,4,4,4,0, -0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,64,0,0,0,0,0,15,8,96,13,65,0,0,0,0,0,0,0,0,0,16,9,10,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,0,0,1,96,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,4,4,4,0,0, +0,0,4,4,4,4,4,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,96,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,64,61,0,0,0,65,96,8,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,4,4,4,4,4,0, +0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,64,0,0,0,0,0,15,8,96,13,65,0,0,0,0,0,0,0,0,0,16,9,10,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,63,93,0,0,0,0,1,96,0,0,0,16,14,61,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,4,4,4,0,0, 0,0,0,16,64,61,0,0,0,16,64,61,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,15,65,0,0,0,0,0,0,0,0,93,0,0,93,64,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,16,64,61,0,0, 4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,8,8,0,0,0,0,0,0,0,93,64,0,0,0,9,10,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,65,8,1,65,1,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0, 4,4,4,4,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,13,0,0,0,0,0,0,93,63,93,64,64,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,13,96,1,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0, -4,4,4,4,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,65,65,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,16,0,0,0,61,0,0,0,0,0,0,0,1,13,96,13,15,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,4,4,4,0,0,0, -4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,65,1,96,1,65,96,96,96,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,13,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0, +4,4,4,4,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,65,65,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,16,64,0,0,61,0,0,0,0,0,0,0,1,13,96,13,15,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,4,4,4,0,0,0, +4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,65,1,96,1,65,96,96,96,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,63,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,13,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0, 16,64,61,0,0,0,16,64,61,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,15,65,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,4,4,4,4,4,0,0, 0,0,0,4,4,4,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,13,0,0,96,1,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,15,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,4,4,4,0,0,0, 0,0,4,4,4,4,4,0,0,0,0,0,93,64,93,0,0,0,0,0,0,64,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,1,13,1,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,16,64,61,0,0,0, @@ -34,8 +34,8 @@ 0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,13,96,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,93,64,64,64,64,16,48,0,0,48,61,64,64,64,64,93,0,0,93,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4, 0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,8,0,0,0,0,8,1,0,0,0,0,0,0,0,0,0,0,0,0,0,93,60,62,93,0,60,62,0,93,0,0,0,0,93,0,60,62,0,93,60,62,93,0,0,0,0,0,13,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,4,4,4,4, 0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,0,0,0,0,65,65,0,0,0,0,0,0,8,8,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,93,0,0,0,0,93,0,64,64,0,93,0,0,0,0,93,0,0,93,0,0,0,0,1,13,8,15,0,0,0,0,0,11,93,64,93,0,0,0,0,0,0,0,0,4,4,4,0,4,4,4,0,0,4,4,4,4, -0,0,0,0,4,4,4,4,4,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,61,0,0,0,65,0,0,0,0,0,0,0,0,1,15,0,0,0,0,0,0,0,0,11,0,0,93,64,64,93,64,64,64,64,93,16,63,63,61,93,64,64,64,64,93,64,64,93,0,0,0,0,13,65,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,16,64,61,0,0,0,4,4,4, -4,0,0,0,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,96,8,0,0,0,0,0,0,0,0,0,0,1,8,13,13,1,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,96,32,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,16,64,61, +0,0,0,0,4,4,4,4,4,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,0,0,61,0,0,0,65,0,0,0,0,0,0,0,0,1,15,0,0,0,0,0,0,0,0,11,0,0,93,64,64,93,64,64,64,64,93,16,63,63,61,93,64,64,64,64,93,64,64,93,0,0,0,0,13,65,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,16,64,61,0,0,0,4,4,4, +4,0,0,0,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,93,63,93,64,93,0,0,96,8,0,0,0,0,0,0,0,0,0,0,1,8,13,13,1,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,96,32,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,16,64,61, 4,4,0,0,0,4,4,4,0,4,4,4,4,4,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,8,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,8,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0, 4,4,0,0,0,16,64,61,0,0,4,4,4,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,65,65,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,65,0,0,0,0,0,0,0,64,0,0,0,0,0,15,15,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,65,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,4,4,4,0, 4,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,9,80,10,0,0,8,13,8,13,13,0,0,0,0,0,9,80,10,0,0,0,0,0,65,65,65,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4, @@ -44,25 +44,25 @@ 4,4,4,4,4,0,4,4,4,4,4,0,0,0,93,12,93,0,0,0,0,0,0,65,96,13,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,13,96,8,8,1,15,96,65,1,1,65,0,0,65,1,0,0,0,0,0,0,0,0,0,1,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,16,64,61,0, 4,4,4,4,4,0,0,4,4,4,0,0,0,0,93,64,93,0,0,0,0,0,96,96,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,8,0,15,8,0,0,0,0,0,64,0,0,0,13,8,15,13,0,0,0,0,0,0,13,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,4, 0,4,4,4,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,93,12,93,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,80,10,0,0,0,0,0,0,15,0,0,0,0,0,9,80,10,0,0,0,0,0,1,1,0,0,96,15,65,15,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4, -0,16,64,61,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,96,65,0,0,0,0,0,93,64,93,0,0,0,0,16,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,8,8,13,0,0,0,0,16,14,61,0,0,0,0,0,0,8,13,1,13,0,0,0,0,0,16,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4, -0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,1,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4, +0,16,64,61,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,96,65,0,0,0,0,0,93,64,93,0,0,0,0,16,0,0,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,14,61,0,0,0,0,0,8,8,13,0,0,0,0,16,14,61,0,0,0,0,0,0,8,13,1,13,0,0,0,0,0,16,64,0,0,61,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4, +0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,1,0,0,0,0,93,63,93,64,93,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4, 0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0,0,0,1,13,96,96,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,15,1,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,65,13,15,13,65,15,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,16, -0,4,4,4,0,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,96,1,15,65,15,65,1,13,1,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,61,0,0,0,0,0,0,9,80,10,0,0,0,0,0,96,8,0,0,0,0,0,9,80,10,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,4,4,4,0, -4,4,4,4,4,0,16,64,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,13,1,13,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,16,14,61,0,0,0,13,15,65,0,0,0,0,0,0,16,14,61,0,0,0,0,0,15,15,0,0,0,0,64,64,64,0,0,0,0,1,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,4,4,4,4,4, -4,4,4,4,4,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,65,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,13,8,15,96,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,15,0,0,16,0,0,0,61,0,0,0,65,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,4,4,4,4,4, -0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,8,8,0,0,0,0,64,0,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,15,1,0,0,0,15,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,65,0,93,64,64,64,93,0,0,0,65,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,4,4,4,0, -0,16,64,61,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,93,12,93,0,0,0,0,0,16,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,13,96,0,0,0,0,0,0,0,0,64,64,64,0,0,0,15,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,16,64,61,0, -0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,8,13,0,0,93,64,93,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,8,13,1,0,0,0,0,0,0,0,16,0,0,0,61,0,0,0,0,0,96,8,13,96,13,8,8,65,8,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0, -0,0,4,4,4,4,4,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,0,0,93,12,93,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0, +0,4,4,4,0,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,96,1,15,65,15,65,1,13,1,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,64,61,0,0,0,0,0,0,9,80,10,0,0,0,0,0,96,8,0,0,0,0,0,9,80,10,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,64,61,0,4,4,4,0, +4,4,4,4,4,0,16,64,61,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,13,1,13,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,63,93,0,0,0,0,0,0,16,14,61,0,0,0,13,15,65,0,0,0,0,0,0,16,14,61,0,0,0,0,0,15,15,0,0,0,0,64,64,64,0,0,0,0,1,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,4,4,4,4,4, +4,4,4,4,4,0,0,0,0,0,0,0,0,16,64,61,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,65,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,13,8,15,96,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,15,0,0,16,0,0,64,61,0,0,0,65,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,4,4,4,4,4, +0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,8,8,0,0,0,0,64,0,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,15,1,0,0,0,15,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,65,0,93,64,93,63,93,0,0,0,65,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,4,4,4,0, +0,16,64,61,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,93,12,93,0,0,0,0,0,16,64,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,13,96,0,0,0,0,0,0,0,0,64,64,64,0,0,0,15,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,16,64,61,0, +0,0,0,4,4,4,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,8,13,0,0,93,64,93,0,0,0,0,0,93,63,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,8,13,1,0,0,0,0,0,0,0,16,64,0,0,61,0,0,0,0,0,96,8,13,96,13,8,8,65,8,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0, +0,0,4,4,4,4,4,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,64,0,0,93,12,93,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,93,63,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0, 0,0,4,4,4,4,4,0,0,16,64,61,0,0,0,0,0,0,64,64,64,0,0,0,0,0,16,0,0,0,61,0,93,64,93,0,0,0,0,0,8,15,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0, -0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,61,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,13,15,1,65,1,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,65,65,8,13,1,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,13,0,0,0,0,0,0,0,4,4,4,0,16,64,61,4,4,4,0,0, -4,4,0,16,64,61,0,0,4,4,4,0,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,15,96,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,65,1,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,93,64,93,0,0,0,15,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0, +0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,16,64,0,0,61,0,0,0,0,93,64,64,64,93,0,0,0,0,0,0,0,0,0,0,0,13,15,1,65,1,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,65,65,8,13,1,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,13,0,0,0,0,0,0,0,4,4,4,0,16,64,61,4,4,4,0,0, +4,4,0,16,64,61,0,0,4,4,4,0,0,0,0,0,0,93,63,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,15,96,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,65,1,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,93,64,93,0,0,0,15,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0, 4,4,4,0,0,0,0,4,4,4,4,4,0,13,1,0,0,0,0,0,0,0,0,64,64,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,1,1,0,0,0,64,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,15,96,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0, -4,4,4,0,0,0,0,4,4,4,4,4,0,0,15,13,0,0,0,0,0,0,16,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,8,0,0,93,12,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,15,96,96,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0, -4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,15,13,0,0,0,0,0,93,64,64,64,93,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,65,13,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,96,96,0,0,0,0,0,0,16,64,61,0,0,0,0,16,64,61,0,0, +4,4,4,0,0,0,0,4,4,4,4,4,0,0,15,13,0,0,0,0,0,0,16,0,0,64,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,8,0,0,93,12,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,15,96,96,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,4,4,4,0,0, +4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,15,13,0,0,0,0,0,93,64,93,63,93,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,65,13,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,96,96,0,0,0,0,0,0,16,64,61,0,0,0,0,16,64,61,0,0, 64,61,0,0,0,0,0,0,16,64,61,0,4,4,4,0,8,13,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,64,64,64,0,0,0,0,0,8,1,0,0,0,0,0,0,0,0,0,0,0,0,0,8,15,1,65,65,13,15,15,8,0,96,8,15,65,15,65,65,65,0,0,0,0,0,0,0,0,0,0,0,13,65,15,15,65,8,8,0,1,96,13,13,96,0,0,0,0,0,4,4,4,0,0,0,0,0,0, -0,0,4,4,4,0,0,0,0,0,0,4,4,4,4,4,0,96,1,13,96,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,16,0,0,0,61,0,0,0,0,65,15,65,65,1,0,0,1,8,1,13,15,15,8,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,65,8,65,1,15,8,96,65,1,96,13,0,0,0,0,0,0,0,96,1,1,15,0,0,0,0,0,0,4,4,4,4,4,0,4,4,4,0, -0,4,4,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,0,0,15,96,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,64,64,93,0,0,0,96,0,0,0,0,0,1,8,96,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4, +0,0,4,4,4,0,0,0,0,0,0,4,4,4,4,4,0,96,1,13,96,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,16,0,0,64,61,0,0,0,0,65,15,65,65,1,0,0,1,8,1,13,15,15,8,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,65,8,65,1,15,8,96,65,1,96,13,0,0,0,0,0,0,0,96,1,1,15,0,0,0,0,0,0,4,4,4,4,4,0,4,4,4,0, +0,4,4,4,4,4,0,0,0,0,0,4,4,4,4,4,0,0,0,0,15,96,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,63,93,0,0,0,96,0,0,0,0,0,1,8,96,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4, 0,4,4,4,4,4,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,8,65,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,13,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,4,4,4,0,4,4,4,4,4, 0,0,4,4,4,0,4,4,4,0,0,0,16,64,61,0,0,0,0,0,0,0,0,0,13,1,13,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,65,65,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,16,64,61,0,0,4,4,4,0, 0,0,16,64,61,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,8,15,96,8,65,65,13,96,13,15,15,1,65,65,13,0,0,0,0,0,0,93,12,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,0,0,16,64,61,0, diff --git a/tiled_map/vanaheim.tmx b/tiled_map/vanaheim.tmx index 3e82863..32aa406 100644 --- a/tiled_map/vanaheim.tmx +++ b/tiled_map/vanaheim.tmx @@ -1,5 +1,5 @@ - + @@ -15,10 +15,10 @@ 0,0,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,61,64,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,16,0,0,61,0,0, 0,0,16,0,0,61,0,16,0,0,0,0,0,0,61,0,16,61,0,16,0,0,0,0,0,0,61,0,0,0,0,0,0,0,0,64,64,0,0,0,0,0,0,93,64,0,80,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,61,0,16,0,0,0,0,61,0, 0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,16,29,31,61,0,0,0,0,0,93,63,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0, -16,0,0,0,0,0,0,61,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,16,80,61,0,11,0,0,93,64,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0, -0,0,0,0,0,0,0,0,16,0,0,61,0,16,0,0,0,0,0,0,61,0,0,0,0,0,0,93,64,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,16,0,0,0,0,0,0,61,0,16,0,0,61, +16,0,0,0,0,0,0,61,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,16,80,61,0,11,0,0,93,64,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0, +0,0,0,0,0,0,0,0,16,0,0,61,0,16,0,0,0,0,0,0,61,0,0,0,0,0,0,93,63,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,16,0,0,0,0,0,0,61,0,16,0,0,61, 16,61,0,0,0,0,0,16,0,0,0,0,61,0,16,61,0,0,0,0,0,0,4,4,4,0,0,0,15,0,0,0,0,0,0,0,0,4,4,4,4,4,4,0,0,4,4,4,4,4,4,0,0,0,0,0,0,16,80,61,0,0,0,0,16,61,0,0,0,0,16,0,0,0,0, -0,0,61,0,0,0,16,0,0,0,0,0,0,16,0,0,61,0,0,0,0,4,4,4,4,4,0,0,1,0,0,0,4,4,4,0,0,4,4,4,4,4,4,0,0,4,4,4,4,4,4,0,0,0,0,0,0,93,64,93,0,0,0,16,0,0,61,0,0,16,0,0,0,0,0, +0,0,61,0,0,0,16,0,0,0,0,0,0,16,0,0,61,0,0,0,0,4,4,4,4,4,0,0,1,0,0,0,4,4,4,0,0,4,4,4,4,4,4,0,0,4,4,4,4,4,4,0,0,0,0,0,0,93,63,93,0,0,0,16,0,0,61,0,0,16,0,0,0,0,0, 0,0,0,61,0,0,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,4,4,4,0,0,0,8,15,0,4,4,4,4,4,0,4,4,4,4,4,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0,0, 0,0,0,0,61,0,16,0,0,61,0,16,0,0,0,0,0,0,61,0,0,0,16,93,61,0,0,0,0,65,96,0,4,4,4,0,0,4,4,4,4,0,0,0,0,0,0,4,4,4,4,0,0,0,4,4,4,0,0,0,0,16,0,0,0,0,0,0,61,0,16,0,0,61,0, 0,0,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,64,0,0,1,0,16,93,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,16,61,0,0,0,0,0,0,16,0,0,0,0,61, @@ -29,11 +29,11 @@ 0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,4,4,4,0,0,0,0,0,65,65,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16, 16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,16,0,0,0,0,61,0,0,4,4,4,4,4,0,0,0,64,0,0,96,0,0,0,0,0,64,64,0,0,0,1,0,0,0,0,0,0,0,4,4,4,0,0,0,16,61,0,16,0,0,0,0,0,0,61,0,16,0, 0,0,61,0,16,0,0,0,0,0,0,61,0,16,61,0,16,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,16,0,61,0,8,0,0,0,0,16,29,31,61,0,0,96,65,96,0,0,0,0,0,16,93,61,0,0,16,0,0,61,0,0,0,0,0,0,0,0,16,0,0, -0,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,93,64,93,0,15,0,0,0,0,93,64,64,93,0,0,0,0,1,15,8,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0,16,0,0,0, +0,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,93,63,93,0,15,0,0,0,0,93,63,64,93,0,0,0,0,1,15,8,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0,16,0,0,0, 0,0,0,0,61,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,96,65,65,8,96,0,0,0,0,0,0,0,0,4,4,4,0,0,0,13,0,0,64,0,0,0,16,0,0,0,0,0,0,61,0,16,0,0,61,0,0,0,0, 0,0,0,0,0,16,0,0,61,0,16,0,0,0,0,0,0,61,0,16,61,0,0,0,0,0,0,0,0,0,0,1,0,0,64,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,8,13,0,16,14,61,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0, -0,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,32,0,0,0,0,15,0,16,0,61,0,0,0,0,0,0,0,0,0,4,4,4,0,13,1,0,0,93,64,93,0,0,0,0,0,0,0,0,16,61,0,0,0,0,0,0,61,0,16, -0,0,0,16,0,0,0,0,0,0,61,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,1,0,93,64,93,0,0,0,0,0,0,0,0,0,16,93,61,0,13,1,0,11,96,65,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,16,0, +0,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,32,0,0,0,0,15,0,16,0,61,0,0,0,0,0,0,0,0,0,4,4,4,0,13,1,0,0,93,63,93,0,0,0,0,0,0,0,0,16,61,0,0,0,0,0,0,61,0,16, +0,0,0,16,0,0,0,0,0,0,61,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,1,0,93,63,93,0,0,0,0,0,0,0,0,0,16,93,61,0,13,1,0,11,96,65,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,16,0, 0,0,0,0,0,0,0,0,0,0,0,16,0,0,61,0,16,0,0,0,0,0,0,61,0,0,0,0,0,0,0,13,15,96,96,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,96,8,13,65,96,8,8,96,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0,0, 0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,0,0,4,4,4,0,0,0,0,1,96,0,64,16,0,61,0,0,0,4,4,4,0,0,0,0,64,64,64,64,64,0,0,8,0,0,0,16,0,0,0,0,0,0,61,0,16,0,0,61,0, 0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,61,0,16,61,0,0,0,0,0,4,4,4,4,4,0,0,96,0,0,16,80,0,0,93,0,0,4,4,4,4,4,0,0,16,64,64,64,64,64,61,0,65,8,0,0,0,0,0,16,61,0,0,0,16,0,0,0,0,61, @@ -45,7 +45,7 @@ 0,0,0,0,0,0,16,61,0,16,0,0,0,0,0,0,61,0,16,61,0,0,0,0,0,0,0,0,0,96,1,1,8,0,0,0,4,4,4,0,0,0,0,0,0,11,0,0,0,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,16,61,0,0,0,0,0,0,61, 0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0,0,0,0,0,65,96,0,0,16,93,61,0,0,64,0,0,0,0,0,0,0,0,4,4,4,0,0,0,64,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0, 0,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0,0,0,0,0,0,1,15,15,0,0,0,0,16,80,61,0,0,0,0,0,1,15,16,93,61,0,0,16,80,61,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61, -0,0,0,16,0,0,0,0,0,0,61,0,16,61,0,16,0,0,0,0,0,0,61,0,16,0,0,61,0,0,0,0,0,0,0,15,8,8,0,0,93,64,93,0,0,0,13,8,65,8,96,8,13,65,0,93,64,93,0,0,16,61,0,16,0,0,0,0,0,0,61,0,16,0,0, +0,0,0,16,0,0,0,0,0,0,61,0,16,61,0,16,0,0,0,0,0,0,61,0,16,0,0,61,0,0,0,0,0,0,0,15,8,8,0,0,93,63,93,0,0,0,13,8,65,8,96,8,13,65,0,93,63,93,0,0,16,61,0,16,0,0,0,0,0,0,61,0,16,0,0, 0,0,0,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,0,0,0,0,0,0,13,15,13,96,1,15,13,65,13,0,0,16,61,0,0,8,13,1,13,65,0,16,0,0,61,0,0,0,0,0,0,0,0,16,0,0,0, 0,0,0,0,0,16,61,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0,16,0,0,0,0,0,0,61,0,16,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,0,0,0,16,0,0,0,0,61,0,0,0,16,61,0,16,0,0,0,0, 0,0,0,0,16,0,0,61,0,16,0,0,0,0,0,0,61,0,16,0,0,61,0,0,0,0,0,0,0,0,16,0,0,61,0,0,0,16,61,0,0,0,0,0,0,0,0,16,0,0,0,0,61,0,16,61,0,16,0,0,0,0,0,0,61,0,16,0,0,61,0,0,0,0,0,