Browse Source

Starting work on skill help pages. (Excavation)

GJ 13 years ago
parent
commit
1814d52680

+ 2 - 2
src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java

@@ -14,7 +14,8 @@ import com.gmail.nossr50.locale.mcLocale;
 public class AcrobaticsCommand implements CommandExecutor {
 public class AcrobaticsCommand implements CommandExecutor {
 	@Override
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
+		if (!(sender instanceof Player))
+		{
 			sender.sendMessage("This command does not support console useage.");
 			sender.sendMessage("This command does not support console useage.");
 			return true;
 			return true;
 		}
 		}
@@ -46,7 +47,6 @@ public class AcrobaticsCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage }));
 		player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage }));
 		player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage }));
 		player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage }));
-
 		return true;
 		return true;
 	}
 	}
 }
 }

+ 41 - 1
src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.commands.skills;
 package com.gmail.nossr50.commands.skills;
 
 
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.CommandSender;
@@ -7,6 +8,7 @@ import org.bukkit.entity.Player;
 
 
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.locale.mcLocale;
@@ -29,6 +31,8 @@ public class ExcavationCommand implements CommandExecutor {
 			ticks++;
 			ticks++;
 		}
 		}
 
 
+
+		player.sendMessage("");
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
 		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
 		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
 
 
@@ -39,8 +43,44 @@ public class ExcavationCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation1_0"), mcLocale.getString("m.EffectsExcavation1_1") }));
 		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation1_0"), mcLocale.getString("m.EffectsExcavation1_1") }));
 		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation2_0"), mcLocale.getString("m.EffectsExcavation2_1") }));
 		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation2_0"), mcLocale.getString("m.EffectsExcavation2_1") }));
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.ExcavationGreenTerraLength", new Object[] { ticks }));
+		player.sendMessage(mcLocale.getString("m.ExcavationGigaDrillBreakerLength", new Object[] { ticks }));
 
 
+		if (args.length >= 1)
+		{
+			if(args[0].equals("?"))
+			{
+				if(args[1].equals("1"))
+				{
+					player.sendMessage("==EXCAVATION==");
+					player.sendMessage("");
+					player.sendMessage("==XP Gain==");
+					player.sendMessage("Base XP: " + LoadProperties.mbase);
+					player.sendMessage(ChatColor.GRAY + "Awarded for digging Dirt, Grass, Sand, Gravel, ");
+					player.sendMessage(ChatColor.GRAY + "Soul Sand, Mycelium, and Clay.");
+					player.sendMessage("Treasures: Varies by item");
+					player.sendMessage(ChatColor.GRAY + "Awarded for finding items while digging.");
+					player.sendMessage("");
+					player.sendMessage("==Abilities==");
+					player.sendMessage("Giga Drill Breaker");
+					player.sendMessage(ChatColor.GRAY + "Right-click with a shovel in hand to prep this ability.");
+					player.sendMessage(ChatColor.GRAY + "Allows for instabreaking of associated blocks.");
+					player.sendMessage("");
+					player.sendMessage("==Subskills==");
+					player.sendMessage("Treasure Hunter");
+					player.sendMessage(ChatColor.GRAY + "Randomly find valuable items while digging.");
+					player.sendMessage(ChatColor.GRAY + "Items found vary depending on skill level.");
+					player.sendMessage("");
+					player.sendMessage("==PAGE 1 of 1==");
+				}
+				
+			}
+			else
+			{
+				player.sendMessage(ChatColor.RED + "Usage is /excavation ? [page]");
+			}
+				
+		}
+		
 		return true;
 		return true;
 	}
 	}
 }
 }

+ 1 - 1
src/main/resources/locale/locale_de.properties

@@ -201,7 +201,7 @@ m.EffectsExcavation1_0=[[YELLOW]]Giga Bohrer (Faehigkeit)
 m.EffectsExcavation1_1=[[AQUA]]3x Drop Rate, 3x EXP, +Tempo
 m.EffectsExcavation1_1=[[AQUA]]3x Drop Rate, 3x EXP, +Tempo
 m.EffectsExcavation2_0=[[YELLOW]]Schatzjaeger
 m.EffectsExcavation2_0=[[YELLOW]]Schatzjaeger
 m.EffectsExcavation2_1=[[AQUA]]Faehigkeit nach Schaetzen zu graben
 m.EffectsExcavation2_1=[[AQUA]]Faehigkeit nach Schaetzen zu graben
-m.ExcavationGreenTerraLength=[[YELLOW]]Giga Bohrer Dauer: [[GREEN]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[YELLOW]]Giga Bohrer Dauer: [[GREEN]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_AQUA]]Du hast einen Ambos platziert, du kannst hier Werkzeuge und Ruestungen reparieren.
 mcBlockListener.PlacedAnvil=[[DARK_AQUA]]Du hast einen Ambos platziert, du kannst hier Werkzeuge und Ruestungen reparieren.
 mcEntityListener.WolfComesBack=[[DARK_AQUA]]Dein Wolf hastet zurueck zu dir...
 mcEntityListener.WolfComesBack=[[DARK_AQUA]]Dein Wolf hastet zurueck zu dir...
 mcPlayerListener.AbilitiesOff=Faehigkeiten nutzen (rechtsklick) aus
 mcPlayerListener.AbilitiesOff=Faehigkeiten nutzen (rechtsklick) aus

+ 1 - 1
src/main/resources/locale/locale_en_us.properties

@@ -203,7 +203,7 @@ m.EffectsExcavation1_0=Giga Drill Breaker (ABILITY)
 m.EffectsExcavation1_1=3x Drop Rate, 3x EXP, +Speed
 m.EffectsExcavation1_1=3x Drop Rate, 3x EXP, +Speed
 m.EffectsExcavation2_0=Treasure Hunter
 m.EffectsExcavation2_0=Treasure Hunter
 m.EffectsExcavation2_1=Ability to dig for treasure
 m.EffectsExcavation2_1=Ability to dig for treasure
-m.ExcavationGreenTerraLength=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Your wolf scurries back to you...
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Your wolf scurries back to you...
 mcPlayerListener.AbilitiesOff=Ability use toggled off
 mcPlayerListener.AbilitiesOff=Ability use toggled off

+ 1 - 1
src/main/resources/locale/locale_es_es.properties

@@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Ultra perforador (HABILIDAD)
 m.EffectsExcavation1_1=Triple beneficio, Triple EXP, + Velocidad
 m.EffectsExcavation1_1=Triple beneficio, Triple EXP, + Velocidad
 m.EffectsExcavation2_0=Cazatesoros
 m.EffectsExcavation2_0=Cazatesoros
 m.EffectsExcavation2_1=Habilidad para excavar y obtener tesoros
 m.EffectsExcavation2_1=Habilidad para excavar y obtener tesoros
-m.ExcavationGreenTerraLength=[[RED]]Duracion de Ultra perforador: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Duracion de Ultra perforador: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Has establecido un yunque, Los yunques pueden reparar herramientas y armadura.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Has establecido un yunque, Los yunques pueden reparar herramientas y armadura.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]El lobo se escabuye hacia ti...
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]El lobo se escabuye hacia ti...
 mcPlayerListener.AbilitiesOff=Uso de habilidad desactivada
 mcPlayerListener.AbilitiesOff=Uso de habilidad desactivada

+ 1 - 1
src/main/resources/locale/locale_fi.properties

@@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Giga Drill Breaker (TAITO)
 m.EffectsExcavation1_1=3x saaliin määrä, 3x kokemuspisteiden määrä, +Nopeus
 m.EffectsExcavation1_1=3x saaliin määrä, 3x kokemuspisteiden määrä, +Nopeus
 m.EffectsExcavation2_0=Aarteenmetsästäjä
 m.EffectsExcavation2_0=Aarteenmetsästäjä
 m.EffectsExcavation2_1=Taito jonka avulla voit kaivaa aarteita
 m.EffectsExcavation2_1=Taito jonka avulla voit kaivaa aarteita
-m.ExcavationGreenTerraLength=[[RED]]Giga Drill Breaker kesto: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drill Breaker kesto: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Olet asettanut alasimen maahan, sillä voit korjata työkaluja ja haarniskoja.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Olet asettanut alasimen maahan, sillä voit korjata työkaluja ja haarniskoja.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Sutesi kipittää takaisin luoksesi...
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Sutesi kipittää takaisin luoksesi...
 mcPlayerListener.AbilitiesOff=Taitojen käyttö pois päältä
 mcPlayerListener.AbilitiesOff=Taitojen käyttö pois päältä

+ 1 - 1
src/main/resources/locale/locale_fr.properties

@@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Super broyeur (capacit
 m.EffectsExcavation1_1=3x Butin, 3x XP, +Vitesse
 m.EffectsExcavation1_1=3x Butin, 3x XP, +Vitesse
 m.EffectsExcavation2_0=Chercheur de trésors
 m.EffectsExcavation2_0=Chercheur de trésors
 m.EffectsExcavation2_1=Capacité de trouver un trésor
 m.EffectsExcavation2_1=Capacité de trouver un trésor
-m.ExcavationGreenTerraLength=[[RED]]Durée de la capacité spéciale : [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Durée de la capacité spéciale : [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Vous avez placé une enclume, Les enclumes peuvent réparer les outils et l'armure.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Vous avez placé une enclume, Les enclumes peuvent réparer les outils et l'armure.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Votre loup revient vers vous...
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Votre loup revient vers vous...
 mcPlayerListener.AbilitiesOff=Capacité spéciale désactivée
 mcPlayerListener.AbilitiesOff=Capacité spéciale désactivée

+ 1 - 1
src/main/resources/locale/locale_nl.properties

@@ -207,7 +207,7 @@ m.EffectsExcavation1_0=Giga Drilboor (ABILITY)
 m.EffectsExcavation1_1=3x drop, 3x XP, hogere snelheid
 m.EffectsExcavation1_1=3x drop, 3x XP, hogere snelheid
 m.EffectsExcavation2_0=Schatzoeker
 m.EffectsExcavation2_0=Schatzoeker
 m.EffectsExcavation2_1=Mogelijkheid om schatten te zoeken
 m.EffectsExcavation2_1=Mogelijkheid om schatten te zoeken
-m.ExcavationGreenTerraLength=[[RED]]Giga Drilboor lengte: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drilboor lengte: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Je hebt een aambeeld geplaatst. Hierop kun je tools en armor repareren.
 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...
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Je wolf dribbelt terug naar je...
 mcPlayerListener.AbilitiesOff=Ability activatie is uit
 mcPlayerListener.AbilitiesOff=Ability activatie is uit

+ 1 - 1
src/main/resources/locale/locale_pl.properties

@@ -201,7 +201,7 @@ m.EffectsExcavation1_0=Super Szybka Saperka (UMIEJETNOSC)
 m.EffectsExcavation1_1=Zwiekszona szybkosc kopania i trzykrotnie wiekszy urobek i zdobyte doswiadczenie.
 m.EffectsExcavation1_1=Zwiekszona szybkosc kopania i trzykrotnie wiekszy urobek i zdobyte doswiadczenie.
 m.EffectsExcavation2_0=Lowca Skarbow
 m.EffectsExcavation2_0=Lowca Skarbow
 m.EffectsExcavation2_1=Umiejetnosc znajdywania skarbow
 m.EffectsExcavation2_1=Umiejetnosc znajdywania skarbow
-m.ExcavationGreenTerraLength=[[RED]]Czas trwania Super Szybkiej Saperki: [[YELLOW]]{0} sekund.
+m.ExcavationGigaDrillBreakerLength=[[RED]]Czas trwania Super Szybkiej Saperki: [[YELLOW]]{0} sekund.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Polozyles kowadlo, ktore pozwala na naprawe przedmiotow.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Polozyles kowadlo, ktore pozwala na naprawe przedmiotow.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Twoj wilk przybiega z powrotem.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Twoj wilk przybiega z powrotem.
 mcPlayerListener.AbilitiesOff=Uzywanie umiejetnosci wylaczone
 mcPlayerListener.AbilitiesOff=Uzywanie umiejetnosci wylaczone

+ 1 - 1
src/main/resources/locale/locale_pt_br.properties

@@ -207,7 +207,7 @@ m.EffectsExcavation1_0=Super Broca (HABILIDADE ESPECIAL)
 m.EffectsExcavation1_1=Drop x3, EXP x3, mais velocidade
 m.EffectsExcavation1_1=Drop x3, EXP x3, mais velocidade
 m.EffectsExcavation2_0=Caçad/or de Tesouros
 m.EffectsExcavation2_0=Caçad/or de Tesouros
 m.EffectsExcavation2_1=Encontra itens raros enquanto cava
 m.EffectsExcavation2_1=Encontra itens raros enquanto cava
-m.ExcavationGreenTerraLength=[[RED]]Duraçao da Super Broca: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Duraçao da Super Broca: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]] Você colocou uma bigorna, a bigorna pode reparar ferramentas e armaduras.
 mcBlockListener.PlacedAnvil=[[DARK_RED]] Você colocou uma bigorna, a bigorna pode reparar ferramentas e armaduras.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Seu lobo voltou para você...
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Seu lobo voltou para você...
 mcPlayerListener.AbilitiesOff=Habilidade especial desabilitada
 mcPlayerListener.AbilitiesOff=Habilidade especial desabilitada

+ 1 - 1
src/main/resources/locale/locale_ru.properties

@@ -202,7 +202,7 @@ m.EffectsExcavation1_0=
 m.EffectsExcavation1_1=3-ой дроп, 3-ой опыт, Увеличение скорости
 m.EffectsExcavation1_1=3-ой дроп, 3-ой опыт, Увеличение скорости
 m.EffectsExcavation2_0=Охотник за сокровищами
 m.EffectsExcavation2_0=Охотник за сокровищами
 m.EffectsExcavation2_1=Способность копать сокровища
 m.EffectsExcavation2_1=Способность копать сокровища
-m.ExcavationGreenTerraLength=[[RED]]Продолжительность "Мега дрели": [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Продолжительность "Мега дрели": [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Вы разместили наковальни и теперь можете чинить вещи.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Вы разместили наковальни и теперь можете чинить вещи.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Ваш волк хочет вернуться к вам
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Ваш волк хочет вернуться к вам
 mcPlayerListener.AbilitiesOff=Использование способностей выключено
 mcPlayerListener.AbilitiesOff=Использование способностей выключено