diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index d24be6450f..689cbdd0fe 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -1397,6 +1397,11 @@ 5055,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_CHATTERING,Chattering 5056,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFSEA,Spirit of Sea +// Wedding Skills 3 +5063,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_CALLALLFAMILY,Call All Family +5064,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_ONEFOREVER,One Forever +5065,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_CHEERUP,Cheer Up + //**** // Homunculus S 8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, HLIF_HEAL,Healing Touch diff --git a/db/re/item_db.txt b/db/re/item_db.txt index c3d76b96a4..d1db38def0 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -1837,8 +1837,8 @@ 2631,First_Age_Ring,Celebration Ring,4,1,,10,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAllStats,5; },{},{} 2632,Korean_Trinket,Korean Trinket,4,125000,,100,,1,,0,0xFFFFFFFE,63,2,136,,65,0,0,{ bonus bVit,1; bonus bDex,1; bonus bLuk,1; },{},{} 2633,Jade_Ring,Jade Ring,4,204000,,100,,0,,0,0xFFFFFFFE,63,2,136,,80,0,0,{ bonus bStr,2; bonus bInt,1; },{},{} -2634,Bridegroom_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,1,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; },{},{} -2635,Bride_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,0,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; },{},{} +2634,Bridegroom_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,1,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1; },{},{} +2635,Bride_Ring,Wedding Ring,4,0,,0,,0,,0,0xFFFFFFFF,63,0,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1; },{},{} 2636,Gold_Ring_,Gold Christmas Ring,4,30000,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bLuk,1; },{},{} 2637,Silver_Ring_,Silver Christmas Ring,4,20000,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bLuk,1; },{},{} 2638,Exorcize_Sachet,Sacred Incense,4,20000,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bStr,1; bonus bLuk,1; },{},{} diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 13ea252bbf..5dd34399b1 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1827,6 +1827,15 @@ 5055,0,1000,0,5000,10000,140000:120000:100000:80000:60000,0 //========================================== +//===== Wedding Skills 3 =================== +//-- WE_CALLALLFAMILY +5063,1500,0,0,0,0,0,1500 +//-- WE_ONEFOREVER +5064,1500,0,0,0,0,0,1500 +//-- WE_CHEERUP +5065,1500,0,0,60000,0,0,1500 +//========================================== + //===== Homunculus Skills ================== //-- HLIF_HEAL 8001,0,2000,0,0,0,0,-1 diff --git a/db/re/skill_castnodex_db.txt b/db/re/skill_castnodex_db.txt index 7c5af99627..893ade68dd 100644 --- a/db/re/skill_castnodex_db.txt +++ b/db/re/skill_castnodex_db.txt @@ -36,6 +36,10 @@ 512,3 //GS_TRACKING 1014,1 //PR_REDEMPTIO +5063,1 //WE_CALLALLFAMILY +5064,1 //WE_ONEFOREVER +5065,1 //WE_CHEERUP + 2012,7 //RK_CRUSHSTRIKE 2013,7 //RK_REFRESH 2014,7 //RK_GIANTGROWTH diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index ba4e7a4527..38cb4330c0 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -1400,6 +1400,11 @@ 5055,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, SU_CHATTERING,Chattering 5056,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, SU_SPIRITOFSEA,Spirit of Sea +// Wedding Skills 3 +5063,1,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0,0, WE_CALLALLFAMILY,Call All Family +5064,3,6,16,0,0x1,0,1,1,yes,0,0x4,0,none,0,0, WE_ONEFOREVER,One Forever +5065,1,6,4,0,0x3,3,1,1,yes,0,0x4,0,none,0,0, WE_CHEERUP,Cheer Up + //**** // Homunculus S 8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, HLIF_HEAL,Healing Touch diff --git a/db/re/skill_nocast_db.txt b/db/re/skill_nocast_db.txt index 7d92d66ab6..6d4213ef4e 100644 --- a/db/re/skill_nocast_db.txt +++ b/db/re/skill_nocast_db.txt @@ -56,6 +56,7 @@ 691,4 //CASH_ASSUMPTIO 2284,4 //SC_FATALMENACE 2300,4 //SC_DIMENSIONDOOR +5063,4 //WE_CALLALLFAMILY //---------------------------------------------------------------------------- // Battlegrounds @@ -93,6 +94,7 @@ 691,8 //CASH_ASSUMPITO 2284,8 //SC_FATALMENACE 2300,8 //SC_DIMENSIONDOOR +5063,8 //WE_CALLALLFAMILY //---------------------------------------------------------------------------- // Mixed @@ -133,6 +135,7 @@ // 2296,16 // SC_UNLUCKY // 2494,16 // GN_CHANGEMATERIAL // 2462,16 // SO_EL_ANALYSIS +5063,16 //WE_CALLALLFAMILY //---------------------------------------------------------------------------- // Zone 1 - Aldebaran Turbo Track @@ -218,3 +221,4 @@ 336,4096 // WE_CALLPARTNER 409,4096 // WE_CALLPARENT 410,4096 // WE_CALLBABY +5063,4096 //WE_CALLALLFAMILY diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt index 78012a66ac..eae8e538b7 100644 --- a/db/re/skill_require_db.txt +++ b/db/re/skill_require_db.txt @@ -1006,6 +1006,11 @@ 5053,0,0,100:90:80:70:60,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,0,0 //SU_MEOWMEOW 5055,0,0,50:45:40:35:30,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,0,0 //SU_CHATTERING +// Wedding Skills 3 +5063,0,0,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,0,0 //WE_CALLALLFAMILY +5064,0,0,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,0,0 //WE_ONEFOREVER +5065,0,0,50,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,0,0 //WE_CHEERUP + 8001,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,545,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL 8002,0,0,20:25:30:35: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,0,0 //HLIF_AVOID 8004,0,0,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,0,0 //HLIF_CHANGE diff --git a/db/re/skill_tree.txt b/db/re/skill_tree.txt index 48420769c1..a2e52c1994 100644 --- a/db/re/skill_tree.txt +++ b/db/re/skill_tree.txt @@ -597,6 +597,8 @@ 22,335,1,0,0,0,0,0,0,0,0,0,0 //WE_FEMALE#I Look up to You# 22,336,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARTNER#I miss You# 22,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# +22,5063,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLALLFAMILY#Call All Family# +22,5064,1,0,0,0,0,0,0,0,0,0,0 //WE_ONEFOREVER#One Forever# //SuperNovice 23,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 23,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1387,6 +1389,7 @@ 4023,143,1,0,0,0,0,0,0,0,0,0,0 //NV_TRICKDEAD#Act Dead# 4023,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# 4023,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4023,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Swordman 4024,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4024,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1402,6 +1405,7 @@ 4024,146,1,0,0,0,0,0,0,0,0,0,0 //SM_AUTOBERSERK#Auto Berserk# 4024,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# 4024,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4024,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Magician 4025,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4025,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1421,6 +1425,7 @@ 4025,157,1,0,0,0,0,0,0,0,0,0,0 //MG_ENERGYCOAT#Energy Coat# 4025,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# 4025,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4025,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Archer 4026,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4026,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1433,6 +1438,7 @@ 4026,148,1,0,0,0,0,0,0,0,0,0,0 //AC_CHARGEARROW#Arrow Repel# 4026,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# 4026,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4026,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Acolyte 4027,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4027,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1453,6 +1459,7 @@ 4027,156,1,0,0,0,0,0,0,0,0,0,0 //AL_HOLYLIGHT#Holy Light# 4027,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# 4027,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4027,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Merchant 4028,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4028,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1470,6 +1477,7 @@ 4028,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4028,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4028,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4028,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Thief 4029,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4029,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1485,6 +1493,7 @@ 4029,152,1,0,0,0,0,0,0,0,0,0,0 //TF_THROWSTONE#Stone Fling# 4029,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# 4029,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4029,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Knight 4030,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4030,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1512,6 +1521,7 @@ 4030,64,5,63,1,0,0,0,0,0,0,0,0 //KN_CAVALIERMASTERY#Cavalier Mastery# 4030,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack# 4030,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# +4030,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Priest 4031,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4031,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1551,6 +1561,7 @@ 4031,78,1,76,5,0,0,0,0,0,0,0,0 //PR_LEXAETERNA#Lex Aeterna# 4031,79,10,12,1,78,1,77,3,0,0,0,0 //PR_MAGNUS#Magnus Exorcismus# 4031,1014,1,0,0,0,0,0,0,0,0,0,0 //PR_REDEMPTIO#Redemptio# +4031,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Wizard 4032,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4032,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1584,6 +1595,7 @@ 4032,92,5,91,1,0,0,0,0,0,0,0,0 //WZ_QUAGMIRE#Quagmire# 4032,93,1,0,0,0,0,0,0,0,0,0,0 //WZ_ESTIMATION#Sense# 4032,1006,1,0,0,0,0,0,0,0,0,0,0 //WZ_SIGHTBLASTER#Sight Blaster# +4032,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Blacksmith 4033,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4033,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1625,6 +1637,7 @@ 4033,459,1,111,5,0,0,0,0,0,0,0,0 //BS_ADRENALINE2#Full Adrenaline Rush# 4033,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4033,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4033,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Hunter 4034,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4034,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1656,6 +1669,7 @@ 4034,131,5,124,1,127,1,0,0,0,0,0,0 //HT_SPRINGTRAP#Spring Trap# 4034,1009,1,0,0,0,0,0,0,0,0,0,0 //HT_PHANTASMIC#Phantasmic Arrow# 4034,499,1,46,10,0,0,0,0,0,0,0,0 //HT_POWER#Beast Strafing# +4034,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Assassin 4035,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4035,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1683,6 +1697,7 @@ 4035,141,10,139,5,140,5,0,0,0,0,0,0 //AS_SPLASHER#Venom Splasher# 4035,1003,1,0,0,0,0,0,0,0,0,0,0 //AS_SONICACCEL#Sonic Acceleration# 4035,1004,1,0,0,0,0,0,0,0,0,0,0 //AS_VENOMKNIFE#Throw Venom Knife# +4035,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Knight(Peco) 4036,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4036,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1710,6 +1725,7 @@ 4036,64,5,63,1,0,0,0,0,0,0,0,0 //KN_CAVALIERMASTERY#Cavalier Mastery# 4036,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack# 4036,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# +4036,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Crusader 4037,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4037,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1744,6 +1760,7 @@ 4037,257,5,251,1,0,0,0,0,0,0,0,0 //CR_DEFENDER#Defending Aura# 4037,258,10,55,10,0,0,0,0,0,0,0,0 //CR_SPEARQUICKEN#Spear Quicken# 4037,1002,1,0,0,0,0,0,0,0,0,0,0 //CR_SHRINK#Shrink# +4037,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Monk 4038,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4038,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1781,6 +1798,7 @@ 4038,273,5,272,3,0,0,0,0,0,0,0,0 //MO_COMBOFINISH#Raging Thrust# 4038,1015,1,0,0,0,0,0,0,0,0,0,0 //MO_KITRANSLATION#Ki Translation# 4038,1016,1,0,0,0,0,0,0,0,0,0,0 //MO_BALKYOUNG#Ki Explosion# +4038,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Sage 4039,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4039,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1825,6 +1843,7 @@ 4039,1017,1,0,0,0,0,0,0,0,0,0,0 //SA_ELEMENTGROUND#Elemental Change Earth# 4039,1018,1,0,0,0,0,0,0,0,0,0,0 //SA_ELEMENTFIRE#Elemental Change Fire# 4039,1019,1,0,0,0,0,0,0,0,0,0,0 //SA_ELEMENTWIND#Elemental Change Wind# +4039,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Rogue 4040,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4040,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1861,6 +1880,7 @@ 4040,224,5,223,1,0,0,0,0,0,0,0,0 //RG_COMPULSION#Haggle# 4040,225,10,219,5,0,0,0,0,0,0,0,0 //RG_PLAGIARISM#Intimidate# 4040,1005,1,0,0,0,0,0,0,0,0,0,0 //RG_CLOSECONFINE#Close Confine# +4040,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Alchemist 4041,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4041,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1898,6 +1918,7 @@ 4041,498,1,228,10,0,0,0,0,0,0,0,0 //AM_TWILIGHT3#Twilight Alchemy 3# 4041,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4041,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4041,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Bard 4042,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4042,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1929,6 +1950,7 @@ 4042,312,1,306,1,0,0,0,0,0,0,0,0 //BD_INTOABYSS#Power Chord# 4042,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm# 4042,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice# +4042,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Dancer 4043,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4043,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1960,6 +1982,7 @@ 4043,312,1,306,1,0,0,0,0,0,0,0,0 //BD_INTOABYSS#Power Chord# 4043,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm# 4043,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm# +4043,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Crusader(Peco) 4044,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4044,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -1994,6 +2017,7 @@ 4044,257,5,251,1,0,0,0,0,0,0,0,0 //CR_DEFENDER#Defending Aura# 4044,258,10,55,10,0,0,0,0,0,0,0,0 //CR_SPEARQUICKEN#Spear Quicken# 4044,1002,1,0,0,0,0,0,0,0,0,0,0 //CR_SHRINK#Shrink# +4044,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Super Baby 4045,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4045,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -2050,6 +2074,7 @@ 4045,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4045,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4045,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4045,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Taekwon 4046,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4046,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4417,6 +4442,7 @@ 4096,2020,5,57,2,0,0,0,0,0,0,0,0 //RK_PHANTOMTHRUST#Phantom Thrust# 4096,5004,10,2007,2,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH_WATER#Dragon Breath(Water)# 4096,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4096,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Warlock 4097,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4097,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4475,6 +4501,7 @@ 4097,2232,5,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell# 4097,5012,5,2202,5,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis# 4097,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4097,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Ranger 4098,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4098,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4530,6 +4557,7 @@ 4098,2254,5,2237,1,0,0,0,0,0,0,0,0 //RA_ICEBOUNDTRAP#Icebound Trap# 4098,5002,5,2234,5,0,0,0,0,0,0,0,0 //RA_UNLIMIT#Unlimit# 4098,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4098,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Arch Bishop 4099,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4099,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4590,6 +4618,7 @@ 4099,2515,5,2044,1,2053,1,0,0,0,0,0,0 //AB_SECRAMENT#Secrament# 4099,5011,5,2051,2,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium# 4099,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4099,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Mechanic 4100,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4100,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4662,6 +4691,7 @@ 4100,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# 4100,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4100,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4100,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Guillotine Cross 4101,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4101,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4708,6 +4738,7 @@ 4101,2037,5,2036,1,0,0,0,0,0,0,0,0 //GC_CROSSRIPPERSLASHER#Cross Ripper Slasher# 4101,5001,5,2023,5,0,0,0,0,0,0,0,0 //GC_DARKCROW#Dark Claw# 4101,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4101,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Royal Guard 4102,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4102,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4763,6 +4794,7 @@ 4102,2325,5,2315,3,2321,4,2322,5,0,0,0,0 //LG_INSPIRATION#Inspiration# 4102,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace# 4102,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4102,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Sorcerer 4103,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4103,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4835,6 +4867,7 @@ 4103,2468,3,2460,3,0,0,0,0,0,0,0,0 //SO_EARTH_INSIGNIA#Earth Insignia# 4103,5008,5,2456,3,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield# 4103,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4103,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Minstrel 4104,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4104,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4892,6 +4925,7 @@ 4104,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice# 4104,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG# 4104,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4104,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Wanderer 4105,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4105,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -4949,6 +4983,7 @@ 4105,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice# 4105,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG# 4105,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4105,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Sura 4106,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4106,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5010,6 +5045,7 @@ 4106,2518,5,267,3,0,0,0,0,0,0,0,0 //SR_RIDEINLIGHTNING#Ride In Lightening# 4106,5009,5,2326,3,2329,3,2330,1,2327,1,0,0 //SR_FLASHCOMBO#Flash Combo# 4106,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4106,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Genetic 4107,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4107,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5068,6 +5104,7 @@ 4107,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# 4107,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4107,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4107,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Shadow Chaser 4108,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4108,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5127,6 +5164,7 @@ 4108,2304,3,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb# 4108,5010,5,2288,2,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape# 4108,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4108,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Rune Knight (Dragon) 4109,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4109,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5167,6 +5205,7 @@ 4109,2020,5,57,2,0,0,0,0,0,0,0,0 //RK_PHANTOMTHRUST#Phantom Thrust# 4109,5004,10,2007,2,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH_WATER#Dragon Breath(Water)# 4109,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4109,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Royal Guard (Gryphon) 4110,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4110,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5222,6 +5261,7 @@ 4110,2325,5,2315,3,2321,4,2322,5,0,0,0,0 //LG_INSPIRATION#Inspiration# 4110,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace# 4110,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4110,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Ranger (Warg) 4111,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4111,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5277,6 +5317,7 @@ 4111,2254,5,2237,1,0,0,0,0,0,0,0,0 //RA_ICEBOUNDTRAP#Icebound Trap# 4111,5002,5,2234,5,0,0,0,0,0,0,0,0 //RA_UNLIMIT#Unlimit# 4111,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# +4111,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Mechanic (Mado) 4112,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4112,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5349,6 +5390,7 @@ 4112,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# 4112,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4112,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4112,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Super Novice (Expanded) 4190,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4190,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5518,6 +5560,7 @@ 4191,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher# 4191,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store# 4191,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate# +4191,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Kagerou 4211,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4211,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5704,8 +5747,7 @@ 4218,5054,1,100,0,5048,5,0,0,0,0,0,0,0,0 //SU_SPIRITOFLAND## 4218,5055,5,100,0,5025,1,0,0,0,0,0,0,0,0 //SU_CHATTERING## 4218,5056,1,100,0,5051,5,0,0,0,0,0,0,0,0 //SU_SPIRITOFSEA## -4218,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# - +4218,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# //Baby Summoner 4220,5018,1,0,0,0,0,0,0,0,0,0,0 //SU_BASIC_SKILL## 4220,5019,1,5018,1,0,0,0,0,0,0,0,0 //SU_BITE## @@ -5729,8 +5771,9 @@ 4220,5039,5,5038,3,0,0,0,0,0,0,0,0 //SU_TUNAPARTY## 4220,5040,5,5041,3,0,0,0,0,0,0,0,0 //SU_BUNCHOFSHRIMP## 4220,5041,5,5024,1,0,0,0,0,0,0,0,0 //SU_FRESHSHRIMP## -4220,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# - +4220,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4220,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4220,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Ninja 4222,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4222,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5757,8 +5800,9 @@ 4222,542,5,533,10,541,5,0,0,0,0,0,0 //NJ_KAMAITACHI#NJ_KAMAITACHI# 4222,543,5,533,5,0,0,0,0,0,0,0,0 //NJ_NEN#NJ_NEN# 4222,544,10,522,7,530,5,543,1,0,0,0,0 //NJ_ISSEN#NJ_ISSEN# -4222,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# - +4222,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4222,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4222,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Kagerou 4223,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4223,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5785,7 +5829,8 @@ 4223,542,5,533,10,541,5,0,0,0,0,0,0 //NJ_KAMAITACHI#NJ_KAMAITACHI# 4223,543,5,533,5,0,0,0,0,0,0,0,0 //NJ_NEN#NJ_NEN# 4223,544,10,522,7,530,5,543,1,0,0,0,0 //NJ_ISSEN#NJ_ISSEN# -4223,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# +4223,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4223,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4223,3001,1,530,5,0,0,0,0,0,0,0,0 //KO_YAMIKUMO## 4223,3002,5,0,0,0,0,0,0,0,0,0,0 //KO_RIGHT## 4223,3003,5,0,0,0,0,0,0,0,0,0,0 //KO_LEFT## @@ -5811,7 +5856,7 @@ 4223,3023,5,3012,1,0,0,0,0,0,0,0,0 //KG_KAGEHUMI## 4223,3024,5,3023,2,0,0,0,0,0,0,0,0 //KG_KYOMU## 4223,3025,5,3024,3,0,0,0,0,0,0,0,0 //KG_KAGEMUSYA## - +4223,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Oboro 4224,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4224,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5838,7 +5883,8 @@ 4224,542,5,533,10,541,5,0,0,0,0,0,0 //NJ_KAMAITACHI#NJ_KAMAITACHI# 4224,543,5,533,5,0,0,0,0,0,0,0,0 //NJ_NEN#NJ_NEN# 4224,544,10,522,7,530,5,543,1,0,0,0,0 //NJ_ISSEN#NJ_ISSEN# -4224,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# +4224,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4224,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4224,3001,1,530,5,0,0,0,0,0,0,0,0 //KO_YAMIKUMO## 4224,3002,5,0,0,0,0,0,0,0,0,0,0 //KO_RIGHT## 4224,3003,5,0,0,0,0,0,0,0,0,0,0 //KO_LEFT## @@ -5864,7 +5910,7 @@ 4224,3026,5,3021,1,0,0,0,0,0,0,0,0 //OB_ZANGETSU## 4224,3027,5,3029,3,0,0,0,0,0,0,0,0 //OB_OBOROGENSOU## 4224,3029,5,3026,2,0,0,0,0,0,0,0,0 //OB_AKAITSUKI## - +4224,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Taekwon 4225,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4225,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5885,8 +5931,9 @@ 4225,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind# 4225,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump# 4225,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission# -4225,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# - +4225,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4225,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4225,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Star Gladiator 4226,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4226,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5907,6 +5954,8 @@ 4226,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind# 4226,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump# 4226,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission# +4226,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4226,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4226,427,3,0,0,0,0,0,0,0,0,0,0 //SG_FEEL#Feeling the Sun, Moon and Stars# 4226,428,3,427,1,0,0,0,0,0,0,0,0 //SG_SUN_WARM#Warmth of the Sun# 4226,429,3,427,2,0,0,0,0,0,0,0,0 //SG_MOON_WARM#Warmth of the Moon# @@ -5925,8 +5974,7 @@ 4226,442,3,0,0,0,0,0,0,0,0,0,0 //SG_FRIEND#Friend of the Sun, Moon and Stars# 4226,443,10,0,0,0,0,0,0,0,0,0,0 //SG_KNOWLEDGE#Knowledge of the Sun, Moon and Stars# 4226,444,1,443,9,0,0,0,0,0,0,0,0 //SG_FUSION#Union of the Sun, Moon and Stars# -4226,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# - +4226,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Soul Linker 4227,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4227,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -5947,6 +5995,8 @@ 4227,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind# 4227,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump# 4227,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission# +4227,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4227,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4227,445,5,0,0,0,0,0,0,0,0,0,0 //SL_ALCHEMIST#Spirit of the Alchemist# 4227,447,5,0,0,0,0,0,0,0,0,0,0 //SL_MONK#Spirit of the Monk# 4227,448,5,0,0,0,0,0,0,0,0,0,0 //SL_STAR#Spirit of the Star Knight# @@ -5974,8 +6024,7 @@ 4227,471,3,452,1,0,0,0,0,0,0,0,0 //SL_SKE#Esk# 4227,472,3,447,1,0,0,0,0,0,0,0,0 //SL_SKA#Eska# 4227,494,5,451,1,0,0,0,0,0,0,0,0 //SL_HIGH#Spirit of Rebirth# -4227,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# - +4227,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Gunslinger 4228,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4228,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -6001,8 +6050,9 @@ 4228,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster# 4228,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack# 4228,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift# -4228,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# - +4228,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4228,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# +4228,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Rebellion 4229,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4229,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -6028,7 +6078,8 @@ 4229,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster# 4229,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack# 4229,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift# -4229,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# +4229,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4229,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4229,2552,1,500,5,0,0,0,0,0,0,0,0 //RL_RICHS_COIN#Rich's Coin# 4229,2553,5,514,1,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL#Mass Spiral# 4229,2554,5,2557,1,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER#Banishing Buster# @@ -6049,7 +6100,7 @@ 4229,2569,5,2553,1,0,0,0,0,0,0,0,0 //RL_AM_BLAST#Anti-Material Blast# 4229,2570,5,2554,3,0,0,0,0,0,0,0,0 //RL_SLUGSHOT#Slug Shot# 4229,2571,5,2569,3,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God# - +4229,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# //Baby Star Gladiator (Union) 4238,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 4238,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -6070,6 +6121,8 @@ 4238,425,7,422,5,423,5,424,5,0,0,0,0 //TK_SEVENWIND#Warm Wind# 4238,426,5,0,0,0,0,0,0,0,0,0,0 //TK_HIGHJUMP#High Jump# 4238,493,1,424,5,0,0,0,0,0,0,0,0 //TK_MISSION#Taekwon Mission# +4238,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby# +4238,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent# 4238,427,3,0,0,0,0,0,0,0,0,0,0 //SG_FEEL#Feeling the Sun, Moon and Stars# 4238,428,3,427,1,0,0,0,0,0,0,0,0 //SG_SUN_WARM#Warmth of the Sun# 4238,429,3,427,2,0,0,0,0,0,0,0,0 //SG_MOON_WARM#Warmth of the Moon# @@ -6088,4 +6141,4 @@ 4238,442,3,0,0,0,0,0,0,0,0,0,0 //SG_FRIEND#Friend of the Sun, Moon and Stars# 4238,443,10,0,0,0,0,0,0,0,0,0,0 //SG_KNOWLEDGE#Knowledge of the Sun, Moon and Stars# 4238,444,1,443,9,0,0,0,0,0,0,0,0 //SG_FUSION#Union of the Sun, Moon and Stars# -4238,681,1,0,0,0,0,0,0,0,0,0,0 //ALL_INCCARRY#Enlarge Weight Limit R# \ No newline at end of file +4238,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# diff --git a/sql-files/upgrades/upgrade_20171019.sql b/sql-files/upgrades/upgrade_20171019.sql new file mode 100644 index 0000000000..d9edd3a66d --- /dev/null +++ b/sql-files/upgrades/upgrade_20171019.sql @@ -0,0 +1,2 @@ +INSERT INTO `skill` (`char_id`, `id`, `lv`, `flag`) + SELECT `char_id`, 5065, 1, 0 FROM `char` WHERE `father` > 0 OR `mother` > 0; diff --git a/src/map/pc.c b/src/map/pc.c index 7f81a38790..6d61218c2d 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -985,6 +985,7 @@ bool pc_adoption(struct map_session_data *p1_sd, struct map_session_data *p2_sd, // Baby Skills pc_skill(b_sd, WE_BABY, 1, ADDSKILL_PERMANENT); pc_skill(b_sd, WE_CALLPARENT, 1, ADDSKILL_PERMANENT); + pc_skill(b_sd, WE_CHEERUP, 1, ADDSKILL_PERMANENT); // Parents Skills pc_skill(p1_sd, WE_CALLBABY, 1, ADDSKILL_PERMANENT); diff --git a/src/map/pc.h b/src/map/pc.h index c8be945922..acd08f6672 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -41,8 +41,8 @@ extern "C" { #define ROULETTE_GOLD_VAR "RouletteGold" //Update this max as necessary. 55 is the value needed for Super Baby currently -//Raised to 84 since Expanded Super Novice needs it. -#define MAX_SKILL_TREE 84 +//Raised to 85 since Expanded Super Baby needs it. +#define MAX_SKILL_TREE 85 //Total number of classes (for data storage) #define CLASS_COUNT (JOB_MAX - JOB_NOVICE_HIGH + JOB_MAX_BASIC) diff --git a/src/map/script_constants.h b/src/map/script_constants.h index b8e1cdad51..ae649aa499 100644 --- a/src/map/script_constants.h +++ b/src/map/script_constants.h @@ -1480,6 +1480,7 @@ export_constant(SC_DORAM_FLEE2); export_constant(SC_DORAM_SVSP); export_constant(SC_FALLEN_ANGEL); + export_constant(SC_CHEERUP); #ifdef RENEWAL export_constant(SC_EXTREMITYFIST2); #endif @@ -2530,6 +2531,7 @@ export_constant(SI_GLOOM_CARD); export_constant(SI_PHARAOH_CARD); export_constant(SI_KIEL_CARD); + export_constant(SI_CHEERUP); export_constant(SI_S_MANAPOTION); export_constant(SI_M_DEFSCROLL); diff --git a/src/map/skill.cpp b/src/map/skill.cpp index de39bc75d5..8b620ec342 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -691,6 +691,7 @@ bool skill_isNotOk(uint16 skill_id, struct map_session_data *sd) case SC_FATALMENACE: case SC_DIMENSIONDOOR: case ALL_ODINS_RECALL: + case WE_CALLALLFAMILY: if(map[m].flag.noteleport) { clif_skill_teleportmessage(sd,0); return true; @@ -6071,6 +6072,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case PR_REDEMPTIO: case ALL_RESURRECTION: case WM_DEADHILLHERE: + case WE_ONEFOREVER: break; default: return 1; @@ -8327,6 +8329,75 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui } break; + case WE_CALLALLFAMILY: + if (sd) { + struct map_session_data *p_sd = pc_get_partner(sd); + struct map_session_data *c_sd = pc_get_child(sd); + + if (!p_sd && !c_sd) { // Fail if no family members are found + clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); + map_freeblock_unlock(); + return 1; + } + + // Partner must be on the same map and in same party + if (p_sd && !status_isdead(&p_sd->bl) && p_sd->bl.m == sd->bl.m && p_sd->status.party_id == sd->status.party_id) + pc_setpos(p_sd, map_id2index(sd->bl.m), sd->bl.x, sd->bl.y, CLR_TELEPORT); + // Child must be on the same map and in same party as the parent casting + if (c_sd && !status_isdead(&c_sd->bl) && c_sd->bl.m == sd->bl.m && c_sd->status.party_id == sd->status.party_id) + pc_setpos(c_sd, map_id2index(sd->bl.m), sd->bl.x, sd->bl.y, CLR_TELEPORT); + } + break; + + case WE_ONEFOREVER: + if (sd) { + struct map_session_data *p_sd = pc_get_partner(sd); + struct map_session_data *c_sd = pc_get_child(sd); + + if (!p_sd && !c_sd && !dstsd) { // Fail if no family members are found + clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); + map_freeblock_unlock(); + return 1; + } + if ((map_flag_gvg2(bl->m) || map[bl->m].flag.battleground)) { // No reviving in WoE grounds! + clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); + break; + } + if (status_isdead(bl)) { + int per = 30, sper = 0; + + if (battle_check_undead(tstatus->race, tstatus->def_ele)) + break; + if (tsc && tsc->data[SC_HELLPOWER]) + break; + if (map[bl->m].flag.pvp && dstsd->pvp_point < 0) + break; + if (dstsd->special_state.restart_full_recover) + per = sper = 100; + if ((dstsd == p_sd || dstsd == c_sd) && status_revive(bl, per, sper)) // Only family members can be revived + clif_skill_nodamage(src, bl, skill_id, skill_lv, 1); + } + } + break; + + case WE_CHEERUP: + if (sd) { + struct map_session_data *f_sd = pc_get_father(sd); + struct map_session_data *m_sd = pc_get_mother(sd); + + if (!f_sd && !m_sd && !dstsd) { // Fail if no family members are found + clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); + map_freeblock_unlock(); + return 1; + } + if (flag&1) { // Buff can only be given to parents in 7x7 AoE around baby + if (dstsd == f_sd || dstsd == m_sd) + clif_skill_nodamage(src, bl, skill_id, skill_lv, sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv))); + } else + map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_PC, src, skill_id, skill_lv, tick, flag|BCT_ALL|1, skill_castend_nodamage_id); + } + break; + case PF_HPCONVERSION: { int hp, sp; diff --git a/src/map/skill.h b/src/map/skill.h index bda10c52c8..747ec3c442 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -1805,6 +1805,10 @@ enum e_skill { SU_CHATTERING, SU_SPIRITOFSEA, + WE_CALLALLFAMILY = 5063, + WE_ONEFOREVER, + WE_CHEERUP, + HLIF_HEAL = 8001, HLIF_AVOID, HLIF_BRAIN, diff --git a/src/map/status.c b/src/map/status.c index d71488554c..45c3aa52b6 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -884,6 +884,8 @@ void initChangeTables(void) add_sc( SU_MEOWMEOW , SC_CHATTERING ); set_sc( SU_CHATTERING , SC_CHATTERING , SI_CHATTERING , SCB_WATK|SCB_MATK ); + set_sc( WE_CHEERUP , SC_CHEERUP , SI_CHEERUP , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); + /* Storing the target job rather than simply SC_SPIRIT simplifies code later on */ SkillStatusChangeTable[skill_get_index(SL_ALCHEMIST)] = (sc_type)MAPID_ALCHEMIST, SkillStatusChangeTable[skill_get_index(SL_MONK)] = (sc_type)MAPID_MONK, @@ -5415,6 +5417,8 @@ static unsigned short status_calc_str(struct block_list *bl, struct status_chang str += 1; if(sc->data[SC_FULL_THROTTLE]) str += str * sc->data[SC_FULL_THROTTLE]->val3 / 100; + if(sc->data[SC_CHEERUP]); + str += 3; return (unsigned short)cap_value(str,0,USHRT_MAX); } @@ -5487,6 +5491,8 @@ static unsigned short status_calc_agi(struct block_list *bl, struct status_chang agi += agi * sc->data[SC_FULL_THROTTLE]->val3 / 100; if (sc->data[SC_ARCLOUSEDASH]) agi += sc->data[SC_ARCLOUSEDASH]->val2; + if(sc->data[SC_CHEERUP]); + agi += 3; return (unsigned short)cap_value(agi,0,USHRT_MAX); } @@ -5551,6 +5557,8 @@ static unsigned short status_calc_vit(struct block_list *bl, struct status_chang if(sc->data[SC_DEFENCE]) vit += sc->data[SC_DEFENCE]->val2; #endif + if(sc->data[SC_CHEERUP]); + vit += 3; return (unsigned short)cap_value(vit,0,USHRT_MAX); } @@ -5621,6 +5629,8 @@ static unsigned short status_calc_int(struct block_list *bl, struct status_chang int_ += 1; if(sc->data[SC_FULL_THROTTLE]) int_ += int_ * sc->data[SC_FULL_THROTTLE]->val3 / 100; + if(sc->data[SC_CHEERUP]); + int_ += 3; if(bl->type != BL_PC) { if(sc->data[SC_STRIPHELM]) @@ -5702,6 +5712,8 @@ static unsigned short status_calc_dex(struct block_list *bl, struct status_chang dex -= dex * sc->data[SC_MARSHOFABYSS]->val2 / 100; if(sc->data[SC_FULL_THROTTLE]) dex += dex * sc->data[SC_FULL_THROTTLE]->val3 / 100; + if(sc->data[SC_CHEERUP]); + dex += 3; return (unsigned short)cap_value(dex,0,USHRT_MAX); } @@ -5764,6 +5776,8 @@ static unsigned short status_calc_luk(struct block_list *bl, struct status_chang luk += 1; if(sc->data[SC_FULL_THROTTLE]) luk += luk * sc->data[SC_FULL_THROTTLE]->val3 / 100; + if(sc->data[SC_CHEERUP]); + luk += 3; return (unsigned short)cap_value(luk,0,USHRT_MAX); } diff --git a/src/map/status.h b/src/map/status.h index 890311a5bf..f94c83eb23 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -839,6 +839,8 @@ typedef enum sc_type { SC_FALLEN_ANGEL, + SC_CHEERUP, + #ifdef RENEWAL SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled #endif @@ -1803,6 +1805,8 @@ enum si_type { SI_PHARAOH_CARD = 989, SI_KIEL_CARD = 990, + SI_CHEERUP = 992, + SI_S_MANAPOTION = 995, SI_M_DEFSCROLL = 996,