summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-03-01 21:53:39 +0300
committerAndrei Karas <akaras@inbox.ru>2019-03-01 21:54:17 +0300
commit84459522e175a51f5d04cee21c654dc933c1497f (patch)
treeeeed8a23d1a80fb99a83c113c3b77d51cae921fe /npc
parentf511273818398a72f83125e679a96260ebd2667d (diff)
downloadserverdata-84459522e175a51f5d04cee21c654dc933c1497f.tar.gz
serverdata-84459522e175a51f5d04cee21c654dc933c1497f.tar.bz2
serverdata-84459522e175a51f5d04cee21c654dc933c1497f.tar.xz
serverdata-84459522e175a51f5d04cee21c654dc933c1497f.zip
Remove extra white spaces
Diffstat (limited to 'npc')
-rw-r--r--npc/000-2-0/doors.txt2
-rw-r--r--npc/000-2-1/story_save.txt2
-rw-r--r--npc/001-1/cookiemaster.txt2
-rw-r--r--npc/001-1/rowboat.txt2
-rw-r--r--npc/001-1/rowboathelper.txt4
-rw-r--r--npc/001-2-22/note.txt2
-rw-r--r--npc/001-2-33/lozerk.txt30
-rw-r--r--npc/008-1/blossom.txt2
-rw-r--r--npc/008-1/hinnak.txt2
-rw-r--r--npc/008-1/shop.txt2
-rw-r--r--npc/008-2-2/barron.txt6
-rw-r--r--npc/008-2-2/melinda.txt52
-rw-r--r--npc/008-2-2/shop.txt2
-rw-r--r--npc/008-2-4/bernard.txt2
-rw-r--r--npc/functions/manhole.txt2
-rw-r--r--npc/functions/masks.txt2
-rw-r--r--npc/functions/util.txt2
-rw-r--r--npc/test/test2.txt2
18 files changed, 60 insertions, 60 deletions
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index a60b0c80..ee29340a 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -68,7 +68,7 @@ L_End:
mesq l("We're soon leaving that island, please return to your cabine.");
next;
restorecam;
-
+
close;
}
diff --git a/npc/000-2-1/story_save.txt b/npc/000-2-1/story_save.txt
index 44171ad6..30cd8cfd 100644
--- a/npc/000-2-1/story_save.txt
+++ b/npc/000-2-1/story_save.txt
@@ -9,7 +9,7 @@
.@q_narr = getq(General_Narrator);
if(.@q_nard == 5 && .@q_narr < 1)
- {
+ {
OnClick:
narrator S_LAST_NEXT,
l("You lie in the bed."),
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index b62014fa..8ab570bd 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -97,7 +97,7 @@ L_StorySeems:
mesn;
mesq g(l("It looks like the sweet lady is curious, am I right?"),
l("It seems the gentleman is curious, am I right sweetie?"));
- next;
+ next;
mesq lg("Well, if you ever do want to join: 'Ye Merry Club Of Thee Bequeathed With Cookies'...");
next;
diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt
index c600f553..9087c010 100644
--- a/npc/001-1/rowboat.txt
+++ b/npc/001-1/rowboat.txt
@@ -4,7 +4,7 @@
// Description:
// The rowboat, picking up the player on small beach in order to bring it to Koga.
// TODO:
-// Check if the player who wants to enter the boat is the same as the one who called for the boat.
+// Check if the player who wants to enter the boat is the same as the one who called for the boat.
// Make the rowboat move back to the cave if the player doesnt enter in time.
001-1,193,26,0 script #Rowboat NPC_ROWBOAT_STAND_WE,{
diff --git a/npc/001-1/rowboathelper.txt b/npc/001-1/rowboathelper.txt
index 8e16ee8b..81fd3927 100644
--- a/npc/001-1/rowboathelper.txt
+++ b/npc/001-1/rowboathelper.txt
@@ -25,9 +25,9 @@ narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
// Make sure to unmount the boat when player dies
OnPCDieEvent:
setmount 0;
-
+
OnInit:
- .distance = 1;
+ .distance = 1;
}
diff --git a/npc/001-2-22/note.txt b/npc/001-2-22/note.txt
index b2560503..8d39cd28 100644
--- a/npc/001-2-22/note.txt
+++ b/npc/001-2-22/note.txt
@@ -2,7 +2,7 @@
// Author:
// Vasily_Makarov
// Description:
-//
+//
001-2-22,31,31,0 script Note#001-2-22 NPC_DAN_NOTE,{
mesn;
diff --git a/npc/001-2-33/lozerk.txt b/npc/001-2-33/lozerk.txt
index 05b40542..cdafb6bf 100644
--- a/npc/001-2-33/lozerk.txt
+++ b/npc/001-2-33/lozerk.txt
@@ -20,7 +20,7 @@
// Quest-related functions
function explain_direction {
-
+
switch (getq(Artis_Legion_Progress))
{
case 1:
@@ -32,7 +32,7 @@
l("Report back to me once you've had enough!"));
restorecam;
-
+
break;
case 3:
setcamnpc "#001-2-33_39_32";
@@ -54,7 +54,7 @@
return;
}
-
+
function send_training {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
lg("Oh, you were sent by Enora!"),
@@ -64,7 +64,7 @@
select(l("Pleasure to meet you. I am @@.", strcharinfo(PC_NAME)));
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
lg("Oh, you are that person! You were stranded in the seas for a while, right? You look like it."),
l("But don't you worry! I don't know how to get you back your memories, but we can work on your muscles for now!"),
lg("After all, this is the Legion of Aemil! You want to be a great warrior? We'll make you one here!"),
@@ -73,7 +73,7 @@
setq Artis_Legion_Progress, 1;
explain_direction();
-
+
return;
}
@@ -87,7 +87,7 @@
setq Artis_Legion_Progress, 3;
explain_direction();
-
+
return;
}
@@ -103,12 +103,12 @@
setq Artis_Legion_Progress, 5;
explain_direction();
-
+
return;
}
// Normal functions
-
+
function forget_direction {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
lg("You are lucky there are no mental faculty requirements to join the Legion!");
@@ -117,25 +117,25 @@
return;
}
-
+
function tell_about_legion {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("The Legion of Aemil is the greatest organization on all continent! A town cannot be safer than when it's under our protection."),
l("This is where the bravest of warriors come together to put their skills to a good use, for a good cause."),
l("Our building here is also the finest place in the town. Just go and see for yourself!");
-
+
return;
}
-
+
function praise_sword {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Thanks!");
-
+
return;
}
-
+
// Conversation
-
+
speech S_LAST_NEXT,
l("Welcome to the Legion of Aemil's building in Artis!");
@@ -152,7 +152,7 @@
l("What can you tell me about the legion?"),
l("That's a nice sword you have there."),
menuaction(l("Quit"));
-
+
switch (@menu)
{
case 1:
diff --git a/npc/008-1/blossom.txt b/npc/008-1/blossom.txt
index 8cbae406..42e2e9c8 100644
--- a/npc/008-1/blossom.txt
+++ b/npc/008-1/blossom.txt
@@ -28,7 +28,7 @@
l("I heard something too. A girl named Galimatia seems to need help. If only those lazy developers could tell her what she needs.");
close;
}
-
+
close;
diff --git a/npc/008-1/hinnak.txt b/npc/008-1/hinnak.txt
index 08b6242a..812ad95b 100644
--- a/npc/008-1/hinnak.txt
+++ b/npc/008-1/hinnak.txt
@@ -8,7 +8,7 @@
// [1] 3 - helped hinnak
// [2] kill counter
// Description:
-
+
// Hinnak needs help to get rid of the same stuff than ever.
008-1,270,74,0 script Hinnak#008-1 NPC_HINNAK,{
diff --git a/npc/008-1/shop.txt b/npc/008-1/shop.txt
index 838062b6..f50912f2 100644
--- a/npc/008-1/shop.txt
+++ b/npc/008-1/shop.txt
@@ -20,7 +20,7 @@ OnInit:
sellitem AWhiteTulip, -1, 50;
sellitem AYellowTulip, -1, 50;
sellitem ABlueTulip, -1, 20;
-
+
.sex = G_OTHER;
.distance = 10;
end;
diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt
index 3eb3baab..f9914f62 100644
--- a/npc/008-2-2/barron.txt
+++ b/npc/008-2-2/barron.txt
@@ -6,11 +6,11 @@
// Barron, the bartender of the Rusty Pick.
008-2-2,43,28,0 script Barron#008-2-2 NPC_GENERAL_STORE,{
-speech S_LAST_NEXT,
+speech S_LAST_NEXT,
l("Hi!"),
l("I am the bartender here, can I provide you with some delicious beverage?"),
l("Or you can take seat and ask Melinda if you need something.");
-
+
switch (select(l("What beverages do you have?"),
l("I'll ask Melinda later")))
{
@@ -23,7 +23,7 @@ speech S_LAST_NEXT,
l("Make sure to tip her, it will brighten up her day.");
close;
}
-
+
OnInit:
diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt
index 09fd9ff5..86f26e96 100644
--- a/npc/008-2-2/melinda.txt
+++ b/npc/008-2-2/melinda.txt
@@ -7,7 +7,7 @@
008-2-2,40,29,0 script Melinda#008-2-2 NPC_MELINDA,1,1,{
function StartConversation {
-
+
.@tick = gettimetick(1);
if (.@tick > @Hurns_Rusty_Pick_WaitressTick + 10)
{
@@ -15,14 +15,14 @@ function StartConversation {
l("Welcome to the Rusty Pick."),
l("Please, have a seat."),
l("Lovely day, isn't it?");
-
+
.@r = rand(getarraysize(.messages$));
.@msg$ = .messages$[.@r];
npctalk3 .@msg$;
@Hurns_Rusty_Pick_WaitressTick = .@tick;
}
}
-
+
function face_to_PC {
getmapxy(.@map$, .@cx, .@cy, 0);
@Melinda_ols_dir = .dir;
@@ -30,7 +30,7 @@ function face_to_PC {
return;
}
-
+
npc_pausemove;
face_to_PC;
mes "";
@@ -91,37 +91,37 @@ switch (select(l("Sure! [Don't tip]"),
case 4:
goto L_No;
}
-
+
L_NoMoney:
mes "";
mesn;
mesq l("You look broke. Don't think that you can dine and dash here!");
goto L_Close;
-
+
L_No:
mes "";
mesn;
mesq l("Just call me when you changed your mind.");
goto L_Close;
-
+
L_Close:
initnpctimer;
npc_resumemove;
close;
-
+
L_TooMany:
mes "";
mesn;
mesq l("You don't have room for a beer!");
goto L_Close;
-
+
OnTimer1000:
dographmovestep;
-
+
OnTouch:
StartConversation;
end;
-
+
OnInit:
.sex = G_FEMALE;
.distance = 5;
@@ -142,41 +142,41 @@ OnInit:
"basement_cabinet", 30,31,
"cabinet", 42, 28,
"bucket", 46, 30;
-
-
-
+
+
+
setmovegraphcmd "startspot", "firewood", 1, "dir 4; wait 5",
"firewood", "fireplace", 1, "dir 4; wait 3",
"fireplace", "startspot", 1, "dir 0; wait 10",
-
+
"startspot", "l_table_b", 1, "dir 4; wait 3",
- "l_table_b", "l_table_r", 1, "dir 2; wait 3",
+ "l_table_b", "l_table_r", 1, "dir 2; wait 3",
"l_table_r", "m_table_l", 1, "dir 6; wait 3",
"m_table_l", "m_table_b", 1, "dir 4; wait 3",
"m_table_b", "r_table_r", 1, "dir 2; wait 3",
"r_table_r", "bucket", 1, "dir 4; wait 1; emote 1;"
- "wait 15; moveon",
+ "wait 15; moveon",
"bucket", "startspot", 1, "dir 0; wait 5",
-
+
"startspot", "kfahr_r", 2, "dir 4; wait 5",
- "kfahr_r", "barkeeper", 1, "dir 4; wait 1;"
+ "kfahr_r", "barkeeper", 1, "dir 4; wait 1;"
"say Another round for kfahr's table.;"
"wait 1; say They sure are thirsty today;"
"wait 5; moveon",
"barkeeper", "kfahr_l", 1, "dir 6; wait 3;"
"say Cheers!;"
"wait 3; moveon",
- "kfahr_l", "startspot", 1, "dir 0; wait 10",
-
+ "kfahr_l", "startspot", 1, "dir 0; wait 10",
+
"startspot", "to_basement", 1, "dir 4; warp 008-2-5 basement_entrance",
"basement_entrance", "basement_cabinet", 1, "dir 4; wait 5",
"basement_cabinet", "basement_entrance", 1, "dir 4; warp 008-2-2 to_basement",
"to_basement", "cabinet", 1, "dir 4; wait 5",
"cabinet", "startspot", 1, "dir 0; wait 15";
-
-
-
-
- firstmove "wait 8";
+
+
+
+
+ firstmove "wait 8";
initnpctimer;
}
diff --git a/npc/008-2-2/shop.txt b/npc/008-2-2/shop.txt
index 8cd55f83..d0db9b67 100644
--- a/npc/008-2-2/shop.txt
+++ b/npc/008-2-2/shop.txt
@@ -17,7 +17,7 @@ OnInit:
sellitem Cheese, -1, 50;
sellitem CherryCake, -1, 50;
sellitem SmallHealing, -1, 50;
-
+
.sex = G_OTHER;
.distance = 10;
end;
diff --git a/npc/008-2-4/bernard.txt b/npc/008-2-4/bernard.txt
index a528bcc3..9f7af5c7 100644
--- a/npc/008-2-4/bernard.txt
+++ b/npc/008-2-4/bernard.txt
@@ -202,7 +202,7 @@ OnPCBaseLvUpEvent:
OnInit:
.min_level = 10; // min level to do the quest
- .first_item = RoastedMaggot;
+ .first_item = RoastedMaggot;
.first_reward_item = CherryCake;
.first_reward_amount = 5;
.first_reward_exp = 100;
diff --git a/npc/functions/manhole.txt b/npc/functions/manhole.txt
index a56b6542..54449d78 100644
--- a/npc/functions/manhole.txt
+++ b/npc/functions/manhole.txt
@@ -1,7 +1,7 @@
// TMW2 Script
// Authors:
// Jesusalva
-//
+//
// Description:
// Handles Artis manholes
// Relies on getmap, be sure coords are enough compatible
diff --git a/npc/functions/masks.txt b/npc/functions/masks.txt
index 98e8bdf8..9fb54919 100644
--- a/npc/functions/masks.txt
+++ b/npc/functions/masks.txt
@@ -6,7 +6,7 @@
// Variables:
// none
-// Artis Aemil's Legion
+// Artis Aemil's Legion
function script artisALRemTopMask {
if ((getareausers("001-2-33", 23, 27, 45, 31) >= 1) ||
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index ae70b233..0c6080b1 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -27,7 +27,7 @@ function script season_direction {
case DECEMBER: .@season_day = 21; break;
default: break;
}
-
+
.@is_after_season_day = .@current_day >= .@season_day ? 0 : -1;
}
diff --git a/npc/test/test2.txt b/npc/test/test2.txt
index 6870463c..fdc6f847 100644
--- a/npc/test/test2.txt
+++ b/npc/test/test2.txt
@@ -2,7 +2,7 @@
// Author:
// 4144
// Description:
-// script tests
+// script tests
test,12,5,0 script test2 NPC_HAT_BOX,{
close;