Mob banish on touch + GMS-like cosmetics + Clear missing names

Fixed erroneous clean slate scroll block on equipments having certain properties.
Implemented a log for bought cash items from Cash Shop.
Implemented mob's player banish by touch (e. g. used by mobs from the Hypnotize quest).
Thoroughly revised stylist/surgeon NPCs, adding several missing GMS-like cosmetic contents.
Thoroughly revised String.wz names having missing item content throughout the WZ files.
Revised missing name info for several faces throughout the WZ files.
Solved a possible deadlock case related with a player vision's spawn object method.
Fixed an issue with "Movement allowed only within account" items being given as "Untradeable" by NPCs.

Happy Holidays and Great New Year everyone!!!
This commit is contained in:
ronancpl
2018-12-22 00:12:13 -02:00
parent a2b8f22e66
commit dc73cb00de
184 changed files with 12897 additions and 3647 deletions

View File

@@ -28,6 +28,22 @@ var regprice = 1000000;
var vipprice = 1000000;
var colors = Array();
function pushIfItemExists(array, itemid) {
if ((itemid = cm.getCosmeticItem(itemid)) != -1 && !cm.isCosmeticEquipped(itemid)) {
array.push(itemid);
}
}
function pushIfItemsExists(array, itemidList) {
for (var i = 0; i < itemidList.length; i++) {
var itemid = itemidList[i];
if ((itemid = cm.getCosmeticItem(itemid)) != -1 && !cm.isCosmeticEquipped(itemid)) {
array.push(itemid);
}
}
}
function start() {
status = -1;
action(1, 0, 0);
@@ -46,7 +62,7 @@ function action(mode, type, selection) {
else
status--;
if (status == 0) {
cm.sendSimple("Hi, there~! I'm Dr.Roberts, in charge of the cosmetic lenses here at the Amoria Plastic Surgery Shop! With #b#t5152025##k or #b#t5152026##k, you can let us take care of the rest and have the kind of beautiful look you've always craved~! Remember, the first thing everyone notices about you is the eyes, and we can help you find the cosmetic lens that most fits you! Now, what would you like to use?\r\n#L1#Cosmetic Lenses: #i5152025##t5152025##l\r\n#L2#Cosmetic Lenses: #i5152026##t5152026##l");
cm.sendSimple("Hi, there~! I'm Dr.Roberts, in charge of the cosmetic lenses here at the Amoria Plastic Surgery Shop! With #b#t5152025##k or #b#t5152026##k, you can let us take care of the rest and have the kind of beautiful look you've always craved~! Remember, the first thing everyone notices about you is the eyes, and we can help you find the cosmetic lens that most fits you! Now, what would you like to use?\r\n#L1#Cosmetic Lenses: #i5152025##t5152025##l\r\n#L2#Cosmetic Lenses: #i5152026##t5152026##l\r\n#L3#One-time Cosmetic Lenses: #i5152106# (any color)#l");
} else if (status == 1) {
if (selection == 1) {
beauty = 1;
@@ -57,7 +73,7 @@ function action(mode, type, selection) {
var current = cm.getPlayer().getFace() % 100 + 21000;
}
colors = Array();
colors = Array(current , current + 100, current + 200, current + 300, current +400, current + 500, current + 600, current + 700);
pushIfItemsExists(colors, [current , current + 100, current + 300, current +400, current + 500, current + 700]);
cm.sendYesNo("If you use the regular coupon, you'll be awarded a random pair of cosmetic lenses. Are you going to use a #b#t5152025##k and really make the change to your eyes?");
} else if (selection == 2) {
beauty = 2;
@@ -68,8 +84,33 @@ function action(mode, type, selection) {
var current = cm.getPlayer().getFace() % 100 + 21000;
}
colors = Array();
colors = Array(current , current + 100, current + 200, current + 300, current +400, current + 500, current + 600, current + 700);
pushIfItemsExists(colors, [current , current + 100, current + 300, current +400, current + 500, current + 700]);
cm.sendStyle("With our specialized machine, you can see yourself after the treatment in advance. What kind of lens would you like to wear? Choose the style of your liking.", colors);
} else if (selection == 3) {
beauty = 3;
if (cm.getPlayer().getGender() == 0) {
var current = cm.getPlayer().getFace()
% 100 + 20000;
}
if (cm.getPlayer().getGender() == 1) {
var current = cm.getPlayer().getFace()
% 100 + 21000;
}
colors = Array();
for (var i = 0; i < 8; i++) {
if (cm.haveItem(5152100 + i)) {
pushIfItemExists(colors, current + 100 * i);
}
}
if (colors.length == 0) {
cm.sendOk("You don't have any One-Time Cosmetic Lens to use.");
cm.dispose();
return;
}
cm.sendStyle("What kind of lens would you like to wear? Please choose the style of your liking.", colors);
}
}
else if (status == 2){
@@ -82,8 +123,7 @@ function action(mode, type, selection) {
cm.sendOk("I'm sorry, but I don't think you have our cosmetic lens coupon with you right now. Without the coupon, I'm afraid I can't do it for you..");
cm.dispose();
}
}
if (beauty == 2){
} else if (beauty == 2){
if (cm.haveItem(5152026)){
cm.gainItem(5152026, -1);
cm.setFace(colors[selection]);
@@ -92,8 +132,17 @@ function action(mode, type, selection) {
cm.sendOk("I'm sorry, but I don't think you have our cosmetic lens coupon with you right now. Without the coupon, I'm afraid I can't do it for you..");
cm.dispose();
}
}
if (beauty == 0){
} else if (beauty == 3){
var color = (colors[selection] / 100) % 100 | 0;
if (cm.haveItem(5152100 + color)){
cm.gainItem(5152100 + color, -1);
cm.setFace(colors[selection]);
cm.sendOk("Enjoy your new and improved cosmetic lenses!");
} else {
cm.sendOk("I'm sorry, but I don't think you have our cosmetic lens coupon with you right now. Without the coupon, I'm afraid I can't do it for you..");
}
} else if (beauty == 0){
if (selection == 0 && cm.getMeso() >= regprice) {
cm.gainMeso(-regprice);
cm.gainItem(5152025, 1);