summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-30 04:39:59 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-30 04:39:59 +0000
commit8ec06e1832af8a2f68bd8d79b7ade09d861a2dea (patch)
tree825a318c8d4496eafa5af8edb785700fee0babbc /src/map/script.c
parentd35ff1c213b7d77cc45c037e950a180c08279cd6 (diff)
downloadhercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.tar.gz
hercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.tar.bz2
hercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.tar.xz
hercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.zip
- Cleaned up a bit the homunculus evolution code, and fixed homevolution allowing the homunc to 're-evolve' even though it was already evolved.
- Optimized a bit the skillheal code in regards to Apple of Idun and Sanctuary git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11090 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 86019c40e..31fba0429 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8737,10 +8737,8 @@ BUILDIN_FUNC(homunculus_evolution)
{
TBL_PC *sd;
sd=script_rid2sd(st);
- if ( sd->hd && sd->hd->homunculusDB->evo_class && sd->hd->homunculus.intimacy > 91000 ) {
- return !merc_hom_evolution(sd->hd) ;
- }
- clif_emotion(&sd->hd->bl, 4) ; //swt
+ if(merc_is_hom_active(sd->hd))
+ merc_hom_evolution(sd->hd);
return 0;
}