diff options
| author | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-07 01:21:25 +0000 |
|---|---|---|
| committer | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-07 01:21:25 +0000 |
| commit | 6d5d8185e0213433def88dece01f66f180bb1a92 (patch) | |
| tree | 599b2312a4d497b24c6b538817046f2c1378da9b /npc | |
| parent | bf00d773f963c6025521142da4dd7e167498b604 (diff) | |
| download | hercules-6d5d8185e0213433def88dece01f66f180bb1a92.tar.gz hercules-6d5d8185e0213433def88dece01f66f180bb1a92.tar.bz2 hercules-6d5d8185e0213433def88dece01f66f180bb1a92.tar.xz hercules-6d5d8185e0213433def88dece01f66f180bb1a92.zip | |
- Follow up r15402. Removed minstrel.txt Job change quest from autostart, since it's not yet added / finished.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15403 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/jobs/3-2/genetic.txt | 18 | ||||
| -rw-r--r-- | npc/scripts_jobs.conf | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/npc/jobs/3-2/genetic.txt b/npc/jobs/3-2/genetic.txt index bba6d7edf..45e059008 100644 --- a/npc/jobs/3-2/genetic.txt +++ b/npc/jobs/3-2/genetic.txt @@ -32,7 +32,7 @@ alde_alche,35,186,5 script Alchemist Union Member 805,{ }
if ((BaseLevel == 99) && (JobLevel > 49)){
- if ((Class == Job_alchemist) | (Class == Job_Creator)){
+ if ((Class == Job_Alchemist) | (Class == Job_Creator)){
if (SkillPoint == 0){
if (job_gen == 0){
mes "[Alchemist Union Member]";
@@ -182,12 +182,12 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "Because of the temptation, I've bought a large amount, hehehe.";
next;
mes "- Ke Ke Ke Ke Ke Ke Ke -";
- specialeffect EF_ENDURE,"Devries#gen";
+ specialeffect EF_ENDURE;
next;
- specialeffect EF_REPAIRWEAPON,"#from1to2gen";
+ specialeffect EF_REPAIRWEAPON;
mes "- Ke Ke Ke Ke! Ke Ke Ke Ke Ke Ke!!! -";
next;
- specialeffect EF_CRASHEARTH,"#from1to2gen";
+ specialeffect EF_CRASHEARTH;
mes "- Bang! Bang!! Bang!!! Bang!!!! -";
next;
mes "[Devries]";
@@ -465,8 +465,8 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "Ah!";
next;
if (job_gen == 60){
- specialeffect EF_FLASHER,"Super Cultivator#gen";
- specialeffect EF_PHARMACY_OK,"Super Cultivator#gen";
+ specialeffect EF_FLASHER;
+ specialeffect EF_PHARMACY_OK;
mes "[Devries]";
mes "Bubbles, look at this!";
mes "What a fascination plant!";
@@ -518,8 +518,8 @@ job3_gen01,25,58,3 script Devries#gen 865,{ }
close;
}
- specialeffect EF_SPELLBREAKER,"Super Cultivator#gen";
- specialeffect EF_PHARMACY_FAIL,"Super Cultivator#gen";
+ specialeffect EF_SPELLBREAKER;
+ specialeffect EF_PHARMACY_FAIL;
mes "[Devries]";
mes "Uh oh! You failed, Bubbles";
mes "it did not grow at all, it's withered already.";
@@ -562,7 +562,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "Bubble!";
mes "Good news!";
next;
- if (((Class == Job_Alchemist) || (Class == Job_Creator)) && (JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98)){
+ if (Class == Job_Alchemist || Class == Job_Creator && ((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.";
diff --git a/npc/scripts_jobs.conf b/npc/scripts_jobs.conf index 4dee85836..3569c1ed4 100644 --- a/npc/scripts_jobs.conf +++ b/npc/scripts_jobs.conf @@ -62,7 +62,7 @@ npc: npc/jobs/3-1/rune_knight.txt npc: npc/jobs/3-1/warlock.txt //npc: npc/jobs/3-1/guillotine.txt // -- 3-2 -npc: npc/jobs/3-2/minstrel.txt +//npc: npc/jobs/3-2/minstrel.txt //npc: npc/jobs/3-2/wanderer.txt npc: npc/jobs/3-2/royal_guard.txt //npc: npc/jobs/3-2/sorcerer.txt |