From 09ec9946e686f75252eab2447ef61b753a3f18f1 Mon Sep 17 00:00:00 2001
From: brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 30 Oct 2009 08:46:09 +0000
Subject: - 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
---
conf/mapflag/nowarpto.txt | 4 ++--
conf/msg_athena.conf | 2 +-
doc/script_commands.txt | 2 +-
npc/events/valentinesday_2009.txt | 2 +-
npc/jobs/2-2/alchemist.txt | 1 +
npc/quests/cooking_quest.txt | 2 +-
npc/quests/quests_veins.txt | 3 ++-
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index 25d8c3786..c37d6e194 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -122,8 +122,8 @@ spl_fild01 mapflag nowarpto
spl_in01 mapflag nowarpto
//Orc's Memory ===================
-1@cata mapflag nowarpto
-2@cata mapflag nowarpto
+1@orcs mapflag nowarpto
+2@orcs mapflag nowarpto
// Nidhoggr's Instance ===========
1@nyd mapflag nowarpto
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 3e2eb4567..6a7db3946 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -255,7 +255,7 @@
239: Game time: After, the game will be in daylight for %s.
240: %d monster(s) summoned!
241: You can now attack and kill players freely.
-242: You be attacked and killed by players.
+242: You can now be attacked and killed by players.
243: Skills have been disabled on this map.
244: Skills have been enabled on this map.
245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index b681a2fbc..155e7ab13 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4041,7 +4041,7 @@ the character will receive a message in their chat window. The character will
also receive warning messages in their chat window before the item disappears.
This command can not be used to rent stackable items. Rental items cannot be
-removed from the character's inventory. (i.e. trade mask 123 in ../db/item_trade.txt)
+dropped, traded, sold to npcs, or placed in guild storage. (i.e. trade mask 75)
Note: 'delitem' in an NPC script can still remove rental items.
---------------------------------------
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) {
--
cgit v1.2.3-70-g09d2