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

- Fixed parenthesis check in most 3rd job change quests. bugreport:5883

Browse Source 
- Partially rewrote Rune Knight job change quest. bugreport:5881
- Follow up r16180 where i forgot to rename some Warper NPC from Mina to Warp Agent.
- Fixed some comodo quest typos. bugreport:5882

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16192 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
masao87 2012-05-31 22:13:00 +00:00
parent 60d39385a7
commit 0c530aa2fe
6 changed files with 1600 additions and 1555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
npc/custom/warper.txt
View File

@ -265,10 +265,10 @@ mid_camp,180,246,6 duplicate(warpra) Warp Agent#29 859
dicastes01,194,188,6 duplicate(warpra) Warp Agent#30 859
dewata,194,178,6 duplicate(warpra) Warp Agent#31 859
malangdo,220,188,6 duplicate(warpra) Warp Agent#32 859
niflheim,32,161,4 duplicate(warpra) Mina#33 859
malaya,210,205,4 duplicate(warpra) Mina#34 859
mora,110,100,4 duplicate(warpra) Mina#35 859
eclage,107,37,4 duplicate(warpra) Mina#36 859
niflheim,32,161,4 duplicate(warpra) Warp Agent#33 859
malaya,210,205,4 duplicate(warpra) Warp Agent#34 859
mora,110,100,4 duplicate(warpra) Warp Agent#35 859
eclage,107,37,4 duplicate(warpra) Warp Agent#36 859
// ------------ Dungeons ------------
ama_dun01,233,9,1 duplicate(warpra) Warp Agent#37 859

3124
npc/jobs/3-1/rune_knight.txt
View File

File diff suppressed because it is too large Load Diff

2
npc/jobs/3-1/warlock.txt
View File

@ -39,7 +39,7 @@ OnTouch:
close;
}
}
if (BaseLevel > 94 && Class == Job_Wizard || Class == Job_High_Wizard || Class == Job_Baby_Wizard){
if ((BaseLevel > 94) && (Class == Job_Wizard || Class == Job_High_Wizard || Class == Job_Baby_Wizard)){
mes " - There is a strange distortion here - ";
next;
switch(select( "Search the area.:Ignore it.")){

2
npc/jobs/3-2/genetic.txt
View File

@ -548,7 +548,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{
mes "Bubbles!";
mes "Good news!";
next;
if (Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist && ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))){
if ((Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist) && ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))){
if (checkcart() == 0){
mes "[Devries]";
mes "Put that heavy and dirty cart away. On such a happy moment, that thing will just ruin it.";

16
npc/jobs/3-2/sorcerer.txt
View File

@ -35,7 +35,7 @@ gef_tower,102,34,5 script Merito 742,{
mes "Wow~ you are a young adventurer. I envy you.";
close;
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc < 1)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc < 1)){
mes "[Merito]";
mes "Welcome. What can I help you with?";
next;
@ -82,7 +82,7 @@ gef_tower,102,34,5 script Merito 742,{
set job_soc,1;
close;
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 1)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 1)){
mes "[Merito]";
mes "Good, then I'll give you a short explanation about the Sorcerer.";
next;
@ -140,7 +140,7 @@ gef_tower,102,34,5 script Merito 742,{
close;
}
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc > 1)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc > 1)){
mes "[Merito]";
mes "How about your test? Well, Karacas is a little lazy, so that might bother you some... kkk";
close;
@ -168,12 +168,12 @@ gef_tower,113,161,5 script Karacas 754,{
mes "Is there anything I can do for you?";
close;
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc < 2)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc < 2)){
mes "[Karacas]";
mes "More people are visiting Geffen Tower thesedays.";
close;
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 2)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 2)){
mes "[Karacas]";
mes "....";
next;
@ -259,7 +259,7 @@ gef_tower,113,161,5 script Karacas 754,{
changequest 12096,12097;
close;
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 3)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 3)){
if ((countitem(992) > 2) && (countitem(991) > 2) && (countitem(990) > 2) && (countitem(993) > 2)){
mes "[Karacas]";
mes "Oh, you have all the materials.";
@ -349,7 +349,7 @@ gef_tower,113,161,5 script Karacas 754,{
mes "When you bring these basic things, I'll guide you to the next step.";
close;
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 4)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 4)){
if ((countitem(6276) > 0) && (countitem(6278) > 0) && (countitem(6277) > 0)){
mes "[Karacas]";
mes "Wow~ your skill is good.";
@ -372,7 +372,7 @@ gef_tower,113,161,5 script Karacas 754,{
mes "Don't give up and keep on trying~";
close;
}
if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 5)){
if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 5)){
mes "[Karacas]";
mes "Originally my teacher needs to check the Sorcerer job change but after he went out to find the spirit of fish, I can't see him. So I'll check it myself.";
next;

3
npc/quests/quests_comodo.txt
View File

@ -354,7 +354,6 @@ comodo,273,137,4 script Traveler#head 702,{
mes "If you brought all the required items, I'll go ahead and make it for you~";
next;
mes "[Isac Mari]";
mes "[Isac Mari]";
mes "But can you check that the items in your inventory aren't upgraded or have cards compounded into them? If any of the required items have forged upgrades or cards, those will be lost once I create the Money Loser's Grief.";
next;
mes "[Isac Mari]";
@ -419,7 +418,7 @@ comodo,273,137,4 script Traveler#head 702,{
mes "But can you check that the items in your inventory aren't upgraded or have cards compounded into them? If any of the required items have forged upgrades or cards, those will be lost once I create the Opera Masque.";
next;
mes "[Isac Mari]";
mes "It's better to keep only the items used to make the Mine Hat in your inventory. Did you check? If so, let's get started.";
mes "It's better to keep only the items used to make the Opera Mask in your inventory. Did you check? If so, let's get started.";
next;
switch(select("Give me a minute~!:Let's make the Opera Masque.")) {
case 1: