From 79ab28a52e610ba6b84f18b596c50da3d23bb1f5 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 11 Aug 2022 16:55:40 +0200 Subject: [PATCH 1/3] Break up Orbis lens NPC script into multiple functions --- scripts/npc/9200101.js | 205 +++++++++++++++++++++-------------------- 1 file changed, 107 insertions(+), 98 deletions(-) diff --git a/scripts/npc/9200101.js b/scripts/npc/9200101.js index b46dad66ec..a95eb32d90 100644 --- a/scripts/npc/9200101.js +++ b/scripts/npc/9200101.js @@ -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,124 @@ 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().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); +} + +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().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++) { + 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() { + 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 { + sendLackingCoupon() + } +} + +function selectedVipStyle(selection) { + if (cm.haveItem(5152014)) { + cm.gainItem(5152014, -1); + cm.setFace(colors[selection]); + cm.sendOk("Enjoy your new and improved cosmetic lenses!"); + } else { + sendLackingCoupon() + } +} + +function selectedOneTimeStyle(selection) { + 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 { + 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.."); +} From ae7b832e00b73170c60c0339f308852c4404195a Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 11 Aug 2022 20:20:45 +0200 Subject: [PATCH 2/3] Fix Orbis one-time lens coupon for female --- scripts/npc/9200101.js | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/scripts/npc/9200101.js b/scripts/npc/9200101.js index a95eb32d90..22ea138e7e 100644 --- a/scripts/npc/9200101.js +++ b/scripts/npc/9200101.js @@ -79,12 +79,12 @@ function selectedRegularCoupon() { } function selectedVipCoupon() { - if (cm.getPlayer().getGender() == 0) { + if (cm.getPlayer().isMale()) { var current = cm.getPlayer().getFace() % 100 + 20000; - } - if (cm.getPlayer().getGender() == 1) { + } 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); @@ -101,10 +101,9 @@ function pushIfItemsExists(array, itemidList) { } function selectedOneTimeCoupon() { - if (cm.getPlayer().getGender() == 0) { + if (cm.getPlayer().isMale()) { var current = cm.getPlayer().getFace() % 100 + 20000; - } - if (cm.getPlayer().getGender() == 1) { + } else { var current = cm.getPlayer().getFace() % 100 + 21000; } @@ -132,8 +131,9 @@ function pushIfItemExists(array, itemid) { } function acceptedRegularCoupon() { - if (cm.haveItem(5152011)) { - cm.gainItem(5152011, -1); + 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 { @@ -142,9 +142,11 @@ function acceptedRegularCoupon() { } function selectedVipStyle(selection) { - if (cm.haveItem(5152014)) { - cm.gainItem(5152014, -1); - cm.setFace(colors[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() @@ -152,11 +154,13 @@ function selectedVipStyle(selection) { } function selectedOneTimeStyle(selection) { - var color = (colors[selection] / 100) % 100 | 0; + const selectedFace = colors[selection] + const color = Math.floor(selectedFace / 100) % 10; - if (cm.haveItem(5152100 + color)) { - cm.gainItem(5152100 + color, -1); - cm.setFace(colors[selection]); + 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() From 6ea4e3cfc118885f2518b809ddca1496c40a8b36 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 11 Aug 2022 21:14:26 +0200 Subject: [PATCH 3/3] Fix one-time lens coupon for female Last commit fixed Orbis, this one fixes: Henesys, Showa, NLC, Mu Lung, Ludibrium, Singapore, Amoria, Ariant --- scripts/npc/2090103.js | 2 +- scripts/npc/2100008.js | 2 +- scripts/npc/9120102.js | 2 +- scripts/npc/9200100.js | 2 +- scripts/npc/9200102.js | 2 +- scripts/npc/9201017.js | 2 +- scripts/npc/9201062.js | 2 +- scripts/npc/9270026.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/npc/2090103.js b/scripts/npc/2090103.js index 6182892ba7..46b0cbb0f8 100644 --- a/scripts/npc/2090103.js +++ b/scripts/npc/2090103.js @@ -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); diff --git a/scripts/npc/2100008.js b/scripts/npc/2100008.js index 3f7dc3337e..5f68b5c40b 100644 --- a/scripts/npc/2100008.js +++ b/scripts/npc/2100008.js @@ -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); diff --git a/scripts/npc/9120102.js b/scripts/npc/9120102.js index 453ee00f49..1c9fc2e7b9 100644 --- a/scripts/npc/9120102.js +++ b/scripts/npc/9120102.js @@ -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); diff --git a/scripts/npc/9200100.js b/scripts/npc/9200100.js index 9c36972468..d4297bd9f3 100644 --- a/scripts/npc/9200100.js +++ b/scripts/npc/9200100.js @@ -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); diff --git a/scripts/npc/9200102.js b/scripts/npc/9200102.js index 22466a2baf..8d9d4fe55e 100644 --- a/scripts/npc/9200102.js +++ b/scripts/npc/9200102.js @@ -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); diff --git a/scripts/npc/9201017.js b/scripts/npc/9201017.js index 42a7b387bf..2854aa417a 100644 --- a/scripts/npc/9201017.js +++ b/scripts/npc/9201017.js @@ -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); diff --git a/scripts/npc/9201062.js b/scripts/npc/9201062.js index 436eb4120c..2d709724d2 100644 --- a/scripts/npc/9201062.js +++ b/scripts/npc/9201062.js @@ -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); diff --git a/scripts/npc/9270026.js b/scripts/npc/9270026.js index 04adaba6e5..f5a0be1fc0 100644 --- a/scripts/npc/9270026.js +++ b/scripts/npc/9270026.js @@ -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);