summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-02-27 00:18:36 +0100
committerHaru <haru@dotalux.com>2014-02-27 00:55:59 +0100
commit87b6c8f196897b72d98de2b1d4716bee1af99c3b (patch)
tree3dbedf03385adcd92673a6932d85150571c1daf0 /src/map/guild.c
parent5cbbcedd588b7eaad2df99f1a2cf9648b8d9ea64 (diff)
downloadhercules-87b6c8f196897b72d98de2b1d4716bee1af99c3b.tar.gz
hercules-87b6c8f196897b72d98de2b1d4716bee1af99c3b.tar.bz2
hercules-87b6c8f196897b72d98de2b1d4716bee1af99c3b.tar.xz
hercules-87b6c8f196897b72d98de2b1d4716bee1af99c3b.zip
Cleaned up messages.conf
- Removed some unused messages. - Re-mapped some duplicate IDs - fixes bugreport:8057, thanks to AnnieRuru http://hercules.ws/board/tracker/issue-8057-jobname-with-invalid-id-return-tomb/ - Fixed some issues with the message range loaded by the char server. - Reworded some messages, fixed typos in others. Note for translation users: some messages have been remapped to new IDs. You'll need to remap them in your custom translations as well. The list of changes is as follows: - Removed messages (you can safely remove them from your translations): 15, 26-27, 35, 48-52, 57-58, 65-69, 82-83, 86-87, 91, 101, 140-142, 164, 189-194, 199-200, 202-203, 209-211, 215-218, 267-268, 275, 289-290, 380-385, 387-388, 401, 497, 499, 535-537, 922, 995, 1063, 1079, 1291-1294 - New messages (you need to add them to your translations): 15 - Moved messages (you need to change their IDs in your translations file): * [Unknown Job] 656 -> 620, * [Job names] 681~693 -> 656~668 * [Tombstone related] 656~661 -> 856~861 * [Etc messages] 662~680 -> 862~880 * [@version] 1436 -> 1294 * [Hercules Chat] 1475 -> 1436 Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/guild.c')
-rw-r--r--src/map/guild.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 27c3b71a9..562878fb8 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1423,7 +1423,7 @@ int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd)
if(map->agit_flag || map->agit2_flag) {
// Disable alliance creation during woe [Valaris]
- clif->message(sd->fd,msg_txt(676)); //"Alliances cannot be made during Guild Wars!"
+ clif->message(sd->fd,msg_txt(876)); //"Alliances cannot be made during Guild Wars!"
return 0;
}
@@ -1540,7 +1540,7 @@ int guild_delalliance(struct map_session_data *sd,int guild_id,int flag) {
if(map->agit_flag || map->agit2_flag) {
// Disable alliance breaking during woe [Valaris]
- clif->message(sd->fd,msg_txt(677)); //"Alliances cannot be broken during Guild Wars!"
+ clif->message(sd->fd,msg_txt(877)); //"Alliances cannot be broken during Guild Wars!"
return 0;
}
@@ -1822,12 +1822,12 @@ int guild_gm_changed(int guild_id, int account_id, int char_id)
strcpy(g->master, g->member[0].name);
if (g->member[pos].sd && g->member[pos].sd->fd) {
- clif->message(g->member[pos].sd->fd, msg_txt(678)); //"You no longer are the Guild Master."
+ clif->message(g->member[pos].sd->fd, msg_txt(878)); //"You no longer are the Guild Master."
g->member[pos].sd->state.gmaster_flag = 0;
}
if (g->member[0].sd && g->member[0].sd->fd) {
- clif->message(g->member[0].sd->fd, msg_txt(679)); //"You have become the Guild Master!"
+ clif->message(g->member[0].sd->fd, msg_txt(879)); //"You have become the Guild Master!"
g->member[0].sd->state.gmaster_flag = 1;
//Block his skills for 5 minutes to prevent abuse.
guild->block_skill(g->member[0].sd, 300000);