Increase revitalizing cap to 5

SlimeKnights · Feb 21, 2023 · 8526577 · 8526577
1 parent be7b23a
commit 8526577
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 54 deletions.
diff --git a/...modifiers/defense/revitalizing_small.json → ...tools/modifiers/defense/revitalizing.json b/...modifiers/defense/revitalizing_small.json → ...tools/modifiers/defense/revitalizing.json
@@ -5,14 +5,9 @@
   },
   "amount_per_item": 1,
   "needed_per_level": 2,
-  "tools": [
-    {
-      "tag": "tconstruct:modifiable/armor/helmets"
-    },
-    {
-      "tag": "tconstruct:modifiable/armor/boots"
-    }
-  ],
+  "tools": {
+    "tag": "tconstruct:modifiable/armor/worn"
+  },
   "slots": {
     "defense": 1
   },
@@ -21,5 +16,5 @@
     "name": "tconstruct:revitalizing",
     "level": 1
   },
-  "max_level": 2
+  "max_level": 5
 }
diff --git a/...nerated/resources/data/tconstruct/recipes/tools/modifiers/defense/revitalizing_large.json b/...nerated/resources/data/tconstruct/recipes/tools/modifiers/defense/revitalizing_large.json
diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -714,22 +714,12 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                                     .save(consumer, prefix(TinkerModifiers.dragonScale, defenseFolder));
     // 3 each for chest and legs, 2 each for boots and helmet, leads to 10 total
     IncrementalModifierRecipeBuilder.modifier(ModifierIds.revitalizing)
-                                    .setTools(ingredientFromTags(TinkerTags.Items.CHESTPLATES, TinkerTags.Items.LEGGINGS))
+                                    .setTools(ingredientFromTags(TinkerTags.Items.WORN_ARMOR)) // revitalizing would suck on an item you constantly change
                                     .setInput(TinkerCommons.jeweledApple, 1, 2)
                                     .setSlots(SlotType.DEFENSE, 1)
-                                    .setMaxLevel(3)
-                                    .save(consumer, wrap(ModifierIds.revitalizing, defenseFolder, "_large"));
-    IncrementalModifierRecipeBuilder.modifier(ModifierIds.revitalizing)
-                                    .setTools(ingredientFromTags(TinkerTags.Items.HELMETS, TinkerTags.Items.BOOTS))
-                                    .setInput(TinkerCommons.jeweledApple, 1, 2)
-                                    .setSlots(SlotType.DEFENSE, 1)
-                                    .setMaxLevel(2)
-                                    .save(consumer, wrap(ModifierIds.revitalizing, defenseFolder, "_small"));
-    IncrementalModifierRecipeBuilder.modifier(ModifierIds.revitalizing)
-                                    .setTools(TinkerTags.Items.WORN_ARMOR) // revitalizing would suck on an item you constantly change
-                                    .setSlots(SlotType.DEFENSE, 1)
-                                    .setMaxLevel(3)
-                                    .saveSalvage(consumer, prefix(ModifierIds.revitalizing, defenseSalvage));
+                                    .setMaxLevel(5)
+                                    .saveSalvage(consumer, prefix(ModifierIds.revitalizing, defenseSalvage))
+                                    .save(consumer, prefix(ModifierIds.revitalizing, defenseFolder));
 
     // upgrade - counterattack
     Ingredient wornOrShield = ingredientFromTags(TinkerTags.Items.WORN_ARMOR, TinkerTags.Items.SHIELDS); // held armor may include things that cannot block

diff --git a/...ain/resources/assets/tconstruct/book/encyclopedia/en_us/defense/special/revitalizing.json b/...ain/resources/assets/tconstruct/book/encyclopedia/en_us/defense/special/revitalizing.json
@@ -8,8 +8,7 @@
   "more_text_space": true,
   "effects": [
     "Can apply levels incrementally",
-    "Maximum of 2 levels on helmets or boots",
-    "Maximum of 3 levels on chestplates or leggings",
-    "Requires 1 defense slot"
+    "Maximum of 5 levels",
+    "Requires 1 defense slot per level"
   ]
 }
diff --git a/.../resources/assets/tconstruct/book/mighty_smelting/en_us/defense/special/revitalizing.json b/.../resources/assets/tconstruct/book/mighty_smelting/en_us/defense/special/revitalizing.json
@@ -7,8 +7,7 @@
   ],
   "effects": [
     "Can apply levels incrementally",
-    "Maximum of 2 levels on helmets or boots",
-    "Maximum of 3 levels on chestplates or leggings",
-    "Requires 1 defense slot"
+    "Maximum of 5 levels",
+    "Requires 1 defense slot per level"
   ]
 }