MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Refactor out itembase

Browse Source
This commit is contained in:
MagicBot
2024-03-15 10:35:41 -04:00
parent f676b14351
commit 6ed4faded2
16 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Item.java
+10 -10
View File
@@ -52,7 +52,7 @@ public class Item extends AbstractWorldObject {
private boolean isRandom = false;
private int value;
public OwnerType ownerType;
public int templsteID;
public int templateID;
private AbstractWorldObject lastOwner;
private long dateToUpgrade;
private String customName = "";
@@ -67,7 +67,7 @@ public class Item extends AbstractWorldObject {
public Item(int templateID) {
super();
this.templsteID = templateID;
this.templateID = templateID;
this.template = ItemTemplate.itemTemplates.get(templateID);
this.chargesRemaining = this.template.item_initial_charges;
this.durabilityCurrent = this.template.combat_health_full;
@@ -84,11 +84,11 @@ public class Item extends AbstractWorldObject {
public Item(ResultSet rs) throws SQLException {
super(rs);
this.templsteID = rs.getInt("item_itemBaseID");
this.template = ItemTemplate.itemTemplates.get(this.templsteID);
this.templateID = rs.getInt("item_itemBaseID");
this.template = ItemTemplate.itemTemplates.get(this.templateID);
if (this.template == null)
Logger.error("Null template of " + this.templsteID)
Logger.error("Null template of " + this.templateID)
;
// Set container enumeration
@@ -227,7 +227,7 @@ public class Item extends AbstractWorldObject {
writer.putInt(0); // Pad
writer.putInt(0); // Pad
if (item.getItemBase().equals(ItemBase.GOLD_ITEM_BASE)) {
if (item.templateID == ResourceType.GOLD.templateID) {
if (item.getOwner() != null && item.getOwner().getObjectType() == GameObjectType.PlayerCharacter) {
PlayerCharacter player = (PlayerCharacter) item.getOwner();
@@ -660,11 +660,11 @@ public class Item extends AbstractWorldObject {
}
public ItemBase getItemBase() {
return ItemBase.getItemBase(templsteID);
return ItemBase.getItemBase(templateID);
}
public int getTemplsteID() {
return this.templsteID;
public int getTemplateID() {
return this.templateID;
}
public int getOwnerID() {
@@ -1012,7 +1012,7 @@ public class Item extends AbstractWorldObject {
if (this.customName.isEmpty() == false)
return this.customName;
ItemTemplate template = ItemTemplate.itemTemplates.get(this.getTemplsteID());
ItemTemplate template = ItemTemplate.itemTemplates.get(this.getTemplateID());
return template.item_base_name;
}
src/engine/objects/ItemFactory.java
+10 -10
View File
@@ -179,8 +179,8 @@ public class ItemFactory {
time = (20 - rate);
time *= MBServerStatics.ONE_MINUTE;
if (ml.templsteID > 910010 && ml.templsteID < 910019) {
rank = ml.getTemplsteID() - 910010;
if (ml.templateID > 910010 && ml.templateID < 910019) {
rank = ml.getTemplateID() - 910010;
time = rank * 60 * 60 * 3 * 1000;
}
@@ -201,8 +201,8 @@ public class ItemFactory {
if (pc != null)
playerID = pc.getObjectUUID();
DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(ml.getObjectUUID(), npc.getObjectUUID(), ml.getTemplsteID(), dateTime, "", "", "", false, playerID);
ProducedItem pi = new ProducedItem(ml.getObjectUUID(), npc.getObjectUUID(), ml.getTemplsteID(), dateTime, false, "", "", "", playerID);
DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(ml.getObjectUUID(), npc.getObjectUUID(), ml.getTemplateID(), dateTime, "", "", "", false, playerID);
ProducedItem pi = new ProducedItem(ml.getObjectUUID(), npc.getObjectUUID(), ml.getTemplateID(), dateTime, false, "", "", "", playerID);
pi.setProducedItemID(ml.getObjectUUID());
pi.setAmount(itemsToRoll);
pi.setRandom(false);
@@ -589,7 +589,7 @@ public class ItemFactory {
time *= MBServerStatics.ONE_MINUTE;
if (ml.getItemBase().getUUID() > 910010 && ml.getItemBase().getUUID() < 910019) {
rank = ml.getTemplsteID() - 910010;
rank = ml.getTemplateID() - 910010;
time = rank * 60 * 60 * 3 * 1000;
}
@@ -610,8 +610,8 @@ public class ItemFactory {
if (pc != null)
playerID = pc.getObjectUUID();
DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(ml.getObjectUUID(), npc.getObjectUUID(), ml.getTemplsteID(), dateTime, prefixString, suffixString, ml.getCustomName(), false, playerID);
ProducedItem pi = new ProducedItem(npc.getRolling().size(), npc.getObjectUUID(), ml.getTemplsteID(), dateTime, false, prefixString, suffixString, ml.getCustomName(), playerID);
DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(ml.getObjectUUID(), npc.getObjectUUID(), ml.getTemplateID(), dateTime, prefixString, suffixString, ml.getCustomName(), false, playerID);
ProducedItem pi = new ProducedItem(npc.getRolling().size(), npc.getObjectUUID(), ml.getTemplateID(), dateTime, false, prefixString, suffixString, ml.getCustomName(), playerID);
pi.setProducedItemID(ml.getObjectUUID());
pi.setAmount(itemsToRoll);
@@ -728,7 +728,7 @@ public class ItemFactory {
time *= MBServerStatics.ONE_MINUTE;
if (toRoll.getItemBase().getUUID() > 910010 && toRoll.getItemBase().getUUID() < 910019) {
rank = toRoll.getTemplsteID() - 910010;
rank = toRoll.getTemplateID() - 910010;
time = rank * 60 * 60 * 3 * 1000;
}
@@ -748,9 +748,9 @@ public class ItemFactory {
if (playerCharacter != null)
playerID = playerCharacter.getObjectUUID();
DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getTemplsteID(), dateTime, prefix, suffix, toRoll.getCustomName(), true, playerID);
DbManager.NPCQueries.ADD_TO_PRODUCTION_LIST(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getTemplateID(), dateTime, prefix, suffix, toRoll.getCustomName(), true, playerID);
ProducedItem pi = new ProducedItem(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getTemplsteID(), dateTime, true, prefix, suffix, toRoll.getCustomName(), playerID);
ProducedItem pi = new ProducedItem(toRoll.getObjectUUID(), vendor.getObjectUUID(), toRoll.getTemplateID(), dateTime, true, prefix, suffix, toRoll.getCustomName(), playerID);
pi.setProducedItemID(toRoll.getObjectUUID());
pi.setAmount(itemsToRoll);
ItemQueue produced = ItemQueue.borrow(pi, (long) (time * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue())));
src/engine/objects/Warehouse.java
+3 -3
View File
@@ -223,7 +223,7 @@ public class Warehouse extends AbstractWorldObject {
return false;
}
Enum.ResourceType resourceType = Enum.ResourceType.resourceLookup.get(resource.templsteID);
Enum.ResourceType resourceType = Enum.ResourceType.resourceLookup.get(resource.templateID);
if (warehouse.resources.get(resourceType) == null)
return false;
@@ -251,7 +251,7 @@ public class Warehouse extends AbstractWorldObject {
int newAmount = oldAmount + amount;
if (newAmount > Enum.ResourceType.resourceLookup.get(resource.templsteID).deposit_limit) {
if (newAmount > Enum.ResourceType.resourceLookup.get(resource.templateID).deposit_limit) {
//ChatManager.chatSystemInfo(pc, "The Warehouse is at it's maximum for this type of resource.");
return false;
}
@@ -293,7 +293,7 @@ public class Warehouse extends AbstractWorldObject {
if (resource.template.item_type.equals(Enum.ItemType.GOLD))
resourceType = Enum.ResourceType.GOLD;
else
resourceType = Enum.ResourceType.valueOf(ItemTemplate.itemTemplates.get(resource.getTemplsteID()).item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(ItemTemplate.itemTemplates.get(resource.getTemplateID()).item_base_name.toUpperCase());
if (transaction)
AddTransactionToWarehouse(warehouse, pc.getObjectType(), pc.getObjectUUID(), Enum.TransactionType.DEPOSIT, resourceType, amount);