summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--conf-tmpl/battle/skill.conf2
-rw-r--r--src/map/battle.c5
3 files changed, 6 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cb26ba463..d6a4a036e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/11
+ * You don't get critical'ed when in counter-attack stance anymore. [Skotlex]
+ * Changed the default counter-type to "always critical". [Skotlex]
* Implemented use of ers for skill_unit_groups to reduce memory usage.
* Note that it's NOT TESTED yet. Use with caution, at least some obvious
bugs are expected to be found... [Skotlex]
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index 55d92509b..e4db9962b 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -99,7 +99,7 @@ combo_delay_rate: 100
// Use alternate auto Counter Attack Skill Type? (Note 4)
// For those characters on which it is set, 100% Critical,
// Otherwise it disregard DEF and HIT+20, CRI*2
-auto_counter_type: 0
+auto_counter_type: 15
// Can ground skills be placed on top of each other? (Note 4)
// If set, only skills with UF_NOREITERATION set will be affected (skill_unit_db)
diff --git a/src/map/battle.c b/src/map/battle.c
index cb84d3044..06242d98e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1162,6 +1162,7 @@ static struct Damage battle_calc_weapon_attack(
sd->state.arrow_atk = flag.arrow;
}
+/* Apparently counter attack no longer causes you to be critical'ed by mobs. [Skotlex]
//Check for counter
if(!skill_num)
{
@@ -1169,7 +1170,7 @@ static struct Damage battle_calc_weapon_attack(
//If it got here and you had autocounter active, then the direction/range does not matches: critical
flag.cri = 1;
} //End counter-check
-
+*/
if (!skill_num && (tsd || battle_config.enemy_perfect_flee))
{ //Check for Lucky Dodge
short flee2 = status_get_flee2(target);
@@ -4058,7 +4059,7 @@ void battle_set_defaults() {
battle_config.etc_log = 1;
battle_config.save_clothcolor = 0;
battle_config.undead_detect_type = 0;
- battle_config.auto_counter_type = 0;
+ battle_config.auto_counter_type = BL_ALL;
battle_config.min_hitrate = 5;
battle_config.max_hitrate = 100;
battle_config.agi_penalty_type = 1;