summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/Global_Functions.txt2
-rw-r--r--npc/other/arena/arena_lvl60.txt4
-rw-r--r--npc/other/arena/arena_party.txt6
-rw-r--r--npc/other/bulletin_boards.txt8
-rw-r--r--npc/other/divorce.txt4
-rw-r--r--npc/other/hugel_bingo.txt2
-rw-r--r--npc/other/marriage.txt20
-rw-r--r--npc/other/mercenary_rent.txt2
-rw-r--r--npc/other/monster_museum.txt2
-rw-r--r--npc/other/monster_race.txt30
-rw-r--r--npc/other/turbo_track.txt18
11 files changed, 48 insertions, 50 deletions
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 3f7d1d20a..559ba151f 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -215,7 +215,7 @@ function script F_ItemName {
}
//////////////////////////////////////////////////////////////////////////////////
-// *** Function "F_SaveQuestSkills": Store learnt quest skills
+// *** Function "F_SaveQuestSkills": Store learnt quest skills
//////////////////////////////////////////////////////////////////////////////////
function script F_SaveQuestSkills {
set ADV_QSK,0; set ADV_QSK2,0;
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index 8ccd45cf0..c3d33f333 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -947,7 +947,7 @@ OnTimer4000:
end;
OnTimer60000:
- donpcevent "cast#60::OnTimeOver2";
+ donpcevent "cast#60::OnTimeOver2";
donpcevent "arn_warp_60::OnOut";
donpcevent "#arn_timer_60::OnStop";
donpcevent "alloff#60::OnEnable";
@@ -956,7 +956,7 @@ OnTimer60000:
OnStop:
stopnpctimer;
- end;
+ end;
}
- script arn_warp_60 -1,{
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 0f4e53ca5..218a6de90 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -1,5 +1,5 @@
//===== Hercules Script ======================================
-//= Izlude Party Arena
+//= Izlude Party Arena
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
@@ -1139,7 +1139,7 @@ OnTimer4000:
end;
OnTimer60000:
- donpcevent "cast#pt::OnTimeOver2";
+ donpcevent "cast#pt::OnTimeOver2";
donpcevent "arn_warp_pt::OnOut";
donpcevent "#arn_timer_pt::OnStop";
donpcevent "alloff#pt::OnEnable";
@@ -1148,7 +1148,7 @@ OnTimer60000:
OnStop:
stopnpctimer;
- end;
+ end;
}
- script arn_warp_pt -1,{
diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt
index 7c1d4d0e3..66e14c577 100644
--- a/npc/other/bulletin_boards.txt
+++ b/npc/other/bulletin_boards.txt
@@ -44,7 +44,7 @@ alberta,111,59,5 script Bulletin Board#1 2_BULLETIN_BOARD,{
next;
mes "[Alberta: The Port City]";
mes "From Alberta, ^1F3A11Payon^000000 is located to the Northwest. You can board passenger ships at the dock to travel to ^5E5C69Izlude^000000.";
- mes "Enjoy your travels.";
+ mes "Enjoy your travels.";
close;
}
@@ -113,12 +113,12 @@ payon,178,108,5 script Bulletin Board#06 2_BULLETIN_BOARD,{
next;
mes "[Payon: The Mountain City]";
mes "From Payon, ^123972Alberta^000000 is located to the Southeast, and ^866C4BMorroc^000000 is to the West. ^5E5C69Izlude^000000 and ^6D6FE0Prontera^000000 are North of Payon.";
- mes "Enjoy your travels.";
+ mes "Enjoy your travels.";
close;
}
pay_arche,79,31,5 script Bulletin Board#07 2_BULLETIN_BOARD,{
- mes "[Archer Village]";
+ mes "[Archer Village]";
mes "Welcome to the Payon Archer Village where Novices can change their jobs to Archer.";
next;
mes "[Archer Village]";
@@ -451,7 +451,7 @@ moc_fild19,107,101,5 script Bulletin Board#20 2_BULLETIN_BOARD,{
gef_tower,55,142,5 script Bulletin Board#21 2_BULLETIN_BOARD,{
mes "[Geffen Dungeon]";
- mes "^6B1312Caution!^000000";
+ mes "^6B1312Caution!^000000";
mes "Geffen dungeon is consisted of 3 levels";
mes "is too difficult for new adventurers to venture.";
mes "As main monsters constantly appear,";
diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index ce497018b..c95589d74 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -38,8 +38,8 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{
// mes "popular nowadays, heh heh~";
// close;
// }
-// else
- if (!getpartnerid()) {
+// else
+ if (!getpartnerid()) {
mes "Bwah hah hah~!";
mes "That look in your eyes~!";
if (Sex) {
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 0a47b4f00..2b1e8f410 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -449,7 +449,7 @@ OnTouch:
if($@bingoresult == 1 || $@bingoresult == 21) mes "[ "+$@bingoresult+"st Number - "+$bingo[$@bingoresult -1]+" ]";
else if($@bingoresult == 2 || $@bingoresult == 22) mes "[ "+$@bingoresult+"nd Number - "+$bingo[$@bingoresult -1]+" ]";
else if($@bingoresult == 3 || $@bingoresult == 23) mes "[ "+$@bingoresult+"rd Number - "+$bingo[$@bingoresult -1]+" ]";
- else mes "[ "+$@bingoresult+"th Number - "+$bingo[$@bingoresult -1]+" ]";
+ else mes "[ "+$@bingoresult+"th Number - "+$bingo[$@bingoresult -1]+" ]";
mes "["+@bingo_a1$+"] ["+@bingo_a2$+"] ["+@bingo_a3$+"] ["+@bingo_a4$+"] ["+@bingo_a5$+"]";
mes "["+@bingo_b1$+"] ["+@bingo_b2$+"] ["+@bingo_b3$+"] ["+@bingo_b4$+"] ["+@bingo_b5$+"]";
mes "["+@bingo_c1$+"] ["+@bingo_c2$+"] ["+@bingo_c3$+"] ["+@bingo_c4$+"] ["+@bingo_c5$+"]";
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 5cb1946d6..be909a207 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -11,7 +11,7 @@
//= Currently does not support same-Sex marriages.
//= Old script located in: npc/custom/marriage.txt
//= - Variable in use: wedding_sign (max 1)
-//= - Variable in use: $@wedding (max 1)
+//= - Variable in use: $@wedding (max 1)
//= - Variable in use: $@wed_groom$ $@wed_bride$
//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
@@ -315,17 +315,15 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{
next;
while(1) {
input .@name$;
- if (.@name$ != strcharinfo(0)) {
- mes "[Marry Happy]";
- mes "Hmmm, you have to write";
- mes "down your name exactly as";
- mes "it is displayed. Maybe you";
- mes "need to copy and paste it?";
- mes "Anyway, let's try it again.";
- next;
- }
- else
+ if (.@name$ == strcharinfo(0))
break;
+ mes "[Marry Happy]";
+ mes "Hmmm, you have to write";
+ mes "down your name exactly as";
+ mes "it is displayed. Maybe you";
+ mes "need to copy and paste it?";
+ mes "Anyway, let's try it again.";
+ next;
}
mes "[Marry Happy]";
mes "Great, it looks like we";
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index 7b2a47d0a..422a5ac5b 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -271,7 +271,7 @@ pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 4_M_J
close;
}
mes "[Mercenary Goods Merchant]";
- if (.@input == 1)
+ if (.@input == 1)
mes "Here's your " + getitemname(.@item[.@m]) + ".";
else {
mes "Here you are, this is exactly";
diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt
index 6917a9f93..fae93fd3e 100644
--- a/npc/other/monster_museum.txt
+++ b/npc/other/monster_museum.txt
@@ -11,7 +11,7 @@
//= - Information about various monsters
//===== Additional Comments: =================================
// 07/06/05 : Added 1st Version. [Muad_Dib]
-//= Adapted to rAthena Scripting Language by [Lance]
+//= Adapted to rAthena Scripting Language by [Lance]
//= 1.1a Fixed typos [Haplo]
//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= 1.3 Added a Missing "case 1:". [Samuray22]
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 3b2dd618b..c3c54a426 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -19,7 +19,7 @@
//= 1.6 Updated experience rewards. [L0ne_W0lf]
//= 1.7 Optimization, -4000 lines (more can still be done). [Euphy]
//= 1.8 Optimized.
-//= Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph]
+//= Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph]
//= 1.9 Updated RE/Pre-RE EXP. [Euphy]
//= 2.0 Added GM management NPC. [Euphy]
//============================================================
@@ -293,7 +293,7 @@ OnTimer9000:
function WN {
set .@n, charat(strnpcinfo(0),getstrlen(strnpcinfo(0))-1);
if (!getarg(0)) return .@n;
- return ((.@n <= 3)?((.@n == 1)?"1st":((.@n == 2)?"2nd":"3rd")):.@n+"th");
+ return ((.@n <= 3)?((.@n == 1)?"1st":((.@n == 2)?"2nd":"3rd")):.@n+"th");
}
OnInit:
@@ -334,7 +334,7 @@ p_track01,67,45,5 script Medal Distributor#single 4_F_RACING,{
mes "after the race finishes. Prize";
mes "Medals may be given to Wayne";
mes "in Hugel in exchange for items.";
- next;
+ next;
if ($@monster_race) {
if (monster_race_1 == $@monster_race) {
mes "[Medal Distributor]";
@@ -670,7 +670,7 @@ hugel,58,72,6 script Eckar Ellebird#single 4_M_NFMAN,{
mes "we ask that you please";
mes "wait a little while longer.";
close;
- }
+ }
} else {
if ($@mon_time_1_1 == 1) {
mes "[Eckar Ellebird]";
@@ -1437,7 +1437,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{
mes "^0000FFMonster "+.@m+"^000000, "+.@w$[0];
mes .@w$[1]+".";
mes "Are you sure you want";
- mes "to choose this monster?";
+ mes "to choose this monster?";
if (select("Yes:No") == 2) {
mes "[Ticket Helper]";
mes "You have canceled";
@@ -1445,7 +1445,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{
mes "I understand. Perhaps";
mes "you'd feel more comfortable";
mes "checking the monsters first?";
- close;
+ close;
}
next;
if (!.@m1) {
@@ -1542,7 +1542,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{
mes "^0000FFMonster " + monster_race_2_1 + "^000000 and ^0000FFMonster " + monster_race_2_2 + "^000000";
mes "for this Dual Monster Race.";
next;
- }
+ }
mes "[Ticket Helper]";
mes "The start of the race will be";
mes "announced through a broadcast.";
@@ -1551,7 +1551,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{
mes "positions. Thank you, and";
mes "have a good time!";
viewpoint 1,43,35,0,0xFF0000;
- close;
+ close;
}
OnInit:
@@ -1841,10 +1841,10 @@ OnMyMobDead:
function MN {
setarray .@n$[1], "poring","lunatic","savagebebe","desertwolf","deviruchi","baphomet";
for (set .@i, 1; .@i <= getarraysize(.@n$); set .@i, .@i + 1) {
- if (compare(strnpcinfo(0),.@n$[.@i]))
+ if (compare(strnpcinfo(0),.@n$[.@i]))
break;
}
- return .@i;
+ return .@i;
}
OnInit:
@@ -2302,7 +2302,7 @@ ein_in01,85,208,5 script Ei'felle#repay01 4_M_EINMAN2,{
setarray .@mw$, "Nagan:Immaterial Sword:Mysteltainn:Byeollungum:Star Dust Blade:Caesar's Sword:Ice Falchion:Excalibur:Edge:Cutlus:Solar Sword:Tirfing:Fireblend";
setarray .@mw, 1130,1141,1138,1140,1148,1134,1131,1137,1132,1135,1136,1139,1133;
break;
- case 2:
+ case 2:
setarray .@mw$, "Dragon Slayer:Masamune:Muramasa:Schweizersabel:Executioner:Zweihander:Katzbalger";
setarray .@mw, 1166,1165,1164,1167,1169,1168,1170;
break;
@@ -2344,7 +2344,7 @@ ein_in01,85,208,5 script Ei'felle#repay01 4_M_EINMAN2,{
case 12:
setarray .@mw$, "Oriental Lute:Electric Guitar";
setarray .@mw, 1918,1913;
- break;
+ break;
}
set .@j, select (.@mw$+":Cancel") - 1;
explode(.@mw$,.@mw$,":");
@@ -2804,7 +2804,7 @@ hugel,71,83,4 script Wayne 4_M_HUMERCHANT,{
set .@m$, .@m$ + .@pm[.@i] + " Prize medal:";
set .@m, select (.@m$) - 1;
switch (.@m) {
- case 0:
+ case 0:
setarray .@mr$, "2 Hinale Leaflets:2 Aloe Leaflets:1 Mastela Fruit:5 Witch Starsands:4 Condensed Red Potions";
setarray .@mr, 520,2,521,2,522,1,1061,5,545,4;
break;
@@ -2862,7 +2862,7 @@ hugel,71,83,4 script Wayne 4_M_HUMERCHANT,{
mes "races, fair adventurer~";
delitem 7515,.@pm[.@m];
getitem .@mr[.@m2*2],.@mr[((.@m2*2)+1)];
- close;
+ close;
}
}
@@ -2968,7 +2968,7 @@ p_track02,69,31,1 script Blacksmith Guildsman#dou 4_F_JOB_BLACKSMITH,{
mes "It's too hard for me to win~!";
emotion e_swt2;
close;
- }
+ }
mes "[Blacksmith Guildsman]";
mes "Run! Go go go!";
mes "I need to win some";
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index 21aaa24d7..2d9b967d8 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -6,7 +6,7 @@
//= 1.2
//===== Description: =========================================
//= [Official Conversion]
-//= Turbo Track Course:
+//= Turbo Track Course:
//= - Solo Mode/Time Attack
//= - Normal (Non-PVP) - 4/8/16 Person
//= - Expert (PVP) - 4/8/16 Person
@@ -1216,14 +1216,14 @@ OnTouch:
mes "I wouldn't be able to do business without the Kafra Services. Thank you, Kafra!";
mes " ";
mes "[Chief Mahnsoo]";
- mes "I looove you Kafra!^000000";
+ mes "I looove you Kafra!^000000";
} else {
mes "^4d4dff[Karkatan]";
mes "My land suffered from poor customer service...until Kafra came along!";
mes " ";
mes "[Curator Guiss]";
mes "Oh, Kafra is simply the best!^000000";
- }
+ }
next;
mes "^ff0000Turbo Track";
mes "^ff0000Traps in the Cursed Desert!";
@@ -1730,7 +1730,7 @@ OnTouch:
case 2:
mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cube Hills course!",bc_map,"0x70DBDB";
warp strnpcinfo(4),316,365;
- end;
+ end;
case 3:
mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cursed Desert!",bc_map,"0x70DBDB";
switch (rand(1,4)) {
@@ -1951,9 +1951,9 @@ OnTouch:
function GetNumber {
setarray .@w_n$[1], "n4","n8","n16","e4","e8","e16";
for (set .@i, 1; .@i <= getarraysize(.@w_n$); set .@i, .@i + 1) {
- if (getarg(0) == .@w_n$[.@i])
+ if (getarg(0) == .@w_n$[.@i])
return .@i;
- }
+ }
}
OnInit:
@@ -2089,7 +2089,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1
mes "However, you cannot receive";
mes "any points if you exceed the";
mes "point limit. You now have a total of " + my_point + " Turbo Track points.";
- }
+ }
set tt_rank,tt_rank+1;
next;
if (tt_rank > $ttranks[1]) {
@@ -2300,7 +2300,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1
mes "you any Turbo Track Points";
mes "since you would exceed the";
mes "maximum limit. Sorry...";
- }
+ }
} else {
mes "Oh right, your current";
set my_point,tt_point;
@@ -2430,7 +2430,7 @@ OnTimer36000:
OnTimer40000:
set .@w$,callfunc("F_tt");
- if (compare(.@w$,"4"))
+ if (compare(.@w$,"4"))
mapannounce strnpcinfo(4),"[Blacksmith Union]",bc_map,"0x33FF66";
else
mapannounce strnpcinfo(4),"[Al De Baran Kafra Corporation Headquarters]",bc_map,"0x33FF66";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-23 22:58:55 +0000