From 8d3cff4b0ecf4daaa714a598161ff2a31b6930c6 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Thu, 31 Dec 2015 04:02:26 +0100 Subject: [PATCH] Migrated all mapflag constants to source exports --- db/const.txt | 61 ----------------------------------- src/map/script_constants.h | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 61 deletions(-) diff --git a/db/const.txt b/db/const.txt index 3629da5b18..85b802924e 100644 --- a/db/const.txt +++ b/db/const.txt @@ -14,67 +14,6 @@ // in field Value. Depending on the implementation values assigned by scripts to parameters will affect // runtime values, such as Zeny, as well (see pc_readparam/pc_setparam). -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_partylock 14 -mf_noicewall 15 -mf_snow 16 -mf_fog 17 -mf_sakura 18 -mf_leaves 19 -mf_rain 20 -mf_nogo 22 -mf_clouds 23 -mf_clouds2 24 -mf_fireworks 25 -mf_gvg_castle 26 -mf_gvg_dungeon 27 -mf_nightenabled 28 -mf_nobaseexp 29 -mf_nojobexp 30 -mf_nomobloot 31 -mf_nomvploot 32 -mf_noreturn 33 -mf_nowarpto 34 -mf_nightmaredrop 35 -mf_restricted 36 -mf_nocommand 37 -mf_nodrop 38 -mf_jexp 39 -mf_bexp 40 -mf_novending 41 -mf_loadevent 42 -mf_nochat 43 -mf_noexppenalty 44 -mf_guildlock 45 -mf_town 46 -mf_autotrade 47 -mf_allowks 48 -mf_monster_noteleport 49 -mf_pvp_nocalcrank 50 -mf_battleground 51 -mf_reset 52 -mf_nomapchannelautojoin 53 -mf_nousecart 54 -mf_noitemconsumption 55 -mf_sumstartmiracle 56 -mf_nomineeffect 57 -mf_nolockon 58 -mf_notomb 59 -mf_skill_damage 60 - //'setcell' types cell_walkable 0 cell_shootable 1 diff --git a/src/map/script_constants.h b/src/map/script_constants.h index 30865079f9..0ffef4b7a4 100644 --- a/src/map/script_constants.h +++ b/src/map/script_constants.h @@ -328,6 +328,71 @@ export_constant(BC_BLUE); export_constant(BC_WOE); + /* mapflags */ + export_constant(MF_NOMEMO); + export_constant(MF_NOTELEPORT); + export_constant(MF_NOSAVE); + export_constant(MF_NOBRANCH); + export_constant(MF_NOPENALTY); + export_constant(MF_NOZENYPENALTY); + export_constant(MF_PVP); + export_constant(MF_PVP_NOPARTY); + export_constant(MF_PVP_NOGUILD); + export_constant(MF_GVG); + export_constant(MF_GVG_NOPARTY); + export_constant(MF_NOTRADE); + export_constant(MF_NOSKILL); + export_constant(MF_NOWARP); + export_constant(MF_PARTYLOCK); + export_constant(MF_NOICEWALL); + export_constant(MF_SNOW); + export_constant(MF_FOG); + export_constant(MF_SAKURA); + export_constant(MF_LEAVES); + // Intentionally disabled mf_rain because Ind removed it source side + //export_constant(MF_RAIN); + export_constant(MF_NOGO); + export_constant(MF_CLOUDS); + export_constant(MF_CLOUDS2); + export_constant(MF_FIREWORKS); + export_constant(MF_GVG_CASTLE); + export_constant(MF_GVG_DUNGEON); + export_constant(MF_NIGHTENABLED); + export_constant(MF_NOBASEEXP); + export_constant(MF_NOJOBEXP); + export_constant(MF_NOMOBLOOT); + export_constant(MF_NOMVPLOOT); + export_constant(MF_NORETURN); + export_constant(MF_NOWARPTO); + export_constant(MF_NIGHTMAREDROP); + export_constant(MF_RESTRICTED); + export_constant(MF_NOCOMMAND); + export_constant(MF_NODROP); + export_constant(MF_JEXP); + export_constant(MF_BEXP); + export_constant(MF_NOVENDING); + export_constant(MF_LOADEVENT); + export_constant(MF_NOCHAT); + export_constant(MF_NOEXPPENALTY); + export_constant(MF_GUILDLOCK); + export_constant(MF_TOWN); + export_constant(MF_AUTOTRADE); + export_constant(MF_ALLOWKS); + export_constant(MF_MONSTER_NOTELEPORT); + export_constant(MF_PVP_NOCALCRANK); + export_constant(MF_BATTLEGROUND); + export_constant(MF_RESET); + // TODO: Check why it is called differently on source and const + //export_constant(MF_CHANNELAUTOJOIN); + script_set_constant("mf_nomapchannelautojoin",MF_CHANNELAUTOJOIN,false); + export_constant(MF_NOUSECART); + export_constant(MF_NOITEMCONSUMPTION); + export_constant(MF_SUMSTARTMIRACLE); + export_constant(MF_NOMINEEFFECT); + export_constant(MF_NOLOCKON); + export_constant(MF_NOTOMB); + export_constant(MF_SKILL_DAMAGE); + /* status options */ export_constant(OPTION_NOTHING); export_constant(OPTION_SIGHT);