Questlog fixes.

- Lost Child (bugreport:8791) http://rathena.org/board/tracker/issue-8791-lost-child-quest/ - Muff's Loan (bugreport:8787) http://rathena.org/board/tracker/issue-8787-muffs-loan/ - Peace For Arunafeltz (bugreport:8790, needs confirmation) http://rathena.org/board/tracker/issue-8790-peace-for-arunafeltz/ Added base entries for new pets; bonuses are currently not properly implemented. (bugreport:8777) http://rathena.org/board/tracker/issue-8777-pet-missing-tikbalang-database-entry/ Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-17 18:24:19 -04:00 · 2014-03-17 18:24:19 -04:00 · c8d792488f
commit c8d792488f
parent c7c5f7e89e
5 changed files with 23 additions and 17 deletions
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@ -88,7 +88,6 @@
 1815,EVENT_RICECAKE,Rice Cake,0,9028,0,511,80,60,50,100,250,20,2000,150,1,0,500,500,200,{ petskillsupport "CR_DEFENDER",3,240,50,100; },{ bonus2 bSubEle,Ele_Neutral,1; bonus bMaxHPrate,-1; }
 1245,GOBLINE_XMAS,Christmas Goblin,12225,9029,0,911,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "MG_SIGHT",5,5,5; },{ bonus bMaxHP,30; bonus2 bSubEle,Ele_Water,1; }

-// Newest pets.
 1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,5,5; },{ bonus bDef,1; bonus2 bSubRace,RC_DemiHuman,1; }
 1879,ECLIPSE_P,Spring Rabbit,0,9031,0,7766,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "TF_THROWSTONE",1,5,5; },{}
 1122,GOBLIN_1,Goblin,14569,9032,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_WINDATTACK",5,5,5; },{}
@ -123,3 +122,10 @@
 // Brasilis Quest - Suspicious Beach [UNHATCHABLE]
 2057,E_CRAMP,Strange Cramp,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // kRO version
 2081,E_HYDRA,Strange Hydra,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // iRO/cRO version
+
+// New pets (FIX ME: pet bonuses for 2210 and 2313 do not require loyalty)
+2200,J_TAINI,Tiny,0,9057,0,512,80,60,10,100,250,20,0,150,1,0,300,300,800,{},{}
+2210,XMAS_LUNATIC,Christmas Snow Rabbit,0,9058,0,529,80,60,10,100,250,20,0,150,1,0,300,300,800,{},{ bonus2 bExpAddRace,RC_All,5; }
+2313,TIKBALANG,Tikbalang,12699,9059,0,528,80,60,10,100,250,20,1000,150,1,0,300,300,800,{},{ bonus2 bAddDamageClass,2320,10; bonus2 bAddDamageClass,2321,10; bonus2 bAddDamageClass,2322,10; bonus2 bAddDamageClass,2317,10; bonus2 bAddDamageClass,2318,10; bonus2 bAddDamageClass,2327,10; bonus2 bAddDamageClass,2319,10; bonus2 bAddDamageClass,2333,10; bonus2 bAddDamageClass,2332,10; }
+1242,MARIN,Marin,12789,9061,10039,6534,80,60,50,100,250,20,2000,150,1,0,300,300,800,{},{}
+2398,LITTLE_PORING,Novice Poring,12846,9062,0,531,80,60,1000,0,250,0,5000,150,0,0,300,300,800,{},{ bonus bHPrecovRate,50; }
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@ -1328,7 +1328,7 @@
 2199,SIORAVA,Siorava,Siorava,87,6500,1,600,600,1,450,660,20,40,10,40,66,70,67,10,10,12,0,0,21,0x83,250,1536,1296,576,0,0,0,0,0,0,0,12624,700,7005,500,932,500,958,500,7071,500,13034,1,1202,1,0,0,0,0,4530,1

 // Izlude Dungeon F6
-//2200,J_TAINI,Taini,Taini,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x83,0,432,792,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2200,J_TAINI,Taini,Taini,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x83,0,432,792,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2201,SROPHO,Sropho,Sropho,113,24002,0,1934,1900,1,571,856,44,91,100,50,30,70,90,30,10,12,1,5,41,0x3795,135,700,600,360,0,0,0,0,0,0,0,951,7000,7938,500,756,250,12012,25,1971,25,1972,10,0,0,0,0,0,0,4522,1
 2202,KRAKEN,Kraken,Kraken,124,5602800,0,983332,961111,3,3823,4969,55,229,150,150,150,180,180,150,10,12,2,5,81,0x37B5,150,768,768,576,491666,607,5500,617,2250,616,450,962,9000,1422,1000,1484,500,1131,300,2347,100,7444,5000,0,0,0,0,0,0,4525,1
 2203,POT_DOFLE,Pot Dofle,Pot Dofle,115,25211,0,2650,1350,1,1088,1632,122,55,100,50,50,70,100,30,10,12,0,5,41,0x1089,135,768,768,576,0,0,0,0,0,0,0,1056,3000,7013,1000,1024,500,6257,100,969,2,617,1,0,0,0,0,0,0,4523,1
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@ -4223,7 +4223,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 		mes "Elegance? That's expected:";
 		mes "I didn't really design it for the common user in mind. Well,";
 		mes "why don't you try it again?";
