summaryrefslogtreecommitdiff
path: root/src/map/battle.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/battle.h')
-rw-r--r--src/map/battle.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 7570f77b7..41ff70850 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -35,7 +35,7 @@ struct block_list;
struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int count);
-int battle_calc_return_damage(struct block_list *bl, int damage, int flag);
+int battle_calc_return_damage(struct block_list *bl, struct block_list *src, int *, int flag);
void battle_drain(struct map_session_data *sd, struct block_list *tbl, int rdamage, int ldamage, int race, int boss);
@@ -111,6 +111,7 @@ extern struct Battle_Config
int enable_baseatk;
int enable_perfect_flee;
int cast_rate, delay_rate;
+ int delay_dependon_dex, delay_dependon_agi;
int sdelay_attack_enable;
int left_cardfix_to_right;
int skill_add_range;
@@ -234,7 +235,7 @@ extern struct Battle_Config
int max_hp;
int max_sp;
int max_lv, aura_lv;
- int max_parameter, max_baby_parameter, max_third_parameter, max_baby_third_parameter;
+ int max_parameter, max_baby_parameter;
int max_cart_weight;
int skill_log;
int battle_log;
@@ -362,6 +363,7 @@ extern struct Battle_Config
int max_cloth_color; // added by [MouseJstr]
int pet_hair_style; // added by [Skotlex]
+ int castrate_dex_scale; // added by [MouseJstr]
int area_size; // added by [MouseJstr]
int max_def, over_def_bonus; //added by [Skotlex]
@@ -495,12 +497,9 @@ extern struct Battle_Config
int bg_magic_damage_rate;
int bg_misc_damage_rate;
int bg_flee_penalty;
-
- int max_decagi_lv;
- int max_decagi_dur;
- int max_decagi;
- int rune_block_by_skill;
- int rune_block_by_status;
+ // rAthena
+ int max_third_parameter;
+ int atcommand_max_stat_bypass;
} battle_config;
void do_init_battle(void);
@@ -511,4 +510,7 @@ extern void battle_set_defaults(void);
int battle_set_value(const char* w1, const char* w2);
int battle_get_value(const char* w1);
+//
+struct block_list* battle_getenemyarea(struct block_list *src, int x, int y, int range, int type, int ignore_id);
+
#endif /* _BATTLE_H_ */