From ec6cc70fe5efd2e4653e7d246c81b97c51d522c9 Mon Sep 17 00:00:00 2001
From: Shadow15510 <antoine.royer14@orange.fr>
Date: Sat, 26 Feb 2022 23:12:11 +0100
Subject: [PATCH] Beginning of DLC

---
 idk/alfheim.py      | 12 ++++++------
 idk/asci.py         | 45 ++++++++++++++++++++++++++-------------------
 idk/asgard.py       | 22 +++++++++++-----------
 idk/dlc_idk.py      | 25 +++++++++++++++++--------
 idk/idk.py          | 22 +++++++++++-----------
 idk/jotunheim.py    | 44 ++++++++++++++++++++++----------------------
 idk/midgard.py      | 34 +++++++++++++++++-----------------
 idk/muspellheim.py  | 34 +++++++++++++++++-----------------
 idk/nidavellir.py   | 36 ++++++++++++++++++------------------
 idk/niflheim.py     | 10 +++++-----
 idk/svartalfheim.py | 26 +++++++++++++-------------
 idk/vanaheim.py     | 18 +++++++++---------
 12 files changed, 172 insertions(+), 156 deletions(-)

diff --git a/idk/alfheim.py b/idk/alfheim.py
index 2433b1e..adf4556 100644
--- a/idk/alfheim.py
+++ b/idk/alfheim.py
@@ -75,12 +75,12 @@ alfheim = (r"""
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~""",
 [
-    ("palais", '?', 34, 20, 'stand by'),
+    ("alfheim palais", '?', 34, 20, 'stand by'),
 
-    ("charretier", '*', 23, 17, 'stand by'),
-    (0, '*', 11, 4, 'stand by'),
-    (1, '*', 46, 6, 'stand by'),
-    (2, '*', 27, 54, 'stand by'),
+    ("alfeim_charretier", '*', 23, 17, 'stand by'),
+    (23, '*', 11, 4, 'stand by'),
+    (24, '*', 46, 6, 'stand by'),
+    (25, '*', 27, 54, 'stand by'),
 ],
 
 # Autres mondes (Alfheim = 2)
@@ -142,6 +142,6 @@ h_24 = (r"""
               |====|^|====|             """,
 [
     ("Diomwar", '*', 36, 12, 'stand by'),
-    (0, '*', 12, 3, 'stand by'),
+    ("h_24", '*', 12, 3, 'stand by'),
 ],
 	(20, 19, 2, 52, 31))
\ No newline at end of file
diff --git a/idk/asci.py b/idk/asci.py
index 6cd85fe..d7e6a99 100644
--- a/idk/asci.py
+++ b/idk/asci.py
@@ -1,10 +1,18 @@
-# Asci (1.7.2)
+# Asci (1.7.3)
 
 class Asci:
     def __init__(self, maps, events_mapping, keys_mapping, behaviors=None, screen_width=21, screen_height=6):
-        # Load maps
-        self.maps = [Map(*i) for i in maps]
-
+        # Load maps and entities
+        self.maps = []
+        self.entities = {}
+        for index, raw_map in [(i, maps[i]) for i in range(len(maps))]:
+            for j in raw_map[1]:
+                if j[0] in self.entities: raise KeyError("'{}' is already a registered entities".format(j[0]))
+                else: self.entities[j[0]] = Entity(index, *j)
+            raw_map = list(raw_map)
+            raw_map.pop(1)
+            self.maps.append(Map(*raw_map))
+        
         # Custom functions
         self._legend = list(events_mapping.keys())
         self._game_events_mapping = [events_mapping[i] for i in self._legend]
@@ -89,18 +97,17 @@ class Asci:
         return self.data[1], self.data[2], self.data[3]
 
     def _change_map(self, new_map):
-        # Update entities
-        if self.current_map:
-            for i in self.current_map.entities.copy():
-                entity = self.current_map.entities[i]
-                if entity.behavior == "follow":
-                    entity.pos_x = entity.pos_y = -1
-                    self.maps[new_map].entities[entity.entity_id] = entity
-                    self.maps[self.data[1]].entities.pop(i)
-
-        # Update current map
-        self.data[1] = new_map
+        # Update map id and data
+        old_map, self.data[1] = self.data[1], new_map
         self.current_map = self.maps[self.data[1]]
+
+        # Update entities
+        for i in self.entities:
+            entity = self.entities[i]
+            if entity.map_id == old_map and entity.behavior == "follow":
+                entity.pos_x = entity.pos_y = -1
+                entity.map_id = new_map
+            if entity.map_id == new_map: self.current_map.entities[i] = entity        
         
         # Update screen configuration
         self.screen.set_world(self.current_map.map_data)
@@ -274,16 +281,16 @@ class Event:
 
 
 class Map:
-    def __init__(self, map_data, entities, *coords):
+    def __init__(self, map_data, *coords):
         self.map_data = map_data
-        if entities: self.entities = {i[0]: Entity(*i) for i in entities}
-        else: self.entities = {}
         self.coords = coords
+        self.entities = {}
 
 class Entity:
-    def __init__(self, entity_id, symbol, x, y, behavior, *args):
+    def __init__(self, map_id, entity_id, symbol, x, y, behavior, *args):
         self.entity_id = entity_id
         self.symbol = symbol
+        self.map_id = map_id
         self.pos_x = x
         self.pos_y = y
         self.behavior = behavior
diff --git a/idk/asgard.py b/idk/asgard.py
index 1ea3e9a..dbfe2fd 100644
--- a/idk/asgard.py
+++ b/idk/asgard.py
@@ -75,8 +75,8 @@ asgard = (r"""
 ~~~~~~~~~~~              ~~~~~~~~~~~~~~                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~         ~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~""",
 [
-    ('valaskjalf', '?', 120, 26, 'stand by'),
-    ('jardin sud', '?', 51, 55, 'stand by'),
+    ('asgard valaskjalf', '?', 120, 26, 'stand by'),
+    ('asgard jardin sud', '?', 51, 55, 'stand by'),
 
     (0, '*', 34, 7, 'stand by'),
     (1, '*', 121, 21, 'stand by'),
@@ -196,7 +196,7 @@ h_11 = (r"""
 |=+<>+=+<>+=+<>+=+<>+==| |==+<>+=+<>+=+<>+=+<>+=|
                        |^|                       """,
 [
-    (0, '*', 34, 7, 'stand by'),
+    ("h_11", '*', 34, 7, 'stand by'),
 ],
     (24, 19, 0, 70, 19))
 
@@ -223,7 +223,7 @@ h_12 = (r"""
             | - -|              |- - |            
             /- - \_____|^^|_____/ - -\            """,
 [
-    (0, '*', 19, 4, 'stand by'),
+    ("h_12", '*', 19, 4, 'stand by'),
 ],
     (24, 19, 0, 25, 31),
     (25, 19, 0, 26, 31)) 
@@ -246,7 +246,7 @@ h_13 = (r"""
 |==================| |==================|
                    |^|                   """,
 [
-    (0, '*', 21, 8, 'stand by'),
+    ("h_13", '*', 21, 8, 'stand by'),
 ],
     (20, 14, 0, 110, 34)) 
 
@@ -268,7 +268,7 @@ h_14 = (r"""
 |=|\/|==|\/|=|  |=|\/|==|\/|=|
              |^^|             """,
 [
-    (0, '*', 26, 2, 'stand by'),
+    ("h_14", '*', 26, 2, 'stand by'),
 ],
     (14, 14, 0, 63, 36),
     (15, 14, 0, 64, 36)) 
@@ -328,7 +328,7 @@ h_16 = (r"""
                       (_)  |   |  (_)                       
                       |=|  |/^\|  |=|                       """,
 [
-    (0, '*', 50, 14, 'stand by'),
+    ("h_16", '*', 50, 14, 'stand by'),
 ],
     (29, 29, 0, 13, 43)) 
 
@@ -360,7 +360,7 @@ h_17 = (r"""
 |======================| |=======================|
                        |^|                        """,
 [
-    (0, '*', 36, 14, 'stand by'),
+    ("h_17", '*', 36, 14, 'stand by'),
 ],
     (24, 24, 0, 75, 50)) 
 
@@ -392,7 +392,7 @@ h_18 = (r"""
                       \|  |/                      
                       /|^^|\                      """,
 [
-    (0, '*', 30, 9, 'stand by'),
+    ("h_18", '*', 30, 9, 'stand by'),
 ],
     (24, 24, 0, 27, 56),
     (25, 24, 0, 28, 56)) 
@@ -415,7 +415,7 @@ h_19 = (r"""
 |                                                |
 |=======================|^|======================|""",
 [
-    (0, '*', 28, 7, 'stand by'),
+    ("h_19", '*', 28, 7, 'stand by'),
 ],
     (25, 14, 0, 57, 67)) 
 
@@ -447,7 +447,7 @@ h_20 = (r"""
                     |                            |
                     |============|^^|============|""",
 [
-    (0, '*', 39, 9, 'stand by'),
+    ("h_20", '*', 39, 9, 'stand by'),
 ],
     (34, 24, 0, 10, 69),
     (35, 24, 0, 11, 69)) 
\ No newline at end of file
diff --git a/idk/dlc_idk.py b/idk/dlc_idk.py
index de38d2c..f2b0ebc 100644
--- a/idk/dlc_idk.py
+++ b/idk/dlc_idk.py
@@ -1,11 +1,20 @@
-title = "Marchands"
+dlc_title = "Marchands"
 
-spells = ("Soin", "Flammes", "Givre", "Etincelles", "Fatigue")
-spells_level = ("I", "II", "III", "IV", "V")
-spells_effect = ((0, 1, True), (4, -1, False), (4, -1, False), (4, -1, False), (0, -1, False))
-weapons = ("<aucune>", "Dague", "Marteau", "Masse", "Fleau", "Hache", "Epee", "Espadon", "Hache double")
-armors = ("<aucune>", "Rondache", "Pavois", "Cote de maille", "Broigne", "Harnois")
+dlc_spells = ("Soin", "Flammes", "Givre", "Etincelles", "Fatigue")
+dlc_spells_level = ("I", "II", "III", "IV", "V")
+dlc_spells_effect = ((0, 1, True), (4, -1, False), (4, -1, False), (4, -1, False), (0, -1, False))
+dlc_weapons = ("<aucune>", "Dague", "Marteau", "Masse", "Fleau", "Hache", "Epee", "Espadon", "Hache double")
+dlc_armors = ("<aucune>", "Rondache", "Pavois", "Cote de maille", "Broigne", "Harnois")
 
-def npc(data, stat, entites, identifiant):
+def dlc_npc(data, stat, entities, identifiant):
+    if not "dlc" in data[0]: data[0]["dlc"] = 0
+    if data[1] == 3: return dlc_midgard_npc(data, stat, entities, identifiant)
+
+
+def dlc_midgard_npc(data, stat, entities, identifiant):
     coords = data[2], data[3]
-    pass
\ No newline at end of file
+    xp = data[0]["dlc"]
+    if coords == (51, 60):
+        if xp == 0: return [0, "Bonjour, je suis Khajit, marchand ambulant. Je suis a la recherche d'un partenaire d'affaire, partant ?\n1. J'ai besoin d'y reflechir.\n2. J'en suis !", 2]
+        elif xp == 1: return [-1, "Je comprends, reviens quand tu veux : je pense rester quelques temps a Midgard."]
+        elif xp == 2: return [1, "Parfait !"]
diff --git a/idk/idk.py b/idk/idk.py
index ce3d49f..6186f6b 100644
--- a/idk/idk.py
+++ b/idk/idk.py
@@ -2,11 +2,11 @@ from idk_lib import *
 
 try:
     import dlc_idk as dlc
-    spells = dlc.spells
-    spells_level = dlc.spells_level
-    spells_effect = dlc.spells_effect
-    weapons = dlc.weapons
-    armors = dlc.armors
+    spells = dlc.dlc_spells
+    spells_level = dlc.dlc_spells_level
+    spells_effect = dlc.dlc_spells_effect
+    weapons = dlc.dlc_weapons
+    armors = dlc.dlc_armors
 except:
     dlc = None
 
@@ -36,8 +36,8 @@ def npc(data, stat, entities, identifiant):
 
 
     if dlc:
-        event = dlc.npc(data, stat, entities, identifiant)
-        if event: return event
+        event = dlc.dlc_npc(data, stat, entities, identifiant)
+        if event: return "dlc", event
 
     return npc_core(npc_data[data[1]], data, stat, entities, identifiant)
 
@@ -65,7 +65,7 @@ def point_of_interest(data, stat, entities, identifiant):
 print(center("Island of the Dead", 21, " "))
 print(center("*  Kings  *", 21, " "))
 print("---------------------")
-if dlc: print(center("DLC : {}".format(dlc.title), 21, " "))
+if dlc: print(center("DLC : {}".format(dlc.dlc_title), 21, " "))
 else: print()
 print("Entrez 'idk()' pour\nune nouvelle partie.")
 events = {"*": npc, "?": point_of_interest}
@@ -345,7 +345,7 @@ def vanaheim_npc(data, stat, entites, identifiant):
                 4: [2, "Bien sur, voila. [+50 PO]", 0, (1, 50)],
             }
 
-    if identifiant == "charretier":
+    if identifiant == "vanaheim_charretier":
         if stat[9] == -1 or data[0]["main"] == stat[9]:
             stat[9] = data[0]["main"]
             return [0, "[LE CONDUCTEUR DE LA CHARRETTE SE TOURNA VERS VOUS] Ou voulez-vous aller ? Je vous emmene pour 5 pieces.\n1. Midgard\n2. Jotunheim\n3. Alfheim", 3]
@@ -486,7 +486,7 @@ def alfheim_npc(data, stat, entites, identifiant):
     # * : (46; 6)
     # * : (23; 17)
     # * : (27; 54)
-    if identifiant == "charretier":
+    if identifiant == "alfheim_charretier":
         if stat[9] == -1 or data[0]["main"] == stat[9]:
             stat[9] = data[0]["main"]
             return [0, "[LE CONDUCTEUR DE LA CHARRETTE SE TOURNA VERS VOUS] Ou voulez-vous aller ? Je vous emmene pour 5 pieces.\n1. Midgard\n2. Asgard\n3. Vanaheim\n4. Svartalfheim", 4]
@@ -666,7 +666,7 @@ def midgard_npc(data, stat, entites, identifiant):
                 55: [-4, "C'est bien, passez. [ALORS QUE VOUS PASSIEZ A COTE DE IROB, UNE VIVE DOULEUR VOUS PRIT L'ABDOMEN, LE SANG ET LES CHAIRS SE REPANDIRENT SUR VOS MAINS ET VOTRE INCOMPREHENSION.]"],
         }
 
-    elif identifiant == "charretier":
+    elif identifiant == "midgard_charretier":
         if stat[9] == -1 or data[0]["main"] == stat[9]:
             stat[9] = data[0]["main"]
             return [0, "[LE CONDUCTEUR DE LA CHARRETTE SE TOURNA VERS VOUS] Ou voulez-vous aller ? Je vous emmene pour 5 pieces.\n1. Vanaheim\n2. Asgard\n3. Nidavellir\n4. Niflheim", 4]
diff --git a/idk/jotunheim.py b/idk/jotunheim.py
index deeb1b7..5f72362 100644
--- a/idk/jotunheim.py
+++ b/idk/jotunheim.py
@@ -125,23 +125,23 @@ jotunheim = (r"""
 ~~~~~~~~~~~~~            ~~~~~~~~~~~~~~~~~~~~~~       ###   |_|                ###     ~~~~ ###            |--| ~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|_|      ~~~~~~~~~~~~~~~~|_| ~~~~~~~~~|_|~~~~~~~~~~~~|--|~~~~~~~~~~~~~~""",
 [
-    (0, '?', 60, 57, 'stand by'),
-    (1, '?', 23, 70, 'stand by'),
-    (2, '?', 60, 86, 'stand by'),
+    ("jotunheim_1", '?', 60, 57, 'stand by'),
+    ("jotunheim_2", '?', 23, 70, 'stand by'),
+    ("jotunheim_3", '?', 60, 86, 'stand by'),
 
     ("Utarg", '*', 34, 56, 'stand by'),
-    (3, '*', 25, 10, 'stand by'),
-    (4, '*', 39, 20, 'stand by'),
-    (5, '*', 3, 28, 'stand by'),
-    (6, '*', 34, 45, 'stand by'),
-    (7, '*', 53, 49, 'stand by'),
-    (8, '*', 19, 51, 'stand by'),
-    (9, '*', 64, 64, 'stand by'),
-    (10, '*', 54, 70, 'stand by'),
-    (11, '*', 8, 72, 'stand by'),
-    (12, '*', 40, 75, 'stand by'), 
-    (13, '*', 72, 87, 'stand by'),
-    (14, '*', 6, 98, 'stand by'),
+    (46, '*', 25, 10, 'stand by'),
+    (47, '*', 39, 20, 'stand by'),
+    (48, '*', 3, 28, 'stand by'),
+    (49, '*', 34, 45, 'stand by'),
+    (50, '*', 53, 49, 'stand by'),
+    (51, '*', 19, 51, 'stand by'),
+    (52, '*', 64, 64, 'stand by'),
+    (53, '*', 54, 70, 'stand by'),
+    (54, '*', 8, 72, 'stand by'),
+    (55, '*', 40, 75, 'stand by'), 
+    (56, '*', 72, 87, 'stand by'),
+    (57, '*', 6, 98, 'stand by'),
 ],
 
 # Autres mondes (Jotunheim = 5)
@@ -175,7 +175,7 @@ h_31 = (r"""
 |            |           |             |
 |============|====|^|====|=============|""",
 [
-    (0, '*', 28, 4, 'stand by'),
+    ("h_31", '*', 28, 4, 'stand by'),
 ],
     (19, 14, 5, 29, 11)) 
 
@@ -207,7 +207,7 @@ h_32 = (r"""
 |============| |==============|                             
 |============|^|==============|                             """,
 [
-    (0, '*', 28, 6, 'stand by'),
+    ("h_32", '*', 28, 6, 'stand by'),
 ],
     (14, 24, 5, 88, 25)) 
 
@@ -239,8 +239,8 @@ h_33 = (r"""
 |============================| |===========================|
 |=[]=[]=[]=[]=[]=[]=[]=[]=[]=|^|=[]=[]=[]=[]=[]=[]=[]=[]=[]|""",
 [
-    (0, '*', 14, 7, 'stand by'),
-    (1, '*', 48, 5, 'stand by'),
+    ("h_33_1", '*', 14, 7, 'stand by'),
+    ("h_33_2", '*', 48, 5, 'stand by'),
 ],
     (30, 24, 5, 89, 45)) 
 
@@ -327,9 +327,9 @@ h_36 = (r"""
 |                 |  | [====]   [====] |
 |=================|^^|=================|""",
 [
-    ("aubergiste", '*', 27, 10, 'stand by'),
-    (0, '*', 0, 0, 'stand by'),
-    (1, '*', 0, 0, 'stand by'),
+    ("h_36_aubergiste", '*', 27, 10, 'stand by'),
+    ("h_36_1", '*', 0, 0, 'stand by'),
+    ("h_36_2", '*', 0, 0, 'stand by'),
 ],
     (19, 14, 5, 23, 88),
     (20, 14, 5, 23, 88)) 
\ No newline at end of file
diff --git a/idk/midgard.py b/idk/midgard.py
index bc32835..c17a236 100644
--- a/idk/midgard.py
+++ b/idk/midgard.py
@@ -100,19 +100,19 @@ midgard = (r"""
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~""",
 [
-    ("falaises nord", '?', 29, 9, 'stand by'),
-    ("clairiere", '?', 53, 24, 'stand by'),
-    ("palais", '?', 66, 45, 'stand by'),
-    ("manoir sud", '?', 52, 79, 'stand by'),
+    ("midgard falaises nord", '?', 29, 9, 'stand by'),
+    ("midgard clairiere", '?', 53, 24, 'stand by'),
+    ("midgard palais", '?', 66, 45, 'stand by'),
+    ("midgard manoir sud", '?', 52, 79, 'stand by'),
 
-    ("charretier", '*', 39, 49, 'stand by'),
-    (0, '*', 8, 59, 'stand by'),
-    (1, "*", 66, 56, "stand by"),
-    (2, '*', 67, 46, 'stand by'),
-    (3, '*', 66, 56, 'stand by'),
-    (4, '*', 51, 60, 'stand by'),
-    (5, '*', 68, 71, 'stand by'),
-    (6, '*', 94, 85, 'stand by')
+    ("midgard_charretier", '*', 39, 49, 'stand by'),
+    (26, '*', 8, 59, 'stand by'),
+    (27, "*", 66, 56, "stand by"),
+    (28, '*', 67, 46, 'stand by'),
+    (29, '*', 66, 56, 'stand by'),
+    (30, '*', 51, 60, 'stand by'),
+    (40, '*', 68, 71, 'stand by'),
+    (41, '*', 94, 85, 'stand by')
     
 ],
 
@@ -169,10 +169,10 @@ h_26 = (r"""
 |---|^|---|                   """,
 [
     ("Rosahil Green", '*', 27, 6, 'stand by'),
-    (0, '*', 17, 7, 'stand by'),
-    (1, '*', 22, 7, 'stand by'),
-    (2, '*', 17, 8, 'stand by'),
-    (3, '*', 27, 8, 'stand by'),
+    ("h_26_1", '*', 17, 7, 'stand by'),
+    ("h_26_2", '*', 22, 7, 'stand by'),
+    ("h_26_3", '*', 17, 8, 'stand by'),
+    ("h_26_4", '*', 27, 8, 'stand by'),
 ],
     (5, 12, 3, 76, 51))
 
@@ -216,7 +216,7 @@ h_28 = (r"""
                     |__+  +__|                    
                     |\/|^^|\/|                    """,
 [
-    (0, '*', 27, 6, 'stand by'),
+    ("h_28", '*', 27, 6, 'stand by'),
 ],
     (24, 14, 3, 60, 69),
     (25, 14, 3, 61, 69))
\ No newline at end of file
diff --git a/idk/muspellheim.py b/idk/muspellheim.py
index 1fed5c2..698a41f 100644
--- a/idk/muspellheim.py
+++ b/idk/muspellheim.py
@@ -120,15 +120,15 @@ muspellheim = (r"""
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~""",
 [
-    ("cote nord", '?', 66, 8, 'stand by'),
-    ("manoir", '?', 65, 97, 'stand by'),
+    ("muspellheim cote nord", '?', 66, 8, 'stand by'),
+    ("muspeillheim manoir", '?', 65, 97, 'stand by'),
 
-    (0, '*', 20, 12, 'stand by'),
-    (1, '*', 78, 14, 'stand by'),
-    (2, '*', 54, 80, 'stand by'),
-    (3, '*', 59, 91, 'stand by'),
-    (4, '*', 39, 94, 'stand by'),
-    (5, '*', 29, 113, 'stand by'),
+    (63, '*', 20, 12, 'stand by'),
+    (64, '*', 78, 14, 'stand by'),
+    (65, '*', 54, 80, 'stand by'),
+    (66, '*', 59, 91, 'stand by'),
+    (67, '*', 39, 94, 'stand by'),
+    (68, '*', 29, 113, 'stand by'),
 ],
 
 # Autres mondes (Muspellheim = 7)
@@ -159,11 +159,11 @@ h_42 = (r"""
 |                                 |
 |==============|^|================|""",
 [
-    ("aubergiste", '*', 6, 7, 'stand by'),
-    (0, '*', 14, 1, 'stand by'),
-    (1, '*', 11, 5, 'stand by'),
-    (2, '*', 2, 11, 'stand by'),
-    (3, '*', 31, 9, 'stand by'),
+    ("h_42_aubergiste", '*', 6, 7, 'stand by'),
+    ("h_42_1", '*', 14, 1, 'stand by'),
+    ("h_42_2", '*', 11, 5, 'stand by'),
+    ("h_42_3", '*', 2, 11, 'stand by'),
+    ("h_42_4", '*', 31, 9, 'stand by'),
 ],
     (16, 14, 7, 87, 14))
 
@@ -186,8 +186,8 @@ h_43 = (r"""
                               |[^]|""",
 [
     ("Berfrid", '*', 24, 4, 'stand by'),
-    (0, '*', 13, 9, 'stand by'),
-    (1, '*', 6, 5, 'stand by'),
+    ("h_43_1", '*', 13, 9, 'stand by'),
+    ("h_43_2", '*', 6, 5, 'stand by'),
 ],
     (32, 14, 7, 47, 53)) 
 
@@ -219,8 +219,8 @@ h_44 = (r"""
 |=|/\|==|/\|=|/\|=|/\|=|  |=|/\|=|/\|=|/\|==|/\|=|
 |=|\/|==|\/|=|\/|=|\/|=|^^|=|\/|=|\/|=|\/|==|\/|=|""",
 [
-    (0, '*', 13, 20, 'stand by'),
-    (1, '*', 13, 2, 'stand by'),
+    ("h_44_1", '*', 13, 20, 'stand by'),
+    ("h_44_2", '*', 13, 2, 'stand by'),
 ],
     (24, 24, 7, 67, 89),
     (25, 24, 7, 68, 89))
\ No newline at end of file
diff --git a/idk/nidavellir.py b/idk/nidavellir.py
index e90b6c2..357d588 100644
--- a/idk/nidavellir.py
+++ b/idk/nidavellir.py
@@ -75,14 +75,14 @@ nidavellir = (r"""
      /      /    \     /    \ /  \   /\  /  \   /\                     /        \/      /      /    
     /      /      \   /      /    \ /  \/    \ /  \   /\                               /      /     """,
 [
-    ("plage", '?', 65, 7, 'stand by'),
-    ("montanges", '?', 66, 58, 'stand by'),
+    ("nidavellir plage", '?', 65, 7, 'stand by'),
+    ("nidavellir montanges", '?', 66, 58, 'stand by'),
 
-    (0, '*', 49, 21, 'stand by'),
-    (1, '*', 25, 31, 'stand by'),
-    (2, '*', 74, 46, 'stand by'),
-    (3, '*', 16, 55, 'stand by'),
-    (4, '*', 77, 61, 'stand by'),
+    (58, '*', 49, 21, 'stand by'),
+    (59, '*', 25, 31, 'stand by'),
+    (60, '*', 74, 46, 'stand by'),
+    (61, '*', 16, 55, 'stand by'),
+    (62, '*', 77, 61, 'stand by'),
 ],
 
 # Autres mondes (Nidavellir = 6)
@@ -128,10 +128,10 @@ h_37 = (r"""
 |=============|^|============|""",
 [
     ("Muin", '*', 2, 1, 'stand by'),
-    (0, '*', 26, 1, 'stand by'),
-    (1, '*', 10, 5, 'stand by'),
-    (2, '*', 4, 10, 'stand by'),
-    (3, '*', 27, 8, 'stand by'),
+    ("h_37_1", '*', 26, 1, 'stand by'),
+    ("h_37_2", '*', 10, 5, 'stand by'),
+    ("h_37_3", '*', 4, 10, 'stand by'),
+    ("h_37_4", '*', 27, 8, 'stand by'),
 ],
     (15, 14, 6, 69, 26))
 
@@ -153,8 +153,8 @@ h_38 = (r"""
           |         |         
           |===|^|===|         """,
 [
-    (0, '*', 12, 3, 'stand by'),
-    (1, '*', 19, 7, 'stand by'),
+    ("h_38_1", '*', 12, 3, 'stand by'),
+    ("h_38_2", '*', 19, 7, 'stand by'),
 ],
     (15, 14, 6, 7, 31)) 
 
@@ -176,8 +176,8 @@ h_39 = (r"""
 |                            |
 |=|/\|=|/\|==|^|===|/\|=|/\|=|""",
 [
-    (0, '*', 9, 2, 'stand by'),
-    (1, '*', 9, 4, "stand by"),
+    ("h_39_1", '*', 9, 2, 'stand by'),
+    ("h_39_2", '*', 9, 4, "stand by"),
 ],
     (14, 14, 6, 35, 38))
 
@@ -199,7 +199,7 @@ h_40 = (r"""
 |=========|   |==============|
 |==========|^|===============|""",
 [
-    (0, '*', 14, 5, 'stand by'),
+    ("h_40", '*', 14, 5, 'stand by'),
 ],
     (12, 14, 6, 22, 22)) 
 
@@ -226,7 +226,7 @@ h_41 = (r"""
 |                  |
 |========|^|=======|""",
 [
-    (0, '*', 10, 8, 'stand by'),
-    (1, '*', 12, 2, 'stand by'),
+    ("h_41_1", '*', 10, 8, 'stand by'),
+    ("h_41_2", '*', 12, 2, 'stand by'),
 ],
     (10, 19, 6, 23, 51)) 
\ No newline at end of file
diff --git a/idk/niflheim.py b/idk/niflheim.py
index 65f29c6..e2593a3 100644
--- a/idk/niflheim.py
+++ b/idk/niflheim.py
@@ -77,10 +77,10 @@ _\      /_\ ### ',             |+|       ___     '              '. ``,..'  '.`.`
 [
     ("niflheim", '?', 88, 32, 'stand by'),
 
-    (0, '*', 95, 30, 'stand by'),
-    (1, '*', 57, 31, 'stand by'),
-    (3, '*', 39, 60, 'stand by'),
-    (4, '*', 108, 67, 'stand by'),
+    (42, '*', 95, 30, 'stand by'),
+    (43, '*', 57, 31, 'stand by'),
+    (44, '*', 39, 60, 'stand by'),
+    (45, '*', 108, 67, 'stand by'),
 ],
 
 # Autres monde (Niflheim = 4)
@@ -138,7 +138,7 @@ h_30 = (r"""
 |=============|        |^^|        |=============|""",
 [
     ("Hel", '*', 37, 4, 'stand by'),
-    (0, '*', 17, 6, 'stand by'),
+    ("h_30", '*', 17, 6, 'stand by'),
 ],
     (24, 19, 4, 70, 31),
     (25, 19, 4, 71, 31)) 
\ No newline at end of file
diff --git a/idk/svartalfheim.py b/idk/svartalfheim.py
index a2a65cd..8094c04 100644
--- a/idk/svartalfheim.py
+++ b/idk/svartalfheim.py
@@ -77,12 +77,12 @@ svartalfheim = (r"""
 [
     ("svartalfheim", '?', 113, 37, 'stand by'),
 
-    (0, '*', 104, 30, 'stand by'), (1, '*', 120, 49, 'stand by'),
-    (2, '*', 105, 46, 'stand by'),
-    (3, '*', 22, 50, 'stand by'),
-    (4, '*', 15, 54, 'stand by'),
-    (5, '*', 25, 61, 'stand by'),
-    (6, '*', 121, 68, 'stand by'),
+    (69, '*', 104, 30, 'stand by'), (70, '*', 120, 49, 'stand by'),
+    (71, '*', 105, 46, 'stand by'),
+    (72, '*', 22, 50, 'stand by'),
+    (73, '*', 15, 54, 'stand by'),
+    (74, '*', 25, 61, 'stand by'),
+    (75, '*', 121, 68, 'stand by'),
 ],
 
 # Autres mondes (Svartalfheim = 8)
@@ -118,7 +118,7 @@ h_45 = (r"""
 |=================|    | |    |==================|
                        |^|                        """,
 [
-    (0, '*', 15, 4, 'stand by'),
+    ("h_45", '*', 15, 4, 'stand by'),
 ],
 	(24, 19, 8, 90, 15))
 
@@ -135,8 +135,8 @@ h_46 = (r"""
 |                  |
 |=======|^|========|""",
 [
-    (0, '*', 13, 2, 'stand by'),
-    (1, '*', 13, 4, 'stand by'),
+    ("h_46_1", '*', 13, 2, 'stand by'),
+    ("h_46_2", '*', 13, 4, 'stand by'),
 ],
 	(9, 9, 8, 6, 24)) 
 
@@ -158,8 +158,8 @@ h_47 = (r"""
 |                            |
 |^|==========================|""",
 [
-    (0, '*', 3, 4, 'stand by'),
-    (1, '*', 15, 8, 'stand by'),
+    ("h_47_1", '*', 3, 4, 'stand by'),
+    ("h_47_2", '*', 15, 8, 'stand by'),
 ],
 	(1, 14, 8, 91, 33))
 
@@ -181,7 +181,7 @@ h_48 = (r"""
 |==|  |======|  |=|  |=|  |======|  |==|
    |  |      |  | |^=| |  |      |  |   """,
 [
-    (0, '*', 34, 5, 'stand by'),
-    (1, '*', 29, 8, 'stand by'),
+    ("h_48_1", '*', 34, 5, 'stand by'),
+    ("h_48_2", '*', 29, 8, 'stand by'),
 ],
 	(19, 14, 8, 57, 59)) 
diff --git a/idk/vanaheim.py b/idk/vanaheim.py
index 4d3a864..fec9266 100644
--- a/idk/vanaheim.py
+++ b/idk/vanaheim.py
@@ -50,14 +50,14 @@ vanaheim = (r"""
                         /  \      /      /    \    /      /    \           
                        /    \           /      \         /      \          """,
 [
-    ("vanaheim", '?', 42, 20, 'stand by'),
-    (0, '?', 26, 29, 'stand by'),
+    ("vanaheim_1", '?', 42, 20, 'stand by'),
+    ("vanaheim_2", '?', 26, 29, 'stand by'),
     
-    ("charretier", '*', 45, 39, 'stand by'),
-    (1, '*', 31, 12, 'stand by'),
-    (2, '*', 41, 45, 'stand by'),
-    (3, '*', 52, 22, 'stand by'),
-    (4, '*', 52, 30, 'stand by'),
+    ("vanaheim_charretier", '*', 45, 39, 'stand by'),
+    (19, '*', 31, 12, 'stand by'),
+    (20, '*', 41, 45, 'stand by'),
+    (21, '*', 52, 22, 'stand by'),
+    (22, '*', 52, 30, 'stand by'),
 ],
 
 # Autres mondes (Vanaheim = 1)
@@ -84,8 +84,8 @@ h_21 = (r"""
 |                       |
 |===|^|=================|""",
 [
-    ("aubergiste", '*', 8, 1, 'stand by'),
-    (0, '*', 21, 6, 'stand by'),
+    ("h_21_aubergiste", '*', 8, 1, 'stand by'),
+    ("h_21", '*', 21, 6, 'stand by'),
 ],
     (5, 9, 1, 44, 11))