diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 5 | ||||
| -rw-r--r-- | src/map/battle.h | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 64 | ||||
| -rw-r--r-- | src/map/skill.c | 5 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
5 files changed, 51 insertions, 27 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 808f8dbb7..354dc0d88 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3822,6 +3822,8 @@ static const struct battle_data_short { { "skip_teleport_lv1_menu", &battle_config.skip_teleport_lv1_menu}, // [LuzZza]
{ "allow_skill_without_day", &battle_config.allow_skill_without_day}, // [Komurka]
+ { "skill_caster_check", &battle_config.skill_caster_check },
+ { "status_cast_cancel", &battle_config.sc_castcancel },
};
static const struct battle_data_int {
@@ -4207,6 +4209,9 @@ void battle_set_defaults() { battle_config.skip_teleport_lv1_menu = 0;
battle_config.allow_skill_without_day = 0;
+
+ battle_config.skill_caster_check = 1;
+ battle_config.sc_castcancel = 0;
}
void battle_validate_conf() {
diff --git a/src/map/battle.h b/src/map/battle.h index e59cd9bd2..353ba7bc1 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -416,6 +416,8 @@ extern struct Battle_Config { unsigned short allow_skill_without_day; // [Komurka]
unsigned short skill_wall_check; // [Skotlex]
unsigned short cell_stack_limit; // [Skotlex]
+ unsigned short skill_caster_check; // [Skotlex]
+ unsigned short sc_castcancel; // [Skotlex]
} battle_config;
void do_init_battle(void);
diff --git a/src/map/pc.c b/src/map/pc.c index e3c843055..09ed0d7f7 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5489,33 +5489,47 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) && !map[sd->bl.m].flag.nopenalty && !map_flag_gvg(sd->bl.m)
&& !(sd->sc.count && sd->sc.data[SC_BABY].timer!=-1))
{
- if(battle_config.death_penalty_type==1 && battle_config.death_penalty_base > 0)
- sd->status.base_exp -= (int) ((double)pc_nextbaseexp(sd) * (double)battle_config.death_penalty_base/10000);
- if(battle_config.pk_mode && src && src->type==BL_PC)
- sd->status.base_exp -= (int) ((double)pc_nextbaseexp(sd) * (double)battle_config.death_penalty_base/10000);
- else if(battle_config.death_penalty_type==2 && battle_config.death_penalty_base > 0) {
- if(pc_nextbaseexp(sd) > 0)
- sd->status.base_exp -= (int) ((double)sd->status.base_exp * (double)battle_config.death_penalty_base/10000);
- if(battle_config.pk_mode && src && src->type==BL_PC)
- sd->status.base_exp -= (int) ((double)sd->status.base_exp * (double)battle_config.death_penalty_base/10000);
+ unsigned int base_penalty =0;
+ if (battle_config.death_penalty_base > 0) {
+ switch (battle_config.death_penalty_type) {
+ case 1:
+ base_penalty += (unsigned int) ((double)pc_nextbaseexp(sd) * (double)battle_config.death_penalty_base/10000);
+ break;
+ case 2:
+ base_penalty = (unsigned int) ((double)sd->status.base_exp * (double)battle_config.death_penalty_base/10000);
+ break;
}
- if(sd->status.base_exp < 0)
- sd->status.base_exp = 0;
- clif_updatestatus(sd,SP_BASEEXP);
-
- if(battle_config.death_penalty_type==1 && battle_config.death_penalty_job > 0)
- sd->status.job_exp -= (int) ((double)pc_nextjobexp(sd) * (double)battle_config.death_penalty_job/10000);
- if(battle_config.pk_mode && src && src->type==BL_PC)
- sd->status.job_exp -= (int) ((double)pc_nextjobexp(sd) * (double)battle_config.death_penalty_job/10000);
- else if(battle_config.death_penalty_type==2 && battle_config.death_penalty_job > 0) {
- if(pc_nextjobexp(sd) > 0)
- sd->status.job_exp -= (int) ((double)sd->status.job_exp * (double)battle_config.death_penalty_job/10000);
- if(battle_config.pk_mode && src && src->type==BL_PC)
- sd->status.job_exp -= (int) ((double)sd->status.job_exp * (double)battle_config.death_penalty_job/10000);
+ if(base_penalty) {
+ if (battle_config.pk_mode && src && src->type==BL_PC)
+ base_penalty*=2;
+ if(sd->status.base_exp < base_penalty)
+ sd->status.base_exp = 0;
+ else
+ sd->status.base_exp -= base_penalty;
+ clif_updatestatus(sd,SP_BASEEXP);
}
- if(sd->status.job_exp < 0)
- sd->status.job_exp = 0;
- clif_updatestatus(sd,SP_JOBEXP);
+ }
+ if(battle_config.death_penalty_job > 0)
+ {
+ base_penalty = 0;
+ switch (battle_config.death_penalty_type) {
+ case 1:
+ base_penalty = (unsigned int) ((double)pc_nextjobexp(sd) * (double)battle_config.death_penalty_job/10000);
+ break;
+ case 2:
+ base_penalty = (unsigned int) ((double)sd->status.job_exp * (double)battle_config.death_penalty_job/10000);
+ break;
+ }
+ if(base_penalty) {
+ if (battle_config.pk_mode && src && src->type==BL_PC)
+ base_penalty*=2;
+ if(sd->status.job_exp < base_penalty)
+ sd->status.job_exp = 0;
+ else
+ sd->status.job_exp -= base_penalty;
+ clif_updatestatus(sd,SP_JOBEXP);
+ }
+ }
}
if(src && src->type==BL_MOB) {
struct mob_data *md=(struct mob_data *)src;
diff --git a/src/map/skill.c b/src/map/skill.c index b9fc9521d..6822c8327 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1543,7 +1543,10 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds if(src->prev == NULL || dsrc->prev == NULL || bl->prev == NULL)
return 0;
//When caster is not the src of attack, this is a ground skill, and as such, do the relevant target checking. [Skotlex]
- if (src != dsrc && !status_check_skilluse(NULL, bl, skillid, 1))
+ if (
+ (src != dsrc || battle_config.skill_caster_check) &&
+ !status_check_skilluse(battle_config.skill_caster_check?src:NULL, bl, skillid, 1)
+ )
return 0;
//Note that splash attacks often only check versus the targetted mob, those around the splash area normally don't get checked for being hidden/cloaked/etc. [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c index 72a5e036a..f9c79cc8c 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4632,7 +4632,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val battle_stopattack(bl);
skill_stop_dancing(bl); /* 演奏/ダンスの中? */
// Cancel cast when get status [LuzZza]
- if (!sd || sd->skillid != PA_PRESSURE) //Only Pressure cannot be cancelled.
+ if (battle_config.sc_castcancel)
skill_castcancel(bl, 0);
case SC_STOP:
case SC_CONFUSION:
|