- Modified Self Destruction, so that Marine Spheres in non-versus maps will hurt only enemies, while in all other situations this skill will hurt everyone around them.

- Expanded setting debuff_on_logout so that &1 removes negative buffs and &2 removes positive buffs.
- Food status boosts will no longer end on death, but they will end when you respawn or logout.
- Added battle config file status.conf, moved some settings from skill.conf and battle.conf to it since they are entirely Status-Change related.


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

4 files changed, 64 insertions, 28 deletions

diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index 26dc1113f..4e50a5fc7 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -147,23 +147,3 @@ delay_battle_damage: yes
 

 // Are arrows are consumed when used on a bow? (Note 1)

 arrow_decrement: yes

-

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

-pc_status_def_rate: 100

-mob_status_def_rate: 100

-

-// Required luk to gain inmunity to status changes.

-// Luk increases resistance by closing the gap between natural resist and max 

-// linearly. This setting indicates required luk to gain complete inmunity.

-// Eg: 40 vit -> 40% resist. 150 luk -> +50% of the missing gap. 

-//     So 40% + (50% of 60%) = 70%

-pc_luk_sc_def: 300

-mob_luk_sc_def: 300

-

-// Maximum resistance to status changes. (10000 = 100%)

-// NOTE: This is applied after cards and equipment, so inmunity cards are 

-// capped to this.

-pc_max_status_def: 10000

-mob_max_status_def: 10000

diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index eaba3e44e..67fa61e73 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -86,14 +86,6 @@ skillrange_from_weapon: 14
 // no effect while the caster is unable to fight (eg: stunned).

 skill_caster_check: yes

 

-// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc?

-status_cast_cancel: no

-

-// Will certain negative skill status-changes be removed on logout?

-// This mimics official servers, where Extremity Fist's no SP regen and 

-// Strip Equipment effects are removed when you logout.

-debuff_on_logout: yes

-

 // Should ground placed skills be removed as soon as the caster dies? [Note 4]

 clear_skills_on_death: 15

 

diff --git a/conf-tmpl/battle/status.conf b/conf-tmpl/battle/status.conf
new file mode 100644
index 000000000..8d2587b27
--- /dev/null
+++ b/conf-tmpl/battle/status.conf
@@ -0,0 +1,61 @@
+//      ______  __    __                                 

+//     /\  _  \/\ \__/\ \                                

+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

+//  _   _   _   _   _   _   _     _   _   _   _   _   _

+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

+//

+//--------------------------------------------------------------

+// eAthena Battle Configuration File

+// Originally Translated by Peter Kieser <pfak@telus.net>

+// Made in to plainer English by Ancyker

+//--------------------------------------------------------------

+//Note 1: Directives can be set using on/off, yes/no or 1/0.

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

+// 1000 miliseconds is 1 second.

+// Unless otherwise specified, the minimum value is 0 for all

+// features.

+//--------------------------------------------------------------

+

+// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc?

+status_cast_cancel: no

+

+// Will certain skill status-changes be removed on logout?

+// This mimics official servers, where Extremity Fist's no SP regen,

+// Strip Equipment, cooking effects are removed when you logout. Setting is:

+// 1 - remove negative buffs (stripping, EF)

+// 2 - remove positive buffs (cooking)

+// 3 - remove all buffs that are not saved on official (default)

+debuff_on_logout: 3

+

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

+pc_status_def_rate: 100

+mob_status_def_rate: 100

+

+// Required luk to gain inmunity to status changes.

+// Luk increases resistance by closing the gap between natural resist and max 

+// linearly. This setting indicates required luk to gain complete inmunity.

+// Eg: 40 vit -> 40% resist. 150 luk -> +50% of the missing gap. 

+//     So 40% + (50% of 60%) = 70%

+pc_luk_sc_def: 300

+mob_luk_sc_def: 300

+

+// Maximum resistance to status changes. (10000 = 100%)

+// NOTE: This is applied after cards and equipment, so inmunity cards are 

+// capped to this.

+pc_max_status_def: 10000

+mob_max_status_def: 10000

diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index 2c17c4ec9..255e33a05 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -53,6 +53,9 @@ import: conf/battle/player.conf
 //Skill related settings

 import: conf/battle/skill.conf

 

+//Status change related settings

+import: conf/battle/status.conf

+

 // Anything else that didn't fit anywhere else.

 // Includes duel, day/night, mute/manner, log settings.

 import: conf/battle/misc.conf