Merge pull request #163 from Merlin8800/patch-1

Patch- Unique moves, Human pal errors, exp table, general cleanup of names
EternalWraith · Jul 11, 2024 · e9b531c · e9b531c
2 parents 7844234 + 982eb6f
commit e9b531c
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 155 deletions.
diff --git a/palworld_pal_edit/PalInfo.py b/palworld_pal_edit/PalInfo.py
@@ -69,9 +69,59 @@
     1550533,
     1861323,
     2234286,
-    2681857
+    2681857,
+    3218908,
+    3863445,
+    4636905,
+    5565072,
+    6678888,
+    8015483,
+    9619412,
+    11544143,
+    13853835,
+    16625481,
+    19951472,
+    23942677,
+    28732138,
+    34479507,
+    41376365,
+    49652610,
+    59584120,
+    71501947,
+    85803355,
+    102965061,
+    123559123,
+    148272013,
+    177927497,
+    213514093,
+    256218024,
+    307462756,
+    368956450,
+    442748899,
+    531299853,
+    637561014,
+    765074422,
+    918090527,
+    1101709869,
+    1322053095,
+    1586464981,
+    1903759260,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647,
+    2147483647
 ]
-if len(xpthresholds) < 50:
+if len(xpthresholds) < 55:
     print("Something is wrong with the thresholds")
 
 

diff --git a/palworld_pal_edit/resources/data/attacks.json b/palworld_pal_edit/resources/data/attacks.json
@@ -18,6 +18,7 @@
         "Type": "Dragon",
         "Power": 50,
         "Exclusive": [
+            "WeaselDragon",
             "WeaselDragon_Fire"
         ],
         "Category": "Melee"
@@ -178,7 +179,9 @@
         "Power": 160,
         "Exclusive": [
             "BlackGriffon",
-            "GYM_BlackGriffon"
+            "GYM_BlackGriffon",
+            "GYM_BlackGriffon_2",
+            "GYM_BlackGriffon_2_Avatar"
         ],
         "Category": "Shot"
     },
@@ -313,7 +316,8 @@
         "Type": "Neutral",
         "Power": 85,
         "Exclusive": [
-            "Gorilla"
+            "Gorilla",
+            "Gorilla_Ground"
         ],
         "Category": "Melee"
     },
@@ -532,23 +536,28 @@
         "Type": "Dark",
         "Power": 130,
         "Exclusive": [
-            "NightLady_Dark"
+            "NightLady_Dark",
+            "RAID_NightLady_Dark",
+            "RAID_NightLady_Dark_2"
         ],
         "Category": "Shot"
     },
     "EPalWazaID::Unique_NightLady_WarpBeam": {
         "Type": "Dark",
         "Power": 160,
         "Exclusive": [
-            "NightLady_Dark"
+            "NightLady_Dark",
+            "RAID_NightLady_Dark",
+            "RAID_NightLady_Dark_2"
         ],
         "Category": "Shot"
     },
     "EPalWazaID::Unique_NightLady_WarpBeam_Straight": {
         "Type": "Dark",
         "Power": 140,
         "Exclusive": [
-            "NightLady"
+            "NightLady",
+            "RAID_NightLady"
         ],
         "Category": "Shot"
     },
@@ -986,7 +995,8 @@
         "Power": 170,
         "Exclusive": [
             "MoonQueen",
-            "GYM_MoonQueen"
+            "GYM_MoonQueen",
+            "GYM_MoonQueen_2"
         ],
         "Category": "Shot"
     },
@@ -1003,15 +1013,19 @@
         "Power": 150,
         "Exclusive": [
             "KingBahamut",
-            "KingBahamut_Dragon"
+            "KingBahamut_Dragon",
+            "RAID_KingBahamut_Dragon",
+            "RAID_KingBahamut_Dragon_2"
         ],
         "Category": "Melee"
     },
     "EPalWazaID::Unique_KingBahamut_AirCrash": {
         "Type": "Dragon",
         "Power": 160,
         "Exclusive": [
-            "KingBahamut_Dragon"
+            "KingBahamut_Dragon",
+            "RAID_KingBahamut_Dragon",
+            "RAID_KingBahamut_Dragon_2"
         ],
         "Category": "Melee"
     },
@@ -1029,30 +1043,35 @@
         "Type": "Dark",
         "Power": 170,
         "Exclusive": [
-            "GYM_BlackGriffon"
+            "GYM_BlackGriffon",
+            "GYM_BlackGriffon_2",
+            "GYM_BlackGriffon_2_Avatar"
         ],
         "Category": "Shot"
     },
     "EPalWazaID::Unique_Horus_PerfectStorm": {
         "Type": "Fire",
         "Power": 145,
         "Exclusive": [
-            "GYM_Horus"
+            "Horus",
+            "GYM_Horus",
+            "GYM_Horus_2"
         ],
         "Category": "Shot"
     },
     "EPalWazaID::Unique_MoonQueen_IceMoonBlade": {
         "Type": "Neutral",
         "Power": 110,
         "Exclusive": [
-            "GYM_MoonQueen"
+            "GYM_MoonQueen_2"
         ],
         "Category": "Shot"
     },
     "EPalWazaID::Unique_ElecPanda_GatlingAttack": {
         "Type": "Electric",
         "Power": 160,
         "Exclusive": [
+            "ElecPanda",
             "GYM_ElecPanda"
         ],
         "Category": "Shot"
@@ -1061,6 +1080,7 @@
         "Type": "Electric",
         "Power": 180,
         "Exclusive": [
+            "ThunderDragonMan",
             "GYM_ThunderDragonMan"
         ],
         "Category": "Shot"
@@ -1126,11 +1146,18 @@
     "EPalWazaID::Unique_LilyQueen_LilyHealing": {
         "Type": "Neutral",
         "Power": 0,
+		"Exclusive": [
+            "LilyQueen",
+            "GYM_LilyQueen_2"
+		],
         "Category": "Shot"
     },
     "EPalWazaID::Unique_ScorpionMan_Uppercut": {
         "Type": "Dark",
         "Power": 110,
+		"Exclusive": [
+            "ScorpionMan"
+		],
         "Category": "Melee"
     },
     "EPalWazaID::WaterBalloon": {
@@ -1148,4 +1175,4 @@
         "Power": 90,
         "Category": "Shot"
     }
-}
+}