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

Read item weight, value and base name through the bridge

Browse Source 
Consumers of the legacy ItemTemplate item_wt, item_value and
item_base_name now read getItemWt(), getItemValue() and
getItemBaseName() on template.cacheTemplate.

Parity (offline, scripts/p14.py, 7586 templates): 0 differences in
item_wt, item_value and item_base_name. No value changes expected.

JSON-Refactor-Plan Task 1.4.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
MagicBotandClaude Opus 5.5 committed 2026-10-19 12:44:35 -04:00
1 parent b8ac8cce3e
commit dc4a9ee08a
29 files changed
+59 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class AddItemToTradeWindowMsgHandler extends AbstractClientMsgHandler {
if (!item.validForInventory(source.getClientConnection(), source, source.charItemManager))
return false;
if (!tradingWith.hasRoomTrade(item.template.item_wt)) {
if (!tradingWith.hasRoomTrade(item.template.cacheTemplate.getItemWt())) {
dispatch = Dispatch.borrow(source, msg);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
return false;
src/engine/net/client/handlers/ItemProductionMsgHandler.java
+3 -3
View File
@@ -241,7 +241,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem.template.cacheTemplate.getItemType().equals(ItemType.GOLD))
return;
if (!vendor.charItemManager.hasRoomInventory(targetItem.template.item_wt)) {
if (!vendor.charItemManager.hasRoomInventory(targetItem.template.cacheTemplate.getItemWt())) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return;
}
@@ -328,7 +328,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (!vendor.charItemManager.inventoryContains(targetItem))
continue;
itemValue = targetItem.template.item_value;
itemValue = targetItem.template.cacheTemplate.getItemValue();
if (vendor.getBuilding().getStrongboxValue() + itemValue > vendor.getBuilding().getMaxGold()) {
ErrorPopupMsg.sendErrorPopup(player, 201);
@@ -471,7 +471,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (!vendor.charItemManager.inventoryContains(targetItem))
return;
if (!player.charItemManager.hasRoomInventory(targetItem.template.item_wt))
if (!player.charItemManager.hasRoomInventory(targetItem.template.cacheTemplate.getItemWt()))
return;
player.charItemManager.buyFromNPC(targetItem, vendor);
src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class TransferItemFromBankMsgHandler extends AbstractClientMsgHandler {
// Not gold, process update here
if (!itemManager.hasRoomInventory(item.template.item_wt))
if (!itemManager.hasRoomInventory(item.template.cacheTemplate.getItemWt()))
return true;
if (itemManager.moveItemToInventory(item) == false)
src/engine/net/client/handlers/TransferItemToBankMsgHandler.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class TransferItemToBankMsgHandler extends AbstractClientMsgHandler {
} else {
if (!itemManager.hasRoomBank(item.template.item_wt))
if (!itemManager.hasRoomBank(item.template.cacheTemplate.getItemWt()))
return true;
if (!itemManager.moveItemToBank(item))
src/engine/net/client/handlers/VendorBuyMsgHandler.java
+3 -3
View File
@@ -86,7 +86,7 @@ public class VendorBuyMsgHandler extends AbstractClientMsgHandler {
if (me.objectUUID == vendorBuyMsg.getItemID()) {
//test room available for item
if (!itemMan.hasRoomInventory(me.template.item_wt))
if (!itemMan.hasRoomInventory(me.template.cacheTemplate.getItemWt()))
return true;
int cost = me.getValue();
@@ -148,10 +148,10 @@ public class VendorBuyMsgHandler extends AbstractClientMsgHandler {
//test room available for item
if (!itemMan.hasRoomInventory(vendorItem.template.item_wt))
if (!itemMan.hasRoomInventory(vendorItem.template.cacheTemplate.getItemWt()))
return true;
int cost = vendorItem.template.item_value;
int cost = vendorItem.template.cacheTemplate.getItemValue();
if (vendorItem.flags.contains(mbEnums.ItemFlags.Identified) || vendorItem.isCustomValue())
cost = vendorItem.magicValue;
src/engine/net/client/handlers/VendorSellMsgHandler.java
+2 -2
View File
@@ -94,7 +94,7 @@ public class VendorSellMsgHandler extends AbstractClientMsgHandler {
return true;
if (npc.getParentZone() != null && npc.getParentZone().playerCityUUID != 0)
if (!npc.charItemManager.hasRoomInventory(sell.template.item_wt)) {
if (!npc.charItemManager.hasRoomInventory(sell.template.cacheTemplate.getItemWt())) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return true;
}
@@ -104,7 +104,7 @@ public class VendorSellMsgHandler extends AbstractClientMsgHandler {
//get goldItem cost to sell
cost = (int) (sell.template.item_value * (sell.combat_health_current / sell.template.combat_health_full));
cost = (int) (sell.template.cacheTemplate.getItemValue() * (sell.combat_health_current / sell.template.combat_health_full));
float bargain = player.getBargain();
float profit = npc.getBuyPercent(player) + bargain;
src/engine/net/client/msg/ManageNPCMsg.java
+2 -2
View File
@@ -424,7 +424,7 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.put((byte) 1);
writer.putInt(0);
writer.putInt(templateID); //itemID
writer.putInt(template.item_value);
writer.putInt(template.cacheTemplate.getItemValue());
writer.putInt(600);
writer.put((byte) 1);
writer.put((byte) template.modTable);
@@ -444,7 +444,7 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(0);
writer.putInt(item.templateID);
writer.putInt(item.template.item_value);
writer.putInt(item.template.cacheTemplate.getItemValue());
long timeLife = item.getDateToUpgrade() - System.currentTimeMillis();