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

Merge branch 'master' into credits_update

Browse Source
This commit is contained in:
ronancpl
2019-06-15 15:56:15 -03:00
parent 30e12a1f20 a39a210c1f
commit 7be66bb39d
146 changed files with 7810 additions and 2802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/npc/1061014.js
View File

@@ -58,7 +58,7 @@ function action(mode, type, selection) {
}
if (status == 0) {
if (player.getLevel() < exped.getMinLevel() && player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement
if (player.getLevel() < exped.getMinLevel() || player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement, thanks Conrad
cm.sendOk("You do not meet the criteria to battle " + expedBoss + "!");
cm.dispose();
} else if (expedition == null) { //Start an expedition

2
scripts/npc/1300013.js
View File

@@ -48,7 +48,7 @@ function action(mode, type, selection){
var party = cm.getPlayer().getParty();
if (party != null) {
if (!em.startInstance(party, cm.getMap())) {
if (!em.startInstance(party, cm.getMap(), 1)) {
cm.sendOk("Another party is already challenging the boss in this channel.");
}
} else {

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;
}

2
scripts/npc/2030013.js
View File

@@ -59,7 +59,7 @@ function action(mode, type, selection) {
}
if (status == 0) {
if (player.getLevel() < exped.getMinLevel() && player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement
if (player.getLevel() < exped.getMinLevel() || player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement, thanks Conrad
cm.sendOk("You do not meet the criteria to battle " + expedBoss + "!");
cm.dispose();
} else if (expedition == null) { //Start an expedition

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();
}
}

2
scripts/npc/2083004.js
View File

@@ -57,7 +57,7 @@ function action(mode, type, selection) {
}
if (status == 0) {
if (player.getLevel() < exped.getMinLevel() && player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement
if (player.getLevel() < exped.getMinLevel() || player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement, thanks Conrad
cm.sendOk("You do not meet the criteria to battle " + expedBoss + "!");
cm.dispose();
} else if (expedition == null) { //Start an expedition

2
scripts/npc/2141001.js
View File

@@ -60,7 +60,7 @@ function action(mode, type, selection) {
}
if (status == 0) {
if (player.getLevel() < exped.getMinLevel() && player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement
if (player.getLevel() < exped.getMinLevel() || player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement, thanks Conrad
cm.sendOk("You do not meet the criteria to battle " + expedBoss + "!");
cm.dispose();
} else if (expedition == null) { //Start an expedition

2
scripts/npc/9120201.js
View File

@@ -58,7 +58,7 @@ function action(mode, type, selection) {
}
if (status == 0) {
if (player.getLevel() < exped.getMinLevel() && player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement
if (player.getLevel() < exped.getMinLevel() || player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement, thanks Conrad
cm.sendOk("You do not meet the criteria to battle " + expedBoss + "!");
cm.dispose();
} else if (expedition == null) { //Start an expedition

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();
}

2
scripts/npc/9201113.js
View File

@@ -54,7 +54,7 @@ function action(mode, type, selection) {
}
if (status == 0) {
if (player.getLevel() < cwkpq.getMinLevel() && player.getLevel() > cwkpq.getMaxLevel()) { //Don't fit requirement
if (player.getLevel() < cwkpq.getMinLevel() || player.getLevel() > cwkpq.getMaxLevel()) { //Don't fit requirement, thanks Conrad
cm.sendOk("You do not meet the criteria to take attempt Crimsonwood Keep Party Quest!");
cm.dispose();
} else if (expedition == null) { //Start an expedition

2
scripts/npc/9270047.js
View File

@@ -59,7 +59,7 @@ function action(mode, type, selection) {
}
if (status == 0) {
if (player.getLevel() < exped.getMinLevel() && player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement
if (player.getLevel() < exped.getMinLevel() || player.getLevel() > exped.getMaxLevel()) { //Don't fit requirement, thanks Conrad
cm.sendOk("You do not meet the criteria to battle " + expedBoss + "!");
cm.dispose();
} else if (expedition == null) { //Start an expedition

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();
}
}
}