Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Added help menu text for Herbalism hunger bonuses (MCCORE-5)

Browse Source
This commit is contained in:
GJ 2012-02-17 19:31:10 -05:00
parent 4e9333e823
commit a1d5eaa846
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
View File

@ -29,6 +29,10 @@ public class HerbalismCommand implements CommandExecutor {
bonus++; bonus++;
if (PP.getSkillLevel(SkillType.HERBALISM) >= 600) if (PP.getSkillLevel(SkillType.HERBALISM) >= 600)
bonus++; bonus++;
if (PP.getSkillLevel(SkillType.HERBALISM) >= 800)
bonus++;
if (PP.getSkillLevel(SkillType.HERBALISM) >= 1000)
bonus++;
int ticks = 2; int ticks = 2;
int x = PP.getSkillLevel(SkillType.HERBALISM); int x = PP.getSkillLevel(SkillType.HERBALISM);
@ -51,11 +55,13 @@ public class HerbalismCommand implements CommandExecutor {
player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism1_0"), mcLocale.getString("m.EffectsHerbalism1_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism1_0"), mcLocale.getString("m.EffectsHerbalism1_1") }));
player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism2_0"), mcLocale.getString("m.EffectsHerbalism2_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism2_0"), mcLocale.getString("m.EffectsHerbalism2_1") }));
player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism3_0"), mcLocale.getString("m.EffectsHerbalism3_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism3_0"), mcLocale.getString("m.EffectsHerbalism3_1") }));
player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism4_0"), mcLocale.getString("m.EffectsHerbalism4_1") }));
player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism5_0"), mcLocale.getString("m.EffectsHerbalism5_1") })); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism5_0"), mcLocale.getString("m.EffectsHerbalism5_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.HerbalismGreenTerraLength", new Object[] { ticks })); player.sendMessage(mcLocale.getString("m.HerbalismGreenTerraLength", new Object[] { ticks }));
player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbChance", new Object[] { gpercentage })); player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbChance", new Object[] { gpercentage }));
player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbStage", new Object[] { bonus })); player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbStage", new Object[] { bonus }));
player.sendMessage(mcLocale.getString("m.HerbalismFoodPlus", new Object[] { bonus } ));
player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage })); player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage }));
return true; return true;

12
src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
View File

@ -261,18 +261,16 @@ public class mcEntityListener implements Listener
int foodChange = newFoodLevel - currentFoodLevel; int foodChange = newFoodLevel - currentFoodLevel;
int herbLevel = PP.getSkillLevel(SkillType.HERBALISM); int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
if(herbLevel < 200)
foodChange = foodChange + 1;
if(herbLevel >= 200 && herbLevel < 400) if(herbLevel >= 200 && herbLevel < 400)
foodChange = foodChange + 2; foodChange = foodChange + 2;
if(herbLevel >= 400 && herbLevel < 600) if(herbLevel >= 400 && herbLevel < 600)
foodChange = foodChange + 3;
if(herbLevel >= 600 && herbLevel < 800)
foodChange = foodChange + 4; foodChange = foodChange + 4;
if(herbLevel >= 800 && herbLevel < 1000) if(herbLevel >= 600 && herbLevel < 800)
foodChange = foodChange + 5;
if(herbLevel >= 1000)
foodChange = foodChange + 6; foodChange = foodChange + 6;
if(herbLevel >= 800 && herbLevel < 1000)
foodChange = foodChange + 8;
if(herbLevel >= 1000)
foodChange = foodChange + 10;
newFoodLevel = currentFoodLevel + foodChange; newFoodLevel = currentFoodLevel + foodChange;
if(newFoodLevel > 20) if(newFoodLevel > 20)

8
src/main/resources/locale/locale_en_us.properties
View File

@ -182,17 +182,17 @@ m.EffectsHerbalism1_0=Green Terra (ABILITY)
m.EffectsHerbalism1_1=Spread the Terra, 3x Drops m.EffectsHerbalism1_1=Spread the Terra, 3x Drops
m.EffectsHerbalism2_0=Green Thumb (Wheat) m.EffectsHerbalism2_0=Green Thumb (Wheat)
m.EffectsHerbalism2_1=Auto-Plants wheat when harvesting m.EffectsHerbalism2_1=Auto-Plants wheat when harvesting
m.EffectsHerbalism3_0=Green Thumb (Cobble) m.EffectsHerbalism3_0=Green Thumb (Cobble/Stone Brick)
m.EffectsHerbalism3_1=Cobblestone -> Mossy w/ Seeds m.EffectsHerbalism3_1=Cobblestone/Stone Brick -> Mossy w/ Seeds
m.EffectsHerbalism4_0=Food+ m.EffectsHerbalism4_0=Food+
m.EffectsHerbalism4_1=Modifies health received from bread/stew m.EffectsHerbalism4_1=Modifies hunger received from bread/stew/melon/cookies
m.EffectsHerbalism5_0=Double Drops (All Herbs) m.EffectsHerbalism5_0=Double Drops (All Herbs)
m.EffectsHerbalism5_1=Double the normal loot m.EffectsHerbalism5_1=Double the normal loot
m.HerbalismGreenTerraLength=[[RED]]Green Terra Length: [[YELLOW]]{0}s m.HerbalismGreenTerraLength=[[RED]]Green Terra Length: [[YELLOW]]{0}s
m.HerbalismGreenThumbChance=[[RED]]Green Thumb Chance: [[YELLOW]]{0}% m.HerbalismGreenThumbChance=[[RED]]Green Thumb Chance: [[YELLOW]]{0}%
m.HerbalismGreenThumbStage=[[RED]]Green Thumb Stage: [[YELLOW]] Wheat grows in stage {0} m.HerbalismGreenThumbStage=[[RED]]Green Thumb Stage: [[YELLOW]] Wheat grows in stage {0}
m.HerbalismDoubleDropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0}% m.HerbalismDoubleDropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0}%
m.HerbalismFoodPlus=[[RED]]Food+ (Rank{0}): [[YELLOW]]Bonus {0} healing m.HerbalismFoodPlus=[[RED]]Food+ (Rank{0}): [[YELLOW]]Bonus {0} hunger
m.SkillExcavation=EXCAVATION m.SkillExcavation=EXCAVATION
m.XPGainExcavation=Digging and finding treasures m.XPGainExcavation=Digging and finding treasures
m.EffectsExcavation1_0=Giga Drill Breaker (ABILITY) m.EffectsExcavation1_0=Giga Drill Breaker (ABILITY)