From ccea0ac167b0e711c60510ebf50c6c8d2084789c Mon Sep 17 00:00:00 2001
From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Date: Tue, 16 Feb 2021 18:02:50 +0100
Subject: Also fixed stuff from trello and more + new items (#401)

- fixed rare giraffe pet
- ~~added price paid to midas staff~~ removed since in pull request #400 they removed it from midas sword and the whole idea was to have it be the same
- changed crystal armor light levels to 15 for consistency
- fixed catalyst rarity
- added social xp requirment for showcase block, island npc and rock paper shears
- moved all logs under 1 parent (previously split under 2 parents)
- fixed rarity of horse armor, name tag and saddle
- added rune sack, autopet, kismet feather, new enrichments and cultivating enchant
---
 constants/enchants.json | 6 ++++--
 constants/parents.json  | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'constants')

diff --git a/constants/enchants.json b/constants/enchants.json
index dd78db6b..574e17db 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -104,7 +104,8 @@
       "turbo_warts",
       "turbo_carrot",
       "turbo_potato",
-      "turbo_mushrooms"
+      "turbo_mushrooms",
+      "cultivating"
     ],
     "HELMET": [
       "big_brain",
@@ -318,6 +319,7 @@
     "ultimate_last_stand": 5,
     "ultimate_legion": 5,
     "ultimate_no_pain_no_gain": 5,
-    "ultimate_wisdom": 5
+    "ultimate_wisdom": 5,
+    "cultivating": 10
   }
 }
diff --git a/constants/parents.json b/constants/parents.json
index 15facbb8..e5dcfe5a 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -292,9 +292,8 @@
   "LOG":[
     "LOG-1",
     "LOG-2",
-    "LOG-3"
-  ],
-  "LOG_2":[
+    "LOG-3",
+    "LOG_2",
     "LOG_2-1"
   ],
   "LOOTING;1":[
-- 
cgit