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

12
src/main/java/net/server/channel/handlers/RangedAttackHandler.java
View File

@@ -25,7 +25,7 @@ import client.*;
import client.inventory.Inventory;
import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.MapleWeaponType;
import client.inventory.WeaponType;
import client.inventory.manipulator.MapleInventoryManipulator;
import config.YamlConfig;
import constants.game.GameConstants;
@@ -90,8 +90,8 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
}
} else {
Item weapon = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -11);
MapleWeaponType type = MapleItemInformationProvider.getInstance().getWeaponType(weapon.getItemId());
if (type == MapleWeaponType.NOT_A_WEAPON) {
WeaponType type = MapleItemInformationProvider.getInstance().getWeaponType(weapon.getItemId());
if (type == WeaponType.NOT_A_WEAPON) {
return;
}
short slot = -1;
@@ -133,13 +133,13 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
boolean bow = ItemConstants.isArrowForBow(id);
boolean cbow = ItemConstants.isArrowForCrossBow(id);
if (item.getQuantity() >= bulletCount) { //Fixes the bug where you can't use your last arrow.
if (type == MapleWeaponType.CLAW && ItemConstants.isThrowingStar(id) && weapon.getItemId() != 1472063) {
if (type == WeaponType.CLAW && ItemConstants.isThrowingStar(id) && weapon.getItemId() != 1472063) {
if (((id == 2070007 || id == 2070018) && chr.getLevel() < 70) || (id == 2070016 && chr.getLevel() < 50)) {
} else {
projectile = id;
break;
}
} else if ((type == MapleWeaponType.GUN && ItemConstants.isBullet(id))) {
} else if ((type == WeaponType.GUN && ItemConstants.isBullet(id))) {
if (id == 2331000 && id == 2332000) {
if (chr.getLevel() > 69) {
projectile = id;
@@ -149,7 +149,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
projectile = id;
break;
}
} else if ((type == MapleWeaponType.BOW && bow) || (type == MapleWeaponType.CROSSBOW && cbow) || (weapon.getItemId() == 1472063 && (bow || cbow))) {
} else if ((type == WeaponType.BOW && bow) || (type == WeaponType.CROSSBOW && cbow) || (weapon.getItemId() == 1472063 && (bow || cbow))) {
projectile = id;
break;
}

4
src/main/java/net/server/channel/handlers/SummonDamageHandler.java
View File

@@ -28,7 +28,7 @@ import client.SkillFactory;
import client.autoban.AutobanFactory;
import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.MapleWeaponType;
import client.inventory.WeaponType;
import client.status.MonsterStatusEffect;
import constants.skills.Outlaw;
import net.packet.InPacket;
@@ -141,7 +141,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
if (weapon_item != null) {
maxBaseDmg = player.calculateMaxBaseDamage(watk, MapleItemInformationProvider.getInstance().getWeaponType(weapon_item.getItemId()));
} else {
maxBaseDmg = player.calculateMaxBaseDamage(watk, MapleWeaponType.SWORD1H);
maxBaseDmg = player.calculateMaxBaseDamage(watk, WeaponType.SWORD1H);
}
float summonDmgMod = (maxBaseDmg >= 438) ? 0.054f : 0.077f;