summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--db/skill_nocast_db.txt2
-rw-r--r--src/map/battle.c5
-rw-r--r--src/map/skill.c2
4 files changed, 11 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e8eaac248..ee8500375 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/09/12
+ * Baphomet splash damage will now hit nearby enemies regardless of flee
+ (but the initial attack still has to connect for the splash to trigger)
+ [Skotlex]
2006/09/11
* Modified set_nonblocking and setsocketoptions in socket.c, using eApp's
code as reference. Hopefully should improve performance somewhat. [Skotlex]
diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index 9efbe48fb..bceeb98e6 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -29,7 +29,7 @@
150,4 //TF_BACKSLIDING
361,4 //HP_ASSUMPTIO
362,4 //HP_BASILICA
-395,4 //CG_MOONLIT
+395,4 //CG_MOONLIT
491,4 //CR_CULTIVATION
//mixed
diff --git a/src/map/battle.c b/src/map/battle.c
index 7b90f2ff5..749a71aa6 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1056,6 +1056,11 @@ static struct Damage battle_calc_weapon_attack(
if (sc && sc->data[SC_SPIRIT].timer != -1 && sc->data[SC_SPIRIT].val2 == SL_CRUSADER)
flag.hit = 1;
break;
+ case 0:
+ //If flag, this is splash damage from Baphomet Card and it always hits.
+ if (wflag)
+ flag.hit = 1;
+ break;
}
if (tsc && !flag.hit && tsc->opt1 && tsc->opt1 != OPT1_STONEWAIT)
flag.hit = 1;
diff --git a/src/map/skill.c b/src/map/skill.c
index 78ef53fb5..3fa78d6f9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3160,7 +3160,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
if(sd) {
if (flag & 3){
if (bl->id != skill_area_temp[1])
- skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, SD_ANIMATION);
+ skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, SD_ANIMATION|flag);
} else {
skill_area_temp[1] = bl->id;
map_foreachinrange(skill_area_sub, bl,