From cb098d5126f0370def62fdbbeb113230c54c9d48 Mon Sep 17 00:00:00 2001 From: momacabu Date: Sat, 20 Apr 2013 01:14:02 +0000 Subject: [PATCH] - Follow up to r17272, added friendly message when you can't return your pet to egg. The hell, been listening too much Bryan Adams.. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17273 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/msg_conf/map_msg.conf | 3 +++ conf/msg_conf/map_msg_por.conf | 3 +++ conf/msg_conf/map_msg_spn.conf | 3 +++ src/common/mmo.h | 2 +- src/map/pet.c | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf index 38a7c51b56..2b0b8d8604 100644 --- a/conf/msg_conf/map_msg.conf +++ b/conf/msg_conf/map_msg.conf @@ -443,6 +443,9 @@ // Homunculus messages 450: You already have a homunculus +// Return pet to egg message +451: You can't return your pet because your inventory is full. + // Message System 460: Please enter a valid language (usage: @langtype ). 461: Language is now set to %s. diff --git a/conf/msg_conf/map_msg_por.conf b/conf/msg_conf/map_msg_por.conf index bf570d1140..9693f81de9 100644 --- a/conf/msg_conf/map_msg_por.conf +++ b/conf/msg_conf/map_msg_por.conf @@ -448,6 +448,9 @@ // Mensagens de homunculus 450: Você já possui um homunculus +// Mensagem de retorno do pet ao ovo +451: Você não pode retornar o seu bichinho de estimação para o ovo pois o seu inventário está lotado. + // Sistema de Mensagens 460: Digite um idioma válido (uso: @langtype ). 461: O seu idioma agora está definido para %s. diff --git a/conf/msg_conf/map_msg_spn.conf b/conf/msg_conf/map_msg_spn.conf index 833aff200b..0d53d7b598 100644 --- a/conf/msg_conf/map_msg_spn.conf +++ b/conf/msg_conf/map_msg_spn.conf @@ -451,6 +451,9 @@ // Homunculus messages 450: Ya tienes un homúnculo. +// Return pet to egg message +451: No puedes retornar tu pet porque tu inventory está llena. + // Message System 460: Por favor, especifica una lengua válida (uso: @langtype ). 461: Se ha cambiado tu lengua a %s. diff --git a/src/common/mmo.h b/src/common/mmo.h index eaeb27c359..408a6894ec 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -47,7 +47,7 @@ // 20120307 - 2012-03-07aRagexeRE+ - 0x970 #ifndef PACKETVER - #define PACKETVER 20100730 + #define PACKETVER 20120410 //#define PACKETVER 20111116 #endif diff --git a/src/map/pet.c b/src/map/pet.c index eae1696fa8..ae75eeead6 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -595,7 +595,7 @@ int pet_menu(struct map_session_data *sd,int menunum) egg_id = itemdb_exists(sd->pd->petDB->EggID); if (egg_id) { if ((egg_id->flag.trade_restriction&0x01) && !pc_inventoryblank(sd)) { - printf ("THERE WILL NEVER BE ANOTHER TONIGHT = %d.\n", ARRAYLENGTH(sd->status.inventory)); + clif_displaymessage(sd->fd, msg_txt(sd, 451)); // You can't return your pet because your inventory is full. return 1; } }