Added new jerry stuff, fixed oringo npc and books (#869)

5 files changed, 139 insertions, 29 deletions

diff --git a/constants/enchants.json b/constants/enchants.json
index 1b1226da..7f6afdc6 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -382,19 +382,24 @@
       "divine_gift"
     ],
     "GLOVES": [
-      "cayenne"
+      "cayenne",
+      "prosperity"
     ],
     "BELT": [
-      "cayenne"
+      "cayenne",
+      "prosperity"
     ],
     "NECKLACE": [
-      "cayenne"
+      "cayenne",
+      "prosperity"
     ],
     "BRACELET": [
-      "cayenne"
+      "cayenne",
+      "prosperity"
     ],
     "CLOAK": [
-      "cayenne"
+      "cayenne",
+      "prosperity"
     ]
   },
   "enchant_pools": [
@@ -1289,6 +1294,13 @@
       100,
       200
     ],
+    "prosperity": [
+      100,
+      100,
+      100,
+      100,
+      200
+    ],
     "one_for_all": [
       50
     ],
diff --git a/constants/misc.json b/constants/misc.json
index 5bd10b70..9502e671 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -876,15 +876,7 @@
     ],
     "BINGO_TALISMAN": [
       "BINGO_RING",
-      "BINGO_ARTIFACT",
-      "BINGO_RELIC"
-    ],
-    "BINGO_RING": [
-      "BINGO_ARTIFACT",
-      "BINGO_RELIC"
-    ],
-    "BINGO_ARTIFACT": [
-      "BINGO_RELIC"
+      "BINGO_ARTIFACT"
     ],
     "ODGERS_BRONZE_TOOTH": [
       "ODGERS_SILVER_TOOTH",
@@ -1261,6 +1253,31 @@
     ],
     "VACCINE_RING": [
       "VACCINE_ARTIFACT"
+    ],
+    "GLACIAL_TALISMAN": [
+      "GLACIAL_RING",
+      "GLACIAL_ARTIFACT"
+    ],
+    "GLACIAL_RING": [
+      "GLACIAL_ARTIFACT"
+    ],
+    "WHITE_GIFT_TALISMAN": [
+      "GREEN_GIFT_TALISMAN",
+      "BLUE_GIFT_TALISMAN",
+      "PURPLE_GIFT_TALISMAN",
+      "GOLD_GIFT_TALISMAN"
+    ],
+    "GREEN_GIFT_TALISMAN": [
+      "BLUE_GIFT_TALISMAN",
+      "PURPLE_GIFT_TALISMAN",
+      "GOLD_GIFT_TALISMAN"
+    ],
+    "BLUE_GIFT_TALISMAN": [
+      "PURPLE_GIFT_TALISMAN",
+      "GOLD_GIFT_TALISMAN"
+    ],
+    "PURPLE_GIFT_TALISMAN": [
+      "GOLD_GIFT_TALISMAN"
     ]
   },
   "special_bois": [
@@ -1527,7 +1544,7 @@
     "GLOWSTONE_GENERATOR": 12,
     "GOLD_GENERATOR": 12,
     "GRAVEL_GENERATOR": 11,
-    "ICE_GENERATOR": 11,
+    "ICE_GENERATOR": 12,
     "IRON_GENERATOR": 12,
     "JUNGLE_GENERATOR": 11,
     "LAPIS_GENERATOR": 12,
@@ -1549,7 +1566,7 @@
     "SHEEP_GENERATOR": 12,
     "SKELETON_GENERATOR": 11,
     "SLIME_GENERATOR": 11,
-    "SNOW_GENERATOR": 11,
+    "SNOW_GENERATOR": 12,
     "SPIDER_GENERATOR": 11,
     "SPRUCE_GENERATOR": 11,
     "SUGAR_CANE_GENERATOR": 12,
diff --git a/constants/parents.json b/constants/parents.json
index 7b8439e3..0f42724d 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -190,7 +190,8 @@
   "EXPERIENCE;1": [
     "EXPERIENCE;2",
     "EXPERIENCE;3",
-    "EXPERIENCE;4"
+    "EXPERIENCE;4",
+    "EXPERIENCE;5"
   ],
   "FEATHER_FALLING;1": [
     "FEATHER_FALLING;2",
@@ -1376,7 +1377,8 @@
     "ICE_GENERATOR_8",
     "ICE_GENERATOR_9",
     "ICE_GENERATOR_10",
-    "ICE_GENERATOR_11"
+    "ICE_GENERATOR_11",
+    "ICE_GENERATOR_12"
   ],
   "SNOW_GENERATOR_1": [
     "SNOW_GENERATOR_2",
@@ -1388,7 +1390,8 @@
     "SNOW_GENERATOR_8",
     "SNOW_GENERATOR_9",
     "SNOW_GENERATOR_10",
-    "SNOW_GENERATOR_11"
+    "SNOW_GENERATOR_11",
+    "SNOW_GENERATOR_12"
   ],
   "COAL_GENERATOR_1": [
     "COAL_GENERATOR_2",
@@ -2399,7 +2402,8 @@
     "MEDIUM_ENCHANTED_CHEST",
     "SMALL_ENCHANTED_CHEST"
   ],
-  "BINGO;3": [
+  "BINGO;4": [
+    "BINGO;3",
     "BINGO;2",
     "BINGO;1",
     "BINGO;0"
@@ -3127,5 +3131,21 @@
   "VACCINE_ARTIFACT": [
     "VACCINE_RING",
     "VACCINE_TALISMAN"
+  ],
+  "GLACIAL_ARTIFACT": [
+    "GLACIAL_RING",
+    "GLACIAL_TALISMAN"
+  ],
+  "GOLD_GIFT_TALISMAN": [
+    "PURPLE_GIFT_TALISMAN",
+    "BLUE_GIFT_TALISMAN",
+    "GREEN_GIFT_TALISMAN",
+    "WHITE_GIFT_TALISMAN"
+  ],
+  "PROSPERITY;1": [
+    "PROSPERITY;2",
+    "PROSPERITY;3",
+    "PROSPERITY;4",
+    "PROSPERITY;5"
   ]
 }
\ No newline at end of file
diff --git a/constants/petnums.json b/constants/petnums.json
index 915a2ad3..ae496aef 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -463,7 +463,8 @@
         ],
         "statNums": {
           "HEALTH": 25.0,
-          "STRENGTH": 5.0
+          "STRENGTH": 5.0,
+          "SPEED": 0
         }
       },
       "100": {
@@ -472,7 +473,8 @@
         ],
         "statNums": {
           "HEALTH": 100.0,
-          "STRENGTH": 25.0
+          "STRENGTH": 25.0,
+          "SPEED": 75.0
         }
       }
     },
