Skip to content

Commit

Permalink
Merge pull request #152 from augentism/main
Browse files Browse the repository at this point in the history 
[v0.8] New Unknown passives not debugging correctly
  • Loading branch information
@EternalWraith
EternalWraith authored Jul 4, 2024
2 parents af0f8d5 + cb81811 commit e88a827
Show file tree
Hide file tree
Showing 8 changed files with 295 additions and 4 deletions.
56 changes: 54 additions & 2 deletions palworld_pal_edit/PalEdit.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class PalEditConfig:

class PalEdit():
ranks = (0, 1, 2, 3, 4)
debug_listPassivesSeen = set()

def load_i18n(self, lang=""):
path = f"{PalInfo.module_dir}/resources/data/en-GB/ui.json"
Expand Down Expand Up @@ -570,7 +571,9 @@ def onselect(self, evt):

for i in range(0, 4):
if not s[i] in [p for p in PalInfo.PalPassives]:
self.skills[i].set("Unknown")
self.skills[i].set("UNKNOWN")
self.debug_listPassivesSeen.add(s[i])
print(self.debug_listPassivesSeen)
else:
self.skills[i].set(s[i])

Expand Down Expand Up @@ -1262,9 +1265,58 @@ def dlclangs():

# tools.add_cascade(label="Converter", menu=convmenu, underline=0)



# for i in paldata:
# try:
# p = PalInfo.PalEntity(i)
# if not str(p.owner) in self.palbox:
# self.palbox[str(p.owner)] = []
# self.palbox[str(p.owner)].append(p)

# n = p.GetFullName()

# for m in p.GetLearntMoves():
# if not m in nullmoves:
# if not m in PalInfo.PalAttacks:
# nullmoves.append(m)
# except Exception as e:
# if str(e) == "This is a player character":
# logger.debug(f"Found Player Character")
# # print(f"\nDebug: Data \n{i}\n\n")
# # o = i['value']['RawData']['value']['object']['SaveParameter']['value']
# # pl = "No Name"
# # if "NickName" in o:
# # pl = o['NickName']['value']
# # plguid = i['key']['PlayerUId']['value']
# # print(f"{pl} - {plguid}")
# # self.players[pl] = plguid
# else:
# self.unknown.append(str(e))
# try:
# erroredpals.append(i)
# except:
# erroredpals.append(None)
# logger.error(f"Error occured on {i['key']['InstanceId']['value']}", exc_info=True)
# # print(f"Error occured on {i['key']['InstanceId']['value']}: {e.__class__.__name__}: {str(e)}")
# # traceback.print_exception(e)
# print()
# # print(f"Debug: Data {i}")



def updateSkillsName(self):
for idx, n in enumerate(self.skills):
self.skills_name[idx].set(PalInfo.PalPassives[n.get()])
try:
self.skills_name[idx].set(PalInfo.PalPassives[n.get()])
except Exception as e:
print(type(n))
# self.unknown.append(str(e))
# logger.error(f"Error occured on {i['key']['InstanceId']['value']}", exc_info=True)
# # print(f"Error occured on {i['key']['InstanceId']['value']}: {e.__class__.__name__}: {str(e)}")
# # traceback.print_exception(e)
# print()


def changesoul(self, field):
if not self.isPalSelected():
Expand Down
5 changes: 4 additions & 1 deletion palworld_pal_edit/PalInfo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ def GetImage(self):
if self._img == None:
n = self.GetCodeName() if not self._human else "Human"
# self._img = ImageTk.PhotoImage(Image.open(module_dir+f'/resources/{n}.png').resize((240,240)))
self._img = tkinter.PhotoImage(file=f'{module_dir}/resources/pals/{n}.png')
try:
self._img = tkinter.PhotoImage(file=f'{module_dir}/resources/pals/{n}.png')
except:
self._img = tkinter.PhotoImage(file=f'{module_dir}/resources/pals/Alpaca.png')
return self._img

