summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/003-5/jeweler.txt8
-rw-r--r--npc/functions/clientversion.txt8
2 files changed, 12 insertions, 4 deletions
diff --git a/npc/003-5/jeweler.txt b/npc/003-5/jeweler.txt
index a1b2b9dd9..75f7109a1 100644
--- a/npc/003-5/jeweler.txt
+++ b/npc/003-5/jeweler.txt
@@ -39,11 +39,11 @@ L_Craft:
mesn l("Inya, the Jeweler");
mesq l("Of course, I actually have two options:");
mes l("- 5 @@, with 1200 GP, for a @@.", getitemlink(GoldPieces), getitemlink(GoldenRing));
- mes l("- 5 @@, with 1200 GP, for a @@.", getitemlink(SilverIngot), getitemlink(SilverRing)); // TODO
+ mes l("- %d %s with %d GP, for a %s.", 2, getitemlink(SilverIngot), 1200, getitemlink(SilverRing)); // TODO
next;
menu
rif(countitem(GoldPieces) >= 5 && Zeny >= 1200, l("Yes, deal. Gimme the gold ring.")), -,
- rif(countitem(SilverIngot) >= 5 && Zeny >= 1200, l("Yes, deal. Gimme the silver ring.")), -,
+ rif(countitem(SilverIngot) >= 2 && Zeny >= 1200, l("Yes, deal. Gimme the silver ring.")), -,
l("...I'll be back later."), L_Close;
switch (@menu) {
@@ -56,8 +56,8 @@ L_Craft:
break;
case 2:
inventoryplace SilverRing, 1;
- delitem SilverIngot, 5; // TODO
- Zeny=Zeny-1200;
+ delitem SilverIngot, 2; // TODO
+ Zeny-=1200;
getitem SilverRing, 1;
getexp 50, 15;
break;
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index c206a24a4..9d9cdb164 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -1103,6 +1103,14 @@ function script clientupdater {
}
#UPDATE=1670633500;
}
+ // Glados-2 disk crash
+ // sáb 10 dez 2022 20:27:47 -03
+ if (UPDATE < 1670714867) {
+ UPDATE=1670714867;
+ if (countitem(SilverRing)) {
+ getitem SilverIngot, 3*countitem(SilverRing);
+ }
+ }
// :// End of Regular Update System
////////////////////////////////////