Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor skill_used

Browse Source
This commit is contained in:
MagicBot
2024-03-10 14:10:51 -04:00
parent e47bd6fba0
commit f616937236
5 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCharacter.java
+6 -6
View File
@@ -2841,11 +2841,11 @@ public class PlayerCharacter extends AbstractCharacter {
if (ib != null) {
if ((item.template.item_type.equals(ItemType.WEAPON))
&& (ib.getSkillRequired().equals(type) || ib.getMastery().equals(type)))
&& (item.template.item_skill_used.equals(type) || ib.getMastery().equals(type)))
return true;
return (item.template.item_type.equals(ItemType.ARMOR))
&& (ib.getSkillRequired().equals(type));
&& (item.template.item_skill_used.equals(type));
}
return false;
@@ -3919,7 +3919,7 @@ public class PlayerCharacter extends AbstractCharacter {
this.rangeHandTwo *= range_bonus;
}
skillPercentage = getModifiedAmount(this.skills.get(wb.getSkillRequired()));
skillPercentage = getModifiedAmount(this.skills.get(weapon.template.item_skill_used));
masteryPercentage = getModifiedAmount(this.skills.get(wb.getMastery()));
if (masteryPercentage == 0f)
mastDam = 0f;
@@ -4174,10 +4174,10 @@ public class PlayerCharacter extends AbstractCharacter {
if (!armor.template.item_type.equals(ItemType.ARMOR))
return 0;
if (ib.getSkillRequired().isEmpty())
if (armor.template.item_skill_used.isEmpty())
return ib.getDefense();
CharacterSkill armorSkill = this.skills.get(ib.getSkillRequired());
CharacterSkill armorSkill = this.skills.get(armor.template.item_skill_used);
if (armorSkill == null) {
Logger.error("Player " + this.getObjectUUID()
+ " has armor equipped without the nescessary skill to equip it");
@@ -4218,7 +4218,7 @@ public class PlayerCharacter extends AbstractCharacter {
skill = this.skills.get("Unarmed Combat");
mastery = this.skills.get("Unarmed Combat Mastery");
} else {
skill = this.skills.get(wb.getSkillRequired());
skill = this.skills.get(weapon.template.item_skill_used);
mastery = this.skills.get(wb.getMastery());
}
if (skill != null)