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

Quest progress overview + Raise UI scripting + Shelved events loadout

Browse Source 
Performed a syllabus over quest progress tracking. Quests that were supposed to show up as startable/completable upon achieved progress should be able to do so. Reviewed progress tracking on scripts to adequate to this scenario.
Fixed some scenarios on where quest dialog popups would appear when updating a quest progress.
Fixed some scripts not using updated package addresses after the recent package refactor.
Reviewed Raise UI, no longer rendering players unable to access CS/MTS in certain scenarios.
Fixed a check of available space in inventory, when trying to obtain items from quests, not informing the player it happened due to a one-of-a-kind item already present.
Fixed quest dialog (feature present in many quests) not showing to players when completing it.
Fixed several issues with the Cygnus 1st job advancement quests.
Added scripting within Raise UI open action. Mimiana egg uses this to keep track of player's EXP progress.
Fixed pets not getting despawned as expiration takes place.
Fixed hidden players being able to control mobs when either entering map or hidden state.
Fixed estimated HP/MP alert not taking bonuses (such as from buffs or equipments) into account.
Fixed Energy Charge refreshing buff time upon touching mobs, skewing the  uptime of the skill's stat buffs.
Switched SnakeYaml for YamlBeans, which makes up for a single JAR artifact.
Refactored a channel's event scripts loadout, now taking place after the server bootup phase.
This commit is contained in:
ronancpl
2019-10-03 20:01:09 -03:00
parent eae6dccbc0
commit 7ee947b404
190 changed files with 3281 additions and 1880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/server/MapleTrade.java
View File

@@ -80,8 +80,8 @@ public class MapleTrade {
private byte number;
private boolean fullTrade = false;
public MapleTrade(byte number, MapleCharacter c) {
chr = c;
public MapleTrade(byte number, MapleCharacter chr) {
this.chr = chr;
this.number = number;
}
@@ -291,8 +291,8 @@ public class MapleTrade {
}
}
public static void completeTrade(MapleCharacter c) {
MapleTrade local = c.getTrade();
public static void completeTrade(MapleCharacter chr) {
MapleTrade local = chr.getTrade();
MapleTrade partner = local.getPartner();
if (local.checkCompleteHandshake()) {
local.fetchExchangedItems();
@@ -300,12 +300,12 @@ public class MapleTrade {
if (!local.fitsMeso()) {
cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL);
c.message("There is not enough meso inventory space to complete the trade.");
chr.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(partner.getChr(), TradeResult.UNSUCCESSFUL);
c.message("Partner does not have enough meso inventory space to complete the trade.");
chr.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;
}
@@ -313,7 +313,7 @@ public class MapleTrade {
if (!local.fitsInInventory()) {
if (local.fitsUniquesInInventory()) {
cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL);
c.message("There is not enough inventory space to complete the trade.");
chr.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);
@@ -323,11 +323,11 @@ public class MapleTrade {
} else if (!partner.fitsInInventory()) {
if (partner.fitsUniquesInInventory()) {
cancelTrade(partner.getChr(), TradeResult.UNSUCCESSFUL);
c.message("Partner does not have enough inventory space to complete the trade.");
chr.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.");
chr.message("Partner cannot hold more than one one-of-a-kind item at a time.");
}
return;
}
@@ -355,7 +355,7 @@ public class MapleTrade {
partner.completeTrade();
partner.getChr().setTrade(null);
c.setTrade(null);
chr.setTrade(null);
}
}
@@ -424,9 +424,9 @@ public class MapleTrade {
trade.cancelHandshake(result.getValue());
}
public static void startTrade(MapleCharacter c) {
if (c.getTrade() == null) {
c.setTrade(new MapleTrade((byte) 0, c));
public static void startTrade(MapleCharacter chr) {
if (chr.getTrade() == null) {
chr.setTrade(new MapleTrade((byte) 0, chr));
}
}
@@ -496,13 +496,13 @@ public class MapleTrade {
}
}
public static void declineTrade(MapleCharacter c) {
MapleTrade trade = c.getTrade();
public static void declineTrade(MapleCharacter chr) {
MapleTrade trade = chr.getTrade();
if (trade != null) {
if (trade.getPartner() != null) {
MapleCharacter other = trade.getPartner().getChr();
if (MapleInviteCoordinator.answerInvite(InviteType.TRADE, c.getId(), other.getId(), false).result == InviteResult.DENIED) {
other.message(c.getName() + " has declined your trade request.");
if (MapleInviteCoordinator.answerInvite(InviteType.TRADE, chr.getId(), other.getId(), false).result == InviteResult.DENIED) {
other.message(chr.getName() + " has declined your trade request.");
}
other.getTrade().cancel(TradeResult.PARTNER_CANCEL.getValue());
@@ -510,7 +510,7 @@ public class MapleTrade {
}
trade.cancel(TradeResult.NO_RESPONSE.getValue());
c.setTrade(null);
chr.setTrade(null);
}
}