* Implemented Malangdo NPCs "Cat Invest Helper" and "Storekeeper".

* Added official and/or improved dialogue for many Malangdo NPCs.
* Added missing Malangdo Points Merchant.
* Removed reference to nonexistent 'checkpeco' command. (bugreport:7566)
* Follow-up r17274, minor documentation/name changes.

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

conf/battle/items.conf

@@ -83,7 +83,7 @@ item_restricted_consumption_type: yes
 // Default: yes
 item_enabled_npc: yes
 
-// Allow map_flooritem to check if item is dropable or not ? (Note 1)
-// If yes item won't appear on map anymore if your inventory is full 
+// Allow map_flooritem to check if item is droppable? (Note 1)
+// If yes, undroppable items will be destroyed instead of appearing on the map when a player's inventory is full.
 // Default: yes
-item_floritem_chk: yes
+item_flooritem_check: yes

doc/script_commands.txt

@@ -3346,7 +3346,7 @@ things might in some cases be required.
 The 'setoption' series of functions check for a so-called option that is set on 
 the invoking character. 'Options' are used to store status conditions and a lot 
 of other non-permanent character data of the yes-no kind. For most common cases, 
-it is better to use 'checkcart','checkfalcon','checkpeco' and other similar 
+it is better to use 'checkcart','checkfalcon','checkriding' and other similar 
 functions, but there are some options which you cannot get at this way. They 
 return 1 if the option is set and 0 if the option is not set.
 

npc/re/cities/malangdo.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -13,9 +13,11 @@
 //= 1.1 Added entrance scripts.
 //= 1.2 Moved "Odgnalam" coordinates.
 //= 1.3 Fixed dialogues.
+//= 1.4 Added "Investment Cat Helper" and "Storekeeper" NPCs.
+//=     Dialogue edits, source iRO.
 //============================================================
 
