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

bugfix - item pricing

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-04-03 20:36:15 -05:00
parent 7f8652b477
commit 2990396778
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+1 -1
View File
@@ -1406,7 +1406,7 @@ public class ClientMessagePump implements NetMsgHandler {
if (!itemMan.hasRoomInventory(ib.getWeight())) { if (!itemMan.hasRoomInventory(ib.getWeight())) {
return; return;
} }
int cost = me.getMagicValue(); int cost = me.magicValue;
int resourceCost = Warehouse.getCostForResource(me.getItemBase().getUUID()); int resourceCost = Warehouse.getCostForResource(me.getItemBase().getUUID());
if (resourceCost != 0) if (resourceCost != 0)
cost = resourceCost; cost = resourceCost;
src/engine/objects/MobEquipment.java
+8 -2
View File
@@ -9,6 +9,7 @@
package engine.objects; package engine.objects;
import engine.Enum;
import engine.exception.SerializationException; import engine.exception.SerializationException;
import engine.gameManager.PowersManager; import engine.gameManager.PowersManager;
import engine.net.ByteBufferWriter; import engine.net.ByteBufferWriter;
@@ -107,8 +108,13 @@ public class MobEquipment extends AbstractGameObject {
public static void serializeForVendor(MobEquipment mobEquipment, ByteBufferWriter writer, float percent) throws SerializationException { public static void serializeForVendor(MobEquipment mobEquipment, ByteBufferWriter writer, float percent) throws SerializationException {
_serializeForClientMsg(mobEquipment, writer, false); _serializeForClientMsg(mobEquipment, writer, false);
int baseValue = mobEquipment.itemBase.getBaseValue() + mobEquipment.itemBase.getMagicValue(); int baseValue = mobEquipment.itemBase.getBaseValue() + mobEquipment.itemBase.getMagicValue();
writer.putInt(mobEquipment.magicValue); if(mobEquipment.itemBase.getType().equals(Enum.ItemType.POTION)){
writer.putInt(mobEquipment.magicValue); writer.putInt((int)(mobEquipment.itemBase.getBaseValue() * 0.5f));
writer.putInt((int)(mobEquipment.itemBase.getBaseValue() * 0.5f));
}else {
writer.putInt(mobEquipment.magicValue);
writer.putInt(mobEquipment.magicValue);
}
} }
public static void serializeForClientMsg(MobEquipment mobEquipment, ByteBufferWriter writer) throws SerializationException { public static void serializeForClientMsg(MobEquipment mobEquipment, ByteBufferWriter writer) throws SerializationException {