Exp gain & Chaos scroll fix + Diet's MK Overhaul
Fixed issues with negative experience being distributed to characters when killing a mob, rendering "Exp reset". Fixed chaos scroll behaving oddly. Refactored debuff expirations to manage one list with registered debuffs and expire times, thus lifting some load from the TimerManager. Added concurrency protection on how World deals with parties. Thanks to the DietStory dev team, fixed some issues with the MK maps.
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
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/>.
|
||||
*/
|
||||
/* Trash Can
|
||||
/* Trash Can 1
|
||||
|
||||
*/
|
||||
|
||||
|
||||
31
scripts/npc/1052110.js
Normal file
31
scripts/npc/1052110.js
Normal file
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
Trash Can 2
|
||||
Kerning Subway
|
||||
*/
|
||||
|
||||
var status;
|
||||
|
||||
function start() {
|
||||
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) {
|
||||
cm.sendOk("Just a trash can sitting there.");
|
||||
cm.dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
51
scripts/npc/1052111.js
Normal file
51
scripts/npc/1052111.js
Normal file
@@ -0,0 +1,51 @@
|
||||
/*
|
||||
Trash Can 3
|
||||
Kerning Subway
|
||||
*/
|
||||
|
||||
var status;
|
||||
|
||||
function start(){
|
||||
status = -1;
|
||||
action(1, 0, 0);
|
||||
}
|
||||
|
||||
function action(mode, type, selection){
|
||||
if(mode == -1){
|
||||
cm.dispose();
|
||||
return;
|
||||
}
|
||||
else{
|
||||
if(mode == 0 && status == 0){
|
||||
cm.dispose();
|
||||
return;
|
||||
}
|
||||
else if(mode == 0)
|
||||
status--;
|
||||
else
|
||||
status++;
|
||||
|
||||
|
||||
if(cm.isQuestStarted(20710)){
|
||||
if(!cm.hasItem(4032136)){
|
||||
cm.sendNext("You have found a #b#t4032136##k in the trash can! #i4032136#");
|
||||
|
||||
if(cm.canHold(4032136)){
|
||||
cm.gainItem(4032136, 1);
|
||||
}
|
||||
else{
|
||||
cm.sendOk("#i4032136# Not enough space in your ETC inventory.");
|
||||
}
|
||||
cm.dispose();
|
||||
}
|
||||
else{
|
||||
cm.sendOk("Just a trash can sitting there.");
|
||||
cm.dispose();
|
||||
}
|
||||
}
|
||||
else{
|
||||
cm.sendOk("Just a trash can sitting there.");
|
||||
cm.dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
31
scripts/npc/1052112.js
Normal file
31
scripts/npc/1052112.js
Normal file
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
Trash Can 4
|
||||
Kerning Subway
|
||||
*/
|
||||
|
||||
var status;
|
||||
|
||||
function start() {
|
||||
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) {
|
||||
cm.sendOk("Just a trash can sitting there.");
|
||||
cm.dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,19 +3,16 @@
|
||||
Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
|
||||
Matthias Butz <matze@odinms.de>
|
||||
Jan Christian Meyer <vimes@odinms.de>
|
||||
|
||||
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/>.
|
||||
*/
|
||||
@@ -24,28 +21,37 @@
|
||||
* @Author xXOsirisXx (BubblesDev)
|
||||
*/
|
||||
|
||||
status = -1;
|
||||
var status;
|
||||
|
||||
function start() {
|
||||
cm.sendNext("Okay, I'll now send you to the stable where my cows are. Watch out for the calves that drink all the milk. You don't want your effort to go to waste.");
|
||||
status = -1;
|
||||
action(1, 0, 0);
|
||||
}
|
||||
|
||||
function action(mode, type, selection){
|
||||
if (mode == -1 || !cm.isQuestStarted(2180)){
|
||||
cm.dispose();
|
||||
return;
|
||||
} else if (mode == 0)
|
||||
status--;
|
||||
else
|
||||
status++;
|
||||
if (status == 1)
|
||||
cm.sendNextPrev("It won't be easy to tell at a glance between a calf and a cow. Those calves may only be a month or two old, but they have already grown to the size of their mother. They even look alike...even I get confused at times! Good luck!");
|
||||
else if (status == 2) {
|
||||
if (cm.canHold(4031847)) {
|
||||
cm.gainItem(4031847, 1);
|
||||
cm.warp(912000100);
|
||||
} else
|
||||
cm.sendNextPrev("I can't give you the empty bottle because your inventory is full. Please make some room in your Etc window.");
|
||||
cm.dispose();
|
||||
}
|
||||
if (mode == -1 || !cm.isQuestStarted(2180)){
|
||||
cm.dispose();
|
||||
return;
|
||||
}
|
||||
else{
|
||||
if (mode == 1) status++;
|
||||
else status --;
|
||||
|
||||
if (status == 0){
|
||||
cm.sendNext("Okay, I'll now send you to the stable where my cows are. Watch out for the calves that drink all the milk. You don't want your effort to go to waste.");
|
||||
}
|
||||
else if (status == 1){
|
||||
cm.sendNextPrev("It won't be easy to tell at a glance between a calf and a cow. Those calves may only be a month or two old, but they have already grown to the size of their mother. They even look alike...even I get confused at times! Good luck!");
|
||||
}
|
||||
else if (status == 2){
|
||||
if (cm.canHold(4031847)){
|
||||
cm.gainItem(4031847, 1);
|
||||
cm.warp(912000100);
|
||||
}
|
||||
else{
|
||||
cm.sendOk("I can't give you the empty bottle because your inventory is full. Please make some room in your Etc window.");
|
||||
}
|
||||
cm.dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
40
scripts/npc/1300013.js
Normal file
40
scripts/npc/1300013.js
Normal file
@@ -0,0 +1,40 @@
|
||||
/*
|
||||
NPC: Blocked Entrance (portal?)
|
||||
MAP: Mushroom Castle - East Castle Tower (106021400)
|
||||
*/
|
||||
|
||||
var status;
|
||||
|
||||
function start(){
|
||||
status = -1;
|
||||
action(1, 0, 0);
|
||||
}
|
||||
|
||||
function action(mode, type, selection){
|
||||
if(mode == -1){
|
||||
cm.dispose();
|
||||
return;
|
||||
}
|
||||
else if(mode == 0 && status == 0){
|
||||
cm.dispose();
|
||||
return;
|
||||
}
|
||||
else if(mode == 0)
|
||||
status--;
|
||||
else
|
||||
status++;
|
||||
|
||||
|
||||
if(status == 0){
|
||||
cm.sendSimple("#L1#Enter to fight #bKing Pepe#k and #bYeti Brothers#k.#l");
|
||||
}
|
||||
else if(status == 1){
|
||||
if(selection == 1){
|
||||
var pepe = cm.getEventManager("KingPepeAndYetis");
|
||||
pepe.setProperty("player", cm.getPlayer().getName());
|
||||
pepe.startInstance(cm.getPlayer());
|
||||
cm.dispose();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,7 @@ function start() {
|
||||
}
|
||||
}
|
||||
else {
|
||||
cm.sendSimple("Only few adventurers, from a selected public, are eligible to protect the Watch Hog.");
|
||||
cm.sendOk("Only few adventurers, from a selected public, are eligible to protect the Watch Hog.");
|
||||
}
|
||||
|
||||
cm.dispose();
|
||||
|
||||
@@ -46,7 +46,7 @@ function action(mode, type, selection) {
|
||||
|
||||
var itemSet = new Array(2049100, 7777777);
|
||||
var matSet = new Array(new Array(4031203,4001356,4000136,4000082,4001126,4080100,4000021,4003005));
|
||||
var matQtySet = new Array(new Array(10,6,4,8,8,1,20,12));
|
||||
var matQtySet = new Array(new Array(100,60,40,80,80,8,200,120));
|
||||
var costSet = new Array(1200000, 7777777);
|
||||
item = itemSet[selectedItem];
|
||||
mats = matSet[selectedItem];
|
||||
|
||||
Reference in New Issue
Block a user