summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-24 16:50:23 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-24 16:50:23 +0000
commit01476c09aec449f89f52761b98da61e6c541e563 (patch)
treeb256b9cb2f53f834798b267d5356b4b06f3b8142
parentdb1cd48635235a32a7c0d0db4c81eea517a73361 (diff)
downloadhercules-01476c09aec449f89f52761b98da61e6c541e563.tar.gz
hercules-01476c09aec449f89f52761b98da61e6c541e563.tar.bz2
hercules-01476c09aec449f89f52761b98da61e6c541e563.tar.xz
hercules-01476c09aec449f89f52761b98da61e6c541e563.zip
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9314 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt6
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c3
4 files changed, 10 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d29d1679d..c4cf9c0cb 100644
--- a/Changelog-Trunk.txt
+++ b/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
diff --git a/src/map/battle.c b/src/map/battle.c
index 20e6e345a..c168f8bdb 100644
--- a/src/map/battle.c
+++ b/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.
diff --git a/src/map/skill.c b/src/map/skill.c
index 8cb9a35c5..26f9a8f41 100644
--- a/src/map/skill.c
+++ b/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,
diff --git a/src/map/status.c b/src/map/status.c
index 4c78c26ea..4d68e9527 100644
--- a/src/map/status.c
+++ b/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: