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

Added a few missing 'changequest' commands to Alchemist job quest. (Hercules 4b4e573)

Browse Source 
Minor cleanup in Wolfchev's Laboratory script.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
This commit is contained in:
Euphy 2014-05-18 08:36:12 -04:00
parent 9faa805da1
commit 2688d78e6a
4 changed files with 96 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/battle/battle.conf
View File

@ -94,11 +94,11 @@ vit_penalty_num: 5
// Use alternate method of DEF calculation for physical attacks. // Use alternate method of DEF calculation for physical attacks.
// With 0, disabled (use normal def% reduction with further def2 reduction) // With 0, disabled (use normal def% reduction with further def2 reduction)
// At 1 or more defense is subtraction of (DEF* value). // At 1 or more defense is subtraction of (DEF * value).
// eg: 10 + 50 def becomes 0 + (10*type + 50) // eg: 10 + 50 def becomes 0 + (10*type + 50)
weapon_defense_type: 0 weapon_defense_type: 0
//MDEF‚same as above....(MDEF*value) // MDEF‚ same as above. (MDEF * value)
magic_defense_type: 0 magic_defense_type: 0
// Change attacker's direction to face opponent on every attack? (Note 3) // Change attacker's direction to face opponent on every attack? (Note 3)

14
conf/msg_conf/map_msg.conf
View File

@ -306,7 +306,7 @@
290: The player is no longer killable. 290: The player is no longer killable.
291: Weather effects will dispell on warp/refresh 291: Weather effects will dispell on warp/refresh
292: Killer state reset. 292: Killer state reset.
//Item Bound System // Item Bound System
293: This bounded item cannot be traded to that character. 293: This bounded item cannot be traded to that character.
294: This bounded item cannot be stored there. 294: This bounded item cannot be stored there.
295: Please enter an item name or ID (usage: @item <item name/ID> <quantity> <bound type>). 295: Please enter an item name or ID (usage: @item <item name/ID> <quantity> <bound type>).
@ -516,7 +516,7 @@
515: Your instance has been reloaded. 515: Your instance has been reloaded.
516: Instance database has been reloaded. 516: Instance database has been reloaded.
//src/map/atcommand.c::ACMD_FUNC(auction) // @auction
517: Auction System is disabled. 517: Auction System is disabled.
//518~534: free //518~534: free
@ -538,7 +538,7 @@
//542: %.0s%.0sSomeone stole %s //542: %.0s%.0sSomeone stole %s
// 543~548 are not used (previously @away messages) // 543~548 are not used (previously @away messages)
// @Autotrade // @autotrade
549: You should have a shop open to use @autotrade. 549: You should have a shop open to use @autotrade.
//550 -> 650: Job Names //550 -> 650: Job Names
@ -717,17 +717,17 @@
710: Item %d has been removed from your cart. 710: Item %d has been removed from your cart.
711: Item %d has been removed from your storage. 711: Item %d has been removed from your storage.
//Item shop // Item shop
712: You do not have enough %s (%d). 712: You do not have enough %s (%d).
713: You do not have enough '%s'. 713: You do not have enough '%s'.
714: Item Shop List: %s (%d) 714: Item Shop List: %s (%d)
715: Point Shop List: '%s' 715: Point Shop List: '%s'
716: Your '%s' now: %d 716: Your '%s' now: %d
//Item Group // Item Group
717: [%s] has won [%s] from '%s' 717: [%s] has won [%s] from '%s'
//@showrate // @showrate
718: Personal rate information is not displayed now. 718: Personal rate information is not displayed now.
719: Personal rate information will be shown. 719: Personal rate information will be shown.
@ -1567,7 +1567,7 @@
1493: Type List: (default) all = -1, healing = 0, usable = 2, etc = 3, armor = 4, weapon = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10 1493: Type List: (default) all = -1, healing = 0, usable = 2, etc = 3, armor = 4, weapon = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
1494: %d items are dropped (%d skipped)! 1494: %d items are dropped (%d skipped)!
//Banking // Banking
1495: You can't withdraw that much money 1495: You can't withdraw that much money
1496: Banking is disabled 1496: Banking is disabled

