summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/1-1e/taekwon.txt3
-rw-r--r--npc/jobs/2-1/assassin.txt2
-rw-r--r--npc/jobs/2-1/blacksmith.txt27
-rw-r--r--npc/jobs/2-1/priest.txt1
-rw-r--r--npc/jobs/2-1e/StarGladiator.txt12
-rw-r--r--npc/jobs/2-2/crusader.txt3
-rw-r--r--npc/jobs/2-2a/Professor.txt1
-rw-r--r--npc/jobs/valkyrie.txt1
8 files changed, 28 insertions, 22 deletions
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index dd088790d..e7d94e567 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -391,7 +391,7 @@ payon,157,141,5 script Phoenix#TKJobChange 4_M_MONK,{
mes "uniform and guard set: make";
mes "good use of these gifts. As";
mes "you travel and train, enlighten";
- mes "others about our art and learn^FFFFFF ^000000 what you can from them in return.";
+ mes "others about our art and learn what you can from them in return.";
next;
mes "[Phoenix]";
mes "It is now time for you to";
@@ -417,4 +417,3 @@ payon,157,141,5 script Phoenix#TKJobChange 4_M_MONK,{
close;
}
}
-
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index e88f0adc6..c98fca135 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1482,7 +1482,7 @@ OnTimer187000:
OnDisable:
stopnpctimer;
end;
-
+
OnMyMobDead:
mapannounce "in_moc_16","Hey, what the hell was that?! I told you: No killing monsters!",bc_map;
mapannounce "in_moc_16","I'm bringing you back... *Sigh...*",bc_map;
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 53f2fa5fc..0109de356 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -7,7 +7,7 @@
//= Optimized and further edited by kobra_k88.
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.8
+//= 2.9
//===== Description: =========================================
//= [Official Conversion]
//= Job Change quest for Blacksmith class.
@@ -38,6 +38,7 @@
//= 2.6a Typo fix [Yommy]
//= 2.7 Added Quest Log commands. [Kisuka]
//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
+//= 2.9 Updated with some extra conditions. [Euphy]
//==============================================================
ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{
@@ -70,20 +71,27 @@ ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{
mes "and passion of our souls into";
mes "our craft. Our skills of melting metal into new weapons";
mes "and tools is truly a form of art!";
+ if (BaseClass >= Job_Thief) close; // Custom expanded class check.
next;
+ // Third class check - precedes other BaseClass dialogue.
+ if (Class >= Job_Rune_Knight && Class <= Job_Baby_Mechanic2) {
+ mes "[Altiregen]";
+ mes "You... look like a stranger. But somehow it seems that you're related to our guild. Haha~";
+ mes "Am I right?";
+ close;
+ }
if (BaseClass == Job_Novice) {
if (Sex == 0) {
mes "[Altiregen]";
mes "Oh~";
mes "what a very";
mes "pretty lady!";
- mes "Are you interested in";
- mes "becoming a Blacksmith?";
- next;
- mes "[Altiregen]";
- mes "First, you must become a Merchant before you can become a Blacksmith. Go to the city of Alberta to learn the Merchant trade.";
- close;
}
+ mes "Are you interested in";
+ mes "becoming a Blacksmith?";
+ next;
+ mes "[Altiregen]";
+ mes "First, you must become a Merchant before you can become a Blacksmith. Go to the city of Alberta to learn the Merchant trade.";
close;
}
else if (BaseClass == Job_Swordman) {
@@ -247,6 +255,11 @@ ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{
}
else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) {
mes "[Altiregen]";
+ if (checkmount() || hascashmount()) {
+ mes "You are on a riding pet, so you cannot change your job.";
+ mes "Please unmount your riding pet and try again!";
+ close;
+ }
mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of the smithing, the art of the Blacksmith.";
if (questprogress(2015)) {
changequest 2015,2016;
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index e28106f69..89573956e 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1860,4 +1860,3 @@ function script F_FatherYos {
mes "...Acolyte, you don't have any business with me here.";
close;
}
-
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index f33cda98e..e45d7c576 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -98,7 +98,7 @@ payon,215,102,3 script Moohyun#job_star 4_M_ROGUE,3,3,{
mes "[Moohyun]";
mes "Alright, you can find Moogang";
mes "in Comodo, supposedly at the";
- mes "place that's closest to the sky.^FFFFFF ^000000 In the meantime, I'll write a";
+ mes "place that's closest to the sky. In the meantime, I'll write a";
mes "letter of recommendation that";
mes "I'll send to him for you.";
STGL_Q = 1;
@@ -352,7 +352,7 @@ OnTouch:
mes "You're blocking my sun!";
close;
}
-
+
comodo,172,230,3 script Wandering Master#job_sta 4_M_JOB_ASSASSIN,{
if (Class == Job_Taekwon) {
if (STGL_Q == 1) {
@@ -381,7 +381,7 @@ comodo,172,230,3 script Wandering Master#job_sta 4_M_JOB_ASSASSIN,{
mes "and improve your Taekwon Girl";
else
mes "and improve your Taekwon Boy";
- mes "skills. When you are finished,^FFFFFF ^000000 come back here for your training.";
+ mes "skills. When you are finished, come back here for your training.";
close;
}
mes "[Moogang]";
@@ -479,7 +479,7 @@ comodo,172,230,3 script Wandering Master#job_sta 4_M_JOB_ASSASSIN,{
mes "the nature of the universe";
mes "comes the respect for nature";
mes "and all things. Now, when you";
- mes "are ready for the next test, then^FFFFFF ^000000";
+ mes "are ready for the next test, then";
mes "I shall guide you to the altar.";
delitem 996,1; //Rough_Wind
delitem 997,1; //Great_Nature
@@ -887,7 +887,7 @@ job_star,29,33,0 script Daru#job_star 1_M_ORIENT01,{
mes "Ah, yes. The warmth";
mes "of the sun brings comfort.";
mes "And without comfort, is life";
- mes "truly worth living? Good answer. ^FFFFFF ^000000";
+ mes "truly worth living? Good answer. ";
.@sun_point += 10;
break;
case 3:
@@ -1559,7 +1559,7 @@ job_star,161,33,0 script Cheehee#job_star 1_F_ORIENT_03,{
mes "gentle moonlight, and the";
mes "melancholic twinkling of the";
mes "stars are unique from each";
- mes "other. Please enjoy the starlight^FFFFFF ^000000 in this room as long as you like.";
+ mes "other. Please enjoy the starlight in this room as long as you like.";
next;
mes "[Cheehee]";
mes "When you are ready,";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index c713194de..22e9b917d 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -969,8 +969,6 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{
close;
}
-
-
// Actual tests
//============================================================
@@ -1201,7 +1199,6 @@ OnDead:
end;
}
-
job_cru,98,105,4 script Summoner#cr5 WARPNPC,3,3,{
OnTouch:
CRUS_Q = 6;
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index 68cac14cf..8fee58494 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -88,4 +88,3 @@ valkyrie,53,47,3 script Scholar#Valkyrie 2_M_SAGE_OLD,{
mes "Honor to the warriors!";
close;
}
-
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index c7cef8107..d2a7108b1 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -398,4 +398,3 @@ S_Warpchar:
//============================================================
valkyrie,48,73,0 warp valk01#1 1,1,valkyrie,48,64
valkyrie,48,66,0 warp valk01#2 1,1,valkyrie,48,75
-
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-24 13:05:29 +0000