summaryrefslogtreecommitdiff
path: root/npc/re/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs')
-rw-r--r--npc/re/jobs/3-1/archbishop.txt5
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt114
-rw-r--r--npc/re/jobs/3-2/genetic.txt7
3 files changed, 53 insertions, 73 deletions
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 0b61588d0..0da34bbe8 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -4,7 +4,7 @@
//= L0ne_W0lf
//= Credits: Gepard
//===== Current Version: =====================================
-//= 1.7
+//= 1.7a
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.5b More small fixes. [Euphy]
//= 1.6 Fixed bugs where players unable to continue the quest. [Joseph]
//= 1.7 Updated script, many bugs fixed. [Euphy]
+//= 1.7a Moved warps to separate file. [Euphy]
//============================================================
prt_church,103,88,3 script Praying Minister#arch 60,{
@@ -1623,8 +1624,6 @@ OnTouch:
end;
}
-job3_arch01,29,24,0 warp #archout 1,1,odin_tem02,282,263
-
odin_tem02,30,181,0 script #wherearch01 139,10,10,{
OnTouch:
if (job_arch == 5)
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 6d5ef573f..8fe6512ac 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib
//===== Current Version: =====================================
-//= 1.0a
+//= 1.0b
//===== Compatible With: =====================================
//= rAthena SVN r16945+
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.0 Adapted from original script. [Euphy]
//= 1.0a Added 'npcskill' command. [Euphy]
+//= 1.0b Moved warps to separate file. [Euphy]
//============================================================
que_job01,75,96,3 script Guild Member#3rdgc01 997,{
@@ -140,75 +141,12 @@ que_job01,75,96,3 script Guild Member#3rdgc01 997,{
mes "Go to Veins and find a chapter.";
mes "You can hear more details from there.";
close;
- } else if (job_3rd_gc > 3) {
+ } else {
mes "[Ahcart]";
mes "Good luck to you.";
close;
- } else { //FIXME: What is this section for?
- mes "[Ahcart]";
- mes "As you know, in the assassin guild, there are normal Assassins and Assassin Crosses.";
- next;
- mes "[Ahcart]";
- mes "But there is one more class that operates in darkness.";
- mes "Members of that class are holding their power in check until they want to be revealed themselves.";
- next;
- mes "[Ahcart]";
- mes "Well, someday you will know about them.";
- close;
- }
-}
-
-veins,257,256,0 warp #gate_to_guil01 1,1,job3_guil01,9,93
-job3_guil01,6,93,0 warp #gate_to_guil02 1,1,veins,254,255
-job3_guil01,18,48,0 warp #gate_to_guil03 1,1,job3_guil01,68,91
-job3_guil01,67,95,0 warp #gate_to_guil04 1,1,job3_guil01,18,53
-job3_guil01,80,77,0 script #gate_to_guil05 45,1,1,{
- end;
-OnTouch:
- if (job_3rd_gc > 3)
- warp "job3_guil01",60,50;
- else {
- mes "[Daora]";
- mes "Hey, there!";
- mes "No trespassing!";
- close;
- }
- end;
-}
-job3_guil01,65,50,0 warp #gate_to_guil06 1,1,job3_guil01,83,77
-job3_guil01,51,55,0 script #gate_to_guil07 45,1,1,{
- end;
-OnTouch:
- if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17)
- warp "job3_guil01",12,7;
- else {
- mes " [-----------------------------]";
- mes " No trespassing without ";
- mes " permission. ";
- mes " I'm not a ";
- mes " generous person. ";
- mes " - Mayshell ";
- mes " [-----------------------------]";
- close;
- }
- end;
-}
-job3_guil01,11,4,0 warp #gate_to_guil08 1,1,job3_guil01,51,50
-job3_guil01,51,44,0 script #gate_to_guil09 45,1,1,{
- end;
-OnTouch:
- if (job_3rd_gc == 11 || job_3rd_gc == 12)
- warp "job3_guil01",79,23;
- else if (job_3rd_gc > 19)
- warp "job3_guil01",144,57;
- else {
- mes "You don't have anything to do.";
- close;
}
- end;
}
-job3_guil01,79,27,0 warp #gate_to_guil10 1,1,job3_guil01,51,50
-job3_guil01,143,61,0 warp #gate_to_guil11 1,1,job3_guil01,51,50
function script func_3rdgc {
set .@n$, "["+strcharinfo(0)+"]";
@@ -3823,6 +3761,52 @@ L_Info:
return;
}
+// Warp Portals
+//============================================================
+job3_guil01,80,77,0 script #gate_to_guil05 45,1,1,{
+ end;
+OnTouch:
+ if (job_3rd_gc > 3)
+ warp "job3_guil01",60,50;
+ else {
+ mes "[Daora]";
+ mes "Hey, there!";
+ mes "No trespassing!";
+ close;
+ }
+ end;
+}
+job3_guil01,51,55,0 script #gate_to_guil07 45,1,1,{
+ end;
+OnTouch:
+ if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17)
+ warp "job3_guil01",12,7;
+ else {
+ mes " [-----------------------------]";
+ mes " No trespassing without ";
+ mes " permission. ";
+ mes " I'm not a ";
+ mes " generous person. ";
+ mes " - Mayshell ";
+ mes " [-----------------------------]";
+ close;
+ }
+ end;
+}
+job3_guil01,51,44,0 script #gate_to_guil09 45,1,1,{
+ end;
+OnTouch:
+ if (job_3rd_gc == 11 || job_3rd_gc == 12)
+ warp "job3_guil01",79,23;
+ else if (job_3rd_gc > 19)
+ warp "job3_guil01",144,57;
+ else {
+ mes "You don't have anything to do.";
+ close;
+ }
+ end;
+}
+
/*
job3_guil02,1,3,0 script #GMhelper01_gc 844,{
mes "What can I do for you?";
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index 9375fc4ea..1d0d8cbe9 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib, Aeomin
//===== Current Version: =====================================
-//= 1.3
+//= 1.3a
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -14,6 +14,7 @@
//= 1.1 Fixed Scatter Stuff NPCs [JayPee].
//= 1.2 Updated dialogue. Credits to Muad_Dib. [Joseph]
//= 1.3 Updated script, optimized. [Euphy]
+//= 1.3a Moved warps to separate file. [Euphy]
//============================================================
alde_alche,35,186,5 script Alchemist Union Member 805,{
@@ -1016,10 +1017,6 @@ OnTouch:
close;
}
-job3_gen01,7,59,0 warp #from1to2gen 1,1,job3_gen01,72,52
-job3_gen01,71,56,0 warp #from2to1gen 1,1,job3_gen01,11,60
-lighthalzen,52,132,0 warp #lighttogen 1,1,job3_gen01,45,50
-job3_gen01,49,49,0 warp #gentolight 1,1,lighthalzen,54,132
job3_gen01,24,32,0 script The gaze of Devries 139,2,2,{
OnTouch:
if (checkquest(2223,HUNTING) == 2) {