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

Code Coupons + Worldmap update + Mini-games + Player Interaction wrap

Browse Source 
Fixed several cases on the Cash Shop that would freeze some player actions when triggered, requiring exit Cash Shop to unstuck.
Implemented Code Coupons, supporting several items bundled on the same code, and also devised a way to automate code generation.
Added a current status on-demand option on the Buyback command. Info such as "current fee" or "time remaining" are available now.
Reviewed several cases where non-owned items would get stacked with owner-tagged items.
Added Door support for Happyville, Crimsonwood Keep.
Added worldmap tooltip support for some maps in Masteria's C. Keep and H. House.
Added Masteria region to the world map.
C. Keep interiors no longer relocates players to entrance after actions such as logout.
Overhauled minigame mechanics: from player boxes tooltip and in-match improvements to deploy different minigame types, accordingly with item description or player choice.
Fixed Amoria outskirts not relocating players to city after getting KO'ed.
Fixed issues with pets, rings and cash items being assigned the same cash unique ids leading to some quirks on the cash shop inventory.
Fixed an issue with the recently added HP/MP ratio update, arbitrarily taking off 1 point in certain cases.
Answer positions on the explorer's 3rd job quiz are now randomed.
Fixed several issues that showed up when the bcrypt system is disabled.
DOT from maps such as El Nath and Aqua Road now procs at a 5sec interval, GMS-like.
Improved performance of Whodrops and Search commands.
Concurrently protected player interaction handlers, thus mitigating several exploits on these lines.
Adjusted several expedition timers, such as Horntail, now having a more sane deadline.
Concurrently protected chair modules.
Fixed "seduce" debuff not working on chairs.
This commit is contained in:
ronancpl
2018-10-09 22:39:36 -03:00
parent 3a8377c283
commit 2b44b4baa2
213 changed files with 16547 additions and 11031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/event/3rdJob_bowman.js
View File

@@ -47,7 +47,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/3rdJob_magician.js
View File

@@ -47,7 +47,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/3rdJob_mount.js
View File

@@ -62,7 +62,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/3rdJob_pirate.js
View File

@@ -47,7 +47,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/3rdJob_thief.js
View File

@@ -47,7 +47,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/3rdJob_warrior.js
View File

@@ -47,7 +47,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/4jberserk.js
View File

@@ -58,7 +58,7 @@ function playerEntry(eim, player) {
player.changeMap(map, map.getPortal(0));
//TODO: hold time across map changes
//player.getClient().getSession().write(tools.MaplePacketCreator.getClock(1800));
//player.getClient().announce(tools.MaplePacketCreator.getClock(1800));
}
function playerDead(eim, player) {

2
scripts/event/Aran_2ndmount.js
View File

@@ -53,7 +53,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 2);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/Aran_3rdmount.js
View File

@@ -54,7 +54,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 1);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/BalrogQuest.js
View File

@@ -29,7 +29,7 @@ var exitMap = 105100100;
var minMapId = 910520000;
var maxMapId = 910520000;
var eventTime = 10; //10 minutes
var eventTime = 10; //10 minutes
var lobbyRange = [0, 0];
@@ -56,7 +56,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 1);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/DollHouse.js
View File

