Update books for shield and staff modifier info

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

@@ -5,6 +5,7 @@
     { "text": "\n- Helmets can be controlled using a keybinding for special effects." },
     { "text": "\n- Chestplates can receive interaction abilities that are used when hands are empty. Most are covered in the interaction section." },
     { "text": "\n- Leggings have inventory based abilities and passive boosts to the player." },
-    { "text": "\n- Boots provide movement and jump based abilities." }
+    { "text": "\n- Boots provide movement and jump based abilities." },
+    { "text": "\n- Shields are more effective at counterattacks, but some modifiers only work when blocking." }
   ]
 }

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

@@ -5,7 +5,7 @@
       "text": "Allows drinking fluid contained in the helmet to perform effects using the helmet keybind, such as lighting yourself on fire, clearing status effects, or restoring hunger."
     },
     {
-      "text": "Helmet can be filled with fluid by interacting with a tank or drain while holding it.", "paragraph": true
+      "text": "Tool can be filled with fluid by interacting with a tank or drain while holding it.", "paragraph": true
     }
   ],
   "more_text_space": true,

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

@@ -0,0 +1,17 @@
+{
+  "modifier_id": "tconstruct:spilling",
+  "text": [
+    {
+      "text": "Drains a small amount of fluid (typically between 10 mb to 50 mb) to boost counterattacks with special effects. Shields must be blocking to use. "
+    },
+    {
+      "text": "Tool can be filled with fluid by interacting with a tank or drain while holding the tool."
+    }
+  ],
+  "more_text_space": true,
+  "effects": [
+    "No max level",
+    "Requires 1 ability slot",
+    "Fill by using tool on a fluid tank"
+  ]
+}

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

@@ -2,10 +2,10 @@
   "modifier_id": "tconstruct:wetting",
   "text": [
     {
-      "text": "Drains a small amount of fluid (typically between 10 mb to 50 mb) when damaged to apply effects such as fire, healing, or clearing status effects. "
+      "text": "Drains a small amount of fluid (typically between 10 mb to 50 mb) when damaged to apply effects such as fire, healing, or clearing status effects. Only works while blocking for shields. "
     },
     {
-      "text": "Leggings can be filled with fluid interacting with a tank or drain while holding it.", "paragraph": true
+      "text": "Tool can be filled with fluid interacting with a tank or drain while holding it.", "paragraph": true
     }
   ],
   "more_text_space": true,

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/weapon/blocking.json

