summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c7
-rw-r--r--src/map/skill.h10
-rw-r--r--src/map/status.c4
3 files changed, 14 insertions, 7 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index d5ac366ad..a55ba6339 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -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 )
diff --git a/src/map/skill.h b/src/map/skill.h
index ae970cb37..e2dbe2dee 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -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,
diff --git a/src/map/status.c b/src/map/status.c
index babd53bf7..df1706cb0 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -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 );