Tweak protection modifiers

Protection is now 5% per level, but is capped at one level per piece
Conditional protection is now 10% per level
Goal is buffing armor to be closer to vanilla without making it too strong once you have dragon heads

src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/protection.json

@@ -32,5 +32,6 @@
   "result": {
     "name": "tconstruct:protection",
     "level": 1
-  }
+  },
+  "max_level": 1
 }

src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java

@@ -671,6 +671,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .addInput(TinkerModifiers.cobaltReinforcement,  4)
                          .setSlots(SlotType.ABILITY, 1)
                          .setTools(TinkerTags.Items.ARMOR)
+                         .setMaxLevel(1)
                          .saveSalvage(consumer, prefix(TinkerModifiers.protection, abilitySalvage))
                          .save(consumer, prefix(TinkerModifiers.protection, abilityFolder));
     ModifierRecipeBuilder.modifier(ModifierIds.knockbackResistance)

src/main/java/slimeknights/tconstruct/tools/modifiers/ability/armor/ProtectionModifier.java

@@ -21,15 +21,15 @@ public class ProtectionModifier extends IncrementalModifier {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (!source.isBypassMagic() && !source.isBypassInvul()) {
-      modifierValue += getEffectiveLevel(tool, level);
+      modifierValue += getEffectiveLevel(tool, level) * 1.25f;
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
     if (tool.hasTag(TinkerTags.Items.ARMOR)) {
-      tooltip.add(applyStyle(new TextComponent(Util.PERCENT_BOOST_FORMAT.format(getEffectiveLevel(tool, level) / 25f))
+      tooltip.add(applyStyle(new TextComponent(Util.PERCENT_BOOST_FORMAT.format(getEffectiveLevel(tool, level) * 1.25f / 25f))
                                .append(" ")
                                .append(new TranslatableComponent(getTranslationKey() + ".resistance"))));
     }

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/BlastProtectionModifier.java

@@ -38,14 +38,14 @@ public BlastProtectionModifier() {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (!source.isBypassMagic() && !source.isBypassInvul() && source.isExplosion()) {
-      modifierValue += getScaledLevel(tool, level) * 2;
+      modifierValue += getScaledLevel(tool, level) * 2.5f;
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
-    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2f, tooltip);
+    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.5f, tooltip);
   }
 
   @Override

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/DragonbornModifier.java

@@ -40,7 +40,7 @@ private static boolean isAirborne(LivingEntity living) {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (!source.isBypassMagic() && !source.isBypassInvul() && isAirborne(context.getEntity())) {
-      modifierValue += getScaledLevel(tool, level) * 2.5;
+      modifierValue += getScaledLevel(tool, level) * 2.5f;
     }
     return modifierValue;
   }

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/FireProtectionModifier.java

@@ -38,14 +38,14 @@ public FireProtectionModifier() {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (!source.isBypassMagic() && !source.isBypassInvul() && source.isFire()) {
-      modifierValue += getScaledLevel(tool, level) * 2;
+      modifierValue += getScaledLevel(tool, level) * 2.5f;
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
-    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2f, tooltip);
+    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.5f, tooltip);
   }
 
 

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/MagicProtectionModifier.java

@@ -32,14 +32,14 @@ public MagicProtectionModifier() {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (!source.isBypassMagic() && !source.isBypassInvul() && source.isMagic()) {
-      modifierValue += getScaledLevel(tool, level) * 2;
+      modifierValue += getScaledLevel(tool, level) * 2.5f;
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
-    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2f, tooltip);
+    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.5f, tooltip);
   }
 
   @Override

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/MeleeProtectionModifier.java

@@ -75,14 +75,14 @@ protected void reset(ModifierMaxLevel data, EquipmentChangeContext context) {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (doesApply(source)) {
-      modifierValue += getScaledLevel(tool, level) * 2;
+      modifierValue += getScaledLevel(tool, level) * 2.5;
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
-    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.0f, tooltip);
+    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.5f, tooltip);
   }
 
   @Override

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/ProjectileProtectionModifier.java

@@ -30,13 +30,13 @@ protected ModifierMaxLevel createData() {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (!source.isBypassMagic() && !source.isBypassInvul() && source.isProjectile()) {
-      modifierValue += getScaledLevel(tool, level) * 2;
+      modifierValue += getScaledLevel(tool, level) * 2.5f;
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
-    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2f, tooltip);
+    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.5f, tooltip);
   }
 }

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/ShulkingModifier.java

