Browse Source

* Updated Minstrel and Shadow Chaser job quests to their latest versions.
* Fixed more Izlude RE coordinates (bugreport:6285).
* Disabled "Fish Tails" NPC in El Dicastes quests until Izlude RE coordinates are found; also, fixed a small mistake.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17024 54d463be-8e91-2dee-dedb-b68131a5f0ec

euphyy 12 years ago
parent
commit
35a5ef2a9e

+ 1 - 1
conf/battle/party.conf

@@ -45,7 +45,7 @@ party_item_share_type: 0
 idle_no_share: no
 idle_no_share: no
 
 
 // Give additional experience bonus per party-member involved on even-share parties (excluding youself)?
 // Give additional experience bonus per party-member involved on even-share parties (excluding youself)?
-// ex. If set to 10, a even-share party of 5 people will receive +40% exp (4 members * 10% exp):
+// ex. If set to 10, an even-share party of 5 people will receive +40% exp (4 members * 10% exp):
 //     140% party experience in total, so each member receives 140%/5 = 28% exp (instead of 20%).
 //     140% party experience in total, so each member receives 140%/5 = 28% exp (instead of 20%).
 party_even_share_bonus: 0
 party_even_share_bonus: 0
 
 

+ 3 - 3
db/quest_db.txt

@@ -670,18 +670,18 @@
 7161,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
 7161,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
 7162,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
 7162,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
 7163,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
 7163,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
-7164,0,0,0,0,0,0,0,"Hunt for shadow of deception"
+7164,0,2076,1,0,0,0,0,"Hunt for shadow of deception"
 7165,0,0,0,0,0,0,0,"Key of deception"
 7165,0,0,0,0,0,0,0,"Key of deception"
 7166,0,0,0,0,0,0,0,"Rachel Branch of Shadow Workshop"
 7166,0,0,0,0,0,0,0,"Rachel Branch of Shadow Workshop"
 7167,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
 7167,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
 7168,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
 7168,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
 7169,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
 7169,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
 7170,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
 7170,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
-7171,0,0,0,0,0,0,0,"Hunt for shadow of delusion"
+7171,0,2077,1,0,0,0,0,"Hunt for shadow of delusion"
 7172,0,0,0,0,0,0,0,"Key of delusion"
 7172,0,0,0,0,0,0,0,"Key of delusion"
 7173,0,0,0,0,0,0,0,"Message to Halled from Paul"
 7173,0,0,0,0,0,0,0,"Message to Halled from Paul"
 7174,0,0,0,0,0,0,0,"Mysterious Cryptogram - 4th"
 7174,0,0,0,0,0,0,0,"Mysterious Cryptogram - 4th"
-7175,0,0,0,0,0,0,0,"Hunft for shadow of gaiety"
+7175,0,2078,1,0,0,0,0,"Hunft for shadow of gaiety"
 7176,0,0,0,0,0,0,0,"Key of Gaiety"
 7176,0,0,0,0,0,0,0,"Key of Gaiety"
 7177,0,0,0,0,0,0,0,"A young guy in Lighthalzen"
 7177,0,0,0,0,0,0,0,"A young guy in Lighthalzen"
 7178,0,0,0,0,0,0,0,"Destination of Deception, Delusion and Gaiety"
 7178,0,0,0,0,0,0,0,"Destination of Deception, Delusion and Gaiety"

+ 6 - 2
npc/kafras/kafras.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Joseph
 //= Joseph
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: =========================================
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //= 0.x Previous Authors: 
 //= 0.x Previous Authors: 
 //=     - L0ne_W0lf, kobra_k88, Samuray22, Evera, Lupus
 //=     - L0ne_W0lf, kobra_k88, Samuray22, Evera, Lupus
 //= 1.0 Merged and cleaned up Kafras. [Joseph]
 //= 1.0 Merged and cleaned up Kafras. [Joseph]
+//= 1.1 Added Izlude RE coordinates. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 // Aldebaran
 // Aldebaran
@@ -411,7 +412,10 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 	mes "are always on your side.";
 	mes "are always on your side.";
 	mes "How may I assist you?";
 	mes "How may I assist you?";
 	callfunc "F_Kafra",5,0,1,40,820;
 	callfunc "F_Kafra",5,0,1,40,820;
-	savepoint "izlude",94,103;
+	if (checkre(0))
+		savepoint "izlude",129,97;
+	else
+		savepoint "izlude",94,103;
 	callfunc "F_KafEnd",0,1,"in the city of Izlude";
 	callfunc "F_KafEnd",0,1,"in the city of Izlude";
 }
 }
 
 

File diff suppressed because it is too large
+ 284 - 283
npc/re/jobs/3-2/minstrel.txt


File diff suppressed because it is too large
+ 425 - 423
npc/re/jobs/3-2/shadow_chaser.txt


+ 1 - 1
npc/re/quests/eden/11-25.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Mission [11 - 25]
+//= Eden Group Quests - Mission [11 - 25]
 //===== By: ==================================================
 //===== By: ==================================================
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 1 - 1
npc/re/quests/eden/26-40.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Mission [26 - 40]
+//= Eden Group Quests - Mission [26 - 40]
 //===== By: ==================================================
 //===== By: ==================================================
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 1 - 1
npc/re/quests/eden/41-55.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Mission [41 - 55]
+//= Eden Group Quests - Mission [41 - 55]
 //===== By: ==================================================
 //===== By: ==================================================
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 1 - 1
npc/re/quests/eden/56-70.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Mission [56 - 70]
+//= Eden Group Quests - Mission [56 - 70]
 //===== By: ==================================================
 //===== By: ==================================================
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 1 - 1
npc/re/quests/eden/71-85.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Mission [71 - 85]
+//= Eden Group Quests - Mission [71 - 85]
 //===== By: ==================================================
 //===== By: ==================================================
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 1 - 1
npc/re/quests/eden/86-90.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Mission [86 - 90]
+//= Eden Group Quests - Mission [86 - 90]
 //===== By: ==================================================
 //===== By: ==================================================
 //= Chilly
 //= Chilly
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 1 - 1
npc/re/quests/eden/91-99.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Mission [91 - 99]
+//= Eden Group Quests - Mission [91 - 99]
 //===== By: ==================================================
 //===== By: ==================================================
 //= Chilly
 //= Chilly
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 4 - 3
npc/re/quests/eden/eden_common.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script ======================================= 
 //===== rAthena Script ======================================= 
-// Eden Group Quests - Common NPCs
+//= Eden Group Quests - Common NPCs
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 1.3 Some little optimization here and there. [Masao]
 //= 1.3 Some little optimization here and there. [Masao]
 //= 1.4 Updated to match the new Izlude Map. [Masao]
 //= 1.4 Updated to match the new Izlude Map. [Masao]
 //= 1.5 Added some missing Eden Group Teleport Officers. [Masao]
 //= 1.5 Added some missing Eden Group Teleport Officers. [Masao]
+//= 1.6 Added Izlude RE coordinates. [Euphy]
 //============================================================
 //============================================================
 
 
 moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
 moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
@@ -246,7 +247,7 @@ OnTouch:
 		case 3: warp "geffen",120,39; end;
 		case 3: warp "geffen",120,39; end;
 		case 4: warp "alberta",117,56; end;
 		case 4: warp "alberta",117,56; end;
 		case 5: warp "aldebaran",168,112; end;
 		case 5: warp "aldebaran",168,112; end;
-		case 6: warp "izlude",127,142; end;
+		case 6: if (checkre(0)) warp "izlude",134,118; else warp "izlude",127,142; end;
 		case 7: warp "prt_church",99,78; end;
 		case 7: warp "prt_church",99,78; end;
 		case 8: warp "geffen_in",162,99; end;
 		case 8: warp "geffen_in",162,99; end;
 		case 9: warp "moc_prydb1",51,118; end;
 		case 9: warp "moc_prydb1",51,118; end;

+ 1 - 1
npc/re/quests/eden/eden_quests.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quest - Quests NPCs
+//= Eden Group Quest - Quests NPCs
 //===== By: ==================================================
 //===== By: ==================================================
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 1 - 1
npc/re/quests/eden/eden_service.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
 //===== rAthena Script =======================================
