summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/mercenary.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f995288bc..69dcb0bf5 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/19
+ * Fixed homunculus intimacy on feeding [Toms]
* Added homunculus_friendly_rate battle config [Toms]
* Some compilation warnings fixed [Toms]
* Added skill's required item check on homunc skills [Toms]
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 472ac285c..2f5ed4d11 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -537,7 +537,7 @@ int merc_hom_food(struct map_session_data *sd, struct homun_data *hd)
merc_hom_increase_intimacy(hd, 100);
emotion = 2;
} else {
- merc_hom_increase_intimacy(hd, 25);
+ merc_hom_increase_intimacy(hd, 50);
emotion = 2;
}