alpha => master (#550)

* New alpha items (#533)

* some new items

* delete duplicates from cheeze

* I'm dumb

* Revert "some new items"

This reverts commit 68d878bbace4de76036e3af6b28ca7014417b347.

* perfect gems

* flawless gems that cheeze didn't do yet

* removed oil_barrel because I fucked up

* wiki links

* New alpha items (#534)

* New alpha items

Added 4 items from the metal detector room but im missing one of them

Added 2 new pets i dont think they are 100% right and we are missing uncommon and leg

* i did a lil grinding and found the 4th scavenged thingy

* found items on the ah and also found an npc with some

updating flamebreaker armor to the alpha version

* found the new pet

it doesnt have perks and *might* be scuffed in pv

* added a wiki link

thx jani

* New item from the raffle v2 event thingy

thx gravy!

* New Alpha Items (#535)

* New Pet Skin

* New Drill Breaking Power

Updated Drill Breaking Powers for the titanium drills.

* Test

* Did not mean to change this file lol

* Fixed Timing

Yes i'm updating these on the web interface

* Fixed Timing

* Fixed Drill Ability And Duration

* Fixed Timings More

* Bye Bal

* Some more gemstones

* WIki Links

Okay I did wiki links now pls stop pining me

* New Alpha Items (but I'm MVP++ so I'm special) (#536)

* Add files via upload

* Add files via upload

Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>

* New Update Parents (#537)

Parented items from new update. Note: We are missing Gemstones: 
- Flawed Saphire
- Flawed Jasper
- Rough Jasper
- Flawed Topaz
- Flawed Amber
- Flawless Jade
so i did not parent them

* Summer - Added new Minion Skins and Furniture Stuff, added 2 Mayors added Rainbow Name and fixed 3 Bugs  (#531) (#538)

* Summer

* Mayor Stuff

* Another Fix

* Rainbow Name and a fix

* Fixing Cultivating

* Another Fix

* yep

* Rainbow Name

* Another Fix

* Rainbow Name

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>

* New alpha items (#539)

* New alpha items

Added 4 items from the metal detector room but im missing one of them

Added 2 new pets i dont think they are 100% right and we are missing uncommon and leg

* i did a lil grinding and found the 4th scavenged thingy

* found items on the ah and also found an npc with some

updating flamebreaker armor to the alpha version

* found the new pet

it doesnt have perks and *might* be scuffed in pv

* added a wiki link

thx jani

* New item from the raffle v2 event thingy

thx gravy!

* Create YOGGIE.json

* added uncommon and leg armadillo and new reforge stone stats

reforge stone is kinda scuffed rn cos moulbemoment and cos i dont have leg/mythic price

also lets hope i didnt fuck up anything

* found on ah

* Wiki Link for Concentrated Stone & Parenting Fixes (#540)

* New Update Parents

Parented items from new update. Note: We are missing Gemstones: 
- Flawed Saphire
- Flawed Jasper
- Rough Jasper
- Flawed Topaz
- Flawed Amber
- Flawless Jade
so i did not parent them

* Changed hardstone order

* Wiki Link

* New New Alpha Items (#542)

* Create SLUDGE_JUICE.json

* links

* recipes until server crash

* jani thingy

* gemstone recipes

* flawed gems + recipes

* all gem recipes

* minions

* heat armor recipe

* last stuff before crash because hypixel good

* hard stone collection done

* Create CATACOMBS_PASS_7.json

* passes

* more passes

* Create CATACOMBS_PASS_9.json

* Update Branch (#544)

* Summer - Added new Minion Skins and Furniture Stuff, added 2 Mayors added Rainbow Name and fixed 3 Bugs  (#531)

* Summer

* Mayor Stuff

* Another Fix

* Rainbow Name and a fix

* Fixing Cultivating

* Another Fix

* yep

* Rainbow Name

* Another Fix

* Rainbow Name

* fix watcher miniboss wikilink (#543)

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>

* changed to skull (#541)

* changed to skull

* Update reforgestones.json

Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>

* Update Alpha Branch (#545)

* Summer - Added new Minion Skins and Furniture Stuff, added 2 Mayors added Rainbow Name and fixed 3 Bugs  (#531)

* Summer

* Mayor Stuff

* Another Fix

* Rainbow Name and a fix

* Fixing Cultivating

* Another Fix

* yep

* Rainbow Name

* Another Fix

* Rainbow Name

* fix watcher miniboss wikilink (#543)

* Allow linting on alpha

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>

* fix gem parents + catacombs pass parents (#546)

* fix gem parents + catacombs pass parents

* Create ROUGH_JASPER_GEM.json

* update alpha branch (#549)

* Summer - Added new Minion Skins and Furniture Stuff, added 2 Mayors added Rainbow Name and fixed 3 Bugs  (#531)

* Summer

* Mayor Stuff

* Another Fix

* Rainbow Name and a fix

* Fixing Cultivating

* Another Fix

* yep

* Rainbow Name

* Another Fix

* Rainbow Name

* fix watcher miniboss wikilink (#543)

* Allow linting on alpha

Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>

Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Co-authored-by: nopothegamer <40329022+nopothegamer@users.noreply.github.com>
Co-authored-by: MisterCheezeCake <75341435+MisterCheezeCake@users.noreply.github.com>
Co-authored-by: Strebbypatty <82723062+Strebbypatty@users.noreply.github.com>
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>

1 files changed, 78 insertions, 2 deletions

diff --git a/constants/parents.json b/constants/parents.json
index 26af7538..9518500a 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -982,6 +982,12 @@
     "ROCK;1",
     "ROCK;0"
   ],
+  "ARMADILLO;4":[
+    "ARMADILLO;3",
+    "ARMADILLO;2",
+	"ARMADILLO;1",
+	"ARMADILLO;0"
+  ],
   "SILVERFISH;4":[
     "SILVERFISH;3",
     "SILVERFISH;2",
@@ -1982,8 +1988,9 @@
   ],
   "TITANIUM_DRILL_3":[
     "TITANIUM_DRILL_2",
-    "TITANIUM_DRILL_1",
-    "MITHRIL_DRILL_2",
+    "TITANIUM_DRILL_1"
+  ],
+  "MITHRIL_DRILL_2":[
     "MITHRIL_DRILL_1"
   ],
   "SIMPLE_CARROT_CANDY":[
@@ -2233,5 +2240,74 @@
   ],
   "PET_SKIN_JERRY_GREEN_ELF":[
     "PET_SKIN_JERRY_RED_ELF"
+  ],
+  "HARD_STONE_GENERATOR_1" : [
+    "HARD_STONE_GENERATOR_2",
+    "HARD_STONE_GENERATOR_3",
+    "HARD_STONE_GENERATOR_4",
+    "HARD_STONE_GENERATOR_5",
+    "HARD_STONE_GENERATOR_6",
+    "HARD_STONE_GENERATOR_7",
+    "HARD_STONE_GENERATOR_8",
+    "HARD_STONE_GENERATOR_9",
+    "HARD_STONE_GENERATOR_10",
+    "HARD_STONE_GENERATOR_11"
+  ],
+  "GEMSTONE_DRILL_3": [
+    "GEMSTONE_DRILL_2",
+    "GEMSTONE_DRILL_1"
+  ],
+  "PERFECT_RUBY_GEM": [
+    "FLAWLESS_RUBY_GEM",
+    "FINE_RUBY_GEM",
+    "FLAWED_RUBY_GEM",
+    "ROUGH_RUBY_GEM"
+  ],
+  "PERFECT_SAPPHIRE_GEM": [
+    "FLAWLESS_SAPPHIRE_GEM",
+    "FINE_SAPPHIRE_GEM",
+    "FLAWED_SAPPHIRE_GEM",
+    "ROUGH_SAPPHIRE_GEM"
+  ],
+  "PERFECT_JASPER_GEM": [
+    "FLAWLESS_JASPER_GEM",
+    "FINE_JASPER_GEM",
+    "FLAWED_JASPER_GEM",
+    "ROUGH_JASPER_GEM"
+  ],
+  "PERFECT_TOPAZ_GEM": [
+    "FLAWLESS_TOPAZ_GEM",
+    "FINE_TOPAZ_GEM",
+    "FLAWED_TOPAZ_GEM",
+    "ROUGH_TOPAZ_GEM"
+  ],
+  "PERFECT_AMBER_GEM": [
+    "FLAWLESS_AMBER_GEM",
+    "FINE_AMBER_GEM",
+    "FLAWED_AMBER_GEM",
+    "ROUGH_AMBER_GEM"
+  ],
+  "PERFECT_JADE_GEM": [
+    "FLAWLESS_JADE_GEM",
+    "FINE_JADE_GEM",
+    "FLAWED_JADE_GEM",
+    "ROUGH_JADE_GEM"
+  ],
+  "PERFECT_AMETHYST_GEM": [
+    "FLAWLESS_AMETHYST_GEM",
+    "FINE_AMETHYST_GEM",
+    "FLAWED_AMETHYST_GEM",
+    "ROUGH_AMETHYST_GEM"
+  ],
+  "CATACOMBS_PASS_10": [
+    "CATACOMBS_PASS_9",
+    "CATACOMBS_PASS_8",
+    "CATACOMBS_PASS_8",
+    "CATACOMBS_PASS_7",
+    "CATACOMBS_PASS_6",
+    "CATACOMBS_PASS_5",
+    "CATACOMBS_PASS_4",
+    "CATACOMBS_PASS_3"
   ]
 }
+