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

fix resource merchant margins

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-06-15 16:02:07 -05:00
parent f27a4f174b
commit 846b8a7cde
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+2 -2
View File
@@ -1409,8 +1409,8 @@ public class ClientMessagePump implements NetMsgHandler {
int cost = me.getMagicValue(); int cost = me.getMagicValue();
int amountResource = 0; int amountResource = 0;
if(ib.getType().equals(ItemType.RESOURCE) && npc.contractUUID == 900){ //resource merchant if(ib.getType().equals(ItemType.RESOURCE) && npc.contractUUID == 900){ //resource merchant
amountResource = 3000000 / (ib.getBaseValue() * 2); amountResource = 15000000 / (ib.getBaseValue());
cost = amountResource * (ib.getBaseValue() * 2); cost = amountResource * (ib.getBaseValue());
} }
float bargain = sourcePlayer.getBargain(); float bargain = sourcePlayer.getBargain();
src/engine/objects/Contract.java
+4 -2
View File
@@ -201,8 +201,10 @@ public class Contract extends AbstractGameObject {
if(this.getObjectUUID() == 900){ //resource merchant if(this.getObjectUUID() == 900){ //resource merchant
for(MobEquipment me : this.sellInventory){ for(MobEquipment me : this.sellInventory){
if(me.getItemBase().getType().equals(Enum.ItemType.RESOURCE)){ if(me.getItemBase().getType().equals(Enum.ItemType.RESOURCE)){
int amountResource = 3000000 / (me.getItemBase().getBaseValue() * 2); int amountResource = 1500000 / (me.getItemBase().getBaseValue());
me.magicValue = amountResource * (me.getItemBase().getBaseValue() * 2); me.magicValue = amountResource * (me.getItemBase().getBaseValue());
} else{
me.magicValue = 100000;
} }
} }
} }