Fix mapflag numbers, disable some things

1 files changed, 127 insertions, 98 deletions

diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 6e5f4803..d2f45290 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -3,37 +3,64 @@
 
 debug            1
 
-mf_nomemo        0
-mf_noteleport    1
-mf_nosave        2
-mf_nobranch      3
-mf_nopenalty     4
-mf_pvp           5
-mf_pvp_noparty   6
-mf_pvp_noguild   7
-mf_gvg           8
-mf_gvg_noparty   9
-mf_nozenypenalty 10
-
-StatusPoint 9    1
+// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
+//MF_NOMEMO           0
+//MF_NOTELEPORT       1
+MF_NOSAVE           2
+//MF_NOBRANCH         3
+//MF_NOPENALTY        4
+//MF_NOZENYPENALTY    5
+MF_PVP              6
+//MF_PVP_NOPARTY      7
+//MF_PVP_NOGUILD      8
+//MF_GVG              9
+//MF_GVG_NOPARTY      10
+//MF_NOTRADE          11
+//MF_NOSKILL          12
+MF_NOWARP           13
+MF_NOPVP            14
+//MF_NOICEWALL        15
+//MF_SNOW             16
+//MF_FOG              17
+//MF_SAKURA           18
+//MF_LEAVES           19
+//MF_RAIN             20
+// Map flags with no assigned value (inaccessible in scripts,
+//      can only be set initially by mapflag):
+//  nowarpto,
+//  noreturn,
+//  monster_noteleport,
+//  pvp_nightmaredrop,
+//  pvp_nocalcrank,
+//  no_player_drops,
+//  town,
+
+// Note: the type-1 constants and the bWhatever are actually
+// the same type internally, but they must be used differently.
+// A *few* can be used for both ...
+// TODO resolve that last, and change the names to match SP_*
+
+// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
+//BaseExp     1    1
+//JobExp      2    1
+Hp          5    1
+MaxHp       6    1
+Sp          7    1
+MaxSp       8    1
+//StatusPoint 9    1
 BaseLevel   11   1
-SkillPoint  12   1
-Class       19   1
-Upper       56   1
+//SkillPoint  12   1
+//Class       19   1
 Zeny        20   1
 Sex         21   1
+//NextBaseExp 22   1
+//NextJobExp  23   1
 Weight      24   1
 MaxWeight   25   1
-JobLevel    55   1
-BaseExp     1    1
-JobExp      2    1
-NextBaseExp 22   1
-NextJobExp  23   1
-Hp          5    1
-MaxHp       6    1
-Sp          7    1
-MaxSp       8    1
+//JobLevel    55   1
+//Upper       56   1
 
+// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
 bMaxHP      6
 bMaxSP      8
 bStr        13
@@ -42,18 +69,18 @@ bVit        15
 bInt        16
 bDex        17
 bLuk        18
-bAtk        41
-bAtk2       42
-bMatk1      43
-bMatk2      44
-bDef        45
+//bAtk        41
+//bAtk2       42
+//bMatk1      43
+//bMatk2      44
+//bDef        45
 bMdef       47
-bMdef2      48
+//bMdef2      48
 bHit        49
 bFlee       50
-bFlee2      51
+//bFlee2      51
 bCritical   52
-bAspd       53
+//bAspd       53
 bDeaf       70
 
 // Elements:
@@ -102,80 +129,82 @@ 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
 
+// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
+
 bAtkRange                1000 // A range bonus of n (bAtkRange,n;).
-bAtkEle                  1001 // Gives the player's attacks a n element (bAtkEle,n;).
-bDefEle                  1002 // Gives the player's defense a n element (bDefEle,n;).
-bCastrate                1003 // Adjusts casting time of skill n by x% (bCastrate,n,x;).
+//bAtkEle                  1001 // Gives the player's attacks a n element (bAtkEle,n;).
+//bDefEle                  1002 // Gives the player's defense a n element (bDefEle,n;).
+//bCastrate                1003 // Adjusts casting time of skill n by x% (bCastrate,n,x;).
 bMaxHPrate               1004 // A max HP bonus of n (bMaxHPrate,n;).
-bMaxSPrate               1005 // A max SP bonus of n (bMaxSPrate,n;).
-bUseSPrate               1006 // Increases the consumption of SP by n% (bUseSPrate,n;).
-bAddEle                  1007 // +x% physical damage against a n element (bAddEle,n,x;).
-bAddRace                 1008 // +x% physical damage against a n race (bAddRace,n,x;).
-bAddSize                 1009 // +x% physical damage against a n size (bAddSize,n,x;).
-bSubEle                  1010 // +x% damage reduction against a n element (bSubEle,n,x;).
-bSubRace                 1011 // +x% damage reduction against race n (bSubRace,n,x;).
-bAddEff                  1012 // Adds a 1/100x% chance to cause effect e to the target when attacking (bAddEff,e,x;).
-bResEff                  1013 // Adds a 1/100x% tolerance to an effect (bResEff,e,x;).
-bBaseAtk                 1014 // A n bonus to the basic attack power (bBaseAtk,n;).
+//bMaxSPrate               1005 // A max SP bonus of n (bMaxSPrate,n;).
+//bUseSPrate               1006 // Increases the consumption of SP by n% (bUseSPrate,n;).
+//bAddEle                  1007 // +x% physical damage against a n element (bAddEle,n,x;).
+//bAddRace                 1008 // +x% physical damage against a n race (bAddRace,n,x;).
+//bAddSize                 1009 // +x% physical damage against a n size (bAddSize,n,x;).
+//bSubEle                  1010 // +x% damage reduction against a n element (bSubEle,n,x;).
+//bSubRace                 1011 // +x% damage reduction against race n (bSubRace,n,x;).
+//bAddEff                  1012 // Adds a 1/100x% chance to cause effect e to the target when attacking (bAddEff,e,x;).
+//bResEff                  1013 // Adds a 1/100x% tolerance to an effect (bResEff,e,x;).
+//bBaseAtk                 1014 // A n bonus to the basic attack power (bBaseAtk,n;).
 bAspdRate                1015 // +n% attack speed (bAspdRate,n;).
 bHPrecovRate             1016 // Natural HP recovery ratio increased of n% (bHPrecovRate,n;).
-bSPrecovRate             1017 // Natural SP recovery ratio increased of n% (bSPrecovRate,n;).
-bSpeedRate               1018 // Moving speed increased of n% and only the highest among all is applied (bSpeedRate,n;).
-bCriticalDef             1019 // Decreases the chance of being hit by critical hits of n% (bCriticalDef,n;).
-bNearAtkDef              1020 // Adds n% damage reduction against melee physical attacks (bNearAtkDef,n;).
-bLongAtkDef              1021 // Adds n% damage reduction against ranged physical attacks (bLongAtkDef,n;).
-bDoubleRate              1022 // Adds a n% probability of doing a double attack (bDoubleRate,n;).
+//bSPrecovRate             1017 // Natural SP recovery ratio increased of n% (bSPrecovRate,n;).
+//bSpeedRate               1018 // Moving speed increased of n% and only the highest among all is applied (bSpeedRate,n;).
+//bCriticalDef             1019 // Decreases the chance of being hit by critical hits of n% (bCriticalDef,n;).
+//bNearAtkDef              1020 // Adds n% damage reduction against melee physical attacks (bNearAtkDef,n;).
+//bLongAtkDef              1021 // Adds n% damage reduction against ranged physical attacks (bLongAtkDef,n;).
+//bDoubleRate              1022 // Adds a n% probability of doing a double attack (bDoubleRate,n;).
 bDoubleAddRate           1023 // Adds another +n% probability of doing a double attack (bDoubleAddRate,n;).
-bMatk                    1024 // Adds a magical attack bonus of n (bMatk,n;).
-bMatkRate                1025 // Adds a magical attack bonus percentage n% (bMatkRate,n;).
-bIgnoreDefEle            1026 // Disregards defense against enemies of a n element (bIgnoreDefEle,n;).
-bIgnoreDefRace           1027 // Disregards defense against enemies of a n race (bIgnoreDefRace,n;).
-bAtkRate                 1028 // Adds an attack bonus of n% (bAtkRate,n;).
+//bMatk                    1024 // Adds a magical attack bonus of n (bMatk,n;).
+//bMatkRate                1025 // Adds a magical attack bonus percentage n% (bMatkRate,n;).
+//bIgnoreDefEle            1026 // Disregards defense against enemies of a n element (bIgnoreDefEle,n;).
+//bIgnoreDefRace           1027 // Disregards defense against enemies of a n race (bIgnoreDefRace,n;).
+//bAtkRate                 1028 // Adds an attack bonus of n% (bAtkRate,n;).
 bSpeedAddRate            1029 // Adds a n% of walking speed (bSpeedAddRate,n;).
-bAspdAddRate             1030 // Adds a n% of attack speed (bAspdAddRate,n;).
-bMagicAtkDef             1031 // Adds a n% damage reduction against magical attacks (bMagicAtkDef,n;).
-bMiscAtkDef              1032 // Adds a n% damage reduction against miscellaneous attacks (traps, falcon, ...) (bMiscAtkDef,n;).
-bIgnoreMdefEle           1033 // Disregards magical defense against enemies of a n element (bIgnoreMdefEle,n;).
-bIgnoreMdefRace          1034 // Disregards magical defense against enemies of a n race (bIgnoreMdefRace,n;).
-bMagicAddEle             1035 // Adds x% of magical damage against a n element (bMagicAddEle,n,x;).
-bMagicAddRace            1036 // Adds x% of magical damage against a n race (bMagicAddRace,n,x;).
-bMagicSubRace            1037 // Removes a x% of magical damage against a n race (bMagicSubRace,n,x;).
-bPerfectHitRate          1038 // On-target impact attack probability n% and only the highest among all is applied (bPerfectHitRate,n;).
-bPerfectHitAddRate       1039 // A n% bonus of an on-target impact (bPerfectHitAddRate,n;).
-bCriticalRate            1040 // Add a n% to the critical hits percentage (bCriticalRate,n;).
-bGetZenyNum              1041 // When killing a monster, there is a x% chance of gaining about n zeny (bGetZenyNum,n;).
-bAddGetZenyNum           1042 // Same as bGetZenyNum, but the rates and zeny to gain stack (bAddGetZenyNum,n,x;).
-bAddDamageClass          1043 // +x% of extra physical damage against monsters of class n, against players n is their job id (bAddDamageClass,n,x;).
-bAddMagicDamageClass     1044 // +x% of extra magical damage against monsters of class n, against players n is their job id (bAddDamageClass,n,x;).
-bAddDefClass             1045 // +x% physical damage reduction against monsters of class n, against players n is their job id (bAddDefClass,n,x;)
-bAddMdefClass            1046 // +x% magical damage reduction against monsters of class n, against players n is their job id (bAddDefClass,n,x;)
-bAddMonsterDropItem      1047 // Adds a x/100% chance for a n item to be dropped, when killing any monster (bAddMonsterDropItem,n,x;)
-bDefRatioAtkEle          1048 // Does more damage depending on the monster's defense against a n element (bDefRatioAtkEle,n;).
-bDefRatioAtkRace         1049 // Does more damage depending on the monster's defense against a n race (bDefRatioAtkRace,n;).
-bAddSpeed                1050 // Adds a n speed to the player (bAddSpeed,n;).
-bHitRate                 1051 // Adds a n% rate to hit (bHitRate,n;).
-bFleeRate                1052 // Adds a n% to flee a monster's attack (bFleeRate,n;).
-bFlee2Rate               1053 // Adds a n% to dodge a monster's attack (bFleeRate,n;).
+//bAspdAddRate             1030 // Adds a n% of attack speed (bAspdAddRate,n;).
+//bMagicAtkDef             1031 // Adds a n% damage reduction against magical attacks (bMagicAtkDef,n;).
+//bMiscAtkDef              1032 // Adds a n% damage reduction against miscellaneous attacks (traps, falcon, ...) (bMiscAtkDef,n;).
+//bIgnoreMdefEle           1033 // Disregards magical defense against enemies of a n element (bIgnoreMdefEle,n;).
+//bIgnoreMdefRace          1034 // Disregards magical defense against enemies of a n race (bIgnoreMdefRace,n;).
+//bMagicAddEle             1035 // Adds x% of magical damage against a n element (bMagicAddEle,n,x;).
+//bMagicAddRace            1036 // Adds x% of magical damage against a n race (bMagicAddRace,n,x;).
+//bMagicSubRace            1037 // Removes a x% of magical damage against a n race (bMagicSubRace,n,x;).
+//bPerfectHitRate          1038 // On-target impact attack probability n% and only the highest among all is applied (bPerfectHitRate,n;).
+//bPerfectHitAddRate       1039 // A n% bonus of an on-target impact (bPerfectHitAddRate,n;).
+//bCriticalRate            1040 // Add a n% to the critical hits percentage (bCriticalRate,n;).
+//bGetZenyNum              1041 // When killing a monster, there is a x% chance of gaining about n zeny (bGetZenyNum,n;).
+//bAddGetZenyNum           1042 // Same as bGetZenyNum, but the rates and zeny to gain stack (bAddGetZenyNum,n,x;).
+//bAddDamageClass          1043 // +x% of extra physical damage against monsters of class n, against players n is their job id (bAddDamageClass,n,x;).
+//bAddMagicDamageClass     1044 // +x% of extra magical damage against monsters of class n, against players n is their job id (bAddDamageClass,n,x;).
+//bAddDefClass             1045 // +x% physical damage reduction against monsters of class n, against players n is their job id (bAddDefClass,n,x;)
+//bAddMdefClass            1046 // +x% magical damage reduction against monsters of class n, against players n is their job id (bAddDefClass,n,x;)
+//bAddMonsterDropItem      1047 // Adds a x/100% chance for a n item to be dropped, when killing any monster (bAddMonsterDropItem,n,x;)
+//bDefRatioAtkEle          1048 // Does more damage depending on the monster's defense against a n element (bDefRatioAtkEle,n;).
+//bDefRatioAtkRace         1049 // Does more damage depending on the monster's defense against a n race (bDefRatioAtkRace,n;).
+//bAddSpeed                1050 // Adds a n speed to the player (bAddSpeed,n;).
+//bHitRate                 1051 // Adds a n% rate to hit (bHitRate,n;).
+//bFleeRate                1052 // Adds a n% to flee a monster's attack (bFleeRate,n;).
+//bFlee2Rate               1053 // Adds a n% to dodge a monster's attack (bFleeRate,n;).
 bDefRate                 1054 // Adds a n% of defense to the equipment (bDefRate,n;).
 bDef2Rate                1055 // Adds a n% of defense based on the vitality to the equipment (bDef2Rate,n;).
-bMdefRate                1056 // Adds a n% of magical defense to the equipment (bMdefRate,n;).
-bMdef2Rate               1057 // Adds a n% of magical defense based on the vitality to the equipment (bMdef2Rate,n;).
-bSplashRange             1058 // Adds n to the splash attack radius and only the highest among all is applied (bSplashRange,n;).
-bSplashAddRange          1059 // Adds n to the splash attack radius (bSplashRange,n;).
-bAutoSpell               1060 // Auto Spell casting on attack of spell n at level x with a y/10% chance (bAutoSpell,n,x,y;).
+//bMdefRate                1056 // Adds a n% of magical defense to the equipment (bMdefRate,n;).
+//bMdef2Rate               1057 // Adds a n% of magical defense based on the vitality to the equipment (bMdef2Rate,n;).
+//bSplashRange             1058 // Adds n to the splash attack radius and only the highest among all is applied (bSplashRange,n;).
+//bSplashAddRange          1059 // Adds n to the splash attack radius (bSplashRange,n;).
+//bAutoSpell               1060 // Auto Spell casting on attack of spell n at level x with a y/10% chance (bAutoSpell,n,x,y;).
 bHPDrainRate             1061 // Adds a n/10% chance to receive x% of dealed damage as HP from a monster of race r with normal attack (bHPDrainRateRace,r,n,x;).
-bSPDrainRate             1062 // Adds a n/10% chance to receive x% of dealed damage as SP from a monster of race r with normal attack (bSPDrainRateRace,r,n,x;).
-bShortWeaponDamageReturn 1063 // Reflects n% of received melee damage back to the enemy that caused it (bShortWeaponDamageReturn,n;).
-bLongWeaponDamageReturn  1064 // Reflects n% of received ranged damage back to the enemy that caused it (bShortWeaponDamageReturn,n;).
-bWeaponComaEle           1065 // Adds a n/100% chance to cause coma when attacking a monster of a x element with a normal attack (bWeaponComaEle,x,n;).
-bWeaponComaRace          1066 // Adds a n/100% chance to cause coma when attacking a monster of a x race with a normal attack (bWeaponComaEle,x,n;).
-bAddEff2                 1067 // Adds a n/100% chance to cause status change x on self when attacking (bAddEff2,x,n;).
-bMagicDamageReturn       1068 // Adds a n% chance to reflect targetted magic spells back to the enemy that caused it (bMagicDamageReturn,n;).
-bRandomAttackIncrease    1069 // Adds a n% chance to inflict x% additional damage to the enemy with normal attack (bRandomAttackIncrease,x,n;).
-bAllStats                1070 // Adds a n number in Strengh, Agility, Vitality, Intelligence, Dexterity and Luck (bAllStats,n;).
-bAgiVit                  1071 // Adds a n number in Agility and Vitality (bAgiVit,n;).
-bAgiDexStr               1072 // Adds a n number in Agility, Dexterity and Strengh (bAgiDexStr,n;).
-bPerfectHide             1073 // A hidden character is no longer detected by monsters with 'detector' mode (bPerfectHide,1;).
+//bSPDrainRate             1062 // Adds a n/10% chance to receive x% of dealed damage as SP from a monster of race r with normal attack (bSPDrainRateRace,r,n,x;).
+//bShortWeaponDamageReturn 1063 // Reflects n% of received melee damage back to the enemy that caused it (bShortWeaponDamageReturn,n;).
+//bLongWeaponDamageReturn  1064 // Reflects n% of received ranged damage back to the enemy that caused it (bShortWeaponDamageReturn,n;).
+//bWeaponComaEle           1065 // Adds a n/100% chance to cause coma when attacking a monster of a x element with a normal attack (bWeaponComaEle,x,n;).
+//bWeaponComaRace          1066 // Adds a n/100% chance to cause coma when attacking a monster of a x race with a normal attack (bWeaponComaEle,x,n;).
+//bAddEff2                 1067 // Adds a n/100% chance to cause status change x on self when attacking (bAddEff2,x,n;).
+//bMagicDamageReturn       1068 // Adds a n% chance to reflect targetted magic spells back to the enemy that caused it (bMagicDamageReturn,n;).
+//bRandomAttackIncrease    1069 // Adds a n% chance to inflict x% additional damage to the enemy with normal attack (bRandomAttackIncrease,x,n;).
+//bAllStats                1070 // Adds a n number in Strengh, Agility, Vitality, Intelligence, Dexterity and Luck (bAllStats,n;).
+//bAgiVit                  1071 // Adds a n number in Agility and Vitality (bAgiVit,n;).
+//bAgiDexStr               1072 // Adds a n number in Agility, Dexterity and Strengh (bAgiDexStr,n;).
+//bPerfectHide             1073 // A hidden character is no longer detected by monsters with 'detector' mode (bPerfectHide,1;).
 
 equip_head   1
 equip_shield 2