From 846b8a7cde03ec04ac226adf9196643fa001e71b Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sat, 15 Jun 2024 16:02:07 -0500 Subject: [PATCH] fix resource merchant margins --- src/engine/net/client/ClientMessagePump.java | 4 ++-- src/engine/objects/Contract.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java index 5fdbe8b2..6c7f1ae4 100644 --- a/src/engine/net/client/ClientMessagePump.java +++ b/src/engine/net/client/ClientMessagePump.java @@ -1409,8 +1409,8 @@ public class ClientMessagePump implements NetMsgHandler { int cost = me.getMagicValue(); int amountResource = 0; if(ib.getType().equals(ItemType.RESOURCE) && npc.contractUUID == 900){ //resource merchant - amountResource = 3000000 / (ib.getBaseValue() * 2); - cost = amountResource * (ib.getBaseValue() * 2); + amountResource = 15000000 / (ib.getBaseValue()); + cost = amountResource * (ib.getBaseValue()); } float bargain = sourcePlayer.getBargain(); diff --git a/src/engine/objects/Contract.java b/src/engine/objects/Contract.java index 1b5cf65e..109fea12 100644 --- a/src/engine/objects/Contract.java +++ b/src/engine/objects/Contract.java @@ -201,8 +201,10 @@ public class Contract extends AbstractGameObject { if(this.getObjectUUID() == 900){ //resource merchant for(MobEquipment me : this.sellInventory){ if(me.getItemBase().getType().equals(Enum.ItemType.RESOURCE)){ - int amountResource = 3000000 / (me.getItemBase().getBaseValue() * 2); - me.magicValue = amountResource * (me.getItemBase().getBaseValue() * 2); + int amountResource = 1500000 / (me.getItemBase().getBaseValue()); + me.magicValue = amountResource * (me.getItemBase().getBaseValue()); + } else{ + me.magicValue = 100000; } } }