summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-05 09:11:52 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-05 09:11:52 +0000
commitc0c50e46e6c9667b9f96a0a40bff85437e61f7ea (patch)
treed0f078493c804947c803f8f57d48eb3532b3fa80
parent91bc012f85c8dd1a6e40497f59fc9a576474a8cd (diff)
downloadhercules-c0c50e46e6c9667b9f96a0a40bff85437e61f7ea.tar.gz
hercules-c0c50e46e6c9667b9f96a0a40bff85437e61f7ea.tar.bz2
hercules-c0c50e46e6c9667b9f96a0a40bff85437e61f7ea.tar.xz
hercules-c0c50e46e6c9667b9f96a0a40bff85437e61f7ea.zip
* Attempt to fix Kyrie Eleison not castable on enemy players
- please test, I can't double client to test it in pvp - don't forget to recompile before testing git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10459 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--db/skill_db.txt2
-rw-r--r--src/map/status.c10
3 files changed, 12 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2e0cdbf63..e3c61666f 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.
+2007/05/06
+ * Attempt to fix Kyrie Eleison not castable on enemy players [Playtester]
+ - please test, I can't double client to test it in pvp
+ - don't forget to recompile before testing
2007/05/04
* Added an optional read-from-GRF/GAT map loading system back in.
- It can be turned on with the use_grf flag in map_athena.conf.
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 5b5e5d59d..5380c9c4e 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -111,7 +111,7 @@
70,9,6,2,6,0x21,0,10,1,yes,0,0,0,magic,1 //PR_SANCTUARY#Sanctuary#
71,9,6,16,0,0x1,0,4,1,yes,0,0,0,magic,0 //PR_SLOWPOISON#Slow Poison#
72,9,6,16,0,0x1,0,1,1,yes,0,0,0,magic,0 //PR_STRECOVERY#Status Recovery#
-73,9,6,16,0,0x1,0,10,1,yes,0,0x1000,0,magic,0 //PR_KYRIE#Kyrie Eleison#
+73,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0 //PR_KYRIE#Kyrie Eleison#
74,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0 //PR_MAGNIFICAT#Magnificat#
75,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0 //PR_GLORIA#Gloria#
76,5,6,1,0,0x1,0:0:0:0:0:0:0:0:0:0:-1,10,0,yes,0,0,0,magic,0 //PR_LEXDIVINA#Lex Divina#
diff --git a/src/map/status.c b/src/map/status.c
index 841b40867..c968fd58e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4594,10 +4594,14 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
//Only affects demons and undead.
if(status->race != RC_DEMON && !undead_flag)
return 0;
- break;
+ break;
case SC_AETERNA:
- if (sc->data[SC_STONE].timer != -1 || sc->data[SC_FREEZE].timer != -1)
- return 0;
+ if (sc->data[SC_STONE].timer != -1 || sc->data[SC_FREEZE].timer != -1)
+ return 0;
+ break;
+ case SC_KYRIE:
+ if (bl->type == BL_MOB)
+ return 0;
break;
case SC_OVERTHRUST:
if (sc->data[SC_MAXOVERTHRUST].timer != -1)