Browse Source

remove ItemBase from LootManager

combat-2
FatBoy-DOTC 8 months ago
parent
commit
3ff9115052
  1. 4
      src/engine/gameManager/LootManager.java
  2. 48
      src/engine/objects/ItemBase.java

4
src/engine/gameManager/LootManager.java

@ -89,7 +89,7 @@ public enum LootManager {
ItemTemplate template = ItemTemplate.templates.get(it.getTemplateID()); ItemTemplate template = ItemTemplate.templates.get(it.getTemplateID());
if ((it.getTemplateID() > 3000 && it.templateID <= 3050) || template.item_base_name.toLowerCase().contains("of the gods")) { if ((it.getTemplateID() > 2499 && it.templateID <= 3050) || template.item_base_name.toLowerCase().contains("of the gods")) {
ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().zoneName + " has found the " + template.item_base_name + ". Are you tough enough to take it?"); ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().zoneName + " has found the " + template.item_base_name + ". Are you tough enough to take it?");
chatMsg.setMessageType(10); chatMsg.setMessageType(10);
chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID()); chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
@ -377,7 +377,7 @@ public enum LootManager {
public static void peddleFate(PlayerCharacter playerCharacter, Item gift) { public static void peddleFate(PlayerCharacter playerCharacter, Item gift) {
//get table ID for the itembase ID //get table ID for the itemtemplate
int tableID = 0; int tableID = 0;

48
src/engine/objects/ItemBase.java

@ -25,31 +25,16 @@ public class ItemBase {
public final int uuid; public final int uuid;
private final int modTable; private final int modTable;
private final short percentRequired; private final short percentRequired;
private final short defense;
private final float dexPenalty;
private final float speed; private final float speed;
private final float range; private final float range;
private final short minDamage;
private final short maxDamage;
private final String mastery;
private final engine.Enum.SourceType damageType;
private final boolean isStrBased;
public ItemBase(ResultSet rs) throws SQLException { public ItemBase(ResultSet rs) throws SQLException {
this.uuid = rs.getInt("ID"); this.uuid = rs.getInt("ID");
this.modTable = rs.getInt("modTable"); this.modTable = rs.getInt("modTable");
this.percentRequired = rs.getShort("percentRequired"); this.percentRequired = rs.getShort("percentRequired");
this.defense = rs.getShort("defense");
this.dexPenalty = rs.getFloat("dexPenalty");
this.isStrBased = (rs.getInt("isStrBased") == 1);
this.speed = rs.getFloat("speed"); this.speed = rs.getFloat("speed");
this.range = rs.getFloat("range"); this.range = rs.getFloat("range");
this.minDamage = rs.getShort("minDamage");
this.maxDamage = rs.getShort("maxDamage");
this.mastery = rs.getString("mastery");
damageType = Enum.SourceType.valueOf(rs.getString("damageType").toUpperCase());
ItemTemplate template = ItemTemplate.templates.get(this.getUUID()); ItemTemplate template = ItemTemplate.templates.get(this.getUUID());
@ -81,11 +66,6 @@ public class ItemBase {
DbManager.ItemBaseQueries.LOAD_ALL_ITEMBASES(); DbManager.ItemBaseQueries.LOAD_ALL_ITEMBASES();
} }
public boolean isDiscRune() {
int ID = uuid;
//class, discipline runes
return ID > 2499 && ID < 3050;
}
public int getModTable() { public int getModTable() {
return modTable; return modTable;
@ -95,18 +75,6 @@ public class ItemBase {
return uuid; return uuid;
} }
public String getMastery() {
return mastery;
}
public short getDefense() {
return defense;
}
public float getDexPenalty() {
return dexPenalty;
}
public float getSpeed() { public float getSpeed() {
return speed; return speed;
} }
@ -115,22 +83,6 @@ public class ItemBase {
return range; return range;
} }
public boolean isStrBased() {
return isStrBased;
}
public short getMaxDamage() {
return maxDamage;
}
public short getMinDamage() {
return minDamage;
}
public Enum.SourceType getDamageType() {
return damageType;
}
public short getPercentRequired() { public short getPercentRequired() {
return percentRequired; return percentRequired;
} }

Loading…
Cancel
Save