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

Refactor itembase.name to template.

Browse Source
This commit is contained in:
MagicBot
2024-02-28 16:31:09 -05:00
parent 507769c6b6
commit d9775dbf4e
17 changed files with 131 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/devcmd/cmds/AuditFailedItemsCmd.java
+2 -1
View File
@@ -65,9 +65,10 @@ public class AuditFailedItemsCmd extends AbstractDevCmd {
playerName = roller.getName();
ItemBase ib = ItemBase.getItemBase(failedItem.getItemBaseID());
ItemTemplate template = ItemTemplate.itemTemplates.get(failedItem.getItemBaseID());
if (ib != null) {
itemName = ib.getName();
itemName = template.item_base_name;
}
if (failedItem.isRandom() == false) {
src/engine/devcmd/cmds/InfoCmd.java
+2 -1
View File
@@ -506,6 +506,7 @@ public class InfoCmd extends AbstractDevCmd {
case MobLoot:
Item item = (Item) target;
ItemBase itemBase = item.getItemBase();
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
output += StringUtils.addWS("ItemBase: " + itemBase.getUUID(), 20);
output += "Weight: " + itemBase.getWeight();
output += newline;
@@ -515,7 +516,7 @@ public class InfoCmd extends AbstractDevCmd {
output += "Charges: " + item.getChargesRemaining()
+ '/' + item.getChargesMax();
output += newline;
output += "Name: " + itemBase.getName();
output += "Name: " + template.item_base_name;
output += newline;
output += item.getContainerInfo();
src/engine/devcmd/cmds/PrintBankCmd.java
+2 -1
View File
@@ -51,7 +51,8 @@ public class PrintBankCmd extends AbstractDevCmd {
ArrayList<Item> list = cim.getBank();
throwbackInfo(pc, "Bank for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Item item : list) {
throwbackInfo(pc, " " + item.getItemBase().getName() + ", count: " + item.getNumOfItems());
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
throwbackInfo(pc, " " + template.item_base_name + ", count: " + item.getNumOfItems());
}
Item gold = cim.getGoldBank();
if (gold != null)
src/engine/devcmd/cmds/PrintBonusesCmd.java
+2 -1
View File
@@ -33,7 +33,8 @@ public class PrintBonusesCmd extends AbstractDevCmd {
if (target instanceof Item) {
type = "Item";
tar = (Item) target;
name = ((Item) tar).getItemBase().getName();
ItemTemplate template = ItemTemplate.itemTemplates.get(((Item) tar).getItemBaseID());
name = template.item_base_name;
} else if (target instanceof AbstractCharacter) {
tar = (AbstractCharacter) target;
name = ((AbstractCharacter) tar).getFirstName();
src/engine/devcmd/cmds/PrintEquipCmd.java
+6 -3
View File
@@ -65,7 +65,8 @@ public class PrintEquipCmd extends AbstractDevCmd {
throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (int slot : tarMob.getEquip().keySet()) {
MobEquipment equip = tarMob.getEquip().get(slot);
throwbackInfo(pc, equip.getItemBase().getUUID() + " : " + equip.getItemBase().getName() + ", slot: " + slot);
ItemTemplate template = ItemTemplate.itemTemplates.get(equip.getItemBase().getUUID());
throwbackInfo(pc, equip.getItemBase().getUUID() + " : " + template.item_base_name + ", slot: " + slot);
}
return;
}
@@ -75,7 +76,8 @@ public class PrintEquipCmd extends AbstractDevCmd {
throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (int slot : tarMob.getEquip().keySet()) {
MobEquipment equip = tarMob.getEquip().get(slot);
throwbackInfo(pc, equip.getItemBase().getUUID() + " : " + equip.getItemBase().getName() + ", slot: " + slot);
ItemTemplate template = ItemTemplate.itemTemplates.get(equip.getItemBase().getUUID());
throwbackInfo(pc, equip.getItemBase().getUUID() + " : " + template.item_base_name + ", slot: " + slot);
}
return;
}
@@ -85,7 +87,8 @@ public class PrintEquipCmd extends AbstractDevCmd {
throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Integer slot : list.keySet()) {
Item item = list.get(slot);
throwbackInfo(pc, " " + item.getItemBase().getName() + ", slot: " + slot);
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
throwbackInfo(pc, " " + template.item_base_name + ", slot: " + slot);
}
}
src/engine/devcmd/cmds/PrintInventoryCmd.java
+2 -1
View File
@@ -82,7 +82,8 @@ public class PrintInventoryCmd extends AbstractDevCmd {
byte charges = item.getChargesRemaining();
chargeInfo = " charges: " + charges + '/' + chargeMax;
}
throwbackInfo(pc, " " + item.getItemBase().getName() + ", count: " + item.getNumOfItems() + chargeInfo);
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
throwbackInfo(pc, " " + template.item_base_name + ", count: " + item.getNumOfItems() + chargeInfo);
} else
goldCount += item.getNumOfItems();
}
src/engine/devcmd/cmds/PrintVaultCmd.java
+2 -1
View File
@@ -50,7 +50,8 @@ public class PrintVaultCmd extends AbstractDevCmd {
ArrayList<Item> list = cim.getVault();
throwbackInfo(pc, "Vault for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Item item : list) {
throwbackInfo(pc, " " + item.getItemBase().getName() + ", count: " + item.getNumOfItems());
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
throwbackInfo(pc, " " + template.item_base_name + ", count: " + item.getNumOfItems());
}
Item gold = cim.getGoldVault();
if (gold != null)
src/engine/devcmd/cmds/SimulateBootyCmd.java
+2 -1
View File
@@ -35,7 +35,8 @@ public class SimulateBootyCmd extends AbstractDevCmd {
for (BootySetEntry entry : LootManager._bootySetMap.get(mob.bootySet)) {
ItemBase item = ItemBase.getItemBase(entry.itemBase);
if (item != null) {
output += "[" + entry.bootyType + "] " + item.getName() + " [Chance] " + entry.dropChance + newline;
ItemTemplate template = ItemTemplate.itemTemplates.get(entry.itemBase);
output += "[" + entry.bootyType + "] " + template.item_base_name + " [Chance] " + entry.dropChance + newline;
}
}
}