From f5c3cb7d76e14f8731d8656b79bac2f7d88fb62c Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Mon, 1 Nov 2021 22:02:04 +0100 Subject: [PATCH] Re-organize repository --- {python_map => src}/alfheim.py | 0 {python_map => src}/asgard.py | 10 ++++++-- src/idk.py | 9 ++++--- {python_map => src}/jotunheim.py | 0 {python_map => src}/midgard.py | 0 {python_map => src}/nidavellir.py | 0 {python_map => src}/niflheim.py | 0 {python_map => src}/vanaheim.py | 0 tiled_map/midgard.tmx | 42 +++++++++++++++---------------- 9 files changed, 34 insertions(+), 27 deletions(-) rename {python_map => src}/alfheim.py (100%) rename {python_map => src}/asgard.py (95%) rename {python_map => src}/jotunheim.py (100%) rename {python_map => src}/midgard.py (100%) rename {python_map => src}/nidavellir.py (100%) rename {python_map => src}/niflheim.py (100%) rename {python_map => src}/vanaheim.py (100%) diff --git a/python_map/alfheim.py b/src/alfheim.py similarity index 100% rename from python_map/alfheim.py rename to src/alfheim.py diff --git a/python_map/asgard.py b/src/asgard.py similarity index 95% rename from python_map/asgard.py rename to src/asgard.py index 9078c73..bd340ec 100644 --- a/python_map/asgard.py +++ b/src/asgard.py @@ -97,8 +97,14 @@ asgard = (r""" ) -# ? : (120, 26) -# ? : ( 51, 55) +def asgard_po(coords): + if coords == (120, 26): return [0, "De hautes montagnes vous entourent de toutes part. Taillées dans la roche enneigee, les marches de l'escalier qui mene a Valaskjalf se decoupent nettement. La grande demeure d'Odin et son toit d'argent domine les environs."] + elif coords == (51, 55): return [0, "Tout autour de vous s'etend un riche jardin soigneusement entretenu. Dans l'alignement de l'allee nord, une fontaine complete l'ensemble. Une douce odeur de verdure emplit vos narines, l'ambiance est calme."] + + return [0, "Il n'y a rien a voir ici."] + +def asgard_pnj(coords): + return [0, "Hmm ?"] # * : ( 34, 7) # * : ( 29, 13) # * : ( 19, 20) diff --git a/src/idk.py b/src/idk.py index c6774e0..f3278cb 100644 --- a/src/idk.py +++ b/src/idk.py @@ -48,8 +48,7 @@ def point_of_interest(data, stat): coords = x, y # Asgard - if current_map == 0: - pass + if current_map == 0: return asgard_po(coords) # Vanaheim elif current_map == 1: @@ -89,6 +88,8 @@ def routine(data, stat): def sleep(data, stat): stat[4] = 360 + stat[0] += 5 + if stat[0] > 100: stat[0] = 100 def display_stat(data, stat): # stat = [PV, pièces d'or, arme, armure, ticks, nom] @@ -121,8 +122,8 @@ def inventory(data, stat): shields = ("", "rondache", "pavois", "cote de maille", "broigne", "harnois") print("<*> Inventaire <*>") - print("Arme :\n{}".format(weapons[stat[2]])) - print("Armure :\n{}".format(shields[stat[3]])) + print(" Arme :\n{}".format(weapons[stat[2]])) + print(" Armure :\n{}".format(shields[stat[3]])) print() print("<*> <*>") input() diff --git a/python_map/jotunheim.py b/src/jotunheim.py similarity index 100% rename from python_map/jotunheim.py rename to src/jotunheim.py diff --git a/python_map/midgard.py b/src/midgard.py similarity index 100% rename from python_map/midgard.py rename to src/midgard.py diff --git a/python_map/nidavellir.py b/src/nidavellir.py similarity index 100% rename from python_map/nidavellir.py rename to src/nidavellir.py diff --git a/python_map/niflheim.py b/src/niflheim.py similarity index 100% rename from python_map/niflheim.py rename to src/niflheim.py diff --git a/python_map/vanaheim.py b/src/vanaheim.py similarity index 100% rename from python_map/vanaheim.py rename to src/vanaheim.py diff --git a/tiled_map/midgard.tmx b/tiled_map/midgard.tmx index 2c15dc9..a7dd7aa 100644 --- a/tiled_map/midgard.tmx +++ b/tiled_map/midgard.tmx @@ -55,30 +55,30 @@ 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,0,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,0,0,0,0,0,0,64,64,0,0,0,0,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,0,0,0,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,0,0,95,95,95,95,95,0,0,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,0,0,0,0,0,93,64,64,93,0,0,0,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,0,0,0,95,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,0,0,0,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,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,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,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,0,0,0,0,0,0,64,64,0,0,0,0,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,0,0,0,0,0,93,64,64,93,0,0,0,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,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,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,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,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,0,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,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,0,0,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,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,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,0,0,0,0,0,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,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,0,11,0,0,0,95,95,95,95,0,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,0,0,0,0,0,0,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,0,0,0,95,95,95,95,95,0,95,95,95,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,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,0,0,0,0,0,95,95,95,95,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,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,0,0,95,0,0,0,0,0,0,0,0,0,0,16,29,31,61,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,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,0,0,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,0,0,0,0,0,0,0,0,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,0,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,93,64,93,63,93,0,0,0,0,0,0,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,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,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,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,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,0,0,0,0,0,0,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,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,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,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,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,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,93,64,93,63,93,0,0,0,0,0,0,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,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,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,0,0,0,0,95,0,0,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,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,0,0,0,0,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,0,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,0,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,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,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,0,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,0,0,0,0,0,95,95,95,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,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,0,0,95,95,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,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,95,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,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,0,0,0,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,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,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,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,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, @@ -87,10 +87,10 @@ 95,95,95,95,95,95,95,95,95,0,0,0,0,0,4,4,4,4,4,0,0,16,93,61,0,0,0,0,0,4,4,4,0,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,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,4,4,4,0,0,0,0,0,4,4,4,0,0,0,16,93,61,0,0,0,0,4,4,4,4,4,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,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,0,0,0,0,0,0,0,16,93,61,0,0,0,0,4,4,4,4,4,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,4,4,4,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,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,4,4,0,0,0,0,0,4,4,4,0,0,16,93,61,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,4,4,4,4,4,0,0,4,4,4,0,0,0,0,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,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,4,4,4,4,4,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,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93, -95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,4,4,4,4,4,0,0,16,93,61,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,0,0,16,93,61,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,93, -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,0,0,0,0,93,14,14,93,14,14,93,14,14,93, +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,4,4,4,0,0,16,93,61,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,4,4,4,4,4,0,0,4,4,4,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,0,0,0,0,0,0,0,0,4,4,4,0,0,0,4,4,4,0,0,0,0,0,4,4,4,4,4,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,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,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,16,93,61,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,0,0,0,0,0,4,4,4,0,0,0,0,0,16,93,61,0,0,0,0,0,0,0,0,0,0,0,0,16,93,61,0,0,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,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,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,