diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-29 00:25:49 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-29 00:25:49 -0300 |
| commit | 8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc (patch) | |
| tree | ec33ef42c2a3125a3e875864b43ad1a7c65bef51 /conf | |
| parent | 8071ddde86666c1495c5119b3927f5718b690f60 (diff) | |
| parent | d6358d0d127ffac94f243d29eccc6793567e9c60 (diff) | |
| download | serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.tar.gz serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.tar.bz2 serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.tar.xz serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/map/battle/homunc.conf | 3 | ||||
| -rw-r--r-- | conf/map/battle/player.conf | 2 | ||||
| -rw-r--r-- | conf/map/battle/skill.conf | 2 | ||||
| -rw-r--r-- | conf/map/maps.conf | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/conf/map/battle/homunc.conf b/conf/map/battle/homunc.conf index 76fee3f4e..f08d4bd20 100644 --- a/conf/map/battle/homunc.conf +++ b/conf/map/battle/homunc.conf @@ -66,3 +66,6 @@ homunculus_max_level: 140 // Max level for Homunculus S homunculus_S_max_level: 150 + +// FF-Update +hom_bonus_exp_from_master: 15 diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf index aa9af9cf3..3c6d850e1 100644 --- a/conf/map/battle/player.conf +++ b/conf/map/battle/player.conf @@ -135,7 +135,7 @@ max_def: 99 over_def_bonus: 0 // Max weight carts can hold. -max_cart_weight: 8000 +max_cart_weight: 5000 // Prevent logout of players after being hit for how long (in ms, 0 disables)? prevent_logout: 10000 diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf index 2713cb79e..038ec528d 100644 --- a/conf/map/battle/skill.conf +++ b/conf/map/battle/skill.conf @@ -251,7 +251,7 @@ max_heal_lv: 11 // 8: Skill is usable on GvG grounds //16: Disable skill from "nowarpto" maps // (it will work on GVG castles even if they are set to nowarpto, though) -emergency_call: 11 +emergency_call: 27 // Guild Aura Skills setting (add as appropriate). // (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES) diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 58891b763..733e5f357 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -127,6 +127,8 @@ map_list: ( "018-5-3", "018-5-boss", "018-5", + "018-6-0", + "018-6-1", "019-1-1", "019-1", "019-2", |