- Fixed a bug in a previous Adoption fix from umage (partnerid is char_id not account_id)

- Added new headgears from EuRO and ThRO.
- Fixed some viewids.

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

2 files changed, 13 insertions, 8 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index c25f0eebb..c0d9b5787 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -2124,8 +2124,8 @@
 5243,Chullos,Ear Muffs Hat,5,,10,800,,2,,1,0xFFFFFFFF,7,2,768,,0,1,287,{ bonus2 bResEff,Eff_Freeze,1000; },{},{}
 5244,Elven_Blinker,Elven Blinker,5,,10,200,,1,,0,0xFFFFFFFF,7,2,512,,0,0,73,{ bonus2 bResEff,Eff_Blind,10000; },{},{}
 5245,Elven_Sunglasses,Elven Sunglasses,5,,10,200,,1,,0,0xFFFFFFFF,7,2,512,,0,0,73,{ bonus2 bResEff,Eff_Blind,500; },{},{}
-5246,Angel_Helm,Angel Helm,5,,10,0,,3,,0,0xFFFFFFFF,7,2,256,,0,0,38,{ bonus bAgi,1; bonus bLuk,1; bonus bMdef,3; bonus2 bSubRace,RC_Demon,5; },{},{}
-5247,Evil_Helm,Evil Helm,5,,10,0,,4,,0,0xFFFFFFFF,7,2,256,,0,0,39,{ bonus bAgi,1; bonus bLuk,1; bonus bMdef,3; bonus2 bSubRace,RC_Demon,5; },{},{}
+5246,Angel_Helm,Angel Helm,5,,10,0,,3,,0,0xFFFFFFFF,7,2,256,,0,0,290,{ bonus bAgi,1; bonus bLuk,1; bonus bMdef,3; bonus2 bSubRace,RC_Demon,5; },{},{}
+5247,Evil_Helm,Evil Helm,5,,10,0,,4,,0,0xFFFFFFFF,7,2,256,,0,0,291,{ bonus bAgi,1; bonus bLuk,1; bonus bMdef,3; bonus2 bSubRace,RC_Demon,5; },{},{}
 5248,Robot_Blinker,Robot Blinker,5,,10,200,,1,,0,0xFFFFFFFF,7,2,512,,0,0,82,{ bonus2 bResEff,Eff_Blind,10000; },{},{}
 5249,Human_Blinker,Human Blinker,5,,10,200,,1,,0,0xFFFFFFFF,7,2,512,,0,0,82,{ bonus2 bResEff,Eff_Blind,10000; },{},{}
 5250,Robot_Ear,Robot Ear,5,,10,10,,0,,0,0xFFFFFFFF,7,2,512,,0,0,73,{},{},{}
@@ -2241,8 +2241,8 @@
 //5361,Ganster_Scarf,Ganster Scarf,5,,,100,,0,,0,0xFFFFFFFF,7,2,1,,60,0,369,{ bonus bBaseAtk,5; if(BaseJob == Job_Rogue) skill 223,1; },{},{}
 //5362,Ninja's_Scroll,Ninja's Scroll,5,,,200,,0,,0,0xFFFFFFFF,7,2,1,,60,0,370,{ bonus bMatkRate,1; },{},{}
 //5366,Love_Dad_Bandana,Love Dad Bandana,5,,,200,,3,,0,0xFFFFFFFF,7,2,256,,0,1,374,{ bonus bStr,2; },{},{}
-5368,White_Wing,White Wing,5,20,,100,,2,,0,0xFFFFFFFE,7,2,256,,0,1,38,{ bonus2 bAddMonsterDropItem,12279,300; },{},{}
-5369,Dark_Wing,Dark Wing,5,20,,100,,1,,0,0xFFFFFFFE,7,2,256,,0,1,39,{ bonus2 bAddMonsterDropItem,12280,300; },{},{}
+5368,White_Wing,White Wing,5,20,,100,,2,,0,0xFFFFFFFE,7,2,256,,0,1,38,{ bonus2 bAddMonsterDropItem,12280,300; },{},{}
+5369,Dark_Wing,Dark Wing,5,20,,100,,1,,0,0xFFFFFFFE,7,2,256,,0,1,39,{ bonus2 bAddMonsterDropItem,12279,300; },{},{}
 //5370,Orchid_Hairband,Orchid Hairband,5,,,200,,1,,0,0xFFFFFFFF,7,2,256,,0,1,376,{ bonus bInt,1; },{},{}
 5371,Judge_Cap,Judge Cap,5,,,300,,2,,0,0xFFFFFFFF,7,2,256,,0,1,377,{ bonus bLuk,1; bonus bMaxSP,30; },{},{}
 //5372,Koneko_Hat,Koneko Hat,5,,,500,,1,,0,0xFFFFFFFF,7,2,256,,0,1,378,{ bonus bDelayRate,-3; bonus bMatkRate,3; bonus bMaxSPrate,3; bonus bMdef,3; },{},{}
@@ -2263,10 +2263,13 @@
 //5387,Nekomimi_Kafra_Headband,Nekomimi Kafra Headband,5,,,200,,1,,1,0xFFFFFFFF,7,2,256,,30,1,392,{ bonus bMdef,5; },{},{}
 //5388,Snake_Head_Hat,Snake Head Hat,5,,,200,,1,,1,0xFFFFFFFE,7,2,256,,30,1,393,{ bonus bDoubleRate,5; },{},{}
 //5389,Angel_Of_Ghost,Angel Of Ghost,5,,,200,,0,,0,0xFFFFFFFE,7,2,512,,30,0,394,{ bonus bAtkRate,2; bonus bMatkRate,2; },{},{}
-//5390,Frozen_Twin_Pompom,Frozen Twin Pompom,5,,,100,,2,,0,0xFFFFFFFE,7,2,256,,0,1,396,{ bonus2 bResEff,Eff_Freeze,3000; },{},{}
+//5390,Frozen_Twin_Pompom,Frozen Twin Pompom,5,,,100,,2,,0,0xFFFFFFFE,7,2,256,,0,1,395,{ bonus2 bResEff,Eff_Freeze,3000; },{},{}
 //5391,Crunch_Toast,Crunch Toast,5,,,100,,0,,0,0xFFFFFFFE,7,2,1,,0,0,397,{ bonus bMaxHP,100; bonus2 bAddMonsterDropItem,617,10; },{},{}
-//5392,Louyang_NewYear_Hat,Louyang NewYear Hat,5,,,300,,3,,1,0xFFFFFFFE,7,2,256,,0,1,398,{ bonus bLuk,2; bonus2 bAddMonsterDropItem,668,3; },{},{}
-//5393,Valentine_Hat,Love Valentine's Hat,5,,,200,,2,,0,0xFFFFFFFE,7,2,256,,0,0,399,{ bonus bMaxSPrate,7; bonus bMaxHPrate,7; },{},{}
+//5392,Louyang_NewYear_Hat,Louyang NewYear Hat,5,,,300,,3,,1,0xFFFFFFFE,7,2,256,,0,1,396,{ bonus bLuk,2; bonus2 bAddMonsterDropItem,668,3; },{},{}
+//5393,Valentine_Hat,Love Valentine's Hat,5,,,200,,2,,0,0xFFFFFFFE,7,2,256,,0,0,397,{ bonus bMaxSPrate,7; bonus bMaxHPrate,7; },{},{}
+//5395,Tiraya_Bonnet,Tiraya Bonnet,5,,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,398,{},{},{}
+//5396,Jasper_Crest,Jasper Crest,5,,,700,,2,,0,0xFFFFFFFF,7,2,256,,0,1,399,{ bonus bDex,3; bonus bVit,1; },{},{}
+//5397,Scuba_Gear,Scuba Gear,5,0,,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,400,{ bonus2 bSubEle,Ele_Water,10; },{},{}
 5800,Blush_Of_Groom,Blush of Groom,5,,,50,,0,,0,0xFFFFFFFF,7,2,512,,0,0,125,{ bonus2 bSubRace,RC_DemiHuman,3; },{},{}
 5801,Ribbon_Of_Bride,Red Tailed Ribbon,5,,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,167,{ bonus bAllStats,2; bonus2 bSubRace,RC_DemiHuman,10; if (getskilllv(29) == 10) { bonus3 bAutoSpellWhenHit,28,10,20; } else { bonus3 bAutoSpellWhenHit,28,5,20; } },{},{}
 5802,Upgrade_Elephant_Hat,Upgraded Elephant Hat,5,,,500,,3,,1,0xFFFFFFFF,7,2,256,,0,1,215,{},{},{}
diff --git a/src/map/clif.c b/src/map/clif.c
index 532d42ff1..0d8a5803a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12086,8 +12086,10 @@ void clif_parse_Adopt_reply(int fd, struct map_session_data *sd)
 
 	if( p1_sd == NULL || p2_sd == NULL )
 		return; // Both players need to be online
-	if( pid != p1_sd->status.account_id || p2_id != p1_sd->status.partner_id )
+
+	if( pid != p1_sd->status.account_id )
 		return; // Incorrect values
+
 	if( result == 0 )
 		return; // Rejected