summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/cooking_quest.txt2
-rw-r--r--npc/quests/guildrelay.txt14
-rw-r--r--npc/quests/okolnir.txt14
-rw-r--r--npc/quests/quests_prontera.txt4
-rw-r--r--npc/quests/quests_rachel.txt2
-rw-r--r--npc/quests/seals/mjolnir_seal.txt4
6 files changed, 20 insertions, 20 deletions
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 8242bcc96..28f5e26b0 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -1716,7 +1716,7 @@ prt_castle,45,35,5 script Madeleine Chu#cook 4_COOK,{
mes "of Cooking Kits";
mes "did you need?";
next;
- switch(Select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) {
+ switch(select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) {
case 1:
callsub S_SellSets,12125;
close;
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index cafdade0e..535eb7902 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -24,25 +24,25 @@
set .@name2$,"Lenya";
set .@name3$,"Gealuve";
set .@name4$,"Pariz";
- set .@GID, GetCastleData("aldeg_cas"+strnpcinfo(2),1);
+ set .@GID, getcastledata("aldeg_cas"+strnpcinfo(2),1);
}
else if (.@name$ == "Jody") {
set .@name2$,"Ron Haware";
set .@name3$,"Vers";
set .@name4$,"Gen Garish";
- set .@GID, GetCastleData("gefg_cas"+strnpcinfo(2),1);
+ set .@GID, getcastledata("gefg_cas"+strnpcinfo(2),1);
}
else if (.@name$ == "Chungye") {
set .@name2$,"Dosuhlji";
set .@name3$,"Yayula";
set .@name4$,"Ashin";
- set .@GID, GetCastleData("payg_cas"+strnpcinfo(2),1);
+ set .@GID, getcastledata("payg_cas"+strnpcinfo(2),1);
}
else if (.@name$ == "Hermod") {
set .@name2$,"Atila";
set .@name3$,"Cecil";
set .@name4$,"Diligo";
- set .@GID, GetCastleData("prtg_cas"+strnpcinfo(2),1);
+ set .@GID, getcastledata("prtg_cas"+strnpcinfo(2),1);
}
if (checkweight(908,630) == 0) {
mes "^3355FFWait a minute! You're";
@@ -1221,7 +1221,7 @@
- script RelayDummy2::GuildRelay2 4_M_SAGE_A,{
set .@name$,strnpcinfo(1);
getmapxy(.@m$,.@x,.@x,1);
- set .@GID, GetCastleData(.@m$,1);
+ set .@GID, getcastledata(.@m$,1);
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a minute! You're";
mes "carrying too many items";
@@ -1730,7 +1730,7 @@
- script RelayDummy3::GuildRelay3 4_M_SAGE_A,{
set .@name$,strnpcinfo(1);
getmapxy(.@m$,.@x,.@x,1);
- set .@GID, GetCastleData(.@m$,1);
+ set .@GID, getcastledata(.@m$,1);
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a minute! You're";
mes "carrying too many items";
@@ -2415,7 +2415,7 @@
- script GuildDummy4::GuildRelay4 4_M_SAGE_A,{
set .@name$,strnpcinfo(1);
getmapxy(.@m$,.@x,.@x,1);
- set .@GID, GetCastleData(.@m$,1);
+ set .@GID, getcastledata(.@m$,1);
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a minute! You're";
mes "carrying too many items";
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index 395fda89d..c1e09bfec 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -21,7 +21,7 @@ function script F_Okolnir {
- script Guide#gq_main -1,{
set .@sub$, callfunc("F_Okolnir");
- set .@GID, GetCastleData(strnpcinfo(4),1);
+ set .@GID, getcastledata(strnpcinfo(4),1);
if (getcharid(2) == .@GID) {
if (getd("$siz_"+.@sub$+"_on") == 0) {
mes "[Guide]";
@@ -58,8 +58,8 @@ function script F_Okolnir {
mes "Would you like to try to enter here?";
close;
case 2:
- set .@Defence,GetCastleData(strnpcinfo(4),3);
- set .@Economy,GetCastleData(strnpcinfo(4),2);
+ set .@Defence,getcastledata(strnpcinfo(4),3);
+ set .@Economy,getcastledata(strnpcinfo(4),2);
if ((.@Economy > 64) && (.@Defence > 29)) {
mes "[Guide]";
mes "Great! Economy and Defense are OK.";
@@ -169,7 +169,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306
- script Wish Maiden#gq_main -1,{
set .@sub$, callfunc("F_Okolnir");
set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
- set .@GID, GetCastleData(.@t$,1);
+ set .@GID, getcastledata(.@t$,1);
if (getcharid(2) == .@GID) {
cutin "wish_maiden31",1;
if (strcharinfo(0) == getguildmaster(.@GID)) {
@@ -236,7 +236,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306
donpcevent "#okolnir_"+.@sub$+"::OnEnable";
disablenpc "Wish Maiden#gq_"+.@sub$;
cutin "wish_maiden11",255;
- announce "["+ strcharinfo(0) +"], of the guild ["+ GetGuildName(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb";
+ announce "["+ strcharinfo(0) +"], of the guild ["+ getguildname(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb";
end;
}
else {
@@ -2142,7 +2142,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss 193
- script Wish Maiden#main_gift -1,{
set .@sub$,callfunc("F_Okolnir");
set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
- set .@GID, GetCastleData(.@t$,1);
+ set .@GID, getcastledata(.@t$,1);
if (getcharid(2) == .@GID) {
if (strcharinfo(0) == getguildmaster(.@GID)) {
if (compare(.@sub$,"aru")) {
@@ -2180,7 +2180,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss 193
delitem .@n[.@i],.@n[.@i+1];
getitem .@rwd,1;
getitem 7840,1; //Valkyrie_Gift
- announce "["+ strcharinfo(0) +"], of guild ["+ GetGuildName(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb";
+ announce "["+ strcharinfo(0) +"], of guild ["+ getguildname(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb";
close2;
cutin "wish_maiden11",255;
disablenpc "Wish Maiden#"+.@sub$+"_gift";
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 59a16deb6..d2a15064c 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -327,7 +327,7 @@ prontera,248,212,3 script Busy Boy#prt 4_M_KID1,3,3,{
mes "You couldn't help it:";
mes "it was a natural reflex!^000000";
next;
- Specialeffect EF_HITDARK;
+ specialeffect EF_HITDARK;
emotion e_omg;
mes "^3355FF*BAM!*^000000";
next;
@@ -449,7 +449,7 @@ OnTouch:
callsub S_CheckWeight; //Check Player's weight
if (BaseLevel > 59) {
if (prt_curse == 0) {
- Specialeffect EF_HITDARK;
+ specialeffect EF_HITDARK;
mes "^3355FF*BAM!*^000000";
next;
mes "[Busy Looking Boy]";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index fc96796bb..715cbe7ee 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3683,7 +3683,7 @@ OnStart:
end;
OnStartTimer:
- Initnpctimer;
+ initnpctimer;
end;
OnStopTimer:
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 375b47426..9457f431a 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -1968,7 +1968,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 4_M_DWARF,{
mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all.";
close;
}
- if (GetEquipPercentRefinery(.@part) == 100) {
+ if (getequippercentrefinery(.@part) == 100) {
mes "[Vestri]";
mes "This item isn't even a challenge to upgrade. You can get humans to do this kind of beginner's stuff. Get them to refine it first.";
next;
@@ -2186,7 +2186,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 4_M_DWARF,{
mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all.";
close;
}
- if (GetEquipPercentRefinery(.@part) == 100) {
+ if (getequippercentrefinery(.@part) == 100) {
mes "[Vestri]";
mes "This item isn't even a challenge to upgrade. You can get humans to do this kind of beginner's stuff. Get them to refine it first.";
next;