summaryrefslogtreecommitdiff
path: root/npc/functions/marriage.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions/marriage.txt')
-rw-r--r--npc/functions/marriage.txt17
1 files changed, 10 insertions, 7 deletions
diff --git a/npc/functions/marriage.txt b/npc/functions/marriage.txt
index 4d4ae2737..0bd9e9c59 100644
--- a/npc/functions/marriage.txt
+++ b/npc/functions/marriage.txt
@@ -1,6 +1,8 @@
+// TMW-2 Script
// Evol functions.
// Author:
// 4144
+// Jesusalva
// Description:
// Functions for marriage
@@ -99,7 +101,7 @@ function script ismarriagepartneraccepted {
if (.@partner$ == "")
return false;
if (readparam(Sex, strcharinfo(0)) == readparam(Sex, .@partner$)) {
- // Blame Jesusalva
+ // Blame Jesusalva. I am sensing various other possible bugs. Let's play safe.
return false;
}
.@name$ = getmarriagepartneraccepted();
@@ -140,7 +142,7 @@ function script marriageregister {
marriageregisterself();
next;
speech lg("Now wait for your partner, then talk to me again.");
- npctalk l("@@ registered for marriage. Waiting for partner...", strcharinfo(0));
+ npctalk l("@@ waits for their loved one.", strcharinfo(0));
close;
}
else
@@ -149,8 +151,8 @@ function script marriageregister {
{
marriageregisterself();
marriageacceptpartner(.@partner$);
- npctalk l("@@ registered for marriage and accepted partner @@!", strcharinfo(0), .@partner$);
- npctalk l("Waiting for @@...", .@partner$);
+ npctalk3 l("@@ registered for marriage and accepted partner @@!", strcharinfo(0), .@partner$);
+ npctalk3 l("Waiting for @@...", .@partner$);
close;
}
else
@@ -177,11 +179,12 @@ function script domarriage {
if (marriage(.@partner$))
{
speech l("You got married to @@!", .@partner$);
- npctalk l("@@ and @@ just got married!", .@name$, .@partner$);
+ mapannounce "009-1", l("@@ and @@ just got married!", .@name$, .@partner$), bc_map;
+ specialeffect 6;
}
else
{
- npctalk l("Marriage failed.");
+ speech l("Marriage failed.");
}
marriageclear();
return;
@@ -264,7 +267,7 @@ function script marriagedivorce {
function script marriagemain {
if (Sex > 1)
{
- speech l("Sorry i can't help you. Go away!");
+ speech l("Sorry, I can't help you. Go away!");
close;
}