* Merged changes from trunk [14784:14819/trunk].

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

6 files changed, 35 insertions, 2 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 3949237db..156e64252 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -9,6 +9,8 @@
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
 
+2011/04/16
+	* Rev. 14797 Added Archangel Wings (2573) and their respective Box (16998) item based on client-side kRO description. [Ai4rei]
 2011/03/19
 	* Rev. 14748 Fixed Beast Strafing (HT_POWER) SP requirement as provided by Playtester (bugreport:4675). [Gepard]
 2011/03/06
diff --git a/db/item_db.txt b/db/item_db.txt
index 225b2b1d9..5601c9a52 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1445,6 +1445,7 @@
 //2558,Freya_Soul_Scarf4,Freya Soul Scarf,
 //2559,Guardian_Manteau,Guardian Manteau,
 2560,Para_Team_Manteau,Eden Team Manteau,5,0,,0,,14,,0,0xFFFFFFFF,7,2,4,,12,0,0,{ bonus2 bSubEle,Ele_Neutral,10; },{},{}
+2573,Archangel_Wings,Archangel Wings,5,0,,200,,18,,1,0xFFFFFFFF,7,2,4,,0,1,1,{},{},{}
 // Accessories
 //===================================================================
 2601,Ring,Ring,5,30000,,100,,0,,0,0xFFFFFFFE,7,2,136,,20,0,0,{ bonus bStr,2; },{},{}
@@ -6192,6 +6193,7 @@
 16680,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
 16776,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
 16777,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
+16998,Archangel_Wings_Box,Archangel Wings Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2573,1; },{},{}
 //18000,Cannon_Ball
 //18001,Holy_Cannon_Ball
 //18002,Dark_Cannon_Ball
diff --git a/db/map_cache.dat b/db/map_cache.dat
index de5e23957..6f034c6c7 100644
--- a/db/map_cache.dat
+++ b/db/map_cache.dat
diff --git a/db/map_index.txt b/db/map_index.txt
index d120516e9..f30553b19 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -810,6 +810,16 @@ mal_dun01
 1@cash
 iz_dun05
 evt_mobroom
+alde_tt03
+dic_dun03
+//mjolnir_04_1
+//evt_swar_b
+//evt_swar_r
+//evt_swar_s
+//evt_swar_t
+1@lhz
+lhz_dun04
+que_lhz
 
 // Only add maps under this line if they are not standard maps!
 
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 81de7614f..6bba81d28 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -2,7 +2,7 @@
 //
 //MOB_ID,dummy value (info only),STATE,SKILL_ID,SKILL_LV,rate (10000 = 100%),casttime,delay,cancelable,target,condition type,condition value,val1,val2,val3,val4,val5,emotion,chat
 //Example
-//1001,Poring@TF_POISON,attack,52,3,100,1500,10000,no,target,always,0,,,,,7
+//1001,Poring@TF_POISON,attack,52,3,100,1500,10000,no,target,always,0,,,,,7,
 //
 //rate refers to the chance of the skill being casted when the condition is fulfilled.
 //delay is the time in milliseconds that has to be pass before recasting the same skill.
diff --git a/db/packet_db.txt b/db/packet_db.txt
index 75561d553..572d3972f 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -1585,5 +1585,24 @@ packet_ver: 25
 0x0842,6,recall2,2
 0x0843,6,remove2,2
 
+//2010-11-24aRagexeRE
+packet_ver: 26
+0x0436,19,wanttoconnection,2:6:10:14:18
+0x035f,5,walktoxy,2
+0x0360,6,ticksend,2
+0x0361,5,changedir,2:4
+0x0362,6,takeitem,2
+0x0363,6,dropitem,2:4
+0x0364,8,movetokafra,2:4
+0x0365,8,movefromkafra,2:4
+0x0366,10,useskilltopos,2:4:6:8
+0x0367,90,useskilltoposinfo,2:4:6:8:10
+0x0368,6,getcharnamerequest,2
+0x0369,6,solvecharname,2
+0x0856,-1
+0x0857,-1
+0x0858,-1
+0x0859,-1
+
 //Add new packets here
-//packet_ver: 26
+//packet_ver: 27