summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 16:04:47 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 16:04:47 +0000
commitb5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c (patch)
tree455e9289ccd1981acdd35e459b099a1e79a3552d /src/map/battle.c
parentee340265a907f243c01588d86b47f244acf7e268 (diff)
downloadhercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.tar.gz
hercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.tar.bz2
hercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.tar.xz
hercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.zip
- Added support for n to specify minutes to @charban.
- Fixed a logic typo on the way dummy_npc_id was defined. - Added state.trading to specify when a trading has started. Now you should be able to walk around until the trade is either rejected or started. - Armor defense is no longer reduced by the amount of characters targetting you. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6192 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 529a32b33..44704b0b0 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1899,10 +1899,11 @@ static struct Damage battle_calc_weapon_attack(
target_count = unit_counttargeted(target,battle_config.vit_penalty_count_lv);
if(target_count >= battle_config.vit_penalty_count) {
if(battle_config.vit_penalty_type == 1) {
- def1 = (def1 * (100 - (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num))/100;
+// armor defense shouldn't be reduced from what people are saying. [Skotlex]
+// def1 = (def1 * (100 - (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num))/100;
def2 = (def2 * (100 - (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num))/100;
} else { //Assume type 2
- def1 -= (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num;
+// def1 -= (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num;
def2 -= (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num;
}
}
@@ -4131,7 +4132,7 @@ void battle_set_defaults() {
battle_config.gm_cant_drop_min_lv = 1;
battle_config.gm_cant_drop_max_lv = 0;
battle_config.disp_hpmeter = 60;
- battle_config.skill_wall_check = 0;
+ battle_config.skill_wall_check = 1;
battle_config.cell_stack_limit = 1;
battle_config.bone_drop = 0;
battle_config.buyer_name = 1;