Skip to content

Commit

Permalink
Typo cleanup (#4932)
Browse files Browse the repository at this point in the history
Rename weapon categories to melee
Mention bows in lightweight tooltip
Fix impaling having the wrong tooltip
Fix looting description mentioning luck instead
Fix wrong quick charge max level
Fix shield strap saying its an ability
Fix missing deprecation annotation on one of the tags
Fix wrong name in biome tag provider
  • Loading branch information
KnightMiner committed Jan 4, 2023
1 parent ecb4891 commit a2d99ac
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ private static void init() {}
public static final TagKey<Item> DURABILITY = tag("modifiable/durability");

/** @deprecated This used to be common, but the melee unarmed combo ended up being more common, and a compound ingredient is pretty trivial */
@Deprecated
public static final TagKey<Item> MELEE_OR_HARVEST = tag("modifiable/melee_or_harvest");
/** Anything that is used in the player's hand, mostly tools that support interaction, but other tools can be added directly */
public static final TagKey<Item> HELD = tag("modifiable/held");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,9 @@ protected void addTags() {
this.tag(TinkerTags.Biomes.BLOOD_ISLANDS).addTags(IS_NETHER);
this.tag(TinkerTags.Biomes.ENDERSLIME_ISLANDS).add(END_HIGHLANDS, END_MIDLANDS, SMALL_END_ISLANDS, END_BARRENS);
}

@Override
public String getName() {
return "Tinkers' Construct Biome Tags";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"modifier_id": "tconstruct:looting",
"text": [
{
"text": "Increases drop rates from monsters killed with an empty hand. Luck requires a different recipe for each level, applied in order."
"text": "Increases drop rates from monsters killed with an empty hand. Looting requires a different recipe for each level, applied in order."
},
{
"text": "Tools can only receive either luck or looting, based on whether they can break blocks.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ upgrades=Upgrades
upgrades.subtext=Each tool gets a limited total number of upgrades slots.
upgrades.group_general=General
upgrades.group_harvest=Harvest
upgrades.group_weapon=Weapon
upgrades.group_weapon=Melee
upgrades.group_ranged=Ranged
upgrades.group_damage=Damage Boost
upgrades.group_armor=Armor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Maximum of 3 levels",
"Maximum of 4 levels",
"Requires 1 upgrade slot per level"
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Weapon Upgrades",
"title": "Melee Upgrades",
"text": [
{ "text": "Weapon upgrades are most effective on tools built for combat, whether it is a sword or a repurposed harvest tool." },
{ "text": "Melee upgrades are most effective on tools built for melee combat, whether it is a sword, a repurposed harvest tool, or a bow for stabbing." },
{ "text": "When applied to ranged weapons such as bows or crossbows, these modifiers will boost the effectiveness of the weapon for melee attacks only unless otherwise stated.", "paragraph": true },
{ "text": "Many of these upgrades can also be applied to chestplates with the unarmed modifier. They will only boost attacks with an empty hand.", "paragraph": true }
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"title": "Weapon Abilities",
"title": "Melee Abilities",
"text": [
{
"text": "With these abilities perhaps you could forge the strongest weapon of all. Of course what weapon you choose is up to you."
},
{
"text": "These abilities can provide your weapon with extra effects or boost your overall rate of attack. Some of these will also work on chestplates, to boost the effectiveness of punching.",
"text": "These abilities can provide your weapon with extra melee effects or boost your overall rate of attack. Some of these will also work on chestplates, to boost the effectiveness of punching.",
"paragraph": true
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ abilities=Abilities
abilities.subtext=Abilities are more powerful than upgrades, but also have a more limited number of slots.
abilities.group_general=General
abilities.group_harvest=Harvest
abilities.group_weapon=Weapon
abilities.group_weapon=Melee
abilities.group_interact=Interact
abilities.group_armor=Armor
upgrades.subtext=Tools can be enhanced with upgrades, though only a limited number can be applied to each tool.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ upgrades=Upgrades
upgrades.subtext=Tools can be enhanced with upgrades, though only a limited number can be applied per tool.
upgrades.group_general=General
upgrades.group_harvest=Harvest
upgrades.group_weapon=Weapon
upgrades.group_weapon=Melee
upgrades.group_damage=Bonus Damage
upgrades.group_armor=Armor

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"Grants an extra offhand slot",
"Leggings interact allows swapping offhand",
"Multiple levels, each level gives +1 slot",
"Requires 1 ability slot"
"Requires 1 upgrade slot"
]
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"title": "Weapon Upgrades",
"title": "Melee Upgrades",
"text": [
{
"text": "With these upgrades perhaps you could forge the strongest weapon of all. Of course what weapon you choose is up to you."
},
{
"text": "These upgrades can help increase your weapon's potential, increase the damage you do overall, to specific mobs, or to both. The choice is yours.",
"text": "These upgrades can help increase your melee weapon's potential, increase the damage you do overall, to specific mobs, or to both. The choice is yours.",
"paragraph": true
}
]
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/tconstruct/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1833,8 +1833,8 @@
"modifier.tconstruct.punch.flavor": "The classic boxing glove arrow",
"modifier.tconstruct.punch.description": "Makes arrows apply additional knockback",
"modifier.tconstruct.impaling": "Impaling",
"modifier.tconstruct.impaling.flavor": "The power within becomes the power without",
"modifier.tconstruct.impaling.description": "Boosts damage of arrows",
"modifier.tconstruct.impaling.flavor": "Just keeps on going and going and going",
"modifier.tconstruct.impaling.description": "Arrows keep moving after hitting a target, potentially hitting more targets",
"modifier.tconstruct.trueshot": "Trueshot",
"modifier.tconstruct.trueshot.flavor": "This bow will always aim true",
"modifier.tconstruct.trueshot.description": "Increases the accuracy of the weapon",
Expand Down Expand Up @@ -2253,7 +2253,7 @@
"modifier.tconstruct.crystalbound.description": "Tool gains bonus velocity, but arrow angle is restricted",
"modifier.tconstruct.lightweight": "Lightweight",
"modifier.tconstruct.lightweight.flavor": "Like a Shardblade!",
"modifier.tconstruct.lightweight.description": "Tool is incredibly light for its size, allowing you to attack and mine faster",
"modifier.tconstruct.lightweight.description": "Tool is incredibly light for its size, allowing you to attack, mine, and launch projectiles faster",
"modifier.tconstruct.tasty": "Tasty",
"modifier.tconstruct.tasty.flavor": "Om Nom Nom",
"modifier.tconstruct.tasty.description": "Smells so good, you cannot resist taking a few bites of your tool",
Expand Down

0 comments on commit a2d99ac

Please sign in to comment.