- Summoned and slave mobs won't show up on @showmobs anymore.

- Moved Spider Web damage bonus from battle_calc_damage to battle_attr_fix, so that damage will be doubled based on the actual attack element.
- Adjusted autospell cards to trigger only on physical weapon attacks.
- Adjusted a bit the heal code, it should now show either the full heal amount, or 0, depending on whether the target was healed at all or not (this also means it shows 0 if you try to heal a full-life character.. but it's the closest I've gotten to make it display 0 on Berserked chars)
- Memorize will be consumed even on instant cast spells now.
- Berserk will end now if hit and remaining hp is less or equal to 100.
- Guild Aura will be removed on sc-load to prevent Guild Masters from getting that bonus from the old implementation.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8705 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 7 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 2f254bc30..bce72d52e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -201,6 +201,8 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag
 			ratio += enchant_eff[sc->data[SC_VIOLENTGALE].val1-1];
 		if(sc->data[SC_DELUGE].timer!=-1 && atk_elem == ELE_WATER)
 			ratio += enchant_eff[sc->data[SC_DELUGE].val1-1];
+		if(sc->data[SC_SPIDERWEB].timer!=-1 && atk_elem == ELE_FIRE) // [Celest]
+			damage *= 2; //FIXME: Double damage instead of double ratio?
 	}
 	if (tsc && tsc->count)
 	{
@@ -335,13 +337,6 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
 				status_change_end( bl,SC_AETERNA,-1 );
 		}
 
-		if(sc->data[SC_SPIDERWEB].timer!=-1)	// [Celest]
-			if ((flag&BF_SKILL && skill_get_pl(skill_num)==ELE_FIRE) ||
-				(!flag&BF_SKILL && status_get_attack_element(src)==ELE_FIRE)) {
-				damage<<=1;
-				status_change_end(bl, SC_SPIDERWEB, -1);
-			}
-
 		//Finally damage reductions....
 		if(sc->data[SC_ASSUMPTIO].timer != -1){
 			if(map_flag_vs(bl->m))