diff options
| author | Gepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-07-03 11:29:29 +0000 |
|---|---|---|
| committer | Gepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-07-03 11:29:29 +0000 |
| commit | ae4f376004739b0178be6ab3f5d9fecbb7a53ca1 (patch) | |
| tree | fc65762acfccdef5835388be63edfc63af83610f /npc/merchants | |
| parent | d2964687c691b302d0d74bde1ba842baa67108ca (diff) | |
| download | hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.gz hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.bz2 hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.xz hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.zip | |
Fixed KvM announcements showing during WoE:SE (bugreport:4335).
Added missing Lighthalzen NPC (bugreport:4319).
Fixed checkweights in Manuk & Splendide shops.
Fixed some condition checks in Moscovia quests.
Fixed some typos in Sealed Shrine and Manuk quests dialogues.
Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/manuk.txt | 6 | ||||
| -rw-r--r-- | npc/merchants/splendide.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/npc/merchants/manuk.txt b/npc/merchants/manuk.txt index c7dbe9891..b98f040ea 100644 --- a/npc/merchants/manuk.txt +++ b/npc/merchants/manuk.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,12 +11,12 @@ //= Manuk coin redemption NPC. //===== Additional Comments: ================================= //= 1.0 First version +//= 1.1 Fixed checkweight. [Gepard] //============================================================ man_in01,286,16,1 script Merchant of Manuk 454,{ if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) { - set .@anrp_test,1201; - if (anrp_test == 1) { + if (checkweight(1201,1) == 0) { mes "[Merchant of Manuk]"; mes "It looks like you're carrying too many things."; mes "Why not put some of your items in storage and come back?"; diff --git a/npc/merchants/splendide.txt b/npc/merchants/splendide.txt index e707a30d8..8bc8a9d34 100644 --- a/npc/merchants/splendide.txt +++ b/npc/merchants/splendide.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,12 +11,12 @@ //= Splendide coin redemption NPC. //===== Additional Comments: ================================= //= 1.0 First version +//= 1.1 Fixed checkweight. [Gepard] //============================================================ spl_in01,110,326,5 script Merchant of Splendide 439,{ if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) { - set .@anrp_test,1201; - if (anrp_test == 1) { + if (checkweight(1201,1) == 0) { mes "[Merchant of Splendide]"; mes "It looks like you're carrying too many things."; mes "Why not put some of your items in storage and come back?"; |