Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Name simplification for collection

Browse Source
This commit is contained in:
MagicBot
2024-03-16 07:57:17 -04:00
parent 13bf6e6f5a
commit ac2403362e
22 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Item.java
+3 -3
View File
@@ -68,7 +68,7 @@ public class Item extends AbstractWorldObject {
public Item(int templateID) {
super();
this.templateID = templateID;
this.template = ItemTemplate.itemTemplates.get(templateID);
this.template = ItemTemplate.templates.get(templateID);
this.chargesRemaining = this.template.item_initial_charges;
this.durabilityCurrent = this.template.combat_health_full;
this.equipSlot = EquipSlotType.NONE;
@@ -85,7 +85,7 @@ public class Item extends AbstractWorldObject {
super(rs);
this.templateID = rs.getInt("item_itemBaseID");
this.template = ItemTemplate.itemTemplates.get(this.templateID);
this.template = ItemTemplate.templates.get(this.templateID);
if (this.template == null)
Logger.error("Null template of " + this.templateID)
@@ -1012,7 +1012,7 @@ public class Item extends AbstractWorldObject {
if (this.customName.isEmpty() == false)
return this.customName;
ItemTemplate template = ItemTemplate.itemTemplates.get(this.getTemplateID());
ItemTemplate template = ItemTemplate.templates.get(this.getTemplateID());
return template.item_base_name;
}
src/engine/objects/ItemBase.java
+3 -3
View File
@@ -57,7 +57,7 @@ public class ItemBase {
this.mastery = rs.getString("mastery");
damageType = Enum.SourceType.valueOf(rs.getString("damageType").toUpperCase());
ItemTemplate template = ItemTemplate.itemTemplates.get(this.getUUID());
ItemTemplate template = ItemTemplate.templates.get(this.getUUID());
if (template == null)
Logger.error(this.getUUID() + " null template");
@@ -68,10 +68,10 @@ public class ItemBase {
_itemBaseByUUID.put(itemBase.uuid, itemBase);
if (ItemTemplate.itemTemplates.get(itemBase.uuid).item_type.equals(ItemType.RESOURCE))
if (ItemTemplate.templates.get(itemBase.uuid).item_type.equals(ItemType.RESOURCE))
_resourceList.add(itemBase);
ItemTemplate template = ItemTemplate.itemTemplates.get(itemBase.uuid);
ItemTemplate template = ItemTemplate.templates.get(itemBase.uuid);
if (template == null)
Logger.error("Null template for: " + itemBase.uuid);
src/engine/objects/ItemFactory.java
+4 -4
View File
@@ -38,7 +38,7 @@ public class ItemFactory {
int max = 20;
CharacterItemManager itemManager = pc.getCharItemManager();
ItemTemplate template = ItemTemplate.itemTemplates.get(templateID);
ItemTemplate template = ItemTemplate.templates.get(templateID);
if (count > max)
count = max;
@@ -86,7 +86,7 @@ public class ItemFactory {
boolean useWarehouse = false;
ItemTemplate template = ItemTemplate.itemTemplates.get(templateID);
ItemTemplate template = ItemTemplate.templates.get(templateID);
if (template == null)
return null;
@@ -641,7 +641,7 @@ public class ItemFactory {
ModTableEntry suffixEntry = null;
ItemBase ib = ItemBase.getItemBase(itemBaseID);
ItemTemplate template = ItemTemplate.itemTemplates.get(itemBaseID);
ItemTemplate template = ItemTemplate.templates.get(itemBaseID);
if (template == null)
return null;
@@ -766,7 +766,7 @@ public class ItemFactory {
if (npc == null)
return null;
ItemTemplate template = ItemTemplate.itemTemplates.get(templateID);
ItemTemplate template = ItemTemplate.templates.get(templateID);
Building forge = npc.getBuilding();
src/engine/objects/ItemTemplate.java
+1 -1
View File
@@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class ItemTemplate {
// Global template lookup
public static HashMap<Integer, ItemTemplate> itemTemplates = new HashMap<>();
public static HashMap<Integer, ItemTemplate> templates = new HashMap<>();
public int template_id;
src/engine/objects/MobEquipment.java
+5 -5
View File
@@ -45,7 +45,7 @@ public class MobEquipment extends AbstractGameObject {
super(MobEquipment.getNewID());
this.itemBase = itemBase;
this.templateID = this.itemBase.getUUID();
this.template = ItemTemplate.itemTemplates.get(templateID);
this.template = ItemTemplate.templates.get(templateID);
this.slot = slot;
this.parentID = parentID;
this.enchanted = false;
@@ -59,7 +59,7 @@ public class MobEquipment extends AbstractGameObject {
public MobEquipment(int itemBaseID, float dropChance) {
super(MobEquipment.getNewID());
this.itemBase = ItemBase.getItemBase(itemBaseID);
this.template = ItemTemplate.itemTemplates.get(itemBaseID);
this.template = ItemTemplate.templates.get(itemBaseID);
Enum.EquipSlotType equipSlot = template.item_eq_slots_and.iterator().next();
@@ -184,17 +184,17 @@ public class MobEquipment extends AbstractGameObject {
if (mobEquipment.itemBase == null)
name = eb.getName();
else
name = eb.getName() + ' ' + ItemTemplate.itemTemplates.get(mobEquipment.itemBase.getUUID()).item_base_name;
name = eb.getName() + ' ' + ItemTemplate.templates.get(mobEquipment.itemBase.getUUID()).item_base_name;
} else if (eb.isSuffix()) {
if (mobEquipment.itemBase == null)
name = eb.getName();
else
name = ItemTemplate.itemTemplates.get(mobEquipment.itemBase.getUUID()).item_base_name + ' ' + eb.getName();
name = ItemTemplate.templates.get(mobEquipment.itemBase.getUUID()).item_base_name + ' ' + eb.getName();
} else {
if (mobEquipment.itemBase == null)
name = "";
else
name = ItemTemplate.itemTemplates.get(mobEquipment.itemBase.getUUID()).item_base_name;
name = ItemTemplate.templates.get(mobEquipment.itemBase.getUUID()).item_base_name;
}
writer.putInt(eb.getToken());
src/engine/objects/MobLoot.java
+1 -1
View File
@@ -38,7 +38,7 @@ public final class MobLoot extends Item {
}
public MobLoot(AbstractCharacter mob, int qtyOfGold) {
this(mob, ItemTemplate.itemTemplates.get(Enum.ResourceType.GOLD.templateID), qtyOfGold, false);
this(mob, ItemTemplate.templates.get(Enum.ResourceType.GOLD.templateID), qtyOfGold, false);
}
public MobLoot(AbstractCharacter mob, ItemTemplate template, int quantity, boolean noSteal) {
src/engine/objects/NPC.java
+3 -3
View File
@@ -920,7 +920,7 @@ public class NPC extends AbstractCharacter {
DbManager.NPCQueries.LOAD_ALL_ITEMS_TO_PRODUCE(this);
for (ProducedItem producedItem : this.forgedItems) {
MobLoot ml = new MobLoot(this, ItemTemplate.itemTemplates.get(producedItem.getItemBaseID()), false);
MobLoot ml = new MobLoot(this, ItemTemplate.templates.get(producedItem.getItemBaseID()), false);
DbManager.NPCQueries.UPDATE_ITEM_ID(producedItem.getID(), currentID, ml.getObjectUUID());
@@ -1070,7 +1070,7 @@ public class NPC extends AbstractCharacter {
ItemBase itemBase;
for (Integer itemID : fullItemList) {
itemBase = ItemBase.getItemBase(itemID);
boolean exclude = itemBase.getPercentRequired() == 0 && ItemTemplate.itemTemplates.get(itemID).item_type == ItemType.WEAPON;
boolean exclude = itemBase.getPercentRequired() == 0 && ItemTemplate.templates.get(itemID).item_type == ItemType.WEAPON;
if (itemBase.getPercentRequired() <= maxSkill && !exclude)
filteredItemList.add(itemID);
}
@@ -1095,7 +1095,7 @@ public class NPC extends AbstractCharacter {
if (ib == null)
return 0;
if (ItemTemplate.itemTemplates.get(itemID).item_type == ItemType.SCROLL)
if (ItemTemplate.templates.get(itemID).item_type == ItemType.SCROLL)
return this.getRank() * 60 * 60 * 3;
float time;
src/engine/objects/Warehouse.java
+3 -3
View File
@@ -294,7 +294,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.getTemplateID()).item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(ItemTemplate.templates.get(resource.getTemplateID()).item_base_name.toUpperCase());
if (transaction)
AddTransactionToWarehouse(warehouse, pc.getObjectType(), pc.getObjectUUID(), Enum.TransactionType.DEPOSIT, resourceType, amount);
@@ -596,7 +596,7 @@ public class Warehouse extends AbstractWorldObject {
if (pc == null)
return false;
ItemTemplate template = ItemTemplate.itemTemplates.get(resourceType.templateID);
ItemTemplate template = ItemTemplate.templates.get(resourceType.templateID);
if (warehouse.resources.get(resourceType) == null)
return false;
@@ -678,7 +678,7 @@ public class Warehouse extends AbstractWorldObject {
if (pc == null)
return false;
ItemTemplate template = ItemTemplate.itemTemplates.get(resourceType);
ItemTemplate template = ItemTemplate.templates.get(resourceType);
if (template == null)
return false;