summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/custom/card_remover.txt6
-rw-r--r--npc/custom/heal.txt5
-rw-r--r--npc/custom/warper.txt2
-rw-r--r--npc/jobs/3-1/ranger.txt1
-rw-r--r--npc/jobs/3-1/rune_knight.txt8
-rw-r--r--npc/quests/skills/acolyte_skills.txt2
-rw-r--r--npc/quests/skills/archer_skills.txt8
-rw-r--r--npc/quests/skills/mage_skills.txt2
-rw-r--r--npc/quests/skills/merchant_skills.txt8
-rw-r--r--npc/quests/skills/swordman_skills.txt10
-rw-r--r--npc/quests/skills/thief_skills.txt2
-rw-r--r--npc/scripts_athena.conf2
12 files changed, 28 insertions, 28 deletions
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index 34855dbd5..b2dce9b6f 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -14,9 +14,9 @@
//============================================================
prt_in,28,73,4 script Wise Old Woman#eAcustom 78,{
- .zenycost = 200000; // Set base cost in zeny of the card remover services
- .percardcost = .percardcost; // set cost per card of the card remover services
- .faildestroy = 1; // Should the card remover have a chance of failure that destroys items?
+ set .zenycost,200000; // Set base cost in zeny of the card remover services
+ set .percardcost,25000; // set cost per card of the card remover services
+ set .faildestroy,1; // Should the card remover have a chance of failure that destroys items? 1 = Yes, 0 = No.
mes "[Wise Old Woman]";
mes "Good day, young one. I have the power to remove cards that you have compounded onto your equipment. Does this idea please you?";
next;
diff --git a/npc/custom/heal.txt b/npc/custom/heal.txt
index 9ef5a6fc5..7b63bd508 100644
--- a/npc/custom/heal.txt
+++ b/npc/custom/heal.txt
@@ -1,7 +1,6 @@
- script healer -1,{
set .payment,0; // Charge for heals? 1 = yes, 0 = no
- .price = 100; // How much zeny to charge for heals?
- callfunc "F_ClearGarbage",0;
+ set .price,100; // How much zeny to charge for heals?
mes "[Healer]";
mes "I have amazing healing powers!!";
@@ -22,7 +21,7 @@
mes "Have fun adventuring!!";
break;
case 2:
- mes "[Healer]";
+ mes "[Healer]";
mes "Alright, come back if you need a heal.";
break;
}
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 60b8b44a5..0e03f467d 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -227,7 +227,7 @@ hugel,88,151,5 duplicate(warpra) Warp Agent#13 859
lighthalzen,155,79,6 duplicate(warpra) Warp Agent#14 859
louyang,210,106,4 duplicate(warpra) Warp Agent#15 859
morocc,156,95,4 duplicate(warpra) Warp Agent#16 859
-prontera,161,192,4 duplicate(warpra) Warp Agent#17 859
+prontera,160,190,4 duplicate(warpra) Warp Agent#17 859
payon,182,110,4 duplicate(warpra) Warp Agent#18 859
umbala,132,130,4 duplicate(warpra) Warp Agent#19 859
xmas,150,136,4 duplicate(warpra) Warp Agent#20 859
diff --git a/npc/jobs/3-1/ranger.txt b/npc/jobs/3-1/ranger.txt
index 63df1b7f7..84e453e35 100644
--- a/npc/jobs/3-1/ranger.txt
+++ b/npc/jobs/3-1/ranger.txt
@@ -98,6 +98,7 @@ tur_dun01,156,36,5 script Survival Instructor#jr01 59,{
mes "[Survival Instructor, Rescue]";
mes "All right.";
mes "You are ready then.";
+ next;
break;
}
mes "[Survival Instructor, Rescue]";
diff --git a/npc/jobs/3-1/rune_knight.txt b/npc/jobs/3-1/rune_knight.txt
index 566513ad2..5eccceeba 100644
--- a/npc/jobs/3-1/rune_knight.txt
+++ b/npc/jobs/3-1/rune_knight.txt
@@ -361,7 +361,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{
mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
close;
}
- if (BaseJob == Job_Swordman) {
+ if (BaseClass == Job_Swordman) {
if (job_rune_edq == 23) {
mes "[Captain Tigris]";
mes "Oh, I see... Please wait a moment.";
@@ -621,7 +621,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{
close;
}
else {
- if ((BaseJob != Job_Knight) && (JobLevel < 50) && (SkillPoint) && (BaseLevel < 99)) {
+ if (Class != Job_Knight || Class != Job_Lord_Knight || Class != Job_Baby_Knight && ((JobLevel < 50) && (SkillPoint) && (BaseLevel < 99))) {
// custom translation
mes "[Captain Tigris]";
mes "You seem to be missing something?";
@@ -673,7 +673,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,{
}
job3_rune01,90,50,3 script Rune Knight Lunarea 469,{
- if (BaseJob != Job_Swordman) {
+ if (BaseClass != Job_Swordman) {
mes "She holds up her chin quietly, nods lightly and notices me.";
next;
mes "Then after a moment she puts her face down and seems absorbed with other thoughts.";
@@ -2323,7 +2323,7 @@ job3_rune01,50,36,1 script Runes, Make & Use 844,{
}
mid_camp,238,250,3 script Rune Knight Sage Guard 468,{
- if (BaseJob != Job_Swordman) {
+ if (BaseClass != Job_Swordman) {
mes "[Rune Knight Sage Guard]";
mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights.";
next;
diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 4662d2728..c6dd68f4e 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -67,7 +67,7 @@ prt_church,173,23,4 script Cleric 79,{
mes "this skill for the work of good . .";
close;
}
- if ((countitem(727) > 0) && (countitem(991) > 0) && (countitem(2608) > 0) && (JobLevel > 29) && (BaseJob == Job_Acolyte)) {
+ if ((countitem(727) > 0) && (countitem(991) > 0) && (countitem(2608) > 0) && (JobLevel > 29) && (BaseClass == Job_Acolyte)) {
mes "[Acolyte Klift]";
mes "Your faith has proven worthy";
mes "for you to gain the ' Holy Light ' skill.";
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index bc1fdf670..dd1233e56 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -15,7 +15,7 @@
//============================================================
moc_ruins,118,99,5 script Roberto 88,{
- if (BaseJob == Job_Archer) {
+ if (BaseClass == Job_Archer) {
if (getskilllv("AC_MAKINGARROW") == 1) {
mes "[Roberto]";
mes "Ooh, you're from my home town!";
@@ -33,13 +33,13 @@ moc_ruins,118,99,5 script Roberto 88,{
mes "Then byebye~";
close;
}
- else if ((BaseJob == Job_Archer) && (JobLevel >= 30)) {
+ else if ((BaseClass == Job_Archer) && (JobLevel >= 30)) {
mes "[Roberto]";
mes "Eh!";
mes " ";
mes "You are...";
next;
- if ((countitem(907) > 19) && (countitem(921) > 6) && (countitem(906) > 40) && (countitem(1019) > 12) && (countitem(501) > 0) && (BaseJob == Job_Archer) && (JobLevel >= 30)) {
+ if ((countitem(907) > 19) && (countitem(921) > 6) && (countitem(906) > 40) && (countitem(1019) > 12) && (countitem(501) > 0) && (BaseClass == Job_Archer) && (JobLevel >= 30)) {
mes "[Roberto]";
mes "You brought them!";
mes "Thank you very much.";
@@ -147,7 +147,7 @@ moc_ruins,118,99,5 script Roberto 88,{
}
payon,103,63,3 script Jason 88,3,3,{
- if (BaseJob == Job_Archer) {
+ if (BaseClass == Job_Archer) {
if (getskilllv("AC_CHARGEARROW") == 1) {
mes "[Jason]";
mes "Eh, we meet again.";
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 6ed54c254..cb141443d 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -92,7 +92,7 @@ geffen_in,151,119,4 script Great Wizard 64,{
mes "I have nothing more to teach you ...";
close;
}
- if ((countitem(746) > 2) && (countitem(730) > 0) && (countitem(935) > 4) && (countitem(943) > 0) && (JobLevel > 34) && (BaseJob == Job_Mage)) {
+ if ((countitem(746) > 2) && (countitem(730) > 0) && (countitem(935) > 4) && (countitem(943) > 0) && (JobLevel > 34) && (BaseClass == Job_Mage)) {
mes "[BLIZZARDRISS]";
mes "Okay, I have received your request.";
mes "I will now awaken your hidden energies . .";
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index e85d19aed..1fb202072 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -15,7 +15,7 @@
//============================================================
alberta,83,96,5 script Necko 98,7,7,{
- if (BaseJob == Job_Merchant) {
+ if (BaseClass == Job_Merchant) {
if (getskilllv("MC_LOUD") == 1) {
mes "[Necko]";
mes "I'm sorry. Necko's store is...";
@@ -179,7 +179,7 @@ OnTouch:
}
alberta,119,221,6 script Charlron 107,{
- if (BaseJob == Job_Merchant) {
+ if (BaseClass == Job_Merchant) {
if (getskilllv("MC_CHANGECART") == 1) {
mes "[Charlron]";
mes "Mmm? I was wondering who was making all";
@@ -332,7 +332,7 @@ alberta,119,221,6 script Charlron 107,{
}
alberta,232,103,6 script Gershaun 57,{
- if (BaseJob == Job_Merchant) {
+ if (BaseClass == Job_Merchant) {
if (getskilllv("MC_CARTREVOLUTION") == 1) {
mes "[Gershaun]";
mes "Ah, long time no see!";
@@ -347,7 +347,7 @@ alberta,232,103,6 script Gershaun 57,{
mes "Here! Hurry!";
close;
}
- else if ((BaseJob == Job_Merchant) && (JobLevel >= 35)) {
+ else if ((BaseClass == Job_Merchant) && (JobLevel >= 35)) {
mes "[Gershaun]";
mes "Ooh. You have a firm body";
mes "for a merchant. You must be";
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 2c991d792..31853bc8c 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -15,7 +15,7 @@
//============================================================
izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
- if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x < 1)) {
+ if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
mes "[De Thomas]";
mes "Oh, no! You must have been hurt! Are you ok?";
mes "You must have fought hard to get such serious injuries..";
@@ -74,7 +74,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
close;
}
}
- else if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x > 1)) {
+ else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) {
mes "[De Thomas]";
mes "Oh, it's you?";
mes "Long time no see!";
@@ -83,7 +83,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
mes "Take care! See you again!";
close;
}
- else if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x == 1)) {
+ else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) {
mes "[De Thomas]";
mes "Welcome back...";
mes "are you ready to learn Body Movin'?";
@@ -150,7 +150,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
prt_in,75,88,5 script Leon Von Frich 85,3,3,{
- if ((BaseJob == Job_Swordman) && (JobLevel >= 25)) {
+ if ((BaseClass == Job_Swordman) && (JobLevel >= 25)) {
if (getskilllv("SM_FATALBLOW") == 1) {
mes "[Leon]";
mes "Eh?";
@@ -303,7 +303,7 @@ OnTouch:
}
prt_in,94,57,3 script Juan 85,4,4,{
- if (BaseJob == Job_Swordman) {
+ if (BaseClass == Job_Swordman) {
if (getskilllv("SM_AUTOBERSERK") == 1) {
mes "[Juan]";
mes "Mmm? Long time no see!";
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 81004cce9..2de3e01ae 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -16,7 +16,7 @@
//============================================================
moc_prydb1,154,128,4 script Alcouskou 118,{
- if (BaseJob == Job_Thief) {
+ if (BaseClass == Job_Thief) {
mes "[Alcouskou]";
mes "As you live life you will encounter";
mes "many things. Sometimes you will";
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index bf26a5757..4b37bf462 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -157,7 +157,7 @@ npc: npc/quests/first_class/tu_sword.txt
npc: npc/quests/first_class/tu_thief01.txt
//Wandering Minstrel Quest
npc: npc/quests/Bard_Quest.txt
-// Repeatable EXP Quests: Currently not avaliable in RE.
+// Repeatable EXP Quests: Currently not available in RE.
//npc: npc/quests/collection/quest_alligator.txt
//npc: npc/quests/collection/quest_caramel.txt
//npc: npc/quests/collection/quest_disguiseloliruri.txt
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-20 03:02:12 +0000