Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix maker disassembly fee not being applied

Browse Source
This commit is contained in:
P0nk
2023-03-04 22:35:16 +01:00
parent d2d4b442d2
commit 1fd0963401
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/client/processor/action/MakerProcessor.java
View File

@@ -172,7 +172,7 @@ public class MakerProcessor {
break; break;
case 2: // no meso case 2: // no meso
c.sendPacket(PacketCreator.serverNotice(1, "You don't have enough mesos (" + GameConstants.numberWithCommas(recipe.getCost()) + ") to complete this operation.")); c.sendPacket(PacketCreator.serverNotice(1, "You don't have enough mesos (" + GameConstants.numberWithCommas(recipe.getReqCost()) + ") to complete this operation."));
c.sendPacket(PacketCreator.makerEnableActions()); c.sendPacket(PacketCreator.makerEnableActions());
break; break;
@@ -194,14 +194,14 @@ public class MakerProcessor {
default: default:
if (toDisassemble != -1) { if (toDisassemble != -1) {
InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (short) pos, (short) 1, false); InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (short) pos, (short) 1, false);
// TODO: fix disassembly being free. The fee is never applied. c.getPlayer().gainMeso(-recipe.getCost());
} else { } else {
for (Pair<Integer, Integer> pair : recipe.getReqItems()) { for (Pair<Integer, Integer> pair : recipe.getReqItems()) {
c.getAbstractPlayerInteraction().gainItem(pair.getLeft(), (short) -pair.getRight(), false); c.getAbstractPlayerInteraction().gainItem(pair.getLeft(), (short) -pair.getRight(), false);
} }
} }
int cost = recipe.getCost(); int cost = recipe.getReqCost();
if (stimulantid == -1 && reagentids.isEmpty()) { if (stimulantid == -1 && reagentids.isEmpty()) {
if (cost > 0) { if (cost > 0) {
c.getPlayer().gainMeso(-cost, false); c.getPlayer().gainMeso(-cost, false);
@@ -234,9 +234,9 @@ public class MakerProcessor {
if (type == 3) { if (type == 3) {
c.sendPacket(PacketCreator.makerResultCrystal(recipe.getGainItems().get(0).getLeft(), recipe.getReqItems().get(0).getLeft())); c.sendPacket(PacketCreator.makerResultCrystal(recipe.getGainItems().get(0).getLeft(), recipe.getReqItems().get(0).getLeft()));
} else if (type == 4) { } else if (type == 4) {
c.sendPacket(PacketCreator.makerResultDesynth(recipe.getReqItems().get(0).getLeft(), recipe.getCost(), recipe.getGainItems())); c.sendPacket(PacketCreator.makerResultDesynth(recipe.getReqItems().get(0).getLeft(), recipe.getReqCost(), recipe.getGainItems()));
} else { } else {
c.sendPacket(PacketCreator.makerResult(makerSucceeded, recipe.getGainItems().get(0).getLeft(), recipe.getGainItems().get(0).getRight(), recipe.getCost(), recipe.getReqItems(), stimulantid, new LinkedList<>(reagentids.keySet()))); c.sendPacket(PacketCreator.makerResult(makerSucceeded, recipe.getGainItems().get(0).getLeft(), recipe.getGainItems().get(0).getRight(), recipe.getReqCost(), recipe.getReqItems(), stimulantid, new LinkedList<>(reagentids.keySet())));
} }
c.sendPacket(PacketCreator.showMakerEffect(makerSucceeded)); c.sendPacket(PacketCreator.showMakerEffect(makerSucceeded));
@@ -323,7 +323,7 @@ public class MakerProcessor {
return 1; return 1;
} }
if (c.getPlayer().getMeso() < recipe.getCost()) { if (c.getPlayer().getMeso() < recipe.getReqCost()) {
return 2; return 2;
} }

6
src/main/java/server/MakerItemFactory.java
View File

@@ -182,7 +182,7 @@ public class MakerItemFactory {
return reqMakerLevel; return reqMakerLevel;
} }
public int getCost() { public int getReqCost() {
return reqCost; return reqCost;
} }
@@ -190,6 +190,10 @@ public class MakerItemFactory {
cost += amount; cost += amount;
} }
public int getCost() {
return (int) this.cost;
}
protected void addReqItem(int itemId, int amount) { protected void addReqItem(int itemId, int amount) {
reqItems.add(new Pair<>(itemId, amount)); reqItems.add(new Pair<>(itemId, amount));
} }