* Updated RUS map_msg translation, and switched encoding from UTF-8 to Windows-1251. (credits: Jarek)

* Fixed "View Equip" bug. (bugreport:7628)
* Follow-up r17305, applied proper fix for functions_kafra.txt.
* Follow-up r17308, minor formatting changes and added prop eol-style:native.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17309 54d463be-8e91-2dee-dedb-b68131a5f0ec

conf/msg_conf/map_msg.conf

@@ -470,7 +470,6 @@
 
 // Bot detect messages (currently unused)
 535: Possible use of BOT (99%% of chance) or modified client by '%s' (account: %d, char_id: %d). This player ask your name when you are hidden.
-
 536: Character '%s' (account: %d) is trying to use a bot (it tries to detect a fake player).
 537: Character '%s' (account: %d) is trying to use a bot (it tries to detect a fake mob).
 // Trade Spoof Messages

conf/msg_conf/map_msg_chn.conf

@@ -470,7 +470,6 @@
 
 // Bot detect messages (currently unused)
 535: Possible use of BOT (99%% of chance) or modified client by '%s' (account: %d, char_id: %d). This player ask your name when you are hidden.
-
 536: 玩家'%s' (account: %d) 試圖使用外掛(它試圖偵測假的玩家)
 537: 玩家'%s' (account: %d) 試圖使用外掛(它試圖偵測假的怪物)
 // Trade Spoof Messages

conf/msg_conf/map_msg_frn.conf

@@ -470,7 +470,6 @@
 
 // Bot detect messages (currently unused)
 535: Utilisation possible d'un BOT (99%% de chance) ou client modifié par '%s' (compte: %d, char_id: %d). Ce Joueur demande votre nom alors que vous êtes caché.
-
 536: Personnage '%s' (compte: %d) essaie d'utiliser un bot (il essaie de détecter un faux joueur).
 537: Personnage '%s' (compte: %d) essaie d'utiliser un bot (il essaie de détecter un faux mob).
 // Trade Spoof Messages

conf/msg_conf/map_msg_por.conf

@@ -475,7 +475,6 @@
 
 // Mensagens de detecção de Bot (atualmente não usadas)
 535: Possível uso de BOT (99%% de chance) ou client modificado por '%s' (account: %d, char_id: %d). Este jogador pediu o seu nome enquanto você estava escondido.
-
 536: Personagem '%s' (account: %d) está tentando utilizar um bot (tentativa de detecção de jogador falso).
 537: Personagem '%s' (account: %d) está tentando utilizar um bot (tentativa de detecção de monstro falso).
 // Mensagens de tentativa de Spoof em Negociações

conf/msg_conf/map_msg_spn.conf

@@ -470,7 +470,6 @@
 
 // Mensajes de detección de bots (sin uso)
 535: Se ha detectado un posible bot (99% de probabilidades) o un cliente modificado: '%s' (cuenta: %d, char_id: %d). Este jugador te pregunta el nombre si estás escondido.
-
 536: El personaje '%s' (cuenta: %d) está intentando utilizar un bot (intentando detectar a un jugador falso).
 537: El personaje '%s' (cuenta: %d) está intentando utilizar un bot (intentando detectar a un monstruo falso).
 // Mensajes del sistema de intercambio de objetos

db/item_nouse.txt

