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

Trade results + Map-Ownership & Fishing + P. EXP distribution rework

Browse Source 
Fixed an issue where players could lose priority over recently dropped items after switching maps.
Adjusted EXP bonus buffs to also cover party bonus gains.
Fixed items taken back from merchants not properly checking for stacking opportunities in player inventory.
Fixed some merchant references in visitors' player object not being properly cleared when owner closes shop.
Adjusted merchants to automatically close as soon as the merchant owner finishes maintenance process with it having no items in store.
Added trade result opcodes. Trade results now should work almost as intended originally.
Implemented server-side check for portal distance when deploying player shops and merchants.
Implemented server-side check for whether local or remote IP is being used when logging in a local/remote server (this should mitigate a few of the issues people may find when trying to log in game world).
Implemented commands designed for management of opened IO sessions.
Fixed chalkboard not showing up for owner player when changing maps.
Added "time left" functionality for merchant owners managing the opened store.
Fixed skillbooks not showing properly for other players in the map.
Fixed commands using lowercased-version of content inputted by player.
Implemented the Fredrick expected fee on using the Store Bank service.
Implemented "exclusive invitation management" in the system. Inviters are notified the invited players are already managing an invite, should it be visually "in-progress" for that one.
Implemented "map ownership". Non-map owners are unable to farm in an area if they are not party members with the owner or until the ownership rescinds.
Adjusted inventory sort feature, now sorting projectile items in such a fashion that commonly stronger versions comes before the basic ones.
Added a visual effect that shows up when obtaining Aran skills.
Revised party EXP gain system. Party bonuses now accounts a fraction of the accumulated EXP gained by members when defeating a mob, and raw EXP gained by a player is kept the same regardless of him/her being in a party or not (thus a bonus being REALLY a bonus).
Implemented a custom fishing system in the source, on which during "seasonal" times (that gets arbitrarily defined by both day-of-year and time-of-day) fishes are more likely to be hooked. Such likelihood also improved depending on the amount of mesos spent as lure.
This commit is contained in:
ronancpl
2019-03-10 01:30:22 -03:00
parent 799870df63
commit 9538c415e1
86 changed files with 2992 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
src/server/MapleTrade.java
View File

