From 376b79cab3c2908c7376128812cd9dce9b5bb899 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Wed, 2 Jan 2013 23:20:25 +0100 Subject: [PATCH 01/11] This doesn't need to get added at any point, because users can replace the sound files inside the .jar --- src/main/java/com/gmail/nossr50/config/AdvancedConfig.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 7ab839a42..ddeb8fc11 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -148,7 +148,4 @@ public class AdvancedConfig extends ConfigLoader { public int getSpoutNotificationTier2() { return config.getInt("Spout.Notifications.Tier2", 400); } public int getSpoutNotificationTier3() { return config.getInt("Spout.Notifications.Tier3", 600); } public int getSpoutNotificationTier4() { return config.getInt("Spout.Notifications.Tier4", 800); } - //TODO Make the sounds configurable! :D - // public String getSpoutSoundRepair() { return config.getString("Spout.Sounds.RepairSound", "url here"); } - // public String getSpoutSoundLevelUp() { return config.getString("Spout.Sounds.LevelUp", "url here"); } } From 447aafd106e3e3d3f95842049365aa5b98473560 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Wed, 2 Jan 2013 23:20:48 +0100 Subject: [PATCH 02/11] Fishermans diet now uses the FoodChance value from advanced.yml --- src/main/java/com/gmail/nossr50/listeners/EntityListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 0e2493c2e..b1aa7c0bc 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -348,13 +348,13 @@ public class EntityListener implements Listener { case RAW_FISH: /* RAW FISH RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ - rankChange = 400; + rankChange = FoodRank2; fish = true; break; case COOKED_FISH: /* COOKED FISH RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */ - rankChange = 200; + rankChange = FoodRank1; fish = true; break; From 9ae74e0fba86d3e1331dc3025e6e71ef43ea2a9e Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Wed, 2 Jan 2013 23:44:52 +0100 Subject: [PATCH 03/11] Began adding comments to advanced.yml Hopefully there aren't too many spell / grammar errors in here. --- src/main/resources/advanced.yml | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index 10b3bebd3..80f621106 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -14,51 +14,91 @@ ### Skills: General: + # This setting will determine when the length of every ability gets longer with 1 second Ability_IncreaseLevel: 50 Acrobatics: + # Maximum chance of dodging when on Dodge_MaxBonusLevel or higher Dodge_ChanceMax: 20 + # On this level or higher, the dodge chance will not go higher than Dodge_ChanceMax Dodge_MaxBonusLevel: 800 + # Maximum chance of rolling when on Roll_MaxBonusLevel or higher Roll_ChanceMax: 100 + # On this level or higher, the roll chance will not go higher than Roll_ChanceMax Roll_MaxBonusLevel: 1000 + # Maximum chance of graceful rolling when on GracefulRoll_MaxBonusLevel or higher GracefulRoll_ChanceMax: 100 + # On this level or higher, the graceful roll chance will not go higher than GracefulRoll_ChanceMax GracefulRoll_MaxBonusLevel: 500 + # Amount of experience for performing a dodge Dodge_XP_Modifier: 120 + # Amount of experience for performing a roll Roll_XP_Modifier: 80 + # Amount of experience for performing a fall Fall_XP_Modifier: 120 Archery: + # Every "SkillShot_IncreaseLevel" the skillshot bonus will go up by "SkillShot_IncreasePercentage" SkillShot_IncreaseLevel: 50 + # This is a percentage value, 0.1 = 10% SkillShot_IncreasePercentage: 0.1D + # When the SkillShot_MaxBonus has been reached, the bonus percentage will not go up anymore. 2.0 = 200% SkillShot_MaxBonus: 2.0D + # Maximum chance of causing daze to opponents Daze_MaxChance: 50 + # Maximum bonus level of Daze, when a player reaches this level his chance of causing a daze will be "Daze_MaxChance" Daze_MaxBonusLevel: 1000 + # Extra damage for arrows that cause a daze (2 damage = 1 heart) Daze_Modifier: 4 + # Maximum chance or retrieving arrows Retrieve_MaxBonus: 100 + # Maximum bonus level for Arrow retrieval, at this level the chance of retrieving arrows from mobs is Retrieve_MaxBonus Retrieve_MaxBonusLevel: 1000 Axes: + # Maximum bonus damage DamageIncrease_MaxBonus: 4 + # Level where the maximum bonus is reached DamageIncrease_MaxBonusLevel: 200 + # Maximum chance of causing a critical hit AxesCritical_MaxChance: 37.50 + # Level where the maximum chance of causing critical hits is reached AxesCritical_MaxBonusLevel: 750 + # Damage modifier of critical hits for PVP, when causing a critical hit the damage gets multiplied by the modifier AxesCritical_PVP_Modifier: 1.5 + # Damage modifier of critical hits for PVE, when causing a critical hit the damage gets multiplied by the modifier AxesCritical_PVE_Modifier: 2 + # Chance of hitting with GreaterImpact, knocksbacks mobs GreaterImpact_Chance: 25 + # Velocity modifier of GreaterImpact hits, this determines how great the knockback is GreaterImpact_KnockbackModifier: 1.5 + # Extra damage for GreaterImpact hits GreaterImpact_BonusDamage: 2 + # Every "IncreaseLevel" the durability damage goes up with 1 ArmorImpact_IncreaseLevel: 50 + # Durability damage cap for ArmorImpact, 20% means that you can never destroy a piece of armor in less than 5 hits ArmorImpact_MaxPercentageDurabilityDamage: 20 Fishing: + # Fishing level when the Shake ability unlocks Shake_UnlockLevel: 150 + # Chance of getting fishing treasure with enchantments Enchantment_Chance: 10 Herbalism: + # This determines when Farmersdiet and Fishermans diet add extra hunger recovery to food Food_RankChange: 200 + # Level value when the GreenThumb stage level goes up GreenThumb_StageChange: 200 + # Maximum chance of converting cobblestone to mossystone GreenThumb_ChanceMax: 100 + # Maximum level when chance = chancemax GreenThumb_MaxBonusLevel: 1500 + # Maximum chance of receiving double drops DoubleDrops_ChanceMax: 100 + # Level when the maximum chance of receiving double drops is reached DoubleDrops_MaxBonusLevel: 1000 Mining: + # Maximum chance of receiving double drops DoubleDrops_ChanceMax: 100 + # Level when the maximum chance of receiving double drops is reached DoubleDrops_MaxBonusLevel: 1000 + # BlastMining rank unlocks BlastMining_Rank1: 125 BlastMining_Rank2: 250 BlastMining_Rank3: 375 From cdd97453411b48a0425c8a918585b932ada1828e Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Thu, 3 Jan 2013 17:40:22 +0100 Subject: [PATCH 04/11] Fixing formatting --- .../nossr50/skills/gathering/Fishing.java | 50 ++++++------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java index 7f49ee586..8e4b8c1f8 100755 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java @@ -106,10 +106,8 @@ public class Fishing { break; } - if (Config.getInstance().getFishingDropsEnabled() && rewards.size() > 0 - && Permissions.getInstance().fishingTreasures(player)) { - FishingTreasure treasure = rewards.get(random.nextInt(rewards - .size())); + if (Config.getInstance().getFishingDropsEnabled() && rewards.size() > 0 && Permissions.getInstance().fishingTreasures(player)) { + FishingTreasure treasure = rewards.get(random.nextInt(rewards.size())); int randomChance = 100; @@ -118,26 +116,20 @@ public class Fishing { } if (random.nextDouble() * randomChance <= treasure.getDropChance()) { - Users.getPlayer(player).addXP(SkillType.FISHING, - treasure.getXp()); + Users.getPlayer(player).addXP(SkillType.FISHING,treasure.getXp()); theCatch.setItemStack(treasure.getDrop()); } } else { theCatch.setItemStack(new ItemStack(Material.RAW_FISH)); } - short maxDurability = theCatch.getItemStack().getType() - .getMaxDurability(); + short maxDurability = theCatch.getItemStack().getType().getMaxDurability(); if (maxDurability > 0) { - theCatch.getItemStack().setDurability( - (short) (random.nextInt(maxDurability))); // Change - // durability to - // random value + theCatch.getItemStack().setDurability((short) (random.nextInt(maxDurability))); // Change durability to random value } - Skills.xpProcessing(player, profile, SkillType.FISHING, Config - .getInstance().getFishingBaseXP()); + Skills.xpProcessing(player, profile, SkillType.FISHING, Config.getInstance().getFishingBaseXP()); } /** @@ -157,8 +149,7 @@ public class Fishing { Item theCatch = (Item) event.getCaught(); if (theCatch.getItemStack().getType() != Material.RAW_FISH) { - final int ENCHANTMENT_CHANCE = advancedConfig - .getFishingEnchantmentChance(); + final int ENCHANTMENT_CHANCE = advancedConfig.getFishingEnchantmentChance(); boolean enchanted = false; ItemStack fishingResults = theCatch.getItemStack(); @@ -171,15 +162,12 @@ public class Fishing { randomChance = (int) (randomChance * 0.75); } - if (random.nextInt(randomChance) <= ENCHANTMENT_CHANCE - && Permissions.getInstance().fishingMagic(player)) { + if (random.nextInt(randomChance) <= ENCHANTMENT_CHANCE && Permissions.getInstance().fishingMagic(player)) { for (Enchantment newEnchant : Enchantment.values()) { if (newEnchant.canEnchantItem(fishingResults)) { - Map resultEnchantments = fishingResults - .getEnchantments(); + Map resultEnchantments = fishingResults.getEnchantments(); - for (Enchantment oldEnchant : resultEnchantments - .keySet()) { + for (Enchantment oldEnchant : resultEnchantments.keySet()) { if (oldEnchant.conflictsWith(newEnchant)) continue; } @@ -188,23 +176,18 @@ public class Fishing { * Actual chance to have an enchantment is related * to your fishing skill */ - if (random.nextInt(15) < Fishing - .getFishingLootTier(profile)) { + if (random.nextInt(15) < Fishing.getFishingLootTier(profile)) { enchanted = true; - int randomEnchantLevel = random - .nextInt(newEnchant.getMaxLevel()) + 1; + int randomEnchantLevel = random.nextInt(newEnchant.getMaxLevel()) + 1; - if (randomEnchantLevel < newEnchant - .getStartLevel()) { - randomEnchantLevel = newEnchant - .getStartLevel(); + if (randomEnchantLevel < newEnchant.getStartLevel()) { + randomEnchantLevel = newEnchant.getStartLevel(); } if (randomEnchantLevel >= 1000) continue; - fishingResults.addEnchantment(newEnchant, - randomEnchantLevel); + fishingResults.addEnchantment(newEnchant,randomEnchantLevel); } } } @@ -237,8 +220,7 @@ public class Fishing { int dropChance = getShakeChance(lootTier); if (event.getPlayer().hasPermission("mcmmo.perks.lucky.fishing")) { - dropChance = (int) (dropChance * 1.25); // With lucky perk on max - // level tier, its 100% + dropChance = (int) (dropChance * 1.25); // With lucky perk on max level tier, its 100% } final int DROP_CHANCE = random.nextInt(100); From 1c3066aaf7a88e3b109ff302ca5c3f4b49fd1420 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Fri, 4 Jan 2013 12:16:31 +0100 Subject: [PATCH 05/11] Fixing a small error pointed out by @sh4z --- src/main/resources/locale/locale_cs_CZ.properties | 2 +- src/main/resources/locale/locale_cy.properties | 2 +- src/main/resources/locale/locale_da.properties | 2 +- src/main/resources/locale/locale_de.properties | 2 +- src/main/resources/locale/locale_en_US.properties | 2 +- src/main/resources/locale/locale_es.properties | 2 +- src/main/resources/locale/locale_fi.properties | 2 +- src/main/resources/locale/locale_fr.properties | 2 +- src/main/resources/locale/locale_it.properties | 2 +- src/main/resources/locale/locale_ko.properties | 2 +- src/main/resources/locale/locale_lv.properties | 2 +- src/main/resources/locale/locale_nl.properties | 2 +- src/main/resources/locale/locale_no.properties | 2 +- src/main/resources/locale/locale_pl.properties | 2 +- src/main/resources/locale/locale_pt_BR.properties | 2 +- src/main/resources/locale/locale_ru.properties | 2 +- src/main/resources/locale/locale_sv.properties | 2 +- src/main/resources/locale/locale_tr_TR.properties | 2 +- src/main/resources/locale/locale_zh_CN.properties | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties index 7f50ac35e..19aa84e65 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/src/main/resources/locale/locale_cs_CZ.properties @@ -450,7 +450,7 @@ Commands.XPGain.Repair=Opravovani Commands.XPGain.Swords=Zabijenim monster. Commands.XPGain.Taming=Ochoceni zvirat nebo boj s vlky Commands.XPGain.Unarmed=Zabijenim monster. -Commands.XPGain.WoodCutting=Kaceni stromu +Commands.XPGain.Woodcutting=Kaceni stromu Commands.XPGain=[[DARK_GRAY]]Zisk dovednosti: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Tvuj XP bar byl uzamcen na {0}! Commands.xplock.unlocked=[[GOLD]]Tvuj XP bar je nyni [[GREEN]]ODEMCEN[[GOLD]]! diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties index ce653317e..29266af75 100644 --- a/src/main/resources/locale/locale_cy.properties +++ b/src/main/resources/locale/locale_cy.properties @@ -449,7 +449,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Angenfilod ymosod Commands.XPGain.Taming=Anifeiliaid Taming, neu ymladd \u00e2\'ch bleiddiaid Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]] Cael Profiad: [[GWYN]] {0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index b906b6e0c..2da531e73 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -450,7 +450,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Dyret\u00e6mning, eller kamp m/ dine ulve Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP FORTJENST: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index aee328a26..53cf71293 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Monster angreifen Commands.XPGain.Taming=Tierz\u00e4hmung oder Kampf mit W\u00f6lfen Commands.XPGain.Unarmed=Monster angreifen -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP Gewinn: [[WHITE]]{0} Commands.xplock.locked=[[YELLOW]]Deine XP BAR ist nun auf {0} gesperrt! Commands.xplock.unlocked=[[YELLOW]]Deine XP BAR ist nun wieder [[GREEN]]FREIGEGEBEN[[YELLOW]]! diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index bfd0be415..bc1585649 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -473,7 +473,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index feebc365e..66db0cd73 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Reparando Commands.XPGain.Swords=Atacando a Monstruos Commands.XPGain.Taming=Domando animales, o combatiendo con tus lobos Commands.XPGain.Unarmed=Atacando a Monstruos -Commands.XPGain.WoodCutting=Talando \u00e1rboles +Commands.XPGain.Woodcutting=Talando \u00e1rboles Commands.XPGain=[[DARK_GRAY]]OBTENCI\u00d3N DE EXPERIENCIA: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Tu BARRA DE EXP esta bloqueada a {0}! Commands.xplock.unlocked=[[GOLD]]Tu BARRA DE EXP esta ahora [[GREEN]]DESBLOQUEADA[[GOLD]]! diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index bc8ca64bf..d0192d053 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index b046509f6..caad11905 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=R\u00e9paration Commands.XPGain.Swords=Attaquer des monstres Commands.XPGain.Taming=Apprivoiser et combattre Commands.XPGain.Unarmed=Attaquer des monstres -Commands.XPGain.WoodCutting=Couper des arbres +Commands.XPGain.Woodcutting=Couper des arbres Commands.XPGain=[[DARK_GRAY]]GAIN D\'XP : [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Votre barre d\'XP est maintenant verrouill\u00e9e sur {0} ! Commands.xplock.unlocked=[[GOLD]]Votre barre d\'XP est maintenant [[GREEN]]D\u00c9VERROUILL\u00c9E[[GOLD]] !! diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index 393b78cd7..88c395b40 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Riparare Commands.XPGain.Swords=Attaccare Mostri Commands.XPGain.Taming=Addomesticare Animali, o combattere con i tuoi lupi Commands.XPGain.Unarmed=Attaccare Mostri -Commands.XPGain.WoodCutting=Tagliare alberi +Commands.XPGain.Woodcutting=Tagliare alberi Commands.XPGain=[[DARK_GRAY]]GUADAGNARE XP: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]La tua BARRA XP \u00e8 ora bloccata a {0}! Commands.xplock.unlocked=[[GOLD]]La tua BARRA XP \u00e8 ora [[GREEN]]SBLOCCATA[[GOLD]]! diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index b1756a7c7..e00069b67 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index 70c9c04aa..f0c3ab096 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Koku cir\u0161ana +Commands.XPGain.Woodcutting=Koku cir\u0161ana Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index deb6716bc..9603f03ac 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Dieren Temmen, of vechten met je wolven Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GEWONNEN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index 3160f19a0..fbaefb9a9 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Angriper Monstre Commands.XPGain.Taming=Dyr temming, eller sl\u00e5ssing hvisk dine ulver. Commands.XPGain.Unarmed=Angriper Monstre -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GEVINST: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index 07ff756c8..c86c0d38a 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Naprawianie Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Scina drzewa +Commands.XPGain.Woodcutting=Scina drzewa Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index 34996824d..f87c39be0 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Sua barra de XP BAR est\u00e1 travada em {0}! Commands.xplock.unlocked=[[GOLD]]Sua barra de XP foi [[GREEN]]DESTRAVADA[[GOLD]]! diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 69cf8a5d2..f55f41c1c 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=\u0420\u0435\u043c\u043e\u043d\u0442\u0438\u0440\u0443\u0 Commands.XPGain.Swords=\u0410\u0442\u0430\u043a\u0443\u0439\u0442\u0435 \u041c\u043e\u043d\u0441\u0442\u0440\u043e\u0432 Commands.XPGain.Taming=\u0423\u043a\u0440\u043e\u0449\u0430\u0439\u0442\u0435 \u0436\u0438\u0432\u043e\u0442\u043d\u044b\u0445 \u0438\u043b\u0438 \u0441\u0440\u0430\u0436\u0430\u0439\u0442\u0435\u0441\u044c \u043f\u0440\u0438 \u043f\u043e\u043c\u043e\u0449\u0438 \u0441\u0432\u043e\u0438\u0445 \u0432\u043e\u043b\u043a\u043e\u0432 Commands.XPGain.Unarmed=\u0410\u0442\u0430\u043a\u0443\u0439\u0442\u0435 \u041c\u043e\u043d\u0441\u0442\u0440\u043e\u0432 -Commands.XPGain.WoodCutting=\u0420\u0443\u0431\u0438\u0442\u0435 \u0434\u0435\u0440\u0435\u0432\u044c\u044f +Commands.XPGain.Woodcutting=\u0420\u0443\u0431\u0438\u0442\u0435 \u0434\u0435\u0440\u0435\u0432\u044c\u044f Commands.XPGain=[[DARK_GRAY]]\u041f\u041e\u041b\u0423\u0427\u0415\u041d\u041e \u041e\u041f\u042b\u0422\u0410: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]\u0412\u0430\u0448\u0430 \u041f\u0430\u043d\u0435\u043b\u044c \u041e\u043f\u044b\u0442\u0430 \u0442\u0435\u043f\u0435\u0440\u044c \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0430 \u043d\u0430 {0}! Commands.xplock.unlocked=[[GOLD]]\u0412\u0430\u0448\u0430 \u041f\u0430\u043d\u0435\u043b\u044c \u041e\u043f\u044b\u0442\u0430 \u0442\u0435\u043f\u0435\u0440\u044c [[GREEN]]\u0420\u0410\u0417\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u0412\u0410\u041d\u0410[[GOLD]]! diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index c9d4b3bf6..814e04c30 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Djurt\u00e4mjning, eller sl\u00e5ss m/ dina vargar Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_tr_TR.properties b/src/main/resources/locale/locale_tr_TR.properties index 6c1942da2..0b4f946c1 100644 --- a/src/main/resources/locale/locale_tr_TR.properties +++ b/src/main/resources/locale/locale_tr_TR.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=Repairing Commands.XPGain.Swords=Attacking Monsters Commands.XPGain.Taming=Animal Taming, or combat w/ your wolves Commands.XPGain.Unarmed=Attacking Monsters -Commands.XPGain.WoodCutting=Chopping down trees +Commands.XPGain.Woodcutting=Chopping down trees Commands.XPGain=[[DARK_GRAY]]XP GAIN: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}! Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]! diff --git a/src/main/resources/locale/locale_zh_CN.properties b/src/main/resources/locale/locale_zh_CN.properties index 4c9fffb2b..507fbe915 100644 --- a/src/main/resources/locale/locale_zh_CN.properties +++ b/src/main/resources/locale/locale_zh_CN.properties @@ -451,7 +451,7 @@ Commands.XPGain.Repair=\u4fee\u7406 Commands.XPGain.Swords=\u653b\u51fb\u602a\u7269 Commands.XPGain.Taming=\u9a6f\u517d, \u548c\u4f60\u7684\u72fc\u4e00\u8d77\u6218\u6597 Commands.XPGain.Unarmed=\u653b\u51fb\u602a\u7269 -Commands.XPGain.WoodCutting=\u628a\u6811\u780d\u5012 +Commands.XPGain.Woodcutting=\u628a\u6811\u780d\u5012 Commands.XPGain=[[DARK_GRAY]]\u83b7\u5f97\u7ecf\u9a8c: [[WHITE]]{0} Commands.xplock.locked=[[GOLD]]\u4f60\u7684\u7ecf\u9a8c\u6761\u9501\u5b9a\u5728 {0}! Commands.xplock.unlocked=[[GOLD]]\u4f60\u7684\u7ecf\u9a8c\u6761\u73b0\u5728 [[GREEN]]\u89e3\u9664\u9501\u5b9a\u4e86[[GOLD]]! From 49fc2a93fadd37421ddb414e45beba0061ebefc1 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sat, 5 Jan 2013 00:48:05 +0100 Subject: [PATCH 06/11] Adding missing line to locale files --- src/main/resources/locale/locale_cs_CZ.properties | 1 + src/main/resources/locale/locale_cy.properties | 1 + src/main/resources/locale/locale_da.properties | 1 + src/main/resources/locale/locale_de.properties | 1 + src/main/resources/locale/locale_es.properties | 1 + src/main/resources/locale/locale_fi.properties | 1 + src/main/resources/locale/locale_fr.properties | 1 + src/main/resources/locale/locale_it.properties | 1 + src/main/resources/locale/locale_ko.properties | 1 + src/main/resources/locale/locale_lv.properties | 1 + src/main/resources/locale/locale_nl.properties | 3 ++- src/main/resources/locale/locale_no.properties | 1 + src/main/resources/locale/locale_pl.properties | 1 + src/main/resources/locale/locale_pt_BR.properties | 1 + src/main/resources/locale/locale_ru.properties | 1 + src/main/resources/locale/locale_sv.properties | 1 + src/main/resources/locale/locale_tr_TR.properties | 1 + src/main/resources/locale/locale_zh_CN.properties | 1 + 18 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties index 19aa84e65..a0eaf0f95 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/src/main/resources/locale/locale_cs_CZ.properties @@ -398,6 +398,7 @@ Commands.Party.Teleport= [[RED]]- Teleport ke clenovi party Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Rebricek [[YELLOW]]Celkovych levelu-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]CELKOVY LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]Neplatny nazev dovednosti! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties index 29266af75..802a1294b 100644 --- a/src/main/resources/locale/locale_cy.properties +++ b/src/main/resources/locale/locale_cy.properties @@ -397,6 +397,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]] - mcMMO [[GLAS]] Lefel P\u0175er [[YELLOW]] Arweinwyr-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK RED]] LEFEL POWER: [[GREEN]] {0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index 2da531e73..05d7995c1 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -398,6 +398,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index 53cf71293..969f879f7 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Macht [[YELLOW]]Rangliste-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} slightly below 9000 Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index 66db0cd73..83b4d0b59 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teletransportarse al miembro del grup Commands.Party.Toggle=[[RED]]- Alternar chat de grupo Commands.Party= [[RED]]- Crear/Unirse al grupo elegido Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO-- Tabla de L\u00edderes: [[BLUE]]Nivel de Poder +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]NIVEL DE PODER: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]\u00a1Esa no es una habilidad v\u00e1lida! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO-- Tabla de L\u00edderes: [[BLUE]]{0} diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index d0192d053..3824fddb9 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index caad11905..3d4acdab5 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- T\u00e9l\u00e9porte sur un membre du grou Commands.Party.Toggle=[[RED]]- Active / d\u00e9sactive le canal groupe Commands.Party= [[RED]]- Cr\u00e9e ou rejoint ce groupe Commands.PowerLevel.Leaderboard=[[YELLOW]]--Classement mcMMO ([[BLUE]]Niveau Global[[YELLOW]])-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]NIVEAU GLOBAL : [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]Ce talent n\'existe pas ! Commands.Skill.Leaderboard=[[YELLOW]]--Classement mcMMO ([[BLUE]]{0}[[YELLOW]])-- diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index 88c395b40..5db985243 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teletrasportati verso un membro del Commands.Party.Toggle=[[RED]]- Attiva o Disattiva la Chat di Compagnia Commands.Party= [[RED]]- Crea/Unisciti alla compagnia scelta Commands.PowerLevel.Leaderboard=[[YELLOW]]--Classifica mcMMO dei [[BLUE]]Livelli di Potere[[YELLOW]]-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]LIVELLO DI POTERE: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]Questo non \u00e8 un nome di abilit\u00e0 valido! Commands.Skill.Leaderboard=[[YELLOW]]--Classifica mcMMO di [[BLUE]]{0}[[YELLOW]]-- diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index e00069b67..e7453730c 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index f0c3ab096..328c8f33d 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index 9603f03ac..b7ef08fd2 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -402,7 +402,8 @@ Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]] Commands.PowerLevel=[[DARK_RED]]Vermogen: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- -Commands.SkillInfo=/ [[RED]]- View detailed information about a skill +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAXIMUM LEVEL: [[YELLOW]]{1} +Commands.SkillInfo=/ [[RED]]- Lees gedetailleerde informatie over een skill Commands.Stats.Self=YOUR STATS Commands.Stats=[[RED]]- View your mcMMO stats Commands.ToggleAbility=[[RED]]- Toggle ability activation with right click diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index fbaefb9a9..86a2b9fa7 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]]Kraft Niv\u00e5[[YELLOW]]Lederbord-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]KRAFT NIV\u00c5: [[GR\u00d8EEN]] {0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index c86c0d38a..10f3973b2 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleportacja do czlonka grupy. Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index f87c39be0..6f231863e 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index f55f41c1c..13a0a361a 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- \u0422\u0435\u043b\u0435\u043f\u043e\u Commands.Party.Toggle=[[RED]]- \u0412\u043a\u043b./\u043e\u0442\u043a\u043b. \u0433\u0440\u0443\u043f\u043f\u043e\u0432\u043e\u0439 \u0447\u0430\u0442 Commands.Party= [[RED]]- \u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443 \u0438\u043b\u0438 \u043f\u0440\u0438\u0441\u043e\u0435\u0434\u0435\u043d\u0438\u0442\u044c\u0441\u044f \u043a \u043d\u0435\u0439 Commands.PowerLevel.Leaderboard=[[YELLOW]]--\u0421\u043f\u0438\u0441\u043e\u043a \u041b\u0438\u0434\u0435\u0440\u043e\u0432 mcMMO \u043f\u043e[[BLUE]] \u041e\u0431\u0449\u0435\u043c\u0443 \u0423\u0440\u043e\u0432\u043d\u044e [[YELLOW]]-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]\u041e\u0411\u0429\u0418\u0419 \u0423\u0420\u041e\u0412\u0415\u041d\u042c: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]\u042d\u0442\u043e \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043d\u0430\u0432\u044b\u043a\u0430! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] \u0421\u043f\u0438\u0441\u043e\u043a \u041b\u0438\u0434\u0435\u0440\u043e\u0432-- diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index 814e04c30..e4b77071b 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_tr_TR.properties b/src/main/resources/locale/locale_tr_TR.properties index 0b4f946c1..91c9f686c 100644 --- a/src/main/resources/locale/locale_tr_TR.properties +++ b/src/main/resources/locale/locale_tr_TR.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- Teleport to party member Commands.Party.Toggle=[[RED]]- Toggle Party Chat Commands.Party= [[RED]]- Create/Join designated party Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]That is not a valid skillname! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- diff --git a/src/main/resources/locale/locale_zh_CN.properties b/src/main/resources/locale/locale_zh_CN.properties index 507fbe915..5f1f88347 100644 --- a/src/main/resources/locale/locale_zh_CN.properties +++ b/src/main/resources/locale/locale_zh_CN.properties @@ -399,6 +399,7 @@ Commands.Party.Teleport= [[RED]]- \u4f20\u9001\u5230\u961f\u4f0d\u6210\u Commands.Party.Toggle=[[RED]]- \u5207\u6362\u961f\u4f0d\u804a\u5929 Commands.Party=[\u961f\u4f0d\u540d] [[RED]]- \u521b\u5efa/\u52a0\u5165\u5df2\u5b58\u5728\u7684\u961f\u4f0d Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] \u80fd\u529b\u7b49\u7ea7 [[YELLOW]]\u6392\u884c\u699c-- +Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]\u80fd\u529b\u7b49\u7ea7: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]\u8fd9\u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u6280\u80fd\u540d\u5b57! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] \u6392\u884c\u699c-- From d183b1b9405ce70793e847ec10db496b1cacd031 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sat, 5 Jan 2013 00:52:11 +0100 Subject: [PATCH 07/11] Fishermans diet now uses the FoodChance value from advanced.yml --- .../commands/skills/FishingCommand.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index c599d35dc..ebfbed864 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -18,6 +18,9 @@ public class FishingCommand extends SkillCommand { private String shakeChance; private String fishermansDietRank; + private int fishermansDietRankChange = advancedConfig.getFarmerDietRankChange(); + private int fishermansDietRankMaxLevel = fishermansDietRankChange * 5; + private boolean canTreasureHunt; private boolean canMagicHunt; private boolean canShake; @@ -37,21 +40,9 @@ public class FishingCommand extends SkillCommand { } shakeChance = String.valueOf(dropChance); - if (skillValue >= 1000) { - fishermansDietRank = "5"; - } - else if (skillValue >= 800) { - fishermansDietRank = "4"; - } - else if (skillValue >= 600) { - fishermansDietRank = "3"; - } - else if (skillValue >= 400) { - fishermansDietRank = "2"; - } - else { - fishermansDietRank = "1"; - } + if(skillValue >= fishermansDietRankMaxLevel) fishermansDietRank = "5"; + else fishermansDietRank = String.valueOf((int) ((double) skillValue / (double) fishermansDietRankChange)); + shakeUnlockLevel = advancedConfig.getShakeUnlockLevel(); } From 99c6c46d54c7a8e0073e4655cdb285e706332bb0 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sat, 5 Jan 2013 11:53:35 +0100 Subject: [PATCH 08/11] Adding another missing line to all locale files --- src/main/resources/locale/locale_cs_CZ.properties | 1 + src/main/resources/locale/locale_cy.properties | 1 + src/main/resources/locale/locale_da.properties | 1 + src/main/resources/locale/locale_de.properties | 1 + src/main/resources/locale/locale_es.properties | 1 + src/main/resources/locale/locale_fi.properties | 1 + src/main/resources/locale/locale_fr.properties | 1 + src/main/resources/locale/locale_it.properties | 1 + src/main/resources/locale/locale_ko.properties | 1 + src/main/resources/locale/locale_lv.properties | 1 + src/main/resources/locale/locale_nl.properties | 1 + src/main/resources/locale/locale_no.properties | 1 + src/main/resources/locale/locale_pl.properties | 1 + src/main/resources/locale/locale_pt_BR.properties | 1 + src/main/resources/locale/locale_ru.properties | 1 + src/main/resources/locale/locale_sv.properties | 1 + src/main/resources/locale/locale_tr_TR.properties | 1 + src/main/resources/locale/locale_zh_CN.properties | 1 + 18 files changed, 18 insertions(+) diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties index a0eaf0f95..2e150bd3b 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/src/main/resources/locale/locale_cs_CZ.properties @@ -248,6 +248,7 @@ Swords.Skills.SS.On=[[GREEN]]**HROZIVY UTOK BYL AKTIVOVAN** Swords.Skills.SS.Refresh=[[GREEN]]Tvoje schopnost [[YELLOW]]Serrated Strikes [[GREEN]]je obnovena! Swords.Skills.SS.Other.Off=[[RED]]Hrozivy utok[[GREEN]] byl deaktivovan [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] pouzil [[RED]]Hrozivy utok! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties index 802a1294b..f13a90584 100644 --- a/src/main/resources/locale/locale_cy.properties +++ b/src/main/resources/locale/locale_cy.properties @@ -247,6 +247,7 @@ Swords.Skills.SS.On=[[GREEN]] ** Streiciau danheddog actifadu ** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]] Streiciau danheddog [[GREEN]] wedi gwisgo i ffwrdd ar gyfer [[YELLOW]] {0} Swords.Skills.SS.Other.On=[[GREEN]] {0} [[DARK_GREEN]] wedi defnyddio [[RED]] Streiciau danheddog! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index 05d7995c1..50e17752e 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -248,6 +248,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index 969f879f7..75fef539a 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**GEZAHNTE TREFFER AKTIVIERT** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index 83b4d0b59..ddc12cd03 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**ATAQUE DENTADO ACTIVADO** Swords.Skills.SS.Refresh=[[GREEN]]\u00a1Tu habilidad de [[YELLOW]]Golpe Dentado [[GREEN]]fue refrescada! Swords.Skills.SS.Other.Off=[[RED]]Ataque Dentado[[GREEN]] le ha expirado a [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]\u00a1{0}[[DARK_GREEN]] us\u00f3 [[RED]]Ataque Dentado! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Duraci\u00f3n del Ataque Dentado: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index 3824fddb9..5628accf7 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index 3d4acdab5..3adc78f44 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**ATTAQUE D\u00c9CHIRANTE ACTIV\u00c9E** Swords.Skills.SS.Refresh=[[GREEN]]Votre comp\u00e9tence [[YELLOW]]Attaque d\u00e9chirante [[GREEN]]est pr\u00eate ! Swords.Skills.SS.Other.Off=[[RED]]Attaque d\u00e9chirante[[GREEN]] s\'est termin\u00e9 pour [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] a utilis\u00e9 [[RED]]Attaque d\u00e9chirante ! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Dur\u00e9e d\'Attaque d\u00e9chirante : [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index 5db985243..31dade256 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**COLPI SEGHETTATI ATTIVATI** Swords.Skills.SS.Refresh=[[GREEN]]La tua capacit\u00e0 [[YELLOW]]Colpi Seghettati [[GREEN]]si \u00e8 rigenerata! Swords.Skills.SS.Other.Off=[[RED]]Colpi Seghettati[[GREEN]] si \u00e8 esaurito per [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] ha usato [[RED]]Colpi Seghettati! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Durata di Colpi Seghettati: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index e7453730c..479728911 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index 328c8f33d..b6c84bb56 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index b7ef08fd2..50583868e 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index 86a2b9fa7..70135fe92 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES AKTIVERT** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har brukt [[RED]] Taggete Streik! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index 10f3973b2..eef55a9fe 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index 6f231863e..7557ed504 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 13a0a361a..13b9a35be 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**\u0423\u043c\u0435\u043d\u0438\u0435 \"\u0420\u04 Swords.Skills.SS.Refresh=[[GREEN]]\u0412\u0430\u0448\u0435 \u0443\u043c\u0435\u043d\u0438\u0435 [[YELLOW]]\"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440\" [[GREEN]]\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e! Swords.Skills.SS.Other.Off=[[RED]]\u0423\u043c\u0435\u043d\u0438\u0435 \"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0443\u0434\u0430\u0440\"[[GREEN]] \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u043e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0443 [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043b \u0443\u043c\u0435\u043d\u0438\u0435 [[RED]]\"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440\"! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0443\u043c\u0435\u043d\u0438\u044f \"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440\": [[YELLOW]]{0}\u0441. #TAMING diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index e4b77071b..f2da4d868 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_tr_TR.properties b/src/main/resources/locale/locale_tr_TR.properties index 91c9f686c..d5f29cb36 100644 --- a/src/main/resources/locale/locale_tr_TR.properties +++ b/src/main/resources/locale/locale_tr_TR.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_zh_CN.properties b/src/main/resources/locale/locale_zh_CN.properties index 5f1f88347..8a430916d 100644 --- a/src/main/resources/locale/locale_zh_CN.properties +++ b/src/main/resources/locale/locale_zh_CN.properties @@ -249,6 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**\u952f\u9f7f\u653b\u51fb\u542f\u52a8** Swords.Skills.SS.Refresh=[[GREEN]]\u4f60\u7684 [[YELLOW]]\u952f\u9f7f\u653b\u51fb [[GREEN]]\u6280\u80fd\u5df2\u7ecf\u53ef\u4ee5\u4f7f\u7528\u4e86! Swords.Skills.SS.Other.Off=[[RED]]\u952f\u9f7f\u653b\u51fb[[GREEN]] \u5df2\u7ecf\u7ed3\u675f\u4e86 [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u4f7f\u7528\u4e86 [[RED]]\u952f\u9f7f\u653b\u51fb! +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]\u952f\u9f7f\u5229\u5203\u6301\u7eed\u65f6\u95f4: [[YELLOW]]{0}s #TAMING From 00020a9cbb4156df867c671fe55a4a9a98020a84 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sun, 6 Jan 2013 12:16:08 +0100 Subject: [PATCH 09/11] Skill commands now show the perk effect, if any are active --- .../commands/skills/AcrobaticsCommand.java | 45 +++++++++++++++---- .../commands/skills/ArcheryCommand.java | 32 +++++++++---- .../nossr50/commands/skills/AxesCommand.java | 26 ++++++++--- .../commands/skills/FishingCommand.java | 26 +++++++---- .../commands/skills/HerbalismCommand.java | 29 +++++++++--- .../commands/skills/MiningCommand.java | 17 +++++-- .../commands/skills/RepairCommand.java | 14 ++++-- .../commands/skills/SwordsCommand.java | 28 +++++++++--- .../commands/skills/TamingCommand.java | 14 ++++-- .../commands/skills/UnarmedCommand.java | 28 +++++++++--- .../commands/skills/WoodcuttingCommand.java | 14 ++++-- .../com/gmail/nossr50/skills/combat/Axes.java | 1 - .../resources/locale/locale_cs_CZ.properties | 1 + .../resources/locale/locale_cy.properties | 1 + .../resources/locale/locale_da.properties | 1 + .../resources/locale/locale_de.properties | 1 + .../resources/locale/locale_en_US.properties | 3 +- .../resources/locale/locale_es.properties | 1 + .../resources/locale/locale_fi.properties | 1 + .../resources/locale/locale_fr.properties | 1 + .../resources/locale/locale_it.properties | 1 + .../resources/locale/locale_ko.properties | 1 + .../resources/locale/locale_lv.properties | 1 + .../resources/locale/locale_nl.properties | 1 + .../resources/locale/locale_no.properties | 1 + .../resources/locale/locale_pl.properties | 1 + .../resources/locale/locale_pt_BR.properties | 1 + .../resources/locale/locale_ru.properties | 1 + .../resources/locale/locale_sv.properties | 1 + .../resources/locale/locale_tr_TR.properties | 1 + .../resources/locale/locale_zh_CN.properties | 1 + 31 files changed, 229 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index 51c61cb8c..c8874256f 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -13,8 +13,11 @@ public class AcrobaticsCommand extends SkillCommand { AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private String dodgeChance; + private String dodgeChanceLucky; private String rollChance; + private String rollChanceLucky; private String gracefulRollChance; + private String gracefulRollChanceLucky; private float dodgeChanceMax = advancedConfig.getDodgeChanceMax(); private float dodgeMaxBonusLevel = advancedConfig.getDodgeMaxBonusLevel(); @@ -34,15 +37,30 @@ public class AcrobaticsCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float dodgeChanceF; + float rollChanceF; + float gracefulRollChanceF; + // DODGE - if(skillValue >= dodgeMaxBonusLevel) dodgeChance = df.format(dodgeChanceMax); - else dodgeChance = df.format(((double) dodgeChanceMax / (double) dodgeMaxBonusLevel) * skillValue); + if(skillValue >= dodgeMaxBonusLevel) dodgeChanceF = dodgeChanceMax; + else dodgeChanceF = (float) (((double) dodgeChanceMax / (double) dodgeMaxBonusLevel) * skillValue); + dodgeChance = df.format(dodgeChanceF); + if(dodgeChanceF + dodgeChanceF * 0.3333D >= 100D) dodgeChanceLucky = df.format(100D); + else dodgeChanceLucky = df.format(dodgeChanceF + dodgeChanceF * 0.3333D); + // ROLL - if(skillValue >= rollMaxBonusLevel) rollChance = df.format(rollChanceMax); - else rollChance = df.format(((double) rollChanceMax / (double) rollMaxBonusLevel) * skillValue); + if(skillValue >= rollMaxBonusLevel) rollChanceF = rollChanceMax; + else rollChanceF = (float) (((double) rollChanceMax / (double) rollMaxBonusLevel) * skillValue); + rollChance = df.format(rollChanceF); + if(rollChanceF + rollChanceF * 0.3333D >= 100D) rollChanceLucky = df.format(100D); + else rollChanceLucky = df.format(rollChanceF + rollChanceF * 0.3333D); + // GRACEFULROLL - if(skillValue >= gracefulRollMaxBonusLevel) gracefulRollChance = df.format(gracefulRollChanceMax); - else gracefulRollChance = df.format(((double) gracefulRollChanceMax / (double) gracefulRollMaxBonusLevel) * skillValue); + if(skillValue >= gracefulRollMaxBonusLevel) gracefulRollChanceF = gracefulRollChanceMax; + else gracefulRollChanceF = (float) (((double) gracefulRollChanceMax / (double) gracefulRollMaxBonusLevel) * skillValue); + gracefulRollChance = df.format(gracefulRollChanceF); + if(gracefulRollChanceF + gracefulRollChanceF * 0.3333D >= 100D) gracefulRollChanceLucky = df.format(100D); + else gracefulRollChanceLucky = df.format(gracefulRollChanceF + gracefulRollChanceF * 0.3333D); } @Override @@ -85,15 +103,24 @@ public class AcrobaticsCommand extends SkillCommand { @Override protected void statsDisplay() { if (canRoll) { - player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance })); + if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) + player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { rollChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance })); } if (canGracefulRoll) { - player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance })); + if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) + player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { gracefulRollChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance })); } if (canDodge) { - player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance })); + if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) + player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { dodgeChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance })); } } } \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java index cd1e7e5da..71d3f47ac 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -14,7 +14,9 @@ public class ArcheryCommand extends SkillCommand { private String skillShotBonus; private String dazeChance; + private String dazeChanceLucky; private String retrieveChance; + private String retrieveChanceLucky; private int skillShotIncreaseLevel = advancedConfig.getSkillShotIncreaseLevel(); private double skillShotIncreasePercentage = advancedConfig.getSkillShotIncreasePercentage(); @@ -26,7 +28,6 @@ public class ArcheryCommand extends SkillCommand { private float retrieveBonusMax = advancedConfig.getRetrieveBonusMax(); private float retrieveMaxBonusLevel = advancedConfig.getRetrieveMaxBonusLevel(); - private boolean canSkillShot; private boolean canDaze; private boolean canRetrieve; @@ -38,18 +39,27 @@ public class ArcheryCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float dazeChanceF; + float retrieveChanceF; + // SkillShot double bonus = (int)((double) skillValue / (double) skillShotIncreaseLevel) * skillShotIncreasePercentage; if (bonus > skillShotBonusMax) skillShotBonus = percent.format(skillShotBonusMax); else skillShotBonus = percent.format(bonus); // Daze - if(skillValue >= dazeMaxBonusLevel) dazeChance = df.format(dazeBonusMax); - else dazeChance = df.format(((double) dazeBonusMax / (double) dazeMaxBonusLevel) * skillValue); + if(skillValue >= dazeMaxBonusLevel) dazeChanceF = dazeBonusMax; + else dazeChanceF = (float) (((double) dazeBonusMax / (double) dazeMaxBonusLevel) * skillValue); + dazeChance = df.format(dazeChanceF); + if(dazeChanceF + dazeChanceF * 0.3333D >= 100D) dazeChanceLucky = df.format(100D); + else dazeChanceLucky = df.format(dazeChanceF + dazeChanceF * 0.3333D); // Retrieve - if(skillValue >= retrieveMaxBonusLevel) retrieveChance = df.format(retrieveBonusMax); - else retrieveChance = df.format(((double) retrieveBonusMax / (double) retrieveMaxBonusLevel) * skillValue); + if(skillValue >= retrieveMaxBonusLevel) retrieveChanceF = retrieveBonusMax; + else retrieveChanceF = (float) (((double) retrieveBonusMax / (double) retrieveMaxBonusLevel) * skillValue); + retrieveChance = df.format(retrieveChanceF); + if(retrieveChanceF + retrieveChanceF * 0.3333D >= 100D) retrieveChanceLucky = df.format(100D); + else retrieveChanceLucky = df.format(retrieveChanceF + retrieveChanceF * 0.3333D); } @Override @@ -92,15 +102,21 @@ public class ArcheryCommand extends SkillCommand { @Override protected void statsDisplay() { if (canSkillShot) { - player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus })); + player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus })); } if (canDaze) { - player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance })); + if (player.hasPermission("mcmmo.perks.lucky.archery")) + player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { dazeChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance })); } if (canRetrieve) { - player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance })); + if (player.hasPermission("mcmmo.perks.lucky.archery")) + player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { retrieveChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance })); } } } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index f422f39bd..57f463bf0 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -14,6 +14,7 @@ public class AxesCommand extends SkillCommand { AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private String critChance; + private String critChanceLucky; private String bonusDamage; private String impactDamage; private String greaterImpactDamage; @@ -24,7 +25,7 @@ public class AxesCommand extends SkillCommand { private double critMaxChance = advancedConfig.getAxesCriticalChance(); private int critMaxBonusLevel = advancedConfig.getAxesCriticalMaxBonusLevel(); private int greaterImpactIncreaseLevel = advancedConfig.getArmorImpactIncreaseLevel(); - // private double greaterImpactModifier = advancedConfig.getGreaterImpactModifier(); + private double greaterImpactBonusDamage = advancedConfig.getGreaterImpactBonusDamage(); private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength(); private boolean canSkullSplitter; @@ -40,14 +41,22 @@ public class AxesCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float critChanceF; int skillCheck = Misc.skillCheck((int)skillValue, critMaxBonusLevel); + //Armor Impact impactDamage = String.valueOf(1 + ((double) skillValue / (double) greaterImpactIncreaseLevel)); + //Skull Splitter skullSplitterLength = String.valueOf(2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel)); - greaterImpactDamage = "2"; - - if (skillValue >= critMaxBonusLevel) critChance = df.format(critMaxChance); - else critChance = String.valueOf((critMaxChance / critMaxBonusLevel) * skillCheck); + //Greater Impact + greaterImpactDamage = String.valueOf(greaterImpactBonusDamage); + //Critical Strikes + if (skillValue >= critMaxBonusLevel) critChanceF = (float) critMaxChance; + else critChanceF = (float) ((critMaxChance / critMaxBonusLevel) * skillCheck); + critChance = df.format(critChanceF); + if(critChanceF + critChanceF * 0.3333D >= 100D) critChanceLucky = df.format(100D); + else critChanceLucky = df.format(critChanceF + critChanceF * 0.3333D); + //Axe Mastery if (skillValue >= bonusDamageAxesMaxBonusLevel) bonusDamage = String.valueOf(bonusDamageAxesBonusMax); else bonusDamage = String.valueOf(skillValue / ((double) bonusDamageAxesMaxBonusLevel / (double) bonusDamageAxesBonusMax)); } @@ -113,8 +122,11 @@ public class AxesCommand extends SkillCommand { player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", new Object[] {greaterImpactDamage}) })); } - if (canCritical) { - player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance })); + if (canCritical){ + if (player.hasPermission("mcmmo.perks.lucky.axes")) + player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { critChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance })); } if (canSkullSplitter) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index ebfbed864..e5a73c417 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -1,5 +1,7 @@ package com.gmail.nossr50.commands.skills; +import java.text.DecimalFormat; + import org.bukkit.ChatColor; import com.gmail.nossr50.commands.SkillCommand; @@ -16,6 +18,7 @@ public class FishingCommand extends SkillCommand { private String magicChance; private int shakeUnlockLevel; private String shakeChance; + private String shakeChanceLucky; private String fishermansDietRank; private int fishermansDietRankChange = advancedConfig.getFarmerDietRankChange(); @@ -32,18 +35,20 @@ public class FishingCommand extends SkillCommand { @Override protected void dataCalculations() { + DecimalFormat df = new DecimalFormat("0.0"); + //Treasure Hunter lootTier = Fishing.getFishingLootTier(profile); - magicChance = percent.format(lootTier / 15D); + magicChance = percent.format(lootTier / 15D); + //Shake int dropChance = Fishing.getShakeChance(lootTier); - if (player.hasPermission("mcmmo.perks.lucky.fishing")) { - dropChance = (int) (dropChance * 1.25D); - } - shakeChance = String.valueOf(dropChance); + shakeChance = df.format(dropChance); + if(dropChance + dropChance * 0.3333D >= 100D) shakeChanceLucky = df.format(100D); + else shakeChanceLucky = df.format(dropChance + dropChance * 0.3333D); + shakeUnlockLevel = advancedConfig.getShakeUnlockLevel(); + //Fishermans Diet if(skillValue >= fishermansDietRankMaxLevel) fishermansDietRank = "5"; - else fishermansDietRank = String.valueOf((int) ((double) skillValue / (double) fishermansDietRankChange)); - - shakeUnlockLevel = advancedConfig.getShakeUnlockLevel(); + else fishermansDietRank = String.valueOf((int) ((double) skillValue / (double) fishermansDietRankChange)); } @Override @@ -103,7 +108,10 @@ public class FishingCommand extends SkillCommand { player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0", new Object[] { shakeUnlockLevel }) })); } else { - player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance })); + if (player.hasPermission("mcmmo.perks.lucky.fishing")) + player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { shakeChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance })); } } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java index 7f8a657ab..f5481f0dd 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java @@ -15,9 +15,11 @@ public class HerbalismCommand extends SkillCommand { private String greenTerraLength; private String greenThumbChance; + private String greenThumbChanceLucky; private String greenThumbStage; private String farmersDietRank; private String doubleDropChance; + private String doubleDropChanceLucky; private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength(); private int farmersDietRankChange = advancedConfig.getFarmerDietRankChange(); @@ -43,6 +45,8 @@ public class HerbalismCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float greenThumbChanceF; + float doubleDropChanceF; greenTerraLength = String.valueOf(2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel)); //FARMERS DIET if(skillValue >= farmersDietMaxLevel) farmersDietRank = "5"; @@ -51,12 +55,17 @@ public class HerbalismCommand extends SkillCommand { if(skillValue >= greenThumbStageMaxLevel) greenThumbStage = "4"; else greenThumbStage = String.valueOf((int) ((double) skillValue / (double) greenThumbStageChange)); - - if(skillValue >= greenThumbMaxLevel) greenThumbChance = String.valueOf(greenThumbMaxBonus); - else greenThumbChance = df.format((greenThumbMaxBonus / greenThumbMaxLevel) * skillValue); + if(skillValue >= greenThumbMaxLevel) greenThumbChanceF = (float) (greenThumbMaxBonus); + else greenThumbChanceF = (float) ((greenThumbMaxBonus / greenThumbMaxLevel) * skillValue); + greenThumbChance = df.format(greenThumbChanceF); + if(greenThumbChanceF + greenThumbChanceF * 0.3333D >= 100D) greenThumbChanceLucky = df.format(100D); + else greenThumbChanceLucky = df.format(greenThumbChanceF + greenThumbChanceF * 0.3333D); //DOUBLE DROPS - if(skillValue >= doubleDropsMaxLevel) doubleDropChance = df.format(doubleDropsMaxBonus); - else doubleDropChance = df.format((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue); + if(skillValue >= doubleDropsMaxLevel) doubleDropChanceF = (float) (doubleDropsMaxBonus); + else doubleDropChanceF = (float) ((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue); + doubleDropChance = df.format(doubleDropChanceF); + if(doubleDropChanceF + doubleDropChanceF * 0.3333D >= 100D) doubleDropChanceLucky = df.format(100D); + else doubleDropChanceLucky = df.format(doubleDropChanceF + doubleDropChanceF * 0.3333D); } @Override @@ -116,7 +125,10 @@ public class HerbalismCommand extends SkillCommand { } if (canGreenThumbBlocks || canGreenThumbWheat) { - player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance })); + if (player.hasPermission("mcmmo.perks.lucky.herbalism")) + player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { greenThumbChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance })); } if (canGreenThumbWheat) { @@ -128,7 +140,10 @@ public class HerbalismCommand extends SkillCommand { } if (canDoubleDrop && !doubleDropsDisabled) { - player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance })); + if (player.hasPermission("mcmmo.perks.lucky.herbalism")) + player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance })); } } } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java index 66d1d12f7..456f1ebc5 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java @@ -14,6 +14,7 @@ import com.gmail.nossr50.util.Misc; public class MiningCommand extends SkillCommand { AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private String doubleDropChance; + private String doubleDropChanceLucky; private String superBreakerLength; private String blastMiningRank; private String blastRadiusIncrease; @@ -46,10 +47,17 @@ public class MiningCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float doubleDropChanceF; + //Super Breaker superBreakerLength = String.valueOf(2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel)); - if(skillValue >= doubleDropsMaxLevel) doubleDropChance = df.format(doubleDropsMaxBonus); - else doubleDropChance = df.format((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue); + //Double Drops + if(skillValue >= doubleDropsMaxLevel) doubleDropChanceF = (float) (doubleDropsMaxBonus); + else doubleDropChanceF = (float) ((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue); + doubleDropChance = df.format(doubleDropChanceF); + if(doubleDropChanceF + doubleDropChanceF * 0.3333D >= 100D) doubleDropChanceLucky = df.format(100D); + else doubleDropChanceLucky = df.format(doubleDropChanceF + doubleDropChanceF * 0.3333D); + //Blast Mining if (skillValue >= blastMiningRank8) { blastMiningRank = "8"; blastDamageDecrease = "100.00%"; @@ -150,7 +158,10 @@ public class MiningCommand extends SkillCommand { @Override protected void statsDisplay() { if (canDoubleDrop && !doubleDropsDisabled) { - player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance })); + if (player.hasPermission("mcmmo.perks.lucky.mining")) + player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance })); } if (canSuperBreaker) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index 94d9a00b7..e15dc933c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -18,6 +18,7 @@ public class RepairCommand extends SkillCommand { private int arcaneForgingRank; private String repairMasteryBonus; private String superRepairChance; + private String superRepairChanceLucky; private float repairMasteryChanceMax = advancedConfig.getRepairMasteryChanceMax(); private float repairMasteryMaxBonusLevel = advancedConfig.getRepairMasteryMaxLevel(); @@ -50,6 +51,7 @@ public class RepairCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float superRepairChanceF; // We're using pickaxes here, not the best but it works Repairable diamondRepairable = mcMMO.repairManager.getRepairable(278); Repairable goldRepairable = mcMMO.repairManager.getRepairable(285); @@ -66,8 +68,11 @@ public class RepairCommand extends SkillCommand { if(skillValue >= repairMasteryMaxBonusLevel) repairMasteryBonus = df.format(repairMasteryChanceMax); else repairMasteryBonus = df.format(((double) repairMasteryChanceMax / (double) repairMasteryMaxBonusLevel) * skillValue); - if(skillValue >= superRepairMaxBonusLevel) superRepairChance = df.format(superRepairChanceMax); - else superRepairChance = df.format(((double) superRepairChanceMax / (double) superRepairMaxBonusLevel) * skillValue); + if(skillValue >= superRepairMaxBonusLevel) superRepairChanceF = superRepairChanceMax; + else superRepairChanceF = (float) (((double) superRepairChanceMax / (double) superRepairMaxBonusLevel) * skillValue); + superRepairChance = df.format(superRepairChanceF); + if(superRepairChanceF + superRepairChanceF * 0.3333D >= 100D) superRepairChanceLucky = df.format(100D); + else superRepairChanceLucky = df.format(superRepairChanceF + superRepairChanceF * 0.3333D); arcaneForgingRank = Repair.getArcaneForgingRank(profile); } @@ -149,7 +154,10 @@ public class RepairCommand extends SkillCommand { } if (canSuperRepair) { - player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance })); + if (player.hasPermission("mcmmo.perks.lucky.repair")) + player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { superRepairChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance })); } if (canArcaneForge) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java index 3a5649071..78f704ea7 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -13,8 +13,10 @@ public class SwordsCommand extends SkillCommand { AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private String counterAttackChance; + private String counterAttackChanceLucky; private String bleedLength; private String bleedChance; + private String bleedChanceLucky; private String serratedStrikesLength; private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength(); @@ -37,16 +39,24 @@ public class SwordsCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float bleedChanceF; + float counterAttackChanceF; serratedStrikesLength = String.valueOf(2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel)); if (skillValue >= bleedMaxLevel) bleedLength = String.valueOf(bleedMaxTicks); else bleedLength = String.valueOf(bleedBaseTicks); - if(skillValue >= bleedMaxLevel) bleedChance = df.format(bleedChanceMax); - else bleedChance = df.format(((double) bleedChanceMax / (double) bleedMaxLevel) * skillValue); + if(skillValue >= bleedMaxLevel) bleedChanceF = bleedChanceMax; + else bleedChanceF = (float) (((double) bleedChanceMax / (double) bleedMaxLevel) * skillValue); + bleedChance = df.format(bleedChanceF); + if(bleedChanceF + bleedChanceF * 0.3333D >= 100D) bleedChanceLucky = df.format(100D); + else bleedChanceLucky = df.format(bleedChanceF + bleedChanceF * 0.3333D); - if(skillValue >= counterMaxLevel) counterAttackChance = df.format(counterChanceMax); - else counterAttackChance = df.format(((double) counterChanceMax / (double) counterMaxLevel) * skillValue); + if(skillValue >= counterMaxLevel) counterAttackChanceF = counterChanceMax; + else counterAttackChanceF = (float) (((double) counterChanceMax / (double) counterMaxLevel) * skillValue); + counterAttackChance = df.format(counterAttackChanceF); + if(counterAttackChanceF + counterAttackChanceF * 0.3333D >= 100D) counterAttackChanceLucky = df.format(100D); + else counterAttackChanceLucky = df.format(counterAttackChanceF + counterAttackChanceF * 0.3333D); serratedStrikesLength = String.valueOf(serratedBleedTicks); } @@ -92,13 +102,19 @@ public class SwordsCommand extends SkillCommand { @Override protected void statsDisplay() { if (canCounter) { - player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance })); + if (player.hasPermission("mcmmo.perks.lucky.swords")) + player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { counterAttackChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance })); } if (canBleed) { player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", new Object[] { bleedLength })); player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note")); - player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance })); + if (player.hasPermission("mcmmo.perks.lucky.swords")) + player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { bleedChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance })); } if (canSerratedStrike) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java index 03f915b34..71bbb1b8d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -13,6 +13,7 @@ import com.gmail.nossr50.locale.LocaleLoader; public class TamingCommand extends SkillCommand { AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private String goreChance; + private String goreChanceLucky; private float goreChanceMax = advancedConfig.getGoreChanceMax(); private float goreMaxLevel = advancedConfig.getGoreMaxBonusLevel(); @@ -39,8 +40,12 @@ public class TamingCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); - if(skillValue >= goreMaxLevel) goreChance = df.format(goreChanceMax); - else goreChance = df.format(((double) goreChanceMax / (double) goreMaxLevel) * skillValue); + float goreChanceF; + if(skillValue >= goreMaxLevel) goreChanceF = (goreChanceMax); + else goreChanceF = (float) (((double) goreChanceMax / (double) goreMaxLevel) * skillValue); + goreChance = df.format(goreChanceF); + if(goreChanceF + goreChanceF * 0.3333D >= 100D) goreChanceLucky = df.format(100D); + else goreChanceLucky = df.format(goreChanceF + goreChanceF * 0.3333D); } @Override @@ -157,7 +162,10 @@ public class TamingCommand extends SkillCommand { } if (canGore) { - player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance })); + if (player.hasPermission("mcmmo.perks.lucky.taming")) + player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { goreChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance })); } } } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index 2cb86b9fa..1c5507090 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -13,7 +13,9 @@ public class UnarmedCommand extends SkillCommand { AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private String berserkLength; private String deflectChance; + private String deflectChanceLucky; private String disarmChance; + private String disarmChanceLucky; private String ironArmBonus; private float disarmChanceMax = advancedConfig.getDisarmChanceMax(); @@ -36,13 +38,21 @@ public class UnarmedCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float disarmChanceF; + float deflectChanceF; berserkLength = String.valueOf(2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel)); - if(skillValue >= disarmMaxLevel) disarmChance = df.format(disarmChanceMax); - else disarmChance = df.format(((double) disarmChanceMax / (double) disarmMaxLevel) * skillValue); + if(skillValue >= disarmMaxLevel) disarmChanceF = disarmChanceMax; + else disarmChanceF = (float) (((double) disarmChanceMax / (double) disarmMaxLevel) * skillValue); + disarmChance = df.format(disarmChanceF); + if(disarmChanceF + disarmChanceF * 0.3333D >= 100D) disarmChanceLucky = df.format(100D); + else disarmChanceLucky = df.format(disarmChanceF + disarmChanceF * 0.3333D); - if(skillValue >= deflectMaxLevel) deflectChance = df.format(deflectChanceMax); - else deflectChance = df.format(((double) deflectChanceMax / (double) deflectMaxLevel) * skillValue); + if(skillValue >= deflectMaxLevel) deflectChanceF = deflectChanceMax; + else deflectChanceF = (float) (((double) deflectChanceMax / (double) deflectMaxLevel) * skillValue); + deflectChance = df.format(deflectChanceF); + if(deflectChanceF + deflectChanceF * 0.3333D >= 100D) deflectChanceLucky = df.format(100D); + else deflectChanceLucky = df.format(deflectChanceF + deflectChanceF * 0.3333D); if (skillValue >= 250) ironArmBonus = String.valueOf(ironArmMaxBonus); else ironArmBonus = String.valueOf(3 + ((double) skillValue / (double) ironArmIncreaseLevel)); @@ -97,11 +107,17 @@ public class UnarmedCommand extends SkillCommand { } if (canDeflect) { - player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance })); + if (player.hasPermission("mcmmo.perks.lucky.unarmed")) + player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { deflectChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance })); } if (canDisarm) { - player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance })); + if (player.hasPermission("mcmmo.perks.lucky.unarmed")) + player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { disarmChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance })); } if (canBerserk) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java index 80ea1fc32..e983161e0 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -14,6 +14,7 @@ public class WoodcuttingCommand extends SkillCommand { AdvancedConfig advancedConfig = AdvancedConfig.getInstance(); private String treeFellerLength; private String doubleDropChance; + private String doubleDropChanceLucky; private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength(); private double doubleDropsMaxBonus = advancedConfig.getWoodcuttingDoubleDropChance(); @@ -32,10 +33,14 @@ public class WoodcuttingCommand extends SkillCommand { @Override protected void dataCalculations() { DecimalFormat df = new DecimalFormat("0.0"); + float doubleDropChanceF; treeFellerLength = String.valueOf(2 + (int) ((double) skillValue / (double) abilityLengthIncreaseLevel)); - if(skillValue >= doubleDropsMaxLevel) doubleDropChance = df.format(doubleDropsMaxBonus); - else doubleDropChance = df.format((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue); + if(skillValue >= doubleDropsMaxLevel) doubleDropChanceF = (float) (doubleDropsMaxBonus); + else doubleDropChanceF = (float) ((doubleDropsMaxBonus / doubleDropsMaxLevel) * skillValue); + doubleDropChance = df.format(doubleDropChanceF); + if(doubleDropChanceF + doubleDropChanceF * 0.3333D >= 100D) doubleDropChanceLucky = df.format(100D); + else doubleDropChanceLucky = df.format(doubleDropChanceF + doubleDropChanceF * 0.3333D); } @Override @@ -91,7 +96,10 @@ public class WoodcuttingCommand extends SkillCommand { } if (canDoubleDrop && !doubleDropsDisabled) { - player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance })); + if (player.hasPermission("mcmmo.perks.lucky.woodcutting")) + player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky })); + else + player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance })); } if (canTreeFell) { diff --git a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java index 230e285b3..918758e41 100644 --- a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java +++ b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java @@ -96,7 +96,6 @@ public class Axes { } if (chance > random.nextInt(randomChance) && !entity.isDead()){ - // if (random.nextInt(randomChance) <= skillCheck && !entity.isDead()){ int damage = event.getDamage(); if (entity instanceof Player){ diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties index 2e150bd3b..81511cd3a 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/src/main/resources/locale/locale_cs_CZ.properties @@ -514,6 +514,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties index f13a90584..005b546d4 100644 --- a/src/main/resources/locale/locale_cy.properties +++ b/src/main/resources/locale/locale_cy.properties @@ -513,6 +513,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index 50e17752e..3480a2e47 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -514,6 +514,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index 75fef539a..3be9593da 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index bc1585649..aed0a3d19 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -112,7 +112,7 @@ 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.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0}% +Fishing.Enchant.Chance=[[RED]]Magic Hunter Chance: [[YELLOW]]{0} Fishing.ItemFound=[[GRAY]]Treasure found! Fishing.Listener=Fishing: Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch... @@ -535,6 +535,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index ddc12cd03..36368108c 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index 5628accf7..76e72d9a4 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index 3adc78f44..a63439ed4 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index 31dade256..f8bb43dbe 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index 479728911..16bb11505 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index b6c84bb56..f63075406 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index 50583868e..96b5a4bc5 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index 70135fe92..f74db866f 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index eef55a9fe..e8d2fb637 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index 7557ed504..f30de1247 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 13b9a35be..9c079ab8f 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index f2da4d868..a576954a5 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_tr_TR.properties b/src/main/resources/locale/locale_tr_TR.properties index d5f29cb36..2585b6dab 100644 --- a/src/main/resources/locale/locale_tr_TR.properties +++ b/src/main/resources/locale/locale_tr_TR.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_zh_CN.properties b/src/main/resources/locale/locale_zh_CN.properties index 8a430916d..b02705d92 100644 --- a/src/main/resources/locale/locale_zh_CN.properties +++ b/src/main/resources/locale/locale_zh_CN.properties @@ -515,6 +515,7 @@ Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. +Perks.lucky.bonus=[[GOLD]] ({0}% with Lucky Perk) Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance From 6aa300dac0b66db80daf05b179f7cf07409230e1 Mon Sep 17 00:00:00 2001 From: WasBornForJustice Date: Sun, 6 Jan 2013 20:58:31 +0400 Subject: [PATCH 10/11] Update src/main/resources/locale/locale_ru.properties Little translation fixes --- src/main/resources/locale/locale_ru.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 9c079ab8f..5307520a8 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -249,7 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**\u0423\u043c\u0435\u043d\u0438\u0435 \"\u0420\u04 Swords.Skills.SS.Refresh=[[GREEN]]\u0412\u0430\u0448\u0435 \u0443\u043c\u0435\u043d\u0438\u0435 [[YELLOW]]\"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440\" [[GREEN]]\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e! Swords.Skills.SS.Other.Off=[[RED]]\u0423\u043c\u0435\u043d\u0438\u0435 \"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0443\u0434\u0430\u0440\"[[GREEN]] \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u043e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0443 [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043b \u0443\u043c\u0435\u043d\u0438\u0435 [[RED]]\"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440\"! -Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]\u0423\u0440\u043e\u0432\u0435\u043d\u044c \u043d\u0430\u0432\u044b\u043a\u0430 \"\u0412\u043b\u0430\u0434\u0435\u043d\u0438\u0435 \u041c\u0435\u0447\u0435\u043c" \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d \u043d\u0430 {0}. \u0412\u0441\u0435\u0433\u043e ({1}) Swords.SS.Length=[[RED]]\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0443\u043c\u0435\u043d\u0438\u044f \"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440\": [[YELLOW]]{0}\u0441. #TAMING @@ -400,7 +400,7 @@ Commands.Party.Teleport= [[RED]]- \u0422\u0435\u043b\u0435\u043f\u043e\u Commands.Party.Toggle=[[RED]]- \u0412\u043a\u043b./\u043e\u0442\u043a\u043b. \u0433\u0440\u0443\u043f\u043f\u043e\u0432\u043e\u0439 \u0447\u0430\u0442 Commands.Party= [[RED]]- \u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443 \u0438\u043b\u0438 \u043f\u0440\u0438\u0441\u043e\u0435\u0434\u0435\u043d\u0438\u0442\u044c\u0441\u044f \u043a \u043d\u0435\u0439 Commands.PowerLevel.Leaderboard=[[YELLOW]]--\u0421\u043f\u0438\u0441\u043e\u043a \u041b\u0438\u0434\u0435\u0440\u043e\u0432 mcMMO \u043f\u043e[[BLUE]] \u041e\u0431\u0449\u0435\u043c\u0443 \u0423\u0440\u043e\u0432\u043d\u044e [[YELLOW]]-- -Commands.PowerLevel.Capped=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0} [[DARK_RED]]MAX LEVEL: [[YELLOW]]{1} +Commands.PowerLevel.Capped=[[DARK_RED]]\u041e\u0431\u0449\u0438\u0439 \u0443\u0440\u043e\u0432\u0435\u043d\u044c: [[GREEN]]{0} [[DARK_RED]]\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0443\u0440\u043e\u0432\u0435\u043d\u044c: [[YELLOW]]{1} Commands.PowerLevel=[[DARK_RED]]\u041e\u0411\u0429\u0418\u0419 \u0423\u0420\u041e\u0412\u0415\u041d\u042c: [[GREEN]]{0} Commands.Skill.Invalid=[[RED]]\u042d\u0442\u043e \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043d\u0430\u0432\u044b\u043a\u0430! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] \u0421\u043f\u0438\u0441\u043e\u043a \u041b\u0438\u0434\u0435\u0440\u043e\u0432-- @@ -411,7 +411,7 @@ Commands.ToggleAbility=[[RED]]- \u0412\u043a\u043b./\u043e\u0442\u043a\u043b. \u mcMMO.MOTD=[[BLUE]]\u042d\u0442\u043e\u0442 \u0441\u0435\u0440\u0432\u0435\u0440 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 mcMMO {0}! \n \u041d\u0430\u043f\u0438\u0448\u0438\u0442\u0435 [[YELLOW]]/mcmmo[[BLUE]] \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u043c\u043e\u0449\u0438. mcMMO.NoInvites=[[RED]]\u0421\u0435\u0439\u0447\u0430\u0441 \u0443 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0439 mcMMO.NoPermission=[[DARK_RED]]\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432. -mcMMO.NoSkillNote=[[DARK_GRAY]]\u0415\u0441\u043b\u0438 \u0443 \u0412\u0430\u0441 \u043d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a \u043d\u0430\u0432\u044b\u043a\u0443, \u0442\u043e \u043e\u043d \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u0441\u0434\u0435\u0441\u044c \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f. +mcMMO.NoSkillNote=[[DARK_GRAY]]\u0415\u0441\u043b\u0438 \u0443 \u0412\u0430\u0441 \u043d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a \u043d\u0430\u0432\u044b\u043a\u0443 - \u043e\u043d \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u0437\u0434\u0435\u0441\u044c \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f. mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - \u0421\u0430\u0439\u0442 mcMMO ##party From 3904b172adc6ba1b63d8158c9eca71543b35a18d Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Tue, 8 Jan 2013 22:19:03 +0100 Subject: [PATCH 11/11] Better formatting for the comments --- src/main/resources/advanced.yml | 102 ++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 37 deletions(-) diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index 80f621106..fdc696255 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -16,88 +16,116 @@ Skills: General: # This setting will determine when the length of every ability gets longer with 1 second Ability_IncreaseLevel: 50 + # + # Settings for Acrobatics + ### Acrobatics: - # Maximum chance of dodging when on Dodge_MaxBonusLevel or higher + # Dodge_ChanceMax: Maximum chance of dodging when on Dodge_MaxBonusLevel or higher + # Dodge_MaxBonusLevel: On this level or higher, the dodge chance will not go higher than Dodge_ChanceMax Dodge_ChanceMax: 20 - # On this level or higher, the dodge chance will not go higher than Dodge_ChanceMax Dodge_MaxBonusLevel: 800 - # Maximum chance of rolling when on Roll_MaxBonusLevel or higher + + # Roll_ChanceMax: Maximum chance of rolling when on Roll_MaxBonusLevel or higher + # Roll_MaxBonusLevel: On this level or higher, the roll chance will not go higher than Roll_ChanceMax Roll_ChanceMax: 100 - # On this level or higher, the roll chance will not go higher than Roll_ChanceMax Roll_MaxBonusLevel: 1000 - # Maximum chance of graceful rolling when on GracefulRoll_MaxBonusLevel or higher + + # GracefulRoll_ChanceMax: Maximum chance of graceful rolling when on GracefulRoll_MaxBonusLevel or higher + # GracefulRoll_MaxBonusLevel: On this level or higher, the graceful roll chance will not go higher than GracefulRoll_ChanceMax GracefulRoll_ChanceMax: 100 - # On this level or higher, the graceful roll chance will not go higher than GracefulRoll_ChanceMax GracefulRoll_MaxBonusLevel: 500 - # Amount of experience for performing a dodge + + # Amount of experience for performing a dodge, roll or fall Dodge_XP_Modifier: 120 - # Amount of experience for performing a roll Roll_XP_Modifier: 80 - # Amount of experience for performing a fall Fall_XP_Modifier: 120 + # + # Settings for Archery + ### Archery: - # Every "SkillShot_IncreaseLevel" the skillshot bonus will go up by "SkillShot_IncreasePercentage" + # SkillShot_IncreaseLevel: Every "SkillShot_IncreaseLevel" the skillshot bonus will go up by "SkillShot_IncreasePercentage" + # SkillShot_IncreasePercentage: This is a percentage value, 0.1 = 10% + # SkillShot_MaxBonus: When the SkillShot_MaxBonus has been reached, the bonus percentage will not go up anymore. 2.0 = 200% SkillShot_IncreaseLevel: 50 - # This is a percentage value, 0.1 = 10% SkillShot_IncreasePercentage: 0.1D - # When the SkillShot_MaxBonus has been reached, the bonus percentage will not go up anymore. 2.0 = 200% SkillShot_MaxBonus: 2.0D - # Maximum chance of causing daze to opponents + + # Daze_MaxChance: Maximum chance of causing daze to opponents + # Daze_MaxBonusLevel: Maximum bonus level of Daze, when a player reaches this level his chance of causing a daze will be "Daze_MaxChance" + # Daze_Modifier: Extra damage for arrows that cause a daze (2 damage = 1 heart) Daze_MaxChance: 50 - # Maximum bonus level of Daze, when a player reaches this level his chance of causing a daze will be "Daze_MaxChance" Daze_MaxBonusLevel: 1000 - # Extra damage for arrows that cause a daze (2 damage = 1 heart) Daze_Modifier: 4 - # Maximum chance or retrieving arrows + + # Retrieve_MaxBonus: Maximum chance or retrieving arrows + # Retrieve_MaxBonusLevel: Maximum bonus level for Arrow retrieval, at this level the chance of retrieving arrows from mobs is Retrieve_MaxBonus Retrieve_MaxBonus: 100 - # Maximum bonus level for Arrow retrieval, at this level the chance of retrieving arrows from mobs is Retrieve_MaxBonus Retrieve_MaxBonusLevel: 1000 + # + # Settings for Axes + ### Axes: - # Maximum bonus damage + # DamageIncrease_MaxBonus: Maximum bonus damage + # DamageIncrease_MaxBonusLevel: Level where the maximum bonus is reached DamageIncrease_MaxBonus: 4 - # Level where the maximum bonus is reached DamageIncrease_MaxBonusLevel: 200 - # Maximum chance of causing a critical hit + + # AxesCritical_MaxChance: Maximum chance of causing a critical hit + # AxesCritical_MaxBonusLevel: Level where the maximum chance of causing critical hits is reached AxesCritical_MaxChance: 37.50 - # Level where the maximum chance of causing critical hits is reached AxesCritical_MaxBonusLevel: 750 - # Damage modifier of critical hits for PVP, when causing a critical hit the damage gets multiplied by the modifier + + # Damage modifier of critical hits for PVP / PVE, when causing a critical hit the damage gets multiplied by the modifier AxesCritical_PVP_Modifier: 1.5 - # Damage modifier of critical hits for PVE, when causing a critical hit the damage gets multiplied by the modifier AxesCritical_PVE_Modifier: 2 - # Chance of hitting with GreaterImpact, knocksbacks mobs + + # GreaterImpact_Chance: Chance of hitting with GreaterImpact, knocksbacks mobs + # GreaterImpact_KnockbackModifier: Velocity modifier of GreaterImpact hits, this determines how great the knockback is + # GreaterImpact_BonusDamage: Extra damage for GreaterImpact hits GreaterImpact_Chance: 25 - # Velocity modifier of GreaterImpact hits, this determines how great the knockback is GreaterImpact_KnockbackModifier: 1.5 - # Extra damage for GreaterImpact hits GreaterImpact_BonusDamage: 2 - # Every "IncreaseLevel" the durability damage goes up with 1 + + # ArmorImpact_IncreaseLevel: Every "IncreaseLevel" the durability damage goes up with 1 + # ArmorImpact_MaxPercentageDurabilityDamage: Durability damage cap for ArmorImpact, 20% means that you can never destroy a piece of armor in less than 5 hits ArmorImpact_IncreaseLevel: 50 - # Durability damage cap for ArmorImpact, 20% means that you can never destroy a piece of armor in less than 5 hits ArmorImpact_MaxPercentageDurabilityDamage: 20 + # + # Settings for Fishing + ### Fishing: - # Fishing level when the Shake ability unlocks + # Shake_UnlockLevel: Fishing level when the Shake ability unlocks Shake_UnlockLevel: 150 - # Chance of getting fishing treasure with enchantments + + # Enchantment_Chance: Chance of getting fishing treasure with enchantments Enchantment_Chance: 10 + # + # Settings for Herbalism + ### Herbalism: # This determines when Farmersdiet and Fishermans diet add extra hunger recovery to food Food_RankChange: 200 - # Level value when the GreenThumb stage level goes up + + # GreenThumb_StageChange: Level value when the GreenThumb stage level goes up + # GreenThumb_ChanceMax: Maximum chance of GreenThumb + # GreenThumb_MaxBonusLevel: On this level, greenthumb chance will be GreenThumb_ChanceMax GreenThumb_StageChange: 200 - # Maximum chance of converting cobblestone to mossystone GreenThumb_ChanceMax: 100 - # Maximum level when chance = chancemax GreenThumb_MaxBonusLevel: 1500 - # Maximum chance of receiving double drops + + # DoubleDrops_ChanceMax: Maximum chance of receiving double drops + # DoubleDrops_MaxBonusLevel: Level when the maximum chance of receiving double drops is reached DoubleDrops_ChanceMax: 100 - # Level when the maximum chance of receiving double drops is reached DoubleDrops_MaxBonusLevel: 1000 + # + # Settings for Mining + ### Mining: - # Maximum chance of receiving double drops + # DoubleDrops_ChanceMax: Maximum chance of receiving double drops + # DoubleDrops_MaxBonusLevel: Level when the maximum chance of receiving double drops is reached DoubleDrops_ChanceMax: 100 - # Level when the maximum chance of receiving double drops is reached DoubleDrops_MaxBonusLevel: 1000 + # BlastMining rank unlocks BlastMining_Rank1: 125 BlastMining_Rank2: 250