Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions constants/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2466,10 +2466,12 @@
],
"PESTHUNTER_BADGE": [
"PESTHUNTER_RING",
"PESTHUNTER_ARTIFACT"
"PESTHUNTER_ARTIFACT",
"PESTHUNTER_RELIC"
],
"PESTHUNTER_RING": [
"PESTHUNTER_ARTIFACT"
"PESTHUNTER_ARTIFACT",
"PESTHUNTER_RELIC"
],
"NIBBLE_CHOCOLATE_STICK": [
"SMOOTH_CHOCOLATE_BAR",
Expand Down Expand Up @@ -3045,6 +3047,13 @@
],
"TARNATULA_TALISMAN": [
"TARNATULA_RING"
],
"ANGUISH_TALISMAN": [
"ANGUISH_RING",
"ANGUISH_ARTIFACT"
],
"ANGUISH_RING": [
"ANGUISH_ARTIFACT"
]
},
"ignored_talisman": [
Expand Down
10 changes: 8 additions & 2 deletions constants/parents.json
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,8 @@
"ENDERMAN;1",
"ENDERMAN;0"
],
"GRIFFIN;4": [
"GRIFFIN;5": [
"GRIFFIN;4",
"GRIFFIN;3",
"GRIFFIN;2",
"GRIFFIN;1",
Expand Down Expand Up @@ -3384,7 +3385,8 @@
"INFINI_VACUUM",
"INFINI_VACUUM_HOOVERIUS"
],
"PESTHUNTER_ARTIFACT": [
"PESTHUNTER_RELIC": [
"PESTHUNTER_ARTIFACT",
"PESTHUNTER_RING",
"PESTHUNTER_BADGE"
],
Expand Down Expand Up @@ -4018,5 +4020,9 @@
"PET_SKIN_SHEEP_BLUE",
"PET_SKIN_SHEEP_GRAY",
"PET_SKIN_SHEEP_YELLOW"
],
"ANGUISH_ARTIFACT": [
"ANGUISH_RING",
"ANGUISH_TALISMAN"
]
}
96 changes: 58 additions & 38 deletions constants/petnums.json
Original file line number Diff line number Diff line change
Expand Up @@ -6326,19 +6326,17 @@
"statNums": {
"CRIT_CHANCE": 0.1,
"CRIT_DAMAGE": 0.5,
"STRENGTH": 0.25,
"MAGIC_FIND": 0.1,
"INTELLIGENCE": 0.1
"STRENGTH": 0.5,
"BONUS_ATTACK_SPEED": 0.25
}
},
"100": {
"otherNums": [],
"statNums": {
"CRIT_CHANCE": 10,
"CRIT_DAMAGE": 50,
"STRENGTH": 25,
"MAGIC_FIND": 10,
"INTELLIGENCE": 10
"STRENGTH": 50,
"BONUS_ATTACK_SPEED": 25
}
}
},
Expand All @@ -6348,95 +6346,117 @@
"statNums": {
"CRIT_CHANCE": 0.1,
"CRIT_DAMAGE": 0.5,
"STRENGTH": 0.25,
"MAGIC_FIND": 0.1,
"INTELLIGENCE": 0.1
"STRENGTH": 0.5,
"BONUS_ATTACK_SPEED": 0.25
}
},
"100": {
"otherNums": [],
"statNums": {
"CRIT_CHANCE": 10,
"CRIT_DAMAGE": 50,
"STRENGTH": 25,
"MAGIC_FIND": 10,
"INTELLIGENCE": 10
"STRENGTH": 50,
"BONUS_ATTACK_SPEED": 25
}
}
},
"RARE": {
"1": {
"otherNums": [],
"otherNums": [
0.1
],
"statNums": {
"CRIT_CHANCE": 0.1,
"CRIT_DAMAGE": 0.5,
"STRENGTH": 0.25,
"MAGIC_FIND": 0.1,
"INTELLIGENCE": 0.1
"STRENGTH": 0.5,
"BONUS_ATTACK_SPEED": 0.25
}
},
"100": {
"otherNums": [],
"otherNums": [
10
],
"statNums": {
"CRIT_CHANCE": 10,
"CRIT_DAMAGE": 50,
"STRENGTH": 25,
"MAGIC_FIND": 10,
"INTELLIGENCE": 10
"STRENGTH": 50,
"BONUS_ATTACK_SPEED": 25
}
}
},
"EPIC": {
"1": {
"otherNums": [
0
0.15
],
"statNums": {
"CRIT_CHANCE": 0.1,
"CRIT_DAMAGE": 0.5,
"STRENGTH": 0.25,
"MAGIC_FIND": 0.1,
"INTELLIGENCE": 0.1
"STRENGTH": 0.5,
"BONUS_ATTACK_SPEED": 0.25
}
},
"100": {
"otherNums": [
16
15
],
"statNums": {
"CRIT_CHANCE": 10,
"CRIT_DAMAGE": 50,
"STRENGTH": 25,
"MAGIC_FIND": 10,
"INTELLIGENCE": 10
"STRENGTH": 50,
"BONUS_ATTACK_SPEED": 25
}
}
},
"LEGENDARY": {
"1": {
"otherNums": [
0,
1.1
0.15,
0.2
],
"statNums": {
"CRIT_CHANCE": 0.1,
"CRIT_DAMAGE": 0.5,
"STRENGTH": 0.25,
"MAGIC_FIND": 0.1,
"INTELLIGENCE": 0.1
"STRENGTH": 0.5,
"BONUS_ATTACK_SPEED": 0.25
}
},
"100": {
"otherNums": [
20,
15
15,
20
],
"statNums": {
"CRIT_CHANCE": 10,
"CRIT_DAMAGE": 50,
"STRENGTH": 50,
"BONUS_ATTACK_SPEED": 25
}
}
},
"MYTHIC": {
"1": {
"otherNums": [
0.15,
0.2
],
"statNums": {
"CRIT_CHANCE": 0.1,
"CRIT_DAMAGE": 0.5,
"STRENGTH": 0.5,
"BONUS_ATTACK_SPEED": 0.25
}
},
"100": {
"otherNums": [
15,
20
],
"statNums": {
"CRIT_CHANCE": 10,
"CRIT_DAMAGE": 50,
"STRENGTH": 25,
"MAGIC_FIND": 10,
"INTELLIGENCE": 10
"STRENGTH": 50,
"BONUS_ATTACK_SPEED": 25
}
}
}
Expand Down
39 changes: 39 additions & 0 deletions constants/reforgestones.json
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,45 @@
}
}
},
"DAEDALUS_NOTES": {
"internalName": "DAEDALUS_NOTES",
"reforgeName": "Erudite",
"reforgeType": "blacksmith/reforge_stone",
"itemTypes": {
"internalName": [
"DEIFIC_SPADE",
"ARCHAIC_SPADE",
"ANCESTRAL_SPADE"
]
},
"requiredRarities": [
"RARE",
"EPIC",
"LEGENDARY",
"MYTHIC"
],
"reforgeCosts": {
"RARE": 500000,
"EPIC": 1000000,
"LEGENDARY": 2000000,
"MYTHIC": 2000000
},
"reforgeAbility": "§eGriffin Burrow §7chains always consist of §a2 §7additional burrows.",
"reforgeStats": {
"RARE": {
"speed": 8
},
"EPIC": {
"speed": 11
},
"LEGENDARY": {
"speed": 15
},
"MYTHIC": {
"speed": 20
}
}
},
"DEEP_SEA_ORB": {
"internalName": "DEEP_SEA_ORB",
"reforgeName": "Submerged",
Expand Down
19 changes: 19 additions & 0 deletions items/CHILL_THE_FISH.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"itemid": "minecraft:cooked_fish",
"displayname": "§cChill the Fish",
"nbttag": "{ExtraAttributes:{id:\"CHILL_THE_FISH\",originTag:\"UNKNOWN\"},HideFlags:254,ItemModel:\"minecraft:cooked_cod\",display:{Lore:[0:\"§7This fish was found frozen solid in\",1:\"§7the lake of the Main Lobby during\",2:\"§7the Holiday months.\",3:\"\",4:\"§c§lSPECIAL\"],Name:\"§cChill the Fish\"},ench:[]}",
"damage": 0,
"lore": [
"§7This fish was found frozen solid in",
"§7the lake of the Main Lobby during",
"§7the Holiday months.",
"",
"§c§lSPECIAL"
],
"internalname": "CHILL_THE_FISH",
"clickcommand": "",
"crafttext": "",
"modver": "Firmament 3.7.1-dev+mc1.21.5+gf7e1a13",
"infoType": "",
"info": []
}
20 changes: 20 additions & 0 deletions items/DYE_MYTHOLOGICAL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"itemid": "minecraft:skull",
"displayname": "§2Mythological Dye",
"nbttag": "{ExtraAttributes:{id:\"DYE_MYTHOLOGICAL\"},HideFlags:254,ItemModel:\"minecraft:player_head\",SkullOwner:{Id:\"37c76cef-87ef-3106-aea0-f73d066c2e7e\",Properties:{textures:[0:{Name:\"textures\",Signature:\"HbPlqQOo/tyXifkzasDgxO+Fvtv8u8sDhFd+T/BqFs2WqbwF17Si9dQ5ePv6GNM0ZnqIbbC/QBMm8xMWqr3taoU8lkNLzwcX6nFEfYMQNJRvcAP0Fqrz03PQFYzNh0wjZbX+FeYvvLcU7st6yVgOq2ktRei0FyZzR+IUtZ8AOxo40IWE508UzjOVj52caV0GH2W3ozfV54azWMXmkidLhKwZAkhWS90F9fIKdvlu0kphmHhrylK5J+H5J+0z0iMGaozpEfHH0jmt2Q2jYpULL3KXIQJsO21BKxBMCOdoGT+ss51mIXEMu+huyqUQbKAwglSW58yvt8CExInZ8wgvcuHIGf+NpNTi1gVvvQEFOd36SBguNzquwZk8farv1DhxGqoriiNhw0kNsxfvYa4V0bbuFKydXu8V+hjHfEky/mbL5eWYEWcZGoVvVkqpj354gevauiLSGSPNqKAukGirHokM5UtQRQw+ZzoZPXK+tcOy71+cvKcypRlkFzPxN4LF4VLsTgAPqZXXq5arx6bmH4qmQS2W2dhp/QvKKL9PDXJsJiW/J0sISERhbNjMiX3F81EQ/FwwK7MnwkBjUyKuZjFwQDw/IdMqN26ajzOb/5M6UQ0FtZxpPp693VMvodh6iXDCrHXBXJwDRWJrLT1Ak0vh1QjHAXatkW9EUu135iY=\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTc1MjUyMjI2MjIzOSwKICAicHJvZmlsZUlkIiA6ICI2M2VkZjY1ZDcxNmE0NGZmYmUzOWU5MWVkMmNiMjM3YyIsCiAgInByb2ZpbGVOYW1lIiA6ICJ2aWxlX3NsYXZlbWFzdGVyIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzRjNTQyNDcyZWVlMWNkZWU3OGE3YTE3ZmQ2ZWU4MDZhMTQ2OTU5Yzk3MTc3NTg3YjZlMjAwNWU4NzRhOWY3MWUiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==\"}]},hypixelPopulated:1B},display:{Lore:[0:\"§8Combinable in Anvil\",1:\"\",2:\"§7Changes the color of an armor piece\",3:\"§7to §r#6F6F0C§7!\",4:\"\",5:\"§6§lLEGENDARY DYE\"],Name:\"§2Mythological Dye\"}}",
"damage": 3,
"lore": [
"§8Combinable in Anvil",
"",
"§7Changes the color of an armor piece",
"§7to §r#6F6F0C§7!",
"",
"§6§lLEGENDARY DYE"
],
"internalname": "DYE_MYTHOLOGICAL",
"clickcommand": "",
"crafttext": "",
"modver": "Firmament 3.7.1-dev+mc1.21.5+gf7e1a13",
"infoType": "",
"info": []
}
18 changes: 9 additions & 9 deletions items/GRIFFIN;0.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"itemid": "minecraft:skull",
"displayname": "§7[Lvl {LVL}] §fGriffin",
"nbttag": "{ExtraAttributes:{id:\"GRIFFIN;0\",petInfo:\"{\\\"type\\\":\\\"GRIFFIN\\\",\\\"tier\\\":\\\"COMMON\\\",\\\"exp\\\":0.0,\\\"candyUsed\\\":0}\"},HideFlags:254,ItemModel:\"minecraft:player_head\",SkullOwner:{Id:\"fa96ef2a-f697-3c9c-9a83-1d09dc9ad20e\",Properties:{textures:[0:{Name:\"textures\",Signature:\"ZUYe3INMx4AW4QsduE/5TRxLJ3A0W9xHEPLXVGmFzQb5IHHdI00LIMUj5daqb9mG0WdMjwlw4CXee9hLjAOTcWSUcl7eC136rmiSjEWQGBhbKaxwwWhCJR0CdE1mjqD0KHvRed4efUfVYtoYf9sc0DOSyuOtD5Pu9f1Aklezh2Y6drbVxIwl7UR69fW3qu9s+VbvqbkrpwUZDqeNZ2hp64oPS4an/cScyjUPz4EQqYUP/Mi/Cf8W2x1J27UMdHfJ3iwyb4UJejfisWZrY5freGdv9Yhp3nneBW1NG1//aj0dUOxEr+H81WWClvomSTUIZuiWITC/2VhMUdocgxYncftL9U5XpgXp89JGCsb67ljxoHVUUVrie3McE7slbhn5JlGL1tTHzeeQYrvYAHmbTSTsC+jk+tloKpJlcRhIQlI4U2UYez1i7JIf5+U/DZ+qa7z68zk0no8tvoKHG7asTMrfk4oZ2Ptc7RM+LvJ3VEItpVpihHjMLBlCqZDCDgz/YspsodnfatFIXzQkaKz6ZfVvamglNlnMKXr68WLuX6U85RMzrhU/391H5YmUfkYhTCKhaKL01v+e/5HybE7M4ZpemIicbu3eTaY5NVZWRSstenizVnVIZCsC4jm1vXrm92CUABfLuHMcYWTEHjPBXfMfxov/X5ySh7ezAXL0Uhk=\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTU5OTgxMDM3NTkzMywKICAicHJvZmlsZUlkIiA6ICI5YzQ5YjU0YjFjZjU0NjZjYjRhNzA4M2JmZGQ4MDIxNSIsCiAgInByb2ZpbGVOYW1lIiA6ICI5U0kiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGMyN2UzY2I1MmE2NDk2OGU2MGM4NjFlZjFhYjg0ZTBhMGNiNWYwN2JlMTAzYWM3OGRhNjc3NjE3MzFmMDBjOCIKICAgIH0KICB9Cn0=\"}]},hypixelPopulated:1B},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c+{STRENGTH}\",3:\"§7Crit Chance: §9{CRIT_CHANCE}%\",4:\"§7Crit Damage: §9{CRIT_DAMAGE}%\",5:\"§7Intelligence: §b{INTELLIGENCE}\",6:\"§7Magic Find: §b{MAGIC_FIND}\",7:\"\",8:\"§6Odyssey\",9:\"§2Mythological Creatures §7you find and\",10:\"§7burrows you dig scale in §cdifficulty\",11:\"§7and §6rewards §7based on your\",12:\"§7equipped Griffin's rarity.\",13:\"\",14:\"§eRight-click to add this pet to your\",15:\"§epet menu!\",16:\"\",17:\"§f§lCOMMON\"],Name:\"§7[Lvl {LVL}] §fGriffin\"}}",
"nbttag": "{ExtraAttributes:{id:\"GRIFFIN;0\",petInfo:\"{\\\"type\\\":\\\"GRIFFIN\\\",\\\"tier\\\":\\\"COMMON\\\",\\\"exp\\\":0.0,\\\"candyUsed\\\":0}\"},HideFlags:254,ItemModel:\"minecraft:player_head\",SkullOwner:{Id:\"fa96ef2a-f697-3c9c-9a83-1d09dc9ad20e\",Properties:{textures:[0:{Name:\"textures\",Signature:\"ZUYe3INMx4AW4QsduE/5TRxLJ3A0W9xHEPLXVGmFzQb5IHHdI00LIMUj5daqb9mG0WdMjwlw4CXee9hLjAOTcWSUcl7eC136rmiSjEWQGBhbKaxwwWhCJR0CdE1mjqD0KHvRed4efUfVYtoYf9sc0DOSyuOtD5Pu9f1Aklezh2Y6drbVxIwl7UR69fW3qu9s+VbvqbkrpwUZDqeNZ2hp64oPS4an/cScyjUPz4EQqYUP/Mi/Cf8W2x1J27UMdHfJ3iwyb4UJejfisWZrY5freGdv9Yhp3nneBW1NG1//aj0dUOxEr+H81WWClvomSTUIZuiWITC/2VhMUdocgxYncftL9U5XpgXp89JGCsb67ljxoHVUUVrie3McE7slbhn5JlGL1tTHzeeQYrvYAHmbTSTsC+jk+tloKpJlcRhIQlI4U2UYez1i7JIf5+U/DZ+qa7z68zk0no8tvoKHG7asTMrfk4oZ2Ptc7RM+LvJ3VEItpVpihHjMLBlCqZDCDgz/YspsodnfatFIXzQkaKz6ZfVvamglNlnMKXr68WLuX6U85RMzrhU/391H5YmUfkYhTCKhaKL01v+e/5HybE7M4ZpemIicbu3eTaY5NVZWRSstenizVnVIZCsC4jm1vXrm92CUABfLuHMcYWTEHjPBXfMfxov/X5ySh7ezAXL0Uhk=\",Value:\"ewogICJ0aW1lc3RhbXAiIDogMTU5OTgxMDM3NTkzMywKICAicHJvZmlsZUlkIiA6ICI5YzQ5YjU0YjFjZjU0NjZjYjRhNzA4M2JmZGQ4MDIxNSIsCiAgInByb2ZpbGVOYW1lIiA6ICI5U0kiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGMyN2UzY2I1MmE2NDk2OGU2MGM4NjFlZjFhYjg0ZTBhMGNiNWYwN2JlMTAzYWM3OGRhNjc3NjE3MzFmMDBjOCIKICAgIH0KICB9Cn0=\"}]},hypixelPopulated:1B},display:{Lore:[0:\"§8Combat Pet\",1:\"\",2:\"§7Strength: §c{STRENGTH}\",3:\"§7Crit Chance: §9{CRIT_CHANCE}%\",4:\"§7Crit Damage: §9{CRIT_DAMAGE}%\",5:\"§7Bonus Attack Speed: §e{BONUS_ATTACK_SPEED}%\",6:\"\",7:\"§6Odyssey\",8:\"§c2 §7types of §2✿ Mythological §7mobs can\",9:\"§7spawn from §eGriffin Burrows§7. Their\",10:\"§7stats scale with your Griffin’s\",11:\"§7rarity.\",12:\"\",13:\"§eRight-click to add this pet to your\",14:\"§epet menu!\",15:\"\",16:\"§8Can be upgraded at Kat in The Hub!\",17:\"§f§lCOMMON\"],Name:\"§7[Lvl {LVL}] §fGriffin\"}}",
"damage": 3,
"lore": [
"§8Combat Pet",
"",
"§7Strength: §c+{STRENGTH}",
"§7Strength: §c{STRENGTH}",
"§7Crit Chance: §9{CRIT_CHANCE}%",
"§7Crit Damage: §9{CRIT_DAMAGE}%",
"§7Intelligence: §b{INTELLIGENCE}",
"§7Magic Find: §b{MAGIC_FIND}",
"§7Bonus Attack Speed: §e{BONUS_ATTACK_SPEED}%",
"",
"§6Odyssey",
2Mythological Creatures §7you find and",
7burrows you dig scale in §cdifficulty",
7and §6rewards §7based on your",
7equipped Griffin's rarity.",
c2 §7types of §2✿ Mythological §7mobs can",
7spawn from §eGriffin Burrows§7. Their",
7stats scale with your Griffin’s",
7rarity.",
"",
"§eRight-click to add this pet to your",
"§epet menu!",
"",
"§8Can be upgraded at Kat in The Hub!",
"§f§lCOMMON"
],
"internalname": "GRIFFIN;0",
"clickcommand": "",
"crafttext": "",
"modver": "Firmament 3.4.0-dev+mc1.21.5+g4cd6602",
"modver": "Firmament 3.7.1-dev+mc1.21.5+gf7e1a13",
"infoType": "WIKI_URL",
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Griffin_Pet",
Expand Down
Loading
Loading