-// Eden Group Quests - Service NPCs
+//= Eden Group Quests - Service NPCs
 //===== By: ==================================================
 //===== By: ==================================================
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //===== Current Version: =====================================

+ 22 - 20
npc/re/quests/quests_dicastes.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
 //===== Current Version: =====================================
-//= 1.8
+//= 1.8a
 //===== Compatible With: =====================================
 //===== Compatible With: =====================================
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: =========================================
 //===== Description: =========================================
@@ -24,6 +24,7 @@
 //= 1.6 Fixed missing checks for quest: Sapha's Visit. [Joseph]
 //= 1.6 Fixed missing checks for quest: Sapha's Visit. [Joseph]
 //= 1.7 Updated to match the official script. [Joseph]
 //= 1.7 Updated to match the official script. [Joseph]
 //= 1.8 Optimized and fixed invalid checkquest. [Joseph]
 //= 1.8 Optimized and fixed invalid checkquest. [Joseph]
+//= 1.8a Disabled "Fish Tails" until Izlude RE coordinates are found. [Euphy]
 //============================================================
 //============================================================
 
 
 // Entrance
 // Entrance
@@ -1026,7 +1027,7 @@ dic_in01,40,193,1	script	Papyrus#0001	453,{
 	else if (.@doc == 11) eldicastes_dp(12169,"Stem","There is nothing like Midgard plants in Manuk.","These plants are used for food and medicine and some are even poisonous.");
 	else if (.@doc == 11) eldicastes_dp(12169,"Stem","There is nothing like Midgard plants in Manuk.","These plants are used for food and medicine and some are even poisonous.");
 	else if (.@doc == 12) eldicastes_dp(12170,"Pointed Scale","Stem from a bumpy life form. Research required as the usage is unknown.","");
 	else if (.@doc == 12) eldicastes_dp(12170,"Pointed Scale","Stem from a bumpy life form. Research required as the usage is unknown.","");
 	else if (.@doc == 13) eldicastes_dp(12171,"Resin","Sap from an old tree collected and solidified. Very valuable in the human world.","");
 	else if (.@doc == 13) eldicastes_dp(12171,"Resin","Sap from an old tree collected and solidified. Very valuable in the human world.","");
-	else if (.@doc == 14) eldicastes_dp(12174,"Fish Tail","Humans eat meat called fish.","Can be used as important food supply for foreign adventurers visiting in the city.");
+	//else if (.@doc == 14) eldicastes_dp(12174,"Fish Tail","Humans eat meat called fish.","Can be used as important food supply for foreign adventurers visiting in the city.");
 	else if (.@doc == 15) eldicastes_dp(12175,"Worm Peeling","They say some Worm Peelings are valuable.","But this is based on the human's standard of value. Research required.");
 	else if (.@doc == 15) eldicastes_dp(12175,"Worm Peeling","They say some Worm Peelings are valuable.","But this is based on the human's standard of value. Research required.");
 	else if (.@doc == 16) eldicastes_dp(12176,"Gill","There are Midgard creatures that live in the sea and breathe through gills.","Further research on their ecology will be useful.");
 	else if (.@doc == 16) eldicastes_dp(12176,"Gill","There are Midgard creatures that live in the sea and breathe through gills.","Further research on their ecology will be useful.");
 	else if (.@doc == 17) eldicastes_dp(12177,"Tooth of Bat","Traces of a nocturnal creature unknown to Manuk. Not a strong creature from the size of its teeth.","");
 	else if (.@doc == 17) eldicastes_dp(12177,"Tooth of Bat","Traces of a nocturnal creature unknown to Manuk. Not a strong creature from the size of its teeth.","");
@@ -1063,6 +1064,7 @@ dic_in01,40,193,1	script	Papyrus#0001	453,{
 	else if (.@doc == 48) eldicastes_dp(12211,"Feather","Warm hair as soft as downy hair.","Must be used for cold protection. Collectable throughout Midgard.");
 	else if (.@doc == 48) eldicastes_dp(12211,"Feather","Warm hair as soft as downy hair.","Must be used for cold protection. Collectable throughout Midgard.");
 	else if (.@doc == 49) eldicastes_dp(12212,"Red Herb","Kind of medicinal red plant.","Humans use this to make recovery medicine. Plant worth researching.");
 	else if (.@doc == 49) eldicastes_dp(12212,"Red Herb","Kind of medicinal red plant.","Humans use this to make recovery medicine. Plant worth researching.");
 	else if (.@doc == 50) eldicastes_dp(12213,"Carrot","Red colored plant. Pub owner requests it all the time. Worth research.","");
 	else if (.@doc == 50) eldicastes_dp(12213,"Carrot","Red colored plant. Pub owner requests it all the time. Worth research.","");
