fix encounter parsin tool. encounters now parsed and ready for .json file thingo

pokeemerald-tools/Tools/encounter-data-fix.py

@@ -7,15 +7,15 @@ from openpyxl.workbook import Workbook
 from openpyxl import load_workbook
 
 #Globals for making header, opening data, debug prints, etc
-Debug = 0
+Debug = 1
 WriteOrAdd = 'w'
 
 FileName = "encounter-data-fix.xlsx"
 GenName = "PkmnEvolved"
 
 PkmnData = load_workbook('encounter-data-evolved.xlsx')
-SheetName = "encounter-data-low-level-parse"
-#SheetName = "next-data"
+#SheetName = "encounter-data-low-level-parse"
+SheetName = "next-data"
 
 
 if SheetName in PkmnData.sheetnames:
@@ -24,8 +24,8 @@ else:
     print(f"No sheet found")
     print(f"{PkmnData.sheetnames}")
 
+#whatFix = "encounter-data"
 whatFix = "encounter-data"
-#whatFix = "next-data"
 
 if Debug:
     print(f"First row for species {PkmnDataFile.min_row}")
@@ -43,18 +43,26 @@ if whatFix == "encounter-data":
             row[0].value = data[:data.find("@}")]
             print(data[:data.find("@}")])
             if Debug: print(row[0].value)
+            
             PkmnDataFile.insert_rows(row[0].row + 1, amount = 1)
-            PkmnDataFile.cell(row[0].row + 1, 1).value = data[data.find("@{"):]
-            PkmnDataFile.cell(row[0].row + 1, 1).value = data.replace("@{","")
-            PkmnDataFile.cell(row[0].row + 1, 1).value = data.replace("@}","")
+            data = data[data.find("@{"):]
+            data = data.replace("@{","")
+            PkmnDataFile.cell(row[0].row + 1, 1).value = data
 
         elif "@{" in data:
             row[0].value = data[:data.find("@{")]
-            print(data[:data.find("@{")])
+            if Debug: print(data[:data.find("@{")])
+            
+            PkmnDataFile.insert_rows(row[0].row + 1, amount = 1)
+            data = data[data.find("@{"):]
+            data = data.replace("@{","")
+            PkmnDataFile.cell(row[0].row + 1, 1).value = data
+
+        elif "@}" in data:
+            row[0].value = data.replace("@}","")
             if Debug: print(row[0].value)
             PkmnDataFile.insert_rows(row[0].row + 1, amount = 1)
-            PkmnDataFile.cell(row[0].row + 1, 1).value = data[data.find("@{"):]
-            PkmnDataFile.cell(row[0].row + 1, 1).value = data.replace("@{","")
+            PkmnDataFile.cell(row[0].row + 1, 1).value = "NEW ROUTE"
             
 #            if "%" in data:            
 #                PkmnDataFile.cell(row[0].row + 1 , 1).value = data[data.find("%")-2:]