@@ -26,7 +26,7 @@ importPackage(Packages.tools);
var entryMap = 922000010;
var exitMap = 221024400;
var eventTime = 10; //10 minutes
var eventTime = 10; //10 minutes
function init() {
em.setProperty("noEntry","false");
@@ -39,7 +39,7 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/GuildQuest.js
View File

@@ -237,7 +237,7 @@ function changedMap(eim, player, mapid) {
function afterChangedMap(eim, player, mapid) {
if (mapid == 990000100) {
var texttt = "So, here is the brief. You guys should be warned that, once out on the fortress outskirts, anyone that would not be equipping the #b#t1032033##k will die instantly due to the deteriorated state of the air around there. That being said, once your team moves out, make sure to #bhit the glowing rocks#k in that region and #bequip the dropped item#k before advancing stages. That will protect you thoroughly from the air sickness. Good luck!";
player.getClient().getSession().write(Packages.tools.MaplePacketCreator.getNPCTalk(9040000, /*(byte)*/ 0, texttt, "00 00", /*(byte)*/ 0));
player.getClient().announce(Packages.tools.MaplePacketCreator.getNPCTalk(9040000, /*(byte)*/ 0, texttt, "00 00", /*(byte)*/ 0));
}
}

2
scripts/event/Hak.js
View File

@@ -34,7 +34,7 @@ function playerEntry(eim, player) {
onRide = eim.getMapFactory().getMap(birdRide[myRide]);
player.changeMap(onRide, onRide.getPortal(0));
player.getClient().getSession().write(MaplePacketCreator.getClock(rideTime / 1000));
player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000));
eim.schedule("timeOut", rideTime);
}

2
scripts/event/HorntailBattle.js
View File

@@ -36,7 +36,7 @@ var clearMap = 240050600;
var minMapId = 240060000;
var maxMapId = 240060200;
var eventTime = 15; // 15 minutes
var eventTime = 120; // 120 minutes
var lobbyRange = [0, 0];

4
scripts/event/KerningTrain.js
View File

@@ -35,8 +35,8 @@ function playerEntry(eim, player) {
onRide = eim.getMapFactory().getMap(trainRide[myRide]);
player.changeMap(onRide, onRide.getPortal(0));
player.getClient().getSession().write(MaplePacketCreator.getClock(rideTime / 1000));
player.getClient().getSession().write(MaplePacketCreator.earnTitleMessage("The next stop is at Kerning " + (myRide == 0 ? "Square" : "Subway") + " Station. The exit is to your left."));
player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000));
player.getClient().announce(MaplePacketCreator.earnTitleMessage("The next stop is at Kerning " + (myRide == 0 ? "Square" : "Subway") + " Station. The exit is to your left."));
eim.schedule("timeOut", rideTime);
}

4
scripts/event/MK_PrimeMinister2.js
View File

