summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2014-03-10 03:01:51 +0100
committerHaruna <haru@dotalux.com>2014-03-10 03:01:51 +0100
commitc5e458c94ad43c78ae9378dae286e18b07810983 (patch)
treee7261a2d6013d40be8c4418a5193542df1b15a28
parent1d12bb1704115e299dbcc0d2a05cd9f2c68f91fd (diff)
parentb389ec3d1184bc0566e92d69fe0bd1250eae27fb (diff)
downloadhercules-c5e458c94ad43c78ae9378dae286e18b07810983.tar.gz
hercules-c5e458c94ad43c78ae9378dae286e18b07810983.tar.bz2
hercules-c5e458c94ad43c78ae9378dae286e18b07810983.tar.xz
hercules-c5e458c94ad43c78ae9378dae286e18b07810983.zip
Merge pull request #262 from Baalberith6/master
MH_LIGHT_OF_REGENE resetting intimacy to 0.25% and checking for 0.75% when used (instead of 25% and 75%)
-rw-r--r--[-rwxr-xr-x]src/common/HPM.c0
-rw-r--r--src/map/skill.c4
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/HPM.c b/src/common/HPM.c
index a25a17782..a25a17782 100755..100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
diff --git a/src/map/skill.c b/src/map/skill.c
index 72b59aab7..8750695ae 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -585,7 +585,7 @@ int skillnotok_hom(uint16 skill_id, struct homun_data *hd)
return 1;
switch(skill_id){
case MH_LIGHT_OF_REGENE:
- if(hd->homunculus.intimacy <= 750) //if not cordial
+ if(hd->homunculus.intimacy <= 75000) //if not cordial
return 1;
break;
case MH_OVERED_BOOST:
@@ -9449,7 +9449,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
case MH_LIGHT_OF_REGENE:
if(hd) {
- hd->homunculus.intimacy = 251; //change to neutral (can't be cast if < 750)
+ hd->homunculus.intimacy = 25100; //change to neutral (can't be cast if < 750)
if(sd) clif->send_homdata(sd, SP_INTIMATE, hd->homunculus.intimacy); //refresh intimacy info
}
//don't break need to start status and start block timer