summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorprotimus <protimus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-29 20:57:09 +0000
committerprotimus <protimus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-29 20:57:09 +0000
commit18536b5d981ef5c4b4a6d0fee590f753d8eb3d7c (patch)
tree8f4b98e10f752fedbd2325128013aa67a12d0a2d /src/map
parent171e402edc560d78083e27a8e2ad07c1f7d43427 (diff)
downloadhercules-18536b5d981ef5c4b4a6d0fee590f753d8eb3d7c.tar.gz
hercules-18536b5d981ef5c4b4a6d0fee590f753d8eb3d7c.tar.bz2
hercules-18536b5d981ef5c4b4a6d0fee590f753d8eb3d7c.tar.xz
hercules-18536b5d981ef5c4b4a6d0fee590f753d8eb3d7c.zip
* Updated for Emperium not can be healed by any skills.
* Updated investments formulas of HP and SP according to renewal. - Not yet official, need more informations. - This is a temporary fix necessary for the emperium can be broken. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15321 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/status.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index d01b72e84..fdb67ae3e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -719,6 +719,10 @@ int battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int dama
switch (skill_num) {
case MO_TRIPLEATTACK:
case HW_GRAVITATION:
+ case AL_HEAL:
+ case PR_SANCTUARY:
+ case BA_APPLEIDUN:
+ case AB_CHEAL:
break;
default:
return 0;
diff --git a/src/map/status.c b/src/map/status.c
index a1d54a481..b7ad490f2 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1824,8 +1824,8 @@ int status_calc_mob_(struct mob_data* md, bool first)
ShowError("status_calc_mob: No castle set at map %s\n", map[md->bl.m].name);
else
if(gc->castle_id < 24 || md->class_ == MOBID_EMPERIUM) {
- status->max_hp += 1000 * gc->defense;
- status->max_sp += 200 * gc->defense;
+ status->max_hp += 50 * gc->defense;
+ status->max_sp += 70 * gc->defense;
status->hp = status->max_hp;
status->sp = status->max_sp;
status->def += (gc->defense+2)/3;