summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-22 06:16:21 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-22 06:16:21 +0000
commitdec3ae611b85e2ce1d01a572a0d07d0e2907408b (patch)
tree1f12484f992422b34b1e3b029ba973aeb43fce20 /npc/merchants
parentb8d9d3ef71cb8d93bb8173c8c04e8d3d1798b187 (diff)
downloadhercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.tar.gz
hercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.tar.bz2
hercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.tar.xz
hercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.zip
* Several small fixes to scripts, and updates.
- Updated City warps for Lighthalzen, and dugneon warps. - Updated castle warps for Schwaltzvalt Castles Map. - "The Sign" quest is now enabled by default. (bugreport:1011) - Added Dimensional Gorge map spawns (According to RO Future Wiki) - Updated Lighthalzen boss spawning mechanisim to official. - Fixed a small error in the novice potion exchanger. - Resolves the following: bugreport:879 bugreport:973 bugreport:983 bugreport:1013 bugreport:1021 bugreport:1024 bugreport:1026 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12227 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/novice_exchange.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index ad87dc4ae..f3d1af076 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -3,9 +3,9 @@
//===== By: ==================================================
//= ???, eAthena Team
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
-//= eAthena 1.0+
+//= eAthena SVN
//===== Description: =========================================
//= [Aegis COnversion]
//= Exchanges your Basic Monster drops for Red Potions.
@@ -13,6 +13,7 @@
//= 1.2 Rescripted to Aegis 10.standards. [L0ne_W0lf[
//= Made it easier to add new items to exhange list
//= meaning only the exchange is done in a function now.
+//= 1.3 Fixed dialog mix-up in function. [L0ne_W0lf]
//============================================================
prontera,123,102,5 script Merchant#pron 85,{
@@ -303,7 +304,7 @@ function script F_PotExchange {
if (countitem(getarg(0)) < getarg(1)) {
mes "[Merchant]";
mes "Hey, where are";
- mes "all those Shells";
+ mes "all those "+getitemname(getarg(0))+"";
mes "that you promised?";
mes "Give me "+getitemname(getarg(0))+"!";
close;
@@ -311,7 +312,7 @@ function script F_PotExchange {
else {
mes "[Merchant]";
mes "Okay, let me check";
- mes "how many Shells you";
+ mes "how many "+getitemname(getarg(0))+" you";
mes "have on you. Hmm...";
next;
mes "[Merchant]";