* Updated most of map-server to 1082

* Removed my own additions for skill delays using aspd
* Adapted skill_range_leniency to jA's code
* Fixed drop rates only limited to multiples of 100's
* Added missing code for castle_defense_rate
* Removed pc_undead_nofreeze
* Updated unrefineable items table
* Added 3 new script commands
* Added SC_SpeedUp0
* Merged itemdb_read for SQL and TXT
* Removed itemdb_read_cardillustnametable limited to TXT only
* Added reading itemslotcounttable.txt from the GRF to auto set number of slots per item
* Added a display message when reading itemslottable from the GRF
* Added options in battle_athena.conf to enable/disable reading the GRF

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

1 files changed, 60 insertions, 0 deletions

diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index 681a42063..b317575cc 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -349,8 +349,27 @@ natural_heal_skill_interval: 10000
 // The maximum weight for a character to carry when the character stops healing naturally. (in %)
 natural_heal_weight_rate: 50
 
+// You can turn the following 5 settings off if you don't need them,
+// or if you're experiencing problems with GRF loading
+//
 // Override item names from GRF file? (Note 1)
 item_name_override_grffile: yes
+//
+// Override item equip positions from GRF file? (Note 1)
+item_equip_override_grffile: yes
+//
+// Override item slots from GRF file? (Note 1)
+item_slots_override_grffile: yes
+//
+// Override 'indoors' mapflags from GRF file? (Note 1)
+indoors_override_grffile: yes
+//
+// Override SP used per level from GRF file? (Note 1)
+// Turn this off if you have a customised skill_require_db.txt
+skill_sp_override_grffile: yes
+//
+// Read card illustrations from GRF file? (Note 1)
+cardillust_read_grffile: yes
 
 // Are arrows are consumed when used on a bow? (Note 1)
 arrow_decrement: yes
@@ -470,6 +489,9 @@ player_cloak_check_type: yes
 // When a monster is cloaking, Whether the wall is checked or not. (Note 1)
 monster_cloak_check_type: no
 
+// Damage adjustments for WOE battles against defending Guild monsters (Note 2)
+castle_defense_rate: 100
+
 // Melee damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
 gvg_short_attack_damage_rate: 100
 
@@ -755,5 +777,43 @@ skill_range_leniency: 1
 // Set this to 1 if your clients have langtype problems and can't display motd properly
 motd_type: 0
 
+// キャラのHP?率を設定。(100で正規の値)
+hp_rate: 100
+
+// キャラのSP?率を設定。(100で正規の値)
+sp_rate: 100
+
+//GMの行動制限  アイテ?ドロップ・倉庫出し入れ・ItemZeny交換
+gm_can_drop_lv: 0
+
+//全キャラがGMにHPメ???を常に送信するか
+disp_hpmeter: no
+
+//PC?亡時に、ドクロをドロップするか
+//0:しない 1:PvP?ップのみ 2:いつでも
+bone_drop: 0
+
+//敵のアイテ?ドロップ率をレ?トごとに個別?率をかけるかどうか
+//details = 0:個別設定なし(デフォルト) 1:それぞれ?率指定(百分率) ?detailsが0以外の場合、以前のドロップ?率は無視されます
+//          2:それぞれ?率指定(百分率)、ドロップ率上限と下限を設定?ドロップ設定0は無視します
+//例 details = 3 rate_1 = 1000 min = 20 ドロップ率1/10000?9/10000の物を10?に指定 10?しても20/10000未満の物は 20/10000に固定
+item_rate_details: 0
+//ドロップ設定1?9
+item_rate_1: 100
+item_rate_1_min: 1
+item_rate_1_max: 9
+//ドロップ設定10?99
+item_rate_10: 100
+item_rate_10_min: 10
+item_rate_10_max: 99
+//ドロップ設定100?999
+item_rate_100: 100
+item_rate_100_min: 100
+item_rate_100_max: 999
+//ドロップ設定1000?10000
+item_rate_1000: 100
+item_rate_1000_min: 1000
+item_rate_1000_max: 10000
+
 import: conf/import/battle_conf.txt