* Moved RE coordinates of Bullet/Magazine Dealers in Izlude, bugreport:6410

* Added "favorite" column to main.sql file, bugreport:6425 (sql-files\main.sql)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16595 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 29 insertions, 23 deletions

diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index fcad5a0ea..fadf8b03f 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena dev team
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -15,11 +15,13 @@
 //= 1.2a Optimized. Please, ommit extra NPC names [Lupus]
 //= 1.3 Updated to match AEGIS script. [Kisuka]
 //= 1.4 Updated to match AEGIS script again. [Masao]
+//= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //============================================================
 
-izlude,171,127,3	script	Magazine Dealer Kenny::mdk	83,{
+alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
+	set .n$, compare(strnpcinfo(1),"Tonny")?"[Tonny]":"[Kenny]";
 	if(BaseJob == Job_Gunslinger) {
-		mes "[Kenny]";
+		mes .n$;
 		mes "Welcome to my Magazine Shop.";
 		mes "As you may know, large numbers";
 		mes "of bullets can be carried more";
@@ -36,7 +38,7 @@ izlude,171,127,3	script	Magazine Dealer Kenny::mdk	83,{
 		case 7: callfunc "Func_Casing",13202,12150; break;
 		case 8: callfunc "Func_Casing",13201,12151; break;
 		case 9:
-			mes "[Kenny]";
+			mes .n$;
 			mes "Well, if you ever find";
 			mes "that you have too many";
 			mes "bullets, come and see me.";
@@ -45,7 +47,7 @@ izlude,171,127,3	script	Magazine Dealer Kenny::mdk	83,{
 			close;
 		}
 	}
-	mes "[Kenny]";
+	mes .n$;
 	mes "Welcome to my shop.";
 	mes "Here, I provide Magazines";
 	mes "and Cartridges for Gunslingers.";
@@ -53,7 +55,7 @@ izlude,171,127,3	script	Magazine Dealer Kenny::mdk	83,{
 	mes "my services would be of any";
 	mes "use to you, adventurer.";
 	next;
-	mes "[Kenny]";
+	mes .n$;
 	mes "Eh, but if you happen to";
 	mes "know any Gunslingers, send";
 	mes "them my way. You can never";
@@ -62,18 +64,18 @@ izlude,171,127,3	script	Magazine Dealer Kenny::mdk	83,{
 }
 
 function	script	Func_Casing	{
-	mes "[Kenny]";
+	mes .n$;
 	mes "Now, you can trade";
 	mes "500 "+getitemname(getarg(0))+"s";
 	mes "and 500 zeny for 1 "+getitemname(getarg(1))+", so make sure";
 	mes "you have sufficient bullets";
 	mes "and zeny for this exchange.";
 	next;
-	mes "[Kenny]";
+	mes .n$;
 	mes "You can exchange 500 "+getitemname(getarg(0))+"s and 500 zeny";
 	mes "with 1 "+getitemname(getarg(1))+".";
 	next;
-	mes "[Kenny]";
+	mes .n$;
 	mes "Remember that I can't give";
 	mes "you more than 50 Magazines";
 	mes "at a time. Now please enter";
@@ -82,7 +84,7 @@ function	script	Func_Casing	{
 	next;
 	input .@amount;
 	if(.@amount > 50 || .@amount == 0) {
-		mes "[Kenny]";
+		mes .n$;
 		mes "Hey, I can't give you";
 		mes "that many Magazines.";
 		mes "Please try again, and";
@@ -93,7 +95,7 @@ function	script	Func_Casing	{
 	if (countitem(getarg(0)) >= (500*.@amount)) {
 		if (Zeny >= (500*.@amount)) {
 			if (checkweight(getarg(1),.@amount) == 0) {
-				mes "[Kenny]";
+				mes .n$;
 				mes "Hey, you've got a lot";
 				mes "of junk crammed in your";
 				mes "Inventory. Free up some";
@@ -102,7 +104,7 @@ function	script	Func_Casing	{
 				mes "some Magazines later, okay?";
 				close;
 			}else{
-				mes "[Kenny]";
+				mes .n$;
 				mes "Alright, here are";
 				mes "your Magazines. Thanks";
 				mes "for visiting my shop, and";
@@ -114,7 +116,7 @@ function	script	Func_Casing	{
 				close;
 			}
 		}else{
-			mes "[Kenny]";
+			mes .n$;
 			mes "Sorry, but you don't";
 			mes "have enough zeny for";
 			mes "this Magazine exchange.";
@@ -124,7 +126,7 @@ function	script	Func_Casing	{
 			close;
 		}
 	}else{
-		mes "[Kenny]";
+		mes .n$;
 		mes "Sorry, but you don't";
 		mes "have enough bullets for";
 		mes "this Magazine exchange.";
@@ -134,5 +136,3 @@ function	script	Func_Casing	{
 		close;
 	}
 }
-
-alberta,118,157,3	duplicate(mdk)	Magazine Dealer Tonny	83
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index ea5f9a803..71f189c6e 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -16,6 +16,7 @@
 //= 1.3 Fixed [Playtester] Optimized. Got rid of @vars [Lupus]
 //= 1.4 Updated to match AEGIS script. [Kisuka]
 //= 1.5 Updated to match AEGIS script again. [Masao]
+//= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //============================================================
 
 alberta,118,160,3	script	Bullet Dealer Tony#alb::bdt	86,{
@@ -122,5 +123,3 @@ function	script	Bullet_Trade	{
 		close;
 	}
 }
-
-izlude,171,133,3	duplicate(bdt)	Bullet Dealer Tony#iz	86
diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index bbe1db2bb..c7d3b9319 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -12,7 +12,7 @@
 //= Misc. Message Boards for:
 //=  - Prontera
 //=  - Morroc
-//-  - Geffen
+//=  - Geffen
 //=  - Al De Baran
 //=  - Izlude
 //=  - Alberta
@@ -23,7 +23,7 @@
 //= 1.4 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
 //= 1.5 Removed a duplicate related to the Sign Quest. [SinSloth]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 1.6 COmmented out conflicting npcs. (bugreport:4093) [L0ne_W0lf]
+//= 1.6 Commented out conflicting npcs. (bugreport:4093) [L0ne_W0lf]
 //============================================================
 
 // Prontera
diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt
index 4b6d1d934..ab13ba42c 100644
--- a/npc/pre-re/cities/izlude.txt
+++ b/npc/pre-re/cities/izlude.txt
@@ -3,13 +3,14 @@
 //===== By: ================================================== 

 //= Daegaladh

 //===== Current Version: ===================================== 

-//= 1.0

+//= 1.1

 //===== Compatible With: ===================================== 

 //= rAthena SVN

 //===== Description: ========================================= 

 //= Izlude town NPCs

 //===== Additional Comments: ================================= 

 //= 1.0 First Version.

+//= 1.1 Added bullet NPC duplicates. [Euphy]

 //============================================================

 

 izlude,201,181,2	duplicate(Sailor_izlude)	Sailor#izlude	100

@@ -21,3 +22,5 @@ izlude,150,143,2	duplicate(Kylick_izlude)	Kylick#izlude	97
 izlude,56,126,2	duplicate(Red_izlude)	Red#izlude	85

 izlude,58,126,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98

 izlude,124,178,2	duplicate(Soldier_izlude)	Soldier#izlude	105

+izlude,171,133,3	duplicate(bdt)	Bullet Dealer Tony#iz	86

+izlude,171,127,3	duplicate(mdk)	Magazine Dealer Kenny	83
\ No newline at end of file
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index d1adb644a..d56c28025 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -8,7 +8,7 @@
 //= rAthena SVN

 //===== Description: ========================================= 

 //= [Official Conversion]

-//= God Item SE Creation scipt (Asprika & Brynhild)

+//= God Item SE Creation script (Asprika & Brynhild)

 //===== Additional Comments: ================================= 

 //= 0.x Previous author: L0ne_W0lf

 //= 1.0 Merged Okolnir. [Joseph]

diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index cfd284ee4..9419d8486 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Masao
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. Still missing many new NPC's and
 //= their dialogues. [Masao]
+//= 1.1 Added bullet NPC duplicates. [Euphy]
 //============================================================
 
 izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	100
@@ -22,6 +23,8 @@ izlude,141,185,4	duplicate(Kylick_izlude)	Kylick#izlude	97
 izlude,56,156,2	duplicate(Red_izlude)	Red#izlude	85
 izlude,58,156,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98
 izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	105
+izlude,158,130,3	duplicate(bdt)	Bullet Dealer Tony#iz	86
+izlude,155,132,3	duplicate(mdk)	Magazine Dealer Kenny	83
 
 izlude,147,131,6	script	Blacksmith#izlude	726,{
 	end;
diff --git a/sql-files/main.sql b/sql-files/main.sql
index d4cef4ab8..09aa67a67 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -400,6 +400,7 @@ CREATE TABLE IF NOT EXISTS `inventory` (
   `card2` smallint(11) NOT NULL default '0',
   `card3` smallint(11) NOT NULL default '0',
   `expire_time` int(11) unsigned NOT NULL default '0',
+  `favorite` tinyint(3) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `char_id` (`char_id`)
 ) ENGINE=MyISAM;