summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/db/item_db.txt64
-rw-r--r--world/map/npc/001-1/luca.txt6
-rw-r--r--world/map/npc/003-1/stranger.txt144
-rw-r--r--world/map/npc/009-2/nicholas.txt32
-rw-r--r--world/map/npc/009-2/peter.txt12
-rw-r--r--world/map/npc/018-2/caul.txt2
-rw-r--r--world/map/npc/018-2/miners.txt48
-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
-rw-r--r--world/map/npc/027-2/crying_child.txt2
-rw-r--r--world/map/npc/027-2/innkeeper.txt16
-rw-r--r--world/map/npc/items/warpTowels.txt40
13 files changed, 235 insertions, 235 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index a30a136d..fbd1e96e 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -321,23 +321,23 @@
806, ReedBundle, Reed Bundle, 3, 20, 10, 7, , , , , , 2, , , , , {}, {}
807, GrassSeed, Grass Seed, 3, 20, 10, 1, , , , , , 2, , , , , {}, {}
#ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
-808, GreyWarpTowel, Hitchhiker's Towel, 3, 1000, 500, 20, , , , , , , , , , , {}, {}
-809, WhiteWarpTowel, White Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useWhiteWarpTowel";}, {}
-810, RedWarpTowel, Red Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useRedWarpTowel";}, {}
-811, GreenWarpTowel, Green Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useGreenWarpTowel";}, {}
-812, BlueWarpTowel, Blue Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useBlueWarpTowel";}, {}
-813, YellowWarpTowel, Yellow Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useYellowWarpTowel";}, {}
-814, PurpleWarpTowel, Purple Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePurpleWarpTowel";}, {}
-815, OrangeWarpTowel, Orange Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useOrangeWarpTowel";}, {}
-816, PinkWarpTowel, Pink Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePinkWarpTowel";}, {}
-817, TealWarpTowel, Teal Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useTealWarpTowel";}, {}
-818, LimeWarpTowel, Lime Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useLimeWarpTowel";}, {}
-819, GemPowderWhite, Diamond Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
-820, GemPowderRed, Ruby Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
-821, GemPowderGreen, Emerald Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
-822, GemPowderBlue, Sapphire Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
-823, GemPowderYellow, Topaz Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
-824, GemPowderPurple, Amethyst Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
+808, HitchhikersTowel, Hitchhiker's Towel, 3, 1000, 500, 20, , , , , , , , , , , {}, {}
+809, WhiteHitchhikersTowel, White Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useWhiteWarpTowel";}, {}
+810, RedHitchhikersTowel, Red Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useRedWarpTowel";}, {}
+811, GreenHitchhikersTowel, Green Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useGreenWarpTowel";}, {}
+812, BlueHitchhikersTowel, Blue Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useBlueWarpTowel";}, {}
+813, YellowHitchhikersTowel, Yellow Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useYellowWarpTowel";}, {}
+814, PurpleHitchhikersTowel, Purple Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePurpleWarpTowel";}, {}
+815, OrangeHitchhikersTowel, Orange Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useOrangeWarpTowel";}, {}
+816, PinkHitchhikersTowel, Pink Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "usePinkWarpTowel";}, {}
+817, TealHitchhikersTowel, Teal Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useTealWarpTowel";}, {}
+818, LimeHitchhikersTowel, Lime Hitchhiker's Towel, 0, 1000, 500, 30, , , , , , 2, , , 0, , {callfunc "useLimeWarpTowel";}, {}
+819, DiamondPowder, Diamond Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
+820, RubyPowder, Ruby Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
+821, EmeraldPowder, Emerald Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
+822, SapphirePowder, Sapphire Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
+823, TopazPowder, Topaz Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
+824, AmethystPowder, Amethyst Powder, 3, 1000, 500, 5, , , , , , , , , , , {}, {}
825, TinyManaElixir, Tiny Mana Elixir, 0, 100, 10, 5, , , , , , 2, , , 0, , {itemheal 0, 25;}, {}
826, SmallManaElixir, Small Mana Elixir, 0, 200, 20, 10, , , , , , 2, , , 0, , {itemheal 0, 50;}, {}
827, MediumManaElixir, Medium Mana Elixir, 0, 400, 40, 15, , , , , , 2, , , 0, , {itemheal 0, 100;}, {}
@@ -664,21 +664,21 @@
// No new additions to the 3000s please. Add to the bottom of the < 1000s for regular entries and the 2000s for dyed entries.
4000, AngryScorpionStinger, Angry Scorpion Stinger, 3, 50, 25, 1, , , , , , , , , , , {}, {}
4001, Coal, Coal, 3, 250, 100, 20, , , , , , , , , , , {}, {}
-4002, GemRawWhite, Diamond, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
+4002, Diamond, Diamond, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
#ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
-4003, GemRawRed, Ruby, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
-4004, GemRawGreen, Emerald, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
-4005, GemRawBlue, Sapphire, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
-4006, GemRawYellow, Topaz, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
-4007, GemRawPurple, Amethyst, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
-4008, RingGemWhite, Diamond Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bVit, 1;}
-4009, RingGemRed, Ruby Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bStr, 1;}
-4010, RingGemGreen, Emerald Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bLuk, 1;}
-4011, RingGemBlue, Sapphire Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bInt, 1;}
-4012, RingGemYellow, Topaz Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bAgi, 1;}
-4013, RingGemPurple, Amethyst Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bDex, 1;}
-4014, RingSimple, Simple Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {}
-4015, IngotIron, Iron Ingot, 3, 500, 250, 200, , , , , , , , , , , {}, {}
+4003, Ruby, Ruby, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
+4004, Emerald, Emerald, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
+4005, Sapphire, Sapphire, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
+4006, Topaz, Topaz, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
+4007, Amethyst, Amethyst, 3, 5000, 2500, 20, , , , , , , , , , , {}, {}
+4008, DiamondRing, Diamond Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bVit, 1;}
+4009, RubyRing, Ruby Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bStr, 1;}
+4010, EmeraldRing, Emerald Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bLuk, 1;}
+4011, SapphireRing, Sapphire Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bInt, 1;}
+4012, TopazRing, Topaz Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bAgi, 1;}
+4013, AmethystRing, Amethyst Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {bonus bDex, 1;}
+4014, SimpleRing, Simple Ring, 5, 5000, 2500, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {}
+4015, IronIngot, Iron Ingot, 3, 500, 250, 200, , , , , , , , , , , {}, {}
4016, BanditHood, Bandit Hood, 3, 100, 50, 50, , , , , , , , , , , {}, {}
4017, RedPowder, Red Powder, 3, 3000, 5, 10, , , , , , 0, , , 0, , {}, {}
4018, YellowPowder, Yellow Powder, 3, 3000, 5, 10, , , , , , 0, , , 0, , {}, {}
@@ -693,7 +693,7 @@
4026, IceCube, Ice Cube, 3, 200, 100, 1, , , , , , , , , , , {}, {}
4027, YetiMask, Yeti Mask, 5, 6000, 3000, 10, , 4, , -10, 0, 2, 256, , 0, 0, {}, {}
4028, WizardHat, Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;}
-4029, DementiaPotion, Grimace of Dementia, 3, 20, 10, 10, , , , , , 2, , , 0, , {}, {}
+4029, GrimaceOfDementia, Grimace of Dementia, 3, 20, 10, 10, , , , , , 2, , , 0, , {}, {}
4030, BowlerHat, Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {}
4031, Monocle, Monocle, 5, 5000, 2500, 20, , 2, , 0, 0, 2, 256, , 0, 0, {}, {bonus bDex, 1; bonus bLuk, 1; bonus bCritical, 10;}
// No new additions to the 4000s please. Add to the bottom of the < 1000s for regular entries and the 2000s for dyed entries.
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index 758fd2d5..28c9a146 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
@@ -305,7 +305,7 @@ L_focus:
goto L_teachmore2;
L_unfocus:
- if (countitem("DementiaPotion") > 0) goto L_unfocus_menu;
+ if (countitem("GrimaceOfDementia") > 0) goto L_unfocus_menu;
if (MAGIG_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE) goto L_nopotion;
@@ -356,8 +356,8 @@ L_unfocus_menu:
set @menu, @menu - 1;
if (@skilllist_id[@menu] == 0) goto L_teachmore2;
- if (countitem("DementiaPotion") == 0) goto L_nopotion;
- delitem "DementiaPotion", 1;
+ if (countitem("GrimaceOfDementia") == 0) goto L_nopotion;
+ delitem "GrimaceOfDementia", 1;
unpoolskill @skilllist_id[@menu];
goto L_Close;
diff --git a/world/map/npc/003-1/stranger.txt b/world/map/npc/003-1/stranger.txt
index 31667b8c..d8e05cc2 100644
--- a/world/map/npc/003-1/stranger.txt
+++ b/world/map/npc/003-1/stranger.txt
@@ -29,9 +29,9 @@
goto L_Close;
L_Items:
- if (countitem("IngotIron") < @IRONINGOT) goto L_No_Item;
+ if (countitem("IronIngot") < @IRONINGOT) goto L_No_Item;
if (countitem("PinkAntenna") < @PINKANTENNA) goto L_No_Item;
- delitem "IngotIron", @IRONINGOT;
+ delitem "IronIngot", @IRONINGOT;
delitem "PinkAntenna", @PINKANTENNA;
getexp @EXP, 0;
set FLAGS, FLAGS | FLAG_TOWEL_HELPED;
@@ -225,7 +225,7 @@ L_Right_Answer_Hard:
mes "\"There you are! A towel is really the most important item for a hitchhiker to have.\"";
next;
mes "\"Please take this.\""; // no full inventory check, this is done before the game
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
set FLAGS, FLAGS | FLAG_TOWEL_COMPLETED;
next;
@@ -247,7 +247,7 @@ L_No_Event:
mes "\"And it really comes in handy that I have my towel with me. A towel is about the most massively useful thing an inte- ahm, a person can have.\"";
next;
mes "\"You can read more about that in my favourite book, 'The Hitchhiker's Guide to the Galaxy'.\"";
- if (countitem("GreyWarpTowel") > 0)
+ if (countitem("HitchhikersTowel") > 0)
menu
"Thanks for the advice.",-,
"I have my towel with me too.",L_Dye;
@@ -308,15 +308,15 @@ L_Red:
mes "[Stranger]";
mes "\"Ok, I'll need two bags of Ruby Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderRed") < 2) goto L_No_Powder;
- delitem "GemPowderRed", 2;
- delitem "GreyWarpTowel", 1;
+ if (countitem("RubyPowder") < 2) goto L_No_Powder;
+ delitem "RubyPowder", 2;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "RedWarpTowel", 1;
+ getitem "RedHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -327,15 +327,15 @@ L_Yellow:
mes "[Stranger]";
mes "\"Ok, I'll need two bags of Topaz Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderYellow") < 2) goto L_No_Powder;
- delitem "GemPowderYellow", 2;
- delitem "GreyWarpTowel", 1;
+ if (countitem("TopazPowder") < 2) goto L_No_Powder;
+ delitem "TopazPowder", 2;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "YellowWarpTowel", 1;
+ getitem "YellowHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -347,15 +347,15 @@ L_White:
mes "[Stranger]";
mes "\"Ok, I'll need two bags of Diamond Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderWhite") < 2) goto L_No_Powder;
- delitem "GemPowderWhite", 2;
- delitem "GreyWarpTowel", 1;
+ if (countitem("DiamondPowder") < 2) goto L_No_Powder;
+ delitem "DiamondPowder", 2;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "WhiteWarpTowel", 1;
+ getitem "WhiteHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -366,15 +366,15 @@ L_Blue:
mes "[Stranger]";
mes "\"Ok, I'll need two bags of Sapphire Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderBlue") < 2) goto L_No_Powder;
- delitem "GemPowderBlue", 2;
- delitem "GreyWarpTowel", 1;
+ if (countitem("SapphirePowder") < 2) goto L_No_Powder;
+ delitem "SapphirePowder", 2;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "BlueWarpTowel", 1;
+ getitem "BlueHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -385,15 +385,15 @@ L_Green:
mes "[Stranger]";
mes "\"Ok, I'll need two bags of Emerald Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderGreen") < 2) goto L_No_Powder;
- delitem "GemPowderGreen", 2;
- delitem "GreyWarpTowel", 1;
+ if (countitem("EmeraldPowder") < 2) goto L_No_Powder;
+ delitem "EmeraldPowder", 2;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "GreenWarpTowel", 1;
+ getitem "GreenHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -404,15 +404,15 @@ L_Purple:
mes "[Stranger]";
mes "\"Ok, I'll need two bags of Amethyst Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderPurple") < 2) goto L_No_Powder;
- delitem "GemPowderPurple", 2;
- delitem "GreyWarpTowel", 1;
+ if (countitem("AmethystPowder") < 2) goto L_No_Powder;
+ delitem "AmethystPowder", 2;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "PurpleWarpTowel", 1;
+ getitem "PurpleHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -423,17 +423,17 @@ L_Orange:
mes "[Stranger]";
mes "\"Ok, I'll need one bag of Ruby Powder, one bag of Topaz Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderRed") < 1) goto L_No_Powder;
- if (countitem("GemPowderYellow") < 1) goto L_No_Powder;
- delitem "GemPowderRed", 1;
- delitem "GemPowderYellow", 1;
- delitem "GreyWarpTowel", 1;
+ if (countitem("RubyPowder") < 1) goto L_No_Powder;
+ if (countitem("TopazPowder") < 1) goto L_No_Powder;
+ delitem "RubyPowder", 1;
+ delitem "TopazPowder", 1;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "OrangeWarpTowel", 1;
+ getitem "OrangeHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -444,17 +444,17 @@ L_Pink:
mes "[Stranger]";
mes "\"Ok, I'll need one bag of Ruby Powder, one bag of Diamond Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderRed") < 1) goto L_No_Powder;
- if (countitem("GemPowderWhite") < 1) goto L_No_Powder;
- delitem "GemPowderRed", 1;
- delitem "GemPowderWhite", 1;
- delitem "GreyWarpTowel", 1;
+ if (countitem("RubyPowder") < 1) goto L_No_Powder;
+ if (countitem("DiamondPowder") < 1) goto L_No_Powder;
+ delitem "RubyPowder", 1;
+ delitem "DiamondPowder", 1;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "PinkWarpTowel", 1;
+ getitem "PinkHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -465,17 +465,17 @@ L_Lime:
mes "[Stranger]";
mes "\"Ok, I'll need one bag of Emerald Powder, one bag of Topaz Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderGreen") < 1) goto L_No_Powder;
- if (countitem("GemPowderYellow") < 1) goto L_No_Powder;
- delitem "GemPowderGreen", 1;
- delitem "GemPowderYellow", 1;
- delitem "GreyWarpTowel", 1;
+ if (countitem("EmeraldPowder") < 1) goto L_No_Powder;
+ if (countitem("TopazPowder") < 1) goto L_No_Powder;
+ delitem "EmeraldPowder", 1;
+ delitem "TopazPowder", 1;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "LimeWarpTowel", 1;
+ getitem "LimeHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
@@ -486,17 +486,17 @@ L_Teal:
mes "[Stranger]";
mes "\"Ok, I'll need one bag of Emerald Powder, one bag of Sapphire Powder and a bottle of water for that.\"";
next;
- if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+ if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
getinventorylist;
- if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+ if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
if (countitem("BottleOfWater") < 1) goto L_No_Water;
- if (countitem("GemPowderGreen") < 1) goto L_No_Powder;
- if (countitem("GemPowderBlue") < 1) goto L_No_Powder;
- delitem "GemPowderGreen", 1;
- delitem "GemPowderBlue", 1;
- delitem "GreyWarpTowel", 1;
+ if (countitem("EmeraldPowder") < 1) goto L_No_Powder;
+ if (countitem("SapphirePowder") < 1) goto L_No_Powder;
+ delitem "EmeraldPowder", 1;
+ delitem "SapphirePowder", 1;
+ delitem "HitchhikersTowel", 1;
delitem "BottleOfWater", 1;
- getitem "TealWarpTowel", 1;
+ getitem "TealHitchhikersTowel", 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
next;
mes "[Stranger]";
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 043705dd..fbffd3e8 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -47,11 +47,11 @@ L_Check:
mes "[Nicholas]";
mes "\"Let me take a look at how much you have...\"";
next;
- if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) )
+ if ( (countitem("IronIngot")<3) || (countitem("Coal") < 6) )
goto L_NoItem;
- if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+ if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) )
goto L_StageA;
- if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+ if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) )
goto L_StageB;
goto L_StageC;
@@ -111,13 +111,13 @@ L_main_menu:
L_main_menu_post_setzer:
- if ( (countitem("IngotIron")<3) || (countitem("Coal") <6) )
+ if ( (countitem("IronIngot")<3) || (countitem("Coal") <6) )
goto L_no_more_helmets;
set @choice$[@choices_nr], "Knight's Helmet (3 Iron Ingots & 6 Coal).";
set @choice_idx[@choices_nr], @CHOICE_KNIGHT;
set @choices_nr, 1 + @choices_nr;
- if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+ if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) )
goto L_no_more_helmets;
set @choice$[@choices_nr], "Crusade Helmet (6 Iron Ingots & 12 Coal).";
set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
@@ -127,7 +127,7 @@ L_main_menu_post_setzer:
set @choice_idx[@choices_nr], @CHOICE_SHIELD;
set @choices_nr, 1 + @choices_nr;
- if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+ if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) )
goto L_no_more_helmets;
set @choice$[@choices_nr], "Warlord Helmet (9 Iron Ingots & 18 Coal).";
set @choice_idx[@choices_nr], @CHOICE_WARLORD;
@@ -182,39 +182,39 @@ L_NoMoney:
L_YesKnight:
if (zeny < 10000)
goto L_NoMoney;
- if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) )
+ if ( (countitem("IronIngot")<3) || (countitem("Coal") < 6) )
goto L_NoItem;
getinventorylist;
if (@inventorylist_count == 100)
goto L_TooMany;
set zeny, zeny - 10000;
- delitem "IngotIron", 3;
+ delitem "IronIngot", 3;
delitem "Coal", 6;
getitem "KnightsHelmet", 1;
goto L_Done;
L_YesCrusade:
if (zeny < 10000) goto L_NoMoney;
- if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+ if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) )
goto L_NoItem;
getinventorylist;
if (@inventorylist_count == 100)
goto L_TooMany;
set zeny, zeny-10000;
- delitem "IngotIron", 6;
+ delitem "IronIngot", 6;
delitem "Coal", 12;
getitem "CrusadeHelmet", 1;
goto L_Done;
L_YesWarlord:
if (zeny < 10000) goto L_NoMoney;
- if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+ if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) )
goto L_NoItem;
getinventorylist;
if (@inventorylist_count == 100)
goto L_TooMany;
set zeny, zeny-10000;
- delitem "IngotIron", 9;
+ delitem "IronIngot", 9;
delitem "Coal", 18;
getitem "WarlordHelmet", 1;
goto L_Done;
@@ -247,7 +247,7 @@ L_YesShield:
goto L_ShieldNoZeny;
if (countitem("InfantryHelmet") < 2)
goto L_ShieldNoInfantry;
- if (countitem("IngotIron") < 6)
+ if (countitem("IronIngot") < 6)
goto L_ShieldNoIngot;
if (countitem("Coal") < 12)
goto L_ShieldNoCoal;
@@ -262,7 +262,7 @@ L_YesShield:
delitem "InfantryHelmet", 1;
delitem "InfantryHelmet", 1;
delitem "LeatherPatch", 1;
- delitem "IngotIron", 6;
+ delitem "IronIngot", 6;
delitem "Coal", 12;
set zeny, zeny - 20000;
@@ -334,7 +334,7 @@ L_SetzerQuest:
"HOW much? Nevermind then!", L_Pass;
if (zeny < 50000)
goto L_SetzerNoZeny;
- if ( (countitem("IngotIron") < 3) || (countitem("Coal") < 6) )
+ if ( (countitem("IronIngot") < 3) || (countitem("Coal") < 6) )
goto L_SetzerNoIngot;
if (countitem("MonsterOilPotion") < 1)
goto L_SetzerNoMonsterOil;
@@ -345,7 +345,7 @@ L_SetzerQuest:
mes "[Nicholas]";
mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer. As you watch, it turns thinner and flatter. Finally he pours the monster oil over it, heats the metal up again and douses it in water.";
set zeny, zeny - 50000;
- delitem "IngotIron", 3;
+ delitem "IronIngot", 3;
delitem "Coal", 6;
delitem "MonsterOilPotion", 1;
delitem "ShortSword", 1;
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index 97fa219c..10186d3b 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -19,7 +19,7 @@
L_Peter_Chain_Mail:
if (zeny < 20000)
goto L_Peter_NotEnough_Zeny;
- if (countitem("IngotIron") < 5)
+ if (countitem("IronIngot") < 5)
goto L_Peter_NotEnough_Ingot;
if (countitem("Coal") < 10)
goto L_Peter_NotEnough_Coal;
@@ -27,7 +27,7 @@ L_Peter_Chain_Mail:
if (@inventorylist_count == 100)
goto L_Peter_TooMany;
set zeny, zeny - 20000;
- delitem "IngotIron", 5;
+ delitem "IronIngot", 5;
getitem "ChainmailShirt", 1;
mes "[Peter]";
mes "\"Here you go!\"";
@@ -36,7 +36,7 @@ L_Peter_Chain_Mail:
L_Peter_Light_Plate:
if (zeny < 50000)
goto L_Peter_NotEnough_Zeny;
- if (countitem("IngotIron") < 10)
+ if (countitem("IronIngot") < 10)
goto L_Peter_NotEnough_Ingot;
if (countitem("Coal") < 20)
goto L_Peter_NotEnough_Coal;
@@ -44,7 +44,7 @@ L_Peter_Light_Plate:
if (@inventorylist_count == 100)
goto L_Peter_TooMany;
set zeny, zeny - 50000;
- delitem "IngotIron", 10;
+ delitem "IronIngot", 10;
delitem "Coal", 20;
getitem "LightPlatemail", 1;
mes "[Peter]";
@@ -54,7 +54,7 @@ L_Peter_Light_Plate:
L_Peter_Warlord_Plate:
if (zeny < 100000)
goto L_Peter_NotEnough_Zeny;
- if (countitem("IngotIron") < 15)
+ if (countitem("IronIngot") < 15)
goto L_Peter_NotEnough_Ingot;
if (countitem("Coal") < 30)
goto L_Peter_NotEnough_Coal;
@@ -62,7 +62,7 @@ L_Peter_Warlord_Plate:
if (@inventorylist_count == 100)
goto L_Peter_TooMany;
set zeny, zeny - 100000;
- delitem "IngotIron", 15;
+ delitem "IronIngot", 15;
delitem "Coal", 30;
getitem "WarlordPlate", 1;
mes "[Peter]";
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 11197ef3..752be33e 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -963,7 +963,7 @@ L_usepearl:
set @finish_dempo, 1;
callsub L_check_explosion;
// ok now you really did it. Here is your potion:
- getitem "DementiaPotion",1;
+ getitem "GrimaceOfDementia",1;
mes "[Caul]";
mes "\"The potion is now ready. It seems as if it worked fine.\"";
diff --git a/world/map/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt
index 03be24c0..6a295675 100644
--- a/world/map/npc/018-2/miners.txt
+++ b/world/map/npc/018-2/miners.txt
@@ -50,42 +50,42 @@ L_Check_Gems:
set @c, 0;
L_Check_Diamond:
- if (countitem("GemRawWhite") < 1)
+ if (countitem("Diamond") < 1)
goto L_Check_Ruby;
set @menuitems$[@c], "A diamond.";
set @menuid[@c], 0;
set @c, @c + 1;
L_Check_Ruby:
- if (countitem("GemRawRed") < 1)
+ if (countitem("Ruby") < 1)
goto L_Check_Emerald;
set @menuitems$[@c], "A ruby.";
set @menuid[@c], 1;
set @c, @c + 1;
L_Check_Emerald:
- if (countitem("GemRawGreen") < 1)
+ if (countitem("Emerald") < 1)
goto L_Check_Sapphire;
set @menuitems$[@c], "An emerald.";
set @menuid[@c], 2;
set @c, @c + 1;
L_Check_Sapphire:
- if (countitem("GemRawBlue") < 1)
+ if (countitem("Sapphire") < 1)
goto L_Check_Topaz;
set @menuitems$[@c], "A sapphire.";
set @menuid[@c], 3;
set @c, @c + 1;
L_Check_Topaz:
- if (countitem("GemRawYellow") < 1)
+ if (countitem("Topaz") < 1)
goto L_Check_Amethyst;
set @menuitems$[@c], "A topaz.";
set @menuid[@c], 4;
set @c, @c + 1;
L_Check_Amethyst:
- if (countitem("GemRawPurple") < 1)
+ if (countitem("Amethyst") < 1)
goto L_Choose_Gem;
set @menuitems$[@c], "An amethyst.";
set @menuid[@c], 5;
@@ -106,17 +106,17 @@ L_Choose_Gem:
set @menu, @menu - 1;
if (@menu >= @c) close;
if (@menuid[@menu] == 0)
- set @gem$, "GemRawWhite";
+ set @gem$, "Diamond";
if (@menuid[@menu] == 1)
- set @gem$, "GemRawRed";
+ set @gem$, "Ruby";
if (@menuid[@menu] == 2)
- set @gem$, "GemRawGreen";
+ set @gem$, "Emerald";
if (@menuid[@menu] == 3)
- set @gem$, "GemRawBlue";
+ set @gem$, "Sapphire";
if (@menuid[@menu] == 4)
- set @gem$, "GemRawYellow";
+ set @gem$, "Topaz";
if (@menuid[@menu] == 5)
- set @gem$, "GemRawPurple";
+ set @gem$, "Amethyst";
if (@menuid[@menu] == 6)
goto L_abort;
@@ -127,18 +127,18 @@ L_Choose_Gem:
&& countitem(@gem$) > 1)
goto L_TooMany;
delitem @gem$, 1;
- if (@gem$ == "GemRawWhite")
- getitem "GemPowderWhite", @MIN_GEM_AMOUNT + rand(6) + rand(6);
- if (@gem$ == "GemRawRed")
- getitem "GemPowderRed", @MIN_GEM_AMOUNT + rand(6);
- if (@gem$ == "GemRawGreen")
- getitem "GemPowderGreen", @MIN_GEM_AMOUNT + rand(6);
- if (@gem$ == "GemRawBlue")
- getitem "GemPowderBlue", @MIN_GEM_AMOUNT + rand(6);
- if (@gem$ == "GemRawYellow")
- getitem "GemPowderYellow", @MIN_GEM_AMOUNT + rand(6);
- if (@gem$ == "GemRawPurple")
- getitem "GemPowderPurple", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "Diamond")
+ getitem "DiamondPowder", @MIN_GEM_AMOUNT + rand(6) + rand(6);
+ if (@gem$ == "Ruby")
+ getitem "RubyPowder", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "Emerald")
+ getitem "EmeraldPowder", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "Sapphire")
+ getitem "SapphirePowder", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "Topaz")
+ getitem "TopazPowder", @MIN_GEM_AMOUNT + rand(6);
+ if (@gem$ == "Amethyst")
+ getitem "AmethystPowder", @MIN_GEM_AMOUNT + rand(6);
mes "[Malek]";
mes "\"Here's your powder. Hope it's fine enough for you.\"";
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:
diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index 80cefcb3..4081f25f 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -159,7 +159,7 @@ L_return4:
getinventorylist;
if (@inventorylist_count == 100)
goto L_full;
- getitem "RingSimple", 1;
+ getitem "SimpleRing", 1;
set @state, 7;
callsub S_Update_Mask;
mes "\"I will tell my parents how great and helpful you are. Maybe they can even let you stay here at the inn for free!\"";
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index 769d0dfd..3b3af853 100644
--- a/world/map/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
@@ -297,27 +297,27 @@ L_Sorry:
mes "[Reid's Ghost]";
mes "\"Welcome back.\"";
if ((@lover == 4)
- && (countitem("GemRawWhite") >= @DIAMOND_AMOUNT)
- && (countitem("GemRawRed") >= @RUBY_AMOUNT)
+ && (countitem("Diamond") >= @DIAMOND_AMOUNT)
+ && (countitem("Ruby") >= @RUBY_AMOUNT)
&& (@husband == 5))
menu
"Savaric asked me to give you something.",L_Diamond,
"Hamond sent me to bring you this.",L_Ruby,
"Nevermind.",-;
- if (@lover == 4 && (countitem("GemRawWhite") >= @DIAMOND_AMOUNT))
+ if (@lover == 4 && (countitem("Diamond") >= @DIAMOND_AMOUNT))
menu
"Savaric asked me to give you something.",L_Diamond,
"Nevermind.",-;
- if (@husband == 5 && (countitem("GemRawRed") >= @RUBY_AMOUNT))
+ if (@husband == 5 && (countitem("Ruby") >= @RUBY_AMOUNT))
menu
"Hamond sent me to bring you this.",L_Ruby,
"Nevermind.",-;
goto L_Close;
L_Diamond:
- if (countitem("GemRawWhite") < @DIAMOND_AMOUNT)
+ if (countitem("Diamond") < @DIAMOND_AMOUNT)
goto L_Kidding;
- delitem "GemRawWhite", @DIAMOND_AMOUNT;
+ delitem "Diamond", @DIAMOND_AMOUNT;
mes "You explain how Savaric feels and what the diamonds mean.";
next;
mes "[Reid's Ghost]";
@@ -329,9 +329,9 @@ L_Diamond:
goto L_Close;
L_Ruby:
- if (countitem("GemRawRed") < @RUBY_AMOUNT)
+ if (countitem("Ruby") < @RUBY_AMOUNT)
goto L_Kidding;
- delitem "GemRawRed", @RUBY_AMOUNT;
+ delitem "Ruby", @RUBY_AMOUNT;
mes "You tell her about Hamonds feelings.";
next;
mes "[Reid's Ghost]";
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 6438c223..01fb5811 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -4,14 +4,14 @@ function|script|useWhiteWarpTowel|{
warp "020-1.gat",66,91; // Nivalis
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "WhiteWarpTowel", 1;
+ getitem "WhiteHitchhikersTowel", 1;
end;
}
function|script|useRedWarpTowel|{
@@ -20,14 +20,14 @@ function|script|useRedWarpTowel|{
warp "009-1.gat",51,40; // Hurnscald
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "RedWarpTowel", 1;
+ getitem "RedHitchhikersTowel", 1;
end; end;
}
function|script|useGreenWarpTowel|{
@@ -36,14 +36,14 @@ function|script|useGreenWarpTowel|{
warp "003-1.gat",35,25;
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "GreenWarpTowel", 1;
+ getitem "GreenHitchhikersTowel", 1;
end; end;
}
function|script|useBlueWarpTowel|{
@@ -52,14 +52,14 @@ function|script|useBlueWarpTowel|{
warp "003-1.gat",35,25;
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "BlueWarpTowel", 1;
+ getitem "BlueHitchhikersTowel", 1;
end; end;
}
function|script|useYellowWarpTowel|{
@@ -68,14 +68,14 @@ function|script|useYellowWarpTowel|{
warp "001-1.gat",40,71; // Tulimshar
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "YellowWarpTowel", 1;
+ getitem "YellowHitchhikersTowel", 1;
end; end;
}
function|script|usePurpleWarpTowel|{
@@ -84,14 +84,14 @@ function|script|usePurpleWarpTowel|{
warp "003-1.gat",35,25;
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "PurpleWarpTowel", 1;
+ getitem "PurpleHitchhikersTowel", 1;
end; end;
}
function|script|useOrangeWarpTowel|{
@@ -100,14 +100,14 @@ function|script|useOrangeWarpTowel|{
warp "027-1.gat",70,100; // Graveyard
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "OrangeWarpTowel", 1;
+ getitem "Orange", 1;
end; end;
}
function|script|usePinkWarpTowel|{
@@ -116,14 +116,14 @@ function|script|usePinkWarpTowel|{
warp "012-3.gat",448,66; // Terranite Cave
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "PinkWarpTowel", 1;
+ getitem "PinkHitchhikersTowel", 1;
end; end;
}
function|script|useTealWarpTowel|{
@@ -132,14 +132,14 @@ function|script|useTealWarpTowel|{
warp "003-1.gat",35,25;
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "TealWarpTowel", 1;
+ getitem "TealHitchhikersTowel", 1;
end; end;
}
function|script|useLimeWarpTowel|{
@@ -148,13 +148,13 @@ function|script|useLimeWarpTowel|{
warp "003-1.gat",35,25;
if (rand(15))
goto L_Keep;
- getitem "GreyWarpTowel", 1;
+ getitem "HitchhikersTowel", 1;
end;
L_Botcheck:
message strcharinfo(0), "You must be warped by a GM to leave the bot check area.";
L_Keep:
- getitem "LimeWarpTowel", 1;
+ getitem "LimeHitchhikersTowel", 1;
end; end;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 17:51:46 +0000