summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-26 14:44:38 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-26 14:44:38 +0000
commitbab077c56d3f89cc65bb0b00e10046ae8bdaa83a (patch)
treedd50254304bbbb538ae0f38e477e4591a8e0a9f1 /src/map/battle.c
parent0fcfb97f9aab16e782440a9f785dba45e89213d4 (diff)
downloadhercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.tar.gz
hercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.tar.bz2
hercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.tar.xz
hercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.zip
- Merged Mitternacht's max_heal/max_heal_lv config settings.
- Removed support of packet 0xc3 on the new packet versions. Thanks to Meruru for pointing out they aren't being used anymore. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7343 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 9c28f0867..f92aa3ff9 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3373,6 +3373,7 @@ static const struct battle_data_short {
{ "skill_min_damage", &battle_config.skill_min_damage },
{ "finger_offensive_type", &battle_config.finger_offensive_type },
{ "heal_exp", &battle_config.heal_exp },
+ { "max_heal_lv", &battle_config.max_heal_lv },
{ "resurrection_exp", &battle_config.resurrection_exp },
{ "shop_exp", &battle_config.shop_exp },
{ "combo_delay_rate", &battle_config.combo_delay_rate },
@@ -3632,6 +3633,7 @@ static const struct battle_data_int {
{ "item_rate_treasure", &battle_config.item_rate_treasure }, // End
{ "day_duration", &battle_config.day_duration }, // added by [Yor]
{ "night_duration", &battle_config.night_duration }, // added by [Yor]
+ { "max_heal", &battle_config.max_heal },
{ "mob_remove_delay", &battle_config.mob_remove_delay },
{ "sg_miracle_skill_duration", &battle_config.sg_miracle_skill_duration },
@@ -3768,6 +3770,8 @@ void battle_set_defaults() {
battle_config.skill_min_damage=6; //Ishizu claims that magic and misc attacks always do at least div_ damage. [Skotlex]
battle_config.finger_offensive_type=0;
battle_config.heal_exp=0;
+ battle_config.max_heal=9999;
+ battle_config.max_heal_lv=11;
battle_config.resurrection_exp=0;
battle_config.shop_exp=0;
battle_config.combo_delay_rate=100;