-// Entrance :: malangdo_go
+// Transportation :: malangdo_go
 //============================================================
 -	script	Dolangmal	-1,{
 	if (checkquest(5091) == -1) {
@@ -283,12 +285,13 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 	mes "You see a lazy cat standing on a chair.";
 	mes "You guess that this is the Innkeeper.";
 	next;
-	switch(select("Umm... can I rest here?:Psst... Can I save here?:Leave.")) {
+	switch(select("Umm... Can I rest here?:Psst... Can I save here?:Leave.")) {
 	case 1:
 		mes "[Innkeeper]";
-		mes "You can use the hammock as you want, but give me ^FF00005 Malangdo Canned Specialties^000000. Then you can relax.";
+		mes "Eh?";
+		mes "Uh, sure you can use this hammock if you give me ^FF00005 Malangdo Cans^000000.";
 		next;
-		switch(select("Give the cans.:No need.")) {
+		switch(select("Here you go.:Never mind.")) {
 		case 1:
 			if (countitem(12636) > 4) {
 				delitem 12636,5; //Malang_Sp_Can
@@ -302,11 +305,11 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 				close;
 			}
 			mes "[Innkeeper]";
-			mes "It looks like a lack of cans.";
+			mes "This ain't no charity.";
 			close;
 		case 2:
 			mes "[Innkeeper]";
-			mes "You are stronger than your appearance.";
+			mes "Let me know if you want to relax.";
 			close;
 		}
 	case 2:
@@ -316,15 +319,15 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 		close;
 	case 3:
 		mes "[Innkeeper]";
-		mes "A busy moment makes you hurry and laziness makes you lazy.";
+		mes "Sometimes you just have to relax.";
 		next;
-		mes "- Wonder if there is work time. -";
+		mes "- Wow, this is the laziest cat ever. -";
 		close;
 	}
 	close;
 }
 
-malangdo,151,120,3	script	Wandering Minstrel#mal	479,{
+malangdo,151,120,3	script	Minstrel#mal	479,{
 	mes "[Minstrel]";
 	mes "Boy, that lazy cat makes me want to just nap all day long.";
 	next;
@@ -333,10 +336,11 @@ malangdo,151,120,3	script	Wandering Minstrel#mal	479,{
 	close;
 }
 
-malangdo,149,120,5	script	Wandering Wanderer#mal	485,5,1,{
-	mes "[Wandering Wanderer]";
-	mes "Cats living in here is so energetic.";
-	mes "And it makes me dance~";
+malangdo,149,120,5	script	Wanderer#mal	485,5,1,{
+	mes "[Wanderer]";
+	mes "The cats living in here are so energetic.";
+	mes "Is it weird that they make me want to dance all day?";
+	mes "La di dah di dah~!";
 	close;
 OnTouch:
 	switch(rand(5)) {
@@ -363,31 +367,397 @@ OnTouch:
 malangdo,216,168,3	script	Cat Trainer#mal1	558,0,8,{
 	emotion e_awsm;
 	mes "[Cat Trainer]";
-	mes "Phh there is a tail and butt both soft and tender!";
-	mes "Can't stand, this is heaven~~!!";
+	mes "Ooo~ their soft puffy tails and soft fur~";
+	mes "I can't stand it, this is heaven~~!!";
 	next;
 	emotion e_gg;
 	mes "[Cat Trainer]";
-	mes "My hidden card, ^FF0000<Silvervine Fruit>^000000, can make all cats in Malangdo my slaves~ haha!";
+	mes "My hidden card, ^FF0000Silvervine Fruit^000000, can make all cats in Malangdo my slaves~ haha!";
 	next;
-	select("^FF0000<Silvervine Fruit>^000000?");
+	select("^FF0000Silvervine Fruit^000000?");
 	mes "[Cat Trainer]";
-	mes "Silvervine Fruit is a rare item!";
+	mes "It is such a rare item!";
 	mes "I can barely get it.";
-	mes "But every cat loves it with no complaints.";
+	mes "But these cudly cats can't resist it~";
 	next;
-	select("Where can I get ^FF0000<Silvervine Fruit>^000000?");
+	select("Where can I get ^FF0000Silvervine Fruit^000000?");
 	mes "[Cat Trainer]";
-	mes "How would I know if I could barely find it?";
-	mes "This can't be taken even with ^3131FFall the zeny in this world^000000!";
+	mes "Why would I tell you when I can barely get it?";
+	mes "I wouldn't even tell you for all the zeny in the world~!";
 	next;
 	emotion e_gg;
 	mes "[Cat Trainer]";
-	mes "The cats in Malangdo are mine...! As it should be, haha~";
-	mes "^FF0000<Silvervine Fruit>^000000! I can be a king in Malangdo~ ohhhh!!!";
+	mes "All the Malangdo cats are mine~!";
+	mes "Muahahahaha~";
+	mes "With enough ^FF0000Silvervine Fruit^000000 I can be a queen in Malangdo~ ohhhh!!!";
 	close;
 OnTouch:
 	emotion e_flash;
 	end;
 }
-malangdo,164,203,3	duplicate(Cat Trainer#mal1)	Cat Trainer#mal2	853,5,8
+
+malangdo,164,203,3	script	Cat Trainer#mal2	853,{
+	emotion e_awsm;
+	mes "[Cat Trainer]";
+	mes "Ooo~ their soft puffy tails and soft fur~";
+	mes "I can't stand it, this is heaven~~!!";
+	next;
+	emotion e_gg;
+	mes "[Cat Trainer]";
+	mes "This is my little secret called";
+	mes "^FF0000Silvervine Fruit^000000. I can use";
+	mes "it to make the Malangdo cats my";
+	mes "slaves~ muahahahaha~!";
+	next;
+	select("^FF0000Silvervine Fruit^000000?");
+	mes "[Cat Trainer]";
+	mes "Hmm, I guess it's no wonder you don't know.";
+	mes "These Malangdo cats can't resist it.";
+	mes "But it's too rare of an item to get so you shouldn't bother trying to find it.";
+	next;
+	select("Where can I get ^FF0000Silvervine Fruit^000000?");
+	mes "[Cat Trainer]";
+	mes "Actually, it's simple. You just...";
+	next;
+	mes "[Cat Trainer]";
+	mes "Hey, you almost made me tell my secret.";
+	next;
+	emotion e_gg;
+	mes "[Cat Trainer]";
+	mes "One day these cats will be mine.";
+	mes "I can be a king in Malangdo~ ohhh~!";
+	close;
+}
+
+// Utility NPCs :: cat_merchant
+//============================================================
+mal_in02,134,31,5	script	Investment Cat Helper	505,{
+	if (MaxWeight - Weight < 100 || checkweight(1201,1) == 0) {
+		mes "[Investment Cat Helper]";
+		mes "You have a heavy load. Maybe you're a peddler? No peddlers in this area.";
+		close;
+	}
+	if (ep13_yong1 < 10) {
+		mes "[Investment Cat Helper]";
+		mes "Ohh!";
+		mes "You've come here to ask about investing?";
+		mes "You've come to the right place.";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "I am here to invest in the Cat Paw Merchant Association.";
+		mes "Err-- I mean I'm here to help honest people like you.";
+		mes "Hehehe~";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "I can't remember everything because I've been here talking to you humans.";
+		mes "But I want to know first... Hold on.";
+		next;
+		mes "smell... smell...";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "Ah?!";
+		mes "You don't know much about the Cat Paw Merchant Association, do you?";
+		mes "Hmm, you do not really smell like a cat.";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "Good!!";
+		mes "You made the right decision to be here to invest in the Cat Paw Merchant Association~";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "First, you need to have ten pieces of Malangdo cans if you want to open an account.";
+		next;
+		while(1) {
+			switch(select("Open an account:Ask about benefits:Cancel")) {
+			case 1:
+				if (countitem(12636) < 10) {
+					mes "[Investment Cat Helper]";
+					mes "Hmm!";
+					mes "I'd love to give you account for";
+					mes "free but as you know, this is for";
+					mes "advertising investers of the trader group, sorry.";
+					close;
+				}
+				delitem 12636,10; //Malang_Sp_Can
+				set ep13_yong1,10;
+				mes "[Investment Cat Helper]";
+				mes "Good!";
+				mes "Write down here~ and";
+				mes "print your palm there,";
+				mes "ah!~ what's your name?";
+				next;
+				mes "[Investment Cat Helper]";
+				mes strcharinfo(0)+" you are~";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "Name: "+strcharinfo(0);
+				mes "Number of accounts: 10";
+				mes "OK! Registered!";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "You have an account now.";
+				mes "Will get an investment of a certain nunber of cans next time.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "I wish to get lots of investments";
+				mes "so you can have many services as well.";
+				mes "And, I also hope that we, the Cat Paw Merchant Association, will make much money.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "See you next investment~";
+				close;
+			case 2:
+				mes "[Investment Cat Helper]";
+				mes "You want to know the benefits of investing?";
+				mes "Actually, we are a small group of cats and we don't think like humans.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "There are lots of benefits based on how much you've invested in our services.";
+				mes "These include more warps, extra storage locations and price reductions of goods and services.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "I promise that if our trade is growing you will benefit from it as well.";
+				next;
+				break;
+			case 3:
+				mes "[Investment Cat Helper]";
+				mes "Ahh~ You're just going to leave?";
+				mes "T_T~ Please open an account.";
+				close;
+			}
+		}
+	} else if (ep13_yong1 < 20000) {
+		mes "[Investment Cat Helper]";
+		mes "I can't remember everyone since I meet so many people...";
+		mes "But I want to check first... Hold on.";
+		mes "Excuse me!";
+		next;
+		mes "smell... smell...";
+		next;
+		if (ep13_yong1 < 10000) {
+			set .@cans,10;
+			mes "[Investment Cat Helper]";
+			mes "This is a familiar smell!!";
+			mes "If it's so...!!";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "You are here to invest!!";
+			mes "Good!~~ Good to see you~";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "From your smell~ you are below 10,000 accounts.";
+			mes "Until then, you can get an account by investing ten cans.";
+		} else {
+			set .@cans,20;
+			mes "[Investment Cat Helper]";
+			mes "Such a stong smell!!";
+			mes "Then it must be!!";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "A VIP invester!!!!!!";
+			mes "You're here to invest? Welcome!";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "A VIP invester with over 10,000 accounts";
+			mes "can get another account with 20 cans.";
+			mes "A good investment!";
+		}
+		next;
+		mes "[Investment Cat Helper]";
+		mes "What will you do?";
+		next;
+		switch(select("Invest:Check the number of accounts:Cancel")) {
+		case 1:
+			mes "[Investment Cat Helper]";
+			mes "Ohh~ thank you for investing~";
+			mes "You can get a maximum of 10 accounts at one time.";
+			mes "Isn't it lovely?";
+			mes "How many will you invest in? Enter 0 to cancel.";
+			next;
+			input .@input;
+			if (.@input == 0) {
+				mes "[Investment Cat Helper]";
+				mes "Please invest next time~";
+				close;
+			} else if (.@input > 10) {
+				mes "[Investment Cat Helper]";
+				mes "You can get a maximum of 10 accounts~";
+				close;
+			}
+			set .@required, .@input*.@cans;
+			mes "[Investment Cat Helper]";
+			mes "Total " + .@input + " accounts, right?";
+			mes "The number of cans you need is "+.@required+" pieces.";
+			mes "Do you want to go through with this?";
+			next;
+			if(select("Yes:No") == 2) {
+				mes "[Investment Cat Helper]";
+				mes "Oh? Is that wrong? Weird.";
+				mes "Please check again~";
+				close;
+			}
+			if (countitem(12636) < .@required) {
+				mes "[Investment Cat Helper]";
+				mes "Ahhh!";
+				mes "You don't have enough cans.";
+				mes "I'm a busy cat, you know.";
+				close;
+			}
+			if (ep13_yong1 < 10000) {
+				delitem 12636,.@required; //Malang_Sp_Can
+				set ep13_yong1, ep13_yong1+.@input;
+				mes "[Investment Cat Helper]";
+				mes .@input+" accounts were invested in.";
+				mes "Thank you for your help~";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "Once we get more investments of cans,";
+				mes "our trader group will grow even more.";
+				mes "And you can get services as well~";
+				mes "A win-win strategy?";
+				close;
+			} else {
+				if (.@input + ep13_yong1 > 20000) {
+					delitem 12636,.@required; //Malang_Sp_Can
+					set ep13_yong1,20000;
+					mes "[Investment Cat Helper]";
+					mes "You can have 20,000 accounts max";
+					mes "according to the trader policy...";
+					mes strcharinfo(0)+"'s accounts increase to 20,000.";
+					mes "Thank you so much for your investment~";
+					next;
+					mes "[Investment Cat Helper]";
+					mes "Now, "+strcharinfo(0)+", you can't invest further";
+					mes "but you can still donate some of your cans to the trader group.";
+					mes "Thank you so much~";
+					close;
+				} else {
+					delitem 12636,.@required; //Malang_Sp_Can
+					set ep13_yong1, ep13_yong1+.@input;
+					mes "[Investment Cat Helper]";
+					mes .@input+" accounts have been invested in.";
+					mes "Thank you for your help~";
+					next;
+					mes "[Investment Cat Helper]";
+					mes "With your big investment in cans,";
+					mes "this will help us meet our goals earlier.";
+					mes "Thank you again.";
+					close;
+				}
+			}
+		case 2:
+			mes "[Investment Cat Helper]";
+			mes "You want to check the number of accounts? Hmm, let's see~";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "Name: "+strcharinfo(0);
+			mes "Number of accounts: "+ep13_yong1;
+			next;
+			mes "[Investment Cat Helper]";
+			if (ep13_yong1 < 10000)
+				mes "Got it?";
+			else
+				mes "You've made many investments. Thank you.";
+			close;
+		case 3:
+			mes "[Investment Cat Helper]";
+			mes "Please invest next time~";
+			close;
+		}
+	} else if (ep13_yong1 >= 20000) {
+		mes "[Investment Cat Helper]";
+		mes strcharinfo(0) + ", welcome~";
+		mes strcharinfo(0) + "~ I felt something upon your arrival.";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "Want to donate?";
+		next;
+		if(select("Donate:No") == 2) {
+			mes "[Investment Cat Helper]";
+			mes "Hehe~ then have fun in here~";
+			close;
+		}
+		mes "[Investment Cat Helper]";
+		mes "Wow, thank you, "+strcharinfo(0)+"~!";
+		next;
+		mes "[Investment Cat Helper]";
+		mes strcharinfo(0)+"~ with your help";
+		mes "the cans will be distributed to cats";
+		mes "in the Midgard area with honor~";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "The can donation can range from a minimum of 20 to a maximum of 10,000.";
+		next;
+		input .@input;
+		if (.@input < 20 || .@input > 10000) {
+			mes "[Investment Cat Helper]";
+			mes "The can donation can range from a minimum of 20 to a maximum of 10,000.";
+			close;
+		} else if (countitem(12636) < .@input) { // Malang_Sp_Can
+			mes "[Investment Cat Helper]";
+			mes "Hmm? You don't have enough cans.";
+			close;
+		} else {
+			delitem 12636,.@input; //Malang_Sp_Can
+			mes "[Investment Cat Helper]";
+			mes "Ohh! Thank you~";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "Dear "+strcharinfo(0)+" ~";
+			mes "I have only Increase AGI";
+			mes "and Blessing to give you.";
+			mes "Thank you.";
+			npcskill "AL_INCAGI",10,0,0;
+			npcskill "AL_BLESSING",10,0,0;
+			close;
+		}
+	}
+}
+
+malangdo,184,139,4	script	Storekeeper#mal	560,{
+	mes "[Storekeeper]";
+	mes "Hey, looks like you might be looking to unload some of your stuff from your pack.";
+	mes "Want to open storage? For free?";
+	next;
+	mes "[Storekeeper]";
+	mes "Hahaha~ Just kidding, of course it isn't free.";
+	mes "What do you take me for?";
+	next;
+	if (ep13_yong1 > 999) {
+		set .@cans,1;
+		set .@zeny,1500;
+		set .@i, select("Pay with Can ----- 1 unit:Pay with Zeny ------- 1,500z");
+	} else {
+		set .@cans,2;
+		set .@zeny,3000;
+		set .@i, select("Pay with Can ----- 2units:Pay with Zeny ------- 3,000z");
+	}
+	if (getskilllv("NV_BASIC") < 6) {
+		mes "[Storekeeper]";
+		mes "Ah, hold on!!";
+		mes "You need to have ^FF0000Basic Skill level 6^000000 to use the storage service!!";
+		close;
+	}
+	switch(.@i) {
+	case 1:
+		if (countitem(12636) < .@cans) {
+			mes "[Storekeeper]";
+			mes "You don't have enough cans...";
+			close;
+		}
+		delitem 12636,.@cans; //Malang_Sp_Can
+		break;
+	case 2:
+		if (Zeny < .@zeny) {
+			mes "[Storekeeper]";
+			mes "You don't have enough zeny...";
+			close;
+		}
+		set Zeny, Zeny-.@zeny;
+		break;
+	}
+	mes "[Storekeeper]";
+	mes "Thank you.";
+	close2;
+	openstorage;
+	end;
+}

npc/re/merchants/3rd_trader.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Masao, Mercurial
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0 First Version.
 //= 1.1 Optimized Poison Herb Salesman NPC
 //= 1.2 Optimized and standardized. [Euphy]
+//= 1.3 Added Malangdo Points NPC. [Euphy]
 //============================================================ 
 
 job3_guil01,79,96,3	script	Poison Herb Salesman::PHS	877,{
@@ -227,4 +228,5 @@ gef_tower,105,172,5	script	Point Salesman#Sorcerer::pss	700,{
 }
 comodo,241,103,6	duplicate(pss)	Point Salesman#1	700
 alberta,105,52,7	duplicate(pss)	Point Salesman#2	700
-veins,202,128,6	duplicate(pss)	Point Salesman#3	700
+veins,202,128,6	duplicate(pss)	Point Salesman#3	700
+malangdo,215,163,6	duplicate(pss)	Point Salesman#4	700

npc/re/merchants/coin_exchange.txt

@@ -434,7 +434,7 @@ function	script	F_mal_coin	{
 			mes "Ahaaa~";
 			mes "If you want to buy this stuff,";
 			mes "you can talk to me";
-			mes "when you grow up little more.";
+			mes "when you grow up a little more.";
 			mes "This stuff is too expensive";
 			mes "for a child~";
 			close;

npc/re/quests/quests_malangdo.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib
 //===== Current Version: =====================================
-//= 1.4
+//= 1.4a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.2 Added Archangel Wing Enchants.
 //= 1.3 Added Play with Baby Cats.
 //= 1.4 Added Malangdo Island.
+//= 1.4a Dialogue edits, source iRO.
 //============================================================
 
 // Malangdo Island :: ma_tomas
@@ -2435,7 +2436,7 @@ malangdo,137,200,6	script	Pipielle	549,{
 		mes "[Pipielle]";
 		mes "I would ask for your help, if you were a stronger advanturer...";
 		next;
-		mes "^770099This cat is working on something, but she asks for help above LV60.^000000";
+		mes "^770099This cat is working on something, but she asks for help above level 60.^000000";
 		close;
 	}
 	set .@fish_ss1$, "What are you doing??";
@@ -2571,7 +2572,7 @@ malangdo,175,206,3	script	Gobonge#ml	561,{
 	}
 	if (BaseLevel < 60) {
 		mes "[Gobonge]";
-		mes "Are you here to get help";
+		mes "Are you here to help";
 		mes "or to get help?";
 		mes "You look so weak, haha...";
 		mes "Go and hunt more Porings!";
@@ -2754,55 +2755,51 @@ OnDisable:
 
 malangdo,181,205,3	script	Gobulee#ml1	547,{
 	mes "[Gobulee]";
-	mes "Why do you come now?";
-	mes "You should have come when we were healthy.";
-	mes "So, you want to me take out what you have?";
+	mes "What a time to show up!";
+	mes "You should come around when we're healthy.";
 	close;
 }
 
 malangdo,180,202,3	script	Gobyungee#ml1	547,{
 	mes "[Gobyungee]";
-	mes "I can't see other cats because";
-	mes "I could't have time to do bad behavior...";
+	mes "I can't even look another cat in the eye since I'm too sick to be doin' crimes properly.";
 	close;
 }
 
 malangdo,186,201,3	script	Gosigee#ml1	547,{
 	mes "[Gosigee]";
-	mes "I am desperate for pill of stomachache,";
-	mes "cap is only thinking of finding out criminal";
-	mes "and to revenge!";
+	mes "I wish I had some peppy bistmuth pills...";
+	mes "Meanwhile the Captain only thinks about catching the bad guys and getting revenge!";
 	mes "...";
 	next;
 	mes "[Gosigee]";
-	mes "How can we follow him as a cap...!";
+	mes "How can we follow someone so single-minded!";
 	close;
 }
 
 malangdo,177,202,3	script	Gonanee#ml2	547,{
 	mes "[Gonanee]";
-	mes "We are only bad circle in Malangdo";
-	mes "and we are very proud.";
-	mes "Can't just lie in bed.";
+	mes "We are the only violent gang in Malangdo and we are very proud.";
+	mes "I don't feel right just lying in bed.";
 	close;
 }
 
 malangdo,183,202,3	script	Godoree#ml3	547,{
 	mes "[Godoree]";
 	mes "I saw unfamiliar cats around";
-	mes "the dock frequently.";
+	mes "the dock recently.";
 	mes "Are they tourists?";
-	mes "We should check their pockets";
-	mes "once I get well...";
+	mes "I should -inspect- their pockets";
+	mes "once I'm better...";
 	close;
 }
 
 malangdo,203,116,5	script	Suspious Dealer#ml	543,{
