* Added nullpo_retb

* Replaced some parts in skill.c with nullpo checks
* Updated most of 12/14's skills patch

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

1 files changed, 17 insertions, 17 deletions

diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index bab565357..3cd2fce32 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -410,29 +410,29 @@ player_auto_counter_type: 0
 // Monsters
 monster_auto_counter_type: 0
 
-// Type of penalty that is applied to FLEE when more than agi_penaly_count monsters are targetting player
+// Type of penalty that is applied to FLEE when more than agi_penalty_count monsters are targetting player
 // 0 = no penalty is applied
-// 1 = agi_penaly_num is reduced from FLEE as a %
-// 2 = agi_penaly_num is reduced from FLEE as an exact amount
-agi_penaly_type: 1
+// 1 = agi_penalty_num is reduced from FLEE as a %
+// 2 = agi_penalty_num is reduced from FLEE as an exact amount
+agi_penalty_type: 1
 
 // Amount of enemies required to be targetting player before FLEE begins to be penalized
-agi_penaly_count: 3
+agi_penalty_count: 3
 
-// Amount of FLEE penalized per each attacking monster more than agi_penaly_count
-agi_penaly_num: 10
+// Amount of FLEE penalized per each attacking monster more than agi_penalty_count
+agi_penalty_num: 10
 
-// Type of penalty that is applied to VIT defense when more than vit_penaly_count monsters are targetting player
+// Type of penalty that is applied to VIT defense when more than vit_penalty_count monsters are targetting player
 // 0 = no penalty is applied
-// 1 = vit_penaly_num is reduced from FLEE as a %
-// 2 = vit_penaly_num is reduced from FLEE as an exact amount
-vit_penaly_type: 1
+// 1 = vit_penalty_num is reduced from FLEE as a %
+// 2 = vit_penalty_num is reduced from FLEE as an exact amount
+vit_penalty_type: 1
 
 // Amount of enemies required to be targetting player before VIT defense begins to be penalized
-vit_penaly_count: 3
+vit_penalty_count: 3
 
-// Amount of VIT defense penalized per each attacking monster more than vit_penaly_count
-vit_penaly_num: 5
+// Amount of VIT defense penalized per each attacking monster more than vit_penalty_count
+vit_penalty_num: 5
 
 // When the player attacks an object, the calculation method of DEF. 
 // With 0 this will be ignored specification, at 1 or more def = subtraction of (DEF* value).
@@ -505,7 +505,7 @@ player_land_skill_limit: yes
 monster_land_skill_limit: yes
 
 // If a party uses a skill with penalties do they apply? (Note 1)
-party_skill_penaly: yes
+party_skill_penalty: yes
 
 // If monster's class is changed will it fully recover HP and SP and Ailments? (Note 1)
 monster_class_change_full_recover: no
@@ -572,14 +572,14 @@ gtb_pvp_only: no
 // 2: Full evasion exclusion
 // 3: Full evasion and evasion exclusion 
 // 4 or more: Except all.
-agi_penaly_count_lv: 2
+agi_penalty_count_lv: 2
 
 // How to count the number of the enemies who do a vit penalty
 // 1 or less: It is a count altogether.
 // 2: Full evasion exclusion
 // 3: Full evasion and evasion exclusion
 // Four or more: Except all.
-vit_penaly_count_lv: 3
+vit_penalty_count_lv: 3
 
 // Grandcross Settings (Dont mess with these)
 // Even if MOB (PC) has overlapped, it HIT(s) compulsion 3. (Default no)