Reworked the relationship between SubSkill and Locale keys

src/main/resources/locale/locale_cy.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Graceful Landing**
 Acrobatics.Combat.Proc=[[GREEN]] **osgoi\'r**
 Acrobatics.DodgeChance=[[RED]]Dodge Chance: [[YELLOW]]{0}
-Acrobatics.Effect.0=Roll
-Acrobatics.Effect.1=Reduces or Negates fall damage
-Acrobatics.Effect.2=Graceful Roll
-Acrobatics.Effect.3=Twice as effective as a normal Roll
-Acrobatics.Effect.4=Dodge
-Acrobatics.Effect.5=Reduce attack damage by half
+Acrobatics.SubSkill.Roll.Name=Roll
+Acrobatics.SubSkill.Roll.Description=Reduces or Negates fall damage
+Acrobatics.SubSkill.GracefulRoll.Name=Graceful Roll
+Acrobatics.SubSkill.GracefulRoll.Description=Twice as effective as a normal Roll
+Acrobatics.SubSkill.Dodge.Name=Dodge
+Acrobatics.SubSkill.Dodge.Description=Reduce attack damage by half
 Acrobatics.Listener=Acrobateg
 Acrobatics.Roll.Chance=[[RED]]Roll Chance: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Graceful Roll Chance: [[YELLOW]]{0}
@@ -16,11 +16,11 @@ Acrobatics.Skillup=[[YELLOW]] Acrobateg sgil cynyddu {0}. Cyfanswm ({1})
 Archery.Combat.DazeChance=[[RED]]Chance to Daze: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Chance to Retrieve Arrows: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}
-Archery.Effect.0=Skill Shot
-Archery.Effect.1=Increases damage done with bows
-Archery.Effect.2=Daze (Players)
-Archery.Effect.4=Arrow Retrieval
-Archery.Effect.5=Chance to retrieve arrows from corpses
+Archery.SubSkill.SkillShot.Name=Skill Shot
+Archery.SubSkill.SkillShot.Description=Increases damage done with bows
+Archery.SubSkill.Daze.Name=Daze (Players)
+Archery.SubSkill.ArrowRetrieval.Name=Arrow Retrieval
+Archery.SubSkill.ArrowRetrieval.Description=Chance to retrieve arrows from corpses
 Archery.Listener=Archery:
 Archery.SkillName=ARCHERY
 Archery.Skillup=[[YELLOW]] sgiliau Saethyddiaeth cynyddu {0}. Cyfanswm ({1})
@@ -38,16 +38,16 @@ Axes.Combat.CriticalHit=[[RED]]CRITICAL HIT!
 Axes.Combat.GI.Proc=[[GREEN]]**STRUCK WITH GREAT FORCE**
 Axes.Combat.GI.Struck=[[RED]] ** ** BRIFO GAN EFFAITH FWYAF
 Axes.Combat.SS.Length=[[RED]]Skull Splitter Length: [[YELLOW]]{0}s
-Axes.Effect.0=Skull Splitter
-Axes.Effect.1=Deal AoE Damage
-Axes.Effect.2=Critical Strikes
-Axes.Effect.3=Double Damage
-Axes.Effect.4=Axe Mastery
-Axes.Effect.5=Adds bonus DMG
-Axes.Effect.6=Impact
-Axes.Effect.7=Strike with enough force to shatter armor
-Axes.Effect.8=Greater Impact
-Axes.Effect.9=Deal bonus damage to unarmored foes
+Axes.SubSkill.SkullSplitter.Name=Skull Splitter
+Axes.SubSkill.SkullSplitter.Description=Deal AoE Damage
+Axes.SubSkill.CriticalStrikes.Name=Critical Strikes
+Axes.SubSkill.CriticalStrikes.Description=Double Damage
+Axes.SubSkill.AxeMastery.Name=Axe Mastery
+Axes.SubSkill.AxeMastery.Description=Adds bonus DMG
+Axes.SubSkill.ArmorImpact.Name=Impact
+Axes.SubSkill.ArmorImpact.Description=Strike with enough force to shatter armor
+Axes.SubSkill.GreaterImpact.Name=Greater Impact
+Axes.SubSkill.GreaterImpact.Description=Deal bonus damage to unarmored foes
 Axes.Listener=Axes:
 Axes.SkillName=AXES
 Axes.Skills.SS.Off=[[RED]]**Skull Splitter has worn off**
@@ -58,10 +58,10 @@ Axes.Skills.SS.Other.On=[[GREEN]] {0} [[DARK_GREEN]] wedi defnyddio [[RED]] Llor
 Axes.Skillup=[[YELLOW]] sgiliau Echelau cynyddu {0}. Cyfanswm ({1})
 Excavation.Ability.Lower=[[GRAY]]**YOU LOWER YOUR SHOVEL**
 Excavation.Ability.Ready=[[GREEN]]**YOU READY YOUR SHOVEL**
-Excavation.Effect.0=Giga Drill Breaker
-Excavation.Effect.1=3x Drop Rate, 3x EXP, +Speed
-Excavation.Effect.2=Treasure Hunter
-Excavation.Effect.3=Ability to dig for treasure
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Drill Breaker
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Speed
+Excavation.SubSkill.TreasureHunter.Name=Treasure Hunter
+Excavation.SubSkill.TreasureHunter.Description=Ability to dig for treasure
 Excavation.Effect.Length=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s
 Excavation.Listener=Cloddio:
 Excavation.SkillName=CLODDIO
@@ -77,14 +77,14 @@ Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5
 Fishing.Ability.TH.MagicRate=[[RED]]Magic Hunter Chance: [[YELLOW]]{0}
 Fishing.Ability.Shake=[[RED]]Shake Chance: [[YELLOW]]{0}
 Fishing.Ability.FD=[[RED]]Fisherman\'\'s Diet: [[YELLOW]]Rank {0}
-Fishing.Effect.0=Treasure Hunter (Passive)
-Fishing.Effect.1=Fish up misc. objects
-Fishing.Effect.2=Magic Hunter
-Fishing.Effect.3=Find Enchanted Items
-Fishing.Effect.4=Shake (vs. Entities)
-Fishing.Effect.5=Shake items off of mobs w/ fishing pole
-Fishing.Effect.6=Fisherman\'s Diet
-Fishing.Effect.7=Improves hunger restored from fished foods
+Fishing.SubSkill.TreasureHunter.Name=Treasure Hunter (Passive)
+Fishing.SubSkill.TreasureHunter.Description=Fish up misc. objects
+Fishing.SubSkill.MagicHunter.Name=Magic Hunter
+Fishing.SubSkill.MagicHunter.Description=Find Enchanted Items
+Fishing.SubSkill.Shake.Name=Shake (vs. Entities)
+Fishing.SubSkill.Shake.Description=Shake items off of mobs w/ fishing pole
+Fishing.SubSkill.FishermansDiet.Name=Fisherman\'s Diet
+Fishing.SubSkill.FishermansDiet.Description=Improves hunger restored from fished foods
 Fishing.Chance.Raining=[[BLUE]] Rain Bonus
 Fishing.Listener=Fishing:
 Fishing.Ability.TH.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
@@ -99,15 +99,15 @@ Herbalism.Ability.GTh.Stage=[[RED]]Green Thumb Stage: [[YELLOW]] Crops grow in s
 Herbalism.Ability.GTh=[[GREEN]]**GREEN THUMB**
 Herbalism.Ability.Lower=[[GRAY]]**YOU LOWER YOUR HOE**
 Herbalism.Ability.Ready=[[GREEN]]**YOU READY YOUR HOE**
