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

Item Raise + Gachapon Rework + Minigames & M. Magnet & M. Door patch

Browse Source 
Fixed a glitch in inventory that would happen when trying to put items into storage.
Added "Item Raise" functionality.
Adjusted Party Search. Token sessions no longer expires due to no players found, rather are sent into a brief "inactivity" period.
Fixed Fredrick stored items not being properly erased after a character deletion.
Fixed skillbooks in stacked quantities not being useable.
New tool: MapleGachaponItemidRetriever. This tool parses the gachapon descriptor file (holding several item names, for several gachapons) and generates files for each defined gachapon with itemids of the loots.
Revised Mushroom Empire transition portals that interacts with scripted items (items now are useable through inventory, no longer being automatically removed from inventory upon crossing portals).
Fixed script "secretroom" always requiring a new key (quest reward) to access the inner rooms, which would make the room unreachable.
Reworked gachapons loots throughout the game. New loots are supposed to represent an old-school MapleSEA-like escalation of gachapon loots.
Fixed issues that would show up in the case null PIN/PIC gets checked.
Reworked skill Monster Magnet, no longer using "catch success rate" as a skill progression element. This fixes the skill disconnecting caster upon failure.
Revised Mystic Doors, no longer crashing players after the caster decides to cancel the buff moments after casting (during portal deploying effect in course).
Fixed portal access to Prime Minister crashing when trying to access on a party.
Refactored the several "startQuest/completeQuest" methods widely used in the many scripting managers. Methods that does essentially the same thing now are accessed from the superclass.
Fixed "rechargeable items" not being properly accounted for slots availability in inventory slot checking.
Fixed several issues of late within minigames.
Fixed minigames regarding double results when handling some rare scenarios.
Implemented "call for leave after finishing game" functionality of minigames.
This commit is contained in:
ronancpl
2019-06-01 21:12:40 -03:00
parent 89eca2995b
commit edb3920852
111 changed files with 6597 additions and 1943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/event/MK_PrimeMinister.js
View File

@@ -86,29 +86,38 @@ function scheduledTimeout(eim){
eim.dispose();
}
function playerRevive(eim, player){
player.respawn(eim, entryMap);
return false;
function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
function playerDead(eim, player){}
function playerDisconnected(eim, player){
var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++){
if(party.get(i).equals(player))
removePlayer(eim, player);
else
playerExit(eim, party.get(i));
}
eim.dispose();
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
function monsterValue(eim, mobId){
return -1;
}
function end(eim) {
var party = eim.getPlayers();
for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i));
}
eim.dispose();
}
function leftParty(eim, player){}
function disbandParty(eim){}
@@ -120,8 +129,15 @@ function playerExit(eim, player){
player.changeMap(exitMap, 2);
}
function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr);
function changedMap(eim, player, mapid) {
if (mapid < minMapId || mapid > maxMapId) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
}
function removePlayer(eim, player){

42
scripts/event/MK_PrimeMinister2.js
View File

@@ -77,29 +77,38 @@ function scheduledTimeout(eim){
eim.dispose();
}
function playerRevive(eim, player){
player.respawn(eim, entryMap);
return false;
function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
function playerDead(eim, player){}
function playerDisconnected(eim, player){
var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++){
if(party.get(i).equals(player))
removePlayer(eim, player);
else
playerExit(eim, party.get(i));
}
eim.dispose();
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
function monsterValue(eim, mobId){
return -1;
}
function end(eim) {
var party = eim.getPlayers();
for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i));
}
eim.dispose();
}
function leftParty(eim, player){}
function disbandParty(eim){}
@@ -112,7 +121,14 @@ function playerExit(eim, player){
}
function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr);
if (mapid < minMapId || mapid > maxMapId) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
}
function removePlayer(eim, player){

55
scripts/item/killarmush.js Normal file
View File

@@ -0,0 +1,55 @@
/*
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
var status;
function start() {
status = -1;
action(1, 0, 0);
}
function action(mode, type, selection) {
if (mode == -1) {
im.dispose();
} else {
if (mode == 0 && type > 0) {
im.dispose();
return;
}
if (mode == 1)
status++;
else
status--;
if(status == 0) {
if (im.getMapId() == 106020300) {
var portal = im.getMap().getPortal("obstacle");
if (portal != null && portal.getPosition().distance(im.getPlayer().getPosition()) < 210) {
if(!(im.isQuestStarted(100202) || im.isQuestCompleted(100202))) im.startQuest(100202);
im.removeAll(2430014);
im.message("You have used the Killer Mushroom Spore to open the way.");
}
}
im.dispose();
}
}
}

0
scripts/item/openTreasure.txt
View File

58
scripts/item/removethorns.js Normal file
View File

@@ -0,0 +1,58 @@
/*
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
var status;
function start() {
status = -1;
action(1, 0, 0);
}
function action(mode, type, selection) {
if (mode == -1) {
im.dispose();
} else {
if (mode == 0 && type > 0) {
im.dispose();
return;
}
if (mode == 1)
status++;
else
status--;
if(status == 0) {
if (im.getMapId() == 106020400 && im.isQuestActive(2324)) {
var player = im.getPlayer();
var portal = im.getMap().getPortal("right00");
if (portal != null && portal.getPosition().distance(player.getPosition()) < 210) {
player.gainExp(3300 * player.getExpRate());
im.forceCompleteQuest(2324);
im.removeAll(2430015);
im.playerMessage(5, "You have used the Thorn Remover to clear the path.");
}
}
im.dispose();
}
}
}

7
scripts/npc/2030008.js
View File

@@ -59,7 +59,12 @@ function action(mode, type, selection) {
}
if(!(cm.isQuestStarted(100200) || cm.isQuestCompleted(100200))) { // thanks Vcoc for finding out a need of reapproval from the masters for Zakum expeditions
cm.sendOk("Beware, for the power of olde has not been forgotten... ");
if (cm.getPlayer().getLevel() >= 50) { // thanks Z1peR for noticing not-so-clear unmet requirements message here.
cm.sendOk("Beware, for the power of olde has not been forgotten... If you seek to defeat #rZakum#k someday, earn the #bChief's Residence Council#k approval foremost and then #bface the trials#k, only then you will become eligible to fight.");
} else {
cm.sendOk("Beware, for the power of olde has not been forgotten...");
}
cm.dispose();
return;
}

9
scripts/npc/2082014_script.js → scripts/npc/2082014.js
View File

@@ -39,7 +39,14 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
cm.sendOk("We've already located the enemy's ultimate weapon! Follow along the ship's bow area ahead and you will find my sister #b#p2082013##k. Report to her for futher instructions on the mission.");
if (Packages.constants.ServerConstants.USE_ENABLE_CUSTOM_NPC_SCRIPT) {
cm.openShopNPC(2082014);
} else if (cm.isQuestStarted(3749)) {
cm.sendOk("We've already located the enemy's ultimate weapon! Follow along the ship's bow area ahead and you will find my sister #b#p2082013##k. Report to her for futher instructions on the mission.");
} else {
cm.sendDefault();
}
cm.dispose();
}
}

7
scripts/npc/9201101.js
View File

@@ -4,11 +4,12 @@
*/
function start() {
if(Packages.server.MapleShopFactory.getInstance().getShop(9201101) != null) {
if (Packages.constants.ServerConstants.USE_ENABLE_CUSTOM_NPC_SCRIPT) {
cm.openShopNPC(9201101);
} else {
cm.sendOk("The patrol in New Leaf City is always ready. No creatures are able to break through to the city.");
//cm.sendOk("The patrol in New Leaf City is always ready. No creatures are able to break through to the city.");
cm.sendDefault();
}
cm.dispose();
}

3
scripts/npc/9977777.js
View File

@@ -60,6 +60,7 @@ function writeFeatureTab_Skills() {
addFeature("Maker skill features properly developed.");
addFeature("Chair Mastery - map chair boosts HP/MP rec.");
addFeature("Mu Lung Dojo skills functional.");
addFeature("Monster Magnet skill no longer crashes players.");
}
function writeFeatureTab_Quests() {
@@ -72,6 +73,7 @@ function writeFeatureTab_Quests() {
addFeature("Reviewed several 4th job skill questlines.");
addFeature("Rewarding system now looks up for item stacking.");
addFeature("3rd job quiz with all 40-question pool available.");
addFeature("Item raising functional.");
}
function writeFeatureTab_PlayerSocialNetwork() {
@@ -113,6 +115,7 @@ function writeFeatureTab_CashItems() {
addFeature("Reviewed an pet position issue within CASH inventory.");
addFeature("Reviewed fashion-related contents, almost GMS-like.");
addFeature("Plastic surgeons/stylists no longer stuck characters.");
addFeature("Reworked gachapon loots, website-lists lookalike.");
addFeature("Scroll for Spikes on Shoes.");
addFeature("Scroll for Cold Protection.");
addFeature("Vega's spell.");

4
scripts/npc/gachapon.js
View File

@@ -26,12 +26,12 @@
var status;
var ticketId = 5220000;
var mapName = ["Henesys", "Ellinia", "Perion", "Kerning City", "Sleepywood", "Mushroom Shrine", "Showa Spa (M)", "Showa Spa (F)", "New Leaf City", "Nautilus"];
var mapName = ["Henesys", "Ellinia", "Perion", "Kerning City", "Sleepywood", "Mushroom Shrine", "Showa Spa (M)", "Showa Spa (F)", "Ludibrium", "New Leaf City", "El Nath", "Nautilus"];
var curMapName = "";
function start() {
status = -1;
curMapName = mapName[(cm.getNpc() != 9100117 && cm.getNpc() != 9100109) ? (cm.getNpc() - 9100100) : cm.getNpc() == 9100109 ? 8 : 9];
curMapName = mapName[(cm.getNpc() != 9100117 && cm.getNpc() != 9100109) ? (cm.getNpc() - 9100100) : cm.getNpc() == 9100109 ? 9 : 11];
action(1, 0, 0);
}

60
scripts/npc/gachaponInfo.js Normal file
View File

@@ -0,0 +1,60 @@
/*
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @author: Ronan
* @npc: Pio
* @func: Gachapon Loot Announcer
*/
var status;
var gachaMessages;
function start() {
gachaMessages = Packages.server.gachapon.MapleGachapon.Gachapon.getLootInfo();
gachas = Packages.server.gachapon.MapleGachapon.Gachapon.values();
status = -1;
action(1, 0, 0);
}
function action(mode, type, selection) {
if (mode == -1) {
cm.dispose();
} else {
if (mode == 0 && type > 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else
status--;
if (status == 0) {
var sendStr = "Hi, #r#p" + cm.getNpc() + "##k here! I'm announcing all obtainable loots from the Gachapons. Which Gachapon machine would you like to look?\r\n\r\n#b" + gachaMessages[0] + "#k";
cm.sendSimple(sendStr);
} else if(status == 1) {
var sendStr = "Loots from #b" + gachas[selection].name() + "#k:\r\n\r\n" + gachaMessages[selection + 1];
cm.sendPrev(sendStr);
} else if(status == 2) {
cm.dispose();
}
}
}

32
scripts/portal/TD_MC_enterboss2.js
View File

@@ -22,17 +22,20 @@ function enter(pi) {
else if(pi.isQuestStarted(2332) && pi.hasItem(4032388)){
pi.forceCompleteQuest(2332, 1300002);
pi.getPlayer().message("You've found the princess!");
pi.giveCharacterExp(4400 * 1.5, pi.getPlayer());
pi.giveCharacterExp(4400, pi.getPlayer());
var em = pi.getEventManager("MK_PrimeMinister");
var party = pi.getPlayer().getParty();
if (party != null) {
if (em.startInstance(party, pi.getMap())) {
pi.playPortalSound();
return true;
} else {
pi.message("Another party is already challenging the boss in this channel.");
return false;
var eli = em.getEligibleParty(pi.getParty()); // thanks Conrad for pointing out missing eligible party declaration here
if(eli.size() > 0) {
if (em.startInstance(party, pi.getMap())) {
pi.playPortalSound();
return true;
} else {
pi.message("Another party is already challenging the boss in this channel.");
return false;
}
}
} else {
if (em.startInstance(pi.getPlayer())) { // thanks RedHat for noticing an issue here
@@ -49,12 +52,15 @@ function enter(pi) {
var party = pi.getPlayer().getParty();
if (party != null) {
if (em.startInstance(1, party, pi.getMap())) {
pi.playPortalSound();
return true;
} else {
pi.message("Another party is already challenging the boss in this channel.");
return false;
var eli = em.getEligibleParty(pi.getParty());
if(eli.size() > 0) {
if (em.startInstance(1, party, pi.getMap())) {
pi.playPortalSound();
return true;
} else {
pi.message("Another party is already challenging the boss in this channel.");
return false;
}
}
} else {
if (em.startInstance(pi.getPlayer())) {

2
scripts/portal/dragonNest.js
View File

@@ -20,7 +20,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
function enter(pi) {
if(!pi.isQuestCompleted(3706)) {
if (!pi.isQuestStarted(100203)) { // thanks Conrad for suggesting grant players access to area with Nein Spirit's Baby Dragon after hatching egg
pi.playPortalSound(); pi.warp(240040611, "out00");
} else {
pi.playPortalSound(); pi.warp(240040612, "out00");

7
scripts/portal/go_secretroom.js
View File

@@ -1,13 +1,12 @@
function enter(pi) {
if(!pi.isQuestStarted(2335) || (pi.isQuestStarted(2335) && !pi.hasItem(4032405))){
if(!pi.isQuestCompleted(2335) && !(pi.isQuestStarted(2335) && pi.hasItem(4032405))){
pi.getPlayer().message("The door is locked securely. I will need a key if I want to go in there.");
return false;
}
if(pi.isQuestStarted(2335) && pi.hasItem(4032405)){
if(pi.isQuestStarted(2335)){
pi.forceCompleteQuest(2335, 1300002);
pi.giveCharacterExp(5000 * 1.5, pi.getPlayer());
pi.giveCharacterExp(5000, pi.getPlayer());
pi.gainItem(4032405, -1);
}
pi.playPortalSound();

17
scripts/portal/gotocastle.js
View File

@@ -1,12 +1,9 @@
function enter(pi) {
if (pi.isQuestActive(2324)) {
var player = pi.getPlayer();
player.gainExp(3300 * player.getExpRate());
pi.forceCompleteQuest(2324);
pi.removeAll(2430015);
pi.playerMessage(5, "You have used the Thorn Remover to clear the path.");
}
pi.playPortalSound(); pi.warp(106020501,0);
return true;
if (pi.isQuestCompleted(2324)) {
pi.playPortalSound(); pi.warp(106020501,0);
return true;
} else {
pi.playerMessage(5, "The path ahead is covered with sprawling vine thorns, only a Thorn Remover to clear this out...");
return false;
}
}

13
scripts/portal/obstacle.js
View File

@@ -5,17 +5,12 @@
*/
function enter(pi){
if (pi.isQuestCompleted(2316)) {
if (pi.hasItem(2430014)) {
pi.gainItem(2430014, -1 * pi.getPlayer().getItemQuantity(2430014, false));
pi.message("You have used the Killer Mushroom Spore to open the way.");
}
if (pi.isQuestStarted(100202)) {
pi.playPortalSound(); pi.warp(106020400, 2);
return true;
} else if (pi.hasItem(2430015)) {
pi.gainItem(2430015, -1 * pi.getPlayer().getItemQuantity(2430015, false));
pi.message("You have used the Thorn Remover to clean the way.");
} else if (pi.hasItem(4000507)) {
pi.gainItem(4000507, -1);
pi.message("You have used a Poison Spore to pass through the barrier.");
pi.playPortalSound(); pi.warp(106020400, 2);
return true;

2
scripts/quest/2332.js
View File

@@ -8,7 +8,7 @@ var status = -1;
function start(mode, type, selection){
if(qm.hasItem(4032388) && !qm.isQuestStarted(2332)){
qm.forceStartQuest();
qm.getPlayer().showHint("I must find Violetta. (quest started)");
qm.getPlayer().showHint("I must find Violetta!! (#bquest started#k)");
}
qm.dispose();
}

3
scripts/reactor/2406000.js
View File

@@ -18,6 +18,9 @@ function touch() {
function untouch() {}
function act() {
rm.message("With your latest efforts the egg has matured and cracked, thus born a radiant baby dragon.");
rm.startQuest(100203);
rm.spawnNpc(2081008);
rm.schedule("sendToHeaven", 12 * 1000);
}