- Fixed EDP's damage being 100% more than it should (should be 5x, not 6x on normal attacks)

- Self Destruction will only hit everyone and not just enemies when used by mobs (non marine spheres) unless the map is a versus map.
- Spider Web's duration is now halved on players (before it was halved in pvp maps only)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9314 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,12 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/11/24
+	* Fixed EDP's damage being 100% more than it should (should be 5x, not 6x
+	  on normal attacks) [Skotlex]
+	* Self Destruction will only hit everyone and not just enemies when used by
+	  mobs (non marine spheres) unless the map is a versus map. [Skotlex]
+	* Spider Web's duration is now halved on players (before it was halved in
+	  pvp maps only) [Skotlex]
 	* Likely fixed Homunculus not disappearing the second their intimacy hit 0.
 	  [Skotlex]
 	* Fixed uninitialized variable fd being used in WFIFOHEAD in a few clif

src/map/battle.c

@@ -1640,7 +1640,7 @@ static struct Damage battle_calc_weapon_attack(
 				skillratio += 2*sc->data[SC_TRUESIGHT].val1;
 			// It is still not quite decided whether it works on bosses or not...
 			if(sc->data[SC_EDP].timer != -1 /*&& !(t_mode&MD_BOSS)*/ && skill_num != ASC_BREAKER && skill_num != ASC_METEORASSAULT)
-				skillratio += 150 +50*sc->data[SC_EDP].val1;
+				skillratio += sc->data[SC_EDP].val3;
 		}
 		switch (skill_num) {
 			case AS_SONICBLOW: //EDP will not stack with Soul Link bonus.

src/map/skill.c

@@ -4067,7 +4067,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 	case NPC_SELFDESTRUCTION:
 		//Self Destruction hits everyone in range (allies+enemies)
 		//Except for Summoned Marine spheres on non-versus maps, where it's just enemy.
-		i = ((hd || (md && md->special_state.ai == 2)) && !map_flag_vs(src->m))?
+		i = ((!md || md->special_state.ai == 2) && !map_flag_vs(src->m))?
 			BCT_ENEMY:BCT_ALL;
 		clif_skill_nodamage(src, src, skillid, -1, 1);
 		map_foreachinrange(skill_area_sub, bl,

src/map/status.c

@@ -4862,6 +4862,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			break;
 		case SC_EDP:	// [Celest]
 			val2 = val1 + 2; //Chance to Poison enemies.
+			val3 = 50*(val1+1); //Damage increase (+50 +50*lv%)
 			break;
 		case SC_POISONREACT:
 			val2=(val1+1)/2 + val1/10; // Number of counters [Skotlex]
@@ -5623,7 +5624,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 				tick = 3000;
 			break;
 		case SC_SPIDERWEB:
-			if (map[bl->m].flag.pvp)
+			if (bl->type == BL_PC)
 				tick /=2;
 			break;
 		case SC_ARMOR: