summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-02 19:46:54 +0000
committerMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-02 19:46:54 +0000
commit5e881e2ebee6c95ac68de1046d6e6c4cf87e3b0f (patch)
tree66f0202e6b434defd4f5925c02980749efbc079e
parent9a20d2e2a837f0ccd53161b5eadf7192a4ba099b (diff)
downloadhercules-5e881e2ebee6c95ac68de1046d6e6c4cf87e3b0f.tar.gz
hercules-5e881e2ebee6c95ac68de1046d6e6c4cf87e3b0f.tar.bz2
hercules-5e881e2ebee6c95ac68de1046d6e6c4cf87e3b0f.tar.xz
hercules-5e881e2ebee6c95ac68de1046d6e6c4cf87e3b0f.zip
Updated offensive use of Sanctuary to function like on the official servers.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6946 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--db/skill_db.txt2
-rw-r--r--src/map/battle.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index fc76db8b3..fe7d20a41 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/06/02
+ * Updated offensive use of Sanctuary to function like on the official servers [MasterOfMuppets]
* Changed the interval between waterballs from 150 to 250 milliseconds [MasterOfMuppets]
* Corrected clif_parse_takeitem to ALWAYS return a NAK packet when it
fails. Fixes cases where the client gets "stuck" and refuses to let you
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 57da4ee47..5ef3f3e90 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -89,7 +89,7 @@
67,9,6,16,0,1,0,3,1,yes,0,512,0,magic,0 //PR_SUFFRAGIUM#Suffragium#
68,9,6,16,6,1,0,5,1,yes,0,0,0,magic,0 //PR_ASPERSIO#Aspersio#
69,9,6,2,0,3,1,5,1,yes,0,64,0,magic,0 //PR_BENEDICTIO#B.S Sacramenti#
-70,9,6,2,6,1,0,10,1,yes,0,0,0,magic,2 //PR_SANCTUARY#Sanctuary#
+70,9,6,2,6,1,0,10,1,yes,0,0,0,magic,1 //PR_SANCTUARY#Sanctuary#
71,9,6,16,0,1,0,4,1,yes,0,0,0,magic,0 //PR_SLOWPOISON#Slow Poison#
72,9,6,16,0,1,0,1,1,yes,0,0,0,magic,0 //PR_STRECOVERY#Status Recovery#
73,9,6,16,0,1,0,10,1,yes,0,0,0,magic,0 //PR_KYRIE#Kyrie Eleison#
diff --git a/src/map/battle.c b/src/map/battle.c
index 147c06e59..a2cd7cbfa 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2079,6 +2079,7 @@ struct Damage battle_calc_magic_attack(
break;
case PR_SANCTUARY:
ad.blewcount|=0x10000;
+ ad.dmotion = 0; //No flinch animation.
case AL_HEAL:
case PR_BENEDICTIO:
case WZ_FIREPILLAR: