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.
// 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)
weapon_defense_type: 0
//MDEF‚same as above....(MDEF*value)
// MDEF‚ same as above. (MDEF * value)
magic_defense_type: 0
// 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.
291: Weather effects will dispell on warp/refresh
292: Killer state reset.
//Item Bound System
// Item Bound System
293: This bounded item cannot be traded to that character.
294: This bounded item cannot be stored there.
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.
516: Instance database has been reloaded.
//src/map/atcommand.c::ACMD_FUNC(auction)
// @auction
517: Auction System is disabled.
//518~534: free
@ -538,7 +538,7 @@
//542: %.0s%.0sSomeone stole %s
// 543~548 are not used (previously @away messages)
// @Autotrade
// @autotrade
549: You should have a shop open to use @autotrade.
//550 -> 650: Job Names
@ -717,17 +717,17 @@
710: Item %d has been removed from your cart.
711: Item %d has been removed from your storage.
//Item shop
// Item shop
712: You do not have enough %s (%d).
713: You do not have enough '%s'.
714: Item Shop List: %s (%d)
715: Point Shop List: '%s'
716: Your '%s' now: %d
//Item Group
// Item Group
717: [%s] has won [%s] from '%s'
//@showrate
// @showrate
718: Personal rate information is not displayed now.
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
1494: %d items are dropped (%d skipped)!
//Banking
// Banking
1495: You can't withdraw that much money
1496: Banking is disabled

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

@ -3,7 +3,7 @@
//===== By: ==================================================
//= nestor_zulueta (Fusion), converted by Darkchild
//===== Current Version: =====================================
//= 3.0
//= 3.1
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
@ -17,6 +17,7 @@
//= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
//= 2.9 Added Quest Log commands. [Kisuka]
//= 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,{
@ -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 "I sent you.";
set ALCH_Q,6;
changequest 2031,2032;
close;
}
else {
@ -1092,6 +1094,7 @@ alde_alche,13,15,7 script Studying Man#am 750,{
mes "and cast away the last";
mes "vestiges of Merchant life!!";
set ALCH_Q,40;
changequest 2033,2034;
close;
}
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;
end;
}
if(checkquest(2039) != -1) {
if (checkquest(2039) != -1) {
changequest 2039,2040;
}
if (checkquest(2034) != -1) {
changequest 2034,2040;
}
mes "Ah, well done.";
mes "I can see that you";
mes "have learned all of";
@ -1705,7 +1711,6 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
mes "illustrious Union.";
mes "I hope you learn a lot...";
next;
if (.@jlevel == 50) {
getitem 7133,1; //Slim_Potion_Create_Book
mes "[Vincent Carsciallo]";

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

@ -459,8 +459,8 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{
break;
case 2:
mes "<<Giant Shield[1]>>";
mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage.";
mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes";
mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage.";
mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes";
callsub L_Reward, 2160, 100, 50, 35; //Giant_Shield
break;
case 3:
@ -524,7 +524,7 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{
} else {
.@weapon$[.@i] = "^FF0000";
}
}
}
while(1) {
switch(select(
"Show me other items.",
@ -866,57 +866,57 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
close;
case 2:
if (!getequipisequiped(EQI_ARMOR)) {
mes "[Pudding]";
mes "Hey..Where is the armor?";
close;
mes "[Pudding]";
mes "Hey..Where is the armor?";
close;
}
.@part = EQI_ARMOR;
break;
case 3:
if (!getequipisequiped(EQI_HAND_L)) {
mes "[Pudding]";
mes "Well.. You are not equipping anything on the left hand.";
close;
mes "[Pudding]";
mes "Well.. You are not equipping anything on the left hand.";
close;
}
.@part = EQI_HAND_L;
break;
case 4:
if (!getequipisequiped(EQI_HAND_R)) {
mes "[Pudding]";
mes "Well.. You are not equipping anything on the right hand.";
close;
mes "[Pudding]";
mes "Well.. You are not equipping anything on the right hand.";
close;
}
.@part = EQI_HAND_R;
break;
case 5:
if (!getequipisequiped(EQI_GARMENT)) {
mes "[Pudding]";
mes "Um.... Where's your robe?";
close;
mes "[Pudding]";
mes "Um.... Where's your robe?";
close;
}
.@part = EQI_GARMENT;
break;
case 6:
if (!getequipisequiped(EQI_ACC_L)) {
mes "[Pudding]";
mes ".....Where's the accessory?";
close;
mes "[Pudding]";
mes ".....Where's the accessory?";
close;
}
.@part = EQI_ACC_L;
break;
case 7:
if (!getequipisequiped(EQI_ACC_R)) {
mes "[Pudding]";
mes ".....Where's the accessory?";
close;
mes "[Pudding]";
mes ".....Where's the accessory?";
close;
}
.@part = EQI_ACC_R;
break;
case 8:
if (!getequipisequiped(EQI_HEAD_LOW)) {
mes "[Pudding]";
mes "Hey.. Are you not wearing any Helm?";
close;
mes "[Pudding]";
mes "Hey.. Are you not wearing any Helm?";
close;
}
.@part = EQI_HEAD_LOW;
break;
@ -1352,39 +1352,39 @@ que_lhz,206,74,4 script Researcher#02 4_LGTSCIENCE,3,3,{
OnTouch:
if (lght_duk01 == 2) {
emotion e_omg, 1;
mes "["+ strcharinfo(0) +"]";
mes "You!!!! are Wolfchev?";
next;
emotion e_gg, "Researcher#02";
mes "[Wolfchev]";
mes "A Human! kaahaha. People tend to hate this place, why are you here?";
next;
mes "["+ strcharinfo(0) +"]";
mes "You!!! I heard that you were committing human experimentation. Wolfchev!!";
next;
mes "["+ strcharinfo(0) +"]";
mes "And I see that you are still committing that!!!";
next;
emotion e_gg, "Researcher#02";
mes "[Wolfchev]";
mes "Kihihihi. I can see that you know something about me. Is that you who accused me?";
mes "How dare you come back to me after you did that. Kihihih";
next;
mes "[Wolfchev]";
mes "I feel good to see a human";
mes "in a long time, but I gotta go. Kihihihi.";
next;
mes "- Wolfchev ran away giving a awkward laughing sound. -";
next;
erasequest 5109;
setquest 5110;
lght_duk01 = 3;
emotion e_omg, 1;
mes "["+ strcharinfo(0) +"]";
mes "Whoa! Wolfchev, stop!";
close2;
warp "que_lhz", 96, 136;
emotion e_omg, 1;
mes "["+ strcharinfo(0) +"]";
mes "You!!!! are Wolfchev?";
next;
emotion e_gg, "Researcher#02";
mes "[Wolfchev]";
mes "A Human! kaahaha. People tend to hate this place, why are you here?";
next;
mes "["+ strcharinfo(0) +"]";
mes "You!!! I heard that you were committing human experimentation. Wolfchev!!";
next;
mes "["+ strcharinfo(0) +"]";
mes "And I see that you are still committing that!!!";
next;
emotion e_gg, "Researcher#02";
mes "[Wolfchev]";
mes "Kihihihi. I can see that you know something about me. Is that you who accused me?";
mes "How dare you come back to me after you did that. Kihihih";
next;
mes "[Wolfchev]";
mes "I feel good to see a human";
mes "in a long time, but I gotta go. Kihihihi.";
next;
mes "- Wolfchev ran away giving a awkward laughing sound. -";
next;
erasequest 5109;
setquest 5110;
lght_duk01 = 3;
emotion e_omg, 1;
mes "["+ strcharinfo(0) +"]";
mes "Whoa! Wolfchev, stop!";
close2;
warp "que_lhz", 96, 136;
}
end;
}
@ -2497,9 +2497,9 @@ OnDisable:
OnMyMobDead:
if (mobcount(instance_mapname("1@lhz"),instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead") < 1) {
donpcevent instance_npcname("#potal_02")+"::OnEnable";
donpcevent instance_npcname("Lab2#2_1")+"::OnDisable";
mapannounce instance_mapname("1@lhz"),"[Security System] The Security system of The Lab No.2 has been stopped.",bc_map,"0xff9977";
donpcevent instance_npcname("#potal_02")+"::OnEnable";
donpcevent instance_npcname("Lab2#2_1")+"::OnDisable";
mapannounce instance_mapname("1@lhz"),"[Security System] The Security system of The Lab No.2 has been stopped.",bc_map,"0xff9977";
}
end;
}
@ -2546,6 +2546,7 @@ OnTimer3000:
end;
OnInstanceInit:
OnDisable:
disablenpc instance_npcname("#potal_02");
end;
@ -2554,10 +2555,6 @@ OnEnable:
enablenpc instance_npcname("#potal_02");
end;
OnDisable:
disablenpc instance_npcname("#potal_02");
end;
OnTouch:
warp instance_mapname("1@lhz"), 84, 28;
end;
@ -2745,7 +2742,7 @@ OnMyMobDead:
// The Lab No.3 >> Boss's Room Warp portal
//============================================================
1@lhz,83,62,0 script #potal_03 WARPNPC,2,2,{
end;
end;
OnInstanceInit:
disablenpc instance_npcname("#potal_03");
@ -3054,7 +3051,7 @@ OnMyMobDead:
mes "The button was supposed to be pressed for an emergency case...but..";
next;
mes "[Wolfchev]";
mes "Hey.. You and I met by a bad connection....";
mes "Hey... You and I met by a bad connection....";
next;
mes "[Wolfchev]";
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?";
next;
mes "[Wolfchev]";
mes "HAHAHAHa. Loneliness.. You say?";
mes "HAHAHAHA. Loneliness... you say?";
next;
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.";
@ -3124,7 +3121,7 @@ OnMyMobDead:
next;
} else {
mes "[Wolfchev]";
mes "kakakaah.. Thank you. You handled those Boss creatures well..";
mes "kakakaah.. Thank you. You handled those Boss creatures well...";
next;
}
if (lght_duk01 == 7) {
@ -3133,10 +3130,10 @@ OnMyMobDead:
mes "While you were struggling...";
next;
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;
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;
} else {
mes "[Wolfchev]";
@ -3160,18 +3157,18 @@ L_Reward:
erasequest .@i;
}
.@r = rand(1, 1000);
if (.@r < 84) getitem 2582, 1; //Salvage_Cape
else if (.@r >= 84 && .@r < 167) getitem 18570, 1; //Ancient_Gold_Deco
else if (.@r >= 167 && .@r < 250) getitem 1490, 1; //Giant_Lance
else if (.@r >= 250 && .@r < 333) getitem 16017, 1; //Bloody_Cross
else if (.@r >= 333 && .@r < 416) getitem 1291, 1; //Guillotine_Katar
else if (.@r >= 416 && .@r < 499) getitem 1584, 1; //Chilly_Spell_Book
else if (.@r >= 499 && .@r < 582) getitem 6471, 10; //Goast_Chill
else if (.@r >= 582 && .@r < 665) getitem 6470, 10; //Blood_Thirst
else if (.@r >= 665 && .@r < 748) getitem 6469, 10; //Will_Of_Warrior
else if (.@r >= 748 && .@r < 831) getitem 6471, 20; //Goast_Chill
else if (.@r >= 831 && .@r < 914) getitem 6470, 20; //Blood_Thirst
else getitem 6469, 20; //Will_Of_Warrior
if (.@r < 84) getitem 2582, 1; //Salvage_Cape
else if (.@r < 167) getitem 18570, 1; //Ancient_Gold_Deco
else if (.@r < 250) getitem 1490, 1; //Giant_Lance
else if (.@r < 333) getitem 16017, 1; //Bloody_Cross
else if (.@r < 416) getitem 1291, 1; //Guillotine_Katar
else if (.@r < 499) getitem 1584, 1; //Chilly_Spell_Book
else if (.@r < 582) getitem 6471, 10; //Goast_Chill
else if (.@r < 665) getitem 6470, 10; //Blood_Thirst
else if (.@r < 748) getitem 6469, 10; //Will_Of_Warrior
else if (.@r < 831) getitem 6471, 20; //Goast_Chill
else if (.@r < 914) getitem 6470, 20; //Blood_Thirst
else getitem 6469, 20; //Will_Of_Warrior
return;
OnInstanceInit: