Counter Attack now makes use of a rank system

Changelog.md

@@ -33,6 +33,7 @@ Rank System
     Woodcutting's Double Drop subskill is now named Harvest Lumber
     Archery's Skill Shot now uses a rank system
     Swords' Bleed now uses a rank system
+    Swords' Counter Attack now uses a rank system
     Axe's Axe Mastery now uses a rank system
     Axe's Impact now uses a rank system
     Herbalism's Farmer's Diet now uses a rank system
@@ -45,6 +46,9 @@ Rank System
     Axes' Critical Strikes now uses a rank system
     Axes' Greater Impact now uses a rank system
     Taming's Beast Lore now uses a rank system
+    Taming's Gore now uses a rank system
+    Taming's Call of the Wild now uses a rank system
+    Taming's Pummel now uses a rank system
     Green Thumb now uses a rank system
     Farmer's Diet & Fisherman's Diet now use a rank system
 

Changelog.txt

@@ -109,6 +109,7 @@ Version 2.1.0
  ! (Skills) Woodcutting's Double Drop subskill is now named Harvest Lumber
  ! (Skills) Archery's Skill Shot now uses a rank system
  ! (Skills) Swords' Bleed now uses a rank system
+ ! (Skills) Swords' Counter Attack now uses a rank system
  ! (Skills) Axe's Axe Mastery now uses a rank system
  ! (Skills) Axe's Impact now uses a rank system
  ! (Skills) Herbalism's Farmer's Diet now uses a rank system
@@ -121,6 +122,9 @@ Version 2.1.0
  ! (Skills) Axes' Critical Strikes now uses a rank system
  ! (Skills) Axes' Greater Impact now uses a rank system
  ! (Skills) Taming's Beast Lore now uses a rank system
+ ! (Skills) Taming's Gore now uses a rank system
+ ! (Skills) Taming's Call of the Wild now uses a rank system
+ ! (Skills) Taming's Pummel now uses a rank system
  ! (Kraken) Removed everything involving the kraken
  = (Skills) Shake now sends custom damage types for better nocheat compat
  ! (Config) Unarmed.IronArm in advanced.yml is now Unarmed.IronArmStyle

src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java

@@ -69,7 +69,7 @@ public enum SubSkillType {
     SMELTING_UNDERSTANDING_THE_ART(8),
 
     /* Swords */
-    SWORDS_COUNTER_ATTACK,
+    SWORDS_COUNTER_ATTACK(1),
     SWORDS_RUPTURE(4),
     SWORDS_SERRATED_STRIKES(1),
 

src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -209,7 +209,7 @@ public class TamingManager extends SkillManager {
     public void pummel(LivingEntity target, Wolf wolf) {
         if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.TAMING_PUMMEL))
             return;
-        
+
         double chance = 10 / activationChance;
         SubSkillRandomCheckEvent event = new SubSkillRandomCheckEvent(getPlayer(), SubSkillType.TAMING_PUMMEL, chance);
         mcMMO.p.getServer().getPluginManager().callEvent(event);

src/main/resources/skillranks.yml

@@ -367,6 +367,11 @@ Fishing:
             Rank_7: 850
             Rank_8: 1000
 Swords:
+    CounterAttack:
+        Standard:
+            Rank_1: 20
+        RetroMode:
+            Rank_1: 200
     Rupture:
         Standard:
             Rank_1: 5