@@ -2,7 +2,7 @@ importPackage(Packages.tools);
importPackage(Packages.server.life);
var minPlayers = 1;
var eventTime = 10;
var eventTime = 10; // 10 minutes
var entryMap = 106021402;
var exitMap = 106021600;
@@ -36,7 +36,7 @@ function playerEntry(eim, player){
var pm = MapleLifeFactory.getMonster(3300008);
weddinghall.spawnMonsterOnGroundBelow(pm, new Packages.java.awt.Point(472, 27));
player.getClient().getSession().write(MaplePacketCreator.getClock(eventTime * 60));
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

2
scripts/event/OrbisPQ.js
View File

@@ -180,7 +180,7 @@ function playerEntry(eim, player) {
player.changeMap(map, map.getPortal(0));
var texttt = "Hi, my name is Eak, the Chamberlain of the Goddess. Don't be alarmed; you won't be able to see me right now. Back when the Goddess turned into a block of stone, I simultaneously lost my own power. If you gather up the power of the Magic Cloud of Orbis, however, then I'll be able to recover my body and re-transform back to my original self. Please collect #b20#k Magic Clouds and bring them back to me. Right now, you'll only see me as a tiny, flickering light.";
player.getClient().getSession().write(Packages.tools.MaplePacketCreator.getNPCTalk(2013001, /*(byte)*/ 0, texttt, "00 00", /*(byte)*/ 0));
player.getClient().announce(Packages.tools.MaplePacketCreator.getNPCTalk(2013001, /*(byte)*/ 0, texttt, "00 00", /*(byte)*/ 0));
}
function scheduledTimeout(eim) {

2
scripts/event/PinkBeanBattle.js
View File

@@ -37,7 +37,7 @@ var clearMap = 270050300;
var minMapId = 270050100;
var maxMapId = 270050300;
var eventTime = 100; // 100 minutes
var eventTime = 140; // 140 minutes
var lobbyRange = [0, 0];

10
scripts/event/RockSpirit.js
View File

@@ -22,7 +22,7 @@
importPackage(Packages.tools);
var exitMap;
var startMap;
var entryMap;
var otherMap;
var minPlayers = 1;
var fightTime = 60;
@@ -30,7 +30,7 @@ var timer = 1000 * 60 * fightTime;
function init() {
exitMap = em.getChannelServer().getMapFactory().getMap(103040400);
startMap = em.getChannelServer().getMapFactory().getMap(103040410);
entryMap = em.getChannelServer().getMapFactory().getMap(103040410);
otherMap = em.getChannelServer().getMapFactory().getMap(103040420);
}
@@ -44,7 +44,7 @@ function setup() {
function afterSetup(eim) {}
function respawn(eim) {
var map = eim.getMapInstance(startMap.getId());
var map = eim.getMapInstance(entryMap.getId());
var map2 = eim.getMapInstance(otherMap.getId());
map.allowSummonState(true);
map2.allowSummonState(true);
@@ -55,7 +55,7 @@ function respawn(eim) {
function playerEntry(eim, player) {
var amplifierMap = eim.getMapInstance(startMap.getId());
var amplifierMap = eim.getMapInstance(entryMap.getId());
player.changeMap(amplifierMap);
eim.schedule("timeOut", timer);
}
@@ -107,7 +107,7 @@ function playerExit(eim, player) {
function moveMap(eim, player) {
if (player.getMap().getId() == exitMap.getId()) {
removePlayer(eim, player);
player.getClient().getSession().write(MaplePacketCreator.removeClock());
player.getClient().announce(MaplePacketCreator.removeClock());
eim.dispose();
}
}

10
scripts/event/RockSpiritVIP.js
View File

@@ -22,7 +22,7 @@
importPackage(Packages.tools);
var exitMap;
var startMap;
var entryMap;
var otherMap;
var minPlayers = 1;
var fightTime = 30;
@@ -30,7 +30,7 @@ var timer = 1000 * 60 * fightTime;
function init() {
exitMap = em.getChannelServer().getMapFactory().getMap(103040400);
startMap = em.getChannelServer().getMapFactory().getMap(103040440);
entryMap = em.getChannelServer().getMapFactory().getMap(103040440);
otherMap = em.getChannelServer().getMapFactory().getMap(103040450);
}
@@ -44,7 +44,7 @@ function setup() {
function afterSetup(eim) {}
function respawn(eim) {
var map = eim.getMapInstance(startMap.getId());
var map = eim.getMapInstance(entryMap.getId());
var map2 = eim.getMapInstance(otherMap.getId());
map.allowSummonState(true);
map2.allowSummonState(true);
@@ -55,7 +55,7 @@ function respawn(eim) {
function playerEntry(eim, player) {
var amplifierMap = eim.getMapInstance(startMap.getId());
var amplifierMap = eim.getMapInstance(entryMap.getId());
player.changeMap(amplifierMap);
eim.schedule("timeOut", timer);
}
@@ -107,7 +107,7 @@ function playerExit(eim, player) {
function moveMap(eim, player) {
if (player.getMap().getId() == exitMap.getId()) {
removePlayer(eim, player);
player.getClient().getSession().write(MaplePacketCreator.removeClock());
player.getClient().announce(MaplePacketCreator.removeClock());
eim.dispose();
}
}

2
scripts/event/ZakumBattle.js
View File

@@ -36,7 +36,7 @@ var clearMap = 211042400;
var minMapId = 280030000;
var maxMapId = 280030000;
var eventTime = 60; // 60 minutes
var eventTime = 120; // 120 minutes
var lobbyRange = [0, 0];