diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 07943734ce..2bdbb9b4c4 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -3169,7 +3169,7 @@ 5356,Pumpkin_Hat_H,Festival Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; bonus2 bAddRace,RC_Demon,5; },{},{} 5357,Wings_Of_Victory,Wings Of Victory,4,20,,200,,10,,0,0xFFFFFFFF,63,2,768,,0,0,365,{ bonus bMdef,10; bonus bUnbreakableHelm,0; },{},{} 5358,Pecopeco_Wing_Ears,Peco Ears,4,20,,100,,1,,0,0xFFFFFFFF,63,2,512,,70,0,366,{ bonus bAgi,1; bonus bMdef,2; bonus bUnbreakableHelm,0; },{},{} -5359,J_Captain_Hat,Ship Captain Hat,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,60,1,367,{ bonus bDex,1; bonus bLongAtkRate,3; },{},{} +5359,J_Captain_Hat,Ship Captain Hat,4,20,,300,,3,,1,0xFFFFFFFF,63,2,256,,60,1,367,{ bonus bDex,1; bonus bMaxHP,100; bonus bLongAtkRate,7; },{},{} 5360,Whikebain_Ears,Hyuke's Black Cat Ears,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,45,1,368,{ bonus bFlee,10; bonus bCritical,3; bonus bCritAtkRate,10; bonus bDefRate,-50; bonus bDef2Rate,-50; },{},{} 5361,Gang_Scarf,Gangster Scarf,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,369,{ bonus bBaseAtk,5; if(BaseJob==Job_Rogue) skill "RG_GANGSTER",1; },{},{} 5362,Ninja_Scroll,Ninja Scroll,4,20,,200,,0,,0,0xFFFFFFFF,63,2,1,,0,0,370,{ bonus bMatkRate,1; },{},{} diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 212e9c5242..ddc3e8a2a4 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -12675,7 +12675,7 @@ OnStop: donpcevent "#room2_1_warp::OnDisable"; donpcevent "#room2_2_warp::OnDisable"; donpcevent "Rin#moc_room2_2::OnDisable"; - donpcevent "Rin#moc_room2_1::OnDisable"; + //donpcevent "Rin#moc_room2_1::OnDisable"; donpcevent "Rayan#moc_room2_2::OnDisable"; donpcevent "que_job01#room_2::OnReset"; stopnpctimer; @@ -12690,7 +12690,7 @@ OnTimer245000: donpcevent "#room2_1_warp::OnDisable"; donpcevent "#room2_2_warp::OnDisable"; donpcevent "Rin#moc_room2_2::OnDisable"; - donpcevent "Rin#moc_room2_1::OnDisable"; + //donpcevent "Rin#moc_room2_1::OnDisable"; donpcevent "Rayan#moc_room2_2::OnDisable"; end; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index bbe4cb120b..d44a21d318 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -5882,7 +5882,7 @@ malaya,269,267,5 script Missing Person's Father 582,{ mes "He must be around here somewhere."; close; } else if (malaya_bakona2 == 1) { - if (countitem(6501) < 2) { + if (countitem(6520) < 2) { mes "[Missing Person's Father]"; mes "You are looking for two of his ^FF0000Lost Belongings^000000?"; mes "Are you confident that"; @@ -5899,7 +5899,7 @@ malaya,269,267,5 script Missing Person's Father 582,{ mes "Let's retrieve them from Tiucknuc that roams Baryo Mahiwaga Field,"; mes "seven ^FF0000Lost Belongings^000000"; mes "and deliver them to ^0000FFMissing Person's Friend^000000."; - delitem 6501,2; //Lost_Belongings + delitem 6520,2; //Lost_Belongings erasequest 1180; setquest 1181; set malaya_bakona2,2; @@ -5937,7 +5937,7 @@ malaya,265,274,5 script Missing Person's Friend 577,{ mes "somewhere."; close; } else if (malaya_bakona2 == 2) { - if (countitem(6501) < 7) { + if (countitem(6520) < 7) { mes "[Missing Person's Friend]"; mes "You are looking for seven ^FF0000Lost Belongings^000000"; mes "of my friend?"; @@ -5950,7 +5950,7 @@ malaya,265,274,5 script Missing Person's Friend 577,{ mes "of my friend... Where is my friend?"; mes "Bring him here, bring him here now!"; callsub L_Quest; - delitem 6501,7; //Lost_Belongings + delitem 6520,7; //Lost_Belongings erasequest 1181; setquest 1182; set malaya_bakona2,3; @@ -5987,7 +5987,7 @@ malaya,270,278,4 script Missing Person's Son 578,{ mes "Please find my father!"; close; } else if (malaya_bakona2 == 3) { - if (countitem(6501) < 3) { + if (countitem(6520) < 3) { mes "[Missing Person's Son]"; mes "You are looking for three ^FF0000Lost Belongings^000000"; mes "of my father? Why lost belongings and not my father?"; @@ -5999,7 +5999,7 @@ malaya,270,278,4 script Missing Person's Son 578,{ mes "These are ^FF0000Lost Belongings^000000 of my father."; mes "Oh dear lord... father!"; callsub L_Quest; - delitem 6501,3; //Lost_Belongings + delitem 6520,3; //Lost_Belongings erasequest 1182; setquest 1183; set malaya_bakona2,4; @@ -6033,7 +6033,7 @@ malaya,265,284,4 script Missing Person's Mother 579,{ mes "and she still isn't back."; close; } else if (malaya_bakona2 == 4) { - if (countitem(6501) < 5) { + if (countitem(6520) < 5) { mes "[Missing Person's Mother]"; mes "You are looking for five ^FF0000Lost Belongings^000000 of my child?"; mes "What does this mean?"; @@ -6054,7 +6054,7 @@ malaya,265,284,4 script Missing Person's Mother 579,{ mes "A mother that has gone mad..."; mes "Now that I finished finding the missing people,"; mes "I should report back to the Village Chief."; - delitem 6501,5; //Lost_Belongings + delitem 6520,5; //Lost_Belongings erasequest 1183; setquest 1184; set malaya_bakona2,5; diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index cf1f321436..ba7bc9aa3a 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -3200,7 +3200,7 @@ REPLACE INTO `item_db_re` VALUES (5355,'Muslim_Hat_F','Selendang',4,0,NULL,100,N REPLACE INTO `item_db_re` VALUES (5356,'Pumpkin_Hat_H','Festival Pumpkin Hat',4,20,NULL,200,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,206,'bonus2 bSubRace,RC_Demon,5; bonus2 bAddRace,RC_Demon,5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (5357,'Wings_Of_Victory','Wings Of Victory',4,20,NULL,200,NULL,10,NULL,0,0xFFFFFFFF,63,2,768,NULL,'0',0,365,'bonus bMdef,10; bonus bUnbreakableHelm,0;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (5358,'Pecopeco_Wing_Ears','Peco Ears',4,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,512,NULL,'70',0,366,'bonus bAgi,1; bonus bMdef,2; bonus bUnbreakableHelm,0;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (5359,'J_Captain_Hat','Ship Captain Hat',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'60',1,367,'bonus bDex,1; bonus bLongAtkRate,3;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (5359,'J_Captain_Hat','Ship Captain Hat',4,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'60',1,367,'bonus bDex,1; bonus bMaxHP,100; bonus bLongAtkRate,7;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (5360,'Whikebain_Ears','Hyuke\'s Black Cat Ears',4,20,NULL,200,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'45',1,368,'bonus bFlee,10; bonus bCritical,3; bonus bCritAtkRate,10; bonus bDefRate,-50; bonus bDef2Rate,-50;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (5361,'Gang_Scarf','Gangster Scarf',4,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,369,'bonus bBaseAtk,5; if(BaseJob==Job_Rogue) skill "RG_GANGSTER",1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (5362,'Ninja_Scroll','Ninja Scroll',4,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,370,'bonus bMatkRate,1;',NULL,NULL);