@@ -1,132 +1,132 @@
-// Item Usage Restriction Configuration File
-// Defines if an item cannot be used under certain circumstances
-// Syntax: <item_id>, <flag>, <group_id_override>
-// flag:
-//	1 = Cannot use item while sitting
-//  X = more to come soon [TODO]
-// group_id_override: group id necessary to override this setting
-
-619,1,100  // Unripe_Apple
-620,1,100  // Orange_Juice
-621,1,100  // Bitter_Herb
-622,1,100  // Rainbow_Carrot
-623,1,100  // Earthworm_The_Dude
-624,1,100  // Rotten_Fish
-625,1,100  // Lusty_Iron
-626,1,100  // Monster_Juice
-627,1,100  // Sweet_Milk
-628,1,100  // Well_Dried_Bone
-629,1,100  // Singing_Flower
-630,1,100  // Dew_Laden_Moss
-631,1,100  // Deadly_Noxious_Herb
-632,1,100  // Fatty_Chubby_Earthworm
-633,1,100  // Baked_Yam
-634,1,100  // Tropical_Banana
-635,1,100  // Horror_Of_Tribe
-636,1,100  // No_Recipient
-637,1,100  // Old_Broom
-638,1,100  // Silver_Knife_Of_Chaste
-639,1,100  // Armlet_Of_Obedience
-640,1,100  // Shining_Stone
-641,1,100  // Contracts_In_Shadow
-642,1,100  // Book_Of_Devil
-659,1,100  // Heart_Of_Her
-660,1,100  // Prohibition_Red_Candle
-661,1,100  // Sway_Apron
-686,1,100  // Earth_Scroll_1_3
-687,1,100  // Earth_Scroll_1_5
-688,1,100  // Cold_Scroll_1_3
-689,1,100  // Cold_Scroll_1_5
-690,1,100  // Fire_Scroll_1_3
-691,1,100  // Fire_Scroll_1_5
-692,1,100  // Wind_Scroll_1_3
-693,1,100  // Wind_Scroll_1_5
-694,1,100  // Ghost_Scroll_1_3
-695,1,100  // Ghost_Scroll_1_5
-696,1,100  // Fire_Scroll_2_1
-697,1,100  // Fire_Scroll_2_5
-698,1,100  // Fire_Scroll_3_1
-699,1,100  // Fire_Scroll_3_5
-700,1,100  // Cold_Scroll_2_1
-11702,1,100  // Moon_Cookie
-12000,1,100  // Cold_Scroll_2_5
-12001,1,100  // Holy_Scroll_1_3
-12002,1,100  // Holy_Scroll_1_5
-12027,1,100  // Giggling_Box
-12028,1,100  // Box_Of_Thunder
-12029,1,100  // Gloomy_Box
-12030,1,100  // Box_Of_Grudge
-12031,1,100  // Sleepy_Box
-12032,1,100  // Box_Of_Storm
-12033,1,100  // Box_Of_Sunlight
-12034,1,100  // Painting_Box
-12215,1,100  // Blessing_10_Scroll
-12216,1,100  // Inc_Agi_10_Scroll
-12217,1,100  // Aspersio_5_Scroll
-12218,1,100  // Assumptio_5_Scroll
-12219,1,100  // Wind_Walk_10_Scroll
-12220,1,100  // Adrenaline_Scroll
-12225,1,100  // Sweet_Candy_Striper
-12235,1,100  // Strawberry_Choco
-12236,1,100  // Choco_Tart
-12237,1,100  // Choco_Lump
-12290,1,100  // Mysterious_Can
-12291,1,100  // Mysterious_PET_Bottle
-12310,1,100  // Spray_Of_Flowers
-12311,1,100  // Large_Spray_Of_Flowers
-12313,1,100  // Protection_Of_Angel
-12323,1,100  // N_Fly_Wing
-12324,1,100  // N_Butterfly_Wing
-12325,1,100  // N_Magnifier
-12340,1,100  // Mysterious_Rice_Powder
-12347,1,100  // Acorn_Jelly
-12350,1,100  // Angeling_Potion
-12358,1,100  // Fan_Of_Wind
-12359,1,100  // Very_Soft_Plant
-12360,1,100  // Very_Red_Juice
-12361,1,100  // Delicious_Shaved_Ice
-12362,1,100  // Kuloren
-12363,1,100  // Fit_Pipe
-12364,1,100  // Staff_Of_Leader
-12365,1,100  // Charming_Lotus
-12366,1,100  // Gril_Doll
-12367,1,100  // Luxury_Whisky_Bottle
-12368,1,100  // Splendid_Mirror
-12369,1,100  // Oilpalm_Coconut
-12370,1,100  // Gril's_Naivety
-12371,1,100  // Magical_Lithography
-12372,1,100  // Hell_Contract
-12373,1,100  // Boy's_Naivety
-12374,1,100  // Flaming_Ice
-12376,1,100  // Mysterious_Can2
-12377,1,100  // Mysterious_PET_Bottle2
-12388,1,100  // Runstone_Crush
-12389,1,100  // Runstone_Storm
-12390,1,100  // Runstone_Millennium
-12396,1,100  // Fools_Day_Box
-12397,1,100  // Fools_Day_Box2
-12415,1,100  // Siege_Teleport_Scroll2
-12473,1,100  // RWC_Parti_Box
-12474,1,100  // RWC_Final_Comp_Box
-12706,1,100  // Lucky_Cookie01
-12707,1,100  // Lucky_Cookie02
-12708,1,100  // Lucky_Cookie03
-12725,1,100  // Runstone_Nosiege
-12726,1,100  // Runstone_Rhydo
-12727,1,100  // Runstone_Verkana
-12728,1,100  // Runstone_Isia
-12729,1,100  // Runstone_Asir
-12730,1,100  // Runstone_Urj
-12731,1,100  // Runstone_Turisus
-12732,1,100  // Runstone_Pertz
-12733,1,100  // Runstone_Hagalas
-14521,1,100  // Repair_Scroll
-14529,1,100  // Greed_Scroll
-14532,1,100  // Battle_Manual25
-14587,1,100  // Repair_Scroll_
-14591,1,100  // Siege_Teleport_Scroll
-14592,1,100  // Job_Manual50
-14593,1,100  // Magic_Power_Scroll
-14594,1,100  // Quagmire_Scroll
-14599,1,100  // Greed_Scroll_C
-14606,1,100  // Job_Manual25
+// Item Usage Restriction Configuration File
+// Defines if an item cannot be used under certain circumstances
+// Syntax: <item_id>, <flag>, <group_id_override>
+// flag:
+//	1 = Cannot use item while sitting
+//	X = more to come soon [TODO]
+// group_id_override: group id necessary to override this setting
+
+619,1,100	// Unripe_Apple
+620,1,100	// Orange_Juice
+621,1,100	// Bitter_Herb
+622,1,100	// Rainbow_Carrot
+623,1,100	// Earthworm_The_Dude
+624,1,100	// Rotten_Fish
+625,1,100	// Lusty_Iron
+626,1,100	// Monster_Juice
+627,1,100	// Sweet_Milk
+628,1,100	// Well_Dried_Bone
+629,1,100	// Singing_Flower
+630,1,100	// Dew_Laden_Moss
+631,1,100	// Deadly_Noxious_Herb
+632,1,100	// Fatty_Chubby_Earthworm
+633,1,100	// Baked_Yam
+634,1,100	// Tropical_Banana
+635,1,100	// Horror_Of_Tribe
+636,1,100	// No_Recipient
+637,1,100	// Old_Broom
+638,1,100	// Silver_Knife_Of_Chaste
+639,1,100	// Armlet_Of_Obedience
+640,1,100	// Shining_Stone
+641,1,100	// Contracts_In_Shadow
+642,1,100	// Book_Of_Devil
+659,1,100	// Heart_Of_Her
+660,1,100	// Prohibition_Red_Candle
+661,1,100	// Sway_Apron
+686,1,100	// Earth_Scroll_1_3
+687,1,100	// Earth_Scroll_1_5
+688,1,100	// Cold_Scroll_1_3
+689,1,100	// Cold_Scroll_1_5
+690,1,100	// Fire_Scroll_1_3
+691,1,100	// Fire_Scroll_1_5
+692,1,100	// Wind_Scroll_1_3
+693,1,100	// Wind_Scroll_1_5
+694,1,100	// Ghost_Scroll_1_3
+695,1,100	// Ghost_Scroll_1_5
+696,1,100	// Fire_Scroll_2_1
+697,1,100	// Fire_Scroll_2_5
+698,1,100	// Fire_Scroll_3_1
+699,1,100	// Fire_Scroll_3_5
+700,1,100	// Cold_Scroll_2_1
+11702,1,100	// Moon_Cookie
+12000,1,100	// Cold_Scroll_2_5
+12001,1,100	// Holy_Scroll_1_3
+12002,1,100	// Holy_Scroll_1_5
+12027,1,100	// Giggling_Box
+12028,1,100	// Box_Of_Thunder
+12029,1,100	// Gloomy_Box
+12030,1,100	// Box_Of_Grudge
+12031,1,100	// Sleepy_Box
+12032,1,100	// Box_Of_Storm
+12033,1,100	// Box_Of_Sunlight
+12034,1,100	// Painting_Box
+12215,1,100	// Blessing_10_Scroll
+12216,1,100	// Inc_Agi_10_Scroll
+12217,1,100	// Aspersio_5_Scroll
+12218,1,100	// Assumptio_5_Scroll
+12219,1,100	// Wind_Walk_10_Scroll
+12220,1,100	// Adrenaline_Scroll
+12225,1,100	// Sweet_Candy_Striper
+12235,1,100	// Strawberry_Choco
+12236,1,100	// Choco_Tart
+12237,1,100	// Choco_Lump
+12290,1,100	// Mysterious_Can
+12291,1,100	// Mysterious_PET_Bottle
+12310,1,100	// Spray_Of_Flowers
+12311,1,100	// Large_Spray_Of_Flowers
+12313,1,100	// Protection_Of_Angel
+12323,1,100	// N_Fly_Wing
+12324,1,100	// N_Butterfly_Wing
+12325,1,100	// N_Magnifier
+12340,1,100	// Mysterious_Rice_Powder
+12347,1,100	// Acorn_Jelly
+12350,1,100	// Angeling_Potion
+12358,1,100	// Fan_Of_Wind
+12359,1,100	// Very_Soft_Plant
+12360,1,100	// Very_Red_Juice
+12361,1,100	// Delicious_Shaved_Ice
+12362,1,100	// Kuloren
+12363,1,100	// Fit_Pipe
+12364,1,100	// Staff_Of_Leader
+12365,1,100	// Charming_Lotus
+12366,1,100	// Gril_Doll
+12367,1,100	// Luxury_Whisky_Bottle
+12368,1,100	// Splendid_Mirror
+12369,1,100	// Oilpalm_Coconut
+12370,1,100	// Gril's_Naivety
+12371,1,100	// Magical_Lithography
+12372,1,100	// Hell_Contract
+12373,1,100	// Boy's_Naivety
+12374,1,100	// Flaming_Ice
+12376,1,100	// Mysterious_Can2
+12377,1,100	// Mysterious_PET_Bottle2
+12388,1,100	// Runstone_Crush
+12389,1,100	// Runstone_Storm
+12390,1,100	// Runstone_Millennium
+12396,1,100	// Fools_Day_Box
+12397,1,100	// Fools_Day_Box2
+12415,1,100	// Siege_Teleport_Scroll2
+12473,1,100	// RWC_Parti_Box
+12474,1,100	// RWC_Final_Comp_Box
+12706,1,100	// Lucky_Cookie01
+12707,1,100	// Lucky_Cookie02
+12708,1,100	// Lucky_Cookie03
+12725,1,100	// Runstone_Nosiege
+12726,1,100	// Runstone_Rhydo
+12727,1,100	// Runstone_Verkana
+12728,1,100	// Runstone_Isia
+12729,1,100	// Runstone_Asir
+12730,1,100	// Runstone_Urj
+12731,1,100	// Runstone_Turisus
+12732,1,100	// Runstone_Pertz
+12733,1,100	// Runstone_Hagalas
+14521,1,100	// Repair_Scroll
+14529,1,100	// Greed_Scroll
+14532,1,100	// Battle_Manual25
+14587,1,100	// Repair_Scroll_
+14591,1,100	// Siege_Teleport_Scroll
+14592,1,100	// Job_Manual50
+14593,1,100	// Magic_Power_Scroll
+14594,1,100	// Quagmire_Scroll
+14599,1,100	// Greed_Scroll_C
+14606,1,100	// Job_Manual25