@@ -0,0 +1,16 @@
+{
+  "modifier_id": "tconstruct:blocking",
+  "text": [
+    {
+      "text": "Allows using the tool as a shield, blocking many potential attacks. "
+    },
+    {
+      "text": "Most tools can block up to 5 damage, but some (such as staffs) can block amounts in the range of 15 to 20 damage."
+    }
+  ],
+  "more_text_space": true,
+  "effects": [
+    "Single level",
+    "Requires 1 ability slot"
+  ]
+}

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/weapon/spilling.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:spilling",
   "text": [
     {
-      "text": "Drains a small amount of fluid (typically between 10 mb to 50 mb) to boost attacks or counterattacks with special effects, such as fire, bonus damage, or potion effects. "
+      "text": "Drains a small amount of fluid (typically between 10 mb to 50 mb) to boost attacks with special effects, such as fire, bonus damage, or potion effects. "
     },
     {
       "text": "Tool can be filled with fluid by interacting with a tank or drain while holding the tool."

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

@@ -1,6 +1,6 @@
 {
   "title": "Protection Defense Modifiers",
   "text": [
-    { "text": "Protection defense modifiers increase resistance to a particular type of damage. All damage sources should fit into one of the five types, and types can be freely mixed on armor." }
+    { "text": "Protection defense modifiers increase resistance to a particular type of damage. All damage sources should fit into one of the five types, and types can be freely mixed on armor and shields for passive benefits." }
   ]
 }

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/slotless/general/dyed.json

@@ -2,7 +2,7 @@
   "modifier_id": "tconstruct:dyed",
   "text": [
     {
-      "text": "Changes the color of the leather parts of travelers's gear."
+      "text": "Changes the color of the leather or wood parts of travelers's gear, shields, and staffs."
     },
     {
       "text": "Can mix multiple dyes, along with mixing dyes from the previous gear color.", "paragraph": true

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/slotless/general/embellishment.json

@@ -2,10 +2,10 @@
   "modifier_id": "tconstruct:embellishment",
   "text": [
     {
-      "text": "Allows changing the appearance of plate armor and the slimesuit."
+      "text": "Allows changing the appearance of plate armor, slimesuits, staffs, and shields."
     },
     {
-      "text": "Plate armor is embellished using metal ingots, while the slimesuit uses congealed slime blocks.",
+      "text": "Metal is embellished using metal ingots, while the slime uses congealed slime blocks.",
       "paragraph": true
     }
   ],

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

@@ -1,6 +1,7 @@
 {
   "title": "Armor Upgrades",
   "text": [
-    { "text": "Armor upgrades are typically effective on a single type of armor or are designed to run on counter attack. If applicable on multiple pieces, the effects typically interact in some way." }
+    { "text": "Armor upgrades are typically effective on a single type of armor or are designed to run on counter attack. If applicable on multiple pieces, the effects typically interact in some way." },
+    { "text": "Shield counterattack modifiers only work while blocking, but are otherwise twice as effective. Other shield modifiers work passively.", "paragraph": true }
   ]
 }

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/springy.json

@@ -3,6 +3,9 @@
   "text": [
     {
       "text": "Has a 25% chance per level to apply up to 2 blocks of knockback per level to the attacker. Applies effect from the piece with the largest bonus."
+    },
+    {
+      "text": "Shields are twice as effective but only work when blocking.", "paragraph": true
     }
   ],
   "more_text_space": true,

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/sticky.json

@@ -5,7 +5,7 @@
       "text": "Has a 25% chance per level to apply up to 1.5 seconds (plus 1 seconds per level) of slowness to the attacker. Applies effect from the piece with the largest bonus."
     },
     {
-      "text": "On weapons, the bonus applies to attacked targets.", "paragraph": true
+      "text": "On weapons, the bonus applies to attacked targets. Shields are twice as effective but only work when blocking.", "paragraph": true
     }
   ],
   "more_text_space": true,

src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/thorns.json

@@ -3,6 +3,9 @@
   "text": [
     {
       "text": "Has a 15% chance per level to apply 1 to 4 damage to the attacker. Multiple pieces will stack the effect."
+    },
+    {
+      "text": "Shields are twice as effective but only work when blocking.", "paragraph": true
     }
   ],
   "more_text_space": true,

src/main/resources/assets/tconstruct/book/encyclopedia/sections/abilities.json

@@ -22,6 +22,10 @@
     "type": "mantle:text",
     "data": "abilities/weapon.json"
   },
+  {
+    "type": "tconstruct:modifier",
+    "data": "abilities/weapon/blocking.json"
+  },
   {
     "type": "tconstruct:modifier",
     "data": "abilities/weapon/dual_wielding.json"
@@ -181,7 +185,7 @@
   },
   {
     "type": "tconstruct:modifier",
-    "data": "abilities/weapon/spilling.json"
+    "data": "abilities/armor/spilling.json"
   },
   {
     "type": "tconstruct:modifier",

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

@@ -5,6 +5,7 @@
     { "text": "\n- Helmets can be controlled using a keybinding for special effects." },
     { "text": "\n- Chestplates can receive interaction abilities that are used when hands are empty. Most are covered in the interaction section." },
     { "text": "\n- Leggings have inventory based abilities and passive boosts to the player." },
-    { "text": "\n- Boots provide movement and jump based abilities." }
+    { "text": "\n- Boots provide movement and jump based abilities." },
+    { "text": "\n- Shields have special abilities on blocking, including stronger counterattack modifiers." }
   ]
 }

src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/abilities/armor/slurping.json

