Skip to content

Commit

Permalink
Removed Melee Attack as it is unused ingame. Added the 3 unreleased c…
Browse files Browse the repository at this point in the history
…reatures back into data. Added Special Gumoss
  • Loading branch information
EternalWraith committed Feb 12, 2024
1 parent 7d0b18b commit c10c236
Show file tree
Hide file tree
Showing 9 changed files with 3,222 additions and 15 deletions.
10 changes: 6 additions & 4 deletions PalEdit.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def default(self, obj):

import traceback
class PalEditConfig:
version = "0.6"
version = "0.6.1"
ftsize = 18
font = "Arial"
badskill = "#DE3C3A"
Expand Down Expand Up @@ -365,6 +365,7 @@ def onselect(self, evt):
self.is_onselect = True
w = evt.widget
if not self.isPalSelected():
self.portrait.config(image=self.purplepanda)
return

self.updatestats()
Expand All @@ -386,6 +387,7 @@ def onselect(self, evt):

self.title.config(text=f"{pal.GetNickname()}")
self.level.config(text=f"Lv. {pal.GetLevel() if pal.GetLevel() > 0 else '?'}")

self.portrait.config(image=pal.GetImage())

self.ptype.config(text=pal.GetPrimary(), bg=PalInfo.PalElements[pal.GetPrimary()])
Expand Down Expand Up @@ -1007,9 +1009,9 @@ def __init__(self):
self.skills_name = []
self.load_i18n()

purplepanda = ImageTk.PhotoImage(
self.purplepanda = ImageTk.PhotoImage(
Image.open(f'{module_dir}/resources/MossandaIcon.png').resize((240, 240)))
self.gui.iconphoto(True, purplepanda)
self.gui.iconphoto(True, self.purplepanda)

root = self.gui

Expand Down Expand Up @@ -1132,7 +1134,7 @@ def __init__(self):
resourceview = tk.Frame(dataview)
resourceview.pack(side=tk.constants.LEFT, fill=tk.constants.BOTH, expand=True)

self.portrait = tk.Label(resourceview, image=purplepanda, relief="sunken", borderwidth=2)
self.portrait = tk.Label(resourceview, image=self.purplepanda, relief="sunken", borderwidth=2)
self.portrait.pack()

typeframe = tk.Frame(resourceview)
Expand Down
15 changes: 5 additions & 10 deletions PalInfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,18 +240,16 @@ def CleanseSkills(self):
def CleanseAttacks(self):
i = 0
while i < len(self._learntMoves):
remove = 0
remove = False
if not SkillExclusivity[self._learntMoves[i]] is None:
if not self._type.GetCodeName() in SkillExclusivity[self._learntMoves[i]]:
remove = 1
remove = True

if PalAttacks[self._learntMoves[i]] in PalLearnSet[self._type.GetCodeName()]:
print(self._level,PalLearnSet[self._type.GetCodeName()][PalAttacks[self._learntMoves[i]]])
if not self._level >= PalLearnSet[self._type.GetCodeName()][PalAttacks[self._learntMoves[i]]]:
remove = 2
remove = True

if remove > 0:
print(f"Removing {self._learntMoves[i]} : Reason {remove}")
if remove:
if self._learntMoves[i] in self._equipMoves:
self._equipMoves.remove(self._learntMoves[i])
self._learntMoves.pop(i)
Expand All @@ -266,17 +264,14 @@ def CleanseAttacks(self):
for i in self._equipMoves:
if not i in self._learntMoves:
self._learntMoves.append(i)
print("------")
for i in self._learntMoves:
print(i)

def GetType(self):
return self._type

def SetType(self, value):
self._obj['CharacterID']['value'] = ("BOSS_" if (self.isBoss or self.isLucky) else "") + value
self._type = PalSpecies[value]
self.SetLevelMoves()
self.CleanseAttacks()

def GetObject(self) -> PalObject:
return self._type
Expand Down
Binary file added resources/Boltmane.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/Dark Mutant.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/Dragostrophe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/Ice Reptyro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/Reptyro Cryst.png
Binary file not shown.
66 changes: 66 additions & 0 deletions resources/data/pals.json
Original file line number Diff line number Diff line change
Expand Up @@ -2106,6 +2106,28 @@
"DEF": 70
}
},
{
"CodeName": "PlantSlime_Flower",
"Name": "Gumoss (Special)",
"Type": [
"Grass",
"Ground"
],
"Moveset": {
"Sand Blast": 1,
"Wind Cutter": 7,
"Stone Blast": 15,
"Seed Machine Gun": 22,
"Seed Mine": 30,
"Sand Tornado": 40,
"Solar Blast": 50
},
"Scaling": {
"HP": 70,
"ATK": 70,
"DEF": 70
}
},
{
"CodeName": "QueenBee",
"Name": "Elizabee",
Expand Down Expand Up @@ -2876,6 +2898,50 @@
"DEF": 110
}
},
{
"CodeName": "BlackFurDragon",
"Name": "Dragostrophe",
"Type": [
"Dark",
"Dragon"
],
"Moveset": {
},
"Scaling": {
"HP": 130,
"ATK": 130,
"DEF": 110
}
},
{
"CodeName": "ElecLion",
"Name": "Boltmane",
"Type": [
"Electric"
],
"Moveset": {
},
"Scaling": {
"HP": 100,
"ATK": 110,
"DEF": 70
}
},
{
"CodeName": "DarkMutant",
"Name": "Dark Mutant",
"Type": [
"Dark",
"Dragon"
],
"Moveset": {
},
"Scaling": {
"HP": 100,
"ATK": 100,
"DEF": 100
}
},
{
"CodeName": "GYM_ThunderDragonMan",
"Name": "Axel & Orserk",
Expand Down
3,146 changes: 3,145 additions & 1 deletion resources/data/pals_zh-CN.json

Large diffs are not rendered by default.

0 comments on commit c10c236

Please sign in to comment.