-		erasequest 3106;
+		changequest 3106,3105;
 		set diamond_edq,10;
 		close;
 	}
@ -4241,8 +4241,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 		mes "is insert the damaged";
 		mes "document and press the";
 		mes "switch. Simple, yes?";
-		erasequest 3106;
-		changequest 3105,3108;
+		changequest 3107,3108;
 		set diamond_edq,13;
 		next;
 		mes "[Dorian]";
@ -4358,7 +4357,7 @@ OnTouch:
 					mes "The joint is broken...";
 					mes "You should go back";
 					mes "to Dorian for help.^000000";
-					setquest 3106;
+					changequest 3105,3106;
 					set diamond_edq,11;
 					close;
 				}
@ -4396,7 +4395,7 @@ OnTouch:
 					mes "^3355FFYou should tell Dorian";
 					mes "first so that you can";
 					mes "use this machine.^000000";
-					setquest 3107;
+					changequest 3105,3107;
 					set diamond_edq,12;
 					close;
 				}
@ -4420,7 +4419,7 @@ OnTouch:
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian...";
-							setquest 3106;
+							changequest 3105,3106;
 							set diamond_edq,11;
 							close;
 						case 1:
@ -4446,7 +4445,7 @@ OnTouch:
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian...";
-								setquest 3106;
+								changequest 3105,3106;
 								set diamond_edq,11;
 								close;
 							}
@ -4472,7 +4471,7 @@ OnTouch:
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian...";
-							setquest 3106;
+							changequest 3105,3106;
 							set diamond_edq,11;
 							close;
 						case 2:
@ -4498,7 +4497,7 @@ OnTouch:
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian...";
-								setquest 3106;
+								changequest 3105,3106;
 								set diamond_edq,11;
 								close;
 							}
@ -4523,7 +4522,7 @@ OnTouch:
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian...";
-							setquest 3106;
+							changequest 3105,3106;
 							set diamond_edq,11;
 							close;
 						case 3:
@ -4549,7 +4548,7 @@ OnTouch:
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian...";
-								setquest 3106;
+								changequest 3105,3106;
 								set diamond_edq,11;
 								close;
 							}
@ -4575,7 +4574,7 @@ OnTouch:
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian...";
-							setquest 3106;
+							changequest 3105,3106;
 							set diamond_edq,11;
 							close;
 						case 4:
@ -4601,7 +4600,7 @@ OnTouch:
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian...";
-								setquest 3106;
+								changequest 3105,3106;
 								set diamond_edq,11;
 								close;
 							}
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@ -350,7 +350,7 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Jenny about Phobe?";
 		mes "Sure, sure, I'll do that.";
 		set lost_boy,10;
-		changequest 8097,8097;
+		changequest 8096,8097;
 		close;
 	}
 	else if (lost_boy == 10) {
@ -6082,6 +6082,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "on business. She is highly";
 					mes "loved by the people, you know.";
 					set aru_em,9;
+					changequest 2131,2132;  // unconfirmed
 				}
 				else if ((aru_em == 9) || (aru_em == 10)) {
 					mes "[High Priest Zhed]";
--- a/sql-files/mob_db_re.sql
+++ b/sql-files/mob_db_re.sql
@ -1394,7 +1394,7 @@ REPLACE INTO `mob_db_re` VALUES (2198,'KING_DRAMOH','King Kray','King Dramoh',11
 REPLACE INTO `mob_db_re` VALUES (2199,'SIORAVA','Siorava','Siorava',87,6500,1,600,600,1,450,660,20,40,10,40,66,70,67,10,10,12,0,0,21,0x83,250,1536,1296,576,0,0,0,0,0,0,0,12624,700,7005,500,932,500,958,500,7071,500,13034,1,1202,1,0,0,0,0,4530,1);

 # Izlude Dungeon F6
-#REPLACE INTO `mob_db_re` VALUES (2200,'J_TAINI','Taini','Taini',1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x83,0,432,792,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2200,'J_TAINI','Taini','Taini',1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x83,0,432,792,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db_re` VALUES (2201,'SROPHO','Sropho','Sropho',113,24002,0,1934,1900,1,571,856,44,91,100,50,30,70,90,30,10,12,1,5,41,0x3795,135,700,600,360,0,0,0,0,0,0,0,951,7000,7938,500,756,250,12012,25,1971,25,1972,10,0,0,0,0,0,0,4522,1);
 REPLACE INTO `mob_db_re` VALUES (2202,'KRAKEN','Kraken','Kraken',124,5602800,0,983332,961111,3,3823,4969,55,229,150,150,150,180,180,150,10,12,2,5,81,0x37B5,150,768,768,576,491666,607,5500,617,2250,616,450,962,9000,1422,1000,1484,500,1131,300,2347,100,7444,5000,0,0,0,0,0,0,4525,1);
 REPLACE INTO `mob_db_re` VALUES (2203,'POT_DOFLE','Pot Dofle','Pot Dofle',115,25211,0,2650,1350,1,1088,1632,122,55,100,50,50,70,100,30,10,12,0,5,41,0x1089,135,768,768,576,0,0,0,0,0,0,0,1056,3000,7013,1000,1024,500,6257,100,969,2,617,1,0,0,0,0,0,0,4523,1);