- Removed settings enemy_critical_rate, homun_critical_rate. Added settings enable_critical (defaults to specify only players), mob_critical_rate and critical_rate. The last applies to all non-mobs and non-players (battle/battle.conf)

- Removed settings mob_npc_warp, mob_warpportal. Replaced with setting mob_warp which specifies which types of warp can a mob step into (battle/monster.conf)
- Updated status_calc_misc so that it also handles the BL_PC case, removed redundant info from status_calc_pc, and moving the SNovice Max Hp bonus to status_base_pc_maxhp


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

3 files changed, 13 insertions, 12 deletions

diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index 4e50a5fc7..4f2b75273 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -36,6 +36,14 @@ enable_baseatk: 11
 // Who can have perfect flee? (Note 4)

 enable_perfect_flee: 5

 

+// Who can have critical attacks? (Note 4)

+// (Note that there are some skills that always do critical hit regardless of this)

+enable_critical: 1

+

+// Critical adjustment rate for non-players (Note 2)

+mob_critical_rate: 100

+critical_rate: 100

+

 // Move-delay adjustment after being hit. (Note 2)

 // The 'can't walk' delay after being hit is calculated as a percentage of the damage animation duration.

 // NOTE: Only affects the normal delay from a single attack, not the delay added by the multihit_delay option below.

diff --git a/conf-tmpl/battle/monster.conf b/conf-tmpl/battle/monster.conf
index 1ffa27a86..ce3934bdb 100644
--- a/conf-tmpl/battle/monster.conf
+++ b/conf-tmpl/battle/monster.conf
@@ -27,11 +27,6 @@
 // features.

 //--------------------------------------------------------------

 

-// Enemy's Critical Rate (use 0 to disable non-skill criticals) (Note 2)

-// Note: In Official servers enemies don't get criticals other than through skills.

-enemy_critical_rate: 0

-homun_critical_rate: 0

-

 // [MVP] Summoned monsters HP rate, that is, monsters summoned by an MVP will have this much HP. (Note 2)

 mvp_hp_rate: 100

 

@@ -61,11 +56,12 @@ monster_max_aspd: 199
 //    any npc-warps in it's sight of view (use with mob_npc_warp below)

 monster_ai: 0

 

-// Should mobs that stand on an npc warp be warped to the destination cell?

+// Should mobs be able to be warped (add as needed)?

 // 0: Disable.

-// 1: Enable on all warps except those that lead to 'nobranch' maps.

-// 2: Enable on all warps.

-mob_npc_warp: 0

+// 1: Enable mob-warping when standing on NPC-warps

+// 2: Enable mob-warping when standing on Priest Warp Portals

+// 4: Disable warping when the target map is a 'nobranch' map.

+mob_warp: 0

 

 // Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)

 view_range_rate: 100

diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index 67fa61e73..ad401a43e 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -154,9 +154,6 @@ display_snatcher_skill_fail: yes
 // Can a player in chat room (in-game), be warped by a warp portal? (Note 1)

 chat_warpportal: no

 

-// Can a monster be warped by a warp portal? (Note 1)

-mob_warpportal: no

-

 // What should the wizard's "Sense" skill display on the defense fields?

 // 0: Do not show defense

 // 1: Base defense