Dev: Convert siren names

Author: LmeSzinc

dev_tools/map_extractor.py

@@ -256,6 +256,16 @@
     'yilishabai_3': 'Elizabeth3',
     'jiasikenie_idol': 'GascogneIdol',
     'dafeng_idol': 'TaihouIdol',
+
+    # Interlude of Illusions
+    'tianlangxing': 'Sirius',
+    'daiduo': 'Dido',
+    'z23_g': 'Z23_g',
+    'laibixi_g': 'Leipzig_g',
+    'pangpeimagenuo': 'PompeoMagno',
+    'aerfuleiduo': 'AlfredoOriani',
+    'guogan': 'LAudacieux',
+    'dipulaikesi': 'Dupleix',
 }
 
 
@@ -304,15 +314,15 @@ def __init__(self, data, data_loop):
 
             # portal
             self.portal = []
-            if self.map_id in MAP_EVENT_LIST:
-                for event_id in MAP_EVENT_LIST[self.map_id]['event_list'].values():
-                    event = MAP_EVENT_TEMPLATE[event_id]
-                    for effect in event['effect'].values():
-                        if effect[0] == 'jump':
-                            address = event['address']
-                            address = location2node((address[1], address[0]))
-                            target = location2node((effect[2], effect[1]))
-                            self.portal.append((address, target))
+            # if self.map_id in MAP_EVENT_LIST:
+            #     for event_id in MAP_EVENT_LIST[self.map_id]['event_list'].values():
+            #         event = MAP_EVENT_TEMPLATE[event_id]
+            #         for effect in event['effect'].values():
+            #             if effect[0] == 'jump':
+            #                 address = event['address']
+            #                 address = location2node((address[1], address[0]))
+            #                 target = location2node((effect[2], effect[1]))
+            #                 self.portal.append((address, target))
 
             # land_based
             # land_based = {{6, 7, 1}, ...}
@@ -596,14 +606,18 @@ def get_chapter_by_name(self, name, select=False):
         Returns:
             list(MapData):
         """
+        def is_extra(name):
+            name = name.lower().replace('.', '')
+            return name in ['extra', 'ex']
+
         print('<<< SEARCH MAP >>>')
         name = name.strip()
         name = int(name) if name.isdigit() else name
         print(f'Searching: {name}')
         if isinstance(name, str):
             maps = []
             for map_id, data in DATA.items():
-                if not isinstance(map_id, int) or data['chapter_name'] == 'EXTRA':
+                if not isinstance(map_id, int) or is_extra(data['chapter_name']):
                     continue
                 if not re.search(name, data['name']):
                     continue
@@ -629,7 +643,7 @@ def get_event_id(map_id):
             event_id = get_event_id(maps[0].map_id)
             new = []
             for map_id, data in DATA.items():
-                if not isinstance(map_id, int) or data['chapter_name'] == 'EXTRA':
+                if not isinstance(map_id, int) or is_extra(data['chapter_name']):
                     continue
                 if get_event_id(data['id']) == event_id:
                     data = MapData(data, DATA_LOOP.get(map_id, None))
@@ -686,8 +700,8 @@ def extract(self, maps, folder):
 LOADER = LuaLoader(FILE, server='CN')
 DATA = LOADER.load('./sharecfgdata/chapter_template.lua')
 DATA_LOOP = LOADER.load('./sharecfgdata/chapter_template_loop.lua')
-MAP_EVENT_LIST = LOADER.load('./sharecfg/map_event_list.lua')
-MAP_EVENT_TEMPLATE = LOADER.load('./sharecfg/map_event_template.lua')
+# MAP_EVENT_LIST = LOADER.load('./sharecfg/map_event_list.lua')
+# MAP_EVENT_TEMPLATE = LOADER.load('./sharecfg/map_event_template.lua')
 EXPECTATION_DATA = LOADER.load('./sharecfgdata/expedition_data_template.lua')
 
 ct = ChapterTemplate()