Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaces more constant names with the official ones (#8374)

Browse Source 
Co-authored-by: Aleos <aleos89@users.noreply.github.com>
This commit is contained in:
Daegaladh 2024-05-31 14:51:59 +02:00 committed by GitHub
parent 1b9e46b247
commit 1f9a43c9d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 216 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/atcommand.cpp
View File

@ -6564,7 +6564,7 @@ ACMD_FUNC(changegm)
if( !battle_config.guild_leaderchange_woe && is_agit_start() ){ if( !battle_config.guild_leaderchange_woe && is_agit_start() ){
#if PACKETVER >= 20151001 #if PACKETVER >= 20151001
clif_msg(sd, GUILD_MASTER_WOE); clif_msg(sd, MSI_IMPOSSIBLE_CHANGE_GUILD_MASTER_IN_SIEGE_TIME);
#else #else
clif_displaymessage(fd, msg_txt(sd,1513)); // Currently in WoE hours, unable to delegate Guild leader clif_displaymessage(fd, msg_txt(sd,1513)); // Currently in WoE hours, unable to delegate Guild leader
#endif #endif
@ -6573,7 +6573,7 @@ ACMD_FUNC(changegm)
if( battle_config.guild_leaderchange_delay && DIFF_TICK(time(nullptr),sd->guild->guild.last_leader_change) < battle_config.guild_leaderchange_delay ){ if( battle_config.guild_leaderchange_delay && DIFF_TICK(time(nullptr),sd->guild->guild.last_leader_change) < battle_config.guild_leaderchange_delay ){
#if PACKETVER >= 20151001 #if PACKETVER >= 20151001
clif_msg(sd, GUILD_MASTER_DELAY); clif_msg(sd, MSI_IMPOSSIBLE_CHANGE_GUILD_MASTER_NOT_TIME);
#else #else
clif_displaymessage(fd, msg_txt(sd,1514)); // You have to wait for a while before delegating a new Guild leader clif_displaymessage(fd, msg_txt(sd,1514)); // You have to wait for a while before delegating a new Guild leader
#endif #endif

65
src/map/clif.cpp
View File

@ -6434,7 +6434,7 @@ void clif_cooking_list( map_session_data *sd, int trigger, uint16 skill_id, int
}else{ }else{
clif_menuskill_clear(sd); clif_menuskill_clear(sd);
#if PACKETVER >= 20090922 #if PACKETVER >= 20090922
clif_msg_skill( sd, skill_id, INVENTORY_SPACE_FULL ); clif_msg_skill( sd, skill_id, MSI_SKILL_INVENTORY_KINDCNT_OVER);
#else #else
p->packetLength = static_cast<decltype(p->packetLength)>( sizeof( struct PACKET_ZC_MAKINGITEM_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGITEM_LIST_sub ) ); p->packetLength = static_cast<decltype(p->packetLength)>( sizeof( struct PACKET_ZC_MAKINGITEM_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGITEM_LIST_sub ) );
WFIFOSET( fd, p->packetLength ); WFIFOSET( fd, p->packetLength );
@ -12019,7 +12019,7 @@ void clif_parse_UseItem(int fd, map_session_data *sd)
} }
if ( (!sd->npc_id && pc_istrading(sd)) || sd->chatID || (sd->state.block_action & PCBLOCK_USEITEM) ) { if ( (!sd->npc_id && pc_istrading(sd)) || sd->chatID || (sd->state.block_action & PCBLOCK_USEITEM) ) {
clif_msg(sd, WORK_IN_PROGRESS); clif_msg(sd, MSI_BUSY);
return; return;
} }
@ -12056,7 +12056,7 @@ void clif_parse_EquipItem(int fd,map_session_data *sd)
return; //Out of bounds check. return; //Out of bounds check.
if((sd->npc_id && !sd->npc_item_flag) || (sd->state.block_action & PCBLOCK_EQUIP)) { if((sd->npc_id && !sd->npc_item_flag) || (sd->state.block_action & PCBLOCK_EQUIP)) {
clif_msg_color( sd, CAN_NOT_EQUIP_ITEM, color_table[COLOR_RED] ); clif_msg_color( sd, MSI_CAN_NOT_EQUIP_ITEM, color_table[COLOR_RED] );
return; return;
} else if (sd->state.storage_flag || sd->sc.opt1) } else if (sd->state.storage_flag || sd->sc.opt1)
; //You can equip/unequip stuff while storage is open/under status changes ; //You can equip/unequip stuff while storage is open/under status changes
@ -12111,7 +12111,7 @@ void clif_parse_UnequipItem(int fd,map_session_data *sd)
} }
if((sd->npc_id && !sd->npc_item_flag) || (sd->state.block_action & PCBLOCK_EQUIP)) { if((sd->npc_id && !sd->npc_item_flag) || (sd->state.block_action & PCBLOCK_EQUIP)) {
clif_msg_color( sd, CAN_NOT_EQUIP_ITEM, color_table[COLOR_RED] ); clif_msg_color( sd, MSI_CAN_NOT_EQUIP_ITEM, color_table[COLOR_RED] );
return; return;
} else if (sd->state.storage_flag || sd->sc.opt1) } else if (sd->state.storage_flag || sd->sc.opt1)
; //You can equip/unequip stuff while storage is open/under status changes ; //You can equip/unequip stuff while storage is open/under status changes
@ -12151,7 +12151,7 @@ void clif_parse_NpcClicked(int fd,map_session_data *sd)
if( pc_cant_act2(sd) || sd->npc_id || pc_hasprogress( sd, WIP_DISABLE_NPC ) ){ if( pc_cant_act2(sd) || sd->npc_id || pc_hasprogress( sd, WIP_DISABLE_NPC ) ){
#ifdef RENEWAL #ifdef RENEWAL
clif_msg( sd, WORK_IN_PROGRESS ); clif_msg( sd, MSI_BUSY);
#endif #endif
return; return;
} }
@ -12170,7 +12170,7 @@ void clif_parse_NpcClicked(int fd,map_session_data *sd)
case BL_NPC: case BL_NPC:
#ifdef RENEWAL #ifdef RENEWAL
if (sd->ud.skill_id < RK_ENCHANTBLADE && sd->ud.skilltimer != INVALID_TIMER) { // Should only show an error message for non-3rd job skills with a running timer if (sd->ud.skill_id < RK_ENCHANTBLADE && sd->ud.skilltimer != INVALID_TIMER) { // Should only show an error message for non-3rd job skills with a running timer
clif_msg(sd, WORK_IN_PROGRESS); clif_msg(sd, MSI_BUSY);
break; break;
} }
#endif #endif
@ -12615,7 +12615,7 @@ void clif_parse_ChangeCart(int fd,map_session_data *sd)
#ifdef RENEWAL #ifdef RENEWAL
if (sd->npc_id || pc_hasprogress(sd, WIP_DISABLE_SKILLITEM)) { if (sd->npc_id || pc_hasprogress(sd, WIP_DISABLE_SKILLITEM)) {
clif_msg(sd, WORK_IN_PROGRESS); clif_msg(sd, MSI_BUSY);
return; return;
} }
#endif #endif
@ -12813,7 +12813,7 @@ void clif_parse_skill_toid( map_session_data* sd, uint16 skill_id, uint16 skill_
return; //Using a ground/passive skill on a target? WRONG. return; //Using a ground/passive skill on a target? WRONG.
if (sd->state.block_action & PCBLOCK_SKILL) { if (sd->state.block_action & PCBLOCK_SKILL) {
clif_msg(sd, WORK_IN_PROGRESS); clif_msg(sd, MSI_BUSY);
return; return;
} }
@ -12839,7 +12839,7 @@ void clif_parse_skill_toid( map_session_data* sd, uint16 skill_id, uint16 skill_
if( sd->npc_id ){ if( sd->npc_id ){
if( pc_hasprogress( sd, WIP_DISABLE_SKILLITEM ) || !sd->npc_item_flag || !( inf & INF_SELF_SKILL ) ){ if( pc_hasprogress( sd, WIP_DISABLE_SKILLITEM ) || !sd->npc_item_flag || !( inf & INF_SELF_SKILL ) ){
#ifdef RENEWAL #ifdef RENEWAL
clif_msg( sd, WORK_IN_PROGRESS ); clif_msg( sd, MSI_BUSY);
#endif #endif
return; return;
} }
@ -12938,7 +12938,7 @@ static void clif_parse_UseSkillToPosSub( int fd, map_session_data& sd, uint16 sk
return; //Using a target skill on the ground? WRONG. return; //Using a target skill on the ground? WRONG.
if (sd.state.block_action & PCBLOCK_SKILL) { if (sd.state.block_action & PCBLOCK_SKILL) {
clif_msg(&sd, WORK_IN_PROGRESS); clif_msg(&sd, MSI_BUSY);
return; return;
} }
@ -12954,7 +12954,7 @@ static void clif_parse_UseSkillToPosSub( int fd, map_session_data& sd, uint16 sk
if( pc_hasprogress( &sd, WIP_DISABLE_SKILLITEM ) ){ if( pc_hasprogress( &sd, WIP_DISABLE_SKILLITEM ) ){
#ifdef RENEWAL #ifdef RENEWAL
clif_msg( &sd, WORK_IN_PROGRESS ); clif_msg( &sd, MSI_BUSY);
#endif #endif
return; return;
} }
@ -13493,7 +13493,7 @@ void clif_parse_MoveToKafra(int fd, map_session_data *sd)
if (item_index < 0 || item_index >= MAX_INVENTORY || item_amount < 1) if (item_index < 0 || item_index >= MAX_INVENTORY || item_amount < 1)
return; return;
if( sd->inventory.u.items_inventory[item_index].equipSwitch ){ if( sd->inventory.u.items_inventory[item_index].equipSwitch ){
clif_msg( sd, SWAP_EQUIPITEM_UNREGISTER_FIRST ); clif_msg( sd, MSI_SWAP_EQUIPITEM_UNREGISTER_FIRST );
return; return;
} }
@ -13546,7 +13546,7 @@ void clif_parse_MoveToKafraFromCart(int fd, map_session_data *sd){
if (idx < 0 || idx >= MAX_INVENTORY || amount < 1) if (idx < 0 || idx >= MAX_INVENTORY || amount < 1)
return; return;
if( sd->inventory.u.items_inventory[idx].equipSwitch ){ if( sd->inventory.u.items_inventory[idx].equipSwitch ){
clif_msg( sd, SWAP_EQUIPITEM_UNREGISTER_FIRST ); clif_msg( sd, MSI_SWAP_EQUIPITEM_UNREGISTER_FIRST );
return; return;
} }
@ -14219,12 +14219,12 @@ void clif_parse_GuildChangeMemberPosition( int fd, map_session_data *sd ){
// Guild leadership change // Guild leadership change
if( entry.position == 0 ){ if( entry.position == 0 ){
if( !battle_config.guild_leaderchange_woe && is_agit_start() ){ if( !battle_config.guild_leaderchange_woe && is_agit_start() ){
clif_msg( sd, GUILD_MASTER_WOE ); clif_msg( sd, MSI_IMPOSSIBLE_CHANGE_GUILD_MASTER_IN_SIEGE_TIME );
return; return;
} }
if( battle_config.guild_leaderchange_delay && DIFF_TICK( time( nullptr ),sd->guild->guild.last_leader_change ) < battle_config.guild_leaderchange_delay ){ if( battle_config.guild_leaderchange_delay && DIFF_TICK( time( nullptr ),sd->guild->guild.last_leader_change ) < battle_config.guild_leaderchange_delay ){
clif_msg( sd, GUILD_MASTER_DELAY ); clif_msg( sd, MSI_IMPOSSIBLE_CHANGE_GUILD_MASTER_NOT_TIME );
return; return;
} }
@ -16581,7 +16581,7 @@ void clif_parse_Mail_setattach(int fd, map_session_data *sd){
flag = mail_setitem(sd, idx, amount); flag = mail_setitem(sd, idx, amount);
if( flag == MAIL_ATTACH_EQUIPSWITCH ){ if( flag == MAIL_ATTACH_EQUIPSWITCH ){
clif_msg( sd, SWAP_EQUIPITEM_UNREGISTER_FIRST ); clif_msg( sd, MSI_SWAP_EQUIPITEM_UNREGISTER_FIRST );
}else{ }else{
clif_Mail_setattachment(sd,idx,amount,flag); clif_Mail_setattachment(sd,idx,amount,flag);
} }
@ -17513,7 +17513,7 @@ void clif_parse_ViewPlayerEquip(int fd, map_session_data* sd)
else if( tsd->status.show_equip || pc_has_permission(sd, PC_PERM_VIEW_EQUIPMENT) ) else if( tsd->status.show_equip || pc_has_permission(sd, PC_PERM_VIEW_EQUIPMENT) )
clif_viewequip_ack( *sd, *tsd ); clif_viewequip_ack( *sd, *tsd );
else else
clif_msg(sd, VIEW_EQUIP_FAIL); clif_msg(sd, MSI_OPEN_EQUIPEDITEM_REFUSED);
} }
@ -18166,17 +18166,6 @@ void clif_parse_mercenary_action(int fd, map_session_data* sd)
} }
/// Mercenary Message
/// message:
/// 0 = Mercenary soldier's duty hour is over.
/// 1 = Your mercenary soldier has been killed.
/// 2 = Your mercenary soldier has been fired.
/// 3 = Your mercenary soldier has ran away.
void clif_mercenary_message(map_session_data* sd, int message){
clif_msg(sd, MERC_MSG_BASE + message);
}
/// Notification about the remaining time of a rental item. /// Notification about the remaining time of a rental item.
/// 0298 <name id>.W <seconds>.L (ZC_CASH_TIME_COUNTER) /// 0298 <name id>.W <seconds>.L (ZC_CASH_TIME_COUNTER)
void clif_rental_time( map_session_data* sd, t_itemid nameid, int seconds ){ void clif_rental_time( map_session_data* sd, t_itemid nameid, int seconds ){
@ -20856,7 +20845,7 @@ void clif_merge_item_open( map_session_data& sd ){
// No item need to be merged // No item need to be merged
if( n < 2 ){ if( n < 2 ){
clif_msg( &sd, MERGE_ITEM_NOT_AVAILABLE ); clif_msg( &sd, MSI_NOT_EXIST_MERGE_ITEM );
return; return;
} }
@ -20877,7 +20866,7 @@ void clif_parse_merge_item_req( int fd, map_session_data* sd ){
// No item need to be merged // No item need to be merged
if( count < 2 ){ if( count < 2 ){
clif_msg( sd, MERGE_ITEM_NOT_AVAILABLE ); clif_msg( sd, MSI_NOT_EXIST_MERGE_ITEM );
return; return;
} }
@ -20888,7 +20877,7 @@ void clif_parse_merge_item_req( int fd, map_session_data* sd ){
} }
if( !clif_merge_item_check( sd->inventory_data[idx_main], &sd->inventory.u.items_inventory[idx_main] ) ){ if( !clif_merge_item_check( sd->inventory_data[idx_main], &sd->inventory.u.items_inventory[idx_main] ) ){
clif_msg( sd, MERGE_ITEM_NOT_AVAILABLE ); clif_msg( sd, MSI_NOT_EXIST_MERGE_ITEM );
return; return;
} }
@ -20912,7 +20901,7 @@ void clif_parse_merge_item_req( int fd, map_session_data* sd ){
} }
if( !clif_merge_item_check( sd->inventory_data[idx], &sd->inventory.u.items_inventory[idx] ) ){ if( !clif_merge_item_check( sd->inventory_data[idx], &sd->inventory.u.items_inventory[idx] ) ){
clif_msg( sd, MERGE_ITEM_NOT_AVAILABLE ); clif_msg( sd, MSI_NOT_EXIST_MERGE_ITEM );
return; return;
} }
@ -20920,7 +20909,7 @@ void clif_parse_merge_item_req( int fd, map_session_data* sd ){
} }
if( indices.empty() ){ if( indices.empty() ){
clif_msg( sd, MERGE_ITEM_NOT_AVAILABLE ); clif_msg( sd, MSI_NOT_EXIST_MERGE_ITEM );
return; return;
} }
@ -21634,7 +21623,7 @@ void clif_parse_open_ui( int fd, map_session_data* sd ){
}else if( pc_attendance_enabled() ){ }else if( pc_attendance_enabled() ){
clif_ui_open( *sd, OUT_UI_ATTENDANCE, pc_attendance_counter( sd ) ); clif_ui_open( *sd, OUT_UI_ATTENDANCE, pc_attendance_counter( sd ) );
}else{ }else{
clif_msg_color( sd, MSG_ATTENDANCE_DISABLED, color_table[COLOR_RED] ); clif_msg_color( sd, MSI_CHECK_ATTENDANCE_NOT_EVENT, color_table[COLOR_RED] );
} }
break; break;
#if PACKETVER >= 20160316 #if PACKETVER >= 20160316
@ -22054,7 +22043,7 @@ void clif_parse_equipswitch_request_single( int fd, map_session_data* sd ){
if( sd->npc_id ){ if( sd->npc_id ){
#ifdef RENEWAL #ifdef RENEWAL
if( pc_hasprogress( sd, WIP_DISABLE_SKILLITEM ) ){ if( pc_hasprogress( sd, WIP_DISABLE_SKILLITEM ) ){
clif_msg( sd, WORK_IN_PROGRESS ); clif_msg( sd, MSI_BUSY);
return; return;
} }
#endif #endif
@ -24122,7 +24111,7 @@ void clif_enchantwindow_open( map_session_data& sd, uint64 clientLuaIndex ){
#if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330 #if PACKETVER_RE_NUM >= 20211103 || PACKETVER_MAIN_NUM >= 20220330
// Hardcoded clientside check // Hardcoded clientside check
if( sd.weight > ( ( sd.max_weight * 70 ) / 100 ) ){ if( sd.weight > ( ( sd.max_weight * 70 ) / 100 ) ){
clif_msg_color( &sd, ENCHANT_FAILED_OVER_WEIGHT, color_table[COLOR_RED] ); clif_msg_color( &sd, MSI_ENCHANT_FAILED_OVER_WEIGHT, color_table[COLOR_RED] );
sd.state.item_enchant_index = 0; sd.state.item_enchant_index = 0;
return; return;
@ -24146,9 +24135,9 @@ void clif_enchantwindow_result( map_session_data& sd, bool success, t_itemid enc
p.PacketType = HEADER_ZC_RESPONSE_ENCHANT; p.PacketType = HEADER_ZC_RESPONSE_ENCHANT;
if( success ){ if( success ){
p.msgId = ENCHANT_SUCCESS; p.msgId = MSI_ENCHANT_SUCCESS;
}else{ }else{
p.msgId = ENCHANT_FAILED; p.msgId = MSI_ENCHANT_FAILED;
} }
p.ITID = enchant; p.ITID = enchant;

185
src/map/clif.hpp
View File

@ -490,9 +490,7 @@ enum useskill_fail_cause : uint8_t
USESKILL_FAIL_MAX USESKILL_FAIL_MAX
}; };
enum clif_messages : uint16_t { enum clif_equipitemack_flag : uint8_t {
/* Constant values */
// clif_equipitemack flags
#if PACKETVER_MAIN_NUM >= 20121205 || PACKETVER_RE_NUM >= 20121107 || defined(PACKETVER_ZERO) #if PACKETVER_MAIN_NUM >= 20121205 || PACKETVER_RE_NUM >= 20121107 || defined(PACKETVER_ZERO)
ITEM_EQUIP_ACK_OK = 0, ITEM_EQUIP_ACK_OK = 0,
ITEM_EQUIP_ACK_FAIL = 2, ITEM_EQUIP_ACK_FAIL = 2,
@ -502,46 +500,148 @@ enum clif_messages : uint16_t {
ITEM_EQUIP_ACK_FAIL = 0, ITEM_EQUIP_ACK_FAIL = 0,
ITEM_EQUIP_ACK_FAILLEVEL = 0, ITEM_EQUIP_ACK_FAILLEVEL = 0,
#endif #endif
/* -end- */ };
//! NOTE: These values below need client version validation //! NOTE: These values below need client version validation
ITEM_CANT_OBTAIN_WEIGHT = 0x34, /* You cannot carry more items because you are overweight. */ // These values correspond to the msgstringtable line number minus 1
CAN_NOT_EQUIP_ITEM = 0x174, enum clif_messages : uint16_t {
ITEM_NOUSE_SITTING = 0x297,
ITEM_PARTY_MEMBER_NOT_SUMMONED = 0x4c5, ///< "The party member was not summoned because you are not the party leader." // You cannot carry more items because you are overweight.
ITEM_PARTY_NO_MEMBER_IN_MAP = 0x4c6, ///< "There is no party member to summon in the current map." MSI_CANT_GET_ITEM_BECAUSE_WEIGHT = 52,
MERC_MSG_BASE = 0x4f2,
SKILL_CANT_USE_AREA = 0x536, // You can't put this item on.
ITEM_CANT_USE_AREA = 0x537, MSI_CAN_NOT_EQUIP_ITEM = 372,
VIEW_EQUIP_FAIL = 0x54d,
ITEM_NEED_MADOGEAR = 0x59b, // You cannot use this item while sitting.
ITEM_NEED_CART = 0x5ef, MSI_CANT_USE_WHEN_SITDOWN = 663,
RUNE_CANT_CREATE = 0x61b,
ITEM_CANT_COMBINE = 0x623, // The party member was not summoned because you are not the party leader.
INVENTORY_SPACE_FULL = 0x625, MSI_CANNOT_PARTYCALL = 1221,
ITEM_PRODUCE_SUCCESS = 0x627,
ITEM_PRODUCE_FAIL = 0x628, // There is no party member to summon in the current map.
ITEM_UNIDENTIFIED = 0x62d, MSI_NO_PARTYMEM_ON_THISMAP = 1222,
ITEM_NEED_BOW = 0x69b,
ITEM_REUSE_LIMIT = 0x746, // The mercenary contract has expired.
WORK_IN_PROGRESS = 0x783, MSI_MER_FINISH = 1266,
NEED_REINS_OF_MOUNT = 0x78c,
PARTY_MASTER_CHANGE_SAME_MAP = 0x82e, ///< "It is only possible to change the party leader while on the same map." // The mercenary has died.
MERGE_ITEM_NOT_AVAILABLE = 0x887, MSI_MER_DIE = 1267,
ITEM_BULLET_EQUIP_FAIL = 0x9bd,
SKILL_NEED_GATLING = 0x9fa, // This skill cannot be used within this area.
SKILL_NEED_SHOTGUN = 0x9fb, MSI_IMPOSSIBLE_SKILL_AREA = 1334,
SKILL_NEED_RIFLE = 0x9fc,
SKILL_NEED_REVOLVER = 0x9fd, // This item cannot be used within this area.
SKILL_NEED_HOLY_BULLET = 0x9fe, MSI_IMPOSSIBLE_USEITEM_AREA = 1335,
SKILL_NEED_GRENADE = 0xa01,
GUILD_MASTER_WOE = 0xb93, /// <"Currently in WoE hours, unable to delegate Guild leader" // This character's equipment information is not open to the public.
GUILD_MASTER_DELAY = 0xb94, /// <"You have to wait for one day before delegating a new Guild leader" MSI_OPEN_EQUIPEDITEM_REFUSED = 1357,
SWAP_EQUIPITEM_UNREGISTER_FIRST = 0xbc7,
MSG_ATTENDANCE_DISABLED = 0xd92, // Item can only be used when Mado Gear is mounted.
ENCHANT_FAILED_OVER_WEIGHT = 0xefd, MSI_USESKILL_FAIL_MADOGEAR = 1435,
ENCHANT_SUCCESS = 0xf11,
ENCHANT_FAILED = 0xf12, // Only available when cart is mounted.
MSI_USESKILL_FAIL_CART = 1519,
// Cannot create rune stone more than the maximum amount.
MSI_RUNESTONE_MAKEERROR_OVERCOUNT = 1563,
// Combination of item is not possible in conversion.
MSI_SKILL_RECIPE_NOTEXIST = 1570,
// Please ensure an extra space in your inventory.
MSI_SKILL_INVENTORY_KINDCNT_OVER = 1572,
// Successful.
MSI_SKILL_SUCCESS = 1574,
// Failed.
MSI_SKILL_FAIL = 1575,
// Items cannot be used in materials cannot be emotional.
MSI_SKILL_FAIL_MATERIAL_IDENTITY = 1581,
// [Bow] must be equipped.
MSI_FAIL_NEED_EQUIPPED_BOW = 1691,
#if (PACKETVER >= 20130807 && PACKETVER <= 20130814) && !defined(PACKETVER_ZERO)
// %d seconds left until you can use
MSI_ITEM_REUSE_LIMIT_SECOND = 1862,
// Any work in progress (NPC dialog, manufacturing ...) quit and try again.
MSI_BUSY = 1924,
// While boarding reins is not available for items.
MSI_FAIELD_RIDING_OVERLAPPED = 1932,
// It is only possible to change the party leader while on the same map.
MSI_PARTY_MASTER_CHANGE_SAME_MAP = 2095,
// Merge items available does not exist.
MSI_NOT_EXIST_MERGE_ITEM = 2183,
// This bullet is not suitable for the weapon you are equipping.
MSI_WRONG_BULLET = 2494,
#else
// %d seconds left until you can use
MSI_ITEM_REUSE_LIMIT_SECOND = 1861,
// Any work in progress (NPC dialog, manufacturing ...) quit and try again.
MSI_BUSY = 1923,
// While boarding reins is not available for items.
MSI_FAIELD_RIDING_OVERLAPPED = 1931,
// It is only possible to change the party leader while on the same map.
MSI_PARTY_MASTER_CHANGE_SAME_MAP = 2094,
// Merge items available does not exist.
MSI_NOT_EXIST_MERGE_ITEM = 2182,
// This bullet is not suitable for the weapon you are equipping.
MSI_WRONG_BULLET = 2493,
#endif
// [Gatling Gun] weapon class must be equipped.
MSI_FAIL_NEED_EQUIPPED_GUN_GATLING = 2554,
// [Shotgun] weapon class must be equipped.
MSI_FAIL_NEED_EQUIPPED_GUN_SHOTGUN = 2555,
// [Rifle] weapon class must be equipped.
MSI_FAIL_NEED_EQUIPPED_GUN_RIFLE = 2556,
// [Revolver] weapon class must be equipped.
MSI_FAIL_NEED_EQUIPPED_GUN_HANDGUN = 2557,
// [Silver Bullet] must be equipped.
MSI_FAIL_NEED_EQUIPPED_PROPERTY_SAINT_BULLET = 2558,
// [Holy Water] must be equipped.
MSI_FAIL_NEED_EQUIPPED_GUN_GRANADE = 2561,
// [Grenade Launcher] weapon class must be equipped.
MSI_IMPOSSIBLE_CHANGE_GUILD_MASTER_IN_SIEGE_TIME = 2963,
// You have to wait for one day before delegating a new Guild leader
MSI_IMPOSSIBLE_CHANGE_GUILD_MASTER_NOT_TIME = 2964,
// This item has been set for Swap Equipment.
MSI_SWAP_EQUIPITEM_UNREGISTER_FIRST = 3015,
// Possession limit is over 70%, or you have less than 10 free inventory space.
MSI_PICKUP_FAILED_ITEMCREATE = 3022,
// Currently there is no attendance check event.
MSI_CHECK_ATTENDANCE_NOT_EVENT = 3474,
// It weighs more than 70%. Decrease the Weight and try again.
MSI_ENCHANT_FAILED_OVER_WEIGHT = 3837,
// Enchantment successful!
MSI_ENCHANT_SUCCESS = 3857,
// Enchantment failed!
MSI_ENCHANT_FAILED = 3858,
}; };
enum e_personalinfo : uint8_t { enum e_personalinfo : uint8_t {
@ -1098,7 +1198,6 @@ void clif_Adopt_request(map_session_data *sd, map_session_data *src, int p_id);
// MERCENARIES // MERCENARIES
void clif_mercenary_info(map_session_data *sd); void clif_mercenary_info(map_session_data *sd);
void clif_mercenary_skillblock(map_session_data *sd); void clif_mercenary_skillblock(map_session_data *sd);
void clif_mercenary_message(map_session_data* sd, int message);
void clif_mercenary_updatestatus(map_session_data *sd, int type); void clif_mercenary_updatestatus(map_session_data *sd, int type);
// RENTAL SYSTEM // RENTAL SYSTEM

13
src/map/mercenary.cpp
View File

@ -286,11 +286,18 @@ int mercenary_delete(s_mercenary_data *md, int reply) {
switch( reply ) switch( reply )
{ {
case 0: mercenary_set_faith(md, 1); break; // +1 Loyalty on Contract ends. case 0:
case 1: mercenary_set_faith(md, -1); break; // -1 Loyalty on Mercenary killed // +1 Loyalty on Contract ends.
mercenary_set_faith(md, 1);
clif_msg(sd, MSI_MER_FINISH);
break;
case 1:
// -1 Loyalty on Mercenary killed
mercenary_set_faith(md, -1);
clif_msg(sd, MSI_MER_DIE);
break;
} }
clif_mercenary_message(sd, reply);
return unit_remove_map(&md->bl, CLR_OUTSIGHT); return unit_remove_map(&md->bl, CLR_OUTSIGHT);
} }

2
src/map/npc.cpp
View File

@ -2196,7 +2196,7 @@ int npc_click(map_session_data* sd, struct npc_data* nd)
} }
if (sd->state.block_action & PCBLOCK_NPCCLICK) { if (sd->state.block_action & PCBLOCK_NPCCLICK) {
clif_msg(sd, WORK_IN_PROGRESS); clif_msg(sd, MSI_BUSY);
return 1; return 1;
} }

2
src/map/party.cpp
View File

@ -917,7 +917,7 @@ int party_changeleader(map_session_data *sd, map_session_data *tsd, struct party
return 0; // Shouldn't happen return 0; // Shouldn't happen
if( battle_config.change_party_leader_samemap && strncmp( p->party.member[mi].map, p->party.member[tmi].map, sizeof( p->party.member[mi].map ) ) != 0 ){ if( battle_config.change_party_leader_samemap && strncmp( p->party.member[mi].map, p->party.member[tmi].map, sizeof( p->party.member[mi].map ) ) != 0 ){
clif_msg(sd, PARTY_MASTER_CHANGE_SAME_MAP); clif_msg(sd, MSI_PARTY_MASTER_CHANGE_SAME_MAP);
return 0; return 0;
} }
} else { } else {

28
src/map/pc.cpp
View File

@ -1816,7 +1816,7 @@ uint8 pc_isequip(map_session_data *sd,int n)
switch (item->subtype) { switch (item->subtype) {
case AMMO_ARROW: case AMMO_ARROW:
if (battle_config.ammo_check_weapon && sd->status.weapon != W_BOW && sd->status.weapon != W_MUSICAL && sd->status.weapon != W_WHIP) { if (battle_config.ammo_check_weapon && sd->status.weapon != W_BOW && sd->status.weapon != W_MUSICAL && sd->status.weapon != W_WHIP) {
clif_msg(sd, ITEM_NEED_BOW); clif_msg(sd, MSI_FAIL_NEED_EQUIPPED_BOW);
return ITEM_EQUIP_ACK_FAIL; return ITEM_EQUIP_ACK_FAIL;
} }
break; break;
@ -1831,26 +1831,26 @@ uint8 pc_isequip(map_session_data *sd,int n)
&& sd->status.weapon != W_GRENADE && sd->status.weapon != W_GRENADE
#endif #endif
) { ) {
clif_msg(sd, ITEM_BULLET_EQUIP_FAIL); clif_msg(sd, MSI_WRONG_BULLET);
return ITEM_EQUIP_ACK_FAIL; return ITEM_EQUIP_ACK_FAIL;
} }
break; break;
#ifndef RENEWAL #ifndef RENEWAL
case AMMO_GRENADE: case AMMO_GRENADE:
if (battle_config.ammo_check_weapon && sd->status.weapon != W_GRENADE) { if (battle_config.ammo_check_weapon && sd->status.weapon != W_GRENADE) {
clif_msg(sd, ITEM_BULLET_EQUIP_FAIL); clif_msg(sd, MSI_WRONG_BULLET);
return ITEM_EQUIP_ACK_FAIL; return ITEM_EQUIP_ACK_FAIL;
} }
break; break;
#endif #endif
case AMMO_CANNONBALL: case AMMO_CANNONBALL:
if (!pc_ismadogear(sd) && (sd->status.class_ == JOB_MECHANIC_T || sd->status.class_ == JOB_MECHANIC)) { if (!pc_ismadogear(sd) && (sd->status.class_ == JOB_MECHANIC_T || sd->status.class_ == JOB_MECHANIC)) {
clif_msg(sd, ITEM_NEED_MADOGEAR); // Item can only be used when Mado Gear is mounted. clif_msg(sd, MSI_USESKILL_FAIL_MADOGEAR); // Item can only be used when Mado Gear is mounted.
return ITEM_EQUIP_ACK_FAIL; return ITEM_EQUIP_ACK_FAIL;
} }
if (sd->state.active && !pc_iscarton(sd) && //Check if sc data is already loaded if (sd->state.active && !pc_iscarton(sd) && //Check if sc data is already loaded
(sd->status.class_ == JOB_GENETIC_T || sd->status.class_ == JOB_GENETIC)) { (sd->status.class_ == JOB_GENETIC_T || sd->status.class_ == JOB_GENETIC)) {
clif_msg(sd, ITEM_NEED_CART); // Only available when cart is mounted. clif_msg(sd, MSI_USESKILL_FAIL_CART); // Only available when cart is mounted.
return ITEM_EQUIP_ACK_FAIL; return ITEM_EQUIP_ACK_FAIL;
} }
break; break;
@ -6172,7 +6172,7 @@ bool pc_isUseitem(map_session_data *sd,int n)
return false; return false;
if( (item->item_usage.sitting) && (pc_issit(sd) == 1) && (pc_get_group_level(sd) < item->item_usage.override) ) { if( (item->item_usage.sitting) && (pc_issit(sd) == 1) && (pc_get_group_level(sd) < item->item_usage.override) ) {
clif_msg(sd,ITEM_NOUSE_SITTING); clif_msg(sd, MSI_CANT_USE_WHEN_SITDOWN);
return false; // You cannot use this item while sitting. return false; // You cannot use this item while sitting.
} }
@ -6217,7 +6217,7 @@ bool pc_isUseitem(map_session_data *sd,int n)
// User is not party leader // User is not party leader
if( i == MAX_PARTY ){ if( i == MAX_PARTY ){
clif_msg( sd, ITEM_PARTY_MEMBER_NOT_SUMMONED ); clif_msg( sd, MSI_CANNOT_PARTYCALL);
return false; return false;
} }
@ -6225,11 +6225,11 @@ bool pc_isUseitem(map_session_data *sd,int n)
// No party members found on same map // No party members found on same map
if( i == MAX_PARTY ){ if( i == MAX_PARTY ){
clif_msg( sd, ITEM_PARTY_NO_MEMBER_IN_MAP ); clif_msg( sd, MSI_NO_PARTYMEM_ON_THISMAP );
return false; return false;
} }
}else{ }else{
clif_msg( sd, ITEM_PARTY_MEMBER_NOT_SUMMONED ); clif_msg( sd, MSI_CANNOT_PARTYCALL);
return false; return false;
} }
} }
@ -6261,7 +6261,7 @@ bool pc_isUseitem(map_session_data *sd,int n)
if( item->flag.group || item->type == IT_CASH) { //safe check type cash disappear when overweight [Napster] if( item->flag.group || item->type == IT_CASH) { //safe check type cash disappear when overweight [Napster]
if( pc_is90overweight(sd) ) { if( pc_is90overweight(sd) ) {
clif_msg(sd, ITEM_CANT_OBTAIN_WEIGHT); clif_msg(sd, MSI_CANT_GET_ITEM_BECAUSE_WEIGHT);
return false; return false;
} }
if( !pc_inventoryblank(sd) ) { if( !pc_inventoryblank(sd) ) {
@ -6324,7 +6324,7 @@ int pc_useitem(map_session_data *sd,int n)
if( pc_hasprogress( sd, WIP_DISABLE_SKILLITEM ) || !sd->npc_item_flag ){ if( pc_hasprogress( sd, WIP_DISABLE_SKILLITEM ) || !sd->npc_item_flag ){
#ifdef RENEWAL #ifdef RENEWAL
clif_msg( sd, WORK_IN_PROGRESS ); clif_msg( sd, MSI_BUSY);
#endif #endif
return 0; return 0;
} }
@ -6363,7 +6363,7 @@ int pc_useitem(map_session_data *sd,int n)
/* on restricted maps the item is consumed but the effect is not used */ /* on restricted maps the item is consumed but the effect is not used */
if (!pc_has_permission(sd,PC_PERM_ITEM_UNCONDITIONAL) && itemdb_isNoEquip(id,sd->bl.m)) { if (!pc_has_permission(sd,PC_PERM_ITEM_UNCONDITIONAL) && itemdb_isNoEquip(id,sd->bl.m)) {
clif_msg(sd,ITEM_CANT_USE_AREA); // This item cannot be used within this area clif_msg(sd, MSI_IMPOSSIBLE_USEITEM_AREA); // This item cannot be used within this area
if( battle_config.allow_consume_restricted_item && id->flag.delay_consume > 0 ) { //need confirmation for delayed consumption items if( battle_config.allow_consume_restricted_item && id->flag.delay_consume > 0 ) { //need confirmation for delayed consumption items
clif_useitemack(sd,n,item.amount-1,true); clif_useitemack(sd,n,item.amount-1,true);
pc_delitem(sd,n,1,1,0,LOG_TYPE_CONSUME); pc_delitem(sd,n,1,1,0,LOG_TYPE_CONSUME);
@ -6531,7 +6531,7 @@ void pc_putitemtocart(map_session_data *sd,int idx,int amount)
return; return;
if( item_data->equipSwitch ){ if( item_data->equipSwitch ){
clif_msg( sd, SWAP_EQUIPITEM_UNREGISTER_FIRST ); clif_msg( sd, MSI_SWAP_EQUIPITEM_UNREGISTER_FIRST );
return; return;
} }
@ -14449,7 +14449,7 @@ uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, u
// Send reply of delay remains // Send reply of delay remains
if (sc->getSCE(id->delay.sc)) { if (sc->getSCE(id->delay.sc)) {
const struct TimerData *timer = get_timer(sc->getSCE(id->delay.sc)->timer); const struct TimerData *timer = get_timer(sc->getSCE(id->delay.sc)->timer);
clif_msg_value(sd, ITEM_REUSE_LIMIT, (int)(timer ? DIFF_TICK(timer->tick, tick) / 1000 : 99)); clif_msg_value(sd, MSI_ITEM_REUSE_LIMIT_SECOND, (int)(timer ? DIFF_TICK(timer->tick, tick) / 1000 : 99));
return 1; return 1;
} }

2
src/map/script.cpp
View File

@ -22541,7 +22541,7 @@ BUILDIN_FUNC(setmounting) {
if (!script_charid2sd(2,sd)) if (!script_charid2sd(2,sd))
return SCRIPT_CMD_FAILURE; return SCRIPT_CMD_FAILURE;
if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ) { if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ) {
clif_msg(sd, NEED_REINS_OF_MOUNT); clif_msg(sd, MSI_FAIELD_RIDING_OVERLAPPED);
script_pushint(st,0); //can't mount with one of these script_pushint(st,0); //can't mount with one of these
} else if (sd->sc.getSCE(SC_CLOAKING) || sd->sc.getSCE(SC_CHASEWALK) || sd->sc.getSCE(SC_CLOAKINGEXCEED) || sd->sc.getSCE(SC_CAMOUFLAGE) || sd->sc.getSCE(SC_STEALTHFIELD) || sd->sc.getSCE(SC__FEINTBOMB)) { } else if (sd->sc.getSCE(SC_CLOAKING) || sd->sc.getSCE(SC_CHASEWALK) || sd->sc.getSCE(SC_CLOAKINGEXCEED) || sd->sc.getSCE(SC_CAMOUFLAGE) || sd->sc.getSCE(SC_STEALTHFIELD) || sd->sc.getSCE(SC__FEINTBOMB)) {
// SC_HIDING, SC__INVISIBILITY, SC__SHADOWFORM, SC_SUHIDE already disable item usage // SC_HIDING, SC__INVISIBILITY, SC__SHADOWFORM, SC_SUHIDE already disable item usage

34
src/map/skill.cpp
View File

@ -872,7 +872,7 @@ bool skill_isNotOk( uint16 skill_id, map_session_data& sd ){
(skill_nocast&8 && mapdata->getMapFlag(MF_BATTLEGROUND)) || (skill_nocast&8 && mapdata->getMapFlag(MF_BATTLEGROUND)) ||
(skill_nocast&16 && mapdata_flag_gvg2_te(mapdata)) || // WOE:TE (skill_nocast&16 && mapdata_flag_gvg2_te(mapdata)) || // WOE:TE
(mapdata->zone && skill_nocast&(mapdata->zone) && mapdata->getMapFlag(MF_RESTRICTED)) ){ (mapdata->zone && skill_nocast&(mapdata->zone) && mapdata->getMapFlag(MF_RESTRICTED)) ){
clif_msg(&sd, SKILL_CANT_USE_AREA); // This skill cannot be used within this area clif_msg(&sd, MSI_IMPOSSIBLE_SKILL_AREA); // This skill cannot be used within this area
return true; return true;
} }
@ -18279,7 +18279,7 @@ bool skill_check_condition_castbegin( map_session_data& sd, uint16 skill_id, uin
count--; count--;
if (!count) { if (!count) {
if( skill_id == RL_P_ALTER ){ if( skill_id == RL_P_ALTER ){
clif_msg( &sd, SKILL_NEED_HOLY_BULLET ); clif_msg( &sd, MSI_FAIL_NEED_EQUIPPED_PROPERTY_SAINT_BULLET );
}else{ }else{
clif_skill_fail( sd, skill_id, USESKILL_FAIL_THIS_WEAPON ); clif_skill_fail( sd, skill_id, USESKILL_FAIL_THIS_WEAPON );
} }
@ -18328,19 +18328,19 @@ bool skill_check_condition_castbegin( map_session_data& sd, uint16 skill_id, uin
default: default:
switch((unsigned int)log2(require.weapon)) { switch((unsigned int)log2(require.weapon)) {
case W_REVOLVER: case W_REVOLVER:
clif_msg(&sd, SKILL_NEED_REVOLVER); clif_msg(&sd, MSI_FAIL_NEED_EQUIPPED_GUN_HANDGUN);
break; break;
case W_RIFLE: case W_RIFLE:
clif_msg(&sd, SKILL_NEED_RIFLE); clif_msg(&sd, MSI_FAIL_NEED_EQUIPPED_GUN_RIFLE);
break; break;
case W_GATLING: case W_GATLING:
clif_msg(&sd, SKILL_NEED_GATLING); clif_msg(&sd, MSI_FAIL_NEED_EQUIPPED_GUN_GATLING);
break; break;
case W_SHOTGUN: case W_SHOTGUN:
clif_msg(&sd, SKILL_NEED_SHOTGUN); clif_msg(&sd, MSI_FAIL_NEED_EQUIPPED_GUN_SHOTGUN);
break; break;
case W_GRENADE: case W_GRENADE:
clif_msg(&sd, SKILL_NEED_GRENADE); clif_msg(&sd, MSI_FAIL_NEED_EQUIPPED_GUN_GRANADE);
break; break;
default: default:
clif_skill_fail( sd, skill_id, USESKILL_FAIL_THIS_WEAPON ); clif_skill_fail( sd, skill_id, USESKILL_FAIL_THIS_WEAPON );
@ -22409,7 +22409,7 @@ bool skill_produce_mix(map_session_data *sd, uint16 skill_id, t_itemid nameid, i
if (k) { if (k) {
clif_produceeffect(sd,6,nameid); clif_produceeffect(sd,6,nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_SUCCESS ); clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_SUCCESS );
clif_msg_skill(sd,skill_id,ITEM_PRODUCE_SUCCESS); clif_msg_skill(sd,skill_id, MSI_SKILL_SUCCESS);
return true; return true;
} }
} else if (tmp_item.amount) { //Success } else if (tmp_item.amount) { //Success
@ -22429,17 +22429,17 @@ bool skill_produce_mix(map_session_data *sd, uint16 skill_id, t_itemid nameid, i
case GN_S_PHARMACY: case GN_S_PHARMACY:
clif_produceeffect(sd, 6, nameid); clif_produceeffect(sd, 6, nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_SUCCESS ); clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_SUCCESS );
clif_msg_skill(sd, skill_id, ITEM_PRODUCE_SUCCESS); clif_msg_skill(sd, skill_id, MSI_SKILL_SUCCESS);
break; break;
case MT_M_MACHINE: case MT_M_MACHINE:
clif_produceeffect(sd, 0, nameid); clif_produceeffect(sd, 0, nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_REFINE_SUCCESS ); clif_misceffect( sd->bl, NOTIFYEFFECT_REFINE_SUCCESS );
clif_msg_skill(sd, skill_id, ITEM_PRODUCE_SUCCESS); clif_msg_skill(sd, skill_id, MSI_SKILL_SUCCESS);
break; break;
case BO_BIONIC_PHARMACY: case BO_BIONIC_PHARMACY:
clif_produceeffect(sd, 2, nameid); clif_produceeffect(sd, 2, nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_SUCCESS ); clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_SUCCESS );
clif_msg_skill(sd, skill_id, ITEM_PRODUCE_SUCCESS); clif_msg_skill(sd, skill_id, MSI_SKILL_SUCCESS);
break; break;
} }
return true; return true;
@ -22508,7 +22508,7 @@ bool skill_produce_mix(map_session_data *sd, uint16 skill_id, t_itemid nameid, i
} }
clif_produceeffect(sd,7,nameid); clif_produceeffect(sd,7,nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_FAILURE ); clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_FAILURE );
clif_msg_skill(sd,skill_id,ITEM_PRODUCE_FAIL); clif_msg_skill(sd, skill_id, MSI_SKILL_FAIL);
} }
break; break;
case GN_MAKEBOMB: case GN_MAKEBOMB:
@ -22516,17 +22516,17 @@ bool skill_produce_mix(map_session_data *sd, uint16 skill_id, t_itemid nameid, i
case GN_CHANGEMATERIAL: case GN_CHANGEMATERIAL:
clif_produceeffect(sd,7,nameid); clif_produceeffect(sd,7,nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_FAILURE ); clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_FAILURE );
clif_msg_skill(sd,skill_id,ITEM_PRODUCE_FAIL); clif_msg_skill(sd, skill_id, MSI_SKILL_FAIL);
break; break;
case MT_M_MACHINE: case MT_M_MACHINE:
clif_produceeffect(sd, 1, nameid); clif_produceeffect(sd, 1, nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_REFINE_FAILURE ); clif_misceffect( sd->bl, NOTIFYEFFECT_REFINE_FAILURE );
clif_msg_skill(sd, skill_id, ITEM_PRODUCE_FAIL); clif_msg_skill(sd, skill_id, MSI_SKILL_FAIL);
break; break;
case BO_BIONIC_PHARMACY: case BO_BIONIC_PHARMACY:
clif_produceeffect(sd, 3, nameid); clif_produceeffect(sd, 3, nameid);
clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_FAILURE ); clif_misceffect( sd->bl, NOTIFYEFFECT_PHARMACY_FAILURE );
clif_msg_skill(sd, skill_id, ITEM_PRODUCE_FAIL); clif_msg_skill(sd, skill_id, MSI_SKILL_FAIL);
break; break;
default: default:
if (skill_produce_db[idx].itemlv > 10 && skill_produce_db[idx].itemlv <= 20 ) { //Cooking items. if (skill_produce_db[idx].itemlv > 10 && skill_produce_db[idx].itemlv <= 20 ) { //Cooking items.
@ -22888,7 +22888,7 @@ int skill_changematerial(map_session_data *sd, int n, unsigned short *item_list)
nameid = sd->inventory.u.items_inventory[idx].nameid; nameid = sd->inventory.u.items_inventory[idx].nameid;
amount = item_list[k*2+1]; amount = item_list[k*2+1];
if( nameid > 0 && sd->inventory.u.items_inventory[idx].identify == 0 ){ if( nameid > 0 && sd->inventory.u.items_inventory[idx].identify == 0 ){
clif_msg_skill(sd,GN_CHANGEMATERIAL,ITEM_UNIDENTIFIED); clif_msg_skill(sd, GN_CHANGEMATERIAL, MSI_SKILL_FAIL_MATERIAL_IDENTITY);
return 0; return 0;
} }
if( nameid == skill_produce_db[i].mat_id[j] && (amount-p*skill_produce_db[i].mat_amount[j]) >= skill_produce_db[i].mat_amount[j] if( nameid == skill_produce_db[i].mat_id[j] && (amount-p*skill_produce_db[i].mat_amount[j]) >= skill_produce_db[i].mat_amount[j]
@ -22910,7 +22910,7 @@ int skill_changematerial(map_session_data *sd, int n, unsigned short *item_list)
} }
if( p == 0) if( p == 0)
clif_msg_skill(sd,GN_CHANGEMATERIAL,ITEM_CANT_COMBINE); clif_msg_skill(sd, GN_CHANGEMATERIAL, MSI_SKILL_RECIPE_NOTEXIST);
return 0; return 0;
} }

2
src/map/trade.cpp
View File

@ -399,7 +399,7 @@ void trade_tradeadditem(map_session_data *sd, short index, short amount)
} }
if( item->equipSwitch ){ if( item->equipSwitch ){
clif_msg(sd, SWAP_EQUIPITEM_UNREGISTER_FIRST); clif_msg(sd, MSI_SWAP_EQUIPITEM_UNREGISTER_FIRST);
return; return;
} }