Merge branch 'master' of https://github.com/HerculesWS/Hercules into JobDBRedesign

4 files changed, 14 insertions, 14 deletions

diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 43389ff67..a01e8f662 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -23,7 +23,7 @@
 
 // Prontera
 //============================================================
-prontera,160,330,0	script	Guard#pront::prtguard	8W_SOLDIER,{
+prontera,160,330,4	script	Guard#pront::prtguard	8W_SOLDIER,{
 	mes "[Prontera Guard]";
 	mes "Welcome to Prontera.";
 	close;
diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt
index 7d2c4ba62..d1f2b59c9 100644
--- a/npc/custom/itembind.txt
+++ b/npc/custom/itembind.txt
@@ -32,8 +32,8 @@ prontera,144,174,4	script	Bound Items	4_M_JP_MID,{
 		getinventorylist();
 		for(.@i = 0; .@i < @inventorylist_count; .@i++) {
 			//We only show the items that you allow to be bound
-			//Allows equipment (default)
-			if(@inventorylist_bound[.@i])
+			//Allows equipment (default) or non-rental item
+			if( @inventorylist_bound[.@i] || @inventorylist_expire[.@i] )
 				continue;
 			if(((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i],2) == (4|5))) ||
 				((.allowbind & 2) && (getiteminfo(@inventorylist_id[.@i],2) == (0|2|11|18))) ||
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index 3f2c6870d..e9ea4ee0d 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -443,7 +443,7 @@ function	script	F_VoteKafra	{
 					mes " ";
 					mes " ";
 					if ($DTS_KafraWins == 0) {
-						mes "FF0000Toy Factory, Level 2^000000";
+						mes "^FF0000Toy Factory, Level 2^000000";
 					}
 					else if ($DTS_KafraWins == 1) {
 						mes "^FF0000Toy Factory, Level 2^000000";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index f1a60dcee..76e9a9536 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -5679,7 +5679,7 @@ malaya,283,265,4	script	Village Chief#bako2	4_BARYO_CHIEF,{
 		mes "[Village Chief]";
 		mes "^0000FFLost Belongings^000000";
 		mes "are said to be carried by";
-		mes "^FF0000Tiucknuc^000000 that roams Baryo Mahiwaga.";
+		mes "^FF0000Tiyanak^000000 that roams Baryo Mahiwaga.";
 		next;
 		switch(select("Do it yourself.:I'm on my way.")) {
 		case 1:
@@ -5690,7 +5690,7 @@ malaya,283,265,4	script	Village Chief#bako2	4_BARYO_CHIEF,{
 		case 2:
 			mes "[Village Chief]";
 			mes "Let's start then. First,";
-			mes "retrieve two ^FF0000Lost Belongings^000000 from Tiucknuc";
+			mes "retrieve two ^FF0000Lost Belongings^000000 from Tiyanak";
 			mes "and take them to ^0000FFMissing Person's Father^000000";
 			mes "for me.";
 			malaya_bakona2 = 1;
@@ -5699,26 +5699,26 @@ malaya,283,265,4	script	Village Chief#bako2	4_BARYO_CHIEF,{
 		}
 	} else if (malaya_bakona2 == 1) {
 		mes "[Village Chief]";
-		mes "From Tiucknuc that roams Baryo Mahiwaga Field,";
+		mes "From Tiyanak that roams Baryo Mahiwaga Field,";
 		mes "retrieve two ^FF0000Lost Belongings^000000";
 		mes "and deliver them to ^0000FFMissing Person's Father^000000";
 		mes "for me.";
 		close;
 	} else if (malaya_bakona2 == 2) {
 		mes "[Village Chief]";
-		mes "Retrieve Seven ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "Retrieve Seven ^FF0000Lost Belongings^000000 from Tiyanak";
 		mes "and deliver them to ^0000FFMissing Person's Friend^000000";
 		mes "for me.";
 		close;
 	} else if (malaya_bakona2 == 3) {
 		mes "[Village Chief]";
-		mes "Retrieve three ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "Retrieve three ^FF0000Lost Belongings^000000 from Tiyanak";
 		mes "and deliver them to ^0000FFMissing Person's Son^000000";
 		mes "for me.";
 		close;
 	} else if (malaya_bakona2 == 4) {
 		mes "[Village Chief]";
-		mes "Retrieve five ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "Retrieve five ^FF0000Lost Belongings^000000 from Tiyanak";
 		mes "and deliver them to ^0000FFMissing Person's Mother^000000";
 		mes "for me.";
 		close;
@@ -5925,7 +5925,7 @@ malaya,269,267,5	script	Missing Person's Father	4_M_MALAYA,{
 		next;
 		mes "The man is unable to continue as he tries to hold back his tears.";
 		mes "Let's continue to find the lost belongings of the missing people.";
-		mes "Let's retrieve them from Tiucknuc that roams Baryo Mahiwaga Field,";
+		mes "Let's retrieve them from Tiyanak that roams Baryo Mahiwaga Field,";
 		mes "seven ^FF0000Lost Belongings^000000";
 		mes "and deliver them to ^0000FFMissing Person's Friend^000000.";
 		delitem 6520,2; //Lost_Belongings
@@ -5939,7 +5939,7 @@ malaya,269,267,5	script	Missing Person's Father	4_M_MALAYA,{
 		next;
 		mes "The man is unable to continue as he tries to hold back his tears.";
 		mes "Let's continue to find the lost belongings of the missing people.";
-		mes "Retrieve seven ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "Retrieve seven ^FF0000Lost Belongings^000000 from Tiyanak";
 		mes "and deliver them to ^0000FFMissing Person's Friend^000000.";
 		close;
 	} else {
@@ -5999,7 +5999,7 @@ L_Quest:
 	next;
 	mes "Leaving behind the crying boy,";
 	mes "let's continue to find the lost belongings of the missing people.";
-	mes "Retrieve three ^FF0000Lost Belongings^000000 from Tiucknuc";
+	mes "Retrieve three ^FF0000Lost Belongings^000000 from Tiyanak";
 	mes "and deliver them to ^0000FFMissing Person's Son^000000.";
 	return;
 }
@@ -6045,7 +6045,7 @@ L_Quest:
 	next;
 	mes "Man crying in agony.";
 	mes "Let's continue to find the lost belongings of the missing people.";
-	mes "Retrieve five ^FF0000Lost Belongings^000000 from Tiucknuc";
+	mes "Retrieve five ^FF0000Lost Belongings^000000 from Tiyanak";
 	mes "and deliver them to ^0000FFMissing Person's Mother^000000.";
 	return;
 }