EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +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
/.project
/.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 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 int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }
public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); }
/* EXCAVATION */
//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
/* 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);
if (!hasArmor(targetPlayer)) {

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

@ -27,6 +27,7 @@ public class Salvage {
return;
}
if (player.getGameMode().equals(0)){
final PlayerProfile profile = Users.getProfile(player);
final int skillLevel = profile.getSkillLevel(SkillType.REPAIR);
final int unlockLevel = configInstance.getSalvageUnlockLevel();
@ -50,6 +51,7 @@ public class Salvage {
player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
}
}
}
/**
* Handles notifications for placing an anvil.

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

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