From eb5f32587f6b0ac1ecbe76f737ad8abab8a3bd80 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 12 Jul 2011 14:59:53 -0700 Subject: [PATCH] Version 1.0.34 --- mcMMO/Changelog.txt | 7 + mcMMO/com/gmail/nossr50/Combat.java | 5 + .../gmail/nossr50/config/LoadProperties.java | 4 +- .../nossr50/datatypes/PlayerProfile.java | 4 +- mcMMO/com/gmail/nossr50/m.java | 18 +- .../com/gmail/nossr50/messages_fi.properties | 125 +++---- .../com/gmail/nossr50/messages_nl.properties | 329 ++++++++++++++++++ mcMMO/com/gmail/nossr50/skills/Axes.java | 87 +++-- mcMMO/com/gmail/nossr50/skills/Mining.java | 39 ++- mcMMO/com/gmail/nossr50/skills/Swords.java | 4 +- mcMMO/plugin.yml | 2 +- 11 files changed, 485 insertions(+), 139 deletions(-) create mode 100644 mcMMO/com/gmail/nossr50/messages_nl.properties diff --git a/mcMMO/Changelog.txt b/mcMMO/Changelog.txt index 4377fa2db..0e21f1b0c 100644 --- a/mcMMO/Changelog.txt +++ b/mcMMO/Changelog.txt @@ -1,5 +1,12 @@ Changelog: #Versions without changelogs probably had very small misc fixes, like tweaks to the source code +Version 1.0.34 +Fixed the PVP setting determining whether or not you would hurt yourself from AoE Abilities +Added Dutch (nl) language support +Super Breaker now gives the correct XP as determined by config.yml +Sand Stone XP is now configurable and no longer shares the 'stone' node +/mining now shows mining values instead of taming values + Version 1.0.33 Fixed the toggle for the Excavation drop 'Cocoa Beans' Fixed bug where Unarmed users could disarm without being bare handed diff --git a/mcMMO/com/gmail/nossr50/Combat.java b/mcMMO/com/gmail/nossr50/Combat.java index 1944f8969..98af699d0 100644 --- a/mcMMO/com/gmail/nossr50/Combat.java +++ b/mcMMO/com/gmail/nossr50/Combat.java @@ -201,6 +201,8 @@ public class Combat { Wolf theWolf = (Wolf) eventb.getDamager(); if(Taming.ownerOnline(theWolf, pluginx)) { + if(Taming.getOwner(theWolf, pluginx) == null) + return; Player master = Taming.getOwner(theWolf, pluginx); PlayerProfile PPo = Users.getProfile(master); @@ -283,6 +285,9 @@ public class Combat { if(Taming.ownerOnline(theWolf, pluginx)) { + if(Taming.getOwner(theWolf, pluginx) == null) + return; + Player master = Taming.getOwner(theWolf, pluginx); PlayerProfile PPo = Users.getProfile(master); if(mcPermissions.getInstance().taming(master)) diff --git a/mcMMO/com/gmail/nossr50/config/LoadProperties.java b/mcMMO/com/gmail/nossr50/config/LoadProperties.java index ad5d28a42..695cce708 100644 --- a/mcMMO/com/gmail/nossr50/config/LoadProperties.java +++ b/mcMMO/com/gmail/nossr50/config/LoadProperties.java @@ -9,7 +9,7 @@ import com.gmail.nossr50.mcMMO; public class LoadProperties { public static Boolean xpGainsMobSpawners=false, print_reports = false, myspawnEnable = true, mccEnable = true, mcmmoEnable = true, partyEnable = true, inviteEnable = true, acceptEnable = true, whoisEnable = true, statsEnable = true, addxpEnable = true, ptpEnable = true, mmoeditEnable = true, clearmyspawnEnable = true, mcgodEnable = true, mcabilityEnable = true, mctopEnable = true, mcrefreshEnable = true, enableMotd, enableMySpawn, enableRegen, enableCobbleToMossy, useMySQL, cocoabeans, archeryFireRateLimit, mushrooms, toolsLoseDurabilityFromAbilities, pvpxp, miningrequirespickaxe, woodcuttingrequiresaxe, eggs, apples, cake, music, diamond, glowstone, slowsand, sulphur, netherrack, bones, coal, clay, anvilmessages; public static String MySQLtablePrefix, MySQLuserName, MySQLserverName, MySQLdbName, MySQLdbPass, mctop, addxp, mcability, mcmmo, mcc, mcrefresh, mcgod, stats, mmoedit, ptp, party, myspawn, whois, invite, accept, clearmyspawn, nWood, nStone, nIron, nGold, nDiamond, locale; - public static int mcocoa = 10, water_thunder = 75, cure_self = 5, cure_other = 5, mbones, msulphur, mslowsand, mmushroom2, mglowstone2, mmusic, mdiamond2, mbase, mapple, meggs, mcake, mpine, mbirch, mspruce, mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold, mdiamond, miron, mredstone, mlapus, mobsidian, mnetherrack, mglowstone, mcoal, mstone, MySQLport, xpGainMultiplier, superBreakerCooldown = 240, greenTerraCooldown = 240, gigaDrillBreakerCooldown = 240, treeFellerCooldown = 240, berserkCooldown = 240, serratedStrikeCooldown = 240, skullSplitterCooldown = 240, abilityDurabilityLoss, feathersConsumedByChimaeraWing, pvpxprewardmodifier, repairdiamondlevel, globalxpmodifier, tamingxpmodifier, miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier, sorceryxpmodifier = 2, unarmedxpmodifier, herbalismxpmodifier, excavationxpmodifier, archeryxpmodifier, swordsxpmodifier, axesxpmodifier, acrobaticsxpmodifier, rWood, rStone, rIron, rGold, rDiamond; + public static int msandstone, mcocoa = 10, water_thunder = 75, cure_self = 5, cure_other = 5, mbones, msulphur, mslowsand, mmushroom2, mglowstone2, mmusic, mdiamond2, mbase, mapple, meggs, mcake, mpine, mbirch, mspruce, mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold, mdiamond, miron, mredstone, mlapus, mobsidian, mnetherrack, mglowstone, mcoal, mstone, MySQLport, xpGainMultiplier, superBreakerCooldown = 240, greenTerraCooldown = 240, gigaDrillBreakerCooldown = 240, treeFellerCooldown = 240, berserkCooldown = 240, serratedStrikeCooldown = 240, skullSplitterCooldown = 240, abilityDurabilityLoss, feathersConsumedByChimaeraWing, pvpxprewardmodifier, repairdiamondlevel, globalxpmodifier, tamingxpmodifier, miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier, sorceryxpmodifier = 2, unarmedxpmodifier, herbalismxpmodifier, excavationxpmodifier, archeryxpmodifier, swordsxpmodifier, axesxpmodifier, acrobaticsxpmodifier, rWood, rStone, rIron, rGold, rDiamond; private static mcMMO plugin; public String directory = "plugins/mcMMO/"; @@ -127,6 +127,7 @@ public class LoadProperties { write("XP.Mining.Glowstone", 3); write("XP.Mining.Coal", 10); write("XP.Mining.Stone", 3); + write("XP.Mining.Sandstone", 3); write("XP.Herbalism.Sugar_Cane", 3); write("XP.Herbalism.Cactus", 3); write("XP.Herbalism.Pumpkin", 55); @@ -278,6 +279,7 @@ public class LoadProperties { mglowstone = readInteger("XP.Mining.Glowstone"); mcoal = readInteger("XP.Mining.Coal"); mstone = readInteger("XP.Mining.Stone"); + msandstone = readInteger("XP.Mining.Sandstone"); enableMotd = readBoolean("enableMOTD"); diff --git a/mcMMO/com/gmail/nossr50/datatypes/PlayerProfile.java b/mcMMO/com/gmail/nossr50/datatypes/PlayerProfile.java index 28bee3f03..ba9883884 100644 --- a/mcMMO/com/gmail/nossr50/datatypes/PlayerProfile.java +++ b/mcMMO/com/gmail/nossr50/datatypes/PlayerProfile.java @@ -885,7 +885,7 @@ public class PlayerProfile stats.put("axesXP", stats.get("axesXP")+newvalue); stats.put("sorcery", stats.get("sorceryXP")+newvalue); } else { - stats.put(skillname+"XP", stats.get(skillname+"XP")+newvalue); + stats.put(skillname.toLowerCase()+"XP", stats.get(skillname.toLowerCase()+"XP")+newvalue); } //save(); } @@ -953,7 +953,7 @@ public class PlayerProfile stats.put("axesXP", stats.get("axesXP")-newvalue); stats.put("sorceryXP", stats.get("sorceryXP")-newvalue); } else { - stats.put(skillname+"XP", stats.get(skillname+"XP")-newvalue); + stats.put(skillname.toLowerCase()+"XP", stats.get(skillname.toLowerCase()+"XP")-newvalue); } save(); } diff --git a/mcMMO/com/gmail/nossr50/m.java b/mcMMO/com/gmail/nossr50/m.java index 1c7f58e7b..55df8be79 100644 --- a/mcMMO/com/gmail/nossr50/m.java +++ b/mcMMO/com/gmail/nossr50/m.java @@ -56,7 +56,8 @@ public class m { } return true; } - public static boolean shouldBeWatched(Block block){ + public static boolean shouldBeWatched(Block block) + { int id = block.getTypeId(); if(id == 49 || id == 81 || id == 83 || id == 86 || id == 91 || id == 1 || id == 17 || id == 42 || id == 87 || id == 89 || id == 2 || id == 3 || id == 12 || id == 13 || id == 21 || id == 15 || id == 14 || id == 56 || id == 38 || id == 37 || id == 39 || id == 40 || id == 24){ return true; @@ -90,7 +91,9 @@ public class m { x+=PP.getSkill("repair"); return x; } - public static boolean blockBreakSimulate(Block block, Player player, Plugin plugin){ + + public static boolean blockBreakSimulate(Block block, Player player, Plugin plugin) + { FakeBlockBreakEvent event = new FakeBlockBreakEvent(block, player); if(block != null && plugin != null && player != null){ @@ -106,13 +109,16 @@ public class m { } } - public static void damageTool(Player player, short damage){ + public static void damageTool(Player player, short damage) + { if(player.getItemInHand().getTypeId() == 0) return; player.getItemInHand().setDurability((short) (player.getItemInHand().getDurability() + damage)); - if(player.getItemInHand().getDurability() >= getMaxDurability(getTier(player), player.getItemInHand())){ + if(player.getItemInHand().getDurability() >= getMaxDurability(getTier(player), player.getItemInHand())) + { ItemStack[] inventory = player.getInventory().getContents(); - for(ItemStack x : inventory){ + for(ItemStack x : inventory) + { if(x != null && x.getTypeId() == player.getItemInHand().getTypeId() && x.getDurability() == player.getItemInHand().getDurability()){ x.setTypeId(0); x.setAmount(0); @@ -693,7 +699,7 @@ public class m { player.sendMessage(Messages.getString("m.SkillHeader", new Object[] {Messages.getString("m.SkillMining")})); //$NON-NLS-1$ player.sendMessage(Messages.getString("m.XPGain", new Object[] {Messages.getString("m.XPGainMining")})); //$NON-NLS-1$ if(mcPermissions.getInstance().mining(player)) - player.sendMessage(Messages.getString("m.LVL", new Object[] {PP.getSkillToString("taming"), PP.getSkillToString("tamingXP"), PP.getXpToLevel("taming")})); + player.sendMessage(Messages.getString("m.LVL", new Object[] {PP.getSkillToString("mining"), PP.getSkillToString("miningXP"), PP.getXpToLevel("mining")})); player.sendMessage(Messages.getString("m.SkillHeader", new Object[] {Messages.getString("m.Effects")})); //$NON-NLS-1$ player.sendMessage(Messages.getString("m.EffectsTemplate", new Object[] {Messages.getString("m.EffectsMining1_0"), Messages.getString("m.EffectsMining1_1")})); //$NON-NLS-1$ player.sendMessage(Messages.getString("m.EffectsTemplate", new Object[] {Messages.getString("m.EffectsMining2_0"), Messages.getString("m.EffectsMining2_1")})); //$NON-NLS-1$ diff --git a/mcMMO/com/gmail/nossr50/messages_fi.properties b/mcMMO/com/gmail/nossr50/messages_fi.properties index d4284b3f7..4824b4aea 100644 --- a/mcMMO/com/gmail/nossr50/messages_fi.properties +++ b/mcMMO/com/gmail/nossr50/messages_fi.properties @@ -1,5 +1,5 @@ Combat.WolfExamine=[[GREEN]]**Tutkit sutta käyttämällä Pedon Tarinaa** -Combat.WolfShowMaster=[[DARK_GREEN]]Pedon isäntä \: {0} +Combat.WolfShowMaster=[[DARK_GREEN]]Pedon isäntä : {0} Combat.Ignition=[[RED]]**SYTYTYS** Combat.BurningArrowHit=[[DARK_RED]]Palava nuoli osui sinuun\! Combat.TouchedFuzzy=[[DARK_RED]]Touched Fuzzy. Felt Dizzy. @@ -248,76 +248,53 @@ mcPlayerListener.WoodcuttingSkill=[[YELLOW]]Puunkaato: mcPlayerListener.YourStats=[[GREEN]]Sinun MMO tilastosi Party.InformedOnJoin={0} [[GREEN]] on liittynyt ryhmään Party.InformedOnQuit={0} [[GREEN]] on lähtenyt ryhmästä -Skills.YourGreenTerra=[[GREEN]]Voit taas käyttää [[YELLOW]]Vihermaa [[GREEN]]taitoasi! -Skills.YourTreeFeller=[[GREEN]]Voit taas käyttää [[YELLOW]]Puunkaataja [[GREEN]]taitoasi! -Skills.YourSuperBreaker=[[GREEN]]Voit taas käyttää [[YELLOW]]Supermurskain [[GREEN]]taitoasi! -Skills.YourSerratedStrikes=[[GREEN]]Voit taas käyttää [[YELLOW]]Sahalaitaiset Iskut [[GREEN]]taitoasi! -Skills.YourBerserk=[[GREEN]]Voit taas käyttää [[YELLOW]]Raivopää [[GREEN]]taitoasi! -Skills.YourSkullSplitter=[[GREEN]]Voit taas käyttää [[YELLOW]]Kallonhalkoja [[GREEN]]taitoasi! -Skills.YourGigaDrillBreaker=[[GREEN]]Voit taas käyttää [[YELLOW]]Giga Drill Breaker [[GREEN]]taitoasi! -Skills.TooTired=[[RED]]Olet liian väsynyt käyttääksesi tuota taitoa uudestaan. -Skills.ReadyHoe=[[GREEN]]**OLET VALMIINA KÄYTTÄMÄÄN KUOKKAA** -Skills.LowerHoe=[[GRAY]]**LASKET KUOKKASI** -Skills.ReadyAxe=[[GREEN]]**OLET VALMIINA KÄYTTÄMÄÄN KIRVESTÄ** -Skills.LowerAxe=[[GRAY]]**LASKET KIRVEESI** -Skills.ReadyFists=[[GREEN]]**OLET VALMIINA KÄYTTÄMÄÄN NYRKKEJÄSI** -Skills.LowerFists=[[GRAY]]**LASKET NYRKKISI** -Skills.ReadyPickAxe=[[GREEN]]**OLET VALMIINA KÄYTTÄMÄÄN HAKKUASI** -Skills.LowerPickAxe=[[GRAY]]**LASKET HAKKUSI** -Skills.ReadyShovel=[[GREEN]]**OLET VALMIINA KÄYTTÄMÄÄN LAPIOTASI** -Skills.LowerShovel=[[GRAY]]**LASKET LAPIOSI** -Skills.ReadySword=[[GREEN]]**OLET VALMIINA KÄYTTÄMÄÄN MIEKKAASI** -Skills.LowerSword=[[GRAY]]**LASKET MIEKKASI** -Skills.BerserkOn=[[GREEN]]**BERSERK ACTIVATED** -Skills.BerserkPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Berserk! -Skills.GreenTerraOn=[[GREEN]]**VIHERMAA AKTIVOITU** -Skills.GreenTerraPlayer=[[GREEN]]{0}[[DARK_GREEN]] käytti [[RED]]Vihermaata! -Skills.TreeFellerOn=[[GREEN]]**PUUNKAATAJA AKTIVOITU** -Skills.TreeFellerPlayer=[[GREEN]]{0}[[DARK_GREEN]] käytti [[RED]]Puunkaatajaa! -Skills.SuperBreakerOn=[[GREEN]]**SUPERMURSKAIN AKTIVOITU** -Skills.SuperBreakerPlayer=[[GREEN]]{0}[[DARK_GREEN]] käytti [[RED]]Supermurskainta! -Skills.SerratedStrikesOn=[[GREEN]]**SAHALAITAISET ISKUT AKTIVOITU** -Skills.SerratedStrikesPlayer=[[GREEN]]{0}[[DARK_GREEN]] käytti [[RED]]Sahalaitaisia Iskuja! -Skills.SkullSplitterOn=[[GREEN]]**KALLONHALKOJA AKTIVOITU** -Skills.SkullSplitterPlayer=[[GREEN]]{0}[[DARK_GREEN]] käytti [[RED]]Kallonhalkojaa! -Skills.GigaDrillBreakerOn=[[GREEN]]**GIGA DRILL BREAKER AKTIVOITU** -Skills.GigaDrillBreakerPlayer=[[GREEN]]{0}[[DARK_GREEN]] käytti [[RED]]Giga Drill Breakeria! -Skills.GreenTerraOff=[[RED]]**Vihermaa kului pois** -Skills.TreeFellerOff=[[RED]]**Puunkaataja kului pois** -Skills.SuperBreakerOff=[[RED]]**Supermurskain kului pois** -Skills.SerratedStrikesOff=[[RED]]**Sahalaitaiset Iskut kului pois** -Skills.BerserkOff=[[RED]]**Raivopää kului pois** -Skills.SkullSplitterOff=[[RED]]**Kallonhalkoja kului pois** -Skills.GigaDrillBreakerOff=[[RED]]**Giga Drill Breaker kului pois** -Skills.TamingUp=[[YELLOW]]Sait {0} kesytyspistettä. Kokonaismäärä ({1}) -Skills.AcrobaticsUp=[[YELLOW]]Sait {0} akrobatiikkapistettä. Kokonaismäärä ({1}) -Skills.ArcheryUp=[[YELLOW]]Sait {0} jousiammuntapistettä. Kokonaismäärä ({1}) -Skills.SwordsUp=[[YELLOW]]Sait {0} miekkapistettä. Kokonaismäärä ({1}) -Skills.AxesUp=[[YELLOW]]Sait {0} kirvespistettä. Kokonaismäärä ({1}) -Skills.UnarmedUp=[[YELLOW]]Sait {0} aseistamattomuuspistettä. Kokonaismäärä ({1}) -Skills.HerbalismUp=[[YELLOW]]Sait {0} yrttihoitopistettä. Kokonaismäärä ({1}) -Skills.MiningUp=[[YELLOW]]Sait {0} louhimispistettä. Kokonaismäärä ({1}) -Skills.WoodcuttingUp=[[YELLOW]]Sait {0} puunkaatopistettä. Kokonaismäärä ({1}) -Skills.RepairUp=[[YELLOW]]Sait {0} korjauspistettä. Kokonaismäärä ({1}) -Skills.ExcavationUp=[[YELLOW]]Sait {0} kaivantopistettä. Kokonaismäärä ({1}) -Skills.FeltEasy=[[GRAY]]That felt easy. -Skills.StackedItems=[[DARK_RED]]You can't repair stacked items -Skills.NeedMore=[[DARK_RED]]You need more -Skills.AdeptDiamond=[[DARK_RED]]You're not skilled enough to repair Diamond -Skills.FullDurability=[[GRAY]]That is at full durability. -Skills.Disarmed=[[DARK_RED]]You have been disarmed! -mcPlayerListener.SorcerySkill=Sorcery: -m.SkillSorcery=SORCERY -Sorcery.HasCast=[[GREEN]]**CASTING**[[GOLD]] -Sorcery.Current_Mana=[[DARK_AQUA]]MP -Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]]) -Sorcery.Cost=[[RED]][COST] {0} MP -Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Out Of Mana [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]]) -Sorcery.Water.Thunder=THUNDER -Sorcery.Curative.Self=CURE SELF -Sorcery.Curative.Other=CURE OTHER -m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]]) -Combat.BeastLore=[[GREEN]]**BEAST LORE** -Combat.BeastLoreOwner=[[DARK_AQUA]]Owner ([[RED]]{0}[[DARK_AQUA]]) -Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/20) -Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/8) \ No newline at end of file +Skills.YourGreenTerra=[[GREEN]]Your [[YELLOW]]Green Terra [[GREEN]]ability is refreshed! +Skills.YourTreeFeller=[[GREEN]]Your [[YELLOW]]Tree Feller [[GREEN]]ability is refreshed! +Skills.YourSuperBreaker=[[GREEN]]Your [[YELLOW]]Super Breaker [[GREEN]]ability is refreshed! +Skills.YourSerratedStrikes=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! +Skills.YourBerserk=[[GREEN]]Your [[YELLOW]]Berserk [[GREEN]]ability is refreshed! +Skills.YourSkullSplitter=[[GREEN]]Your [[YELLOW]]Skull Splitter [[GREEN]]ability is refreshed! +Skills.YourGigaDrillBreaker=[[GREEN]]Your [[YELLOW]]Giga Drill Breaker [[GREEN]]ability is refreshed! +Skills.TooTired=[[RED]]You are too tired to use that ability again. +Skills.ReadyHoe=[[GREEN]]**YOU READY YOUR HOE** +Skills.LowerHoe=[[GRAY]]**YOU LOWER YOUR HOE** +Skills.ReadyAxe=[[GREEN]]**YOU READY YOUR AXE** +Skills.LowerAxe=[[GRAY]]**YOU LOWER YOUR AXE** +Skills.ReadyFists=[[GREEN]]**YOU READY YOUR FISTS** +Skills.LowerFists=[[GRAY]]**YOU LOWER YOUR FISTS** +Skills.ReadyPickAxe=[[GREEN]]**YOU READY YOUR PICKAXE** +Skills.LowerPickAxe=[[GRAY]]**YOU LOWER YOUR PICKAXE** +Skills.ReadyShovel=[[GREEN]]**YOU READY YOUR SHOVEL** +Skills.LowerShovel=[[GRAY]]**YOU LOWER YOUR SHOVEL** +Skills.ReadySword=[[GREEN]]**YOU READY YOUR SWORD** +Skills.LowerSword=[[GRAY]]**YOU LOWER YOUR SWORD** +Skills.GreenTerraOn=[[GREEN]]**GREEN TERRA ACTIVATED** +Skills.GreenTerraPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Green Terra! +Skills.TreeFellerOn=[[GREEN]]**TREE FELLER ACTIVATED** +Skills.TreeFellerPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Tree Feller! +Skills.SuperBreakerOn=[[GREEN]]**SUPER BREAKER ACTIVATED** +Skills.SuperBreakerPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Super Breaker! +Skills.SerratedStrikesOn=[[GREEN]]**SERRATED STRIKES ACTIVATED** +Skills.SerratedStrikesPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! +Skills.SkullSplitterOn=[[GREEN]]**SKULL SPLITTER ACTIVATED** +Skills.SkullSplitterPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Skull Splitter! +Skills.GigaDrillBreakerOn=[[GREEN]]**GIGA DRILL BREAKER ACTIVATED** +Skills.GigaDrillBreakerPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Giga Drill Breaker! +Skills.GreenTerraOff=[[RED]]**Green Terra has worn off** +Skills.TreeFellerOff=[[RED]]**Tree Feller has worn off** +Skills.SuperBreakerOff=[[RED]]**Super Breaker has worn off** +Skills.SerratedStrikesOff=[[RED]]**Serrated Strikes has worn off** +Skills.BerserkOff=[[RED]]**Berserk has worn off** +Skills.SkullSplitterOff=[[RED]]**Skull Splitter has worn off** +Skills.GigaDrillBreakerOff=[[RED]]**Giga Drill Breaker has worn off** +Skills.TamingUp=[[YELLOW]]Taming skill increased by {0}. Total ({1}) +Skills.AcrobaticsUp=[[YELLOW]]Acrobatics skill increased by {0}. Total ({1}) +Skills.ArcheryUp=[[YELLOW]]Archery skill increased by {0}. Total ({1}) +Skills.SwordsUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Skills.AxesUp=[[YELLOW]]Axes skill increased by {0}. Total ({1}) +Skills.UnarmedUp=[[YELLOW]]Unarmed skill increased by {0}. Total ({1}) +Skills.HerbalismUp=[[YELLOW]]Herbalism skill increased by {0}. Total ({1}) +Skills.MiningUp=[[YELLOW]]Mining skill increased by {0}. Total ({1}) +Skills.WoodcuttingUp=[[YELLOW]]Woodcutting skill increased by {0}. Total ({1}) +Skills.RepairUp=[[YELLOW]]Repair skill increased by {0}. Total ({1}) +Skills.ExcavationUp=[[YELLOW]]Excavation skill increased by {0}. Total ({1}) \ No newline at end of file diff --git a/mcMMO/com/gmail/nossr50/messages_nl.properties b/mcMMO/com/gmail/nossr50/messages_nl.properties new file mode 100644 index 000000000..dca0fd686 --- /dev/null +++ b/mcMMO/com/gmail/nossr50/messages_nl.properties @@ -0,0 +1,329 @@ +# Dutch translation by Pluis65 v1.1 +# To use: Set locale to nl +# DO NOT EDIT THIS FILE WITH NORMAL NOTEPAD, use Notepad++ +# Verander deze file alleen met Notepad++ +# Geef fouten door aan pluis65@hotmail.com +# Last official edit: 8-7-2011 +Combat.WolfExamine=[[GREEN]]**Je bekijkt de wolf met Wolfinspectie** +Combat.WolfShowMaster=[[DARK_GREEN]]Eigenaar van de wolf \: {0} +Combat.Ignition=[[RED]]**IGNITION** +Combat.BurningArrowHit=[[DARK_RED]]Je bent geraakt door een brandende pijl\! +Combat.TouchedFuzzy=[[DARK_RED]]Je raakte Fuzzy aan. Je voelt je duizelig. +Combat.TargetDazed=Doelwit was [[DARK_RED]]versuft +Combat.WolfNoMaster=[[GRAY]]Deze wolf heeft geen eigenaar... +Combat.WolfHealth=[[GREEN]]Deze wolf heeft {0} levens +Combat.StruckByGore=[[RED]]**VAST DOOR GESTOLD BLOED** +Combat.Gore=[[GREEN]]**GESTOLD BLOED** +Combat.ArrowDeflect=[[WHITE]]**PIJL AFWIJKING** +Item.ChimaeraWingFail=**CHIMAERA WING MISLUKT\!** +Item.ChimaeraWingPass=**CHIMAERA WING** +Item.InjuredWait=Je bent gewond en moet wachten. [[YELLOW]]({0}s) +Item.NeedFeathers=[[GRAY]]Je hebt meer veren nodig.. +m.mccPartyCommands=[[GREEN]]--PARTY COMMANDOS-- +m.mccParty=[party name] [[RED]]- Maak/Join getypte party +m.mccPartyQ=[[RED]]- Verlaat je huidige party +m.mccPartyToggle=[[RED]] - Doe party chat aan/uit +m.mccPartyInvite=[player name] [[RED]]- Stuur een uitnodiging voor je party +m.mccPartyAccept=[[RED]]- Accepteer party uitnodiging +m.mccPartyTeleport=[party member name] [[RED]]- Teleporteer naar je party medelid +m.mccOtherCommands=[[GREEN]]--ANDERE COMMANDOS-- +m.mccStats=- Laat je levels zien +m.mccLeaderboards=- Topscores +m.mccMySpawn=- Teleporteer naar MySpawn +m.mccClearMySpawn=- Verwijder je MySpawn +m.mccToggleAbility=- Doe ability activatie aan/uit +m.mccAdminToggle=- Doe admin chat aan/uit +m.mccWhois=[playername] [[RED]]- Laat informatie zien over speler +m.mccMmoedit=[playername] [skill] [newvalue] [[RED]]- Verander levels +m.mccMcGod=- God Modus +m.mccSkillInfo=[skillname] [[RED]]- Laat informatie zien over een skill +m.mccModDescription=[[RED]]- Lees MOD beschrijving +m.SkillHeader=[[RED]]-----[][[GREEN]]{0}[[RED]][]----- +m.XPGain=[[DARK_GRAY]]XP: [[WHITE]]{0} +m.EffectsTemplate=[[DARK_AQUA]]{0}: [[GREEN]]{1} +m.AbilityLockTemplate=[[GRAY]]{0} +m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1} +m.Effects=EFFECTEN +m.YourStats=JOUW STATUS +m.SkillTaming=TEMMEN +m.XPGainTaming=Wolven krijgen schade +m.EffectsTaming1_0=Wolfinspectie +m.EffectsTaming1_1=Bone-meal inspecteert wolven +m.EffectsTaming2_0=Gestold bloed +m.EffectsTaming2_1=Critical Strike zorgt voor bloedingen +m.EffectsTaming3_0=Scherpere klauwen +m.EffectsTaming3_1=Geeft meer schade +m.EffectsTaming4_0=Mileukennis +m.EffectsTaming4_1=Geen cactus/lava schade, geen falldamage +m.EffectsTaming5_0=Dikke huis +m.EffectsTaming5_1=Minder schade, kan tegen vuur +m.EffectsTaming6_0=Explosieschild +m.EffectsTaming6_1=Minder explosie schade +m.AbilLockTaming1=GEBLOKEERD TOT 100+ SKILL (MILIEUKENNIS) +m.AbilLockTaming2=GEBLOKEERD TOT 250+ SKILL (DIKKE HUIS) +m.AbilLockTaming3=GEBLOKEERD TOT 500+ SKILL (EXPLOSIESCHILD) +m.AbilLockTaming4=GEBLOKEERD TOT 750+ SKILL (SCHERPERE KLAUWEN) +m.AbilBonusTaming1_0=Milieukennis +m.AbilBonusTaming1_1=Wolven ontwijken gevaar (cactus, lava) +m.AbilBonusTaming2_0=Dikkere huid +m.AbilBonusTaming2_1=Halve schade, kan tegen vuur +m.AbilBonusTaming3_0=Explosieschild +m.AbilBonusTaming3_1=Explosies geven 1/6 van de normale schade +m.AbilBonusTaming4_0=Scherpere klauwen +m.AbilBonusTaming4_1=+2 Schade +m.TamingGoreChance=[[RED]]Kans op gestold bloed: [[YELLOW]]{0}% +m.SkillWoodCutting=HOUTHAKKEN +m.XPGainWoodCutting=Bomen omhakken +m.EffectsWoodCutting1_0=Tree Feller (ABILITY) +m.EffectsWoodCutting1_1=Laat bomen deels exploderen +m.EffectsWoodCutting2_0=Leaf Blower +m.EffectsWoodCutting2_1=Laat leaves verdwijnen +m.EffectsWoodCutting3_0=Dubbele Drop +m.EffectsWoodCutting3_1=Geeft een dubbele drop +m.AbilLockWoodCutting1=GEBLOKEERD TOT 100+ SKILL (LEAF BLOWER) +m.AbilBonusWoodCutting1_0=Leaf Blower +m.AbilBonusWoodCutting1_1=Laat leaves verdwijnen +m.WoodCuttingDoubleDropChance=[[RED]]Dubbele Drop kans: [[YELLOW]]{0}% +m.WoodCuttingTreeFellerLength=[[RED]]Tree Feller lengte: [[YELLOW]]{0}s +m.SkillArchery=BOOGSCHIETEN +m.XPGainArchery=Schiet op vijanden +m.EffectsArchery1_0=Brandende pijl +m.EffectsArchery1_1=25% kans dat een vijand verbrand +m.EffectsArchery2_0=Verdoof (Players) +m.EffectsArchery2_1=Gedesorienteerde vijanden +m.EffectsArchery3_0=Schade+ +m.EffectsArchery3_1=Verhoogt schade +m.EffectsArchery4_0=Pijlen terugkrijgen +m.EffectsArchery4_1=Kans dat dode vijanden pijlen droppen +m.ArcheryDazeChance=[[RED]]Kans op verdoving: [[YELLOW]]{0}% +m.ArcheryRetrieveChance=[[RED]]Kans om pijlen terug te krijgen: [[YELLOW]]{0}% +m.ArcheryIgnitionLength=[[RED]]Lengte van Brandende pijl: [[YELLOW]]{0} seconds +m.ArcheryDamagePlus=[[RED]]Schade+ (Rank{0}): [[YELLOW]]Bonus {0} schade +m.SkillAxes=BIJLEN +m.XPGainAxes=Val monsters aan met een bijl +m.EffectsAxes1_0=Schedelsplijter (ABILITY) +m.EffectsAxes1_1=Geef schade rond om je heen +m.EffectsAxes2_0=Critical Strikes +m.EffectsAxes2_1=Dubbele schade +m.EffectsAxes3_0=Bijl Master (500 SKILL) +m.EffectsAxes3_1=Verhoogt schade +m.AbilLockAxes1=GEBLOKEERD TOT 500+ SKILL (BIJL MASTER) +m.AbilBonusAxes1_0=Bijl Master +m.AbilBonusAxes1_1=4 schade extra +m.AxesCritChance=[[RED]]Kans op Critical Strikes: [[YELLOW]]{0}% +m.AxesSkullLength=[[RED]]Schedelsplijter lengte: [[YELLOW]]{0}s +m.SkillSwords=ZWAARDEN +m.XPGainSwords=Val monsters aan met een zwaard +m.EffectsSwords1_0=Terugkaats Aanval +m.EffectsSwords1_1=Kaats 50% van de schade terug +m.EffectsSwords2_0=Serrated Strikes (ABILITY) +m.EffectsSwords2_1=25% meer schade, kans op Bloeding+ om je heen +m.EffectsSwords3_0=Serrated Strikes Bloeding+ +m.EffectsSwords3_1=Kans op extra bloeding bij vijanden +m.EffectsSwords4_0=Pareren +m.EffectsSwords4_1=Blokkeer vijandelijke aanval +m.EffectsSwords5_0=5 Tikken van Bloeding +m.EffectsSwords5_1=Laat anderen bloeden +m.SwordsCounterAttChance=[[RED]]Kans op Terugkeer Aanval: [[YELLOW]]{0}% +m.SwordsBleedLength=[[RED]]Bloeding lengte: [[YELLOW]]{0} ticks +m.SwordsBleedChance=[[RED]]Kans op Bloeding: [[YELLOW]]{0} % +m.SwordsParryChance=[[RED]]Kans op Pareren: [[YELLOW]]{0} % +m.SwordsSSLength=[[RED]]Serrated Strikes lengte: [[YELLOW]]{0}s +m.SwordsTickNote=[[GRAY]]NOTE: [[YELLOW]]1 tik per 2 seconden +m.SkillAcrobatics=ACROBATIEK +m.XPGainAcrobatics=Vallen +m.EffectsAcrobatics1_0=Rollen +m.EffectsAcrobatics1_1=Verminderd of voorkomt schade +m.EffectsAcrobatics2_0=Perfecte Rol +m.EffectsAcrobatics2_1=Twee keer zo effectief als Rollen +m.EffectsAcrobatics3_0=Ontwijken +m.EffectsAcrobatics3_1=50% minder schade +m.AcrobaticsRollChance=[[RED]]Kans om te rollen: [[YELLOW]]{0}% +m.AcrobaticsGracefulRollChance=[[RED]]Kans op Perfecte Rol: [[YELLOW]]{0}% +m.AcrobaticsDodgeChance=[[RED]]Kans om te ontwijken: [[YELLOW]]{0}% +m.SkillMining=MIJNBOUW +m.XPGainMining=Hak steen & erts met een pickaxe +m.EffectsMining1_0=Super Breeker (ABILITY) +m.EffectsMining1_1=Hogere snelheid, Kans op 3x drop +m.EffectsMining2_0=Dubbele Drops +m.EffectsMining2_1=Dubbele van normale drop +m.MiningDoubleDropChance=[[RED]]Kans op Dubbele Drop: [[YELLOW]]{0}% +m.MiningSuperBreakerLength=[[RED]]Super Breeker lengte: [[YELLOW]]{0}s +m.SkillRepair=REPAREREN +m.XPGainRepair=Repareer tools en armor +m.EffectsRepair1_0=Repareer +m.EffectsRepair1_1=Repareer Iron Tools & Armor +m.EffectsRepair2_0=Repareer Master +m.EffectsRepair2_1=Vergroot de reparatiehoeveelheid +m.EffectsRepair3_0=Super Repareren +m.EffectsRepair3_1=Dubbel effectief +m.EffectsRepair4_0=Diamond Repareren ({0}+ SKILL) +m.EffectsRepair4_1=Repareer Diamond Tools & Armor +m.RepairRepairMastery=[[RED]]Repareer Master: [[YELLOW]]Extra {0}% durability restored +m.RepairSuperRepairChance=[[RED]]Kans op Super Repareren: [[YELLOW]]{0}% +m.SkillUnarmed=ONBEWAPEND +m.XPGainUnarmed=Val monsters aan met hand +m.EffectsUnarmed1_0=Onbewapende gek (ABILITY) +m.EffectsUnarmed1_1=+50% schade, hak zachte materialen weg +m.EffectsUnarmed2_0=Ontwapen (Players) +m.EffectsUnarmed2_1=Dropt het wapen van de vijand +m.EffectsUnarmed3_0=Onbewapende held +m.EffectsUnarmed3_1=Nog meer schade +m.EffectsUnarmed4_0=Onbewapende leerling +m.EffectsUnarmed4_1=Meer schade +m.EffectsUnarmed5_0=Pijlafwijking +m.EffectsUnarmed5_1=Laat pijlen afwijken +m.AbilLockUnarmed1=GEBLOKEERD TOT 250+ SKILL (Onbewapende leerling) +m.AbilLockUnarmed2=GEBLOKEERD TOT 500+ SKILL (Onbewapende held) +m.AbilBonusUnarmed1_0=Onbewapende leerling +m.AbilBonusUnarmed1_1=+2 meer schade +m.AbilBonusUnarmed2_0=Onbewapende held +m.AbilBonusUnarmed2_1=+4 meer schade +m.UnarmedArrowDeflectChance=[[RED]]Kans op Pijlafwijking: [[YELLOW]]{0}% +m.UnarmedDisarmChance=[[RED]]Kans op Ontwapening: [[YELLOW]]{0}% +m.UnarmedBerserkLength=[[RED]]Lengte van Onbewapende gek: [[YELLOW]]{0}s +m.SkillHerbalism=LANDBOUW +m.XPGainHerbalism=Verzamel kruiden en planten +m.EffectsHerbalism1_0=Groene Aarde (ABILITY) +m.EffectsHerbalism1_1=3x meer XP en kans op 3x drop +m.EffectsHerbalism2_0=Groene vingers (Wheat) +m.EffectsHerbalism2_1=Plant wheat bij het oogsten +m.EffectsHerbalism3_0=Groene vingers (Cobble) +m.EffectsHerbalism3_1=Maakt van cobblestone moss-stone met seeds +m.EffectsHerbalism4_0=Voedsel+ +m.EffectsHerbalism4_1=Verhoogt de heling van brood en stews +m.EffectsHerbalism5_0=Dubbele Drop (Alle planten) +m.EffectsHerbalism5_1=Dubbele drop van planten +m.HerbalismGreenTerraLength=[[RED]]Groene Aarde lengte: [[YELLOW]]{0}s +m.HerbalismGreenThumbChance=[[RED]]Kans op Groene vingers: [[YELLOW]]{0}% +m.HerbalismGreenThumbStage=[[RED]]Groene vingers periode: [[YELLOW]] Wheat groeit in periode {0} +m.HerbalismDoubleDropChance=[[RED]]Kans op Dubbele Drop: [[YELLOW]]{0}% +m.HerbalismFoodPlus=[[RED]]Voedsel+ (Rank{0}): [[YELLOW]]Bonus {0} heling +m.SkillExcavation=UITGRAVING +m.XPGainExcavation=Graven +m.EffectsExcavation1_0=Giga Drilboor (ABILITY) +m.EffectsExcavation1_1=3x drop, 3x XP, hogere snelheid +m.EffectsExcavation2_0=Schatzoeker +m.EffectsExcavation2_1=Mogelijkheid om schatten te zoeken +m.ExcavationGreenTerraLength=[[RED]]Giga Drilboor lengte: [[YELLOW]]{0}s +mcBlockListener.PlacedAnvil=[[DARK_RED]]Je hebt een aambeeld geplaatst. Hierop kun je tools en armor repareren. +mcEntityListener.WolfComesBack=[[DARK_GRAY]]Je wolf dribbelt terug naar je... +mcPlayerListener.AbilitiesOff=Ability activatie is uit +mcPlayerListener.AbilitiesOn=Ability activatie is aan +mcPlayerListener.AbilitiesRefreshed=[[GREEN]]**ABILITIES HERLADEN\!** +mcPlayerListener.AcrobaticsSkill=Acrobatiek: +mcPlayerListener.ArcherySkill=Boogschieten: +mcPlayerListener.AxesSkill=Bijlen: +mcPlayerListener.ExcavationSkill=Uitgraving: +mcPlayerListener.GodModeDisabled=[[YELLOW]]Godmodus uitgeschakeld +mcPlayerListener.GodModeEnabled=[[YELLOW]]Godmodus ingeschakeld +mcPlayerListener.GreenThumb=[[GREEN]]**GROENE VINGERS** +mcPlayerListener.GreenThumbFail=[[RED]]**GROENE VINNGERS MISLUKT** +mcPlayerListener.HerbalismSkill=Landbouw: +mcPlayerListener.MiningSkill=Mijnbouw: +mcPlayerListener.MyspawnCleared=[[DARK_AQUA]]Myspawn is verwijderd. +mcPlayerListener.MyspawnNotExist=[[RED]]Plaats Myspawn eerst door op een bed te drukken. +mcPlayerListener.MyspawnSet=[[DARK_AQUA]]Myspawn is geplaatst op je huidige locatie. +mcPlayerListener.MyspawnTimeNotice=Je moet {0}m {1}s wachten voordat je myspawn kan gebruiken. +mcPlayerListener.NoPermission=Je hebt geen permissie. +mcPlayerListener.NoSkillNote=[[DARK_GRAY]]Als je geen toegang hebt tot een skill wordt hij hier niet weergegeven. +mcPlayerListener.NotInParty=[[RED]]Je zit niet in een party. +mcPlayerListener.InviteSuccess=[[GREEN]]Uitnodiging succesvol verzonden. +mcPlayerListener.ReceivedInvite1=[[RED]]BERICHT: [[GREEN]]Je bent uitgenodigd voor de party {0} door {1} +mcPlayerListener.ReceivedInvite2=[[YELLOW]]Type [[GREEN]]/{0}[[YELLOW]] om de uitnodiging te accepteren. +mcPlayerListener.InviteAccepted=[[GREEN]]Uitnodiging geaccepteerd. Je bent nu lid van {0} +mcPlayerListener.NoInvites=[[RED]]Je hebt geen uitnodigingen +mcPlayerListener.YouAreInParty=[[GREEN]]Je zit in de party {0} +mcPlayerListener.PartyMembers=[[GREEN]]Party Leden +mcPlayerListener.LeftParty=[[RED]]Je hebt de party verlaten +mcPlayerListener.JoinedParty=Lid geworden van: {0} +mcPlayerListener.PartyChatOn=Alleen Party Chat [[GREEN]]aan +mcPlayerListener.PartyChatOff=Alleen Party Chat [[RED]]uit +mcPlayerListener.AdminChatOn=Alleen Admin Chat [[GREEN]]aan +mcPlayerListener.AdminChatOff=Alleen Admin Chat [[RED]]uit +mcPlayerListener.MOTD=[[BLUE]]Deze server werkt op mcMMO {0} type [[YELLOW]]/{1}[[BLUE]] voor hulp. +mcPlayerListener.WIKI=[[GREEN]]http://mcmmo.wikia.com[[BLUE]] - mcMMO Wiki +mcPlayerListener.PowerLevel=[[DARK_RED]]POWER LEVEL: +mcPlayerListener.PowerLevelLeaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Highscore-- +mcPlayerListener.SkillLeaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Highscore-- +mcPlayerListener.RepairSkill=Repareren: +mcPlayerListener.SwordsSkill=Zwaarden: +mcPlayerListener.TamingSkill=Temmen: +mcPlayerListener.UnarmedSkill=Onbewapend: +mcPlayerListener.WoodcuttingSkill=Houthakken: +mcPlayerListener.YourStats=[[GREEN]][mcMMO] Status +Party.InformedOnJoin={0} [[GREEN]] heeft je party gejoined +Party.InformedOnQuit={0} [[GREEN]] heeft je party verlaten +Skills.YourGreenTerra=[[GREEN]]Je [[YELLOW]]Groene Aarde [[GREEN]]ability is opgeladen! +Skills.YourTreeFeller=[[GREEN]]Je [[YELLOW]]Tree Feller [[GREEN]]ability is opgeladen! +Skills.YourSuperBreaker=[[GREEN]]Je [[YELLOW]]Super Breeker [[GREEN]]ability is opgeladen! +Skills.YourSerratedStrikes=[[GREEN]]Je [[YELLOW]]Serrated Strikes [[GREEN]]ability is opgeladen! +Skills.YourBerserk=[[GREEN]]Je [[YELLOW]]Onbewapende gek [[GREEN]]ability is opgeladen! +Skills.YourSkullSplitter=[[GREEN]]Je [[YELLOW]]Schedelsplijter [[GREEN]]ability is opgeladen! +Skills.YourGigaDrillBreaker=[[GREEN]]Je [[YELLOW]]Giga Drilboor [[GREEN]]ability is opgeladen! +Skills.TooTired=[[RED]]Je bent te moe om die ability te gebruiken. +Skills.ReadyHoe=[[GREEN]]**JE TILT JE SCHOFFEL OP** +Skills.LowerHoe=[[GRAY]]**JE LAAT JE SCHOFFEL ZAKKEN** +Skills.ReadyAxe=[[GREEN]]**JE TILT JE BIJL OP** +Skills.LowerAxe=[[GRAY]]**JE LAAT JE BIJL ZAKKEN** +Skills.ReadyFists=[[GREEN]]**JE BALT JE VUISTEN** +Skills.LowerFists=[[GRAY]]**JE LAAT JE VUISTEN ZAKKEN** +Skills.ReadyPickAxe=[[GREEN]]**JE TILT JE PICKAXE OP** +Skills.LowerPickAxe=[[GRAY]]**JE LAAT JE PICKAXE ZAKKEN** +Skills.ReadyShovel=[[GREEN]]**JE TILT JE SCHEP OP** +Skills.LowerShovel=[[GRAY]]**JE LAAT JE SCHEP ZAKKEN** +Skills.ReadySword=[[GREEN]]**JE TILT JE ZWAARD OP** +Skills.LowerSword=[[GRAY]]**JE LAAT JE ZWAARD ZAKKEN** +Skills.BerserkOn=[[GREEN]]**ONBEWAPENDE GEK GEACTIVEERD** +Skills.BerserkPlayer=[[GREEN]]{0}[[DARK_GREEN]] gebruikt [[RED]]Onbewapende gek! +Skills.GreenTerraOn=[[GREEN]]**GROENE AARDE GEACTIVEERD** +Skills.GreenTerraPlayer=[[GREEN]]{0}[[DARK_GREEN]] gebruikt [[RED]]Groene Aarde! +Skills.TreeFellerOn=[[GREEN]]**TREE FELLER GEACTIVEERD** +Skills.TreeFellerPlayer=[[GREEN]]{0}[[DARK_GREEN]] gebruikt [[RED]]Tree Feller! +Skills.SuperBreakerOn=[[GREEN]]**SUPER BREEKER GEACTIVEERD** +Skills.SuperBreakerPlayer=[[GREEN]]{0}[[DARK_GREEN]] gebruikt [[RED]]Super Breeker! +Skills.SerratedStrikesOn=[[GREEN]]**SERRATED STRIKES GEACTIVEERD** +Skills.SerratedStrikesPlayer=[[GREEN]]{0}[[DARK_GREEN]] gebruikt [[RED]]Serrated Strikes! +Skills.SkullSplitterOn=[[GREEN]]**SCHEDELSPLIJTER GEACTIVEERD** +Skills.SkullSplitterPlayer=[[GREEN]]{0}[[DARK_GREEN]] gebruikt [[RED]]Schedelsplijter! +Skills.GigaDrillBreakerOn=[[GREEN]]**GIGA DRILBOOR GEACTIVEERD** +Skills.GigaDrillBreakerPlayer=[[GREEN]]{0}[[DARK_GREEN]] gebruikt [[RED]]Giga Drilboor! +Skills.GreenTerraOff=[[RED]]**Groene Aarde is uitgewerkt** +Skills.TreeFellerOff=[[RED]]**Tree Feller is uitgewerkt** +Skills.SuperBreakerOff=[[RED]]**Super Breeker is uitgewerkt** +Skills.SerratedStrikesOff=[[RED]]**Serrated Strikes is uitgewerkt** +Skills.BerserkOff=[[RED]]**Onbewapende gek is uitgewerkt** +Skills.SkullSplitterOff=[[RED]]**Schedelsplijter is uitgewerkt** +Skills.GigaDrillBreakerOff=[[RED]]**Giga Drilboor is uitgewerkt** +Skills.TamingUp=[[YELLOW]]Temmen skill verhoogt met {0}. Totaal ({1}) +Skills.AcrobaticsUp=[[YELLOW]]Acrobatics skill verhoogt met {0}. Total ({1}) +Skills.ArcheryUp=[[YELLOW]]Boogschieten skill verhoogt met {0}. Totaal ({1}) +Skills.SwordsUp=[[YELLOW]]Zwaarden skill verhoogt met {0}. Totaal ({1}) +Skills.AxesUp=[[YELLOW]]Bijlen skill verhoogt met {0}. Totaal ({1}) +Skills.UnarmedUp=[[YELLOW]]Onbewapend skill verhoogt met {0}. Totaal ({1}) +Skills.HerbalismUp=[[YELLOW]]Landbouw skill verhoogt met {0}. Totaal ({1}) +Skills.MiningUp=[[YELLOW]]Mijnbouw skill verhoogt met {0}. Totaal ({1}) +Skills.WoodcuttingUp=[[YELLOW]]Houthakken skill verhoogt met {0}. Totaal ({1}) +Skills.RepairUp=[[YELLOW]]Repareren skill verhoogt met {0}. Totaal ({1}) +Skills.ExcavationUp=[[YELLOW]]Uitgraven skill verhoogt met {0}. Totaal ({1}) +Skills.FeltEasy=[[GRAY]]Dat was makkelijk. +Skills.StackedItems=[[DARK_RED]]Je kan geen gestackte items repareren +Skills.NeedMore=[[DARK_RED]]Je hebt te weinig +Skills.AdeptDiamond=[[DARK_RED]]Je bent niet goed genoeg om diamond te repareren. +Skills.FullDurability=[[GRAY]]Dat is nog helemaal heel. +Skills.Disarmed=[[DARK_RED]]Je bent ontwapend! +mcPlayerListener.SorcerySkill=Tovenarij: +m.SkillSorcery=TOVERNARIJ +Sorcery.HasCast=[[GREEN]]**UITROEPEN VAN**[[GOLD]] +Sorcery.Current_Mana=[[DARK_AQUA]]MP +Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]]) +Sorcery.Cost=[[RED]][COST] {0} MP +Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Geen Mana meer [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]]) +Sorcery.Water.Thunder=DONDER +Sorcery.Curative.Self=HEEL JEZELF +Sorcery.Curative.Other=HEEL EEN ANDER +m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]]) +Combat.BeastLore=[[GREEN]]**WOLFINSPECTIE** +Combat.BeastLoreOwner=[[DARK_AQUA]]Eigenaar ([[RED]]{0}[[DARK_AQUA]]) +Combat.BeastLoreHealthWolfTamed=[[DARK_AQUA]]Levens ([[GREEN]]{0}[[DARK_AQUA]]/20) +Combat.BeastLoreHealthWolf=[[DARK_AQUA]]Levens ([[GREEN]]{0}[[DARK_AQUA]]/8) \ No newline at end of file diff --git a/mcMMO/com/gmail/nossr50/skills/Axes.java b/mcMMO/com/gmail/nossr50/skills/Axes.java index 8d9045b0b..80c7c5f81 100644 --- a/mcMMO/com/gmail/nossr50/skills/Axes.java +++ b/mcMMO/com/gmail/nossr50/skills/Axes.java @@ -96,44 +96,57 @@ public class Axes { public static void applyAoeDamage(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx) { - int targets = 0; - Entity x = event.getEntity(); - targets = m.getTier(attacker); - for(Entity derp : x.getWorld().getEntities()) + int targets = 0; + + if(event.getEntity() instanceof LivingEntity) { - if(m.getDistance(x.getLocation(), derp.getLocation()) < 5) - { - if(derp instanceof Player) - { - if(Combat.pvpAllowed(event, derp.getWorld())) - { - Player target = (Player)derp; - if(Party.getInstance().inSameParty(attacker, target)) - continue; - if(!target.getName().equals(attacker.getName()) && targets >= 1) - { - target.damage(event.getDamage() / 2); - target.sendMessage(ChatColor.DARK_RED+"Struck by CLEAVE!"); - targets--; - } - } - } else if(derp instanceof LivingEntity && targets >= 1) - { - if(derp instanceof Wolf) - { - Wolf hurrDurr = (Wolf)derp; - if(Taming.getOwner(hurrDurr, pluginx) == attacker) - continue; - if(Party.getInstance().inSameParty(attacker, Taming.getOwner(hurrDurr, pluginx))) - continue; - } - - //Deal the damage - LivingEntity target = (LivingEntity)derp; - target.damage(event.getDamage() / 2); - targets--; - } - } + LivingEntity x = (LivingEntity) event.getEntity(); + targets = m.getTier(attacker); + + for(Entity derp : x.getWorld().getEntities()) + { + if(m.getDistance(x.getLocation(), derp.getLocation()) < 5) + { + + + //Make sure the Wolf is not friendly + if(derp instanceof Wolf) + { + Wolf hurrDurr = (Wolf)derp; + if(Taming.getOwner(hurrDurr, pluginx) == attacker) + continue; + if(Party.getInstance().inSameParty(attacker, Taming.getOwner(hurrDurr, pluginx))) + continue; + } + //Damage nearby LivingEntities + if(derp instanceof LivingEntity && targets >= 1) + { + if(derp instanceof Player) + { + Player target = (Player)derp; + + if(target.getName().equals(attacker.getName())) + continue; + + if(Party.getInstance().inSameParty(attacker, target)) + continue; + if(targets >= 1 && derp.getWorld().getPVP()) + { + target.damage(event.getDamage() / 2); + target.sendMessage(ChatColor.DARK_RED+"Struck by CLEAVE!"); + targets--; + continue; + } + } + else + { + LivingEntity target = (LivingEntity)derp; + target.damage(event.getDamage() / 2); + targets--; + } + } + } + } } } } diff --git a/mcMMO/com/gmail/nossr50/skills/Mining.java b/mcMMO/com/gmail/nossr50/skills/Mining.java index a8d5db3ae..6a531882d 100644 --- a/mcMMO/com/gmail/nossr50/skills/Mining.java +++ b/mcMMO/com/gmail/nossr50/skills/Mining.java @@ -177,7 +177,8 @@ public class Mining { return false; } } - public static void SuperBreakerBlockCheck(Player player, Block block, mcMMO plugin){ + public static void SuperBreakerBlockCheck(Player player, Block block, mcMMO plugin) + { PlayerProfile PP = Users.getProfile(player); if(LoadProperties.toolsLoseDurabilityFromAbilities) m.damageTool(player, (short) LoadProperties.abilityDurabilityLoss); @@ -188,18 +189,24 @@ public class Mining { ItemStack item = new ItemStack(mat, 1, (byte)0, damage); if(block.getTypeId() == 1 || block.getTypeId() == 24) { - if(!plugin.misc.blockWatchList.contains(block) && block.getData() != (byte) 5) - { - xp += 3; - blockProcCheck(block, player); - blockProcCheck(block, player); - } if(block.getTypeId() == 1) { mat = Material.COBBLESTONE; + if(!plugin.misc.blockWatchList.contains(block) && block.getData() != (byte) 5) + { + xp += LoadProperties.mstone; + blockProcCheck(block, player); + blockProcCheck(block, player); + } } else { mat = Material.SANDSTONE; + if(!plugin.misc.blockWatchList.contains(block) && block.getData() != (byte) 5) + { + xp += LoadProperties.msandstone; + blockProcCheck(block, player); + blockProcCheck(block, player); + } } item = new ItemStack(mat, 1, (byte)0, damage); loc.getWorld().dropItemNaturally(loc, item); @@ -210,7 +217,7 @@ public class Mining { if(block.getTypeId() == 87) { if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 3; + xp += LoadProperties.mnetherrack; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -224,7 +231,7 @@ public class Mining { if(block.getTypeId() == 89) { if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 3; + xp += LoadProperties.mglowstone; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -238,7 +245,7 @@ public class Mining { if(block.getTypeId() == 16) { if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 10; + xp += LoadProperties.mcoal; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -252,7 +259,7 @@ public class Mining { if(block.getTypeId() == 14 && m.getTier(player) >= 3) { if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 35; + xp += LoadProperties.mgold; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -267,7 +274,7 @@ public class Mining { if(LoadProperties.toolsLoseDurabilityFromAbilities) m.damageTool(player, (short) LoadProperties.abilityDurabilityLoss); if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 15; + xp += LoadProperties.mobsidian; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -281,7 +288,7 @@ public class Mining { if(block.getTypeId() == 56 && m.getTier(player) >= 3) { if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 75; + xp += LoadProperties.mdiamond; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -295,7 +302,7 @@ public class Mining { if(block.getTypeId() == 15 && m.getTier(player) >= 2) { if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 25; + xp += LoadProperties.miron; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -309,7 +316,7 @@ public class Mining { { if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5) { - xp += 15; + xp += LoadProperties.mredstone; blockProcCheck(block, player); blockProcCheck(block, player); } @@ -328,7 +335,7 @@ public class Mining { //LAPUS if(block.getTypeId() == 21 && m.getTier(player) >= 3){ if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5){ - xp += 40; + xp += LoadProperties.mlapus; blockProcCheck(block, player); blockProcCheck(block, player); } diff --git a/mcMMO/com/gmail/nossr50/skills/Swords.java b/mcMMO/com/gmail/nossr50/skills/Swords.java index d33fe30e8..28d59cbb5 100644 --- a/mcMMO/com/gmail/nossr50/skills/Swords.java +++ b/mcMMO/com/gmail/nossr50/skills/Swords.java @@ -125,7 +125,7 @@ public class Swords { //Damage nearby LivingEntities if(derp instanceof LivingEntity && targets >= 1) { - if(derp instanceof Player && derp.getWorld().getPVP()) + if(derp instanceof Player) { Player target = (Player)derp; @@ -134,7 +134,7 @@ public class Swords { if(Party.getInstance().inSameParty(attacker, target)) continue; - if(targets >= 1) + if(targets >= 1 && derp.getWorld().getPVP()) { target.damage(event.getDamage() / 4); target.sendMessage(ChatColor.DARK_RED+"Struck by Serrated Strikes!"); diff --git a/mcMMO/plugin.yml b/mcMMO/plugin.yml index f9e451610..31cb2f755 100644 --- a/mcMMO/plugin.yml +++ b/mcMMO/plugin.yml @@ -1,3 +1,3 @@ name: mcMMO main: com.gmail.nossr50.mcMMO -version: 1.0.33 \ No newline at end of file +version: 1.0.34 \ No newline at end of file