* Updated (and added) item_trade entries. (Converted from Aegis.)

* Updated several Prontera NPCs.
- Updated Prontera town NPCs, and Prontera Library.
- Updated the Prontera Milk Merchant. 
- Updated the inn dialogs slightly, and corrected information for Prontera.
- Added Gaebolg Family Curse quest.
- Commented out old Clothes_dyer npc.
* Updated Rachel's guide's while loop to be a bit nicer looking.
* Added the ability to redeem lottery tickets before max donation is met.
* Changed conflicting warps to the "Adoption" room in the church.
* Fixed a bug in Kiel Hyre warps and quest.
* Updated Dandelion Request quest for Gaebolg compatibility.

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

2 files changed, 114 insertions, 64 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 83af57edc..efb061489 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -49,6 +49,7 @@
 	----
 ========================
 06/09
+	* Rev. 10736 Updated (and added) item_trade entries. (Converted from Aegis.) [L0ne_W0lf]
 	* Added some official Thor Volcano mob stats [Playtester]
 	- also updated sql files
 	* Fixed some bugs on Moscovia mobs [Playtester]
diff --git a/db/item_trade.txt b/db/item_trade.txt
index 51e70c5b3..fa007301b 100644
--- a/db/item_trade.txt
+++ b/db/item_trade.txt
@@ -12,67 +12,116 @@
 //Example:
 //1161,67,50 //Balmung: No drop, No trade, No Guild Store (1+2+64 =67),
 //only GMs of GM-level 50 and up can override the setting.