-Herbalism.Effect.0=Green Terra
-Herbalism.Effect.1=Spread the Terra, 3x Drops
-Herbalism.Effect.2=Green Thumb (Wheat)
-Herbalism.Effect.3=Auto-Plants crops when harvesting
-Herbalism.Effect.5=Make bricks mossy, or make grass grow
-Herbalism.Effect.6=Farmer\'s Diet
-Herbalism.Effect.7=Improves hunger restored from farmed foods
-Herbalism.Effect.8=Double Drops (All Herbs)
-Herbalism.Effect.9=Double the normal loot
+Herbalism.SubSkill.GreenTerra.Name=Green Terra
+Herbalism.SubSkill.GreenTerra.Description=Spread the Terra, 3x Drops
+Herbalism.SubSkill.GreenThumb.Name=Green Thumb (Wheat)
+Herbalism.SubSkill.GreenThumb.Description=Auto-Plants crops when harvesting
+Herbalism.SubSkill.GreenThumb.Description.2=Make bricks mossy, or make grass grow
+Herbalism.SubSkill.FarmersDiet.Name=Farmer\'s Diet
+Herbalism.SubSkill.FarmersDiet.Description=Improves hunger restored from farmed foods
+Herbalism.SubSkill.DoubleDrops.Name=Double Drops (All Herbs)
+Herbalism.SubSkill.DoubleDrops.Description=Double the normal loot
 Herbalism.Listener=Meddygaeth lysieuol:
 Herbalism.SkillName=HERBALISM
 Herbalism.Skills.GTe.On=[[GREEN]]**GREEN TERRA ACTIVATED**
@@ -121,16 +121,16 @@ Mining.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (BIGGER BOMBS)
 Mining.Ability.Locked.2=LOCKED UNTIL {0}+ SKILL (DEMOLITIONS EXPERTISE)
 Mining.Ability.Lower=[[GRAY]]**YOU LOWER YOUR PICKAXE**
 Mining.Ability.Ready=[[GREEN]] ** CHI\'N BAROD EICH PICKAXE **
-Mining.Effect.0=Super Breaker
-Mining.Effect.1=Speed+, Triple Drop Chance
-Mining.Effect.2=Double Drops
-Mining.Effect.3=Double the normal loot
-Mining.Effect.4=Blast Mining
-Mining.Effect.5=Bonuses to mining with TNT
-Mining.Effect.6=Bigger Bombs
-Mining.Effect.7=Increases TNT explosion radius
-Mining.Effect.8=Demolitions Expertise
-Mining.Effect.9=Decreases damage from TNT explosions
+Mining.SubSkill.SuperBreaker.Name=Super Breaker
+Mining.SubSkill.SuperBreaker.Description=Speed+, Triple Drop Chance
+Mining.SubSkill.DoubleDrops.Name=Double Drops
+Mining.SubSkill.DoubleDrops.Description=Double the normal loot
+Mining.SubSkill.BlastMining.Name=Blast Mining
+Mining.SubSkill.BlastMining.Description=Bonuses to mining with TNT
+Mining.SubSkill.BiggerBombs.Name=Bigger Bombs
+Mining.SubSkill.BiggerBombs.Description=Increases TNT explosion radius
+Mining.SubSkill.DemolitionsExpertise.Name=Demolitions Expertise
+Mining.SubSkill.DemolitionsExpertise.Description=Decreases damage from TNT explosions
 Mining.Effect.Decrease=[[RED]]Demolitions Expert Damage Decrease: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0}
 Mining.Listener=Mwyngloddio:
@@ -146,24 +146,24 @@ Mining.Blast.Radius.Increase=[[RED]] Chwyth Cynnydd Radiws [[YELLOW]] {0}
 Mining.Blast.Rank=[[RED]]Blast Mining: [[YELLOW]] Rank {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
 Mining.Blast.Refresh=[[GREEN]] Eich [[YELLOW]] Mwyngloddio Chwyth [[GREEN]] gallu ei hadnewyddu!
-Repair.Effect.0=Repair
-Repair.Effect.1=Repair Tools & Armor
-Repair.Effect.10=Gold Repair ({0}+ SKILL)
-Repair.Effect.11=Repair Gold Tools & Armor
-Repair.Effect.12=Iron Repair ({0}+ SKILL)
-Repair.Effect.13=Repair Iron Tools & Armor
-Repair.Effect.14=Stone Repair ({0}+ SKILL)
-Repair.Effect.15=Repair Stone Tools
-Repair.Effect.2=Repair Mastery
-Repair.Effect.3=Increased repair amount
-Repair.Effect.4=Super Repair
-Repair.Effect.5=Double effectiveness
-Repair.Effect.6=Diamond Repair ({0}+ SKILL)
-Repair.Effect.7=Repair Diamond Tools & Armor
-Repair.Effect.8=Arcane Forging
-Repair.Effect.9=Atgyweiriwch eitemau sydd hud
-Repair.Effect.16=Salvage ({0}+ SKILL)
-Repair.Effect.17=Salvage Tools & Armor
+Repair.SubSkill.Repair.Name=Repair
+Repair.SubSkill.Repair.Description=Repair Tools & Armor
+Repair.SubSkill.GoldRepair.Name=Gold Repair ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=Repair Gold Tools & Armor
+Repair.SubSkill.IronRepair.Name=Iron Repair ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=Repair Iron Tools & Armor
+Repair.SubSkill.StoneRepair.Name=Stone Repair ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=Repair Stone Tools
+Repair.SubSkill.RepairMastery.Name=Repair Mastery
+Repair.SubSkill.RepairMastery.Description=Increased repair amount
+Repair.SubSkill.SuperRepair.Name=Super Repair
+Repair.SubSkill.SuperRepair.Description=Double effectiveness
+Repair.SubSkill.DiamondRepair.Name=Diamond Repair ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Repair Diamond Tools & Armor
+Repair.SubSkill.ArcaneForging.Name=Arcane Forging
+Repair.SubSkill.ArcaneForging.Description=Atgyweiriwch eitemau sydd hud
+Repair.SubSkill.Salvage.Name=Salvage ({0}+ SKILL)
+Repair.SubSkill.Salvage.Description=Salvage Tools & Armor
 Repair.Error=[[DARK_RED]]mcMMO encountered an error attempting to repair this item!
 Repair.Listener.Anvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor.
 Repair.Listener.Anvil2=[[DARK_RED]]You have placed a Salvage anvil, use this to Salvage tools and armor.
@@ -202,11 +202,11 @@ Swords.Combat.Counter.Chance=[[RED]]Counter Attack Chance: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Hit with a counter-attack!
 Swords.Combat.Countered=[[GREEN]] ** GWRTH-YMOSOD **
 Swords.Combat.SS.Struck=[[DARK_RED]] Taro gan Streiciau danheddog!
-Swords.Effect.0=Counter Attack
-Swords.Effect.2=Serrated Strikes
+Swords.SubSkill.CounterAttack.Name=Counter Attack
+Swords.SubSkill.SerratedStrikes.Name=Serrated Strikes
 Swords.Effect.4=Serrated Strikes Bleed+
-Swords.Effect.6=Bleed
-Swords.Effect.7=Apply a bleed DoT
+Swords.SubSkill.Bleed.Name=Bleed
+Swords.SubSkill.Bleed.Description=Apply a bleed DoT
 Swords.Listener=Swords:
 Swords.SkillName=SWORDS
 Swords.Skills.SS.Off=[[RED]]**Serrated Strikes has worn off**
@@ -229,24 +229,24 @@ Taming.Ability.Locked.2=LOCKED UNTIL {0}+ SKILL (SHOCK PROOF)
 Taming.Ability.Locked.3=LOCKED UNTIL {0}+ SKILL (SHARPENED CLAWS)
 Taming.Ability.Locked.4=LOCKED UNTIL {0}+ SKILL (FAST FOOD SERVICE)
 Taming.Combat.Chance.Gore=[[RED]]Gore Chance: [[YELLOW]]{0}
-Taming.Effect.0=Beast Lore
-Taming.Effect.1=Bone-whacking inspects wolves & ocelots
-Taming.Effect.10=Shock Proof
-Taming.Effect.11=Explosive Damage Reduction
-Taming.Effect.12=Call of the Wild
-Taming.Effect.13=Summon an animal to your side
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): Crouch and left-click with {0} Fish in hand
+Taming.SubSkill.BeastLore.Name=Beast Lore
+Taming.SubSkill.BeastLore.Description=Bone-whacking inspects wolves & ocelots
+Taming.SubSkill.ShockProof.Name=Shock Proof
+Taming.SubSkill.ShockProof.Description=Explosive Damage Reduction
+Taming.SubSkill.CallOfTheWild.Name=Call of the Wild
+Taming.SubSkill.CallOfTheWild.Description=Summon an animal to your side
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): Crouch and left-click with {0} Fish in hand
 Taming.Effect.15=[[GRAY]]COTW (Wolf): Crouch and left-click with {0} Bones in hand
