summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt3
-rw-r--r--conf-tmpl/msg_athena.conf6
-rw-r--r--src/map/clif.c6
3 files changed, 12 insertions, 3 deletions
diff --git a/Changelog.txt b/Changelog.txt
index fe9f243f2..bcc991754 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -3,6 +3,9 @@ $LastChangedDate: 2004-12-30 00:22:54 -0500 (Thu, 30 Dec 2004)$
SVN: $Rev$
Date Added
+12/30
+ * Moved supernovice guardian angel messages to msg_athena.conf [celest]
+
12/29
* Fix account register wipe issue (SVN 868) [MouseJstr]
* Double storage/lag exploit fixed (SVN 867) [MouseJstr]
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index effd535e0..e693c2694 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -285,3 +285,9 @@
524: Character does not exist.
525: Mail has been sent.
526: You have new mail.
+
+//Supernovice's Guardian Angel
+//----------------------------
+540: guardian angel, can you hear my voice? ^^;
+541: my name is %s, and i'm a super novice~
+542: please help me~ t.t
diff --git a/src/map/clif.c b/src/map/clif.c
index 0f4746251..e0d76a756 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7853,15 +7853,15 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c <
int next = pc_nextbaseexp(sd)>0 ? pc_nextbaseexp(sd) : sd->status.base_exp;
if ((sd->status.base_exp*100/next)%10 == 0) {
estr_lower(RFIFOP(fd,4));
- if (sd->state.snovice_flag == 0 && strstr(RFIFOP(fd,4), "guardian angel, can you hear my voice? ^^;"))
+ if (sd->state.snovice_flag == 0 && strstr(RFIFOP(fd,4), msg_txt(540)))
sd->state.snovice_flag = 1;
else if (sd->state.snovice_flag == 1) {
- sprintf(message, "my name is %s, and i'm a super novice~", sd->status.name);
+ sprintf(message, msg_txt(541), sd->status.name);
estr_lower(message);
if (strstr(RFIFOP(fd,4), message))
sd->state.snovice_flag = 2;
}
- else if (sd->state.snovice_flag == 2 && strstr(RFIFOP(fd,4), "please help me~ t.t"))
+ else if (sd->state.snovice_flag == 2 && strstr(RFIFOP(fd,4), msg_txt(542)))
sd->state.snovice_flag = 3;
else if (sd->state.snovice_flag == 3) {
int i;