Merge pull request #95 from P0nk/bug-88-cosmetic-lens

Fix one-time cosmetic lens coupon not working for female characters
This commit is contained in:
Ponk
2022-08-11 21:17:06 +02:00
committed by GitHub
9 changed files with 119 additions and 106 deletions

View File

@@ -138,7 +138,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..");
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);

View File

@@ -125,7 +125,7 @@ function action(mode, type, selection) {
cm.sendOk("Hmm ... it looks like you don't have the coupon specifically for this place. Sorry to say this, but without the coupon, there's no plastic surgery for you...");
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);

View File

@@ -144,7 +144,7 @@ function action(mode, type, selection) {
cm.sendOk("Hmm ... it looks like you don't have the coupon specifically for this place. Sorry to say this, but without the coupon, there's no plastic surgery for you...");
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);

View File

@@ -130,7 +130,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..");
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);

View File

@@ -24,26 +24,8 @@
*/
var status = 0;
var beauty = 0;
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);
@@ -63,97 +45,128 @@ function action(mode, type, selection) {
} else if (status == 1) {
if (selection == 1) {
beauty = 1;
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();
pushIfItemsExists(colors, [current + 100, current + 300, current + 400, 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#t5152011##k and really make the change to your eyes?");
selectedRegularCoupon()
} else if (selection == 2) {
beauty = 2;
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();
pushIfItemsExists(colors, [current + 100, current + 300, current + 400, current + 700]);
cm.sendStyle("With our new computer program, you can see yourself after the treatment in advance. What kind of lens would you like to wear? Please choose the style of your liking.", colors);
selectedVipCoupon()
} 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);
selectedOneTimeCoupon()
}
} else if (status == 2) {
cm.dispose();
if (beauty == 1) {
if (cm.haveItem(5152011)) {
cm.gainItem(5152011, -1);
cm.setFace(colors[Math.floor(Math.random() * colors.length)]);
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..");
}
acceptedRegularCoupon()
} else if (beauty == 2) {
if (cm.haveItem(5152014)) {
cm.gainItem(5152014, -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..");
}
selectedVipStyle(selection)
} 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(5152011, 1);
cm.sendOk("Enjoy!");
} else if (selection == 1 && cm.getMeso() >= vipprice) {
cm.gainMeso(-vipprice);
cm.gainItem(5152014, 1);
cm.sendOk("Enjoy!");
} else {
cm.sendOk("You don't have enough mesos to buy a coupon!");
}
selectedOneTimeStyle(selection)
}
}
}
}
function selectedRegularCoupon() {
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();
pushIfItemsExists(colors, [current + 100, current + 300, current + 400, 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#t5152011##k and really make the change to your eyes?");
}
function selectedVipCoupon() {
if (cm.getPlayer().isMale()) {
var current = cm.getPlayer().getFace() % 100 + 20000;
} else {
var current = cm.getPlayer().getFace() % 100 + 21000;
}
colors = Array();
pushIfItemsExists(colors, [current + 100, current + 300, current + 400, current + 700]);
cm.sendStyle("With our new computer program, you can see yourself after the treatment in advance. What kind of lens would you like to wear? Please choose the style of your liking.", colors);
}
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 selectedOneTimeCoupon() {
if (cm.getPlayer().isMale()) {
var current = cm.getPlayer().getFace() % 100 + 20000;
} else {
var current = cm.getPlayer().getFace() % 100 + 21000;
}
colors = Array();
for (var i = 0; i < 8; i++) {
const oneTimeCouponId = 5152100 + i
if (cm.haveItem(oneTimeCouponId)) {
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);
}
function pushIfItemExists(array, itemid) {
if ((itemid = cm.getCosmeticItem(itemid)) != -1 && !cm.isCosmeticEquipped(itemid)) {
array.push(itemid);
}
}
function acceptedRegularCoupon() {
const regularCouponItemId = 5152011
if (cm.haveItem(regularCouponItemId)) {
cm.gainItem(regularCouponItemId, -1);
cm.setFace(colors[Math.floor(Math.random() * colors.length)]);
cm.sendOk("Enjoy your new and improved cosmetic lenses!");
} else {
sendLackingCoupon()
}
}
function selectedVipStyle(selection) {
const vipCouponItemId = 5152014
if (cm.haveItem(vipCouponItemId)) {
cm.gainItem(vipCouponItemId, -1);
const selectedFace = colors[selection]
cm.setFace(selectedFace);
cm.sendOk("Enjoy your new and improved cosmetic lenses!");
} else {
sendLackingCoupon()
}
}
function selectedOneTimeStyle(selection) {
const selectedFace = colors[selection]
const color = Math.floor(selectedFace / 100) % 10;
const oneTimeCouponItemId = 5152100 + color
if (cm.haveItem(oneTimeCouponItemId)) {
cm.gainItem(oneTimeCouponItemId, -1);
cm.setFace(selectedFace);
cm.sendOk("Enjoy your new and improved cosmetic lenses!");
} else {
sendLackingCoupon()
}
}
function sendLackingCoupon() {
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..");
}

View File

@@ -131,7 +131,7 @@ function action(mode, type, selection) {
cm.dispose();
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);

View File

@@ -129,7 +129,7 @@ function action(mode, type, selection) {
cm.dispose();
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);

View File

@@ -107,7 +107,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..");
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);

View File

@@ -106,7 +106,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..");
}
} else if (beauty == 3) {
var color = (colors[selection] / 100) % 100 | 0;
var color = (colors[selection] / 100) % 10 | 0;
if (cm.haveItem(5152100 + color)) {
cm.gainItem(5152100 + color, -1);