-2634,127,100	// ??????
-2635,127,100	// ??????
-//The Sign Quest related items
-7177,123,100	// ?? ?????
-7178,123,100	// ?? ???
-7304,123,100	// ??????
-7305,123,100	// ???????
-7306,123,100	// ?????
-7307,123,100	// ??????
-7308,123,100	// ?????
-7309,123,100	// ??????
-2642,123,100	// ??????
-2644,123,100	// ??? armor
-7314,123,100	// ??? event
-7025,27,100	// ??? ??
-7527,122,100	// ????? ???
-12142,122,100	// ????? ???
-2647,123,100	// ????
-//Eye of Hellion quest related items
-7332,123,100	// ??
-7333,123,100	// ????_1
-7334,123,100	// ????_2
-7335,123,100	// ????_3
-7336,123,100	// ????_4
-7339,123,100	// ??????_
-5132,27,100	// ?????
-//Leather Pouch (part of Cooking Quest)
-7432,123,100
-// Keys (Thanatos Tower Quest)
-7421,123,100
-7422,123,100
-7423,123,100
-7424,123,100
-7425,123,100
-// Magical Stones (Thanatos Tower Quest)
-7426,123,100
-7427,123,100
-7428,123,100
-7429,123,100
-7430,123,100
-// Kiel Hyre Quest Items
-7487,123,100	//Pub_Liquor
-7488,123,100	//Delivery_Box
-7489,123,100	//Outhouse_Spare_Key
-7490,123,100	//Letter_to_Elie
-7491,123,100	//Iron_Box
-7492,123,100	//Yellow_Keycard
-7493,123,100	//Golden_Key
-7494,123,100	//Exquisite_Button
-7495,123,100	//Blue_Keycard
-7496,123,100	//Red_Keycard
-7497,123,100	//Piece_of_Metal
-7498,123,100	//Losimier's_House_Key
-7499,123,100	//Portrait_of_a_Family
-7500,123,100	//Portrait_of_a_Lady
-7501,123,100	//K.H's_Letter
-7502,123,100	//James's_Memo
-7503,123,100	//Portrait_of_a_Guy
-7504,123,100	//Power_Source
-7505,123,100	//Toy_Key
-7506,115,100	//Black_Keycard
-7508,123,100	//Elisia's_Ring
-7509,91,100	//Gorgeous_Keycard
-7516,123,100	//Green Keycard
+
+// Wedding Related items
+2634,127,100	// Bridegroom_Ring
+2635,127,100	// Bride_Ring
+
+// "2005 The Sign" related items
+7177,123,100	// Part_Of_Star's_Sob
+7178,123,100	// Star's_Sob
+7304,123,100	// Witch's_Spell_Book
+7305,123,100	// Authority_Of_Nine_World
+7306,123,100	// Fragment_Of_Soul
+7307,123,100	// Whisper_Of_Soul
+7308,123,100	// Witch's_Potion
+7309,123,100	// Wing_Of_Crow
+2642,123,100	// Serin's_Gold_Ring
+2644,123,100	// The_Sign_
+7314,123,100	// The_Sign
+7025,91,100	// Lucifer's_Lament
+7527,122,100	// Life_Book
+12142,122,100	// Magic_Book
+
+// "2nd Anniversary Event" items
+// "Eye of Hellion" items
+2647,123,100	// Nile_Rose
+7332,123,100	// Slate
+7333,123,100	// Piece_Of_Slate_1
+7334,123,100	// Piece_Of_Slate_2
+7335,123,100	// Piece_Of_Slate_3
+7336,123,100	// Piece_Of_Slate_4
+7339,123,100	// RO_Transportation_Card_
+5132,91,100	// Angeling_Hat
+
+// "Main Quest"/"Danilion's Request" items
+7416,91,100	// Letter_Of_Recommendation
+7417,91,100	// Mission_ScrollA
+7418,91,100	// Mission_ScrollB
+
+// "10.3 Quest items"
+// * "Gaebolg family Curse" items
+7431,115,100	// Books
+7432,115,100	// Leather_Pouch
+// * "Thanatos Tower" items
+7421,115,100	// Red_Key
+7422,115,100	// Yellow_Key
+7423,115,100	// Blue_Key
+7424,115,100	// Green_Key
+7425,115,100	// Black_Key
+7426,115,100	// Red_Magic_Stone
+7427,115,100	// Yellow_Magic_Stone
+7428,115,100	// Blue_Magic_Stone
+7429,115,100	// Green_Magic_Stone
+7430,115,100	// Black_Magic_Stone
+7420,115,100	// Skull_
+7484,123,100	// Warrior_Symbol
+7485,123,100	// 2nd_Floor_Pass
+7486,123,100	// 3rd_Floor_Pass
+
+// "Kiel Hyre's Cottage" Quest related items
+7487,123,100	// Tavern_Wine
+7488,123,100	// Delivery_Box
+7489,123,100	// Villa_Spare_Key
+7490,123,100	// Kyll_Hire_Letter
+7491,123,100	// Iron_Box
+7492,123,100	// Yellow_Key_Card
+7493,123,100	// Golden_Key
+7494,123,100	// Kiel_Button
+7495,123,100	// Blue_Key_Card
+7496,123,100	// Red_Key_Card
+7497,123,100	// Steel_Piece
+7498,123,100	// Rosimier_Key
+7499,123,100	// Family_Portrait
+7500,123,100	// Elysia_Portrait
+7501,123,100	// Kyll_Hyre_Letter2
+7502,123,100	// Pieco_Memo_Of_James
+7503,123,100	// Man_Portrait
+7504,123,100	// Toy_Motor
+7505,123,100	// Toy_Key
+7506,115,100	// Black_Key_Card
+7508,123,100	// Elysia_Ring
+7509,83,100	// Fancy_Key_Card
+7515,115,100	// Marvelous_Medal
+7516,115,100	// Green_Key_Card
+
+// Chinese ????? related items
+7518,115,100	// Women's_Medal
+2668,115,100	// Women's_Glory
+7525,115,100	// Summer_Feast_Ticket
+7341,123,100	// Worn_Out_Pendant
+
+// Lighthalzen Quest items
+// * Schwartzvalt Trilogy Quest items
+7342,123,100	// File01
+7343,123,100	// File02
+7344,123,100	// File03
+7346,123,100	// Pile_Of_Ymir_Heart
+7349,123,100	// Indication_Of_Member02
+// * Friendship Quest(?) Items
+7351,123,100	// Friend's_Diary
+
+// "2006 USA 3rd Anniversary" related items
+7530,123,100	// Travel_Brochure_01
+7531,123,100	// Travel_Brochure_02
+7532,123,100	// Travel_Brochure_03
+7533,123,100	// Travel_Brochure_04
+7534,123,100	// Photo_Album_01
+7535,123,100	// Photo_Album_02
+7536,123,100	// Photo_Album_03
+7537,123,100	// Photo_Album_04
+5147,123,100	// Baseball_Cap
+
+// Poring Coin items
+7538,115,100	// Sifted_Sand
+7539,115,100	// Poring_Coin