v0.9 initial release

EternalWraith · Jul 4, 2024 · c3f80fb · c3f80fb
1 parent e88a827
commit c3f80fb
Show file tree

Hide file tree

Showing 180 changed files with 126,495 additions and 207 deletions.
diff --git a/pals/error_0.json b/pals/error_0.json
diff --git a/pals/error_1.json b/pals/error_1.json
diff --git a/pals/error_2.json b/pals/error_2.json
diff --git a/pals/error_3.json b/pals/error_3.json
diff --git a/pals/error_4.json b/pals/error_4.json
diff --git a/palworld_pal_edit/ImageResizeUtil.py b/palworld_pal_edit/ImageResizeUtil.py
@@ -0,0 +1,9 @@
+from PIL import Image
+import os
+
+for root, dirs, files in os.walk("resources/pals"):
+    for name in files:
+        i = Image.open(os.path.join(root, name))
+        ni = i.resize((240,240))
+        ni.save(os.path.join(root,name))
+
diff --git a/palworld_pal_edit/PalEdit.py b/palworld_pal_edit/PalEdit.py
@@ -123,7 +123,7 @@ def skip_encode(
 
 
 class PalEditConfig:
-    version = "0.8"
+    version = "0.9"
     ftsize = 18
     font = "Microsoft YaHei"
     badskill = "#DE3C3A"
@@ -212,8 +212,8 @@ def atk_upd(menu, atk_id, label, codename):
                 atk_upd(menu, atk_id, PalInfo.PalAttacks[codename], codename)
 
         op = [PalInfo.PalPassives[e] for e in PalInfo.PalPassives]
-        op.pop(0)
-        op.pop(0)
+        op.remove("None")
+        op.remove("Unknown")
         op.sort()
         op.insert(0, "None")
 
@@ -1830,10 +1830,10 @@ def try_update(var, event=None):
         self.updateSkillsName()
 
         op = [PalInfo.PalPassives[e] for e in PalInfo.PalPassives]
-        op.pop(0)
-        op.pop(0)
+        op.remove("None")
         op.sort()
         op.insert(0, "None")
+        op.remove("Unknown")
         self.skilldrops = [
             tk.OptionMenu(topview, self.skills_name[0], *op, command=lambda evt: self.changeskill(0)),
             tk.OptionMenu(topview, self.skills_name[1], *op, command=lambda evt: self.changeskill(1)),

diff --git a/palworld_pal_edit/PalInfo.py b/palworld_pal_edit/PalInfo.py
@@ -109,7 +109,7 @@ def GetImage(self):
             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')
+                self._img = tkinter.PhotoImage(file=f'{module_dir}/resources/pals/#ERROR.png')
         return self._img
 
     def GetPrimary(self):
@@ -907,9 +907,9 @@ def LoadPassives(lang="en-GB"):
                 PalPassives[code] = l[code]["Name"]
                 PassiveDescriptions[code] = l[code]["Description"]
                 PassiveRating[code] = d[i]["Rating"]
+                #print(i, l[code]["Name"])
             PalPassives = dict(sorted(PalPassives.items()))
 
-
 LoadPassives()
 
 # PalAttacks CodeName -> Name

diff --git a/palworld_pal_edit/resources/data/attacks.json b/palworld_pal_edit/resources/data/attacks.json
@@ -652,7 +652,262 @@
         "Power": 30
     },
     "EPalWazaID::WaterWave": {
-        "Type": "",
+        "Type": "Water",
+        "Power": 0
+    },
+
+    "EPalWazaID::IcicleLine": {
+        "Type": "Ice",
+        "Power": 120
+    },
+    "EPalWazaID::FlareTwister": {
+        "Type": "Fire",
+        "Power": 130
+    },
+    "EPalWazaID::WindEdge": {
+        "Type": "Grass",
+        "Power": 90
+    },
+    "EPalWazaID::RaidCutter": {
+        "Type": "Grass",
+        "Power": 110
+    },
+    "EPalWazaID::IceAge": {
+        "Type": "Ice",
+        "Power": 140
+    },
+    "EPalWazaID::DoubleIcicleThrow": {
+        "Type": "Ice",
+        "Power": 200
+    },
+    "EPalWazaID::IciclePierce": {
+        "Type": "Ice",
+        "Power": 110
+    },
+    "EPalWazaID::ChaosLaser": {
+        "Type": "Dark",
+        "Power": 300
+    },
+    "EPalWazaID::BubbleShower": {
+        "Type": "Dark",
+        "Power": 110
+    },
+    "EPalWazaID::ShokeiLaser": {
+        "Type": "Electric",
+        "Power": 170
+    },
+    "EPalWazaID::Railbolt": {
+        "Type": "Electric",
+        "Power": 200
+    },
+    "EPalWazaID::RangeThunder": {
+        "Type": "Electric",
+        "Power": 125
+    },
+    "EPalWazaID::SandTwister": {
+        "Type": "Ground",
+        "Power": 160
+    },
+    "EPalWazaID::FlameFunnel": {
+        "Type": "Fire",
+        "Power": 120
+    },
+    "EPalWazaID::ThunderStorm": {
+        "Type": "Electric",
+        "Power": 160
+    },
+    "EPalWazaID::TriSpark": {
+        "Type": "Electric",
+        "Power": 110
+    },
+    "EPalWazaID::WallSplash": {
+        "Type": "Water",
+        "Power": 120
+    },
+    "EPalWazaID::AirBlade": {
+        "Type": "Neutral",
+        "Power": 85
+    },
+    "EPalWazaID::FlameWall": {
+        "Type": "Fire",
+        "Power": 100
+    },
+    "EPalWazaID::HolyBlast": {
+        "Type": "Neutral",
+        "Power": 120
+    },
+    "EPalWazaID::Eruption": {
+        "Type": "Fire",
+        "Power": 130
+    },
+    "EPalWazaID::CommetRain": {
+        "Type": "Dragon",
+        "Power": 160
+    },
+    "EPalWazaID::ThreeComemt": {
+        "Type": "Dragon",
+        "Power": 120
+    },
+    "EPalWazaID::BlastCanon": {
+        "Type": "Dragon",
+        "Power": 100
+    },
+    "EPalWazaID::ChargeCanon": {
+        "Type": "Dragon",
+        "Power": 120
+    },
+    "EPalWazaID::LineGeyser": {
+        "Type": "Water",
+        "Power": 90
+    },
+    "EPalWazaID::RootLance": {
+        "Type": "Grass",
+        "Power": 120
+    },
+    "EPalWazaID::StarMine": {
+        "Type": "Neutral",
+        "Power": 110
+    },
+    "EPalWazaID::DiamondFall": {
+        "Type": "Ice",
+        "Power": 160
+    },
+    "EPalWazaID::BeamSlicer": {
+        "Type": "Dragon",
+        "Power": 130
+    },
+    "EPalWazaID::Tremor": {
+        "Type": "Earth",
+        "Power": 130
+    },
+    "EPalWazaID::Commet": {
+        "Type": "Dragon",
+        "Power": 110
+    },
+
+    "EPalWazaID::Unique_DarkScorpion_Pierce": {
+        "Type": "Dark",
+        "Power": 110,
+        "Exclusive": [
+            "DarkScorpion"
+        ]
+    },
+    "EPalWazaID::Unique_FeatherOstrich_Tossin": {
+        "Type": "Earth",
+        "Power": 100,
+        "Exclusive": [
+            "FeatherOstrich"
+        ]
+    },
+    "EPalWazaID::Unique_SifuDog_Counter": {
+        "Type": "Neutral",
+        "Power": 170,
+        "Exclusive": [
+            "SifuDog"
+        ]
+    },
+    "EPalWazaID::Unique_WingGolem_RoundCutter": {
+        "Type": "Earth",
+        "Power": 145,
+        "Exclusive": [
+            "WingGolem"
+        ]
+    },
+    "EPalWazaID::Unique_MoonQueen_MoonBlade": {
+        "Type": "Neutral",
+        "Power": 110,
+        "Exclusive": [
+            "MoonQueen",
+            "GYM_MoonQueen"
+        ]
+    },
+    "EPalWazaID::Unique_MoonQueen_MoonBeam": {
+        "Type": "Neutral",
+        "Power": 170,
+        "Exclusive": [
+            "MoonQueen",
+            "GYM_MoonQueen"
+        ]
+    },
+    "EPalWazaID::Unique_DarkAlien_JumpScractch": {
+        "Type": "Dark",
+        "Power": 95,
+        "Exclusive": [
+            "DarkAlien"
+        ]
+    },
+    "EPalWazaID::Unique_KingBahamut_ArmSlash": {
+        "Type": "Fire",
+        "Power": 150,
+        "Exclusive": [
+            "KingBahamut",
+            "KingBahamut_Dragon"
+        ]
+    },
+    "EPalWazaID::Unique_KingBahamut_AirCrash": {
+        "Type": "Dragon",
+        "Power": 160,
+        "Exclusive": [
+            "KingBahamut_Dragon"
+        ]
+    },
+    "EPalWazaID::Unique_WeaselDragon_FlyingTackle": {
+        "Type": "Dragon",
+        "Power": 50,
+        "Exclusive": [
+            "WeaselDragon_Fire"
+        ]
+    },
+
+    "EPalWazaID::ThunderBird_ThunderStorm": {
+        "Type": "Electric",
         "Power": 0
+    },
+    "EPalWazaID::Manticore_InfernoStrike": {
+        "Type": "Fire",
+        "Power": 0
+    },
+
+    "EPalWazaID::Unique_BlackGriffon_TackleLaser2": {
+        "Type": "Dark",
+        "Power": 170,
+        "Exclusive": [
+            "GYM_BlackGriffon"
+        ]
+    },
+    "EPalWazaID::Unique_Horus_PerfectStorm": {
+        "Type": "Fire",
+        "Power": 145,
+        "Exclusive": [
+            "GYM_Horus"
+        ]
+    },
+    "EPalWazaID::Unique_MoonQueen_IceMoonBlade": {
+        "Type": "Neutral",
+        "Power": 110,
+        "Exclusive": [
+            "GYM_MoonQueen"
+        ]
+    },
+    "EPalWazaID::Unique_ElecPanda_GatlingAttack": {
+        "Type": "Electric",
+        "Power": 160,
+        "Exclusive": [
+            "GYM_ElecPanda"
+        ]
+    },
+    "EPalWazaID::Unique_ThunderDragonMan_NumerousSwordAttack": {
+        "Type": "Electic",
+        "Power": 180,
+        "Exclusive": [
+            "GYM_ThunderDragonMan"
+        ]
+    },
+    "EPalWazaID::Unique_LilyQueen_WindBarrier": {
+        "Type": "Grass",
+        "Power": 60,
+        "Exclusive": [
+            "GYM_LilyQueen"
+        ]
     }
 }
