EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #332 from TfT-02/master

Browse Source 
Fixed and patches
This commit is contained in:
Grant 2012-12-03 21:08:58 -08:00
commit abd051d07b
5 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
# Eclipse stuffs # Eclipse stuff
/.classpath /.classpath
/.project /.project
/.settings /.settings

3
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
View File

@ -57,10 +57,11 @@ public class AdvancedConfig extends ConfigLoader {
public int getAxesCriticalPVEModifier() { return config.getInt("Skills.Axes.AxesCritical_PVE_Modifier", 2); } public int getAxesCriticalPVEModifier() { return config.getInt("Skills.Axes.AxesCritical_PVE_Modifier", 2); }
public int getGreaterImpactChance() { return config.getInt("Skills.Axes.GreaterImpact_Chance", 25); } public int getGreaterImpactChance() { return config.getInt("Skills.Axes.GreaterImpact_Chance", 25); }
public int getGreaterImpactIncreaseLevel() { return config.getInt("Skills.Axes.GreaterImpact_IncreaseLevel", 50); }
public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); } public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); }
public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); } public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }
public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); }
/* EXCAVATION */ /* EXCAVATION */
//Nothing to configure, everything is already configurable in config.yml //Nothing to configure, everything is already configurable in config.yml

2
src/main/java/com/gmail/nossr50/skills/combat/Axes.java
View File

@ -129,7 +129,7 @@ public class Axes {
short durabilityDamage = 1; //Start with 1 durability damage short durabilityDamage = 1; //Start with 1 durability damage
/* Every 30 Skill Levels you gain 1 durability damage */ /* Every 30 Skill Levels you gain 1 durability damage */
int impactIncreaseLevel = advancedConfig.getGreaterImpactIncreaseLevel(); int impactIncreaseLevel = advancedConfig.getArmorImpactIncreaseLevel();
durabilityDamage += (int) ((double) Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / (double) impactIncreaseLevel); durabilityDamage += (int) ((double) Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / (double) impactIncreaseLevel);
if (!hasArmor(targetPlayer)) { if (!hasArmor(targetPlayer)) {

38
src/main/java/com/gmail/nossr50/skills/repair/Salvage.java
View File

@ -27,27 +27,29 @@ public class Salvage {
return; return;
} }
final PlayerProfile profile = Users.getProfile(player); if (player.getGameMode().equals(0)){
final int skillLevel = profile.getSkillLevel(SkillType.REPAIR); final PlayerProfile profile = Users.getProfile(player);
final int unlockLevel = configInstance.getSalvageUnlockLevel(); final int skillLevel = profile.getSkillLevel(SkillType.REPAIR);
final int unlockLevel = configInstance.getSalvageUnlockLevel();
if (skillLevel >= unlockLevel) { if (skillLevel >= unlockLevel) {
final World world = player.getWorld(); final World world = player.getWorld();
final float currentdura = inHand.getDurability(); final float currentdura = inHand.getDurability();
if (currentdura == 0) { if (currentdura == 0) {
final int salvagedAmount = getSalvagedAmount(inHand); final int salvagedAmount = getSalvagedAmount(inHand);
final int itemID = getSalvagedItemID(inHand); final int itemID = getSalvagedItemID(inHand);
player.setItemInHand(new ItemStack(0)); player.setItemInHand(new ItemStack(0));
location.setY(location.getY() + 1); location.setY(location.getY() + 1);
world.dropItem(location, new ItemStack(itemID, salvagedAmount)); world.dropItem(location, new ItemStack(itemID, salvagedAmount));
player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess")); player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess"));
} else { } else {
player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability")); player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
} }
} else { } else {
player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage")); player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
}
} }
} }

2
src/main/resources/advanced.yml
View File

@ -42,9 +42,9 @@ Skills:
AxesCritical_PVP_Modifier: 1.5 AxesCritical_PVP_Modifier: 1.5
AxesCritical_PVE_Modifier: 2 AxesCritical_PVE_Modifier: 2
GreaterImpact_Chance: 25 GreaterImpact_Chance: 25
GreaterImpact_IncreaseLevel: 50
GreaterImpact_KnockbackModifier: 1.5 GreaterImpact_KnockbackModifier: 1.5
GreaterImpact_BonusDamage: 2 GreaterImpact_BonusDamage: 2
ArmorImpact_IncreaseLevel: 50
Fishing: Fishing:
Shake_UnlockLevel: 150 Shake_UnlockLevel: 150
Enchantment_Chance: 10 Enchantment_Chance: 10