summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/guides/guides_payon.txt2
-rw-r--r--npc/pre-re/jobs/1-1/merchant.txt4
-rw-r--r--npc/pre-re/jobs/novice/novice.txt6
-rw-r--r--npc/pre-re/kafras/kafras.txt2
-rw-r--r--npc/pre-re/mobs/fields/veins.txt2
-rw-r--r--npc/pre-re/scripts_main.conf2
-rw-r--r--npc/pre-re/warps/cities/rachel.txt4
7 files changed, 11 insertions, 11 deletions
diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt
index 4efc96737..9f8e4a776 100644
--- a/npc/pre-re/guides/guides_payon.txt
+++ b/npc/pre-re/guides/guides_payon.txt
@@ -14,7 +14,7 @@
//= to Muad_Dib
//= 1.3a Fixed some problems with duplicated text, thanks to muad_dib [MasterOfMuppets]
//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
-//= 1.4a Tixed Archer Village Guide [Lupus]
+//= 1.4a Tixed Archer Village Guide [Lupus]
//= 1.5 Removed Duplicates [Silent]
//= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 59b612e5b..934dc0300 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -710,9 +710,9 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
mes "[Union Staff Kay]";
mes "Hey hey. That number's not valid! Enter a value from 1000000 to 5000000. got it?";
next;
- }
- else
+ } else {
break;
+ }
}
mes "[Union Staff Kay]";
if (.@where_village == 1)
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index 2f15fa995..a57bf5190 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -175,7 +175,7 @@ new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{
close;
}
}
-}
+}
new_1-1,53,114,4 script Shion#nv1 4_F_JOB_HUNTER,{
if (nov_get_item04 > 9 || nov_get_item05 > 9) {
@@ -2654,7 +2654,7 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 4_M_02,{
}
else {
warp "new_1-3",96,21;
- }
+ }
end;
case 2:
mes "[Hoffman]";
@@ -3859,7 +3859,7 @@ S_UserJobchoice:
mes "[Hanson]";
mes "The Mage Academy is located in the NorthWest in town. Please remember this.";
}
- else if (@menu == 3) {
+ else if (@menu == 3) {
mes "to become a Merchant.";
mes "You will be sent to";
mes "the town of Alberta.";
diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt
index e900a0fa6..85d2ae49e 100644
--- a/npc/pre-re/kafras/kafras.txt
+++ b/npc/pre-re/kafras/kafras.txt
@@ -9,7 +9,7 @@
//= arg(0): 0 - Default Kafra message
//= 1 - Niflhiem Kafra message
//= 2 - Guild Kafra message
-//= arg(1): 1 - Disable teleport menu
+//= arg(1): 1 - Disable teleport menu
//= arg(2): 1 - Disable info menu
//= arg(3): Cost of Storage service
//= arg(4): Cost of Rent a Pushcart service
diff --git a/npc/pre-re/mobs/fields/veins.txt b/npc/pre-re/mobs/fields/veins.txt
index 73577013a..5a9a221bc 100644
--- a/npc/pre-re/mobs/fields/veins.txt
+++ b/npc/pre-re/mobs/fields/veins.txt
@@ -70,7 +70,7 @@ ve_fild05,123,65,50,21 monster Sleeper 1386,5,120000,0,0
ve_fild05,152,139,15,17 monster White Plant 1082,5,1800000,0,0
ve_fild05,152,139,5,5 monster Shining Plant 1083,1,2400000,0,0
-//======== [Veins Field-06] ===================================
+//======== [Veins Field-06] ===================================
ve_fild06,0,0,0,0 monster Stapo 1784,2,300000,0,0
ve_fild06,0,0,0,0 monster Stapo 1784,1,1800000,0,0
ve_fild06,0,0,0,0 monster Shining Plant 1083,1,1020000,0,0
diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf
index a2c1fcc1c..8e75dd332 100644
--- a/npc/pre-re/scripts_main.conf
+++ b/npc/pre-re/scripts_main.conf
@@ -4,7 +4,7 @@
// The idea of this new system is to make scripts more organized
// since the old system was rather messy with all the NPCs in one
// file. Now scripts are organized in to files arraged by type.
-// Custom scripts are now in scripts_custom.conf, all other
+// Custom scripts are now in scripts_custom.conf, all other
// scripts are deemed as 'official'. You should place your NPCs
// in to scripts_custom.conf to follow the trend.
//
diff --git a/npc/pre-re/warps/cities/rachel.txt b/npc/pre-re/warps/cities/rachel.txt
index df2821535..2f16964c3 100644
--- a/npc/pre-re/warps/cities/rachel.txt
+++ b/npc/pre-re/warps/cities/rachel.txt
@@ -7,14 +7,14 @@
//===== Description: =========================================
//= Warp Points for Rachel City, shops & other locations
//===== Additional Comments: =================================
-//= 1.0 Added the official warps and commented out the
+//= 1.0 Added the official warps and commented out the
//= "custom duplicates" for future checkout. Special thanks
//= to RockmanEXE who provided all the info. [erKURITA]
//= 1.1 Added warp to Veins Field [Playtester]
//= 1.2 Fully official rachel warps [Playtester]
//= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
//= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf]
-//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf]
+//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf]
//============================================================
rachel,150,249,0 warp rachel01 1,1,ra_temple,120,30