aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoulberry <jjenour@student.unimelb.edu.au>2020-10-03 06:03:27 +1000
committerGitHub <noreply@github.com>2020-10-03 06:03:27 +1000
commit3ecf258ced69724feb09c9807d1dd73719bf7f5c (patch)
tree00baab2a701125a4f9ad8a676a8e2477d9fe70c9
parent228ec7960d0319d8018c24ee14a92ea235c5e68c (diff)
parent53df26bfed360f90f5eed3947e854606138888c7 (diff)
downloadNotEnoughUpdates-REPO-3ecf258ced69724feb09c9807d1dd73719bf7f5c.tar.gz
NotEnoughUpdates-REPO-3ecf258ced69724feb09c9807d1dd73719bf7f5c.tar.bz2
NotEnoughUpdates-REPO-3ecf258ced69724feb09c9807d1dd73719bf7f5c.zip
Merge pull request #278 from IRONM00N/master
Some New Items And Fixes
-rw-r--r--.gitignore0
-rw-r--r--constants/petnums.json135
-rw-r--r--items/BAT_WAND.json15
-rw-r--r--items/BONE_BOOMERANG.json15
-rw-r--r--items/BONZO_FRAGMENT.json16
-rw-r--r--items/CREATIVE_MIND.json26
-rw-r--r--items/CRYPT_BOW.json31
-rw-r--r--items/CRYPT_DREADLORD_SWORD.json39
-rw-r--r--items/CRYPT_WITHERLORD_BOOTS.json24
-rw-r--r--items/CRYPT_WITHERLORD_CHESTPLATE.json24
-rw-r--r--items/CRYPT_WITHERLORD_HELMET.json24
-rw-r--r--items/CRYPT_WITHERLORD_LEGGINGS.json24
-rw-r--r--items/DIAMOND_BONZO_HEAD.json24
-rw-r--r--items/DIAMOND_PROFESSOR_HEAD.json36
-rw-r--r--items/DIAMOND_SCARF_HEAD.json34
-rw-r--r--items/DIAMOND_THORN_HEAD.json9
-rw-r--r--items/DRAGON_HORN.json9
-rw-r--r--items/FEATHER_FALLING;10.json23
-rw-r--r--items/FEL_SWORD.json12
-rw-r--r--items/FLORID_ZOMBIE_SWORD.json7
-rw-r--r--items/FLOWER_OF_TRUTH.json37
-rw-r--r--items/GIANTS_EYE.json23
-rw-r--r--items/GIANTS_SWORD.json27
-rw-r--r--items/GIANT_TOOTH.json26
-rw-r--r--items/GOLD_BONZO_HEAD.json30
-rw-r--r--items/GOLD_LIVID_HEAD.json15
-rw-r--r--items/GOLD_PROFESSOR_HEAD.json29
-rw-r--r--items/GOLD_SCARF_HEAD.json21
-rw-r--r--items/GOLD_THORN_HEAD.json24
-rw-r--r--items/GOLEM_POPPY.json17
-rw-r--r--items/HEAVY_BOOTS.json28
-rw-r--r--items/HEAVY_CHESTPLATE.json29
-rw-r--r--items/HEAVY_HELMET.json24
-rw-r--r--items/HEAVY_LEGGINGS.json26
-rw-r--r--items/HYPER_CLEAVER.json15
-rw-r--r--items/LAST_BREATH.json8
-rw-r--r--items/LEAPING_SWORD.json2
-rw-r--r--items/LESSER_ORB_OF_HEALING.json24
-rw-r--r--items/LIVID_DAGGER.json11
-rw-r--r--items/MASTIFF_PUPPY.json22
-rw-r--r--items/MIDAS_JEWEL.json13
-rw-r--r--items/MIMIC_FRAGMENT.json21
-rw-r--r--items/MINERAL_BOOTS.json7
-rw-r--r--items/MINERAL_CHESTPLATE.json7
-rw-r--r--items/MINERAL_HELMET.json7
-rw-r--r--items/MINERAL_LEGGINGS.json7
-rw-r--r--items/MINERAL_TALISMAN.json7
-rw-r--r--items/NECROMANCER_LORD_BOOTS.json32
-rw-r--r--items/NECROMANCER_LORD_CHESTPLATE.json32
-rw-r--r--items/NECROMANCER_LORD_HELMET.json32
-rw-r--r--items/NECROMANCER_LORD_LEGGINGS.json32
-rw-r--r--items/NECROMANCER_SWORD.json41
-rw-r--r--items/OVERLOAD;1.json25
-rw-r--r--items/PET_SKIN_GUARDIAN.json30
-rw-r--r--items/PET_SKIN_ROCK_COOL.json27
-rw-r--r--items/PET_SKIN_ROCK_DERP.json27
-rw-r--r--items/PET_SKIN_ROCK_EMBARRASSED.json27
-rw-r--r--items/PET_SKIN_ROCK_LAUGH.json27
-rw-r--r--items/PET_SKIN_ROCK_SMILE.json27
-rw-r--r--items/PET_SKIN_ROCK_THINKING.json27
-rw-r--r--items/POORLY_WRAPPED_ROCK.json19
-rw-r--r--items/PRECURSOR_EYE.json35
-rw-r--r--items/REAPER_SCYTHE.json38
-rw-r--r--items/RECOMBOBULATOR_3000.json13
-rw-r--r--items/REFINED_MINERAL.json5
-rw-r--r--items/REVENANT_LEGGINGS.json9
-rw-r--r--items/ROSE_BOUQUET.json19
-rw-r--r--items/ROTTEN_BOOTS.json34
-rw-r--r--items/ROTTEN_CHESTPLATE.json31
-rw-r--r--items/ROTTEN_HELMET.json31
-rw-r--r--items/ROTTEN_LEGGINGS.json31
-rw-r--r--items/SCARF_FRAGMENT.json16
-rw-r--r--items/SECRET_DUNGEON_REDSTONE_KEY.json7
-rw-r--r--items/SHADOW_ASSASSIN_BOOTS.json9
-rw-r--r--items/SHADOW_ASSASSIN_CHESTPLATE.json14
-rw-r--r--items/SHADOW_ASSASSIN_HELMET.json9
-rw-r--r--items/SHADOW_ASSASSIN_LEGGINGS.json21
-rw-r--r--items/SHADOW_FURY.json10
-rw-r--r--items/SILENT_DEATH.json42
-rw-r--r--items/SKELETON_GRUNT_BOOTS.json33
-rw-r--r--items/SKELETON_GRUNT_CHESTPLATE.json30
-rw-r--r--items/SKELETON_GRUNT_HELMET.json34
-rw-r--r--items/SKELETON_GRUNT_LEGGINGS.json35
-rw-r--r--items/SKELETON_SOLDIER_BOOTS.json38
-rw-r--r--items/SKELETON_SOLDIER_CHESTPLATE.json36
-rw-r--r--items/SKELETON_SOLDIER_HELMET.json2
-rw-r--r--items/SKELETON_SOLDIER_LEGGINGS.json35
-rw-r--r--items/SKELETOR_LEGGINGS.json12
-rw-r--r--items/SKYBLOCK_MENU.json18
-rw-r--r--items/SPIRIT_WING.json7
-rw-r--r--items/SUMMONING_RING.json32
-rw-r--r--items/SUPER_HEAVY_BOOTS.json13
-rw-r--r--items/SUPER_HEAVY_CHESTPLATE.json13
-rw-r--r--items/SUPER_HEAVY_HELMET.json13
-rw-r--r--items/SUPER_HEAVY_LEGGINGS.json16
-rw-r--r--items/TREASURE_ARTIFACT.json4
-rw-r--r--items/WEDDING_RING_0.json27
-rw-r--r--items/WEDDING_RING_1.json27
-rw-r--r--items/WITHER_CLOAK.json23
-rw-r--r--items/YELLOW_ROCK.json19
-rw-r--r--items/ZOMBIE_COMMANDER_BOOTS.json30
-rw-r--r--items/ZOMBIE_COMMANDER_CHESTPLATE.json33
-rw-r--r--items/ZOMBIE_COMMANDER_HELMET.json30
-rw-r--r--items/ZOMBIE_COMMANDER_LEGGINGS.json30
-rw-r--r--items/ZOMBIE_COMMANDER_WHIP.json32
-rw-r--r--items/ZOMBIE_KNIGHT_SWORD.json40
-rw-r--r--items/ZOMBIE_LORD_BOOTS.json18
-rw-r--r--items/ZOMBIE_LORD_CHESTPLATE.json17
-rw-r--r--items/ZOMBIE_LORD_HELMET.json17
-rw-r--r--items/ZOMBIE_LORD_LEGGINGS.json17
-rw-r--r--items/ZOMBIE_SOLDIER_CUTLASS.json38
111 files changed, 2029 insertions, 553 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/.gitignore
diff --git a/constants/petnums.json b/constants/petnums.json
index 7de170a7..b669d827 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -3985,5 +3985,138 @@
},
"interp": "1:70"
}
- }
+ },
+ "GRIFFIN": {
+ "COMMON": {
+ "1": {
+ "otherNums": [
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 0.1,
+ "CRIT_DAMAGE": 0.5,
+ "STRENGTH": 0.25,
+ "MAGIC_FIND": 0.1,
+ "INTELLIGENCE": 0.1
+ }
+ },
+ "100": {
+ "otherNums": [
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 10,
+ "CRIT_DAMAGE": 50,
+ "STRENGTH": 25,
+ "MAGIC_FIND": 10,
+ "INTELLIGENCE": 10
+ }
+ },
+ "interp": "1:70"
+ },
+ "UNCOMMON": {
+ "1": {
+ "otherNums": [
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 0.1,
+ "CRIT_DAMAGE": 0.5,
+ "STRENGTH": 0.25,
+ "MAGIC_FIND": 0.1,
+ "INTELLIGENCE": 0.1
+ }
+ },
+ "100": {
+ "otherNums": [
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 10,
+ "CRIT_DAMAGE": 50,
+ "STRENGTH": 25,
+ "MAGIC_FIND": 10,
+ "INTELLIGENCE": 10
+ }
+ },
+ "interp": "1:70"
+ },
+ "RARE": {
+ "1": {
+ "otherNums": [
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 0.1,
+ "CRIT_DAMAGE": 0.5,
+ "STRENGTH": 0.25,
+ "MAGIC_FIND": 0.1,
+ "INTELLIGENCE": 0.1
+ }
+ },
+ "100": {
+ "otherNums": [
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 10,
+ "CRIT_DAMAGE": 50,
+ "STRENGTH": 25,
+ "MAGIC_FIND": 10,
+ "INTELLIGENCE": 10
+ }
+ },
+ "interp": "1:70"
+ },
+ "EPIC": {
+ "1": {
+ "otherNums": [
+ 1
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 0.1,
+ "CRIT_DAMAGE": 0.5,
+ "STRENGTH": 0.25,
+ "MAGIC_FIND": 0.1,
+ "INTELLIGENCE": 0.1
+ }
+ },
+ "100": {
+ "otherNums": [
+ 16
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 10,
+ "CRIT_DAMAGE": 50,
+ "STRENGTH": 25,
+ "MAGIC_FIND": 10,
+ "INTELLIGENCE": 10
+ }
+ },
+ "interp": "1:70"
+ },
+ "LEGENDARY": {
+ "1": {
+ "otherNums": [
+ 1,
+ 1
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 0.1,
+ "CRIT_DAMAGE": 0.5,
+ "STRENGTH": 0.25,
+ "MAGIC_FIND": 0.1,
+ "INTELLIGENCE": 0.1
+ }
+ },
+ "100": {
+ "otherNums": [
+ 20,
+ 15
+ ],
+ "statNums": {
+ "CRIT_CHANCE": 10,
+ "CRIT_DAMAGE": 50,
+ "STRENGTH": 25,
+ "MAGIC_FIND": 10,
+ "INTELLIGENCE": 10
+ }
+ },
+ "interp": "1:70"
+ }
+ }
} \ No newline at end of file
diff --git a/items/BAT_WAND.json b/items/BAT_WAND.json
index b07287b9..9c75055a 100644
--- a/items/BAT_WAND.json
+++ b/items/BAT_WAND.json
@@ -1,13 +1,13 @@
{
"itemid": "minecraft:red_flower",
"displayname": "§6Spirit Sceptre",
- "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d370 §8(538)\",1:\"§7Damage: §c+180 §8(+271.8)\",2:\"\",3:\"§7Intelligence: §a+300 §8(+453)\",4:\"\",5:\"§6Item Ability: Guided Bat §e§lRIGHT CLICK\",6:\"§7Shoots a guided spirit bat,\",7:\"§7following your aim and exploding\",8:\"§7for §c4,564 §7damage.\",9:\"§8Mana Cost: §3250\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§7§4❣ §cRequires §aCatacombs Floor IV\",13:\"§aCompletion\",14:\"§6§lLEGENDARY DUNGEON SWORD\"],Name:\"§6Spirit Sceptre\"},ExtraAttributes:{dungeon_item_level:0,id:\"BAT_WAND\"}}",
+ "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d370 \",1:\"§7Damage: §c+180 \",2:\"\",3:\"§7Intelligence: §a+300 \",4:\"\",5:\"§6Item Ability: Guided Bat §e§lRIGHT CLICK\",6:\"§7Shoots a guided spirit bat,\",7:\"§7following your aim and exploding\",8:\"§7for §c4,564 §7damage.\",9:\"§8Mana Cost: §3250\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§7§4❣ §cRequires §aCatacombs Floor IV\",13:\"§aCompletion\",14:\"§6§lLEGENDARY DUNGEON SWORD\"],Name:\"§6Spirit Sceptre\"},ExtraAttributes:{dungeon_item_level:0,id:\"BAT_WAND\"}}",
"damage": 2,
"lore": [
- "§7Gear Score: §d370 §8(538)",
- "§7Damage: §c+180 §8(+271.8)",
+ "§7Gear Score: §d370 ",
+ "§7Damage: §c+180 ",
"",