add pink hair color and rewrite the script

1 files changed, 14 insertions, 14 deletions

diff --git a/world/map/conf/battle_athena.conf b/world/map/conf/battle_athena.conf
index 574938d6..a4207f2c 100644
--- a/world/map/conf/battle_athena.conf
+++ b/world/map/conf/battle_athena.conf
@@ -1,4 +1,3 @@
-
 //--------------------------------------------------------------
 //eAthena Battle Configuration File
 // Made in to plainer english by Ancyker
@@ -74,7 +73,7 @@ attribute_recover: yes
 // If an item is droped, does it go stright into the users inventory? (Note 1)
 item_auto_get: no
 
-// How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds) 
+// How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds)
 flooritem_lifetime: 120000
 
 // How long before the first person who did the most damage to a monster can get the item? (in milliseconds)
@@ -98,7 +97,7 @@ mvp_item_first_get_time: 10000
 // So, It Is Like First Person's Time + Second Person's Time  = Time Before Second Person Can Get The Items
 mvp_item_second_get_time: 10000
 
-// How long before the third person who did the third most/least damage to a MVP can get the item 
+// How long before the third person who did the third most/least damage to a MVP can get the item
 //(Note the Amount is in Milliseconds and It Adds Time From The First Persons Time And Second Persons Time)
 //So It Is Like First Person's Time + Second Person's Time + Third Person's Time  = Time Before Third Person Can Get The Items
 mvp_item_third_get_time: 2000
@@ -425,7 +424,7 @@ vit_penaly_count: 3
 // Amount of VIT defense penalized per each attacking monster more than vit_penaly_count
 vit_penaly_num: 5
 
-// When the player attacks an object, the calculation method of DEF. 
+// 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).
 player_defense_type: 0
 
@@ -453,7 +452,7 @@ player_skill_nofootset: yes
 monster_skill_nofootset: yes
 
 // When a player is cloaking, Whether the wall is checked or not. (Note 1)
-// Note: Gravity announced that they were changing cloaking so it would 
+// Note: Gravity announced that they were changing cloaking so it would
 // not need a wall, but this was never implemented. I set to no, for fun.
 player_cloak_check_type: no
 
@@ -558,7 +557,7 @@ gtb_pvp_only: no
 // How to count the number of the enemies who do an agi penalty...
 // 1 or less: It is a count altogether.
 // 2: Full evasion exclusion
-// 3: Full evasion and evasion exclusion 
+// 3: Full evasion and evasion exclusion
 // 4 or more: Except all.
 agi_penaly_count_lv: 2
 
@@ -600,7 +599,7 @@ invite_request_check: yes
 
 // リムーブトラップの仕-l 0:-{鯖仕-l、罠1個 1:Athena仕-l、使ったアイテムを使った個数
 // translation (babelfish):
-// SI of ???????? -l 
+// SI of ???????? -l
 // 0: - {Mackerel SI -l, trap 1
 // 1:Athena SI -l, the quantity which used the item which was used
 skill_removetrap_type: 0
@@ -611,7 +610,7 @@ disp_experience: no
 // Whether or not Marine Spheres and Floras summoned by Alchemist will drop items and give experience? (Note 1)
 alchemist_summon_reward: no
 
-// Maximum level (default 255).  Requires that you have an experience table that supports more than 99 levels to go 
+// Maximum level (default 255).  Requires that you have an experience table that supports more than 99 levels to go
 // any higher.  It is left at 255 for default as to not cause problems for people who already have players at higher levels.
 // @lvup command will not go higher than this value, and therefor will not loop back around 0.
 maximum_level: 255
@@ -625,7 +624,7 @@ drops_by_luk: 0
 monsters_ignore_gm: no
 
 // Turn equipment breaking on. (Note 1)
-// Turning this one will allow equipment to break in battles, 
+// Turning this one will allow equipment to break in battles,
 // as well as some skills that have chance to break equipmen.
 equipment_breaking: no
 
@@ -635,7 +634,7 @@ equipment_breaking: no
 equipment_break_rate: 100
 
 // PK Server Mode.  Turns entire server pvp(excluding towns).  Experience loss is doubled if killed by another player.
-// When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items. 
+// When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items.
 // There is a nopvp.txt for setting up maps not to have pk on in this mode.  Novices cannot be attacked and cannot attack.
 // Normal pvp counter and rank display are disabled as well.
 pk_mode: no
@@ -700,10 +699,11 @@ mail_system: no
 
 // valid range of dye's and styles on the client
 min_hair_style: 0
-max_hair_style: 20
+max_hair_style: 19
 min_hair_color: 0
-max_hair_color: 9
-min_cloth_color: 0 
+max_hair_color: 11
+// Not for tA-style dyed clothes
+min_cloth_color: 0
 max_cloth_color: 4
 
 // Visible area size (how many squares away from a player can they see)
@@ -728,7 +728,7 @@ chat_spam_ban: 1
 chat_maxline: 512
 
 // Packet flood protection
-// If more than packet_spam_flood over-limits packets are recieved in 
+// If more than packet_spam_flood over-limits packets are recieved in
 // packet_spam_threshold seconds, we will kick the user if packet_spam_kick
 // is not set to 0. Limits on individual packets are defined in src/map/clif.c
 packet_spam_flood: 30