summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 02:58:34 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 02:58:34 +0000
commit6a3573e5f5bf52330b278dd0736112bf7f6f8938 (patch)
treecff3d1c4004e3a6a8aa9556f1cecd5953bf6ed16 /src/map
parent3d56a0bf4a4ac9da69eac47560b18e2f770d2747 (diff)
downloadhercules-6a3573e5f5bf52330b278dd0736112bf7f6f8938.tar.gz
hercules-6a3573e5f5bf52330b278dd0736112bf7f6f8938.tar.bz2
hercules-6a3573e5f5bf52330b278dd0736112bf7f6f8938.tar.xz
hercules-6a3573e5f5bf52330b278dd0736112bf7f6f8938.zip
Added renewal behavior to safety wall (exclusive to remode)
- Safety Wall now possesses a lifetime equal to 3 times the health of the caster, when the wall absorbs this much damage, the wall is removed and any remaining damage is dealt to the player. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15554 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c13
-rw-r--r--src/map/skill.c12
2 files changed, 22 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index efcf199aa..6cf116db4 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -386,10 +386,23 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
{
struct skill_unit_group* group = skill_id2group(sc->data[SC_SAFETYWALL]->val3);
if (group) {
+ /**
+ * in RE, SW possesses a lifetime equal to 3 times the caster's health
+ **/
+ #if REMODE
+ if ( ( group->val2 - damage) > 0 ) {
+ group->val2 -= damage;
+ d->dmg_lv = ATK_BLOCK;
+ return 0;
+ } else
+ damage -= group->val2;
+ skill_delunitgroup(group);
+ #else
if (--group->val2<=0)
skill_delunitgroup(group);
d->dmg_lv = ATK_BLOCK;
return 0;
+ #endif
}
status_change_end(bl, SC_SAFETYWALL, INVALID_TIMER);
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 3179853c2..5b931e99f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8850,10 +8850,16 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli
status = status_get_status_data(src);
sc = status_get_sc(src); // for traps, firewall and fogwall - celest
- switch( skillid )
- {
+ switch( skillid ) {
case MG_SAFETYWALL:
- val2=skilllv+1;
+ #if REMODE
+ /**
+ * According to data provided in RE, SW life is equal to 3 times caster's health
+ **/
+ val2 = status_get_max_hp(src) * 3;
+ #else
+ val2 = skilllv+1;
+ #endif
break;
case MG_FIREWALL:
if(sc && sc->data[SC_VIOLENTGALE])