From 57c13e388731f52ee8e6b6d3b75ea7d0dfcecf7e Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Wed, 14 Jul 2021 15:33:47 -0400 Subject: 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> --- constants/enchants.json | 8 +++ constants/parents.json | 80 +++++++++++++++++++++++- constants/petnums.json | 143 +++++++++++++++++++++++++++++++++++++++++++ constants/pets.json | 3 + constants/reforgestones.json | 32 ++++++++++ 5 files changed, 264 insertions(+), 2 deletions(-) (limited to 'constants') diff --git a/constants/enchants.json b/constants/enchants.json index 1be873e1..34d007d8 100644 --- a/constants/enchants.json +++ b/constants/enchants.json @@ -76,6 +76,7 @@ "experience", "fortune", "silk_touch", + "pristine", "smelting_touch", "telekinesis" ], @@ -84,6 +85,7 @@ "efficiency", "experience", "fortune", + "pristine", "silk_touch", "smelting_touch", "telekinesis" @@ -760,6 +762,12 @@ 40, 50 ], + "pristine": [ + 25, + 25, + 25, + 25 + ], "caster": [ 20, 25, 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" ] } + diff --git a/constants/petnums.json b/constants/petnums.json index 2638110b..3693f6e3 100644 --- a/constants/petnums.json +++ b/constants/petnums.json @@ -1,4 +1,147 @@ { + "GOLDEN_DRAGON": { + "LEGENDARY": { + "1": { + "otherNums": [ + + ], + "statNums": { + + } + }, + "100": { + "otherNums": [ + + ], + "statNums": { + + } + }, + "interp": "1:100" + } +}, + "BAL": { + "COMMON": { + "1": { + "otherNums": [ + + ], + "statNums": { + "FEROCITY": 0.0, + "STRENGTH": 0.0 + } + }, + "100": { + "otherNums": [ + + ], + "statNums": { + "FEROCITY": 10.0, + "STRENGTH": 25.0 + } + }, + "interp": "1:100" + } +}, + "ARMADILLO": { + "COMMON": { + "1": { + "otherNums": [ + + ], + "statNums": { + "DEFENSE": 2.0 + } + }, + "100": { + "otherNums": [ + + ], + "statNums": { + "DEFENSE": 200 + } + }, + "interp": "1:100" + }, + "UNCOMMON": { + "1": { + "otherNums": [ + + ], + "statNums": { + "DEFENSE": 2.0 + } + }, + "100": { + "otherNums": [ + + ], + "statNums": { + "DEFENSE": 200 + } + }, + "interp": "1:100" + }, + "RARE": { + "1": { + "otherNums": [ + 57.9 + ], + "statNums": { + "DEFENSE": 2.0 + } + }, + "100": { + "otherNums": [ + 30.0 + ], + "statNums": { + "DEFENSE": 200 + } + }, + "interp": "1:100" + }, + "EPIC": { + "1": { + "otherNums": [ + 57.9 + ], + "statNums": { + "DEFENSE": 2.0 + } + }, + "100": { + "otherNums": [ + 30.0 + ], + "statNums": { + "DEFENSE": 200 + } + }, + "interp": "1:100" + }, + "LEGENDARY": { + "1": { + "otherNums": [ + 57.9, + 99.5 + ], + "statNums": { + "DEFENSE": 2.0 + } + }, + "100": { + "otherNums": [ + 30.0, + 50 + ], + "statNums": { + "DEFENSE": 200 + } + }, + "interp": "1:100" + } + }, "BABY_YETI": { "EPIC": { "1": { diff --git a/constants/pets.json b/constants/pets.json index 5b7b5275..f853b8e2 100644 --- a/constants/pets.json +++ b/constants/pets.json @@ -180,6 +180,9 @@ "WOLF":"COMBAT", "GUARDIAN":"ENCHANTING", "GRANDMA_WOLF":"COMBAT", + "ARMADILLO":"MINING", + "BAL":"COMBAT", + "GOLDEN_DRAGON":"COMBAT", "RAT":"COMBAT" } } \ No newline at end of file diff --git a/constants/reforgestones.json b/constants/reforgestones.json index dbe2a475..5c199700 100644 --- a/constants/reforgestones.json +++ b/constants/reforgestones.json @@ -822,6 +822,38 @@ } } }, + "HOT_STUFF":{ + "internalName":"HOT_STUFF", + "reforgeName":"Heated", + "reforgeType":"blacksmith/reforge_stone", + "itemTypes":"PICKAXE", + "requiredRarities":[ + "COMMON", + "UNCOMMON", + "RARE", + "EPIC", + "LEGENDARY" + ], + "reforgeCosts":{ + "COMMON":20000, + "UNCOMMON":40000, + "RARE":80000, + "EPIC":150000, + "LEGENDARY":300000 + }, + "reforgeStats":{ + "COMMON":{ + "mining_speed":1 + } + }, + "reforgeAbility":{ + "COMMON":"§7Grants §aincreased §6⸕ Mining §6Speed §7the deeper the you §7venture.", + "UNCOMMON":"§7Grants §aincreased §6⸕ Mining §6Speed §7the deeper the you §7venture.", + "RARE":"§7Grants §aincreased §6⸕ Mining §6Speed §7the deeper the you §7venture.", + "EPIC":"§7Grants §aincreased §6⸕ Mining §6Speed §7the deeper the you §7venture.", + "LEGENDARY":"§7Grants §aincreased §6⸕ Mining §6Speed §7the deeper the you §7venture." + } + }, "JERRY_STONE":{ "internalName":"JERRY_STONE", "reforgeName":"Jerry's", -- cgit