npc/kafras/functions_kafras.txt

@@ -118,8 +118,8 @@ function	script	F_Kafra	{
 			// NPC has it's own welcome message. (Display nothing)
 			break;
 	}
+	next;
 	while (1) {
-		next;
 		deletearray @K_Menu0$[0],getarraysize(@K_Menu0$);
 		if (getarg(0) == 2) {
 			// Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
@@ -161,6 +161,7 @@ function	script	F_Kafra	{
 				callfunc "F_KafStor",2,0,0;
 			else 
 				callfunc "F_KafStor",0,getarg(3),getarg(0);
+			next;
 		} else if (@K_Menu0$[.@j] == "Use Teleport Service") {
 			// Display Einbroch "No Teleport Service" notice.
 			if(getarg(1) != 4) callfunc "F_KafTele",getarg(0);
@@ -178,15 +179,19 @@ function	script	F_Kafra	{
 				mes "instead. Thank you for your";
 				mes "understanding and cooperation.";
 			}
+			next;
 		} else if (@K_Menu0$[.@j] == "Rent a Pushcart") {
-			callfunc "F_KafCart",getarg(0),getarg(4);
+			if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) 
+				next;
 		} else if (@K_Menu0$[.@j] == "Check Other Information") {
 			callfunc "F_KafInfo",getarg(2);
+			next;
 		} else if (@K_Menu0$[.@j] == "Cancel"){
 			callfunc "F_KafEnd",getarg(0),0;
 			end;
 		} else if (@K_Menu0$[.@j] == "Use Guild Storage") {
 			callfunc "F_KafStor",1,0;
+			next;
 		}
 	}
 }