-Taming.Effect.16=Fast Food Service
-Taming.Effect.17=Chance for wolves to heal on attack
-Taming.Effect.2=Gore
-Taming.Effect.3=Critical Strike that applies Bleed
-Taming.Effect.4=Sharpened Claws
-Taming.Effect.5=Damage Bonus
-Taming.Effect.6=Environmentally Aware
-Taming.Effect.7=Cactus/Lava Phobia, Fall DMG Immune
-Taming.Effect.8=Thick Fur
-Taming.Effect.9=DMG Reduction, Fire Resistance
+Taming.SubSkill.FastFoodService.Name=Fast Food Service
+Taming.SubSkill.FastFoodService.Description=Chance for wolves to heal on attack
+Taming.SubSkill.Gore.Name=Gore
+Taming.SubSkill.Gore.Description=Critical Strike that applies Bleed
+Taming.SubSkill.SharpenedClaws.Name=Sharpened Claws
+Taming.SubSkill.SharpenedClaws.Description=Damage Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Environmentally Aware
+Taming.SubSkill.EnvironmentallyAware.Description=Cactus/Lava Phobia, Fall DMG Immune
+Taming.SubSkill.ThickFur.Name=Thick Fur
+Taming.SubSkill.ThickFur.Description=DMG Reduction, Fire Resistance
 Taming.Listener.Wolf=[[DARK_GRAY]] Eich sgrialu i blaidd yn \u00f4l i chi ...
 Taming.Listener=Taming:
 Taming.SkillName=TAMING
@@ -263,14 +263,14 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Your opponent has an iron grip!
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Your iron grip kept you from being disarmed!
 Unarmed.Ability.Lower=[[GRAY]]**YOU LOWER YOUR FISTS**
 Unarmed.Ability.Ready=[[GREEN]]**YOU READY YOUR FISTS**
-Unarmed.Effect.0=Berserk
-Unarmed.Effect.1=+50% DMG, Breaks weak materials
-Unarmed.Effect.2=Disarm (Players)
-Unarmed.Effect.3=Drops the foes item held in hand
-Unarmed.Effect.4=Iron Arm Style
-Unarmed.Effect.5=Hardens your arm over time
-Unarmed.Effect.6=Arrow Deflect
-Unarmed.Effect.7=Deflect arrows
+Unarmed.SubSkill.Berserk.Name=Berserk
+Unarmed.SubSkill.Berserk.Description=+50% DMG, Breaks weak materials
+Unarmed.SubSkill.Disarm.Name=Disarm (Players)
+Unarmed.SubSkill.Disarm.Description=Drops the foes item held in hand
+Unarmed.SubSkill.IronArmStyle.Name=Iron Arm Style
+Unarmed.SubSkill.IronArmStyle.Description=Hardens your arm over time
+Unarmed.SubSkill.ArrowDeflect.Name=Arrow Deflect
+Unarmed.SubSkill.ArrowDeflect.Description=Deflect arrows
 Unarmed.Listener=Dim Arfau:
 Unarmed.SkillName=UNARMED
 Unarmed.Skills.Berserk.Off=[[RED]] ** arno\\\'i hun wedi gwisgo i ffwrdd **
@@ -284,12 +284,12 @@ Woodcutting.Ability.1=Chwythu i ffwrdd yn gadael
 Woodcutting.Ability.Chance.DDrop=[[RED]]Double Drop Chance: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Tree Feller Length: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (LEAF BLOWER)
-Woodcutting.Effect.0=Tree Feller
-Woodcutting.Effect.1=Make trees explode
-Woodcutting.Effect.2=Leaf Blower
-Woodcutting.Effect.3=Blow Away Leaves
-Woodcutting.Effect.4=Double Drops
-Woodcutting.Effect.5=Double the normal loot
+Woodcutting.SubSkill.TreeFeller.Name=Tree Feller
+Woodcutting.SubSkill.TreeFeller.Description=Make trees explode
+Woodcutting.SubSkill.LeafBlower.Name=Leaf Blower
+Woodcutting.SubSkill.LeafBlower.Description=Blow Away Leaves
+Woodcutting.SubSkill.HarvestLumber.Name=Double Drops
+Woodcutting.SubSkill.HarvestLumber.Description=Double the normal loot
 Woodcutting.Listener=Woodcutting:
 Woodcutting.SkillName=Torri coed
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Tree Feller has worn off**