diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java index bd4f0b7bf..afc6d1540 100644 --- a/src/main/java/com/gmail/nossr50/Combat.java +++ b/src/main/java/com/gmail/nossr50/Combat.java @@ -77,8 +77,7 @@ public class Combat } else if(m.isAxes(itemInHand) && mcPermissions.getInstance().axes(attacker)) { - if(Users.getProfile(attacker).getSkillLevel(SkillType.AXES) >= 500) - event.setDamage(damage + 4); + Axes.axesBonus(attacker, event); Axes.axeCriticalCheck(attacker, event, pluginx); //Critical hit diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index 6755047c7..e1ff33195 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -99,11 +99,19 @@ m.EffectsAxes1_0=[[YELLOW]]Schaedelspalter (Faehigkeit) m.EffectsAxes1_1=[[AQUA]]Verursacht Flaechenschaden m.EffectsAxes2_0=[[YELLOW]]Kritischer Schlag m.EffectsAxes2_1=[[AQUA]]doppelter Schaden -m.EffectsAxes3_0=[[YELLOW]]Axtmeister (500 Skilllevel) -m.EffectsAxes3_1=[[AQUA]]Modifiziert Schaden -m.AbilLockAxes1=[[DARK_AQUA]]gesperrt bis 500+ Skilllevel(Axtmeister) -m.AbilBonusAxes1_0=[[YELLOW]]Axtmeister -m.AbilBonusAxes1_1=[[AQUA]]4 Bonus-Schaden +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[YELLOW]]Chance fuer kritische Treffer: [[GREEN]]{0}% m.AxesSkullLength=[[YELLOW]]Schaedelspalter Dauer: [[GREEN]]{0}s m.SkillSwords=Schwert (Swords) diff --git a/src/main/resources/locale/locale_en_us.properties b/src/main/resources/locale/locale_en_us.properties index a66b55407..42800ddb0 100644 --- a/src/main/resources/locale/locale_en_us.properties +++ b/src/main/resources/locale/locale_en_us.properties @@ -100,7 +100,7 @@ m.EffectsAxes1_1=Deal AoE Damage m.EffectsAxes2_0=Critical Strikes m.EffectsAxes2_1=Double Damage m.EffectsAxes3_0=Axe Mastery -m.EffectsAxes3_1=Modifies Damage +m.EffectsAxes3_1=Adds bonus DMG m.EffectsAxes4_0=Impact m.EffectsAxes4_1=Strike with enough force to shatter armor m.EffectsAxes5_0=Greater Impact diff --git a/src/main/resources/locale/locale_es_es.properties b/src/main/resources/locale/locale_es_es.properties index 4bf20ea8e..26fe05164 100644 --- a/src/main/resources/locale/locale_es_es.properties +++ b/src/main/resources/locale/locale_es_es.properties @@ -99,11 +99,19 @@ m.EffectsAxes1_0=Cortador de cabecas (HABILIDAD) m.EffectsAxes1_1=Causa daños en arena m.EffectsAxes2_0=Golpes criticos m.EffectsAxes2_1=Doble de daño -m.EffectsAxes3_0=Maestria de hacha -m.EffectsAxes3_1=Modifica el daño -m.AbilLockAxes1=BLOQUEADO HASTA TENER HABILIDAD +500 (MAESTRIA DE HACHA) -m.AbilBonusAxes1_0=Maestria de hacha -m.AbilBonusAxes1_1=4 de daño de bonus +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[RED]]Posibilad de golpe critico: [[YELLOW]]{0}% m.AxesSkullLength=[[RED]]Longitud de Cortador de cabezas: [[YELLOW]]{0}s m.SkillSwords=ESPADAS diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index f4dad1cbb..5351155c2 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -99,11 +99,19 @@ m.EffectsAxes1_0=Kallonhalkoja (TAITO) m.EffectsAxes1_1=Tee aluevahinkoa m.EffectsAxes2_0=Kriittiset Iskut m.EffectsAxes2_1=Tuplavahinko -m.EffectsAxes3_0=Kirveiden Herra (500 TAITO) -m.EffectsAxes3_1=Muokkaa vahinkoa -m.AbilLockAxes1=LUKITTU KUNNES 500+ TAITO (KIRVEIDEN HERRA) -m.AbilBonusAxes1_0=Kirveiden Herra -m.AbilBonusAxes1_1=+4 Vahinko +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[RED]]Todennäköisyys iskeä kriittisesti: [[YELLOW]]{0}% m.AxesSkullLength=[[RED]]Kallonhalkojan kesto: [[YELLOW]]{0}s m.SkillSwords=MIEKAT diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index 5f57d64ff..5c3c2410e 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -99,11 +99,19 @@ m.EffectsAxes1_0=Fendeur de cr m.EffectsAxes1_1=provoque des dégâts de zone m.EffectsAxes2_0=Coup critiques m.EffectsAxes2_1=double les dégâts -m.EffectsAxes3_0=Maîtrise de la hache (niveau 500) -m.EffectsAxes3_1=Augmente les dégâts -m.AbilLockAxes1=Débloqué au niveau 500 (Maîtrise de la hache) -m.AbilBonusAxes1_0=Maîtrise de la hache -m.AbilBonusAxes1_1=4 Blessures en bonus +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[RED]]Chances de coup critique : [[YELLOW]]{0}% m.AxesSkullLength=[[RED]]Durée de votre capacité spéciale : [[YELLOW]]{0}s m.SkillSwords=ÉPÉE diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index 0be840317..aa4cbc3ef 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -105,11 +105,19 @@ m.EffectsAxes1_0=Schedelsplijter (ABILITY) m.EffectsAxes1_1=Geef schade rond om je heen m.EffectsAxes2_0=Critical Strikes m.EffectsAxes2_1=Dubbele schade -m.EffectsAxes3_0=Bijl Master (500 SKILL) -m.EffectsAxes3_1=Verhoogt schade -m.AbilLockAxes1=GEBLOKEERD TOT 500+ SKILL (BIJL MASTER) -m.AbilBonusAxes1_0=Bijl Master -m.AbilBonusAxes1_1=4 schade extra +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[RED]]Kans op Critical Strikes: [[YELLOW]]{0}% m.AxesSkullLength=[[RED]]Schedelsplijter lengte: [[YELLOW]]{0}s m.SkillSwords=ZWAARDEN diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index 970bf05f5..3894a665e 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -99,11 +99,19 @@ m.EffectsAxes1_0=Berserk (UMIEJETNOSC) m.EffectsAxes1_1=Zadaje obrazenia wszystkiemu dookola. m.EffectsAxes2_0=Krytyczne uderzenie m.EffectsAxes2_1=Potrafisz trafic wroga tam gdzie boli, zadajac podwojne obrazenia. -m.EffectsAxes3_0=Doswiadczony wojownik -m.EffectsAxes3_1=Mordowanie setek potworow zwiekszylo twoja sile i celnosc. Zadajesz wiecej obrazen. -m.AbilLockAxes1=Aby odblokowac doswiadczonego wojownika, zdobadz 500 poziom. -m.AbilBonusAxes1_0=Doswiadczony wojownik -m.AbilBonusAxes1_1=Zadajesz dodatkowe 4 punkty obrazen. +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[RED]]Szansa na krytyczne uderzenie: [[YELLOW]]{0}% m.AxesSkullLength=[[RED]]Dlugosc berserku: [[YELLOW]]{0} sekund m.SkillSwords=MIECZE diff --git a/src/main/resources/locale/locale_pt_br.properties b/src/main/resources/locale/locale_pt_br.properties index c3fc603cc..b6a5014e7 100644 --- a/src/main/resources/locale/locale_pt_br.properties +++ b/src/main/resources/locale/locale_pt_br.properties @@ -101,12 +101,19 @@ m.XPGainAxes=Atacando monstros m.EffectsAxes1_0=Rachador de Crânios (HABILIDADE ESPECIAL) m.EffectsAxes1_1=Causa Danos em Area m.EffectsAxes2_0=Ataques Críticos -m.EffectsAxes2_1=Dobra o Dano -m.EffectsAxes3_0=Mestre com Machados (NIVEL 500) -m.EffectsAxes3_1=Aumenta o Dano -m.AbilLockAxes1=DESBLOQUEIE NO NIVEL 500 (Mestre com Machados) -m.AbilBonusAxes1_0=Mestre com Machados/ -m.AbilBonusAxes1_1=Bônus de 4 de dano +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[RED]]Chance ataque crítico: [[YELLOW]]{0}% m.AxesSkullLength=[[RED]]Duraçao do Rachador de Crânios: [[YELLOW]]{0}s diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index fb3c2aaf8..fec480ced 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -100,11 +100,19 @@ m.EffectsAxes1_0= m.EffectsAxes1_1=Óâåëè÷åíèå óðîíà îò òîïîðà m.EffectsAxes2_0=Êðèòè÷åñêèå óäàðû m.EffectsAxes2_1=Äâîéíîé óðîí -m.EffectsAxes3_0=Ìàñòåðñòâî òîïîðà(500 óðîâåíü) -m.EffectsAxes3_1=Óëó÷øåíèå óðîíà -m.AbilLockAxes1=Áëîêèðóåòñÿ äî 500+ óðîâíÿ(Ìàñòåðñòâî òîïîðà) -m.AbilBonusAxes1_0=Ìàñòåðñòâî òîïîðà -m.AbilBonusAxes1_1=Äàåò áîíóñ â 4 óðîíà +m.EffectsAxes3_0=Axe Mastery +m.EffectsAxes3_1=Adds bonus DMG +m.EffectsAxes4_0=Impact +m.EffectsAxes4_1=Strike with enough force to shatter armor +m.EffectsAxes5_0=Greater Impact +m.EffectsAxes5_1=Deal bonus damage to unarmored foes +m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXE MASTERY) +m.AbilBonusAxes1_0=Axe Mastery +m.AbilBonusAxes1_1=Bonus {0} damage +m.AbilBonusAxes2_0=Impact +m.AbilBonusAxes2_1=Deal {0} DMG to armor +m.AbilBonusAxes3_0=Greater Impact +m.AbilBonusAxes3_1=Deal {0} Bonus DMG to the unarmored m.AxesCritChance=[[RED]]Øàíñ êðèòè÷åñêîãî óäàðà: [[YELLOW]]{0}% m.AxesSkullLength=[[RED]]Ïðîäîëæèòåëüíîñòü Ðàçðóøèòåëÿ ×åðåïîâ: [[YELLOW]]{0}s m.SkillSwords=Ìå÷è