diff --git a/palworld_pal_edit/resources/data/en-GB/attacks.json b/palworld_pal_edit/resources/data/en-GB/attacks.json
@@ -120,5 +120,59 @@
     "EPalWazaID::DarkCanon": "Dark Cannon",
     "EPalWazaID::DarkPulse": "Umbral Surge",
     "EPalWazaID::DarkArrow": "Dark Arrow",
-    "EPalWazaID::Apocalypse": "Apocalypse"
+    "EPalWazaID::Apocalypse": "Apocalypse",
+
+    "EPalWazaID::IcicleLine": "Icicle Line",
+    "EPalWazaID::FlareTwister": "Flare Twister",
+    "EPalWazaID::WindEdge": "Wind Edge",
+    "EPalWazaID::RaidCutter": "Raid Cutter",
+    "EPalWazaID::IceAge": "Absolute Frost",
+    "EPalWazaID::DoubleIcicleThrow": "Double Blizzard Spike",
+    "EPalWazaID::IciclePierce": "Icicle Bullet",
+    "EPalWazaID::ChaosLaser": "Chaos Laser",
+    "EPalWazaID::BubbleShower": "Poison Shower",
+    "EPalWazaID::ShokeiLaser": "Lethal Laster",
+    "EPalWazaID::Railbolt": "Thunder Rail",
+    "EPalWazaID::RangeThunder": "All Range Thunder",
+    "EPalWazaID::SandTwister": "Sand Twister",
+    "EPalWazaID::FlameFunnel": "Flame Funnel",
+    "EPalWazaID::ThunderStorm": "Thunderstorm",
+    "EPalWazaID::TriSpark": "TriSpark",
+    "EPalWazaID::WallSplash": "Curtain Splash",
+    "EPalWazaID::AirBlade": "Air Blade",
+    "EPalWazaID::FlameWall": "Flame Wall",
+    "EPalWazaID::HolyBlast": "Holy Burst",
+    "EPalWazaID::Eruption": "Volcanic Rain",
+    "EPalWazaID::CommetRain": "Meteor Rain",
+    "EPalWazaID::ThreeComemt": "Comet Barrage",
+    "EPalWazaID::BlastCanon": "Blast Cannon",
+    "EPalWazaID::ChargeCanon": "Charge Cannon",
+    "EPalWazaID::LineGeyser": "Splash",
+    "EPalWazaID::RootLance": "Circle Vine",
+    "EPalWazaID::StarMine": "Star Mine",
+    "EPalWazaID::DiamondFall": "Diamond Rain",
+    "EPalWazaID::BeamSlicer": "Beam Slicer",
+    "EPalWazaID::Tremor": "Rockburst",
+    "EPalWazaID::Commet": "Comet Strike",
+
+    "EPalWazaID::Unique_DarkScorpion_Pierce": "Upper Smash",
+    "EPalWazaID::Unique_FeatherOstrich_Tossin": "Earth Dash",
+    "EPalWazaID::Unique_SifuDog_Counter": "Wholehearted Stance",
+    "EPalWazaID::Unique_WingGolem_RoundCutter": "Ground Cutter",
+    "EPalWazaID::Unique_MoonQueen_MoonBlade": "Seigetsu Blade",
+    "EPalWazaID::Unique_MoonQueen_MoonBeam": "Moonlight Beam",
+    "EPalWazaID::Unique_DarkAlien_JumpScractch": "Evil Slash",
+    "EPalWazaID::Unique_KingBahamut_ArmSlash": "Brawn Impact",
+    "EPalWazaID::Unique_KingBahamut_AirCrash": "Magna Crush",
+    "EPalWazaID::Unique_WeaselDragon_FlyingTackle": "Rocket Slam",
+
+    "EPalWazaID::ThunderBird_ThunderStorm": "Lightning Dive",
+    "EPalWazaID::Manticore_InfernoStrike": "Volcanic Fang",
+
+    "EPalWazaID::Unique_BlackGriffon_TackleLaser2": "Divine Distater II",
+    "EPalWazaID::Unique_Horus_PerfectStorm": "Raging Flame Wave",
+    "EPalWazaID::Unique_MoonQueen_IceMoonBlade": "Seigetsu Blade II",
+    "EPalWazaID::Unique_ElecPanda_GatlingAttack": "Heavy Thunder Tank",
+    "EPalWazaID::Unique_ThunderDragonMan_NumerousSwordAttack": "Polykeraunos",
+    "EPalWazaID::Unique_LilyQueen_WindBarrier": "Wind Barrier"
 }