summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-19 11:32:41 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-19 11:32:41 +0000
commit59fcf9c26e7c9d5cf65b60d0fb148b5214143711 (patch)
tree58925b6bc69b15dfbce7f90b1a8c96651ea0f1b9 /src/map/mercenary.c
parent41fcb2ac66e37cad97e9ec485bd4d11f8397e53b (diff)
downloadhercules-59fcf9c26e7c9d5cf65b60d0fb148b5214143711.tar.gz
hercules-59fcf9c26e7c9d5cf65b60d0fb148b5214143711.tar.bz2
hercules-59fcf9c26e7c9d5cf65b60d0fb148b5214143711.tar.xz
hercules-59fcf9c26e7c9d5cf65b60d0fb148b5214143711.zip
Added homunculus_friendly_rate battle config
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8361 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 118bda037..472ac285c 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -393,6 +393,9 @@ int merc_hom_gainexp(struct homun_data *hd,int exp)
// Return then new value
int merc_hom_increase_intimacy(struct homun_data * hd, unsigned int value)
{
+ if (battle_config.homunculus_friendly_rate != 100)
+ value = (value * battle_config.homunculus_friendly_rate) / 100;
+
if (hd->master->homunculus.intimacy + value <= 100000)
hd->master->homunculus.intimacy += value;
else