diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 3 | ||||
| -rw-r--r-- | src/map/pc.c | 28 | ||||
| -rw-r--r-- | src/map/skill.c | 7 |
4 files changed, 23 insertions, 17 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 6d6c928d7..4e1f2692c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -911,6 +911,7 @@ static struct Damage battle_calc_weapon_attack( break; case TF_DOUBLE: //For NPC used skill. + case GS_CHAINACTION: wd.type = 0x08; break; @@ -918,6 +919,7 @@ static struct Damage battle_calc_weapon_attack( case KN_BOWLINGBASH: case MO_BALKYOUNG: case TK_TURNKICK: + case GS_GROUNDDRIFT: wd.blewcount=0; break; diff --git a/src/map/mob.c b/src/map/mob.c index 61789b7fc..fe0b323ee 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3006,10 +3006,11 @@ int mob_clone_spawn(struct map_session_data *sd, int m, int x, int y, const char switch (skill_id) { //Certain Special skills that are passive, and thus, never triggered. case MO_TRIPLEATTACK: case TF_DOUBLE: + case GS_CHAINACTION: ms[i].state = MSS_BERSERK; ms[i].target = MST_TARGET; ms[i].cond1 = MSC_ALWAYS; - ms[i].permillage = skill_id==TF_DOUBLE?(ms[i].skill_lv*500):(3000-ms[i].skill_lv*100); + ms[i].permillage = skill_id==MO_TRIPLEATTACK?(3000-ms[i].skill_lv*100):(ms[i].skill_lv*500); ms[i].delay -= 5000; //Remove the added delay as these could trigger on "all hits". break; default: //Untreated Skill diff --git a/src/map/pc.c b/src/map/pc.c index 210181527..5ad01d285 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3173,25 +3173,24 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, int lv) if(!sd || !bl || bl->type!=BL_MOB) return 0; + md = (TBL_MOB *)bl; + + if(md->state.steal_flag == UCHAR_MAX || md->sc.opt1) //already stolen from / status change check + return 0; + sd_status= status_get_status_data(&sd->bl); md_status= status_get_status_data(bl); - md = (TBL_MOB *)bl; - if(md->state.steal_flag == UCHAR_MAX || //already stolen from - md_status->mode&MD_BOSS || md->master_id || + if(md->master_id || md_status->mode&MD_BOSS || (md->class_>=1324 && md->class_<1364) || // prevent stealing from treasure boxes [Valaris] - map[md->bl.m].flag.nomobloot || // check noloot map flag [Lorky] - md->sc.opt1 //status change check - ) - return 0; - - if(battle_config.skill_steal_max_tries && - md->state.steal_flag++ >= battle_config.skill_steal_max_tries) - { //Reached limit of steal attempts. + map[bl->m].flag.nomobloot || // check noloot map flag [Lorky] + (battle_config.skill_steal_max_tries && //Reached limit of steal attempts. [Lupus] + md->state.steal_flag++ >= battle_config.skill_steal_max_tries) + ) { //Can't steal from md->state.steal_flag = UCHAR_MAX; return 0; } - + rate = battle_config.skill_steal_type ? (sd_status->dex - md_status->dex)/2 + lv*6 + 10 : (sd_status->dex - md_status->dex) + lv*3 + 10; @@ -3203,10 +3202,7 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, int lv) //preliminar statistical data hints at this behaviour: //each steal attempt: try to steal against ONE mob drop, and no more. - if (lv > 5) //Include last slot (card slot) - i = rand()%MAX_MOB_DROP; - else //Do not include card slot - i = rand()%(MAX_MOB_DROP-1); + i = rand()%(MAX_MOB_DROP-1); //You can't steal from the last slot. if(rand() % 10000 >= md->db->dropitem[i].p*rate/100) return 0; diff --git a/src/map/skill.c b/src/map/skill.c index 3c8a956e8..724c915ba 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2714,6 +2714,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int case HT_POWER: case TK_DOWNKICK: case TK_COUNTER: + case GS_CHAINACTION: case GS_TRIPLEACTION: case GS_MAGICALBULLET: case GS_TRACKING: @@ -7317,6 +7318,9 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns switch (sg->val1) { + case ELE_WIND: + sc_start(bl,SC_STUN,5,sg->skill_lv,skill_get_time2(sg->skill_id, sg->skill_lv)); + break; case ELE_WATER: sc_start(bl,SC_FREEZE,5,sg->skill_lv,skill_get_time2(sg->skill_id, sg->skill_lv)); break; @@ -7326,6 +7330,9 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns case ELE_DARK: sc_start(bl,SC_BLIND,5,sg->skill_lv,skill_get_time2(sg->skill_id, sg->skill_lv)); break; + case ELE_FIRE: + skill_blown(&src->bl,bl,skill_get_blewcount(sg->skill_id,sg->skill_lv)); + break; } sg->unit_id = UNT_USED_TRAPS; |