Added skill ALL_WEWISH. This skill in older clients plays a song, however in current clients it does not. The effect (AL_ANGELUS) still shows.

Added ALL_WEWISH to the skill databases, and enabled the Christmas Musicbox item.


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

8 files changed, 22 insertions, 8 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index fa5daf7e2..51e561c78 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,10 +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.
 
 2009/12/02
-	* Autobonus code cleanups. [Inkfish]
-	- introduced a global cache for autobonus scripts so that we don't have to allocate and deallocate scripts everytime invoking status_calc_bl.
-	- removed the 'script_parsed' flag to fix the issues with combo items.
-	- fixed such script commands as 'getrefine()' not working inside autobonus scripts.
+	* Rev. 14182 Added skill ALL_WEWISH. This skill in older clients plays a song, however in current clients it does not. The effect (AL_ANGELUS) still shows. [L0ne_W0lf]
 2009/11/26
 	* Moved log_sql_init() call up in map-server-init to after after map_sql_init() call to prevent unnecessary processing before a potential quit. [Paradox924X]
 	* NPC event code cleanups. [Inkfish]
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 98ea18f74..15a8974c3 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,8 @@
 	1475 Equestrian's Spear:	NEED INFO.
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
+2009/12/02
+	* Rev. 14182 Added ALL_WEWISH to the skill databases, and enabled the Christmas Musicbox item. [L0ne_W0lf]
 2009/11/24
 	* Rev. 14165 Changed Talkie Box to trap type, and removed the UF_NOREITERRATION flag. (Partial fix for Bugreport:3748) [L0ne_W0lf]
 2009/11/03
diff --git a/db/item_db.txt b/db/item_db.txt
index 68ed57357..08c142427 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1590,9 +1590,9 @@
 //2779,Dark_Knight_Belt
 //2780,Dark_Knight_Glove
 //2781,Aumdura's_Grace
-//2782,Ring_Of_Wise_King
+2782,Ring_Of_Wise_King,Ring Of Wise King,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
 //2783,Eyes_Stone_Ring
-//2784,Oh_Holy_Night
+2784,Oh_Holy_Night,Christmas Musicbox,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ skill "ALL_WEWISH",1; },{},{}
 //2785,Orleans_Glove_M
 //2786,Spiritual_Ring_M
 //2787,Waterdrop_Brooch
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index e3859cb58..3ca91e109 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -987,6 +987,8 @@
 690,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 //-- CASH_ASSUMPTIO
 691,0,0,0,20000:40000:60000:80000:100000,0
+//-- ALL_WEWISH
+698,0,20000,0,0,0
 //==========================================
 
 //===== 2nd Jobs Quest Skills ==============
diff --git a/db/skill_db.txt b/db/skill_db.txt
index a0241b22b..63bbbfa4c 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -636,7 +636,11 @@
 //692,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_CATCRY,Cat Cry
 //693,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_PARTYFLEE,Party Flee
 //694,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_ANGEL_PROTECT,Angel's Protection
-//695,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_SUMMERNIGHTDREAM,Summer Night Dream
+//695,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_DREAM_SUMMERNIGHT,Summer Night Dream
+//696,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		NPC_CHANGEUNDEAD2,Change Undead
+//697,9,6,4,0,0x1,0,1,1,yes,0,0x2,0,magic,0,	ALL_REVERSEORCISH,Reverse Orcish
+698,0,6,4,0,0x01,0,1,1,no,0,0,0,none,0,		ALL_WEWISH,Christmas Carol
+//699,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_SONKRAN,ALL_SONKRAN
 
 1001,9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,0,	KN_CHARGEATK,Charge Attack
 1002,0,6,4,0,0x1,0,1,0,no,0,0x1,0,weapon,2,	CR_SHRINK,Shrink
diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index 4d6c37dbe..bd76b9ed1 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -434,6 +434,8 @@
 543,0,0,20:30:40:50:60,-5,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_NEN
 544,0,0,55:60:65:70:75:80:85:90:95:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_ISSEN
 
+698,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//ALL_WEWISH#Christmas Carol
+
 1001,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KN_CHARGEATK#チャ?[ジアタック#
 1002,0,0,15,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CR_SHRINK#シュリンク#
 1004,0,0,15,0,0,0,99,2,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AS_VENOMKNIFE#ベナムナイフ#
diff --git a/src/map/skill.c b/src/map/skill.c
index e4fad5ff8..864aa3b7d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5696,6 +5696,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				skill_castend_nodamage_id);
 		}
 		break;
+	case ALL_WEWISH:
+		clif_skill_nodamage(src,bl,skillid,skilllv,1);
+		break;
 	default:
 		ShowWarning("skill_castend_nodamage_id: Unknown skill used:%d\n",skillid);
 		clif_skill_nodamage(src,bl,skillid,skilllv,1);
diff --git a/src/map/skill.h b/src/map/skill.h
index 02a9a760a..d8a0f5f64 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -986,8 +986,12 @@ enum e_skill {
 	ALL_CATCRY = 692,
 	ALL_PARTYFLEE,
 	ALL_ANGEL_PROTECT,
-	ALL_SUMMERNIGHTDREAM,
+	ALL_DREAM_SUMMERNIGHT,
+	NPC_CHANGEUNDEAD2,
+	ALL_REVERSEORCISH
 	*/
+	ALL_WEWISH = 698,
+	//ALL_SONKRAN = 699,
 	KN_CHARGEATK = 1001,
 	CR_SHRINK,
 	AS_SONICACCEL,