@@ -484,7 +486,8 @@
         ],
         "statNums": {
           "HEALTH": 25.0,
-          "STRENGTH": 5.0
+          "STRENGTH": 5.0,
+          "SPEED": 0
         }
       },
       "100": {
@@ -494,7 +497,8 @@
         ],
         "statNums": {
           "HEALTH": 100.0,
-          "STRENGTH": 25.0
+          "STRENGTH": 25.0,
+          "SPEED": 75
         }
       }
     },
@@ -507,7 +511,8 @@
         ],
         "statNums": {
           "HEALTH": 27.5,
-          "STRENGTH": 5.5
+          "STRENGTH": 5.5,
+          "SPEED": 0
         }
       },
       "100": {
@@ -518,7 +523,8 @@
         ],
         "statNums": {
           "HEALTH": 140.0,
-          "STRENGTH": 35.0
+          "STRENGTH": 35.0,
+          "SPEED": 75.0
         }
       }
     },
@@ -532,7 +538,8 @@
         ],
         "statNums": {
           "HEALTH": 27.5,
-          "STRENGTH": 5.5
+          "STRENGTH": 5.5,
+          "SPEED": 0
         }
       },
       "100": {
@@ -544,7 +551,38 @@
         ],
         "statNums": {
           "HEALTH": 140.0,
-          "STRENGTH": 35.0
+          "STRENGTH": 35.0,
+          "SPEED": 75.0
+        }
+      }
+    },
+    "LEGENDARY": {
+      "1": {
+        "otherNums": [
+          5.0,
+          5.0,
+          10.0,
+          0.1,
+          25
+        ],
+        "statNums": {
+          "HEALTH": 27.5,
+          "STRENGTH": 5.5,
+          "SPEED": 0
+        }
+      },
+      "100": {
+        "otherNums": [
+          25,
+          15,
+          40,
+          1,
+          75
+        ],
+        "statNums": {
+          "HEALTH": 140.0,
+          "STRENGTH": 35.0,
+          "SPEED": 75.0
         }
       }
     }
@@ -3492,6 +3530,28 @@
       }
     }
   },
+  "REINDEER": {
+    "LEGENDARY": {
+      "1": {
+        "otherNums": [
+          1.0
+        ],
+        "statNums": {
+          "HEALTH": 1.0,
+          "SEA_CREATURE_CHANCE": 0.05
+        }
+      },
+      "100": {
+        "otherNums": [
+          100
+        ],
+        "statNums": {
+          "HEALTH": 100.0,
+          "SEA_CREATURE_CHANCE": 5.0
+        }
+      }
+    }
+  },
   "SHEEP": {
     "EPIC": {
       "1": {
diff --git a/constants/pets.json b/constants/pets.json
index ea0ad022..c86abbf2 100644
--- a/constants/pets.json
+++ b/constants/pets.json
@@ -294,6 +294,7 @@
     "AMMONITE": "FISHING",
     "SNAIL": "MINING",
     "MOOSHROOM_COW": "FARMING",
-    "KUUDRA": "COMBAT"
+    "KUUDRA": "COMBAT",
+    "REINDEER": "FISHING"
   }
 }