* Updated core and map-server to jA 1115~1137

* Fixed a typo in Volcano

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

2 files changed, 26 insertions, 6 deletions

diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index f2c76990d..ef0802342 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -240,6 +240,9 @@ potion_produce_rate: 100
 // Allow monsters to be aggresive and attack first? (Note 1)
 monster_active_enable: yes
 
+// If a monster is attacked, will they have a delay in being able to move? (Note 1)
+monster_damage_delay: yes
+
 // Monster damage delay rate (Note 1)
 monster_damage_delay_rate: 100
 
@@ -552,16 +555,16 @@ party_skill_penalty: yes
 monster_class_change_full_recover: no
 
 // Do produced items have the maker's name on them? (Note 1)
-produce_item_name_input: yes
+produce_item_name_input: no
 
 // Do produced potions have the maker's name on them? (Note 1)
-produce_potion_name_input: yes
+produce_potion_name_input: no
 
 // Do crafted arrows have the maker's name on them? (Note 1)
-making_arrow_name_input: yes
+making_arrow_name_input: no
 
 // Does created holy water have the maker's name on it? (Note 1)
-holywater_name_input: yes
+holywater_name_input: no
 
 // Stop logout for 10 seconds after a hit? (Note 1)
 prevent_logout: yes
diff --git a/conf-tmpl/script_athena.conf b/conf-tmpl/script_athena.conf
index bc8f1c907..3e420744b 100644
--- a/conf-tmpl/script_athena.conf
+++ b/conf-tmpl/script_athena.conf
@@ -1,3 +1,20 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------
+// eAthena Script Configuration File
+//--------------------------------------------------------
+
+
 // When choosing those which it refines setting the letter which is indicated. (Those for word use other than Japanese?)
 refine_posword: Head,Body,Left hand,Right hand,Robe,Shoes,Accessory 1,Accessory 2,Head 2,Head 3,Not Equipped
 
@@ -9,9 +26,9 @@ warn_func_mismatch_paramnum: yes
 
 warn_cmd_mismatch_paramnum: yes
 
-check_cmdcount: 8192
+check_cmdcount: 65536
 
-check_gotocount: 512
+check_gotocount: 2048
 
 
 //---- Custom script functions ----