Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed a copy-paste 'nowarpto' mapflag. (bugreport:3688)

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@14111 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2009-10-30 08:46:09 +00:00
parent bea15e3e37
commit 1fa8a70422
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/mapflag/nowarpto.txt
View File

@ -122,8 +122,8 @@ spl_fild01 mapflag nowarpto
spl_in01 mapflag nowarpto spl_in01 mapflag nowarpto
//Orc's Memory =================== //Orc's Memory ===================
1@cata mapflag nowarpto 1@orcs mapflag nowarpto
2@cata mapflag nowarpto 2@orcs mapflag nowarpto
// Nidhoggr's Instance =========== // Nidhoggr's Instance ===========
1@nyd mapflag nowarpto 1@nyd mapflag nowarpto

2
conf/msg_athena.conf
View File

@ -255,7 +255,7 @@
239: Game time: After, the game will be in daylight for %s. 239: Game time: After, the game will be in daylight for %s.
240: %d monster(s) summoned! 240: %d monster(s) summoned!
241: You can now attack and kill players freely. 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. 243: Skills have been disabled on this map.
244: Skills have been enabled on this map. 244: Skills have been enabled on this map.
245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds. 245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.

2
doc/script_commands.txt
View File

@ -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. 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 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. Note: 'delitem' in an NPC script can still remove rental items.
--------------------------------------- ---------------------------------------

2
npc/events/valentinesday_2009.txt
View File

@ -66,7 +66,7 @@ prontera,164,174,4 script Trader#Val09 58,{
mes "when you change your mind."; mes "when you change your mind.";
close; close;
} }
if (.@val09choco > 5) { if (.@input > 5) {
mes "[Marco Bassinio]"; mes "[Marco Bassinio]";
mes "Ugh.. Didn't I tell you?"; mes "Ugh.. Didn't I tell you?";
mes "5 is the maximum!"; mes "5 is the maximum!";

1
npc/jobs/2-2/alchemist.txt
View File

@ -688,6 +688,7 @@ L_AskQuestions:
mes "price, how much profit would"; mes "price, how much profit would";
mes "you make from this sale?"; mes "you make from this sale?";
next; next;
input .@input;
if (.@input != 7680) set w_point,w_point+1; if (.@input != 7680) set w_point,w_point+1;
} }
if (.@w_point == 0) { if (.@w_point == 0) {

2
npc/quests/cooking_quest.txt
View File

@ -2115,7 +2115,7 @@ S_SellSets:
set .@item_cost,getiteminfo(getarg(0),0); set .@item_cost,getiteminfo(getarg(0),0);
set .@item_weight,getiteminfo(getarg(0),6); set .@item_weight,getiteminfo(getarg(0),6);
mes "[Madeleine Chu]"; mes "[Madeleine Chu]";
mes "How many Outdoor"; mes "How many " + (getarg(0)==12125 ? "Outdoor":"Indoor");
mes "Cooking Kits would"; mes "Cooking Kits would";
mes "you like to buy? If you"; mes "you like to buy? If you";
mes "want to cancel, please"; mes "want to cancel, please";

3
npc/quests/quests_veins.txt
View File

@ -3402,7 +3402,7 @@ que_thor,36,66,5 script Little Curdie 941,{
mes "to hurry a little bit."; mes "to hurry a little bit.";
mes "Alright, it's time to go."; mes "Alright, it's time to go.";
next; next;
mes "^3355FFYou extract the soup"; mes "^3355FFYou extract the soap";
mes "from the lock, and"; mes "from the lock, and";
mes "carefully wrap it."; mes "carefully wrap it.";
mes "Now you need to take"; 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 "the key, so I can get it done";
mes "as soon as you can bring"; mes "as soon as you can bring";
mes "me the Steel. I'll be waiting."; mes "me the Steel. I'll be waiting.";
close;
} }
} }
else if (rachel_camel == 23) { else if (rachel_camel == 23) {