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

Fixed a few problems with homunculus autofeed (#3062)

Browse Source
This commit is contained in:
Lemongrass3110 2018-04-20 19:22:13 +02:00 committed by GitHub
parent 7df4c6b80a
commit 2c68db9faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/battle/feature.conf
View File

@ -71,7 +71,3 @@ feature.achievement: on
// Homunculues Autofeeding (Note 1) // Homunculues Autofeeding (Note 1)
// Requires: 2017-09-20bRagexeRE or later // Requires: 2017-09-20bRagexeRE or later
feature.homunculus_autofeed: off feature.homunculus_autofeed: off
// At which rate should homunculus autofeeding trigger?
// Default: 30
feature.homunculus_autofeed_rate: 30

3
src/map/battle.cpp
View File

@ -8513,8 +8513,7 @@ static const struct _battle_data {
{ "broadcast_hide_name", &battle_config.broadcast_hide_name, 2, 0, NAME_LENGTH, }, { "broadcast_hide_name", &battle_config.broadcast_hide_name, 2, 0, NAME_LENGTH, },
{ "skill_drop_items_full", &battle_config.skill_drop_items_full, 0, 0, 1, }, { "skill_drop_items_full", &battle_config.skill_drop_items_full, 0, 0, 1, },
{ "feature.homunculus_autofeed", &battle_config.feature_homunculus_autofeed, 1, 0, 1, }, { "feature.homunculus_autofeed", &battle_config.feature_homunculus_autofeed, 1, 0, 1, },
{ "feature.homunculus_autofeed_rate", &battle_config.feature_homunculus_autofeed_rate,30, 0, 100, }, { "summoner_trait", &battle_config.summoner_trait, 3, 0, 3, },
{ "summoner_trait", &battle_config.summoner_trait, 3, 0, 3, },
#include "../custom/battle_config_init.inc" #include "../custom/battle_config_init.inc"
}; };

3
src/map/battle.hpp
View File

@ -641,8 +641,7 @@ struct Battle_Config
int autoloot_adjust; int autoloot_adjust;
int broadcast_hide_name; int broadcast_hide_name;
int skill_drop_items_full; int skill_drop_items_full;
int feature_homunculus_autofeed; int feature_homunculus_autofeed;
int feature_homunculus_autofeed_rate;
int summoner_trait; int summoner_trait;
#include "../custom/battle_config_struct.inc" #include "../custom/battle_config_struct.inc"

4
src/map/clif.cpp
View File

@ -10448,7 +10448,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
clif_equipcheckbox(sd); clif_equipcheckbox(sd);
#endif #endif
#if PACKETVER >= 20170920 #if PACKETVER >= 20170920
if( sd->hd ){ if( sd->hd && battle_config.feature_homunculus_autofeed ){
clif_configuration( sd, CONFIG_HOMUNCULUS_AUTOFEED, sd->hd->homunculus.autofeed ); clif_configuration( sd, CONFIG_HOMUNCULUS_AUTOFEED, sd->hd->homunculus.autofeed );
}else{ }else{
clif_configuration( sd, CONFIG_HOMUNCULUS_AUTOFEED, false ); clif_configuration( sd, CONFIG_HOMUNCULUS_AUTOFEED, false );
@ -16568,7 +16568,7 @@ void clif_parse_configuration( int fd, struct map_session_data* sd ){
break; break;
case CONFIG_HOMUNCULUS_AUTOFEED: case CONFIG_HOMUNCULUS_AUTOFEED:
// Player can not click this if he does not have a homunculus or it is vaporized // Player can not click this if he does not have a homunculus or it is vaporized
if( sd->hd == nullptr || sd->hd->homunculus.vaporize ){ if( sd->hd == nullptr || sd->hd->homunculus.vaporize || !battle_config.feature_homunculus_autofeed ){
return; return;
} }

4
src/map/homunculus.cpp
View File

@ -892,10 +892,6 @@ static int hom_hungry(int tid, unsigned int tick, int id, intptr_t data)
clif_emotion(&hd->bl, ET_OK); clif_emotion(&hd->bl, ET_OK);
} }
if( battle_config.feature_homunculus_autofeed && hd->homunculus.autofeed && hd->homunculus.hunger <= battle_config.feature_homunculus_autofeed_rate ){
hom_food( sd, hd );
}
if (hd->homunculus.hunger < 0) { if (hd->homunculus.hunger < 0) {
hd->homunculus.hunger = 0; hd->homunculus.hunger = 0;
// Delete the homunculus if intimacy <= 100 // Delete the homunculus if intimacy <= 100