@@ -36,14 +36,38 @@ import client.inventory.manipulator.MapleInventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
import constants.GameConstants;
import constants.ServerConstants;
import net.server.coordinator.MapleInviteCoordinator;
import net.server.coordinator.MapleInviteCoordinator.InviteResult;
import net.server.coordinator.MapleInviteCoordinator.InviteType;
import tools.Pair;
/**
*
* @author Matze
* @author Ronan - concurrency safety & check available slots
* @author Ronan - concurrency safety & check available slots & trade results
*/
public class MapleTrade {
public enum TradeResult {
NO_RESPONSE(1),
PARTNER_CANCEL(2),
SUCCESSFUL(7),
UNSUCCESSFUL(8),
UNSUCCESSFUL_UNIQUE_ITEM_LIMIT(9),
UNSUCCESSFUL_ANOTHER_MAP(12),
UNSUCCESSFUL_DAMAGED_FILES(13);
private final int res;
private TradeResult(int res) {
this.res = res;
}
private byte getValue() {
return (byte) res;
}
}
private MapleTrade partner = null;
private List<Item> items = new ArrayList<>();
private List<Item> exchangeItems;
@@ -88,6 +112,7 @@ public class MapleTrade {
}
private void completeTrade() {
byte result;
boolean show = ServerConstants.USE_DEBUG;
items.clear();
meso = 0;
@@ -106,18 +131,21 @@ public class MapleTrade {
} else {
chr.dropMessage(1, "Transaction completed. You received " + GameConstants.numberWithCommas(exchangeMeso) + " mesos.");
}
result = TradeResult.NO_RESPONSE.getValue();
} else {
chr.dropMessage(1, "Transaction completed.");
result = TradeResult.SUCCESSFUL.getValue();
}
exchangeMeso = 0;
if (exchangeItems != null) {
exchangeItems.clear();
}
chr.getClient().announce(MaplePacketCreator.getTradeCompletion(number));
chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
}
private void cancel() {
private void cancel(byte result) {
boolean show = ServerConstants.USE_DEBUG;
for (Item item : items) {
@@ -134,7 +162,8 @@ public class MapleTrade {
if (exchangeItems != null) {
exchangeItems.clear();
}
chr.getClient().announce(MaplePacketCreator.getTradeCancel(number));
chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
}
private boolean isLocked() {
@@ -224,6 +253,15 @@ public class MapleTrade {
return MapleInventory.checkSpotsAndOwnership(chr, tradeItems);
}
private boolean fitsUniquesInInventory() {
List<Integer> exchangeItemids = new LinkedList<>();
for (Item item : exchangeItems) {
exchangeItemids.add(item.getItemId());
}
return chr.canHoldUniques(exchangeItemids);
}
private synchronized boolean checkTradeCompleteHandshake(boolean updateSelf) {
MapleTrade self, other;
@@ -259,32 +297,42 @@ public class MapleTrade {
partner.fetchExchangedItems();
if (!local.fitsMeso()) {
cancelTrade(c);
cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL);
c.message("There is not enough meso inventory space to complete the trade.");
partner.getChr().message("Partner does not have enough meso inventory space to complete the trade.");
return;
} else if (!partner.fitsMeso()) {
cancelTrade(c);
cancelTrade(partner.getChr(), TradeResult.UNSUCCESSFUL);
c.message("Partner does not have enough meso inventory space to complete the trade.");
partner.getChr().message("There is not enough meso inventory space to complete the trade.");
return;
}
if (!local.fitsInInventory()) {
cancelTrade(c);
c.message("There is not enough inventory space to complete the trade.");
partner.getChr().message("Partner does not have enough inventory space to complete the trade.");
if (local.fitsUniquesInInventory()) {
cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL);
c.message("There is not enough inventory space to complete the trade.");
partner.getChr().message("Partner does not have enough inventory space to complete the trade.");
} else {
cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL_UNIQUE_ITEM_LIMIT);
partner.getChr().message("Partner cannot hold more than one one-of-a-kind item at a time.");
}
return;
} else if (!partner.fitsInInventory()) {
cancelTrade(c);
c.message("Partner does not have enough inventory space to complete the trade.");
partner.getChr().message("There is not enough inventory space to complete the trade.");
if (partner.fitsUniquesInInventory()) {
cancelTrade(partner.getChr(), TradeResult.UNSUCCESSFUL);
c.message("Partner does not have enough inventory space to complete the trade.");
partner.getChr().message("There is not enough inventory space to complete the trade.");
} else {
cancelTrade(partner.getChr(), TradeResult.UNSUCCESSFUL_UNIQUE_ITEM_LIMIT);
c.message("Partner cannot hold more than one one-of-a-kind item at a time.");
}
return;
}
if (local.getChr().getLevel() < 15) {
if (local.getChr().getMesosTraded() + local.exchangeMeso > 1000000) {
cancelTrade(c);
cancelTrade(local.getChr(), TradeResult.NO_RESPONSE);
local.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
return;
} else {
@@ -292,7 +340,7 @@ public class MapleTrade {
}
} else if (partner.getChr().getLevel() < 15) {
if (partner.getChr().getMesosTraded() + partner.exchangeMeso > 1000000) {
cancelTrade(c);
cancelTrade(partner.getChr(), TradeResult.NO_RESPONSE);
partner.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
return;
} else {
@@ -309,74 +357,122 @@ public class MapleTrade {
}
}
private static void cancelTradeInternal(MapleCharacter chr) {
private static void cancelTradeInternal(MapleCharacter chr, byte selfResult, byte partnerResult) {
MapleTrade trade = chr.getTrade();
if(trade == null) return;
trade.cancel();
trade.cancel(selfResult);
if (trade.getPartner() != null) {
trade.getPartner().cancel();
trade.getPartner().cancel(partnerResult);
trade.getPartner().getChr().setTrade(null);
MapleInviteCoordinator.answerInvite(InviteType.TRADE, trade.getChr().getId(), trade.getPartner().getChr().getId(), false);
MapleInviteCoordinator.answerInvite(InviteType.TRADE, trade.getPartner().getChr().getId(), trade.getChr().getId(), false);
}
chr.setTrade(null);
}
private synchronized void tradeCancelHandshake(boolean updateSelf) {
private synchronized void tradeCancelHandshake(boolean updateSelf, byte result) {
byte selfResult, partnerResult;
MapleTrade self;
partnerResult = result;
selfResult = (result == TradeResult.PARTNER_CANCEL.getValue() ? TradeResult.NO_RESPONSE.getValue() : result);
if (updateSelf) {
self = this;
} else {
self = this.getPartner();
}
cancelTradeInternal(self.getChr());
cancelTradeInternal(self.getChr(), selfResult, partnerResult);
}
private void cancelHandshake() { // handshake checkout thanks to Ronan
if (this.getChr().getId() < this.getPartner().getChr().getId()) {
this.tradeCancelHandshake(true);
private void cancelHandshake(byte result) { // handshake checkout thanks to Ronan
MapleTrade partner = this.getPartner();
if (partner == null || this.getChr().getId() < partner.getChr().getId()) {
this.tradeCancelHandshake(true, result);
} else {
this.getPartner().tradeCancelHandshake(false);
partner.tradeCancelHandshake(false, result);
}
}
public static void cancelTrade(MapleCharacter chr) {
public static void cancelTrade(MapleCharacter chr, TradeResult result) {
MapleTrade trade = chr.getTrade();
if(trade == null) return;
trade.cancelHandshake();
trade.cancelHandshake(result.getValue());
}
public static void startTrade(MapleCharacter c) {
if (c.getTrade() == null) {
c.setTrade(new MapleTrade((byte) 0, c));
c.getClient().announce(MaplePacketCreator.getTradeStart(c.getClient(), c.getTrade(), (byte) 0));
} else {
c.message("You are already in a trade.");
}
}
private static boolean hasTradeInviteBack(MapleCharacter c1, MapleCharacter c2) {
MapleTrade other = c2.getTrade();
if (other != null) {
MapleTrade otherPartner = other.getPartner();
if (otherPartner != null) {
if (otherPartner.getChr().getId() == c1.getId()) {
return true;
}
}
}
return false;
}
public static void inviteTrade(MapleCharacter c1, MapleCharacter c2) {
if (c2.getTrade() == null) {
c2.setTrade(new MapleTrade((byte) 1, c2));
c2.getTrade().setPartner(c1.getTrade());
c1.getTrade().setPartner(c2.getTrade());
c2.getClient().announce(MaplePacketCreator.getTradeInvite(c1));
if (MapleInviteCoordinator.hasInvite(InviteType.TRADE, c1.getId())) {
if (hasTradeInviteBack(c1, c2)) {
c1.message("You are already managing this player's trade invitation.");
} else {
c1.message("You are already managing someone's trade invitation.");
}
return;
} else if (c1.getTrade().isFullTrade()) {
c1.message("You are already in a trade.");
return;
}
if (MapleInviteCoordinator.createInvite(InviteType.TRADE, c1, c1.getId(), c2.getId())) {
if (c2.getTrade() == null) {
c2.setTrade(new MapleTrade((byte) 1, c2));
c2.getTrade().setPartner(c1.getTrade());
c1.getTrade().setPartner(c2.getTrade());
c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0));
c2.getClient().announce(MaplePacketCreator.tradeInvite(c1));
} else {
c1.message("The other player is already trading with someone else.");
cancelTrade(c1, TradeResult.NO_RESPONSE);
MapleInviteCoordinator.answerInvite(InviteType.TRADE, c2.getId(), c1.getId(), false);
}
} else {
c1.message("The other player is already trading with someone else.");
cancelTrade(c1);
c1.message("The other player is already managing someone else's trade invitation.");
cancelTrade(c1, TradeResult.NO_RESPONSE);
}
}
public static void visitTrade(MapleCharacter c1, MapleCharacter c2) {
if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) {
c2.getClient().announce(MaplePacketCreator.getTradePartnerAdd(c1));
c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
c1.getTrade().setFullTrade(true);
c2.getTrade().setFullTrade(true);
Pair<InviteResult, MapleCharacter> inviteRes = MapleInviteCoordinator.answerInvite(InviteType.TRADE, c1.getId(), c2.getId(), true);
InviteResult res = inviteRes.getLeft();
if (res == InviteResult.ACCEPTED) {
if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) {
c2.getClient().announce(MaplePacketCreator.getTradePartnerAdd(c1));
c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
c1.getTrade().setFullTrade(true);
c2.getTrade().setFullTrade(true);
} else {
c1.message("The other player has already closed the trade.");
}
} else {
c1.message("The other player has already closed the trade.");
c1.message("This trade invitation already rescinded.");
cancelTrade(c1, TradeResult.NO_RESPONSE);
}
}
@@ -385,11 +481,15 @@ public class MapleTrade {
if (trade != null) {
if (trade.getPartner() != null) {
MapleCharacter other = trade.getPartner().getChr();
other.getTrade().cancel();
if (MapleInviteCoordinator.answerInvite(InviteType.TRADE, c.getId(), other.getId(), false).getLeft() == InviteResult.DENIED) {
other.message(c.getName() + " has declined your trade request.");
}
other.getTrade().cancel(TradeResult.PARTNER_CANCEL.getValue());
other.setTrade(null);
other.message(c.getName() + " has declined your trade request.");
}
trade.cancel();
trade.cancel(TradeResult.NO_RESPONSE.getValue());
c.setTrade(null);
}
}