11
npc/jobs/2-2/alchemist.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= nestor_zulueta (Fusion), converted by Darkchild //= nestor_zulueta (Fusion), converted by Darkchild
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 3.0 //= 3.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena Project //= rAthena Project
//===== Description: ========================================= //===== Description: =========================================
@ -17,6 +17,7 @@
//= 2.8 Fixed minor typo in test section. [L0ne_W0lf] //= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
//= 2.9 Added Quest Log commands. [Kisuka] //= 2.9 Added Quest Log commands. [Kisuka]
//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf] //= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
//= 3.1 Added missing changequest commands. [Kisuka]
//============================================================ //============================================================
alde_alche,27,185,5 script Alchemist Guildsman#am 744,{ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
@ -467,6 +468,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
mes "He'll teach you how to do the experiments. Just tell him that"; mes "He'll teach you how to do the experiments. Just tell him that";
mes "I sent you."; mes "I sent you.";
set ALCH_Q,6; set ALCH_Q,6;
changequest 2031,2032;
close; close;
} }
else { else {
@ -1092,6 +1094,7 @@ alde_alche,13,15,7 script Studying Man#am 750,{
mes "and cast away the last"; mes "and cast away the last";
mes "vestiges of Merchant life!!"; mes "vestiges of Merchant life!!";
set ALCH_Q,40; set ALCH_Q,40;
changequest 2033,2034;
close; close;
} }
else if (countitem(7134) > 2 && countitem(713) > 2 && countitem(507) > 0 && countitem(508) > 0 && countitem(509) > 0) { else if (countitem(7134) > 2 && countitem(713) > 2 && countitem(507) > 0 && countitem(508) > 0 && countitem(509) > 0) {
@ -1686,9 +1689,12 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
cutin "",255; cutin "",255;
end; end;
} }
if(checkquest(2039) != -1) { if (checkquest(2039) != -1) {
changequest 2039,2040; changequest 2039,2040;
} }
if (checkquest(2034) != -1) {
changequest 2034,2040;
}
mes "Ah, well done."; mes "Ah, well done.";
mes "I can see that you"; mes "I can see that you";
mes "have learned all of"; mes "have learned all of";
@ -1705,7 +1711,6 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
mes "illustrious Union."; mes "illustrious Union.";
mes "I hope you learn a lot..."; mes "I hope you learn a lot...";
next; next;
if (.@jlevel == 50) { if (.@jlevel == 50) {
getitem 7133,1; //Slim_Potion_Create_Book getitem 7133,1; //Slim_Potion_Create_Book
mes "[Vincent Carsciallo]"; mes "[Vincent Carsciallo]";

35
npc/re/instances/WolfchevLaboratory.txt
View File

@ -2546,6 +2546,7 @@ OnTimer3000:
end; end;
OnInstanceInit: OnInstanceInit:
OnDisable:
disablenpc instance_npcname("#potal_02"); disablenpc instance_npcname("#potal_02");
end; end;
@ -2554,10 +2555,6 @@ OnEnable:
enablenpc instance_npcname("#potal_02"); enablenpc instance_npcname("#potal_02");
end; end;
OnDisable:
disablenpc instance_npcname("#potal_02");
end;
OnTouch: OnTouch:
warp instance_mapname("1@lhz"), 84, 28; warp instance_mapname("1@lhz"), 84, 28;
end; end;
@ -3054,7 +3051,7 @@ OnMyMobDead:
mes "The button was supposed to be pressed for an emergency case...but.."; mes "The button was supposed to be pressed for an emergency case...but..";
next; next;
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "Hey.. You and I met by a bad connection...."; mes "Hey... You and I met by a bad connection....";
next; next;
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "But...., you helped me... How could you do that?"; mes "But...., you helped me... How could you do that?";
@ -3066,7 +3063,7 @@ OnMyMobDead:
mes "But actually, you did that because you was lonely,.. you just concentrated on that for this reason, huh?"; mes "But actually, you did that because you was lonely,.. you just concentrated on that for this reason, huh?";
next; next;
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "HAHAHAHa. Loneliness.. You say?"; mes "HAHAHAHA. Loneliness... you say?";
next; next;
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "It might be seen like that to you. But, it isn't. Loneliness is just a good and easy excuse of the losers."; mes "It might be seen like that to you. But, it isn't. Loneliness is just a good and easy excuse of the losers.";
@ -3124,7 +3121,7 @@ OnMyMobDead:
next; next;
} else { } else {
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "kakakaah.. Thank you. You handled those Boss creatures well.."; mes "kakakaah.. Thank you. You handled those Boss creatures well...";
next; next;
} }
if (lght_duk01 == 7) { if (lght_duk01 == 7) {
@ -3133,10 +3130,10 @@ OnMyMobDead:
mes "While you were struggling..."; mes "While you were struggling...";
next; next;
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "I figured out something..and there's a system error which doesn't let us come and go freely, so you could help me in 72 hours... Go somewhere to take rest before you come back.."; mes "I figured something out... and there's a system error which doesn't let us come and go freely, so you could help me in 72 hours... Go somewhere to rest before you come back.";
next; next;
mes "[Wolfchev]"; mes "[Wolfchev]";
mes "Ah.. and I can send you out of my laboratory. Do you want?"; mes "Ah... and I can send you out of my laboratory. Do you want?";
next; next;
} else { } else {
mes "[Wolfchev]"; mes "[Wolfchev]";
@ -3161,16 +3158,16 @@ L_Reward:
} }
.@r = rand(1, 1000); .@r = rand(1, 1000);
if (.@r < 84) getitem 2582, 1; //Salvage_Cape if (.@r < 84) getitem 2582, 1; //Salvage_Cape
else if (.@r >= 84 && .@r < 167) getitem 18570, 1; //Ancient_Gold_Deco else if (.@r < 167) getitem 18570, 1; //Ancient_Gold_Deco
else if (.@r >= 167 && .@r < 250) getitem 1490, 1; //Giant_Lance else if (.@r < 250) getitem 1490, 1; //Giant_Lance
else if (.@r >= 250 && .@r < 333) getitem 16017, 1; //Bloody_Cross else if (.@r < 333) getitem 16017, 1; //Bloody_Cross
else if (.@r >= 333 && .@r < 416) getitem 1291, 1; //Guillotine_Katar else if (.@r < 416) getitem 1291, 1; //Guillotine_Katar
else if (.@r >= 416 && .@r < 499) getitem 1584, 1; //Chilly_Spell_Book else if (.@r < 499) getitem 1584, 1; //Chilly_Spell_Book
else if (.@r >= 499 && .@r < 582) getitem 6471, 10; //Goast_Chill else if (.@r < 582) getitem 6471, 10; //Goast_Chill
else if (.@r >= 582 && .@r < 665) getitem 6470, 10; //Blood_Thirst else if (.@r < 665) getitem 6470, 10; //Blood_Thirst
else if (.@r >= 665 && .@r < 748) getitem 6469, 10; //Will_Of_Warrior else if (.@r < 748) getitem 6469, 10; //Will_Of_Warrior
else if (.@r >= 748 && .@r < 831) getitem 6471, 20; //Goast_Chill else if (.@r < 831) getitem 6471, 20; //Goast_Chill
else if (.@r >= 831 && .@r < 914) getitem 6470, 20; //Blood_Thirst else if (.@r < 914) getitem 6470, 20; //Blood_Thirst
else getitem 6469, 20; //Will_Of_Warrior else getitem 6469, 20; //Will_Of_Warrior
return; return;