Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Implemented the Party Buff cash skills.

Browse Source 
* Misc updates, and updates for party buff items.
- Added CASH_BLESSING, CASH_INCAGI and CASH_ASSUMPTIO skills.
- Added itemskill commands for the party buff scrolls.
- Corrected Equipment repair book's itemtype to 11.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13840 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2009-06-03 03:28:20 +00:00
parent e06e7945aa
commit c778107ca8
9 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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.
09/06/02
* Rev. 13840 Implemented the Party Buff cash skills. [L0ne_W0lf]
* Fixed Mystical Amplification having unlimited duration [Playtester]
* Fixed skills used through items and Hocus-pocus consume requirements if you have them. (bugreport:3164) [Inkfish]
09/06/01

5
db/Changelog.txt
View File

@ -37,6 +37,11 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
2009/06/02
* Rev. 13840 Misc updates, and updates for party buff items. [L0ne_W0lf]
- Added CASH_BLESSING, CASH_INCAGI and CASH_ASSUMPTIO skills.
- Added itemskill commands for the party buff scrolls.
- Corrected Equipment repair book's itemtype to 11.
2009/05/29
* Rev. 13825 Removed an extra comma from chocolate_pie. [L0ne_W0lf]
* Rev. 13824 Various item database updates of my own :D [L0ne_W0lf]

8
db/item_db.txt
View File

@ -4973,10 +4973,10 @@
14584,Red_Butterfly_Wing,Red Butterfly Wing,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashCity",3; },{},{}
14585,Blue_Butterfly_Wing,Blue Butterfly Wing,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashCity",4; },{},{}
14586,Jumping_Candy,Jumping candy,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14587,Equipment_Repair_Book,Equipment Repair Book,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "BS_REPAIRWEAPON",1; },{},{}
14588,Party_Blessing_Scroll,Party Blessing Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14589,Party_Increase_Agility_Scroll,Party Increase AGI Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14590,Party_Assumptio_Scroll,Party Assumtio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14587,Equipment_Repair_Book,Equipment Repair Book,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "BS_REPAIRWEAPON",1; },{},{}
14588,Party_Blessing_Scroll,Party Blessing Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "CASH_BLESSING",10; },{},{}
14589,Party_Increase_Agility_Scroll,Party Increase AGI Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "CASH_INCAGI",10; },{},{}
14590,Party_Assumptio_Scroll,Party Assumtio Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "CASH_ASSUMPTIO",10; },{},{}
14591,Seige_Tele_Scroll,Seige Teleport Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashSeigeTele"; },{},{}
// Should increase job EXP only.
14592,JOB_Battle_Manual,JOB Battle Manual,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{}

11
db/skill_cast_db.txt
View File

@ -968,6 +968,15 @@
678,0,0,0,0,5000
//==========================================
//===== Item Use-Only Skills ===============
//-- CASH_BLESSING
689,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
//-- CASH_INCAGI
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
//==========================================
//===== 2nd Jobs Quest Skills ==============
//-- KN_CHARGEATK
1001,300,300,0,0,0
@ -1020,7 +1029,7 @@
//-- HAMI_BLOODLUST
8008,0,0,0,60000:180000:300000,300000:600000:900000
//-- HFLI_MOON
8009,0,0,1000,0,0
8009,0,0,1000,0,0
//-- HFLI_FLEET
8010,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000
//-- HFLI_SPEED

6
db/skill_db.txt
View File

@ -630,9 +630,9 @@
// Additional Skill (??)
//688,0,0,0,0,0,0,9,0,no,0,0,0,none,0, GM_SANDMAN,GM Sandman
//689,0,0,0,0,0,0,9,0,no,0,0,0,none,0, CASH_BLESSING,Blessing
//690,0,0,0,0,0,0,9,0,no,0,0,0,none,0, CASH_INCAGI,Increase Agi
//691,0,0,0,0,0,0,9,0,no,0,0,0,none,0, CASH_ASSUMPTIO,Assumpito
689,0,6,4,0,0x3,-1,10,1,yes,0,0,0,magic,0, CASH_BLESSING,Party Blessing
690,0,6,4,0,0x3,-1,10,1,yes,0,0,0,magic,0, CASH_INCAGI,Party Increase AGI
691,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0, CASH_ASSUMPTIO,Party Assumptio
//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

2
db/skill_nocast_db.txt
View File

@ -30,6 +30,7 @@
362,4 //HP_BASILICA
395,4 //CG_MOONLIT
491,4 //CR_CULTIVATION
691,4; //CASH_ASSUMPITO
//BATTLEGROUND
26,8 //AL_TELEPORT
@ -56,6 +57,7 @@
438,8 //SG_SUN_BLESS
439,8 //SG_MOON_BLESS
440,8 //SG_STAR_BLESS
691,8; //CASH_ASSUMPITO
//mixed
488,3 //CG_HERMODE

7
src/map/skill.c
View File

@ -342,7 +342,7 @@ int can_copy (struct map_session_data *sd, int skillid, struct block_list* bl)
}
//Added so plagarize can't copy agi/bless if you're undead since it damages you
if ((skillid == AL_INCAGI || skillid == AL_BLESSING))
if ((skillid == AL_INCAGI || skillid == AL_BLESSING || skillid == CASH_BLESSING || skillid == CASH_INCAGI))
return 0;
return 1;
@ -1673,7 +1673,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
damage = dmg.damage + dmg.damage2;
if( (skillid == AL_INCAGI || skillid == AL_BLESSING) && tsd->sc.data[SC_CHANGEUNDEAD] )
if( (skillid == AL_INCAGI || skillid == AL_BLESSING || skillid == CASH_BLESSING || skillid == CASH_INCAGI) && tsd->sc.data[SC_CHANGEUNDEAD] )
damage = 1;
if( damage > 0 && dmg.flag&BF_WEAPON && src != bl && ( src == dsrc || ( dsrc->type == BL_SKILL && ( skillid == SG_SUN_WARM || skillid == SG_MOON_WARM || skillid == SG_STAR_WARM ) ) )
@ -4013,6 +4013,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case PR_MAGNIFICAT:
case PR_GLORIA:
case SN_WINDWALK:
case CASH_BLESSING:
case CASH_INCAGI:
case CASH_ASSUMPTIO:
if( sd == NULL || sd->status.party_id == 0 || (flag & 1) )
clif_skill_nodamage(bl, bl, skillid, skilllv, sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
else if( sd )

10
src/map/skill.h
View File

@ -978,14 +978,14 @@ enum e_skill {
NPC_HELLPOWER,
NPC_WIDEHELLDIGNITY,
NPC_INVINCIBLE,
NPC_INVINCIBLEOFF, */
NPC_INVINCIBLEOFF,
*/
NPC_ALLHEAL = 687,
/*
GM_SANDMAN = 688,
CASH_BLESSING,
//GM_SANDMAN = 688,
CASH_BLESSING = 689,
CASH_INCAGI,
CASH_ASSUMPTIO,
/*
ALL_CATCRY = 692,
ALL_PARTYFLEE,
ALL_ANGEL_PROTECT,

4
src/map/status.c
View File

@ -385,6 +385,10 @@ void initChangeTables(void)
add_sc( NPC_WIDECURSE , SC_CURSE );
add_sc( NPC_WIDESTUN , SC_STUN );
set_sc( CASH_BLESSING , SC_BLESSING , SI_BLESSING , SCB_STR|SCB_INT|SCB_DEX );
set_sc( CASH_INCAGI , SC_INCREASEAGI , SI_INCREASEAGI , SCB_AGI|SCB_SPEED );
set_sc( CASH_ASSUMPTIO , SC_ASSUMPTIO , SI_ASSUMPTIO , SCB_NONE );
set_sc( CR_SHRINK , SC_SHRINK , SI_SHRINK , SCB_NONE );
set_sc( RG_CLOSECONFINE , SC_CLOSECONFINE2 , SI_CLOSECONFINE2 , SCB_NONE );
set_sc( RG_CLOSECONFINE , SC_CLOSECONFINE , SI_CLOSECONFINE , SCB_FLEE );