summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/001-1/rewards.txt6
-rw-r--r--npc/002-1/alige.txt16
-rw-r--r--npc/003-1/ishi.txt2
-rw-r--r--npc/003-1/shop.txt4
-rw-r--r--npc/003-6/cyndala.txt8
-rw-r--r--npc/009-1/dangrostra.txt4
6 files changed, 20 insertions, 20 deletions
diff --git a/npc/001-1/rewards.txt b/npc/001-1/rewards.txt
index ad716bebe..77afb137f 100644
--- a/npc/001-1/rewards.txt
+++ b/npc/001-1/rewards.txt
@@ -47,9 +47,9 @@ OnInit:
sellitem WoodenSword, 100;
// Temporary, but later may sell rare dyes (eg. golden?)
- sellitem RedCottonDye, 50;
- sellitem GreenCottonDye, 50;
- sellitem BlueCottonDye, 50;
+ sellitem RedDye, 50;
+ sellitem GreenDye, 50;
+ sellitem BlueDye, 50;
// Consumables
sellitem ElixirOfLife,35;
diff --git a/npc/002-1/alige.txt b/npc/002-1/alige.txt
index fc6351b98..f9a91fe0a 100644
--- a/npc/002-1/alige.txt
+++ b/npc/002-1/alige.txt
@@ -59,8 +59,8 @@ L_GoGo:
mes l("* @@/8 @@", countitem(BottleOfTonoriWater), getitemlink(BottleOfTonoriWater));
mes l("* @@/6 @@", countitem(HastePotion), getitemlink(HastePotion));
mes l("* @@/6 @@", countitem(StrengthPotion), getitemlink(StrengthPotion));
- mes l("* @@/2 @@", countitem(YellowCottonDye), getitemlink(YellowCottonDye));
- mes l("* @@/2 @@", countitem(BlueCottonDye), getitemlink(BlueCottonDye));
+ mes l("* @@/2 @@", countitem(YellowDye), getitemlink(YellowDye));
+ mes l("* @@/2 @@", countitem(BlueDye), getitemlink(BlueDye));
mes l("* @@/7.500 GP", Zeny);
next;
// Temporary item. This four leaf amulet can be evolved: Bromenal < Iron < Golden < Crozenite
@@ -114,8 +114,8 @@ L_Remember:
mes l("* @@/8 @@", countitem(BottleOfTonoriWater), getitemlink(BottleOfTonoriWater));
mes l("* @@/6 @@", countitem(HastePotion), getitemlink(HastePotion));
mes l("* @@/6 @@", countitem(StrengthPotion), getitemlink(StrengthPotion));
- mes l("* @@/2 @@", countitem(YellowCottonDye), getitemlink(YellowCottonDye));
- mes l("* @@/2 @@", countitem(BlueCottonDye), getitemlink(BlueCottonDye));
+ mes l("* @@/2 @@", countitem(YellowDye), getitemlink(YellowDye));
+ mes l("* @@/2 @@", countitem(BlueDye), getitemlink(BlueDye));
mes l("* @@/7.500 GP", Zeny);
next;
// Temporary item. This four leaf amulet can be evolved: Bromenal < Iron < Golden < Crozenite
@@ -131,8 +131,8 @@ L_Check:
countitem(BottleOfTonoriWater) < 8 ||
countitem(HastePotion) < 6 ||
countitem(StrengthPotion) < 6 ||
- countitem(YellowCottonDye) < 2 ||
- countitem(BlueCottonDye) < 2)
+ countitem(YellowDye) < 2 ||
+ countitem(BlueDye) < 2)
goto L_Missing;
if (Zeny < 7500) goto L_Poor;
@@ -144,8 +144,8 @@ L_Check:
delitem BottleOfTonoriWater, 8;
delitem HastePotion, 6;
delitem StrengthPotion, 6;
- delitem YellowCottonDye, 2;
- delitem BlueCottonDye, 2;
+ delitem YellowDye, 2;
+ delitem BlueDye, 2;
Zeny = Zeny - 7500;
getitem CrozeniteFourLeafAmulet, 1;
getexp 2200, 50;
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index a8a1de1c1..fafedbf7b 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -33,7 +33,7 @@
"RedApple","Beer","Candy","Orange","ChocolateBar","BugLeg","CoinBag",
"Coal","SnakeSkin","CottonCloth","GrassSeeds","HardSpike","CobaltHerb","GambogeHerb",
"MauveHerb","IronOre","MaggotSlime","RawLog","ScorpionStinger","SilkCocoon","TreasureKey",
- "FluffyFur","EmptyBottle","RustyKnife","Grenade","Coral","PiouLegs","Cheese","SnakeEgg","RoastedMaggot","BlueCottonDye";
+ "FluffyFur","EmptyBottle","RustyKnife","Grenade","Coral","PiouLegs","Cheese","SnakeEgg","RoastedMaggot","BlueDye";
setarray @Rares$, "BrimmedHat", 5, "IronIngot", 10, "BronzeGift", 10;
mesn l("Ishi, the Rewards Master");
diff --git a/npc/003-1/shop.txt b/npc/003-1/shop.txt
index 37eb8a179..b6fd283d3 100644
--- a/npc/003-1/shop.txt
+++ b/npc/003-1/shop.txt
@@ -7,7 +7,7 @@
OnInit:
tradertype(NST_MARKET);
- sellitem YellowCottonDye, -1, 2;
+ sellitem YellowDye, -1, 2;
sellitem Knife, -1, 5;
sellitem Arrow, -1, 30000;
sellitem DesertHat, -1, 8;
@@ -24,7 +24,7 @@ OnClock0621:
OnClock1210:
OnClock1757:
OnClock0000:
- restoreshopitem YellowCottonDye, -1, 2;
+ restoreshopitem YellowDye, -1, 2;
restoreshopitem Knife, -1, 5;
restoreshopitem Arrow, -1, 30000;
restoreshopitem DesertHat, -1, 8;
diff --git a/npc/003-6/cyndala.txt b/npc/003-6/cyndala.txt
index d4410df3a..8569c4975 100644
--- a/npc/003-6/cyndala.txt
+++ b/npc/003-6/cyndala.txt
@@ -17,7 +17,7 @@
l("Seek a colorant for that material: Cotton, cashmere, leather, Lazurite..."),
l("Once you have the appropriate colorant for the item, ##bdrag the colorant##b to the material."),
l("Example:"),
- l("Drag and drop a @@ in a @@, and you will obtain a @@.", getitemlink(RedCottonDye), getitemlink(ArtisTankTop), getitemlink(ArtisTankTop, RedCottonDye)),
+ l("Drag and drop a @@ in a @@, and you will obtain a @@.", getitemlink(RedDye), getitemlink(ArtisTankTop), getitemlink(ArtisTankTop, RedDye)),
l("Dye cards are not the only thing which exist, but they are the coolest!");
}
@@ -31,8 +31,8 @@
if (@inventorylist_card1[.@item_index] != 0)
{
- if ((@inventorylist_card1[.@item_index] > YellowCottonDye) ||
- (@inventorylist_card1[.@item_index] < CrimsonCashmereDye))
+ if ((@inventorylist_card1[.@item_index] > YellowDye) ||
+ (@inventorylist_card1[.@item_index] < CrimsonDye))
{
return false;
}
@@ -113,7 +113,7 @@
mes "slot " + str(.@i) + " = " + str(getcardbyindex(.@item, .@i));
}
mes str(@inventorylist_card1[.@item]);
- mes str(YellowCottonDye);
+ mes str(YellowDye);
mes "item options:";
for (.@i = 0; .@i < 5; .@i ++)
{
diff --git a/npc/009-1/dangrostra.txt b/npc/009-1/dangrostra.txt
index 04e05528b..1e8dc8228 100644
--- a/npc/009-1/dangrostra.txt
+++ b/npc/009-1/dangrostra.txt
@@ -42,7 +42,7 @@ OnInit:
// Misc (uncommon)
sellitem SharpKnife, -1, 1;
sellitem EmptyBottle, -1, 1; // You can buy some empty bottles here, but they're scarse
- sellitem BlueCottonDye, -1, 1;
+ sellitem BlueDye, -1, 1;
// Arrows (common)
sellitem Arrow, -1, 250;
sellitem IronArrow, -1, 110;
@@ -57,7 +57,7 @@ OnClock0400:
OnClock1600:
restoreshopitem SharpKnife, -1, 1;
restoreshopitem EmptyBottle, -1, 1;
- restoreshopitem BlueCottonDye, -1, 1;
+ restoreshopitem BlueDye, -1, 1;
OnClock0800:
OnClock2000:
restoreshopitem Arrow, -1, 200;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-29 05:40:13 +0000