- Merged the unit_data structure from jA for handling unit-related data (attack times, walking, auto-attack timers, skill related data)

- Modified unit_skillcastcancel to receive flag&2, which stands for "cancel casting only if current skill is cancellable"
- Battle config options changed from yes/no to BL_TYPE settings: skillrange_by_distance, skill_noreiteration, skill_nofootset, gvg_traps_target_all, skill_log, attack_direction_change, auto_counter_type
- Clif.c will disconnect sessions that send an unknown command packet above 0x30000 instead of just ignoring it.
- Cleaned up/rewrite of the pet ai, same for pet_calc_pos
- Implemented use of mob variable attacked_players as it is used on jA
- Cleaned up error reporting during mob-skill loading to be less spamy with non-loaded mobs.
- Corrected water_height reading. I forgot to give credits to LittleWolf for providing the water-reading function :X


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5707 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 27 insertions, 44 deletions

diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index c850aeebc..ada4b5a70 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -19,6 +19,8 @@
 //Note 2: All rates are in percents, 100 would mean 100%, 200
 //   would mean 200%, etc
 //Note 3: Value is not limited to 60K (see below)
+//Note 4: Use bitmask values to specify who is affected 
+//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)
 // Other Information:
 // All options are limited to a max of 60K (aprox) which is 600%
 // or 60secs as appropiate.
@@ -108,11 +110,8 @@ agi_penalty_count_lv: 2
 // Four or more: Except all.
 vit_penalty_count_lv: 3
 
-// Player's Direction Changed When Attacking? (Note 1)
-player_attack_direction_change: yes
-
-// Monsters's Direction Changed When Attacking? (Note 1)
-monster_attack_direction_change: yes
+// Change attacker's direction to face opponent on every attack? (Note 4)
+attack_direction_change: 15
 
 // Is a usual attack of a pet delivered withOUT an attribute? (Note 1)
 pet_attack_attr_none: no
diff --git a/conf-tmpl/battle/misc.conf b/conf-tmpl/battle/misc.conf
index d767e829f..724eaa361 100644
--- a/conf-tmpl/battle/misc.conf
+++ b/conf-tmpl/battle/misc.conf
@@ -19,6 +19,8 @@
 //Note 2: All rates are in percents, 100 would mean 100%, 200
 //   would mean 200%, etc
 //Note 3: Value is not limited to 60K (see below)
+//Note 4: Use bitmask values to specify who is affected 
+//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)
 // Other Information:
 // All options are limited to a max of 60K (aprox) which is 600%
 // or 60secs as appropiate.
@@ -46,11 +48,8 @@ pk_level_range: 0
 // Allow muting of players?
 muting_players: yes
 
-// Display player skill errors in console? (for debug only) (default: off) (Note 1)
-player_skill_log: off
-
-// Display monster skill errors in console? (for debug only) (default: off) (Note 1)
-monster_skill_log: off
+// Display skill usage/errors in console? (for debug only) (default: off) (Note 4)
+skill_log: 0
 
 // Display battle log? (for debug only) (default: off) (Note 1)
 battle_log: off
diff --git a/conf-tmpl/battle/monster.conf b/conf-tmpl/battle/monster.conf
index e0d412a45..8f22c0d5e 100644
--- a/conf-tmpl/battle/monster.conf
+++ b/conf-tmpl/battle/monster.conf
@@ -55,7 +55,7 @@ monster_max_aspd: 199
 //    can't attack back regardless of how they were attacked (eg: GrimTooth), otherwise, their 
 //    rude attack" is only activated if they can't melee reach the target (eg: sniping)
 // 4: If not set, mobs that can change target only do so when melee attacked (distance player/mob < 3),
-//    otherwise mobs may change target and chase ranged attackers.
+//    otherwise mobs may change target and chase ranged attackers. This flag also overrides the 'provoke' target.
 // 8: If set, when a mob loses track of their target, they stop walking inmediately. Otherwise, they continue
 //    to their last target tile. When set mobs also scatter as soon as they lose their target. Use this mode to 
 //    make it much harder to mob-train by hiding and collecting them on a single spot (ie: GrimTooth training)
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index 3512faee8..dc7bdf659 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -19,6 +19,8 @@
 //Note 2: All rates are in percents, 100 would mean 100%, 200

 //   would mean 200%, etc

 //Note 3: Value is not limited to 60K (see below)

+//Note 4: Use bitmask values to specify who is affected 

+//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)

 // Other Information:

 // All options are limited to a max of 60K (aprox) which is 600%

 // or 60secs as appropiate.

@@ -47,24 +49,16 @@ castrate_dex_scale: 150
 // Will normal attacks be able to ignore the delay after skills? (Note 1)

 skill_delay_attack_enable: yes

 

-// Range added to player skills after their cast time finishes.

+// Range added to skills after their cast time finishes.

 // Decides how far away the target can walk away after the skill began casting before the skill fails.

-player_skill_add_range: 15

+skill_add_range: 15

 

 // If the target moves out of range while casting, do we take the items and SP for the skill anyway? (Note 1)

 skill_out_range_consume: no

 

-// Range added to mob skills after their cast time finishes.

-// Decides how far away the target can walk away after the skill began casting before the skill fails.

-monster_skill_add_range: 15

-

-// Does the distance between caster and target define if the skill is a ranged skill?

+// Does the distance between caster and target define if the skill is a ranged skill? (Note 4)

 // If set, when the distance between caster and target is greater than 3 the skill is considered long-range, otherwise it's a melee range.

 // If not set, then the range is determined by the skill (eg: Double Strafe is always long-ranged). 

-// Mask values (add as necessary):

-// 1: Players

-// 2: Mobs

-// 4: Pets

 // Default 6 (mobs + pets)

 skillrange_by_distance: 6

 

@@ -101,31 +95,22 @@ skill_min_damage: 6
 // The delay rate of monk's combo (Note 2)

 combo_delay_rate: 100

 

-// Counter Attack Skill Type

-// 0 = 100% critical

-// 1 = disregard DEF and HIT+20, CRI*2

-// Players

-player_auto_counter_type: 0

-// Monsters

-monster_auto_counter_type: 0

-

-// Whether or not, ground skills of the players' will stack. (Note 1)

-player_skill_reiteration: no

-

-//Whether or not, ground skills of the monsters' will pile up. (Note 1)

-monster_skill_reiteration: no

+// 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

 

-// Whether players are not allowed to cast ground based skills of a certain type such

-// as traps straight onto or nearby other players/monsters. (Note 1)

-player_skill_nofootset: yes

+// 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)

+skill_reiteration: 0

 

-// Whether monsters are not allowed to cast ground based skills of a certain type such

-// as traps straight onto or nearby other players. (Note 1)

-monster_skill_nofootset: no

+// Can ground skills NOT be placed underneath/near players/monsters? (Note 4)

+// If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db)

+skill_nofootset: 1

 

-// Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 1)

-// Default on official servers: yes

-gvg_traps_target_all: yes

+// Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 4)

+// Default on official servers: yes for player-traps

+gvg_traps_target_all: 1

 

 // Whether placed down skills will check walls (Note 1)

 // (Makes it so that Storm Gust/Lord of Vermillion/etc when casted next to a wall, won't hit on the other side)