diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-10 21:30:17 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-10 21:30:17 +0000 |
| commit | ab76b5ee8de6220f739c6f0f2288df887a3a5f7e (patch) | |
| tree | 22e776a5a30a98170dacd9cf19b09ac82de75f3a | |
| parent | 6e8b9de43008b0ed45f2ee11b0113e7ba4e77087 (diff) | |
| download | hercules-ab76b5ee8de6220f739c6f0f2288df887a3a5f7e.tar.gz hercules-ab76b5ee8de6220f739c6f0f2288df887a3a5f7e.tar.bz2 hercules-ab76b5ee8de6220f739c6f0f2288df887a3a5f7e.tar.xz hercules-ab76b5ee8de6220f739c6f0f2288df887a3a5f7e.zip | |
- Fixed mob-casted demonstration/quagmire being affected by the gvg_traps_all config setting.
- Moved the gvg_traps_target_all config from guild.conf to skill.conf
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5568 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | conf-tmpl/battle/guild.conf | 4 | ||||
| -rw-r--r-- | conf-tmpl/battle/skill.conf | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/conf-tmpl/battle/guild.conf b/conf-tmpl/battle/guild.conf index ee77b7ad6..2c208163d 100644 --- a/conf-tmpl/battle/guild.conf +++ b/conf-tmpl/battle/guild.conf @@ -62,10 +62,6 @@ gvg_misc_attack_damage_rate: 60 // NOTE: It's %, not absolute, so 20 is -20% of your total flee gvg_flee_penalty: 20 -// 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 - // When the emperium is broken with WoE mode on, How Long Before The // Declaration Of Castle Owner and Removal of Monsters/Players from // Castle. (in milliseconds) (Note 3) diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf index 89489708d..1c33be10d 100644 --- a/conf-tmpl/battle/skill.conf +++ b/conf-tmpl/battle/skill.conf @@ -118,6 +118,10 @@ player_skill_nofootset: yes // as traps straight onto or nearby other players. (Note 1)
monster_skill_nofootset: no
+// 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
+
// 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)
// NOTE: It may degrade performance to enable this.
diff --git a/src/map/skill.c b/src/map/skill.c index 4495e1c02..9b6b99b87 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6470,7 +6470,8 @@ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid, break;
case WZ_QUAGMIRE: //The target changes to "all" if used in a gvg map. [Skotlex]
case AM_DEMONSTRATION:
- if (map_flag_vs(src->m) && battle_config.vs_traps_bctall)
+ if (map_flag_vs(src->m) && battle_config.vs_traps_bctall
+ && src->type != BL_MOB)
target = BCT_ALL;
break;
case HT_SHOCKWAVE: /* ショックウェ?ブトラップ */
|