-	mes "On listening to the story for";
-	mes "a while, he pretends to be indifferent once hearing someone's noise.";
+	mes "He appears to be listening intently.";
+	mes "Upon hearing you approach, he pretends to be completely oblivious.";
 	next;
 	mes "[Suspious Dealer]";
-	mes "Oh my body, too much pain...";
+	mes "Oh the pain, oh the pain of it all...";
 	close;
 }
 
@@ -2810,13 +2807,13 @@ malangdo,205,116,3	script	Very Suspious Dealer#ml1	543,{
 	mes "On listening to the story for";
 	mes "a while, he pretends to be indifferent once hearing someone's noise.";
 	next;
-	mes "[Very Suspious Dealer]";
-	mes "The weather is so dirty...";
+	mes "[Suspious Dealer]";
+	mes "Could it BE any smoggier today?";
 	close;
 }
 
-malangdo,197,120,5	script	Foolish Cat#ml	546,{
-	mes "[Foolish Cat]";
+malangdo,197,120,5	script	A Foolish Cat#ml	546,{
+	mes "[A Foolish Cat]";
 	mes "If you stay here, you";
 	mes "can hear all they're saying.";
 	mes "Don't know exactly what, but";
@@ -2906,8 +2903,7 @@ OnTouch:
 malangdo,171,163,3	script	Awfully Suspious Dealer	543,{
 	if (malang_bad_guys < 4) {
 		mes "[Awfully Suspious Dealer]";
-		mes "We quit our sales,";
-		mes "find the other merchant!";
+		mes "We quit selling them, find another merchant!";
 		close;
 	} else if (malang_bad_guys == 4) {
 		mes "[Awfully Suspious Dealer]";
@@ -4481,13 +4477,13 @@ malangdo,211,203,4	script	[Meow Team] Charo#nya_11	560,{
 		close;
 	}
 	if (nyadven == 0) {
-		mes "There are gathered cats who seems younger than other crews.";
+		mes "There are cats who seem younger than the other crew.";
 		mes "They are having a serious conversation about the weird machine in front of them.";
 		close;
 	} else if (nyadven == 1) {
-		mes "There are gathered cats who seems younger than other crews.";
+		mes "There are cats who seem younger than the other crew.";
 		mes "They are having a serious conversation about the weird machine in front of them.";
-		mes "They are looks like kids who Rato told me.";
+		mes "They look like the kids that Rato told me about.";
 		next;
 		switch(select("Just watch them without a word.:Busy right now.")) {
 		case 1:
@@ -4880,7 +4876,7 @@ malangdo,215,201,3	script	[Meow Team] Roku#nya_10	553,{
 		close;
 	}
 	if (nyadven < 2) {
-		mes "A young black cat helps a busy white cat.";
+		mes "A young black cat helps the busy white cat.";
 		mes "Maybe the machine is broken.";
 		close;
 	} else if (nyadven == 2) {

src/map/battle.c

@@ -5939,7 +5939,7 @@ static const struct _battle_data {
 	{ "item_restricted_consumption_type",   &battle_config.item_restricted_consumption_type,1,      0,      1,              },
 	{ "max_walk_path",                      &battle_config.max_walk_path,                   17,     1,      MAX_WALKPATH,   },
 	{ "item_enabled_npc",                   &battle_config.item_enabled_npc,                1,      0,      1,              },
-	{ "item_floritem_chk",                   &battle_config.item_onfloor,                    1,      0,      1,              },
+	{ "item_flooritem_check",               &battle_config.item_onfloor,                    1,      0,      1,              },
 };
 #ifndef STATS_OPT_OUT
 /**

src/map/battle.h

@@ -485,7 +485,7 @@ extern struct Battle_Config
 	int item_restricted_consumption_type;
 	int max_walk_path;
 	int item_enabled_npc;
-	int item_onfloor; //wheater or not use pop item on map if inventory full and nodrop on or not (like aegis)
+	int item_onfloor; // Whether to drop an undroppable item on the map or destroy it if inventory is full.
 	} battle_config;
 
 void do_init_battle(void);