From 74f140f47ceb8ec457b2612f7bd88363086c0e31 Mon Sep 17 00:00:00 2001
From: Shadow15510 <antoine.royer14@orange.fr>
Date: Tue, 2 Nov 2021 08:51:14 +0100
Subject: [PATCH] Fix bugs

---
 asci_lib.py     | 10 ++++++----
 tiled/converter |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/asci_lib.py b/asci_lib.py
index 5e59616..d56cd06 100644
--- a/asci_lib.py
+++ b/asci_lib.py
@@ -1,3 +1,5 @@
+# Asci (version 1.5.1)
+
 class Screen:
     def __init__(self, screen_width=21, screen_height=6):
         # Screen configuration
@@ -48,7 +50,7 @@ class Screen:
 
 
 class Asci:
-    def __init__(self, maps, events_mapping, keys_mapping, routine=None, screen_width=21, screen_height=6):
+    def __init__(self, maps, events_mapping, keys_mapping, screen_width=21, screen_height=6):
         # Load maps
         self.maps = [Map(*i) for i in maps]
 
@@ -56,7 +58,6 @@ class Asci:
         self.legend = list(events_mapping.keys())
         self._game_events_mapping = [events_mapping[i] for i in self.legend]
         self._game_keys_mapping = {key: keys_mapping[key] for key in keys_mapping if not key in (1, 2, 3, 5, 9)}
-        self._game_routine = routine
 
         # Screen initialisation
         self.screen = Screen(screen_width, screen_height)
@@ -164,7 +165,7 @@ class Asci:
 
         return current_map, self.data[2], self.data[3]
 
-    def mainloop(self, end_game, stat=None, data=[0, 0, 0, 0], player="@", door="^", walkable=" ", exit_key=9):
+    def mainloop(self, end_game, stat=None, data=[0, 0, 0, 0], routine=None, player="@", door="^", walkable=" ", exit_key=9):
         # Load save ; data = [XP, map_id, x, y]
         self.data = data[:]
         if not stat or type(stat) != list: self.stat = [100]
@@ -190,7 +191,8 @@ class Asci:
 
             self._keyboard(key)
             
-            if self._game_routine: self._game_routine(self.data, self.stat)
+            # Launching the game routine
+            if routine: routine(self.data, self.stat)
 
         if self.stat[0] <= 0: self.stat[0] = 100
         return self.stat, self.data
diff --git a/tiled/converter b/tiled/converter
index 3a01fb9..120288c 100755
--- a/tiled/converter
+++ b/tiled/converter
@@ -25,10 +25,10 @@ def convert_to_string(filename, doors, misc):
             output += char_list[char_id]
 
             if char_list[char_id] in doors:
-                doors_coords.append(f"\t({char_index}, {line_index}, ,0, 0),")
+                doors_coords.append(f"\t({char_index}, {line_index}, , 0, 0),")
             
             if char_list[char_id] in misc:
-                misc_coords.append(f"# {char_list[char_id]} : ({char_index}; {line_index})")
+                misc_coords.append(f"# {char_list[char_id]} : ({char_index}, {line_index})")
 
         output += "\n"