@@ -338,7 +343,7 @@ function	script	F_KafCart	{
 		mes "is only available to Merchants,";
 		mes "Blacksmiths, Master Smiths,";
 		mes "Alchemists and Biochemists.";
-		return;
+		return 1;
 	}
 	// Make sure the invoking character does not have a cart already
 	else if(checkcart() == 1){
@@ -348,7 +353,7 @@ function	script	F_KafCart	{
 		mes "Unfortunately, we can't";
 		mes "rent more than one to";
 		mes "each customer at a time.";
-		return;
+		return 1;
 	}
 	// Consume "Free Ticket for the Cart Service" if available.
 	// Do not consume if in Guild castle.
@@ -359,20 +364,20 @@ function	script	F_KafCart	{
 		mes "fee is "+getarg(1)+" zeny. Would";
 		mes "you like to rent a Pushcart?";
 		next;
-		if (select("Rent a Pushcart.:Cancel") == 2) return;
+		if (select("Rent a Pushcart.:Cancel") == 2) return 0;
 			if(Zeny<getarg(1)){
 				mes "[Kafra Employee]";
 				mes "I'm sorry, but you";
 				mes "don't have enough";
 				mes "zeny to pay the Pushcart";
 				mes "rental fee of "+getarg(1)+" zeny.";
-				return;
+				return 1;
 			}
 			set Zeny,Zeny-getarg(1);
 			set RESRVPTS, RESRVPTS + 48;
 	}
 	setcart;
-	return;
+	return 1;
 }
 
 //===================================================