def GetPrimary(self):
Expand Down
4 changes: 4 additions & 0 deletions palworld_pal_edit/resources/data/attacks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"Type": "Neutral",
"Power": 25
},
"EPalWazaID::Unique_WeaselDragon_FlyingTackle": {
"Type": "Dragon",
"Power": 50
},
"EPalWazaID::Unique_Deer_PushupHorn": {
"Type": "Neutral",
"Power": 50,
Expand Down
1 change: 1 addition & 0 deletions palworld_pal_edit/resources/data/en-GB/attacks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"EPalWazaID::Unique_PinkCat_CatPunch": "Punch Flurry",
"EPalWazaID::Unique_Boar_Tackle": "Reckless Charge",
"EPalWazaID::RockLance": "Rock Lance",
"EPalWazaID::Unique_WeaselDragon_FlyingTackle": "Rocket Slam",
"EPalWazaID::Unique_SheepBall_Roll": "Roly Poly",
"EPalWazaID::MudShot": "Sand Blast",
"EPalWazaID::SandTornado": "Sand Tornado",
Expand Down
8 changes: 7 additions & 1 deletion palworld_pal_edit/resources/data/en-GB/pals.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,5 +183,11 @@
"PalDealer_Desert": "Pal Merchant (Desert)",
"PalDealer_Volcano": "Pal Merchant (Volcano)",
"Police_Rifle": "PIDF Infantry",
"Police_Shotgun": "PIDF Elite"
"Police_Shotgun": "PIDF Elite",
"DarkAlien": "Xenovader",
"KendoFrog": "Croajiro",
"MimicDog": "Mimog",
"FeatherOstrich": "Dazemu",
"MushroomDragon": "Shroomer"

}
44 changes: 44 additions & 0 deletions palworld_pal_edit/resources/data/en-GB/passives.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,52 @@
"Name": "Siren of the Void",
"Description": "+20% damage dealt with Ice and Dark attacks; Bellanoir Libero's signature ability"
},
"Stamina_Up_1": {
"Name": "Infinite Stamina",
"Description": "Max Stamina +50% (This effect is only valid for rideable pals.)"
},
"SalePrice_Up_1": {
"Name": "Noble",
"Description": "+5% Sell price"
},
"CoolTimeReduction_Up_1": {
"Name": "Serenity",
"Description": "Active skill cooldown reduction 30% Attack +10% "
},
"NonKilling": {
"Name": "Mercy hit",
"Description": "will not reduce the target's health below 1"
},
"SalePrice_Up_2": {
"Name": "Fine Furs",
"Description": "Sale price 3% "
},
"CoolTimeReduction_Up_2": {
"Name": "Impatient",
"Description": "Active skill cooldown reduction 15%"
},
"Stamina_Up_2": {
"Name": "Fit as a Fiddle",
"Description": "Max Stamina +25% (This effect is only valid for rideable pals.)"
},
"Nocturnal": {
"Name": "Nocturnal",
"Description": "The Pal does not sleep at night and continues to work. "
},
"SalePrice_Down_1": {
"Name": "Shabby",
"Description": "Sale price -10%"
},
"Test_PalEgg_HatchingSpeed_Up": {
"Name": "Philantropist",
"Description": "When assigned to a Breeding Farm, egg production time is reduced by 100%"
},
"Stamina_Down_1": {
"Name": "Sickly",
"Description": "-25% max Stamina"
},
"CoolTimeReduction_Down_1": {
"Name": "Easygoing",
"Description": "Active Skill Cooldown extension -15%"
}
}
147 changes: 147 additions & 0 deletions palworld_pal_edit/resources/data/pals.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4510,11 +4510,13 @@
"Moveset": {
"EPalWazaID::IceMissile": 1,
"EPalWazaID::DragonCanon": 7,
"EPalWazaID::Unique_WeaselDragon_FlyingTackle": 11,
"EPalWazaID::DragonWave": 15,
"EPalWazaID::IceBlade": 22,
"EPalWazaID::DragonBreath": 30,
"EPalWazaID::FrostBreath": 40,
"EPalWazaID::DragonMeteor": 50

},
"Scaling": {
"HP": 90,
Expand Down Expand Up @@ -5010,6 +5012,151 @@
"MonsterFarm": 0
}
},
{
"CodeName": "DarkAlien",
"Type": [
"Dark"
],
"Moveset": {

},
"Scaling": {
"HP": 90,
"ATK": 125,
"DEF": 85
},
"Suitabilities": {
"EmitFlame": 0,
"Watering": 0,
"Seeding": 0,
"GenerateElectricity": 0,
"Handcraft": 0,
"Collection": 0,
"Deforest": 2,
"Mining": 0,
"OilExtraction": 0,
"ProductMedicine": 0,
"Cool": 0,
"Transport": 2,
"MonsterFarm": 0
}
},
{
"CodeName": "MimicDog",
"Type": [
"Neutral"
],
"Moveset": {

},
"Scaling": {
"HP": 60,
"ATK": 60,
"DEF": 130
},
"Suitabilities": {
"EmitFlame": 0,
"Watering": 0,
"Seeding": 0,
"GenerateElectricity": 0,
"Handcraft": 0,
"Collection": 1,
"Deforest": 0,
"Mining": 0,
"OilExtraction": 0,
"ProductMedicine": 0,
"Cool": 0,
"Transport": 0,
"MonsterFarm": 0
}
},
{
"CodeName": "KendoFrog",
"Type": [
"Water"
],
"Moveset": {

},
"Scaling": {
"HP": 80,
"ATK": 80,
"DEF": 80
},
"Suitabilities": {
"EmitFlame": 0,
"Watering": 1,
"Seeding": 0,
"GenerateElectricity": 0,
"Handcraft": 1,
"Collection": 1,
"Deforest": 0,
"Mining": 0,
"OilExtraction": 0,
"ProductMedicine": 0,
"Cool": 0,
"Transport": 1,
"MonsterFarm": 0
}
},
{
"CodeName": "FeatherOstrich",
"Type": [
"Ground"
],
"Moveset": {

},
"Scaling": {
"HP": 80,
"ATK": 80,
"DEF": 80
},
"Suitabilities": {
"EmitFlame": 0,
"Watering": 0,
"Seeding": 0,
"GenerateElectricity": 0,
"Handcraft": 0,
"Collection": 2,
"Deforest": 0,
"Mining": 0,
"OilExtraction": 0,
"ProductMedicine": 0,
"Cool": 0,
"Transport": 0,
"MonsterFarm": 0
}
},
{
"CodeName": "MushroomDragon",
"Type": [
"Grass"
],
"Moveset": {

},
"Scaling": {
"HP": 80,
"ATK": 80,
"DEF": 80
},
"Suitabilities": {
"EmitFlame": 0,
"Watering": 0,
"Seeding": 2,
"GenerateElectricity": 0,
"Handcraft": 1,
"Collection": 2,
"Deforest": 2,
"Mining": 0,
"OilExtraction": 0,
"ProductMedicine": 0,
"Cool": 0,
"Transport": 0,
"MonsterFarm": 0
}
},
{
"CodeName": "GYM_ThunderDragonMan",
"Type": [
Expand Down
34 changes: 34 additions & 0 deletions palworld_pal_edit/resources/data/passives.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,40 @@
"Witch": {
"Rating": "Good"
},
"Stamina_Up_1": {
"Rating": "Good"
},
"SalePrice_Up_1": {
"Rating": "Good"
},
"CoolTimeReduction_Up_1": {
"Rating": "Good"
},

"SalePrice_Up_2": {
"Rating": "Good"
},
"CoolTimeReduction_Up_2": {
"Rating": "Good"
},
"Stamina_Up_2": {
"Rating": "Good"
},
"Nocturnal": {
"Rating": "Good"
},
"SalePrice_Down_1": {
"Rating": "Bad"
},
"Test_PalEgg_HatchingSpeed_Up": {
"Rating": "Good"
},
"CoolTimeReduction_Down_1": {
"Rating": "Bad"
},
"Stamina_Down_1": {
"Rating": "Bad"
},
"NonKilling": {
"Rating": "Bad"
}
Expand Down

0 comments on commit e88a827

Please sign in to comment.