Browse Source

More item refactor work.

combat-2
MagicBot 9 months ago
parent
commit
08aa431f5d
  1. 2
      src/engine/objects/AbstractGameObject.java
  2. 31
      src/engine/objects/Item.java
  3. 11
      src/engine/objects/MobLoot.java

2
src/engine/objects/AbstractGameObject.java

@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
public abstract class AbstractGameObject { public abstract class AbstractGameObject {
private GameObjectType objectType = GameObjectType.unknown; private GameObjectType objectType = GameObjectType.unknown;
private int objectUUID; public int objectUUID;
private byte ver = 1; private byte ver = 1;

31
src/engine/objects/Item.java

@ -65,6 +65,7 @@ public class Item extends AbstractWorldObject {
/** /**
* In Memory constructor * In Memory constructor
* Set values and call PERSIST();
*/ */
public Item(int templateID) { public Item(int templateID) {
@ -79,36 +80,6 @@ public class Item extends AbstractWorldObject {
bakeInStats(); bakeInStats();
} }
/**
* Normal Constructor
*/
public Item(ItemBase itemBase, int ownerID,
OwnerType ownerType, byte chargesMax, byte chargesRemaining,
short durabilityCurrent, short durabilityMax, boolean canDestroy,
boolean rentable, boolean inBank, boolean inVault,
boolean inInventory, boolean isEquipped, byte equipSlot,
ArrayList<EnchantmentBase> enchants, int newUUID) {
super(newUUID);
this.templsteID = itemBase.getUUID();
this.ownerID = ownerID;
this.ownerType = ownerType;
this.customName = "";
this.chargesMax = (byte) itemBase.getNumCharges();
this.chargesRemaining = (byte) itemBase.getNumCharges();
this.durabilityMax = (short) itemBase.getDurability();
this.durabilityCurrent = (short) itemBase.getDurability();
this.canDestroy = canDestroy;
this.equipSlot = equipSlot;
this.flags = 1;
this.value = this.magicValue;
loadEnchantments();
bakeInStats();
}
/** /**
* ResultSet Constructor * ResultSet Constructor
*/ */

11
src/engine/objects/MobLoot.java

@ -17,7 +17,6 @@ import engine.gameManager.PowersManager;
import engine.powers.poweractions.AbstractPowerAction; import engine.powers.poweractions.AbstractPowerAction;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
@ -64,15 +63,15 @@ public final class MobLoot extends Item {
* @param quantity Quantity of the item * @param quantity Quantity of the item
*/ */
public MobLoot(AbstractCharacter mob, ItemBase ib, int quantity, boolean noSteal) { public MobLoot(AbstractCharacter mob, ItemBase ib, int quantity, boolean noSteal) {
super(ib, mob.getObjectUUID(),
OwnerType.Mob, (byte) 0, (byte) 0, (short) 0, super(ib.getUUID());
(short) 0, true, false, false, false, true, this.ownerType = OwnerType.Mob;
false, (byte) 0, new ArrayList<>(), generateId()); this.ownerID = mob.getObjectUUID();
this.objectUUID = generateId();
if (quantity == 0 && ib.getType() == ItemType.RESOURCE) if (quantity == 0 && ib.getType() == ItemType.RESOURCE)
quantity = 1; quantity = 1;
if (quantity > 0) if (quantity > 0)
this.setNumOfItems(quantity); this.setNumOfItems(quantity);

Loading…
Cancel
Save