浏览代码

moved supernovice guardian angel messages

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@877 54d463be-8e91-2dee-dedb-b68131a5f0ec
celest 20 年之前
父节点
当前提交
aba33b2fc9
共有 3 个文件被更改,包括 12 次插入3 次删除
  1. 3 0
      Changelog.txt
  2. 6 0
      conf-tmpl/msg_athena.conf
  3. 3 3
      src/map/clif.c

+ 3 - 0
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]

+ 6 - 0
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

+ 3 - 3
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;