summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-23 18:17:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-23 18:17:30 +0000
commitdd3b3ddb4332afacd9d25a1d892ca889c82e7730 (patch)
treec8c26de7bd5b816d5c640c8b715755c240dd0428 /src
parentbd0894e6e31121b4f738fd331c3e6da37d80e5e6 (diff)
downloadhercules-dd3b3ddb4332afacd9d25a1d892ca889c82e7730.tar.gz
hercules-dd3b3ddb4332afacd9d25a1d892ca889c82e7730.tar.bz2
hercules-dd3b3ddb4332afacd9d25a1d892ca889c82e7730.tar.xz
hercules-dd3b3ddb4332afacd9d25a1d892ca889c82e7730.zip
- Modified setting skillrange_by_weapon (skill.conf) to be a per-object-type setting instead of yes/no. The default now is that weapon-based skills will take the attacker's range for non-players.
- Changed the default of skillrange_by_distance to include homunculus. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7844 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/skill.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 14e82f792..bbee2fe24 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3735,8 +3735,8 @@ void battle_set_defaults() {
battle_config.left_cardfix_to_right=0;
battle_config.skill_add_range=0;
battle_config.skill_out_range_consume=1;
- battle_config.skillrange_by_distance=BL_MOB|BL_PET;
- battle_config.use_weapon_skill_range=0;
+ battle_config.skillrange_by_distance=BL_MOB|BL_PET|BL_HOMUNCULUS;
+ battle_config.use_weapon_skill_range=BL_MOB|BL_PET|BL_HOMUNCULUS;
battle_config.pc_damage_delay_rate=100;
battle_config.defnotenemy=0;
battle_config.vs_traps_bctall=BL_PC;
diff --git a/src/map/pc.c b/src/map/pc.c
index d2556b0dc..c15fca7f9 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6204,7 +6204,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos)
pos = sd->equip_index[EQI_HAND_R] >= 0 ? EQP_HAND_L : EQP_HAND_R;
}
- if (pos&EQP_HAND_R && battle_config.use_weapon_skill_range)
+ if (pos&EQP_HAND_R && battle_config.use_weapon_skill_range&BL_PC)
{ //Update skill-block range database when weapon range changes. [Skotlex]
i = sd->equip_index[EQI_HAND_R];
if (i < 0 || !sd->inventory_data[i]) //No data, or no weapon equipped
diff --git a/src/map/skill.c b/src/map/skill.c
index 8c25f823b..d665950dd 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -764,7 +764,7 @@ int skill_get_range2 (struct block_list *bl, int id, int lv)
{
int range = skill_get_range(id, lv);
if(range < 0) {
- if (battle_config.use_weapon_skill_range)
+ if (battle_config.use_weapon_skill_range&bl->type)
return status_get_range(bl);
range *=-1;
}