Fix some modifier max levels missing and remove max on tank

Tank is storage, if you want to spend all upgrades on storage, be our guest (will make good slimestaff)
SlimeKnights · Feb 3, 2023 · cc01a78 · cc01a78
1 parent 2cf0a5e
commit cc01a78
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 10 deletions.
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/aqua_affinity.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/aqua_affinity.json
@@ -27,5 +27,6 @@
   "result": {
     "name": "tconstruct:aqua_affinity",
     "level": 1
-  }
+  },
+  "max_level": 1
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/frost_walker.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/frost_walker.json
@@ -27,5 +27,6 @@
   "result": {
     "name": "tconstruct:frost_walker",
     "level": 1
-  }
+  },
+  "max_level": 1
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/snowdrift.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/snowdrift.json
@@ -27,5 +27,6 @@
   "result": {
     "name": "tconstruct:snowdrift",
     "level": 1
-  }
+  },
+  "max_level": 1
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/trick_quiver.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/trick_quiver.json
@@ -27,5 +27,6 @@
   "result": {
     "name": "tconstruct:trick_quiver",
     "level": 1
-  }
+  },
+  "max_level": 2
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/tank.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/tank.json
@@ -26,6 +26,5 @@
   "result": {
     "name": "tconstruct:tank",
     "level": 1
-  },
-  "max_level": 5
+  }
 }
diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -561,6 +561,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .addInput(TinkerWorld.skySlimeVine)
                          .setSlots(SlotType.ABILITY, 1)
                          .setTools(TinkerTags.Items.BOWS)
+                         .setMaxLevel(2)
                          .saveSalvage(consumer, prefix(TinkerModifiers.trickQuiver, abilitySalvage))
                          .save(consumer, prefix(TinkerModifiers.trickQuiver, abilityFolder));
     BiConsumer<ItemLike,String> crystalshotRecipe = (item, variant) -> {
@@ -885,6 +886,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .addInput(Blocks.DARK_PRISMARINE)
                          .setSlots(SlotType.ABILITY, 1)
                          .setTools(TinkerTags.Items.HELMETS)
+                         .setMaxLevel(1)
                          .saveSalvage(consumer, prefix(TinkerModifiers.aquaAffinity, abilitySalvage))
                          .save(consumer, prefix(TinkerModifiers.aquaAffinity, abilityFolder));
     // chestplate
@@ -995,6 +997,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .addInput(Items.BLUE_ICE)
                          .addInput(Items.BLUE_ICE)
                          .setSlots(SlotType.ABILITY, 1)
+                         .setMaxLevel(1)
                          .saveSalvage(consumer, prefix(TinkerModifiers.frostWalker, abilitySalvage))
                          .save(consumer, prefix(TinkerModifiers.frostWalker, abilityFolder));
     ModifierRecipeBuilder.modifier(TinkerModifiers.snowdrift)
@@ -1005,6 +1008,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .addInput(Items.SNOW_BLOCK)
                          .addInput(Items.SNOW_BLOCK)
                          .setSlots(SlotType.ABILITY, 1)
+                         .setMaxLevel(1)
                          .saveSalvage(consumer, prefix(TinkerModifiers.snowdrift, abilitySalvage))
                          .save(consumer, prefix(TinkerModifiers.snowdrift, abilityFolder));
 
@@ -1190,7 +1194,6 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .save(consumer, prefix(TinkerModifiers.spilling, abilityFolder));
     ModifierRecipeBuilder.modifier(TinkerModifiers.tank)
                          .addInput(TinkerTags.Items.TANKS)
-                         .setMaxLevel(5)
                          .setSlots(SlotType.UPGRADE, 1)
                          .setTools(ingredientFromTags(TinkerTags.Items.INTERACTABLE, TinkerTags.Items.HELMETS, TinkerTags.Items.CHESTPLATES, TinkerTags.Items.LEGGINGS))
                          .saveSalvage(consumer, prefix(TinkerModifiers.tank, upgradeSalvage))

diff --git a/...main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/double_jump.json b/...main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/double_jump.json
@@ -7,6 +7,7 @@
   ],
   "more_text_space": true,
   "effects": [
+    "No max level",
     "Requires 1 ability slot"
   ]
 }
diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/pockets.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/pockets.json
@@ -7,6 +7,7 @@
   ],
   "more_text_space": true,
   "effects": [
+    "No max level",
     "Requires 1 ability slot"
   ]
 }
diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/slurping.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/slurping.json
@@ -10,6 +10,7 @@
   ],
   "more_text_space": true,
   "effects": [
+    "No max level",
     "Requires 1 ability slot",
     "Fill by using tool on a fluid tank"
   ]

diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/wetting.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/wetting.json
@@ -10,7 +10,7 @@
   ],
   "more_text_space": true,
   "effects": [
-    "Maximum of 1 level",
+    "No max level",
     "Requires 1 ability slot",
     "Fill by using tool on a fluid tank"
   ]

diff --git a/...ain/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/bulk_quiver.json b/...ain/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/bulk_quiver.json
@@ -11,6 +11,7 @@
   ],
   "more_text_space": true,
   "effects": [
+    "No max level",
     "Requires 1 ability slot per level"
   ]
 }
diff --git a/...ain/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/crystalshot.json b/...ain/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/crystalshot.json
@@ -10,7 +10,7 @@
   ],
   "more_text_space": true,
   "effects": [
+    "Maximum of 1 level",
     "Requires 1 ability slot",
-    "Single level"
   ]
 }
diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/multishot.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/multishot.json
@@ -11,6 +11,7 @@
   ],
   "more_text_space": true,
   "effects": [
+    "No max level",
     "Requires 1 ability slot per level"
   ]
 }
diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/weapon/spilling.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/weapon/spilling.json
@@ -10,7 +10,7 @@
   ],
   "more_text_space": true,
   "effects": [
-    "Maximum of 1 level",
+    "No max level",
     "Requires 1 ability slot",
     "Fill by using tool on a fluid tank"
   ]