aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjani270 <69345714+jani270@users.noreply.github.com>2024-07-21 14:37:41 +0200
committerGitHub <noreply@github.com>2024-07-21 12:37:41 +0000
commit8c016218931ed66cba82ffb748b3e156636d8121 (patch)
treef0313380ac1009a4ab0474b1194fc2bb878f241d
parent9622e8da7d5f20191a06f0e8e8fc15de105bf61d (diff)
downloadNotEnoughUpdates-REPO-8c016218931ed66cba82ffb748b3e156636d8121.tar.gz
NotEnoughUpdates-REPO-8c016218931ed66cba82ffb748b3e156636d8121.tar.bz2
NotEnoughUpdates-REPO-8c016218931ed66cba82ffb748b3e156636d8121.zip
feat: Carnival NPC's / Doug / Mask Enchant Data (#1298)
* feat: Carnival NPC's / Doug / Mask Enchant Data * fix: Chantelle NPC not having the Event lore
-rw-r--r--constants/enchants.json27
-rw-r--r--constants/islands.json7
-rw-r--r--constants/parents.json2
-rw-r--r--items/CARNIVAL_COWBOY_NPC.json19
-rw-r--r--items/CARNIVAL_FISHERMAN_NPC.json19
-rw-r--r--items/CARNIVAL_LEADER_NPC.json19
-rw-r--r--items/CARNIVAL_PIRATEMAN_NPC.json19
-rw-r--r--items/CHANTELLE_NPC.json19
-rw-r--r--items/DOUG_NPC.json70
-rw-r--r--items/SKYBLOCK_CARNIVAL_POINT.json19
10 files changed, 219 insertions, 1 deletions
diff --git a/constants/enchants.json b/constants/enchants.json
index 2bb1fff1..6bdcb31f 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -426,6 +426,33 @@
"cayenne",
"prosperity",
"green_thumb"
+ ],
+ "CARNIVAL MASK": [
+ "protection",
+ "blast_protection",
+ "fire_protection",
+ "projectile_protection",
+ "growth",
+ "rejuvenate",
+ "respite",
+ "thorns",
+ "counter_strike",
+ "true_protection",
+ "ultimate_bank",
+ "ultimate_last_stand",
+ "ultimate_legion",
+ "ultimate_no_pain_no_gain",
+ "ultimate_wisdom",
+ "hardened_mana",
+ "strong_mana",
+ "mana_vampire",
+ "ferocious_mana",
+ "ultimate_habanero_tactics",
+ "ultimate_bobbin_time",
+ "reflection",
+ "pesterminator",
+ "ultimate_refrigerate",
+ "ice_cold"
]
},
"enchant_pools": [
diff --git a/constants/islands.json b/constants/islands.json
index 402ab219..54763b66 100644
--- a/constants/islands.json
+++ b/constants/islands.json
@@ -428,6 +428,13 @@
"x": -53,
"y": 72,
"z": -53
+ },
+ {
+ "warp": "carnival",
+ "mode": "hub",
+ "x": -87,
+ "y": 71,
+ "z": -32
}
]
}
diff --git a/constants/parents.json b/constants/parents.json
index a2f5fb10..6ec6b021 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -3761,7 +3761,7 @@
"RELIC_OF_COINS": [
"ARTIFACT_OF_COINS",
"RING_OF_COINS",
- "COIN_TAILSMAN"
+ "COIN_TALISMAN"
],
"EMERALD_ARTIFACT": [
"EMERALD_RING"
diff --git a/items/CARNIVAL_COWBOY_NPC.json b/items/CARNIVAL_COWBOY_NPC.json
new file mode 100644
index 00000000..05188b1d
--- /dev/null
+++ b/items/CARNIVAL_COWBOY_NPC.json
@@ -0,0 +1,19 @@
+{
+ "itemid": "minecraft:skull",
+ "displayname": "§9Carnival Cowboy (NPC)",
+ "nbttag": "{HideFlags:254,SkullOwner:{Id:\"405b6046-4a47-2527-8c29-c578e082a3ee\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y1NjIxOTZlYjcyNDVlMzM0ZjNiNzg4MzE1ZTgwZTgxYjI0ZDI4OTg4NDFiYjBhYzRmOTRjYWMxOTQ2YjExNzkifX19\"}]},Name:\"405b6046-4a47-2527-8c29-c578e082a3ee\"},display:{Lore:[0:\"§7Only appears during §eThe Carnival Event \",1:\"§7when §dFoxy §7is Mayor.\"],Name:\"§9Carnival Cowboy (NPC)\"},ExtraAttributes:{id:\"CARNIVAL_COWBOY_NPC\"}}",
+ "damage": 3,
+ "lore": [
+ "§7Only appears during §eThe Carnival Event ",
+ "§7when §dFoxy §7is Mayor."
+ ],
+ "internalname": "CARNIVAL_COWBOY_NPC",
+ "clickcommand": "",
+ "modver": "",
+ "x": -103,
+ "y": 71,
+ "z": 9,
+ "island": "hub",
+ "crafttext": "",
+ "infoType": ""
+} \ No newline at end of file
diff --git a/items/CARNIVAL_FISHERMAN_NPC.json b/items/CARNIVAL_FISHERMAN_NPC.json
new file mode 100644
index 00000000..cf5f7ea9
--- /dev/null
+++ b/items/CARNIVAL_FISHERMAN_NPC.json
@@ -0,0 +1,19 @@
+{
+ "itemid": "minecraft:skull",
+ "displayname": "§9Carnival Fisherman (NPC)",
+ "nbttag": "{HideFlags:254,SkullOwner:{Id:\"b8e6293a-281f-20dc-b4a4-45bbb16aca76\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzEwZDI3YmQ5NjRkOTA0YTRhZDBiOGE5YjJhNjI3NjExZDM3ZmVjYTZlNGMyNTI3ZTEwNTYzODIxMDM3YzdhNmYifX19\"}]},Name:\"b8e6293a-281f-20dc-b4a4-45bbb16aca76\"},display:{Lore:[0:\"§7Only appears during §eThe Carnival Event \",1:\"§7when §dFoxy §7is Mayor.\"],Name:\"§9Carnival Fisherman (NPC)\"},ExtraAttributes:{id:\"CARNIVAL_FISHERMAN_NPC\"}}",
+ "damage": 3,
+ "lore": [
+ "§7Only appears during §eThe Carnival Event ",
+ "§7when §dFoxy §7is Mayor."
+ ],
+ "internalname": "CARNIVAL_FISHERMAN_NPC",
+ "clickcommand": "",
+ "modver": "",
+ "x": -81,
+ "y": 73,
+ "z": 0,
+ "island": "hub",
+ "crafttext": "",
+ "infoType": ""
+} \ No newline at end of file
diff --git a/items/CARNIVAL_LEADER_NPC.json b/items/CARNIVAL_LEADER_NPC.json
new file mode 100644
index 00000000..7b9b360b
--- /dev/null
+++ b/items/CARNIVAL_LEADER_NPC.json
@@ -0,0 +1,19 @@
+{
+ "itemid": "minecraft:skull",
+ "displayname": "§9Carnival Leader (NPC)",
+ "nbttag": "{HideFlags:254,SkullOwner:{Id:\"0b3be67e-c5df-2d47-8896-0196bad3a1ce\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2JjYTU2MTIwZTkwOTZiNjkxMDJlN2E2YzYyMDFiMjAzNjU3NDcyZGQ0Nzc4MWYyZTdmMGM5MTQ1MWVkZjQwYzEifX19\"}]},Name:\"0b3be67e-c5df-2d47-8896-0196bad3a1ce\"},display:{Lore:[0:\"§7Only appears during §eThe Carnival Event \",1:\"§7when §dFoxy §7is Mayor.\"],Name:\"§9Carnival Leader (NPC)\"},ExtraAttributes:{id:\"CARNIVAL_LEADER_NPC\"}}",
+ "damage": 3,
+ "lore": [
+ "§7Only appears during §eThe Carnival Event ",
+ "§7when §dFoxy §7is Mayor."
+ ],
+ "internalname": "CARNIVAL_LEADER_NPC",
+ "clickcommand": "",
+ "modver": "",
+ "x": -89,
+ "y": 72,
+ "z": -18,
+ "island": "hub",
+ "crafttext": "",
+ "infoType": ""
+} \ No newline at end of file
diff --git a/items/CARNIVAL_PIRATEMAN_NPC.json b/items/CARNIVAL_PIRATEMAN_NPC.json
new file mode 100644
index 00000000..7229be8e
--- /dev/null
+++ b/items/CARNIVAL_PIRATEMAN_NPC.json
@@ -0,0 +1,19 @@
+{
+ "itemid": "minecraft:skull",
+ "displayname": "§9Carnival Pirateman (NPC)",
+ "nbttag": "{HideFlags:254,SkullOwner:{Id:\"330d461e-2f5d-26f6-bc73-ffc837a502ab\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y1YmU2Zjk5MjQyYzI2ZWFmYWJjMDg2MGI1NzRlZjU0NDQ5MTZlZWUyM2RkZGZmMjIyODg1MDkzNWNkODBhMDMifX19\"}]},Name:\"330d461e-2f5d-26f6-bc73-ffc837a502ab\"},display:{Lore:[0:\"§7Only appears during §eThe Carnival Event \",1:\"§7when §dFoxy §7is Mayor.\"],Name:\"§9Carnival Pirateman (NPC)\"},ExtraAttributes:{id:\"CARNIVAL_PIRATEMAN_NPC\"}}",
+ "damage": 3,
+ "lore": [
+ "§7Only appears during §eThe Carnival Event ",
+ "§7when §dFoxy §7is Mayor."
+ ],
+ "internalname": "CARNIVAL_PIRATEMAN_NPC",
+ "clickcommand": "",
+ "modver": "",
+ "x": -107,
+ "y": 74,
+ "z": -2,
+ "island": "hub",
+ "crafttext": "",
+ "infoType": ""
+} \ No newline at end of file
diff --git a/items/CHANTELLE_NPC.json b/items/CHANTELLE_NPC.json
new file mode 100644
index 00000000..533c6740
--- /dev/null
+++ b/items/CHANTELLE_NPC.json
@@ -0,0 +1,19 @@
+{
+ "itemid": "minecraft:skull",
+ "displayname": "§9Chantelle (NPC)",
+ "nbttag": "{HideFlags:254,SkullOwner:{Id:\"fc1417fa-b1b9-2d42-b4bb-eda71ab3ba81\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2NjM2U0MjIzZDhkOGM3YTBlY2EzMjkzOGI4MDdiNTdiMTgwOGEyZTA2YWExNzM0MjVmOWUzZDg4MzhhYWQ4YzQifX19\"}]},Name:\"fc1417fa-b1b9-2d42-b4bb-eda71ab3ba81\"},display:{Lore:[0:\"§7Only appears during §eThe Carnival Event \",1:\"§7when §dFoxy §7is Mayor.\"],Name:\"§9Chantelle (NPC)\"},ExtraAttributes:{id:\"CHANTELLE_NPC\"}}",
+ "damage": 3,
+ "lore": [
+ "§7Only appears during §eThe Carnival Event ",
+ "§7when §dFoxy §7is Mayor."
+ ],
+ "internalname": "CHANTELLE_NPC",
+ "clickcommand": "",
+ "modver": "",
+ "x": -83,
+ "y": 72,
+ "z": -18,
+ "island": "hub",
+ "crafttext": "",
+ "infoType": ""
+} \ No newline at end of file
diff --git a/items/DOUG_NPC.json b/items/DOUG_NPC.json
new file mode 100644
index 00000000..38e06887
--- /dev/null
+++ b/items/DOUG_NPC.json
@@ -0,0 +1,70 @@
+{
+ "itemid": "minecraft:skull",
+ "displayname": "§9Doug (NPC)",
+ "nbttag": "{HideFlags:254,SkullOwner:{Id:\"8f1bdba9-9757-2a16-a4ba-7b2c8ad3921c\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y1NjIxOTZlYjcyNDVlMzM0ZjNiNzg4MzE1ZTgwZTgxYjI0ZDI4OTg4NDFiYjBhYzRmOTRjYWMxOTQ2YjExNzkifX19\"}]},Name:\"8f1bdba9-9757-2a16-a4ba-7b2c8ad3921c\"},display:{Lore:[0:\"§7Only appears during §eThe Carnival Event \",1:\"§7when §dFoxy §7is Mayor.\"],Name:\"§9Doug (NPC)\"},ExtraAttributes:{id:\"DOUG_NPC\"}}",
+ "damage": 3,
+ "lore": [
+ "§7Only appears during §eThe Carnival Event ",
+ "§7when §dFoxy §7is Mayor."
+ ],
+ "internalname": "DOUG_NPC",
+ "clickcommand": "",
+ "modver": "",
+ "x": -78,
+ "y": 72,
+ "z": -7,
+ "island": "hub",
+ "crafttext": "",
+ "infoType": "",
+ "recipes": [
+ {
+ "type": "npc_shop",
+ "cost": [
+ "SKYBLOCK_CARNIVAL_POINT:250"
+ ],
+ "result": "CARNIVAL_MASK_BAG:1"
+ },
+ {
+ "type": "npc_shop",
+ "cost": [
+ "SKYBLOCK_CARNIVAL_POINT:500"
+ ],
+ "result": "ZOMBIE_MASK:1"
+ },
+ {
+ "type": "npc_shop",
+ "cost": [
+ "SKYBLOCK_CARNIVAL_POINT:500"
+ ],
+ "result": "SALMON_MASK:1"
+ },
+ {
+ "type": "npc_shop",
+ "cost": [
+ "SKYBLOCK_CARNIVAL_POINT:1000"
+ ],
+ "result": "ARMADILLO_MASK:1"
+ },
+ {
+ "type": "npc_shop",
+ "cost": [
+ "SKYBLOCK_CARNIVAL_POINT:1000"
+ ],
+ "result": "PARROT_MASK:1"
+ },
+ {
+ "type": "npc_shop",
+ "cost": [
+ "SKYBLOCK_CARNIVAL_POINT:2000"
+ ],
+ "result": "BEE_MASK:1"
+ },
+ {
+ "type": "npc_shop",
+ "cost": [
+ "SKYBLOCK_CARNIVAL_POINT:200"
+ ],
+ "result": "FROG_MASK:1"
+ }
+ ]
+} \ No newline at end of file
diff --git a/items/SKYBLOCK_CARNIVAL_POINT.json b/items/SKYBLOCK_CARNIVAL_POINT.json
new file mode 100644
index 00000000..c204e776
--- /dev/null
+++ b/items/SKYBLOCK_CARNIVAL_POINT.json
@@ -0,0 +1,19 @@
+{
+ "itemid": "minecraft:skull",
+ "displayname": "§aCarnival Point",
+ "nbttag": "{HideFlags:254,SkullOwner:{Id:\"65cbcaba-d302-4f00-97f7-55928e7d3e5c\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmQ3ZjVlMmU1MjM1YjY3OWY4ZGI5YzQyZTg1OWM4OGFhNzgyN2IxZmI1MTgyYzA3NzAzYzQ1NmU5MTI1Y2Y1ZiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7Used for NEU NPC-Shops\",1:\"\",2:\"§c§l§ka§r §c§l§c§lSPECIAL §c§l§ka\"],Name:\"§aCarnival Point\"},ExtraAttributes:{id:\"SKYBLOCK_CARNIVAL_POINT\"}}",
+ "damage": 3,
+ "lore": [
+ "§7Used for NEU NPC-Shops",
+ "",
+ "§c§l§ka§r §c§l§c§lSPECIAL §c§l§ka"
+ ],
+ "internalname": "SKYBLOCK_CARNIVAL_POINT",
+ "crafttext": "",
+ "clickcommand": "",
+ "modver": "",
+ "infoType": "WIKI_URL",
+ "info": [
+ "https://wiki.hypixel.net/Carnival"
+ ]
+} \ No newline at end of file