diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-30 08:46:09 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-30 08:46:09 +0000 |
commit | 09ec9946e686f75252eab2447ef61b753a3f18f1 (patch) | |
tree | 5dde356afd64716bbad6bbb3181a9da83d489238 /npc | |
parent | 6bf8e81c98ef42067408f626df89561a8fc7f8ad (diff) | |
download | hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.tar.gz hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.tar.bz2 hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.tar.xz hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.zip |
- Fixed a copy-paste 'nowarpto' mapflag. (bugreport:3688)
- Updated documentation for 'rentitem'. (follow up to r14082)
- Fixed a variable name in Valentines 2009 quest. (bugreport:3644)
- Added a missing 'input' in Alchemist Job quest. (bugreport:3695)
- Fixed a typo in Cooking Quest. (bugreport:3691)
- Fixed some typos in Veins Quest. (bugreport:3588) and (bugreport:3692)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14111 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r-- | npc/events/valentinesday_2009.txt | 2 | ||||
-rw-r--r-- | npc/jobs/2-2/alchemist.txt | 1 | ||||
-rw-r--r-- | npc/quests/cooking_quest.txt | 2 | ||||
-rw-r--r-- | npc/quests/quests_veins.txt | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 02845d3e2..24eb24e01 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -66,7 +66,7 @@ prontera,164,174,4 script Trader#Val09 58,{ mes "when you change your mind."; close; } - if (.@val09choco > 5) { + if (.@input > 5) { mes "[Marco Bassinio]"; mes "Ugh.. Didn't I tell you?"; mes "5 is the maximum!"; diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index fe8141a94..428c58276 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -688,6 +688,7 @@ L_AskQuestions: mes "price, how much profit would"; mes "you make from this sale?"; next; + input .@input; if (.@input != 7680) set w_point,w_point+1; } if (.@w_point == 0) { diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 21ba2e0a1..c36e282e1 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -2115,7 +2115,7 @@ S_SellSets: set .@item_cost,getiteminfo(getarg(0),0); set .@item_weight,getiteminfo(getarg(0),6); mes "[Madeleine Chu]"; - mes "How many Outdoor"; + mes "How many " + (getarg(0)==12125 ? "Outdoor":"Indoor"); mes "Cooking Kits would"; mes "you like to buy? If you"; mes "want to cancel, please"; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 4dbfac3e5..2a63c2061 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -3402,7 +3402,7 @@ que_thor,36,66,5 script Little Curdie 941,{ mes "to hurry a little bit."; mes "Alright, it's time to go."; next; - mes "^3355FFYou extract the soup"; + mes "^3355FFYou extract the soap"; mes "from the lock, and"; mes "carefully wrap it."; mes "Now you need to take"; @@ -3959,6 +3959,7 @@ veins,181,166,3 script Lockenlock 900,{ mes "the key, so I can get it done"; mes "as soon as you can bring"; mes "me the Steel. I'll be waiting."; + close; } } else if (rachel_camel == 23) { |