Fix tooltip and add ignore_diet to diet powers.

Provismet · Aug 9, 2023 · 804cf7e · 804cf7e
1 parent 980ed1e
commit 804cf7e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ repositories {
 	// for more information about repositories.
 	maven {
         name = "Ladysnake Libs"
-        url = 'https://ladysnake.jfrog.io/artifactory/mods'
+        url = 'https://maven.ladysnake.org/releases'
     }
     maven {
         url = 'https://maven.cafeteria.dev'

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.14.21
 
 # Mod Properties
-	mod_version = 1.4.0
+	mod_version = 1.4.1
 	maven_group = com.provismet
 	archives_base_name = provi-origins
 

diff --git a/src/main/resources/assets/proviorigins/lang/en_us.json b/src/main/resources/assets/proviorigins/lang/en_us.json
@@ -37,6 +37,8 @@
     "death.attack.compost.player": "%1$s was composted by %2$s",
     "death.attack.compost.item": "%1$s was composted by %2$s using %3$s",
 
+    "tooltip.proviorigins.common.no_potions": "You are unaffected by potions.",
+
     "tooltip.proviorigins.voidlily.grants_armour": "Consume to gain armor.",
     "tooltip.proviorigins.voidlily.grants_blindness": "Consume to inflict blindness on struck entities.",
     "tooltip.proviorigins.voidlily.grants_corruption": "Consume to enhance your latent poison with the void.",
@@ -52,7 +54,6 @@
     "tooltip.proviorigins.voidlily.grants_weakness": "Consume to inflict weakness on struck entities.",
     "tooltip.proviorigins.voidlily.grants_wither": "Consume to inflict wither on struck entities.",
     "tooltip.proviorigins.voidlily.grants_water_breathing": "Consume to gain oxygen.",
-    "tooltip.proviorigins.voidlily.no_potions": "You are unaffected by potions.",
 
     "tooltip.proviorigins.decaykraken.weak_soul": "Weak Soul",
     "tooltip.proviorigins.decaykraken.medium_soul": "Medium Soul",

diff --git a/src/main/resources/data/proviorigins/powers/common/no_food.json b/src/main/resources/data/proviorigins/powers/common/no_food.json
@@ -3,6 +3,18 @@
     "description": "power.proviorigins.common.no_food.desc",
     "type": "origins:prevent_item_use",
     "item_condition": {
-        "type": "origins:food"
+        "type": "origins:and",
+        "conditions": [
+            {
+                "type": "origins:ingredient",
+                "ingredient": {
+                    "tag": "origins:ignore_diet"
+                },
+                "inverted": true
+            },
+            {
+                "type": "origins:food"
+            }
+        ]
     }
 }
diff --git a/src/main/resources/data/proviorigins/powers/common/no_splash_potions.json b/src/main/resources/data/proviorigins/powers/common/no_splash_potions.json
@@ -21,7 +21,7 @@
             ]
         },
         "text": {
-            "translate": "power.voidlily.no_potions"
+            "translate": "tooltip.proviorigins.common.no_potions"
         }
     }
 }
diff --git a/src/main/resources/data/proviorigins/powers/common/pescatarian.json b/src/main/resources/data/proviorigins/powers/common/pescatarian.json
@@ -12,6 +12,13 @@
                 },
                 "inverted": true
             },
+            {
+                "type": "origins:ingredient",
+                "ingredient": {
+                    "tag": "origins:ignore_diet"
+                },
+                "inverted": true
+            },
             {
                 "type": "origins:food"
             }