@@ -5,7 +5,7 @@
       "text": "He was number one!"
     },
     {
-      "text": "Right clicking a tank while holding the helmet to fill with fluid.", "paragraph": true
+      "text": "Right clicking a tank while holding the tool fills it with fluid.", "paragraph": true
     }
   ],
   "effects": [

src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/abilities/armor/spilling.json

@@ -0,0 +1,16 @@
+{
+  "modifier_id": "tconstruct:spilling",
+  "text": [
+    {
+      "text": "Kinda gross that your tool is leaking. But also very effective!"
+    },
+    {
+      "text": "Right clicking a tank with tool fills it", "paragraph": true
+    }
+  ],
+  "effects": [
+    "Drains tank when attacked, must be blocking for shields",
+    "Various effects based on fluid, including fire and poison",
+    "Requires 1 Ability Slot per level"
+  ]
+}

src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/abilities/armor/wetting.json

@@ -5,7 +5,7 @@
       "text": "Its okay if you wet yourself a bit when you get hurt. Wait, you did not add this modifier to your pants?"
     },
     {
-      "text": "Use pants on a tank to fill with fluid.", "paragraph": true
+      "text": "Use tool on a tank to fill with fluid.", "paragraph": true
     }
   ],
   "effects": [

src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/abilities/weapon/blocking.json

@@ -0,0 +1,13 @@
+{
+  "modifier_id": "tconstruct:blocking",
+  "text": [
+    {
+      "text": "Your sword is now a shield, now just need a way to make your shield a sword."
+    }
+  ],
+  "effects": [
+    "Allows you to block with your tool",
+    "Single Level",
+    "Requires 1 Ability Slot"
+  ]
+}

src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/abilities/weapon/dual_wielding.json

@@ -7,7 +7,6 @@
   ],
   "effects": [
     "Allows you to dual wield your tools",
-    "Requires offhanded for two-handed tools",
     "Single Level",
     "Requires 1 Ability Slot"
   ]

src/main/resources/assets/tconstruct/book/mighty_smelting/en_us/abilities/weapon/spilling.json

@@ -11,6 +11,6 @@
   "effects": [
     "Drains tank on attacking",
     "Various effects based on fluid, including fire and poison",
-    "Requires 1 Ability Slot, single level"
+    "Requires 1 Ability Slot per level"
   ]
 }

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

@@ -1,6 +1,6 @@
 {
   "title": "Protection Defense Modifiers",
   "text": [
-    { "text": "Protection defense modifiers increase resistance to a particular type of damage. All damage sources should fit into one of the five types, and types can be freely mixed on armor." }
+    { "text": "Protection defense modifiers increase resistance to a particular type of damage. All damage sources should fit into one of the five types, and types can be freely mixed on armor and shields for passive protection." }
   ]
 }

src/main/resources/assets/tconstruct/book/mighty_smelting/sections/abilities.json

@@ -22,6 +22,10 @@
     "type": "mantle:text",
     "data": "abilities/weapon.json"
   },
+  {
+    "type": "tconstruct:modifier",
+    "data": "abilities/weapon/blocking.json"
+  },
   {
     "type": "tconstruct:modifier",
     "data": "abilities/weapon/dual_wielding.json"
@@ -175,7 +179,7 @@
   },
   {
     "type": "tconstruct:modifier",
-    "data": "abilities/weapon/spilling.json"
+    "data": "abilities/armor/spilling.json"
   },
   {
     "type": "tconstruct:modifier",

src/main/resources/assets/tconstruct/book/puny_smelting/en_us/slotless/general/dyed.json

@@ -6,7 +6,7 @@
     }
   ],
   "effects": [
-    "Can use dyes to change the color of traveler's gear",
+    "Can use dyes to change the color of the tool",
     "Multi-use",
     "Slotless"
   ]

src/main/resources/assets/tconstruct/book/puny_smelting/en_us/slotless/general/embellishment.json

@@ -6,9 +6,9 @@
     }
   ],
   "effects": [
-    "Changes the appearance of armor",
-    "Use ingots to embellish plate",
-    "Use congealed slime to embellish slime suit",
+    "Changes the appearance of armor, shields, and staffs",
+    "Use ingots to embellish metal",
+    "Use congealed slime to embellish slime",
     "Multi-use",
     "Slotless"
   ]

src/main/resources/assets/tconstruct/book/puny_smelting/en_us/upgrades/armor.json

@@ -1,6 +1,6 @@
 {
   "title": "Armor Upgrades",
   "text": [
-    { "text": "Armor upgrades provide ways to modify your jump, speed, and other such factors." }
+    { "text": "Armor upgrades provide ways to modify your jump, speed, and other such factors on armor and shields." }
   ]
 }