Browse Source

Fixes Stage 1 Potions

The 'NETHER_WARTS' material enum should be 'NETHER_STALK' to represent the actual item.
Adds Dragon's Breath as Tier 1 Ingredient so lingering potions are actually validated as an mcMMO brew.
Adds second type of Potion of Water to support water potions that are spawned in via commands or other plugins.
Dylan 9 years ago
parent
commit
538a0c5d6c
1 changed files with 21 additions and 3 deletions
  1. 21 3
      src/main/resources/potions.yml

+ 21 - 3
src/main/resources/potions.yml

@@ -18,6 +18,7 @@ Concoctions:
         - SULPHUR
         - SULPHUR
         - WATER_LILY
         - WATER_LILY
         - 'RAW_FISH:3'
         - 'RAW_FISH:3'
+        - 'DRAGONS_BREATH'
     Tier_Two_Ingredients:
     Tier_Two_Ingredients:
         - CARROT_ITEM
         - CARROT_ITEM
         - SLIME_BALL
         - SLIME_BALL
@@ -69,7 +70,24 @@ Potions:
             SUGAR: POTION_OF_MUNDANE
             SUGAR: POTION_OF_MUNDANE
             FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS
             FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS
             SULPHUR: SPLASH_POTION_OF_WATER
             SULPHUR: SPLASH_POTION_OF_WATER
-            NETHER_WARTS: POTION_OF_AWKWARD
+            NETHER_STALK: POTION_OF_AWKWARD
+            REDSTONE: POTION_OF_MUNDANE
+            SPECKLED_MELON: POTION_OF_MUNDANE
+            BLAZE_POWDER: POTION_OF_MUNDANE
+            MAGMA_CREAM: POTION_OF_MUNDANE
+            RABBIT_FOOT: POTION_OF_MUNDANE
+            GLOWSTONE_DUST: POTION_OF_THICK
+    POTION_OF_WATER_UNCRAFTABLE:
+        Material: POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Children:
+            SPIDER_EYE: POTION_OF_MUNDANE
+            GHAST_TEAR: POTION_OF_MUNDANE
+            SUGAR: POTION_OF_MUNDANE
+            FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS
+            SULPHUR: SPLASH_POTION_OF_WATER
+            NETHER_STALK: POTION_OF_AWKWARD
             REDSTONE: POTION_OF_MUNDANE
             REDSTONE: POTION_OF_MUNDANE
             SPECKLED_MELON: POTION_OF_MUNDANE
             SPECKLED_MELON: POTION_OF_MUNDANE
             BLAZE_POWDER: POTION_OF_MUNDANE
             BLAZE_POWDER: POTION_OF_MUNDANE
@@ -636,7 +654,7 @@ Potions:
             FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_WEAKNESS
             FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_WEAKNESS
             SPIDER_EYE: SPLASH_POTION_OF_MUNDANE
             SPIDER_EYE: SPLASH_POTION_OF_MUNDANE
             BLAZE_POWDER: SPLASH_POTION_OF_MUNDANE
             BLAZE_POWDER: SPLASH_POTION_OF_MUNDANE
-            NETHER_WARTS: SPLASH_POTION_OF_AWKWARD
+            NETHER_STALK: SPLASH_POTION_OF_AWKWARD
             SUGAR: SPLASH_POTION_OF_MUNDANE
             SUGAR: SPLASH_POTION_OF_MUNDANE
     SPLASH_POTION_OF_MUNDANE:
     SPLASH_POTION_OF_MUNDANE:
         Material: SPLASH_POTION
         Material: SPLASH_POTION
@@ -1186,7 +1204,7 @@ Potions:
         PotionData:
         PotionData:
             PotionType: WATER
             PotionType: WATER
         Children:
         Children:
-            NETHER_WARTS: LINGERING_POTION_OF_AWKWARD
+            NETHER_STALK: LINGERING_POTION_OF_AWKWARD
             MAGMA_CREAM: LINGERING_POTION_OF_MUNDANE
             MAGMA_CREAM: LINGERING_POTION_OF_MUNDANE
             BLAZE_POWDER: LINGERING_POTION_OF_MUNDANE
             BLAZE_POWDER: LINGERING_POTION_OF_MUNDANE
             RABBIT_FOOT: LINGERING_POTION_OF_MUNDANE
             RABBIT_FOOT: LINGERING_POTION_OF_MUNDANE