diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-08-10 20:46:27 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-08-10 20:46:27 +0000 |
| commit | a2ec62d8f24cbc11dcb646712c4c16a5cf897372 (patch) | |
| tree | aaead75f19d72e72fbf60aeca5e1020c314f68e8 /src | |
| parent | a1b41fc31ea08bd869e609bb41dd8ba011dcbb66 (diff) | |
| download | hercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.tar.gz hercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.tar.bz2 hercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.tar.xz hercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.zip | |
* Raised MAX_MERCENARY_CLASS to 44 for new mercenaries.
* Raised max_lv to allow values up to 150 in battle.conf.
* Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees.
* Upped max_lv and max_aura to 150, and max_aspd to 193.
* Added Brasilis database updates from trunk r14928.
* Added scripts and NPC Brasilis updates from trunk r14928.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14931 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/mmo.h | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/pc.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index f9037e913..49a738b08 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -160,7 +160,7 @@ //Mercenary System #define MC_SKILLBASE 8201 #define MAX_MERCSKILL 40 -#define MAX_MERCENARY_CLASS 40 +#define MAX_MERCENARY_CLASS 44 enum item_types { IT_HEALING = 0, diff --git a/src/map/battle.c b/src/map/battle.c index ca5662dd7..f60b375ed 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3764,7 +3764,7 @@ static const struct _battle_data { { "arrow_decrement", &battle_config.arrow_decrement, 1, 0, 2, }, { "max_aspd", &battle_config.max_aspd, 199, 100, 199, }, { "max_walk_speed", &battle_config.max_walk_speed, 300, 100, 100*DEFAULT_WALK_SPEED, }, - { "max_lv", &battle_config.max_lv, 99, 0, 127, }, + { "max_lv", &battle_config.max_lv, 99, 0, 150, }, { "aura_lv", &battle_config.aura_lv, 99, 0, INT_MAX, }, { "max_hp", &battle_config.max_hp, 32500, 100, 1000000000, }, { "max_sp", &battle_config.max_sp, 32500, 100, 1000000000, }, diff --git a/src/map/pc.h b/src/map/pc.h index fdf4094a1..6cf9be63c 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -428,7 +428,7 @@ struct map_session_data { }; //Update this max as necessary. 55 is the value needed for Super Baby currently -#define MAX_SKILL_TREE 55 +#define MAX_SKILL_TREE 77 //Total number of classes (for data storage) #define CLASS_COUNT (JOB_MAX - JOB_NOVICE_HIGH + JOB_MAX_BASIC) |