- Merged /branches/renewal/conf (partial)

- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

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

6 files changed, 38 insertions, 8 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 2737e32cb..8a32c7f47 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -4,6 +4,8 @@ Date	Added
 	* Rev. 14972 Updated misleading comment in conf/mapflag/partylock.txt (bugreport:4930, since r14092). [Ai4rei]
 2011/08/21
 	* Rev. 14938 Added setting 'client_limit_unit_lv' to control the unit types which are affected by 'max_lv' and 'aura_lv' settings. [Ai4rei]
+2011/08/10
+	* Rev. 14931 Upped max_lv and max_aura to 150, and max_aspd to 193.
 2011/07/09
 	* Rev. 14892 Removed 'msg_athena.conf' messages 619 and 620 (duplicates to 572 and 573) (since r5506). [Ai4rei]
 2011/05/13
@@ -30,6 +32,8 @@ Date	Added
 	* Rev. 14587 Corrected wording of the setting homunculus_autoloot (since r12203). [Ai4rei]
 2010/12/10
 	* Rev. 14572 Applied update to charhelp.txt provided by EvilPuncker to match current charcommand behavior (bugreport:4632, follow up to r13403). [Ai4rei]
+2010/11/21
+	* Changed party_share_level from 10 to 15 as per kRO maintenance from 2010/04/14. [Ai4rei]
 2010/10/10
 	* Added cashfood_use_interval config setting. [Paradox924X]
 2010/05/25
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index ac3b6f193..d8efd9f3a 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -74,7 +74,7 @@ natural_heal_skill_interval: 10000
 natural_heal_weight_rate: 50
 
 // Maximum atk speed. (Default 190, Highest allowed 199)
-max_aspd: 190
+max_aspd: 193
 
 // Maximum walk speed rate (200 would be capped to twice the normal speed)
 max_walk_speed: 300
@@ -94,7 +94,7 @@ max_third_parameter: 120
 // Same as max_parameter, but for baby classes.
 max_baby_parameter: 80
 
-// Max armor def/mdef
+// Max armor def/mdef 
 // NOTE: This setting have no effect if server is run on Renewal Mode (RRMODE) 
 // NOTE: does not affects skills and status effects like Mental Strength
 // If weapon_defense_type is non-zero, it won't apply to max def.
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 8e109f4da..4ffd47783 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -10,7 +10,7 @@ passwd: p1
 
 // Server name, use alternative character such as ASCII 160 for spaces.
 // NOTE: Do not use spaces in the name, or guild emblems won't work client-side!
-server_name: eAthena
+server_name: RAthena
 
 // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
 wisp_server_name: Server
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
index bcb53bdf8..4c6191389 100644
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -9,7 +9,7 @@ log_inter: 1
 inter_log_filename: log/inter.log
 
 // Level range for sharing within a party
-party_share_level: 10
+party_share_level: 15
 
 
 // TXT version options only
diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
index 384802628..dff80f3b2 100644
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -312,9 +312,9 @@ map: pvp_y_8-3
 map: pvp_y_8-4
 map: pvp_y_8-5
 map: pvp_y_room
-//map: sword_1-1
-//map: sword_2-1
-//map: sword_3-1
+map: sword_1-1
+map: sword_2-1
+map: sword_3-1
 map: treasure01
 map: treasure02
 //map: wizard_1-1
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index b740a2f37..ae2cd5cd9 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -535,7 +535,33 @@
 //620: FREE
 621: Summer
 //...
-650: Unknown Job
+625: Rune Knight
+626: Warlock
+627: Ranger
+628: Arch Bishop
+629: Mechanic
+630: Guillotine Cross
+631: Royal Guard
+632: Sorcerer
+633: Minstrel
+634: Wanderer
+635: Sura
+636: Genetic
+637: Shadow Chaser
+638: Baby Rune Knight
+639: Baby Warlock
+640: Baby Ranger
+641: Baby Arch Bishop
+642: Baby Mechanic
+643: Baby Guillotine Cross
+644: Baby Royal Guard
+645: Baby Sorcerer
+646: Baby Minstrel
+647: Baby Wanderer
+648: Baby Sura
+649: Baby Genetic
+650: Baby Shadow Chaser
+651: Unknown Job
 
 //Custom translations
 import: conf/import/msg_conf.txt