summaryrefslogtreecommitdiff
path: root/src/map/skill.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/skill.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/skill.c')
-rw-r--r--src/map/skill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 37ee297ca..064b18bdf 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -512,7 +512,7 @@ int skillnotok (uint16 skill_id, struct map_session_data *sd)
if( npc->isnear(&sd->bl) ) {
// uncomment for more verbose message.
//char output[150];
- //sprintf(output, msg_txt(662), battle_config.min_npc_vendchat_distance);
+ //sprintf(output, msg_txt(862), battle_config.min_npc_vendchat_distance); // "You're too close to a NPC, you must be at least %d cells away from any NPC."
//clif->message(sd->fd, output);
clif->skill_fail(sd,skill_id,USESKILL_FAIL_THERE_ARE_NPC_AROUND,0);
return 1;
@@ -5503,7 +5503,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
if (sd)
clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
if (skill->break_equip(bl, EQP_WEAPON, 10000, BCT_PARTY) && sd && sd != dstsd)
- clif->message(sd->fd, msg_txt(669));
+ clif->message(sd->fd, msg_txt(869)); // "You broke the target's weapon."
}
break;