- Fixed incorrect range check in autospell2 triggers.

- Modified Wedding recall skills to behave as in officials.
- Modified Arrow Shower to be a ground-based skill and work as it should on officials.
- Fixed skill_additional_effect triggering every time you were being hit even if no damage was returned.
- Fixed battle_calc_damage_return to make magic damage be returned by 100%, and received damage nullified


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5598 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 12 insertions, 5 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 13b753067..2e6a480e3 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -25,6 +25,10 @@
 	-----

 

 =========================

+03/14

+	* Modified skill entries for the Wedding recall skills. Updated their

+	  splash value to signal the area around the caster where the warp will be

+	  placed. [Skotlex]

 03/13

 	* Changed the mode of the crystals to 193 (can move, can attack, plants)

 	  [Skotlex]

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 11fd60c73..f55b49613 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -653,9 +653,9 @@
 //-- WE_BABY

 408,3000,0,0,300000,0

 //-- WE_CALLPARENT

-409,20000,0,0,0,0

+409,0,0,0,20000,0

 //-- WE_CALLBABY

-410,20000,0,0,0,0

+410,0,0,0,20000,0

 //==========================================

 

 

diff --git a/db/skill_db.txt b/db/skill_db.txt
index fb0eebd3d..652f039a4 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -355,7 +355,7 @@
 333,0,6,4,0,1,0,1,0,no,0,2,0,none,0	//NPC_REVENGE

 334,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_MALE#I Will Protect You#

 335,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_FEMALE#I Look up to You#

-336,9,6,4,0,1,0,1,1,yes,0,4,1,none,0	//WE_CALLPARTNER#I miss You#

+336,9,6,4,0,1,3,1,1,yes,0,4,1,none,0	//WE_CALLPARTNER#I miss You#

 337,9,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//ITM_TOMAHAWK#Throw Tomahawk#

 338,-1,8,1,7,0,0,0,-2,no,0,2,0,weapon,0	//NPC_DARKCROSS#Cross of Darkness#

 339,0,6,4,7,0,0,10,1,no,33,258,0,magic,0		//NPC_GRANDDARKNESS#Grand cross of Darkness#

@@ -428,8 +428,8 @@
 406,0,6,4,-1,2,2,10,1,no,33,0,0,weapon,0	//ASC_METEORASSAULT#Meteor Assault#

 407,0,6,4,0,1,0,1,0,no,0,0,0,none,0	//ASC_CDP#Create Deadly Poison#

 408,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_BABY#Baby#

-409,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_CALLPARENT#Call Parent#

-410,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_CALLBABY#Call Baby#

+409,9,6,4,0,1,3,1,1,yes,0,4,1,none,0	//WE_CALLPARENT#Call Parent#

+410,9,6,4,0,1,3,1,1,yes,0,4,1,none,0	//WE_CALLBABY#Call Baby#

 411,0,6,4,0,1,0,10,1,yes,0,0,0,misc,0	//TK_RUN#Running#

 412,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0	//TK_READYSTORM#Prepare Whirlwind#

 413,0,6,4,-1,2,2,7,1,no,0,512,0,weapon,0	//TK_STORMKICK#Whirlwind Kick#

diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 45240d82a..c615b30be 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -26,6 +26,7 @@
  21,0x86,    ,  0, 2,1000,enemy, 0x008	//MG_THUNDERSTORM#サンダーストーム

  25,0x85,    ,  1, 0,  -1,all,   0x003	//AL_PNEUMA#ニューマ

  27,0x81,0x80,  0, 0,  -1,all,   0x006	//AL_WARP#ワープポータル

+ 47,0x86,    ,  0, 2,1000,enemy, 0x080	//AC_SHOWER

  70,0x83,    , -1, 1,1000,all,   0x008	//PR_SANCTUARY#サンクチュアリ

  79,0x84,    , -1, 1,3000,enemy, 0x008	//PR_MAGNUS#マグヌスエクソシズム

  80,0x87,0x88,  0, 1,2000,enemy, 0x002	//WZ_FIREPILLAR#ファイアーピラー

@@ -78,6 +79,8 @@
 369,0xb3,    , -1, 0,10000,all,  0x000	//PA_GOSPEL#ゴスペル

 404,0xb6,    , -1, 0,  -1,all,   0x000	//PF_FOGWALL#フォグウォール

 405,0xb7,    ,  0, 1,1000,enemy, 0x000	//PF_SPIDERWEB#スパイダーウェッブ

+409,0xb2,    ,  0,-1,  -1,noone, 0x000	//WE_CALLBABY

+410,0xb2,    ,  0,-1,  -1,noone, 0x000	//WE_CALLPARENT

 484,0xb8,    ,  2, 0,1000,enemy, 0x808	//HW_GRAVITATION

 488,0xb9,    ,  3, 0,  -1,all,   0x000	//CG_HERMODE

 535,0xba,    ,  2, 0,1000,enemy, 0x008	//NJ_KAENSIN#NJ_KAENSIN#