mergeHEADmaster

1 files changed, 25 insertions, 22 deletions

diff --git a/world/map/db/params.txt b/world/map/db/params.txt
index d600b4ad..512d0ac8 100644
--- a/world/map/db/params.txt
+++ b/world/map/db/params.txt
@@ -28,6 +28,7 @@ NEXTBASEEXP                     22   1
 NEXTJOBEXP                      23   1
 Weight                          24   1
 MaxWeight                       25   1
+MaxWeightOverride               27   1
 ATK1                            41   1
 ATK2                            42   1
 MATK1                           43   1
@@ -74,34 +75,36 @@ MUTE_PARTY                      1084 1
 //MUTE_GUILD                    1085 1
 AUTOMOD                         1086 1
 
-bMaxHP      6 // MaxHP + n
-bMaxSP      8 // MaxSP + n
-bStr        13 // STR + n
-bAgi        14 // AGI + n
-bVit        15 // VIT + n
-bInt        16 // INT + n
-bDex        17 // DEX + n
-bLuk        18 // LUK + n
-bAtk        41 // ATK + n (Minimum attack power)
-bAtk2       42 // ATK2 + n (Maximum attack power)
-bMatk1      43 // MATK1 + n (Maximum magical attack power)
-bMatk2      44 // MATK2 + n (Minimum magical attack power)
+bMaxHP        6  // MaxHP + n
+bMaxSP        8  // MaxSP + n
+bStr          13 // STR + n
+bAgi          14 // AGI + n
+bVit          15 // VIT + n
+bInt          16 // INT + n
+bDex          17 // DEX + n
+bLuk          18 // LUK + n
+bMaxWeight    25 // Sets the maximum possible weight to carry to n (bMaxWeight,n;).    Note: As a failsafe 1000 is added to n, final weight is n + 1000.
+bMaxWeightAdd 26 // Adds n to the maximum possible weight to carry (bMaxWeightAdd,n;). Note: As a failsafe 1000 is added to n, final weight is MaxWeight + n + 1000.
+bAtk          41 // ATK + n (Minimum attack power)
+bAtk2         42 // ATK2 + n (Maximum attack power)
+bMatk1        43 // MATK1 + n (Maximum magical attack power)
+bMatk2        44 // MATK2 + n (Minimum magical attack power)
 // Greatest of MATK1 and MATK2 is taken and becomes MATK1 and MATK2 is set to 0.
 // So using MATK2 bonus at the moment has no real benefit you only need greater values to reach same as MATK1.
 // MATK1 += INT + (INT / 5) * (INT / 5);
 // MATK2 += INT + (INT / 7) * (INT / 7);
 // The whole magic system is currently handled in serverdata which only uses MATK1 but the magic attack functions
 // do already exist in servercode only skills must be added there.
-bDef        45 // Equipment DEF + n
-bDef2       46 // VIT based DEF + n
-bMdef       47 // Equipment MDEF + n
-bMdef2      48 // INT based MDEF + n
-bHit        49 // Hit + n
-bFlee       50 // Flee + n
-bFlee2      51 // Perfect Dodge + n
-bCritical   52 // Critical + n
-bAspd       53 // Attack speed + n
-bDeaf       70
+bDef          45 // Equipment DEF + n
+bDef2         46 // VIT based DEF + n
+bMdef         47 // Equipment MDEF + n
+bMdef2        48 // INT based MDEF + n
+bHit          49 // Hit + n
+bFlee         50 // Flee + n
+bFlee2        51 // Perfect Dodge + n
+bCritical     52 // Critical + n
+bAspd         53 // Attack speed + n
+bDeaf         70
 
 // Those which can be used with the arrow are only bCritical, bAtkEle, bHit, bAddEle, bAddRace, bAddSize and bAddEff. The other bonuses are ignored.
 // For more information, have a look here: http://code.google.com/p/eathena/source/browse/trunk/doc/item_bonus.txt