@@ -35,14 +35,14 @@ protected ModifierMaxLevel createData() {
   @Override
   public float getProtectionModifier(IToolStackView tool, int level, EquipmentContext context, EquipmentSlot slotType, DamageSource source, float modifierValue) {
     if (context.getEntity().isCrouching() && !source.isBypassMagic() && !source.isBypassInvul()) {
-      modifierValue += getScaledLevel(tool, level) * 2;
+      modifierValue += getScaledLevel(tool, level) * 2.5f;
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
-    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2f, tooltip);
+    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.5f, tooltip);
   }
 
   private static void onAttack(LivingHurtEvent event) {

src/main/java/slimeknights/tconstruct/tools/modifiers/defense/TurtleShellModifier.java

@@ -39,14 +39,14 @@ public float getProtectionModifier(IToolStackView tool, int level, EquipmentCont
       LivingEntity entity = context.getEntity();
       // helmet/chest boost if eyes in water, legs/boots boost if feet in water
       if ((slotType == EquipmentSlot.HEAD || slotType == EquipmentSlot.CHEST) ? entity.wasEyeInWater : entity.isInWater()) {
-        modifierValue += getScaledLevel(tool, level) * 2;
+        modifierValue += getScaledLevel(tool, level) * 2.5f;
       }
     }
     return modifierValue;
   }
 
   @Override
   public void addInformation(IToolStackView tool, int level, @Nullable Player player, List<Component> tooltip, TooltipKey tooltipKey, TooltipFlag tooltipFlag) {
-    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2f, tooltip);
+    AbstractProtectionModifier.addResistanceTooltip(this, tool, level, 2.5f, tooltip);
   }
 }

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/protection.json

@@ -2,11 +2,12 @@
   "modifier_id": "tconstruct:protection",
   "text": [
     {
-      "text": "Grants +6% resistance against all damage for the first level, and +4% at consecutive levels. Caps at 80% across the whole set, including other types of protection."
+      "text": "Grants +5% resistance against all damage per piece with this modifier. Caps at 80% across the whole set, including other types of protection."
     }
   ],
   "more_text_space": true,
   "effects": [
+    "Maximum of 1 level",
     "Requires 1 ability slot per level"
   ]
 }

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/blast.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:blast_protection",
   "text": [
     {
-      "text": "Grants +8% resistance against explosion damage, such as from creepers or TNT. Caps at 80% across the whole set, or 10 levels."
+      "text": "Grants +10% resistance against explosion damage, such as from creepers or TNT. Caps at 80% across the whole set, or 10 levels."
     },
     {
       "text": "Reduces the knockback from explosions by 15% per level of the highest level piece.", "paragraph": true

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/fire.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:fire_protection",
   "text": [
     {
-      "text": "Grants +8% resistance against fire damage, such as from lava or blazes. Caps at 80% across the whole set, or 10 levels."
+      "text": "Grants +10% resistance against fire damage, such as from lava or blazes. Caps at 80% across the whole set, or 10 levels."
     },
     {
       "text": "Reduces the duration of fire by 15% per level of the highest level piece.", "paragraph": true

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/magic.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:magic_protection",
   "text": [
     {
-      "text": "Grants +8% resistance against magic damage, such as from poison or thorns. Caps at 80% across the whole set, or 10 levels."
+      "text": "Grants +10% resistance against magic damage, such as from poison or thorns. Caps at 80% across the whole set, or 10 levels."
     },
     {
       "text": "Reduces the duration of negative potions by 5% per level of the highest level piece.", "paragraph": true

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/melee.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:melee_protection",
   "text": [
     {
-      "text": "Grants +8% resistance against melee damage, such as from zombies and swords. Caps at 80% across the whole set, or 10 levels."
+      "text": "Grants +10% resistance against melee damage, such as from zombies and swords. Caps at 80% across the whole set, or 10 levels."
     },
     {
       "text": "Grants +3% attack speed per level of the highest level piece.",

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/projectile.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:projectile_protection",
   "text": [
     {
-      "text": "Grants +8% resistance against projectile damage, such as arrows from skeletons. Caps at 80% across the whole set, or 10 levels."
+      "text": "Grants +10% resistance against projectile damage, such as arrows from skeletons. Caps at 80% across the whole set, or 10 levels."
     },
     {
       "text": "Reduces visibility to all mobs by 5% per level of the highest level piece.", "paragraph": true

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/shulking.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:shulking",
   "text": [
     {
-      "text": "Grants +8% resistance while sneaking. Caps at 80% across the whole set, or 10 levels."
+      "text": "Grants +10% resistance while sneaking. Caps at 80% across the whole set, or 10 levels."
     },
     {
       "text": "Decreases attack damage while sneaking by 10% per level of the highest level piece.", "paragraph": true

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/turtle_shell.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:turtle_shell",
   "text": [
     {
-      "text": "Grants +8% resistance when underwater. Caps at 80% across the whole set, or 10 levels."
+      "text": "Grants +10% resistance when underwater. Caps at 80% across the whole set, or 10 levels."
     },
     {
       "text": "Increases swim speed by 5% per level.", "paragraph": true