diff options
| -rw-r--r-- | conf/msg_athena.conf | 10 | ||||
| -rw-r--r-- | src/map/atcommand.c | 8 | ||||
| -rw-r--r-- | src/map/chat.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 8 | ||||
| -rw-r--r-- | src/map/pc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
6 files changed, 20 insertions, 12 deletions
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf index 645416702..e38308ac6 100644 --- a/conf/msg_athena.conf +++ b/conf/msg_athena.conf @@ -580,5 +580,15 @@ 660: Defeated by 661: [^EE0000%s^000000] +// Etc messages from source +662: You're too close to a NPC, you must be at least %d cells away from any NPC. +663: Duel: Can't use this item in duel. +664: You cannot use this command when dead. +665: Can't create chat rooms in this Area. +666: Pets are not allowed in Guild Wars. +667: You're not dead. +668: Your actual memo positions are: +669: You broke target's weapon + //Custom translations import: conf/import/msg_conf.txt diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 9fe68da08..f3e75658e 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -552,7 +552,7 @@ ACMD_FUNC(jumpto) if( pc_isdead(sd) ) { - clif_displaymessage(fd, "You cannot use this command when dead."); + clif_displaymessage(fd, msg_txt(664)); return -1; } @@ -583,7 +583,7 @@ ACMD_FUNC(jump) if( pc_isdead(sd) ) { - clif_displaymessage(fd, "You cannot use this command when dead."); + clif_displaymessage(fd, msg_txt(664)); return -1; } @@ -1280,7 +1280,7 @@ ACMD_FUNC(alive) nullpo_retr(-1, sd); if (!status_revive(&sd->bl, 100, 100)) { - clif_displaymessage(fd, "You're not dead."); + clif_displaymessage(fd, msg_txt(667)); return -1; } clif_skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION,4,1); @@ -2451,7 +2451,7 @@ ACMD_FUNC(memo) if( !message || !*message || sscanf(message, "%d", &position) < 1 ) { int i; - clif_displaymessage(sd->fd, "Your actual memo positions are:"); + clif_displaymessage(sd->fd, msg_txt(668)); for( i = 0; i < MAX_MEMOPOINTS; i++ ) { if( sd->status.memo_point[i].map ) diff --git a/src/map/chat.c b/src/map/chat.c index 5a0f1123e..702ee55d9 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -88,7 +88,7 @@ int chat_createpcchat(struct map_session_data* sd, const char* title, const char if( map_getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKNOCHAT) ) { - clif_displaymessage (sd->fd, "Can't create chat rooms in this Area."); + clif_displaymessage (sd->fd, msg_txt(665)); return 0; } diff --git a/src/map/clif.c b/src/map/clif.c index d9b95264d..b3bbb5a69 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6649,7 +6649,7 @@ void clif_sendegg(struct map_session_data *sd) fd=sd->fd; if (battle_config.pet_no_gvg && map_flag_gvg(sd->bl.m)) { //Disable pet hatching in GvG grounds during Guild Wars [Skotlex] - clif_displaymessage(fd, "Pets are not allowed in Guild Wars."); + clif_displaymessage(fd, msg_txt(666)); return; } WFIFOHEAD(fd, MAX_INVENTORY * 2 + 4); @@ -9161,7 +9161,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) { if( battle_config.pet_no_gvg && map_flag_gvg(sd->bl.m) ) { //Return the pet to egg. [Skotlex] - clif_displaymessage(sd->fd, "Pets are not allowed in Guild Wars."); + clif_displaymessage(sd->fd, msg_txt(666)); pet_menu(sd, 3); //Option 3 is return to egg. } else @@ -11818,9 +11818,7 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd) } if( vending_checknearnpc(&sd->bl) ) { - char output[150]; - sprintf(output,"You're too close to a NPC, you must be at least %d cells away from any NPC.",battle_config.min_npc_vending_distance); - clif_displaymessage(sd->fd, output); + clif_displaymessage(sd->fd, msg_txt(662)); clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0); return; } diff --git a/src/map/pc.c b/src/map/pc.c index c51aaec68..1a7efc260 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3977,7 +3977,7 @@ int pc_isUseitem(struct map_session_data *sd,int n) case 14591: // Siege Teleport Scroll if( sd->duel_group && !battle_config.duel_allow_teleport ) { - clif_displaymessage(sd->fd, "Duel: Can't use this item in duel."); + clif_displaymessage(sd->fd, msg_txt(663)); return 0; } if( nameid != 601 && nameid != 12212 && map[sd->bl.m].flag.noreturn ) diff --git a/src/map/skill.c b/src/map/skill.c index 5891aa7a3..842546a32 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5011,7 +5011,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if (sd) clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0); if (skill_break_equip(bl, EQP_WEAPON, 10000, BCT_PARTY) && sd && sd != dstsd) - clif_displaymessage(sd->fd,"You broke target's weapon"); + clif_displaymessage(sd->fd, msg_txt(669)); } break; |