Browse Source

Value set in constructor

combat-2
MagicBot 8 months ago
parent
commit
eba905b15d
  1. 6
      src/engine/net/client/handlers/BuyFromNPCMsgHandler.java
  2. 2
      src/engine/objects/CharacterItemManager.java
  3. 10
      src/engine/objects/Item.java

6
src/engine/net/client/handlers/BuyFromNPCMsgHandler.java

@ -90,7 +90,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler { @@ -90,7 +90,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler {
if (!itemMan.hasRoomInventory(me.template.item_wt))
return true;
int cost = me.getMagicValue();
int cost = me.magicValue;
float bargain = sourcePlayer.getBargain();
@ -112,7 +112,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler { @@ -112,7 +112,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler {
if (building != null && building.getProtectionState().equals(Enum.ProtectionState.NPC))
building = null;
int buildingDeposit = cost - me.getMagicValue();
int buildingDeposit = cost - me.magicValue;
if (building != null && (building.getStrongboxValue() + buildingDeposit) > building.getMaxGold()) {
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
@ -155,7 +155,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler { @@ -155,7 +155,7 @@ public class BuyFromNPCMsgHandler extends AbstractClientMsgHandler {
int cost = vendorItem.template.item_value;
if (vendorItem.flags.contains(Enum.ItemFlags.Identified) || vendorItem.isCustomValue())
cost = vendorItem.getMagicValue();
cost = vendorItem.magicValue;
float bargain = sourcePlayer.getBargain();

2
src/engine/objects/CharacterItemManager.java

@ -1477,7 +1477,7 @@ public class CharacterItemManager { @@ -1477,7 +1477,7 @@ public class CharacterItemManager {
if (!purchasedItem.moveItemToInventory((PlayerCharacter) this.absCharacter))
return false;
if (purchasedItem.getValue() != purchasedItem.getMagicValue()) {
if (purchasedItem.getValue() != purchasedItem.magicValue) {
DbManager.ItemQueries.UPDATE_VALUE(purchasedItem, 0);
purchasedItem.setValue(0);
}

10
src/engine/objects/Item.java

@ -56,7 +56,7 @@ public class Item extends AbstractWorldObject { @@ -56,7 +56,7 @@ public class Item extends AbstractWorldObject {
public OwnerType ownerType;
public int templateID;
private long dateToUpgrade;
private int magicValue;
public int magicValue;
public ItemTemplate template;
public String name;
@ -76,7 +76,7 @@ public class Item extends AbstractWorldObject { @@ -76,7 +76,7 @@ public class Item extends AbstractWorldObject {
this.numberOfItems = 1;
this.flags.addAll(this.template.item_flags);
this.value = this.template.item_value;
this.magicValue = this.value + calcMagicValue();
loadTemplateEnchantments();
}
@ -971,10 +971,6 @@ public class Item extends AbstractWorldObject { @@ -971,10 +971,6 @@ public class Item extends AbstractWorldObject {
return true;
}
public final int getMagicValue() {
return this.magicValue;
}
private void loadTemplateEnchantments() {
EffectsBase effect;
@ -1155,7 +1151,7 @@ public class Item extends AbstractWorldObject { @@ -1155,7 +1151,7 @@ public class Item extends AbstractWorldObject {
if (this.value == 0)
if (this.flags.contains(ItemFlags.Identified)) {
return this.getMagicValue();
return this.magicValue;
} else
return this.template.item_value;

Loading…
Cancel
Save