summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2/crusader.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/2-2/crusader.txt')
-rw-r--r--npc/jobs/2-2/crusader.txt98
1 files changed, 53 insertions, 45 deletions
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 3fa61960f..e11a45382 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Crusader Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= Made by: Black Dragon
//= Converted by: Shin
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 3.3
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Crusader classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 2.2 Updated All NPCs to the officials one [Samuray22]
//= -Based on the ASB 4.0 Package.
//=-Maybe need be checked the monsters in the test 2 and 4.
@@ -34,8 +32,8 @@
//= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
-
-//=============== Senior Crusader: 1st Collect Items Test============================
+// Senior Crusader: 1st Collect Items Test
+//============================================================
prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
@@ -127,7 +125,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "Train yourself more as a Swordsman and wait for your calling. I understand your intent, but as of now, you cannot join us.";
close;
}
- if (Skillpoint) {
+ if (SkillPoint) {
mes "[Michael Halig]";
mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me.";
close;
@@ -207,7 +205,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
close;
}
mes "[Michael Halig]";
- if (sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
+ if (Sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
else mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
close;
}
@@ -216,25 +214,25 @@ prt_castle,45,169,5 script Senior Crusader 752,{
next;
switch(CRUS_Q) {
case 1:
- set @item1, 957;
- set @item2, 959;
- set @item3, 1099;
- set @item4, 901;
+ set .@item1, 957;
+ set .@item2, 959;
+ set .@item3, 1099;
+ set .@item4, 901;
break;
- Case 2:
- set @item1, 932;
- set @item2, 1043;
- set @item3, 1098;
- set @item4, 1094;
+ case 2:
+ set .@item1, 932;
+ set .@item2, 1043;
+ set .@item3, 1098;
+ set .@item4, 1094;
break;
- Case 3:
- set @item1, 958;
- set @item2, 930;
- set @item3, 1041;
- set @item4, 1062;
+ case 3:
+ set .@item1, 958;
+ set .@item2, 930;
+ set .@item3, 1041;
+ set .@item4, 1062;
break;
}
- if (countitem(@item1) > 9 && countitem(@item2) > 9 && countitem(@item3) > 9 && countitem(@item4) > 9) {
+ if (countitem(.@item1) > 9 && countitem(.@item2) > 9 && countitem(.@item3) > 9 && countitem(.@item4) > 9) {
mes "[Michael Halig]";
mes "Ah, well done.";
mes "I must acknowledge your efforts and determination. You may now proceed to take the next test.";
@@ -242,10 +240,10 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
next;
- delitem @item1, 10;
- delitem @item2, 10;
- delitem @item3, 10;
- delitem @item4, 10;
+ delitem .@item1, 10;
+ delitem .@item2, 10;
+ delitem .@item3, 10;
+ delitem .@item4, 10;
set CRUS_Q, 4;
if(checkquest(3006) != -1) {
changequest 3006,3009;
@@ -264,10 +262,10 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "Ah, you still have not completed the task I have given to you. Bring me the following items, and prove your will to become a Crusader to me...";
next;
mes "[Michael Halig]";
- mes "10 ^3355FF"+getitemname(@item1)+"^000000";
- mes "10 ^3355FF"+getitemname(@item2)+"^000000";
- mes "10 ^3355FF"+getitemname(@item3)+"^000000";
- mes "10 ^3355FF"+getitemname(@item4)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item1)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item2)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item3)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item4)+"^000000";
next;
mes "[Michael Halig]";
mes "If you put forth the effort, you'll be able to accomplish this task. May Odin protect you on your journeys.";
@@ -295,7 +293,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
mes "Now you are";
mes "one of us!";
- if (sex) mes "...Brother.";
+ if (Sex) mes "...Brother.";
else mes "...Comrade.";
next;
if(.@JobLevel != 50) getitem 504, 6;
@@ -314,7 +312,8 @@ prt_castle,45,169,5 script Senior Crusader 752,{
close;
}
-//===================== Suffering Man: 2nd Endurance Test ===============================================
+// Suffering Man: 2nd Endurance Test
+//============================================================
prt_castle,164,32,1 script Man in Anguish 733,{
mes "[Murnak Mijoul]";
if(BaseJob != Job_Swordman) {
@@ -346,7 +345,7 @@ prt_castle,164,32,1 script Man in Anguish 733,{
else if(CRUS_Q == 4) {
mes "What is it...?";
mes "Do you have business";
- if (sex) mes "with me, man of the sword?";
+ if (Sex) mes "with me, man of the sword?";
else mes "with me, woman of the sword?";
next;
if (select("I'd like to take the Crusader test.:Nothing.") == 1) {
@@ -447,7 +446,8 @@ prt_castle,164,32,1 script Man in Anguish 733,{
close;
}
-//===================== Gabriel Valentine: 3rd Knowledge Test =================================
+// Gabriel Valentine: 3rd Knowledge Test
+//============================================================
prt_church,95,127,3 script Crusader 745,{
mes "[Gabriel Valentine]";
if(BaseJob != Job_Swordman) {
@@ -795,7 +795,8 @@ prt_church,95,127,3 script Crusader 745,{
close;
}
-//===================== Crusader: 4th Purification Test =====================================================
+// Crusader: 4th Purification Test
+//============================================================
prt_castle,35,151,5 script Patron Knight 751,{
mes "[Bliant Piyord]";
mes "Welcome.";
@@ -970,8 +971,12 @@ prt_castle,35,151,5 script Patron Knight 751,{
-//=== Actual tests ========================================
-//=== Endurance Test ======================================
+// Actual tests
+//============================================================
+
+//----------------------------------------------------------------------------
+// Endurance Test
+//----------------------------------------------------------------------------
job_cru,1,1,1 script Summoner#cr1 -1,{
OnTimer300000:
donpcevent "Summoner#cr1::OnReset";
@@ -1205,7 +1210,9 @@ OnTouch:
end;
}
-//=== Purification Test ===================================
+//----------------------------------------------------------------------------
+// Purification Test
+//----------------------------------------------------------------------------
job_cru,24,187,4 script Patron Knight#2 751,{
mes "[Bliant Piyord]";
mes "Welcome.";
@@ -1458,9 +1465,9 @@ OnStop:
end;
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= Need optimalization and fixing
//= thanks to Komurka, KiLLaLeN, Lupus (fixing error)
//= just a temp Job Quest
@@ -1478,4 +1485,5 @@ OnStop:
//= Hand of God allow to skip item gathering [DracoRPG]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Fixed endless loop, wrong condition check [Lupus]
-//= also changed all job numbers to constants, fixed logic
+//= also changed all job numbers to constants, fixed logic
+//============================================================