- Some cleaning of the pc_eventtimer and pc enqueue code, it should fix some memory leaks when the event counter does not matches with the actual number of queued timers during logout.

- Minor typos, corrections, etc.


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

2 files changed, 4 insertions, 2 deletions

diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index 30a136ee8..f7516836f 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -141,7 +141,9 @@ vit_penalty_count_lv: 3
 attack_direction_change: 15

 

 // For those who is set, attacks of Neutral element will not get any elemental

-// modifiers (they will hit for full damage on Ghost types) (Note 4)

+// adjustment (100% versus on all defense-elements) (Note 4)

+// NOTE: This is the setting that makes it so non-players can hit for full

+// damage against Ghost-type targets (eg: Ghostring wearing players).

 attack_attr_none: 14

 

 // Rate at which equipment can break (base rate before it's modified by any skills)

diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index 42c4486f0..87e37b4b2 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -132,7 +132,7 @@ traps_setting: 0
 

 // Restrictions applied to the Alchemist's Summon Flora skill (add as necessary)

 // 1: Enable players to damage the floras outside of versus grounds.

-// 3: Disable having different types out at the same time

+// 2: Disable having different types out at the same time

 //    (eg: forbid summoning anything except hydras when there's already 

 //     one hydra out)

 summon_flora_setting: 3