+	close;
 
 
 	function	eldicastes_dp	{
 	function	eldicastes_dp	{
 		if (checkquest(getarg(0)) >= 0) {
 		if (checkquest(getarg(0)) >= 0) {
@@ -1087,24 +1089,24 @@ dic_in01,25,187,0	duplicate(Document Package#main)	Document Package#0004	844
 //============================================================
 //============================================================
 
 
 function	script	unknown_d	{
 function	script	unknown_d	{
-		if (checkquest(getarg(0)) == -1) {
-			mes "You see some traces of digging";
-			close;
-		}
-		specialeffect2 310;
-		specialeffect2 830;
-		progressbar "ffff00",4;
-		erasequest getarg(0);
-		mes "You were able to find information on the Reptile Tongue";
-		specialeffect2 18;
-		getitem getarg(1),rand(1,4);
-		if (!rand(2)) {
-			next;
-			mes "In addition, you've obtained an unknown relic to report back to the Saphas";
-			specialeffect2 18;
-			getitem 6308,1; //Unidentified_Relic
-		}
+	if (checkquest(getarg(0)) == -1) {
+		mes "You see some traces of digging";
 		close;
 		close;
+	}
+	specialeffect2 310;
+	specialeffect2 830;
+	progressbar "ffff00",4;
+	erasequest getarg(0);
+	mes "You were able to find information on the "+getitemname(getarg(1))+".";
+	specialeffect2 18;
+	getitem getarg(1),rand(1,4);
+	if (!rand(2)) {
+		next;
+		mes "In addition, you've obtained an unknown relic to report back to the Saphas.";
+		specialeffect2 18;
+		getitem 6308,1; //Unidentified_Relic
+	}
+	close;
 }
 }
 prt_fild09,371,255,0	script	Reptile Tongues	844,{ unknown_d(12167,903); }
 prt_fild09,371,255,0	script	Reptile Tongues	844,{ unknown_d(12167,903); }
 prt_fild09,352,241,0	script	Scorpion Tails	844,{ unknown_d(12168,904); }
 prt_fild09,352,241,0	script	Scorpion Tails	844,{ unknown_d(12168,904); }
@@ -1113,7 +1115,7 @@ pay_fild02,105,113,0	script	Pointed Scales	844,{ unknown_d(12170,906); }
 pay_fild01,152,171,0	script	Resin	844,{ unknown_d(12171,907); }
 pay_fild01,152,171,0	script	Resin	844,{ unknown_d(12171,907); }
 gef_fild01,104,111,0	script	Spawn	844,{ unknown_d(12172,908); }
 gef_fild01,104,111,0	script	Spawn	844,{ unknown_d(12172,908); }
 prt_fild08,299,332,0	script	Jellopy	844,{ unknown_d(12173,909); }
 prt_fild08,299,332,0	script	Jellopy	844,{ unknown_d(12173,909); }
-izlude,132,136,0	script	Fish Tails	844,{ unknown_d(12174,1023); }
+//izlude,132,136,0	script	Fish Tails	844,{ unknown_d(12174,1023); }
 prt_fild05,303,169,0	script	Worm Peelings	844,{ unknown_d(12175,955); }
 prt_fild05,303,169,0	script	Worm Peelings	844,{ unknown_d(12175,955); }
 iz_dun03,155,165,0	script	Gills	844,{ unknown_d(12176,956); }
 iz_dun03,155,165,0	script	Gills	844,{ unknown_d(12176,956); }
 mjo_dun01,222,226,0	script	Tooth of Bat	844,{ unknown_d(12177,913); }
 mjo_dun01,222,226,0	script	Tooth of Bat	844,{ unknown_d(12177,913); }

Some files were not shown because too many files changed in this diff