Fixed save issues and attempted to rectify backwards compat with older saves

Author: EternalWraith

palworld_pal_edit/PalEdit.py

@@ -1143,6 +1143,9 @@ def updateDisplay(self):
             elif p.isLucky:
                 self.listdisplay.itemconfig(tk.constants.END, {'fg': 'blue'})
 
+            if p.isBossRush:
+                self.listdisplay.itemconfig(tk.constants.END, {'bg': 'yellow'})
+
         self.refresh()
 
     def logerror(self, msg):
@@ -1791,6 +1794,11 @@ def changespeciestype(self, evt):
 
     def _apply_species(self, pal, code):
         """Change a pal's species and refresh the display around it."""
+        if code == "KingWhale_otomo":
+            self.alphavar.set(1)
+            self.togglealpha()
+            #pal.SetBoss(True if self.alphavar.get() == 1 else False)
+            
         self.speciesvar.set(code)
         self.speciesvar_name.set(PalInfo.PalSpecies[code].GetName())
         pal.SetType(code)
@@ -2289,13 +2297,18 @@ def replaceitem(self, i, pal):
         elif pal.isLucky:
             self.listdisplay.itemconfig(i, {'fg': 'blue'})
 
+        if pal.isBossRush:
+            self.listdisplay.itemconfig(i, {'bg': 'yellow'})
+
     def togglelucky(self):
         if not self.isPalSelected():
             return
         i = int(self.listdisplay.curselection()[0])
         pal = self.FilteredPals()[i]
-
-        if self.luckyvar.get() == 1 and self.alphavar.get() == 1:
+        if pal.GetCodeName() == "KingWhale_otomo":
+            self.luckyvar.set(0)
+            self.alphavar.set(1)
+        elif self.luckyvar.get() == 1 and self.alphavar.get() == 1:
             self.alphavar.set(0)
 
         pal.SetLucky(True if self.luckyvar.get() == 1 else False)
@@ -2307,8 +2320,10 @@ def togglealpha(self):
             return
         i = int(self.listdisplay.curselection()[0])
         pal = self.FilteredPals()[i]
-
-        if self.luckyvar.get() == 1 and self.alphavar.get() == 1:
+        if pal.GetCodeName() == "KingWhale_otomo":
+            self.luckyvar.set(0)
+            self.alphavar.set(1)
+        elif self.luckyvar.get() == 1 and self.alphavar.get() == 1:
             self.luckyvar.set(0)
 
         pal.SetBoss(True if self.alphavar.get() == 1 else False)

palworld_pal_edit/PalInfo.py

@@ -174,7 +174,7 @@ def GetImage(self):
             else:
 
                 n = "PlantSlime" if "PlantSlime" in self.GetCodeName() else n
-                n = n.replace("RAID_", "").replace("_2","")
+                n = n.replace("RAID_", "").replace("_2","").replace("_otomo","")
                 # self._img = ImageTk.PhotoImage(Image.open(module_dir+f'/resources/{n}.png').resize((240,240)))
                 try:
                     print(f"T_{n}_icon_normal.png")
@@ -192,6 +192,9 @@ def GetSecondary(self):
     def GetScaling(self):
         return self._scaling
 
+    def IsHuman(self):
+        return self._human
+
 
 class PalEntity:
 
@@ -240,6 +243,11 @@ def __init__(self, data):
         if typename not in PalSpecies and typename.lower() in PalSpeciesLower:
             typename = PalSpeciesLower[typename.lower()]
 
+        self.isBossRush = False
+        if "_BossRush" in typename:
+            typename = typename.replace("_BossRush", "")
+            self.isBossRush = True
+
         self._type = PalSpecies[typename]
         if self.IsHuman() and ogtypename[:5].lower() == "boss_":
             if ogtypename in PalSpecies:
@@ -517,6 +525,8 @@ def GetMaxHP(self):
         #return self._obj['MaxHP']['value']['Value']['value']
 
     def CalculateIngameStats(self, baseline=False):
+        if self.GetObject().IsHuman():
+            return {"HP": 1, "PHY": 0, "MAG": 0, "DEF": 0}
         """Computed in-game stats. With baseline=True, use the level-only
         values (IV 0, souls 0, condensation rank 1) — the 'standard' stats for
         this species at this level, for comparing against the pal's actual."""
@@ -531,6 +541,8 @@ def CalculateIngameStats(self, baseline=False):
         soul_df = 0 if baseline else self.GetRankDefence()
         rank = 1 if baseline else self.GetRank()
 
+        if SCALING == None:
+            print(self.GetObject().GetName())
         HP_SCALE = SCALING["HP"]
         if self.isBoss and "HP_BOSS" in SCALING:
             HP_SCALE = SCALING["HP_BOSS"]
@@ -787,7 +799,7 @@ def SetNickname(self, value):
 
     def GetFullName(self):
         return self.GetObject().GetName() + (" 💀" if self.isBoss else "") + (
-            " ✨" if self.isLucky else "") + (f" - '{self._nickname}'" if not self._nickname == "" else "")
+            " ✨" if self.isLucky else "") + (" (Boss Rush)" if self.isBossRush else "") + (f" - '{self._nickname}'" if not self._nickname == "" else "")
 
     def SetLucky(self, v=True):
         self._obj["IsRarePal"]['value'] = self.isLucky = v