diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/language.lang b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/language.lang index e1b2382dbdc..52ac4033dfa 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/language.lang +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/language.lang @@ -2,7 +2,9 @@ intro=Introduction small_tools=Small Tools +small_tools.info=Tool Information large_tools=Broad Tools +large_tools.info=Tool Information tier_one_materials=Tier 1 Materials tier_two_materials=Tier 2 Materials diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/broad_axe.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/broad_axe.json index 8a9342bab7b..dcac331bdb5 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/broad_axe.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/broad_axe.json @@ -6,10 +6,10 @@ ], "properties": [ "+5 Attack Damage", - "150% Attack Damage", + "150% Attack Modifier", "0.6 Attack Speed", - "30% Mining Speed", - "425% Durability", - "Strips wood" + "30% Mining Modifier", + "425% Durability Modifier", + "Strips wood" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/cleaver.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/cleaver.json index fd61685dca2..3b75c17b9d2 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/cleaver.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/cleaver.json @@ -6,10 +6,10 @@ ], "properties": [ "+3.5 Attack Damage", - "150% Attack Damage", + "150% Attack Modifier", "0.9 Attack Speed", - "+1 Reach", - "350% Durability", - "Beheading II" + "+1 Reach", + "350% Durability Modifier", + "Beheading II" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/excavator.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/excavator.json index 4eae6190911..9d79065cc06 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/excavator.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/excavator.json @@ -6,10 +6,10 @@ ], "properties": [ "+1.5 Attack Damage", - "120% Attack Damage", + "120% Attack Modifier", "1.0 Attack Speed", - "30% Mining Speed", - "375% Durability", + "30% Mining Modifier", + "375% Durability Modifier", "Knockback II", "Makes path" ] diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/info.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/info.json new file mode 100644 index 00000000000..033b61997b3 --- /dev/null +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/info.json @@ -0,0 +1,7 @@ +{ + "title": "Tool Information", + "text": [ + { "text": "All broad tools require the Tinker's Anvil to be created, and to swap parts. Most require 4 tool parts, and start with only 2 upgrade slots and 1 ability slot." }, + { "text": "Large tools have both attack bonuses and modifiers like small tools, and many more have traits. In addition, many tools have a durability or a mining speed modifier that act similarly to the attack modifier, affecting both base stats and stat bonuses from modifiers. Finally, all broad tools have the \"two handed\" trait, which prevents use of the offhand unless a modifier such as offhanded is applied.", "paragraph": true } + ] +} diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/scythe.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/scythe.json index 99072dde8f4..817d3ac2661 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/scythe.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/scythe.json @@ -7,10 +7,10 @@ "properties": [ "+1 Attack Damage", "0.8 Attack Speed", - "45% Mining Speed", - "250% Durability", + "45% Mining Modifier", + "250% Durability Modifier", "AOE Attack", "Tills dirt", - "Harvest plants" + "Harvest plants" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/sledge_hammer.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/sledge_hammer.json index 5efc3360a60..8e48744c6ab 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/sledge_hammer.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/sledge_hammer.json @@ -6,10 +6,10 @@ ], "properties": [ "+3 Attack Damage", - "135% Attack Damage", + "135% Attack Modifier", "0.75 Attack Speed", - "40% Mining Speed", - "400% Durability", + "40% Mining Modifier", + "400% Durability Modifier", "Smite II" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/vein_hammer.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/vein_hammer.json index b12d29a19f9..c9ec8a162af 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/vein_hammer.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/large_tools/vein_hammer.json @@ -6,9 +6,9 @@ ], "properties": [ "+3 Attack Damage", - "125% Attack Damage", + "125% Attack Modifier", "1.1 Attack Speed", - "30% Mining Speed", + "30% Mining Modifier", "500% Durability", "Piercing II" ] diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/dagger.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/dagger.json index 2fc0d326668..d4885286f7d 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/dagger.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/dagger.json @@ -6,7 +6,7 @@ ], "properties": [ "+2 Attack Damage", - "50% Attack Damage", + "50% Attack Modifier", "2.0 Attack Speed", "75% Durability", "Padded I", diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/hand_axe.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/hand_axe.json index 21e1d911f7f..0a6d42083c0 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/hand_axe.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/hand_axe.json @@ -2,11 +2,11 @@ "tool": "tconstruct:hand_axe", "text": [ { "text": "The Hand Axe is a precision chopping tool, effective on wood, plants, and leaves." }, - { "text": "Expanders increase the circular radius of the axe.", "paragraph": true }, + { "text": "Expanders increase the circular radius of the axe.", "paragraph": true } ], "properties": [ "+6 Attack Damage", "0.9 Attack Speed", - "Strips wood" + "Strips wood" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/info.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/info.json new file mode 100644 index 00000000000..0a7f2f9d13e --- /dev/null +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/info.json @@ -0,0 +1,7 @@ +{ + "title": "Tool Information", + "text": [ + { "text": "All small tools can be created in either the Tinker Station or the Tinker's Anvil. They require between 2 to 3 parts, granting 2 to 3 traits. Most small tools start with 1 ability slot and 3 upgrade slots as well." }, + { "text": "Most tools have an attack damage bonus, which is added to the head stats and multiplied by the handle stats. In addition, some tools have an attack modifier, which multiplies attack damage from all sources on the tool, including modifiers. Some tools also start with tool traits, which are applied to fully built tools similarly to material traits.", "paragraph": true } + ] +} diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/kama.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/kama.json index 9ad2ef9ff14..e5e09fd5dc9 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/kama.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/kama.json @@ -6,7 +6,7 @@ ], "properties": [ "+1 Attack Damage", - "75% Attack Damage", + "75% Attack Modifier", "1.8 Attack Speed", "Tills dirt", "Shears plants and animals", diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/mattock.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/mattock.json index 91dd03292c1..e7971381468 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/mattock.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/mattock.json @@ -6,7 +6,7 @@ ], "properties": [ "+1.5 Attack Damage", - "1.0 Attack Speed", + "1.0 Attack Speed", "Knockback I", "Makes paths" ] diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/sword.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/sword.json index a287839d4bb..575119e735c 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/sword.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/small_tools/sword.json @@ -7,7 +7,7 @@ "properties": [ "+3 Attack Damage", "1.6 Attack Speed", - "110% Durability", + "110% Durability Modifier", "Sweep Attack" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/knockback.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/knockback.json index 100986e1b58..a66fb2f0dba 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/knockback.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/knockback.json @@ -2,7 +2,7 @@ "modifier_id": "tconstruct:knockback", "text": [ { - "text": "Grants 0.5 knockback per level" + "text": "Grants 0.5 knockback per level, which launches a mob roughly 2 blocks. Most tools start with 0.4 knockback." } ], "more_text_space": true, diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/padded.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/padded.json index 62224d5b01d..57e306274c2 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/padded.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/padded.json @@ -3,9 +3,6 @@ "text": [ { "text": "Reduces knockback on the tool from all sources by 50% per level." - }, - { - "text": "Disclaimer: You are a horrible person for using this on fish, turtles, dolphins, or any other peaceful sea life." } ], "more_text_space": true, diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/piercing.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/piercing.json index 2915ffb048e..d3c6c474bb0 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/piercing.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/piercing.json @@ -2,7 +2,7 @@ "modifier_id": "tconstruct:piercing", "text": [ { - "text": "Adds +0.5 damage per level, multiplied by the tools attack multiplier. The additional damage pierces armor." + "text": "Adds +0.5 damage per level. The additional damage pierces armor." } ], "more_text_space": true, diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/sharpness.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/sharpness.json index 439ba24505a..8724d104900 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/sharpness.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/weapon/sharpness.json @@ -2,7 +2,7 @@ "modifier_id": "tconstruct:sharpness", "text": [ { - "text": "Grants +1 damage per level, multiplied by the tools attack multiplier." + "text": "Grants +1 damage per level." } ], "more_text_space": true, diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/sections/large_tools.json b/src/main/resources/assets/tconstruct/book/encyclopedia/sections/large_tools.json index 66842cf19f3..25cd2d13bfa 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/sections/large_tools.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/sections/large_tools.json @@ -1,4 +1,9 @@ [ + { + "name": "info", + "type": "text", + "data": "large_tools/info.json" + }, { "name": "cleaver", "type": "tool", diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/sections/small_tools.json b/src/main/resources/assets/tconstruct/book/encyclopedia/sections/small_tools.json index c38f9b90229..6c6c8ed4093 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/sections/small_tools.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/sections/small_tools.json @@ -1,4 +1,9 @@ [ + { + "name": "info", + "type": "text", + "data": "small_tools/info.json" + }, { "name": "sword", "type": "tool",