summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/jobs/3-1/archbishop.txt5
-rw-r--r--npc/re/jobs/3-1/ranger.txt6
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt9
3 files changed, 12 insertions, 8 deletions
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 395bbb6cc..11b901162 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -17,6 +17,7 @@
//= 1.3 Made some NPC's into duplicates and fixed some && / || checks. [Masao]
//= 1.4 Fixed Job_Archbishop/Job_Archbishop_T typos. [Euphy]
//= 1.5 Redone the whole Script. [Masao]
+//= 1.5a Fixed little typo in Baby Priest & Baby Arch Bishop checks. [Masao]
//============================================================
prt_church,103,88,3 script Praying Minister#arch 60,{
@@ -836,10 +837,10 @@ job3_arch01,29,34,3 script Valkyrie#arch 403,{
mes "- you put some items into Kafra Storage. -";
close;
}
- if ((Class != Job_Priest) && (Class != Job_High_Priest) && (Class == Job_Baby_Priest)) {
+ if ((Class != Job_Priest) && (Class != Job_High_Priest) && (Class != Job_Baby_Priest)) {
warp "odin_tem02",282,263;
}
- if (Class != Job_Arch_Bishop || Class != Job_Arch_Bishop_T || Class == Job_Baby_Bishop) {
+ if (Class != Job_Arch_Bishop || Class != Job_Arch_Bishop_T || Class != Job_Baby_Bishop) {
if (job_arch < 5) {
warp "odin_tem02",282,263;
}
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 84e453e35..0097853e6 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -18,6 +18,7 @@
//= it decreases the total points by 1 also commented the SC_STONE
//= part until M_DESERT_WOLF_B Mercenary is fully working.
//= 1.3 Fixed waves not being announced and counted [Elias]
+//= 1.3a Little beauty fix, changed break; to next; . [Masao]
//============================================================
tur_dun01,156,36,5 script Survival Instructor#jr01 59,{
@@ -2979,9 +2980,8 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 832,{
}
mes "[Ranger Master, Neveragain]";
mes "Good. No falcon and you've used up all your skill points.";
- break;
- }else
- {
+ next;
+ }else{
mes "[Ranger Master, Neveragain]";
mes "Didn't you dismiss your falcon??";
next;
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index d8f05acb8..e30ffd2ab 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -9,10 +9,11 @@
//= rAthena SVN
//===== Description: =========================================
//= Job change Quest from Knight / Lord Knight -> Rune Knight.
-//= Does not entirely support changing to Baby Third Class.
//===== Additional Comments: =================================
//= 1.0 First version.
//= 1.1 Added forgoten Header. [Masao]
+//= 1.2 Added Energy Rune item reward after finishing the
+//= job change quest and changed an close2; to close; command. [Masao]
//============================================================
prt_in,162,24,3 script Splendid-Looking Knight 470,{
@@ -622,6 +623,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{
if (Class == Job_Baby_Knight) {
getitem 5746,1; //Rune_Circlet
getitem 2795,1; //Green_Apple_Ring
+ getitem 2140,1; //Energy_Rune
set job_rune_edq,23;
completequest 3219;
jobchange Job_Baby_Rune;
@@ -638,6 +640,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{
else if (Class == Job_Knight) {
getitem 5746,1; //Rune_Circlet
getitem 2795,1; //Green_Apple_Ring
+ getitem 2140,1; //Energy_Rune
set job_rune_edq,23;
completequest 3219;
jobchange Job_Rune_Knight;
@@ -654,6 +657,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{
else if (Class == Job_Lord_Knight) {
getitem 5746,1; //Rune_Circlet
getitem 2795,1; //Green_Apple_Ring
+ getitem 2140,1; //Energy_Rune
set job_rune_edq,23;
completequest 3219;
jobchange Job_Rune_Knight_T;
@@ -2343,8 +2347,7 @@ job3_rune01,50,36,1 script Runes, Make & Use 844,{
next;
break;
case 5:
- close2;
- break;
+ close;
}
break;
case 3: