summaryrefslogtreecommitdiff
path: root/world/map/npc/021-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/021-2')
-rw-r--r--world/map/npc/021-2/heathin.txt2
-rw-r--r--world/map/npc/021-2/inya.txt98
-rw-r--r--world/map/npc/021-2/jhedia.txt4
3 files changed, 52 insertions, 52 deletions
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index e1684dd5..e83ab281 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -74,7 +74,7 @@ L_Heathin_Ring_Award:
set HEATHIN_QUEST, 2;
set zeny, zeny - 100000;
delitem "Coal", 50;
- getitem "RingSimple", 1;
+ getitem "SimpleRing", 1;
mes "[Heathin]";
mes "\"You have brought the Coal and gold pieces. This is most excellent! As promised, I have crafted a ring for you. Hopefully you will find it useful.\"";
next;
diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index 53d3cf0f..1213246c 100644
--- a/world/map/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
@@ -49,144 +49,144 @@ L_Inya_Add_RingGem:
L_Inya_Remove_Diamond:
if ( (zeny < 500000)
- | (countitem ("RingGemWhite") < 1) )
+ | (countitem ("DiamondRing") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 500000;
- delitem "RingGemWhite", 1;
- getitem "RingSimple", 1;
+ delitem "DiamondRing", 1;
+ getitem "SimpleRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Remove_Ruby:
if ( (zeny < 500000)
- | (countitem ("RingGemRed") < 1) )
+ | (countitem ("RubyRing") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 500000;
- delitem "RingGemRed", 1;
- getitem "RingSimple", 1;
+ delitem "RubyRing", 1;
+ getitem "SimpleRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Remove_Emerald:
if ( (zeny < 500000)
- | (countitem ("RingGemGreen") < 1) )
+ | (countitem ("EmeraldRing") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 500000;
- delitem "RingGemGreen", 1;
- getitem "RingSimple", 1;
+ delitem "EmeraldRing", 1;
+ getitem "SimpleRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Remove_Sapphire:
if ( (zeny < 500000)
- | (countitem ("RingGemBlue") < 1) )
+ | (countitem ("SapphireRing") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 500000;
- delitem "RingGemBlue", 1;
- getitem "RingSimple", 1;
+ delitem "SapphireRing", 1;
+ getitem "SimpleRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Remove_Topaz:
if ( (zeny < 500000)
- | (countitem ("RingGemYellow") < 1) )
+ | (countitem ("TopazRing") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 500000;
- delitem "RingGemYellow", 1;
- getitem "RingSimple", 1;
+ delitem "TopazRing", 1;
+ getitem "SimpleRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Remove_Amethyst:
if ( (zeny < 500000)
- | (countitem ("RingGemPurple") < 1) )
+ | (countitem ("AmethystRing") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 500000;
- delitem "RingGemPurple", 1;
- getitem "RingSimple", 1;
+ delitem "AmethystRing", 1;
+ getitem "SimpleRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Add_Diamond:
if ( (zeny < 1000000)
- | (countitem ("RingSimple") < 1)
- | (countitem ("GemRawWhite") < 1) )
+ | (countitem ("SimpleRing") < 1)
+ | (countitem ("Diamond") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 1000000;
- delitem "RingSimple", 1;
- delitem "GemRawWhite", 1;
- getitem "RingGemWhite", 1;
+ delitem "SimpleRing", 1;
+ delitem "Diamond", 1;
+ getitem "DiamondRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Add_Ruby:
if ( (zeny < 1000000)
- | (countitem ("RingSimple") < 1)
- | (countitem ("GemRawRed") < 1) )
+ | (countitem ("SimpleRing") < 1)
+ | (countitem ("Ruby") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 1000000;
- delitem "RingSimple", 1;
- delitem "GemRawRed", 1;
- getitem "RingGemRed", 1;
+ delitem "SimpleRing", 1;
+ delitem "Ruby", 1;
+ getitem "RubyRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Add_Emerald:
if ( (zeny < 1000000)
- | (countitem ("RingSimple") < 1)
- | (countitem ("GemRawGreen") < 1) )
+ | (countitem ("SimpleRing") < 1)
+ | (countitem ("Emerald") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 1000000;
- delitem "RingSimple", 1;
- delitem "GemRawGreen", 1;
- getitem "RingGemGreen", 1;
+ delitem "SimpleRing", 1;
+ delitem "Emerald", 1;
+ getitem "EmeraldRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Add_Sapphire:
if ( (zeny < 1000000)
- | (countitem ("RingSimple") < 1)
- | (countitem ("GemRawBlue") < 1) )
+ | (countitem ("SimpleRing") < 1)
+ | (countitem ("Sapphire") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 1000000;
- delitem "RingSimple", 1;
- delitem "GemRawBlue", 1;
- getitem "RingGemBlue", 1;
+ delitem "SimpleRing", 1;
+ delitem "Sapphire", 1;
+ getitem "SapphireRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Add_Topaz:
if ( (zeny < 1000000)
- | (countitem ("RingSimple") < 1)
- | (countitem ("GemRawYellow") < 1) )
+ | (countitem ("SimpleRing") < 1)
+ | (countitem ("Topaz") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 1000000;
- delitem "RingSimple", 1;
- delitem "GemRawYellow", 1;
- getitem "RingGemYellow", 1;
+ delitem "SimpleRing", 1;
+ delitem "Topaz", 1;
+ getitem "TopazRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
L_Inya_Add_Amethyst:
if ( (zeny < 1000000)
- | (countitem ("RingSimple") < 1)
- | (countitem ("GemRawPurple") < 1) )
+ | (countitem ("SimpleRing") < 1)
+ | (countitem ("Amethyst") < 1) )
goto L_Inya_Not_Enough;
set zeny, zeny - 1000000;
- delitem "RingSimple", 1;
- delitem "GemRawPurple", 1;
- getitem "RingGemPurple", 1;
+ delitem "SimpleRing", 1;
+ delitem "Amethyst", 1;
+ getitem "AmethystRing", 1;
mes "[Inya]";
mes "\"Here you go.\"";
close;
@@ -200,4 +200,4 @@ L_Inya_Not_Enough:
mes "[Inya]";
mes "\"I am sorry, you simply do not seem to have the necessary items for me to help you. Please come back when you do, and I would be more than happy to help you out.\"";
close;
-} \ No newline at end of file
+}
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index 102c8598..9df2bab0 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -24,14 +24,14 @@
goto L_Jhedia_NotEnough_Zeny;
getinventorylist;
if (@inventorylist_count == 100
- && countitem("IngotIron") == 0
+ && countitem("IronIngot") == 0
&& countitem("IronOre") > @ingot_count * @Iron_Ore_Per
| countitem("Coal") > @ingot_count * @Coal_Per)
goto L_Jhedia_NotEnoughSlots;
set zeny, zeny - @Zeny_cost;
delitem "IronOre", @ingot_count * @Iron_Ore_Per;
delitem "Coal", @ingot_count * @Coal_Per;
- getitem "IngotIron", @ingot_count;
+ getitem "IronIngot", @ingot_count;
close;
L_Jhedia_Bye:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 02:20:34 +0000