summaryrefslogtreecommitdiff
path: root/npc/functions
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions')
-rw-r--r--npc/functions/bank.txt16
-rw-r--r--npc/functions/barber.txt2
-rw-r--r--npc/functions/beds.txt2
-rw-r--r--npc/functions/fishing.txt8
-rw-r--r--npc/functions/game-rules.txt6
-rw-r--r--npc/functions/inventoryplace.txt2
-rw-r--r--npc/functions/legiontalk.txt2
-rw-r--r--npc/functions/sailortalk.txt4
8 files changed, 21 insertions, 21 deletions
diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt
index 95a51842..5b281379 100644
--- a/npc/functions/bank.txt
+++ b/npc/functions/bank.txt
@@ -8,14 +8,14 @@ function script MerchantGuild_Bank {
{
if (BankVault > 0)
{
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You currently have @@ Esperin on your bank account.",
format_number(BankVault)),
l("What do you want to do with your money?");
}
else
{
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("What do you want to do with your money?");
}
@@ -27,7 +27,7 @@ function script MerchantGuild_Bank {
switch (@menu)
{
case 1:
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("How much do you want to deposit?");
menuint
@@ -56,7 +56,7 @@ function script MerchantGuild_Bank {
{
if (@menuret > Zeny)
{
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You do not have enough Esperin on yourself.");
break;
}
@@ -71,14 +71,14 @@ function script MerchantGuild_Bank {
BankVault += .@deposit; // add to bank
Zeny -= .@deposit; // remove from inventory
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You made a cash deposit of @@ E.", format_number(.@deposit));
}
}
break;
case 2:
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("How much do you want to withdraw?");
menuint
@@ -107,7 +107,7 @@ function script MerchantGuild_Bank {
{
if (@menuret > BankVault)
{
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You do not have enough Esperin on your bank account.");
break;
}
@@ -122,7 +122,7 @@ function script MerchantGuild_Bank {
Zeny += .@withdrawal; // add to inventory
BankVault -= .@withdrawal; // remove from bank
- speech 1 | 4,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("You withdrew a total of @@ E.", format_number(.@withdrawal));
}
}
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 1023430c..b1e3dc38 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -22,7 +22,7 @@ function script BarberSayStyle {
message strcharinfo(0), l("@@", .@color_name$);
break;
case 3:
- speech 5,
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Your hairstyle is @@ and its color is @@.", .@style_name$, .@color_name$);
break;
}
diff --git a/npc/functions/beds.txt b/npc/functions/beds.txt
index 6d59a075..4ab8b6a7 100644
--- a/npc/functions/beds.txt
+++ b/npc/functions/beds.txt
@@ -19,7 +19,7 @@ function script bedTouch {
}
function script bedClic {
- narrator 4, l("Do you want to use this place as save point?");
+ narrator S_LAST_NEXT, l("Do you want to use this place as save point?");
if (askyesno() == ASK_YES)
{
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 88fef427..8eadab89 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -222,7 +222,7 @@ function script fishing {
// begin fishing
- narrator 4,
+ narrator S_LAST_NEXT,
l("You see some fish reflecting the sun on the surface of the water."),
l("What will be the bait for the fish?");
@@ -233,7 +233,7 @@ function script fishing {
if (.@bait < 1)
{
- narrator 1,
+ narrator S_FIRST_BLANK_LINE,
l("You take your fishing rod and leave.");
return -6;
@@ -255,7 +255,7 @@ function script fishing {
if (.@bait_c != true)
{
- narrator 1,
+ narrator S_FIRST_BLANK_LINE,
l("This item cannot be used as bait here.");
return -6;
@@ -263,7 +263,7 @@ function script fishing {
if (getvariableofnpc(.char_id, .@npc$) > 0)
{
- narrator 1,
+ narrator S_FIRST_BLANK_LINE,
l("Somebody took your place on this spot!"),
l("You take your fishing rod and leave.");
return -8;
diff --git a/npc/functions/game-rules.txt b/npc/functions/game-rules.txt
index 5a420e76..f633ee5f 100644
--- a/npc/functions/game-rules.txt
+++ b/npc/functions/game-rules.txt
@@ -27,13 +27,13 @@ function script GameRules {
end;
function read_book {
- narrator 5 | 1,
+ narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("This book outlines the laws of every city and holding in Gasaron."),
l("The first page contains the universal rules that have been agreed upon throughout the land.");
- GameRules 8 | 4;
+ GameRules S_NO_NPC_NAME | S_LAST_NEXT;
- narrator 8,
+ narrator S_NO_NPC_NAME,
l("The next page begins to list the complex trading laws of the City of Esperia"),
l("All this seems unimportant to you right now.");
close;
diff --git a/npc/functions/inventoryplace.txt b/npc/functions/inventoryplace.txt
index e92ec579..4a5e08ca 100644
--- a/npc/functions/inventoryplace.txt
+++ b/npc/functions/inventoryplace.txt
@@ -26,7 +26,7 @@ function script inventoryplace {
if (!checkweight2(.@item, .@amount))
{
- narrator 1,
+ narrator S_FIRST_BLANK_LINE,
l("It looks like you can't carry anything else for now."),
l("You should come back when you have some free space.");
diff --git a/npc/functions/legiontalk.txt b/npc/functions/legiontalk.txt
index b804d2a1..14743783 100644
--- a/npc/functions/legiontalk.txt
+++ b/npc/functions/legiontalk.txt
@@ -12,7 +12,7 @@ function script legiontalk {
{
case 0:
npctalk3 l("Do I look like a tree? I feel like one.");
- //speech 4,
+ //speech S_LAST_NEXT,
// l("Do you feel too weak even to do damage to this areas wishy-washy wildlife?"),
// l("Then concentrate your anger upon the trees hereabouts, you will gain experience whilst leveling your sword skill on them."),
// l("Oh, and a fruit may even fall for you if you are lucky! But stay alert to pick up your drops.");
diff --git a/npc/functions/sailortalk.txt b/npc/functions/sailortalk.txt
index 38225d4e..49bc62f8 100644
--- a/npc/functions/sailortalk.txt
+++ b/npc/functions/sailortalk.txt
@@ -12,7 +12,7 @@ function script sailortalk {
if (.@rand == 0) goodbye;
if (.@rand == 1)
{
- speech 4,
+ speech S_LAST_NEXT,
l("These purple mushrooms are called @@s. There are plenty of 'em on this island!", getitemlink(Plushroom)),
l("It's a kind of mushroom that tastes like a marshmallow and looks like a plush! @@, get it?", getitemlink(Plushroom)),
l("These funny fungi are mushrooming all around this island. Just pick some @@s and have a try.", getitemlink(Plushroom));
@@ -21,7 +21,7 @@ function script sailortalk {
if (.@rand == 3) npctalk3 l("So finally someone has came to visit me?");
if (.@rand == 4)
{
- speech 4,
+ speech S_LAST_NEXT,
l("A sunny and hot day,"),
l("a quiet place,"),
l("a ground!"),
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-05 19:31:26 +0000