From e83f7e14dbe4ebb46ce6d15c5e84bb0a547f4fb0 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Sun, 18 Oct 2020 12:18:17 -0400
Subject: 1.4

Not sure what moul did to pet nums, hopfully he didn;t fuck them up
---
 constants/misc.json    | 158 ++++++++++++++++++++++++++++++++++++++++---------
 constants/petnums.json |  16 ++---
 2 files changed, 137 insertions(+), 37 deletions(-)

(limited to 'constants')

diff --git a/constants/misc.json b/constants/misc.json
index 4e41f38d..1e50b7a7 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -333,34 +333,133 @@
     "PERSONAL_COMPACTOR_5000": [
       "PERSONAL_COMPACTOR_6000"
     ],
-    "SCARF_STUDIES": [
-      "SCARF_THESIS",
-      "SCARF_GRIMOIRE"
-    ],
-    "SCARF_THESIS": [
-      "SCARF_GRIMOIRE"
-    ],
-    "CAT_TALISMAN": [
-      "LYNX_TALISMAN",
-      "CHEETAH_TALISMAN"
-    ],
-    "LYNX_TALISMAN": [
-      "CHEETAH_TALISMAN"
-    ],
-    "SHADY_RING": [
-      "CROOKED_ARTIFACT",
-      "SEAL_OF_THE_FAMILY"
-    ],
-   "CROOKED_ARTIFACT": [
-      "SEAL_OF_THE_FAMILY"
-    ],
-    "TREASURE_TALISMAN": [
-      "TREASURE_RING",
-      "TREASURE_ARTIFACT"
-    ],
-    "TREASURE_RING": [
-      "TREASURE_ARTIFACT"
-    ]
+	"SCARF_STUDIES": [
+	  "SCARF_THESIS",
+	  "SCARF_GRIMOIRE"
+	],
+	"SCARF_THESIS": [
+	  "SCARF_GRIMOIRE"
+	],
+	"CAT_TALISMAN": [
+	  "LYNX_TALISMAN",
+	  "CHEETAH_TALISMAN"
+	],
+	"LYNX_TALISMAN": [
+	  "CHEETAH_TALISMAN"
+	],
+	"SHADY_RING": [
+	  "CROOKED_ARTIFACT",
+	  "SEAL_OF_THE_FAMILY"
+	],
+	"CROOKED_ARTIFACT": [
+	  "SEAL_OF_THE_FAMILY"
+	],
+	"TREASURE_TALISMAN": [
+	  "TREASURE_RING",
+	  "TREASURE_ARTIFACT"
+	],
+	"TREASURE_RING": [
+	  "TREASURE_ARTIFACT"
+	],
+	"BEASTMASTER_CREST_COMMON": [
+	  "BEASTMASTER_CREST_UNCOMMON",
+	  "BEASTMASTER_CREST_RARE",
+	  "BEASTMASTER_CREST_EPIC",
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"BEASTMASTER_CREST_UNCOMMON": [
+	  "BEASTMASTER_CREST_RARE",
+	  "BEASTMASTER_CREST_EPIC",
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"BEASTMASTER_CREST_RARE": [
+	  "BEASTMASTER_CREST_EPIC",
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"BEASTMASTER_CREST_EPIC": [
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"RAGGEDY_SHARK_TOOTH_NECKLACE": [
+	  "DULL_SHARK_TOOTH_NECKLACE",
+	  "HONED_SHARK_TOOTH_NECKLACE",
+	  "SHARP_SHARK_TOOTH_NECKLACE",
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"DULL_SHARK_TOOTH_NECKLACE": [
+	  "HONED_SHARK_TOOTH_NECKLACE",
+	  "SHARP_SHARK_TOOTH_NECKLACE",
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"HONED_SHARK_TOOTH_NECKLACE": [
+	  "SHARP_SHARK_TOOTH_NECKLACE",
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"SHARP_SHARK_TOOTH_NECKLACE": [
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"WEDDING_RING_0": [
+	  "WEDDING_RING_1",
+	  "WEDDING_RING_2",
+	  "WEDDING_RING_3",
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_1": [
+	  "WEDDING_RING_2",
+	  "WEDDING_RING_3",
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_2": [
+	  "WEDDING_RING_3",
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_3": [
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_4": [
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_5": [
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_6": [
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_7": [
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_8": [
+	  "WEDDING_RING_9"
+	]
   },
   
   "special_bois": [
@@ -373,7 +472,8 @@
 	"2c3f5fc730c14821ae5c2e3f07868b1a",
 	"689ff4bbf61e4e0594e01066892b0bbe",
 	"a5761ff3c7104cabb4f43e7f017a8dbf",
-	"7fd80955792d4206b43ae8f559f20b56"
+	"7fd80955792d4206b43ae8f559f20b56",
+	"4f0e53f2bc1e464fa86af515e22390c7"
   ],
 
   "ranks": {
diff --git a/constants/petnums.json b/constants/petnums.json
index b669d827..3d978a79 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -1135,7 +1135,7 @@
         "EPIC": {
             "1": {
                 "otherNums": [
-                    0.1,
+                    0.4,
                     0.5
                 ],
                 "statNums": {
@@ -1145,7 +1145,7 @@
             },
             "100": {
                 "otherNums": [
-                    15,
+                    40,
                     50
                 ],
                 "statNums": {
@@ -1158,7 +1158,7 @@
         "LEGENDARY": {
             "1": {
                 "otherNums": [
-                    0.1,
+                    0.4,
                     0.5,
                     0.3
                 ],
@@ -1169,7 +1169,7 @@
             },
             "100": {
                 "otherNums": [
-                    15,
+                    40,
                     50,
                     30
                 ],
@@ -1183,8 +1183,8 @@
         "RARE": {
             "1": {
                 "otherNums": [
-                    0.1,
-                    0.4
+                    0.3,
+                    0.3
                 ],
                 "statNums": {
                     "DEFENSE": 0.0,
@@ -1193,8 +1193,8 @@
             },
             "100": {
                 "otherNums": [
-                    12,
-                    40
+                    30,
+                    30
                 ],
                 "statNums": {
                     "DEFENSE": 50.0,
-- 
cgit