From c2a21eeee5c94e8633388341603673fe55f09431 Mon Sep 17 00:00:00 2001 From: jani270 Date: Thu, 22 Jun 2023 11:04:57 +0200 Subject: Fixed Guardian and Tara Pet --- constants/parents.json | 3 ++- constants/petnums.json | 26 ++++++++++++++++++++++++++ items/GUARDIAN;5.json | 22 +++++++++++++--------- items/TARANTULA;5.json | 4 ++-- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/constants/parents.json b/constants/parents.json index 3d4d4a50..3577da89 100644 --- a/constants/parents.json +++ b/constants/parents.json @@ -969,7 +969,8 @@ "OCELOT;1", "OCELOT;0" ], - "GUARDIAN;4": [ + "GUARDIAN;5": [ + "GUARDIAN;4", "GUARDIAN;3", "GUARDIAN;2", "GUARDIAN;1", diff --git a/constants/petnums.json b/constants/petnums.json index c37cd002..d611c275 100644 --- a/constants/petnums.json +++ b/constants/petnums.json @@ -1963,6 +1963,32 @@ "INTELLIGENCE": 100.0 } } + }, + "MYTHIC": { + "1": { + "otherNums": [ + 1.2, + 0.3, + 0.3, + 0.1 + ], + "statNums": { + "DEFENSE": 0.0, + "INTELLIGENCE": 1.0 + } + }, + "100": { + "otherNums": [ + 120, + 30, + 30, + 7.0 + ], + "statNums": { + "DEFENSE": 50.0, + "INTELLIGENCE": 100.0 + } + } } }, "GOLDEN_DRAGON": { diff --git a/items/GUARDIAN;5.json b/items/GUARDIAN;5.json index 0e23491b..6c512759 100644 --- a/items/GUARDIAN;5.json +++ b/items/GUARDIAN;5.json @@ -1,29 +1,29 @@ { "itemid": "minecraft:skull", - "displayname": "§f§f§7[Lvl 100] §dGuardian", - "nbttag": "{HideFlags:254,SkullOwner:{Id:\"26508276-c01a-32a9-9201-7dae1724954e\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjIxMDI1NDM0MDQ1YmRhNzAyNWIzZTUxNGIzMTZhNGI3NzBjNmZhYTRiYTlhZGI0YmUzODA5NTI2ZGI3N2Y5ZCJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Enchanting Pet\",1:\"\",2:\"§7Defense: §a+50\",3:\"§7Intelligence: §a+200\",4:\"\",5:\"§6Laserbeam\",6:\"§7§7Zaps your enemies for §b120x\",7:\"§b§7your §b✎ Intelligence §7every\",8:\"§7§a3s§7.\",9:\"\",10:\"§6Enchanting Wisdom Boost\",11:\"§7§7§7Grants §3+30☯ Enchanting\",12:\"§3Wisdom§7.\",13:\"\",14:\"§6Mana Pool\",15:\"§7§7Regenerate §b30% §7extra mana,\",16:\"§7doubled when near or in water.\",17:\"\",18:\"§6Lucky Seven\",19:\"§7§7Gain §b+7% §7chance to find\",20:\"§7§5ultra rare §7books in\",21:\"§7§dSuperpairs§7.\",22:\"\",23:\"§7§eRight-click to add this pet to\",24:\"§eyour pet menu!\",25:\"\",26:\"§d§lMYTHIC\"],Name:\"§f§f§7[Lvl 100] §dGuardian\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"GUARDIAN\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"MYTHIC\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0,\\\"uuid\\\":\\\"80bde392-2e4b-497c-8549-df7edd8939d3\\\",\\\"hideRightClick\\\":false}\",id:\"GUARDIAN;5\"}}", + "displayname": "§f§f§7[Lvl {LVL}] §dGuardian", + "nbttag": "{HideFlags:254,SkullOwner:{Id:\"26508276-c01a-32a9-9201-7dae1724954e\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjIxMDI1NDM0MDQ1YmRhNzAyNWIzZTUxNGIzMTZhNGI3NzBjNmZhYTRiYTlhZGI0YmUzODA5NTI2ZGI3N2Y5ZCJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Enchanting Pet\",1:\"\",2:\"§7Intelligence: §a{INTELLIGENCE}\",3:\"§7Defense: §a{DEFENSE}\",4:\"\",5:\"§6Laserbeam\",6:\"§7§7Zaps your enemies for §b{0}x\",7:\"§b§7your §b✎ Intelligence §7every\",8:\"§7§a3s§7.\",9:\"\",10:\"§6Enchanting Wisdom Boost\",11:\"§7§7§7Grants §3+{1}☯ Enchanting\",12:\"§3Wisdom§7.\",13:\"\",14:\"§6Mana Pool\",15:\"§7§7Regenerate §b{2}% §7extra mana,\",16:\"§7doubled when near or in water.\",17:\"\",18:\"§6Lucky Seven\",19:\"§7§7Gain §b+{3}% §7chance to find\",20:\"§7§5ultra rare §7books in\",21:\"§7§dSuperpairs§7.\",22:\"\",23:\"§7§eRight-click to add this pet to\",24:\"§eyour pet menu!\",25:\"\",26:\"§d§lMYTHIC\"],Name:\"§f§f§7[Lvl {LVL}] §dGuardian\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"GUARDIAN\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"MYTHIC\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0,\\\"uuid\\\":\\\"80bde392-2e4b-497c-8549-df7edd8939d3\\\",\\\"hideRightClick\\\":false}\",id:\"GUARDIAN;5\"}}", "damage": 3, "lore": [ "§8Enchanting Pet", "", - "§7Defense: §a+50", - "§7Intelligence: §a+200", + "§7Intelligence: §a{INTELLIGENCE}", + "§7Defense: §a{DEFENSE}", "", "§6Laserbeam", - "§7§7Zaps your enemies for §b120x", + "§7§7Zaps your enemies for §b{0}x", "§b§7your §b✎ Intelligence §7every", "§7§a3s§7.", "", "§6Enchanting Wisdom Boost", - "§7§7§7Grants §3+30☯ Enchanting", + "§7§7§7Grants §3+{1}☯ Enchanting", "§3Wisdom§7.", "", "§6Mana Pool", - "§7§7Regenerate §b30% §7extra mana,", + "§7§7Regenerate §b{2}% §7extra mana,", "§7doubled when near or in water.", "", "§6Lucky Seven", - "§7§7Gain §b+7% §7chance to find", + "§7§7Gain §b+{3}% §7chance to find", "§7§5ultra rare §7books in", "§7§dSuperpairs§7.", "", @@ -36,5 +36,9 @@ "crafttext": "", "clickcommand": "", "modver": "2.1.1-PRE", - "infoType": "" + "infoType": "WIKI_URL", + "info": [ + "https://hypixel-skyblock.fandom.com/wiki/Guardian_Pet", + "https://wiki.hypixel.net/Guardian_Pet" + ] } \ No newline at end of file diff --git a/items/TARANTULA;5.json b/items/TARANTULA;5.json index 175f47b3..d7b1d2f6 100644 --- a/items/TARANTULA;5.json +++ b/items/TARANTULA;5.json @@ -1,12 +1,12 @@ { "itemid": "minecraft:skull", "displayname": "§f§f§7[Lvl {LVL}] §dTarantula", - "nbttag": "{HideFlags:254,SkullOwner:{Id:\"3e5474d4-4365-3ea7-b4bc-b4edc54da341\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODMwMDk4NmVkMGEwNGVhNzk5MDRmNmFlNTNmNDllZDNhMGZmNWIxZGY2MmJiYTYyMmVjYmQzNzc3ZjE1NmRmOCJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c{STRENGH}\",3:\"§7Crit Chance: §c{CRIT_CHANCE}%\",4:\"§7Crit Damage: §c{CRIT_DAMAGE}%\",5:\"\",6:\"§6Webbed Cells\",7:\"§7§7Anti-healing is §a{0}% §7less\",8:\"§7effective against you.\",9:\"\",10:\"§6Eight Legs\",11:\"§7§7Decreases the mana cost of\",12:\"§7Spider, Tarantula and Spirit\",13:\"§7Boots by §a{1}%§7.\",14:\"\",15:\"§6Arachnid Slayer\",16:\"§7§7Gain §b{2}x §7Combat XP\",17:\"§7§7against §aSpiders§7.\",18:\"\",19:\"§6Web Battlefield\",20:\"§7§7Killing mobs grants §c+6❁\",21:\"§cStrength §7and §b+1✯ Magic Find\",22:\"§b§7for §a40s §7to all players\",23:\"§7staying within §a20 §7blocks\",24:\"§7§7of where they died. §8Stacks\",25:\"§8up to 10 times.\",26:\"\",27:\"§7§eRight-click to add this pet to\",28:\"§eyour pet menu!\",29:\"\",30:\"§d§lMYTHIC\"],Name:\"§f§f§7[Lvl {LVL}] §dTarantula\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"TARANTULA\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"MYTHIC\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0,\\\"uuid\\\":\\\"6b37a715-8c96-41d0-88a7-2b6523be44cb\\\",\\\"hideRightClick\\\":false}\",id:\"TARANTULA;5\"}}", + "nbttag": "{HideFlags:254,SkullOwner:{Id:\"3e5474d4-4365-3ea7-b4bc-b4edc54da341\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODMwMDk4NmVkMGEwNGVhNzk5MDRmNmFlNTNmNDllZDNhMGZmNWIxZGY2MmJiYTYyMmVjYmQzNzc3ZjE1NmRmOCJ9fX0\u003d\"}]}},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c{STRENGTH}\",3:\"§7Crit Chance: §c{CRIT_CHANCE}%\",4:\"§7Crit Damage: §c{CRIT_DAMAGE}%\",5:\"\",6:\"§6Webbed Cells\",7:\"§7§7Anti-healing is §a{0}% §7less\",8:\"§7effective against you.\",9:\"\",10:\"§6Eight Legs\",11:\"§7§7Decreases the mana cost of\",12:\"§7Spider, Tarantula and Spirit\",13:\"§7Boots by §a{1}%§7.\",14:\"\",15:\"§6Arachnid Slayer\",16:\"§7§7Gain §b{2}x §7Combat XP\",17:\"§7§7against §aSpiders§7.\",18:\"\",19:\"§6Web Battlefield\",20:\"§7§7Killing mobs grants §c+6❁\",21:\"§cStrength §7and §b+1✯ Magic Find\",22:\"§b§7for §a40s §7to all players\",23:\"§7staying within §a20 §7blocks\",24:\"§7§7of where they died. §8Stacks\",25:\"§8up to 10 times.\",26:\"\",27:\"§7§eRight-click to add this pet to\",28:\"§eyour pet menu!\",29:\"\",30:\"§d§lMYTHIC\"],Name:\"§f§f§7[Lvl {LVL}] §dTarantula\"},ExtraAttributes:{petInfo:\"{\\\"type\\\":\\\"TARANTULA\\\",\\\"active\\\":false,\\\"exp\\\":0,\\\"tier\\\":\\\"MYTHIC\\\",\\\"hideInfo\\\":false,\\\"candyUsed\\\":0,\\\"uuid\\\":\\\"6b37a715-8c96-41d0-88a7-2b6523be44cb\\\",\\\"hideRightClick\\\":false}\",id:\"TARANTULA;5\"}}", "damage": 3, "lore": [ "§8Combat Pet", "", - "§7Strength: §c{STRENGH}", + "§7Strength: §c{STRENGTH}", "§7Crit Chance: §c{CRIT_CHANCE}%", "§7Crit Damage: §c{CRIT_DAMAGE}%", "", -- cgit