Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged Hercules@de7a8c0eaaeeb0994f58c8b419e5d2523c7df5a7, Eden quest were giving wrong equipments.

Browse Source 
Merged Hercules@c7c956f71e63c9dd477c59d778c25690c6267b83 and fixed another bug in Collect Poison Spores case
This commit is contained in:
Atemo 2016-01-12 23:02:08 +01:00
parent b439ef3168
commit 6a62aab6d4
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
npc/re/quests/eden/11-25.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.2
//= 1.3
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
@ -12,19 +12,20 @@
//= 1.0 First Version.
//= 1.1 Some little optimization here and there. [Masao]
//= 1.2 Optimized. [Euphy]
//= 1.3 Bug fixes. [Capuche]
//============================================================
moc_para01,36,38,3 script Mission [11 - 25]#Tuto 857,{
if (countitem(6219) < 1) {
moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{
if (countitem(6219) < 1) {// Para_Team_Mark
mes "- You need to have an -";
mes "- ^4d4dff'Eden Group Mark'^000000 -";
mes "- to receive these missions. -";
close;
}
for(set .@i,11124; .@i<11134; set .@i,.@i+1)
for ( .@i = 11124; .@i < 11134; .@i++ )
if (checkquest(.@i,PLAYTIME) == 2) erasequest .@i;
for(set .@i,11114; .@i<11123; set .@i,.@i+1) {
set .@j, checkquest(.@i,HUNTING);
for( .@i = 11114; .@i < 11124; .@i++ ) {
.@j = checkquest(.@i,HUNTING);
if (.@j == 2) {
mes " - You must collect your - ";
mes " - reward before starting - ";
@ -69,50 +70,52 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 857,{
case 8: callsub L_Quest,11121,"Familiar Hunting"," - Hunt 20 ^4d4dffFamiliar^000000 - "," - in the Culvert Sewers - "," - west of Prontera. - ";
case 9: callsub L_Quest,11122,"Collect Feathers"," - Hunt 30 ^4d4dff'Peco Pecos'^000000 - "," - south of Prontera. - ";
case 10: callsub L_Quest,11123,"Collect Poison Spores"," - Hunt 30 ^4d4dffPoison Spores^000000 - "," - inside the Geffen Tower and - "," - bring 5 ^4d4dffPoison Spores^000000. - ";
case 11: mes " - Stop reading the bulletin board. - "; close;
case 11:
mes " - Stop reading the bulletin board. - ";
close;
}
end;
L_Quest:
if (checkquest(getarg(0),PLAYTIME) == 1) {
mes " - Mission ^4d4dff"+getarg(1)+"^000000 - ";
if (checkquest(getarg(0)+10,PLAYTIME) == 1) {
mes " - Mission ^4d4dff"+ getarg(1) +"^000000 - ";
mes " - is already finished for today. - ";
mes " ";
mes " - Manager : Spike - ";
close;
}
mes " - Mission '"+getarg(1)+"' - ";
for(set .@i,2; .@i<getargcount(); set .@i,.@i+1)
mes " - Mission '"+ getarg(1) +"' - ";
for ( .@i = 2; .@i < getargcount(); .@i++ )
mes getarg(.@i);
mes " ";
mes " - Manager : Spike - ";
next;
if(select("I will do this mission.:Look for other missions.") == 2) {
if (select("I will do this mission.:Look for other missions.") == 2) {
mes " - Let's search for -";
mes " - other missions. - ";
close;
}
for(set .@i,2; .@i<getargcount(); set .@i,.@i+1)
for ( .@i = 2; .@i < getargcount(); .@i++ )
mes getarg(.@i);
if (getarg(0) == 11123 && checkquest(11123,PLAYTIME) == 2)
erasequest 11133; // Special case for "Collect Poison Spores"
setquest getarg(0);
close;
}
moc_para01,32,30,6 script Spike 914,{
for(set .@i,11114; .@i<11124; set .@i,.@i+1) {
set .@j, checkquest(.@i,HUNTING);
if (.@j == 2) switch(.@i) {
case 11114: callsub L_Quest,.@i,"Hornet Hunting",900;
case 11115: callsub L_Quest,.@i,"Condor Hunting",1800;
case 11116: callsub L_Quest,.@i,"Grasshopper's Leg",1400,940,10;
case 11117: callsub L_Quest,.@i,"Worm Tail Hunting",2600;
case 11118: callsub L_Quest,.@i,"Spore Hunting",3900;
case 11119: callsub L_Quest,.@i,"Extirpate Insects",2900,915,10;
case 11120: callsub L_Quest,.@i,"Muka Hunting",3200;
case 11121: callsub L_Quest,.@i,"Familiar Hunting",3200;
case 11122: callsub L_Quest,.@i,"Collect Feathers",5400;
case 11123: callsub L_Quest,.@i,"Collect Poison Spores",6000,7033,5;
moc_para01,32,30,6 script Spike 4_F_CHILD,{
for( .@i = 11114; .@i < 11124; .@i++ ) {
.@j = checkquest(.@i,HUNTING);
if (.@j == 2) {
switch(.@i) {
case 11114: callsub L_Quest,.@i,"Hornet Hunting",900;
case 11115: callsub L_Quest,.@i,"Condor Hunting",1800;
case 11116: callsub L_Quest,.@i,"Grasshopper's Leg",1400,940,10;
case 11117: callsub L_Quest,.@i,"Worm Tail Hunting",2600;
case 11118: callsub L_Quest,.@i,"Spore Hunting",3900;
case 11119: callsub L_Quest,.@i,"Extirpate Insects",2900,915,10;
case 11120: callsub L_Quest,.@i,"Muka Hunting",3200;
case 11121: callsub L_Quest,.@i,"Familiar Hunting",3200;
case 11122: callsub L_Quest,.@i,"Collect Feathers",5400;
case 11123: callsub L_Quest,.@i,"Collect Poison Spores",6000,7033,5;
}
}
else if (.@j >= 0) {
mes "[Spike]";
@ -128,27 +131,30 @@ moc_para01,32,30,6 script Spike 914,{
mes "[Spike]";
mes "Why don't you look around and find some interesting tasks?";
close;
L_Quest:
.@quest_id = getarg(0);
if (checkquest(.@quest_id,HUNTING) == 2) {
.@item_req = getarg(3,0);
.@req_amount = getarg(4,0);
if (.@item_req)
if (.@item_req) {
if (countitem(.@item_req) < .@req_amount) {
mes "[Spike]";
mes "You don't have enough "+ getitemname(.@item_req) +".";
mes "You need to bring "+ .@req_amount +" "+ getitemname(.@item_req) +".";
close;
}
}
mes "[Spike]";
mes "Hmm... let me see~";
mes "You have completed the '"+getarg(1)+"' mission.";
mes "You have completed the '"+ getarg(1) +"' mission.";
next;
mes "[Spike]";
mes "Good work~!!";
mes "Our client is so happy with your work. He will appreciate what you have done.";
mes "Please help us again. Thanks!";
if (.@item_req) delitem .@item_req,.@req_amount;
if (.@item_req)
delitem .@item_req,.@req_amount;
erasequest .@quest_id;
setquest .@quest_id+10;
getexp getarg(2),0;

4
npc/re/quests/eden/eden_quests.txt
View File

@ -2120,8 +2120,8 @@ S_Select:
if (para_suv02 == 0) {
mes "You don't have a record of receiving any supplies";
mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
getitem 18514,1;// Para_Team_Hat2
getitem 2571,1; // Para_Team_Manteau2
getitem 5583,1;// Para_Team_Hat
getitem 2560,1;// Para_Team_Manteau
if (para_suv01 == 22)
para_suv02 = 2;
else