- Modified the way autospells stack to mimic official servers. Cards of the same ID cannot stack, but different cards with the same skill can each trigger indepedently of each other.

- Added battle_config autospell_stacking to enable stacking of cards of same ID.
- Moved card-specific battle options to items.conf
- Autospells triggered when hit will check the range to the target.
- Some cleaning up of status_calc_pc
- In status_change_start capped the passed success chance to 100%


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

3 files changed, 14 insertions, 9 deletions

diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index 42f5cd934..c850aeebc 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -144,14 +144,6 @@ delay_battle_damage: yes
 // Are arrows are consumed when used on a bow? (Note 1)
 arrow_decrement: yes
 
-// The ghostring fix makes mob attacks not be affected by ghostring armor wearing players.
-mob_ghostring_fix: yes
-
-// Does the Golden Thief Bug card only work during pvp?
-// no or 0 - gtb works all the time
-// 1 - 100 - percentage of magic damage reduced only during pvp (or gvg)
-gtb_pvp_only: no
-
 // Adjustment for the natural rate of resistance from status changes.
 // If 50, status defense is halved, and you need twice as much stats to block
 // them (eg: 200 vit to completely block stun)
diff --git a/conf-tmpl/battle/items.conf b/conf-tmpl/battle/items.conf
index 3a360da4a..bcb8f11d9 100644
--- a/conf-tmpl/battle/items.conf
+++ b/conf-tmpl/battle/items.conf
@@ -71,3 +71,16 @@ item_check: no
 // How much time must pass between item uses?
 // Only affects the delay between using items, prevents healing item abuse. Recommended ~500 ms
 item_use_interval: 0
+
+// The ghostring fix makes mob attacks not be affected by ghostring armor wearing players.
+mob_ghostring_fix: yes
+
+// Does the Golden Thief Bug card only work during pvp?
+// no or 0 - gtb works all the time
+// 1 - 100 - percentage of magic damage reduced only during pvp (or gvg)
+gtb_pvp_only: no
+
+// Enable autospell card effects to stack?
+// NOTE: Different cards that grant the same skill will both 
+// always work independently of each other regardless of setting.
+autospell_stacking: no
diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index 8d61e1c35..2c17c4ec9 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -35,7 +35,7 @@ import: conf/battle/gm.conf
 //Guild and WoE settings

 import: conf/battle/guild.conf

 

-//Item-specific and crafting related options.

+//Item/card-specific and crafting related options.

 import: conf/battle/items.conf

 

 //Mob related configuration