Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleWeaponType

Browse Source
This commit is contained in:
P0nk
2021-09-09 20:52:49 +02:00
parent 6ca5abd896
commit a5541c121c
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/client/MapleCharacter.java
View File

@@ -693,16 +693,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return false;
}
public int calculateMaxBaseDamage(int watk, MapleWeaponType weapon) {
public int calculateMaxBaseDamage(int watk, WeaponType weapon) {
int mainstat, secondarystat;
if (getJob().isA(MapleJob.THIEF) && weapon == MapleWeaponType.DAGGER_OTHER) {
weapon = MapleWeaponType.DAGGER_THIEVES;
if (getJob().isA(MapleJob.THIEF) && weapon == WeaponType.DAGGER_OTHER) {
weapon = WeaponType.DAGGER_THIEVES;
}
if (weapon == MapleWeaponType.BOW || weapon == MapleWeaponType.CROSSBOW || weapon == MapleWeaponType.GUN) {
if (weapon == WeaponType.BOW || weapon == WeaponType.CROSSBOW || weapon == WeaponType.GUN) {
mainstat = localdex;
secondarystat = localstr;
} else if (weapon == MapleWeaponType.CLAW || weapon == MapleWeaponType.DAGGER_THIEVES) {
} else if (weapon == WeaponType.CLAW || weapon == WeaponType.DAGGER_THIEVES) {
mainstat = localluk;
secondarystat = localdex + localstr;
} else {
@@ -7824,11 +7824,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (job.isA(MapleJob.THIEF) || job.isA(MapleJob.BOWMAN) || job.isA(MapleJob.PIRATE) || job.isA(MapleJob.NIGHTWALKER1) || job.isA(MapleJob.WINDARCHER1)) {
Item weapon_item = getInventory(InventoryType.EQUIPPED).getItem((short) -11);
if (weapon_item != null) {
MapleWeaponType weapon = ii.getWeaponType(weapon_item.getItemId());
boolean bow = weapon == MapleWeaponType.BOW;
boolean crossbow = weapon == MapleWeaponType.CROSSBOW;
boolean claw = weapon == MapleWeaponType.CLAW;
boolean gun = weapon == MapleWeaponType.GUN;
WeaponType weapon = ii.getWeaponType(weapon_item.getItemId());
boolean bow = weapon == WeaponType.BOW;
boolean crossbow = weapon == WeaponType.CROSSBOW;
boolean claw = weapon == WeaponType.CLAW;
boolean gun = weapon == WeaponType.GUN;
if (bow || crossbow || claw || gun) {
// Also calc stars into this.
Inventory inv = getInventory(InventoryType.USE);

7
src/main/java/client/inventory/MapleWeaponType.java → src/main/java/client/inventory/WeaponType.java
View File

@@ -21,7 +21,7 @@
*/
package client.inventory;
public enum MapleWeaponType {
public enum WeaponType {
NOT_A_WEAPON(0),
GENERAL1H_SWING(4.4),
GENERAL1H_STAB(3.2),
@@ -42,9 +42,10 @@ public enum MapleWeaponType {
SWORD1H(4.0),
SWORD2H(4.6),
WAND(3.6);
private double damageMultiplier;
private MapleWeaponType(double maxDamageMultiplier) {
private final double damageMultiplier;
WeaponType(double maxDamageMultiplier) {
this.damageMultiplier = maxDamageMultiplier;
}