src/map/clif.c

@@ -3271,7 +3271,7 @@ void clif_statusupack(struct map_session_data *sd,int type,int ok,int val)
 }
 
 
-/// Notifies the client about the result of a request to equip an item .
+/// Notifies the client about the result of a request to equip an item.
 /// 00aa <index>.W <equip location>.W <result>.B (ZC_REQ_WEAR_EQUIP_ACK)
 /// 00aa <index>.W <equip location>.W <view id>.W <result>.B (PACKETVER >= 20100629)
 /// 08d0 <index>.W <equip location>.W <view id>.W <result>.B (ZC_REQ_WEAR_EQUIP_ACK2)
@@ -3317,7 +3317,7 @@ void clif_equipitemack(struct map_session_data *sd,int n,int pos,int ok)
 }
 
 
-/// Notifies the client about the result of a request to take off an item .
+/// Notifies the client about the result of a request to take off an item.
 /// 00ac <index>.W <equip location>.W <result>.B (ZC_REQ_TAKEOFF_EQUIP_ACK)
 /// 08d1 <index>.W <equip location>.W <result>.B (ZC_REQ_TAKEOFF_EQUIP_ACK2)
 /// 099a <index>.W <equip location>.L <result>.B (ZC_ACK_TAKEOFF_EQUIP_V5)
@@ -8744,7 +8744,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts
 
 #if PACKETVER < 20101124
 	WBUFW(buf, 0) = 0x2d7;
-#elseif PACKETVER < 20120925
+#elif PACKETVER < 20120925
 	WBUFW(buf, 0) = 0x859;
 #else
 	WBUFW(buf, 0) = 0x997;