summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-17 10:35:40 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-17 10:35:40 +0000
commit078f38629dfd8642e15c7209c68d9bb91cbd4429 (patch)
tree245d25f4ae91c3910a65d4451674e384ac484a57
parent5140b06dfa8554077fb9a698d2bf9c280b0954a4 (diff)
downloadhercules-078f38629dfd8642e15c7209c68d9bb91cbd4429.tar.gz
hercules-078f38629dfd8642e15c7209c68d9bb91cbd4429.tar.bz2
hercules-078f38629dfd8642e15c7209c68d9bb91cbd4429.tar.xz
hercules-078f38629dfd8642e15c7209c68d9bb91cbd4429.zip
* Duration of SC_STONE is not reduced by MDEF.
* LexAeterna is allowed to be used on petrifying targets. * Mobs won't attack back if StoneCurse fails. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14064 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c5
3 files changed, 7 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0d895d777..726f9727f 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.
+09/09/17
+ * Duration of SC_STONE is not reduced by MDEF. [Inkfish]
+ * LexAeterna is allowed to be used on petrifying targets. [Inkfish]
+ * Mobs won't attack back if StoneCurse fails. [Inkfish]
09/09/13
* Progressbar aborts when player is attacked. [Inkfish]
* Do not stand if damage is from yourself or has no source.(bugreport:3582) [Inkfish]
diff --git a/src/map/skill.c b/src/map/skill.c
index f3d80ba0b..36a83ee14 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4241,8 +4241,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
}
if(status_isimmune(bl) || !tsc)
break;
- if (dstmd)
- mob_target(dstmd,src,skill_get_range2(src,skillid,skilllv));
if (tsc->data[SC_STONE]) {
status_change_end(bl,SC_STONE,-1);
diff --git a/src/map/status.c b/src/map/status.c
index 7479b726c..1d77afacd 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4627,7 +4627,8 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti
}
//When no tick def, reduction is the same for both.
- if (!tick_def) tick_def = sc_def;
+ if( !tick_def && type != SC_STONE ) //Recent tests show duration of petrify isn't reduced by MDEF. [Inkfish]
+ tick_def = sc_def;
//Natural resistance
if (!(flag&8)) {
@@ -4732,7 +4733,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
return 0;
break;
case SC_AETERNA:
- if (sc->data[SC_STONE] || sc->data[SC_FREEZE])
+ if( (sc->data[SC_STONE] && sc->opt1 == OPT1_STONE) || sc->data[SC_FREEZE] )
return 0;
break;
case SC_KYRIE: