* Merged enumeration update from renewal [14699/branches/renewal] for a future commit.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14709 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 414 insertions, 10 deletions

diff --git a/src/map/skill.h b/src/map/skill.h
index fc7877be3..6f55af7ec 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -865,7 +865,7 @@ enum e_skill {
 	SL_SKA,
 
 	SM_SELFPROVOKE,
-	NPC_EMOTION_ON,	
+	NPC_EMOTION_ON,
 	ST_PRESERVE,
 	ST_FULLSTRIP,
 	WS_WEAPONREFINE,
@@ -973,20 +973,19 @@ enum e_skill {
 	NPC_INVINCIBLE,
 	NPC_INVINCIBLEOFF,
 	NPC_ALLHEAL,
-	//GM_SANDMAN = 688,
-	CASH_BLESSING = 689,
+	GM_SANDMAN,
+	CASH_BLESSING,
 	CASH_INCAGI,
 	CASH_ASSUMPTIO,
-	/*
-	ALL_CATCRY = 692,
+	ALL_CATCRY,
 	ALL_PARTYFLEE,
 	ALL_ANGEL_PROTECT,
 	ALL_DREAM_SUMMERNIGHT,
 	NPC_CHANGEUNDEAD2,
-	ALL_REVERSEORCISH
-	*/
-	ALL_WEWISH = 698,
-	//ALL_SONKRAN = 699,
+	ALL_REVERSEORCISH,
+	ALL_WEWISH,
+	ALL_SONKRAN,
+
 	KN_CHARGEATK = 1001,
 	CR_SHRINK,
 	AS_SONICACCEL,
@@ -1007,6 +1006,312 @@ enum e_skill {
 	SA_ELEMENTFIRE,
 	SA_ELEMENTWIND,
 
+	RK_ENCHANTBLADE = 2001,
+	RK_SONICWAVE,
+	RK_DEATHBOUND,
+	RK_HUNDREDSPEAR,
+	RK_WINDCUTTER,
+	RK_IGNITIONBREAK,
+	RK_DRAGONTRAINING,
+	RK_DRAGONBREATH,
+	RK_DRAGONHOWLING,
+	RK_RUNEMASTERY,
+	RK_MILLENNIUMSHIELD,
+	RK_CRUSHSTRIKE,
+	RK_REFRESH,
+	RK_GIANTGROWTH,
+	RK_STONEHARDSKIN,
+	RK_VITALITYACTIVATION,
+	RK_STORMBLAST,
+	RK_FIGHTINGSPIRIT,
+	RK_ABUNDANCE,
+	RK_PHANTOMTHRUST,
+
+	GC_VENOMIMPRESS,
+	GC_CROSSIMPACT,
+	GC_DARKILLUSION,
+	GC_RESEARCHNEWPOISON,
+	GC_CREATENEWPOISON,
+	GC_ANTIDOTE,
+	GC_POISONINGWEAPON,
+	GC_WEAPONBLOCKING,
+	GC_COUNTERSLASH,
+	GC_WEAPONCRUSH,
+	GC_VENOMPRESSURE,
+	GC_POISONSMOKE,
+	GC_CLOAKINGEXCEED,
+	GC_PHANTOMMENACE,
+	GC_HALLUCINATIONWALK,
+	GC_ROLLINGCUTTER,
+	GC_CROSSRIPPERSLASHER,
+
+	AB_JUDEX,
+	AB_ANCILLA,
+	AB_ADORAMUS,
+	AB_CLEMENTIA,
+	AB_CANTO,
+	AB_CHEAL,
+	AB_EPICLESIS,
+	AB_PRAEFATIO,
+	AB_ORATIO,
+	AB_LAUDAAGNUS,
+	AB_LAUDARAMUS,
+	AB_EUCHARISTICA,
+	AB_RENOVATIO,
+	AB_HIGHNESSHEAL,
+	AB_CLEARANCE,
+	AB_EXPIATIO,
+	AB_DUPLELIGHT,
+	AB_DUPLELIGHT_MELEE,
+	AB_DUPLELIGHT_MAGIC,
+	AB_SILENTIUM,
+
+	WL_WHITEIMPRISON = 2201,
+	WL_SOULEXPANSION,
+	WL_FROSTMISTY,
+	WL_JACKFROST,
+	WL_MARSHOFABYSS,
+	WL_RECOGNIZEDSPELL,
+	WL_SIENNAEXECRATE,
+	WL_RADIUS,
+	WL_STASIS,
+	WL_DRAINLIFE,
+	WL_CRIMSONROCK,
+	WL_HELLINFERNO,
+	WL_COMET,
+	WL_CHAINLIGHTNING,
+	WL_CHAINLIGHTNING_ATK,
+	WL_EARTHSTRAIN,
+	WL_TETRAVORTEX,
+	WL_TETRAVORTEX_FIRE,
+	WL_TETRAVORTEX_WATER,
+	WL_TETRAVORTEX_WIND,
+	WL_TETRAVORTEX_GROUND,
+	WL_SUMMONFB,
+	WL_SUMMONBL,
+	WL_SUMMONWB,
+	WL_SUMMON_ATK_FIRE,
+	WL_SUMMON_ATK_WIND,
+	WL_SUMMON_ATK_WATER,
+	WL_SUMMON_ATK_GROUND,
+	WL_SUMMONSTONE,
+	WL_RELEASE,
+	WL_READING_SB,
+	WL_FREEZE_SP,
+
+	RA_ARROWSTORM,
+	RA_FEARBREEZE,
+	RA_RANGERMAIN,
+	RA_AIMEDBOLT,
+	RA_DETONATOR,
+	RA_ELECTRICSHOCKER,
+	RA_CLUSTERBOMB,
+	RA_WUGMASTERY,
+	RA_WUGRIDER,
+	RA_WUGDASH,
+	RA_WUGSTRIKE,
+	RA_WUGBITE,
+	RA_TOOTHOFWUG,
+	RA_SENSITIVEKEEN,
+	RA_CAMOUFLAGE,
+	RA_RESEARCHTRAP,
+	RA_MAGENTATRAP,
+	RA_COBALTTRAP,
+	RA_MAIZETRAP,
+	RA_VERDURETRAP,
+	RA_FIRINGTRAP,
+	RA_ICEBOUNDTRAP,
+
+	NC_MADOLICENCE,
+	NC_BOOSTKNUCKLE,
+	NC_PILEBUNKER,
+	NC_VULCANARM,
+	NC_FLAMELAUNCHER,
+	NC_COLDSLOWER,
+	NC_ARMSCANNON,
+	NC_ACCELERATION,
+	NC_HOVERING,
+	NC_F_SIDESLIDE,
+	NC_B_SIDESLIDE,
+	NC_MAINFRAME,
+	NC_SELFDESTRUCTION,
+	NC_SHAPESHIFT,
+	NC_EMERGENCYCOOL,
+	NC_INFRAREDSCAN,
+	NC_ANALYZE,
+	NC_MAGNETICFIELD,
+	NC_NEUTRALBARRIER,
+	NC_STEALTHFIELD,
+	NC_REPAIR,
+	NC_TRAININGAXE,
+	NC_RESEARCHFE,
+	NC_AXEBOOMERANG,
+	NC_POWERSWING,
+	NC_AXETORNADO,
+	NC_SILVERSNIPER,
+	NC_MAGICDECOY,
+	NC_DISJOINT,
+
+	SC_FATALMENACE,
+	SC_REPRODUCE,
+	SC_AUTOSHADOWSPELL,
+	SC_SHADOWFORM,
+	SC_TRIANGLESHOT,
+	SC_BODYPAINT,
+	SC_INVISIBILITY,
+	SC_DEADLYINFECT,
+	SC_ENERVATION,
+	SC_GROOMY,
+	SC_IGNORANCE,
+	SC_LAZINESS,
+	SC_UNLUCKY,
+	SC_WEAKNESS,
+	SC_STRIPACCESSARY,
+	SC_MANHOLE,
+	SC_DIMENSIONDOOR,
+	SC_CHAOSPANIC,
+	SC_MAELSTROM,
+	SC_BLOODYLUST,
+	SC_FEINTBOMB,
+
+	LG_CANNONSPEAR = 2307,
+	LG_BANISHINGPOINT,
+	LG_TRAMPLE,
+	LG_SHIELDPRESS,
+	LG_REFLECTDAMAGE,
+	LG_PINPOINTATTACK,
+	LG_FORCEOFVANGUARD,
+	LG_RAGEBURST,
+	LG_SHIELDSPELL,
+	LG_EXEEDBREAK,
+	LG_OVERBRAND,
+	LG_PRESTIGE,
+	LG_BANDING,
+	LG_MOONSLASHER,
+	LG_RAYOFGENESIS,
+	LG_PIETY,
+	LG_EARTHDRIVE,
+	LG_HESPERUSLIT,
+	LG_INSPIRATION,
+
+	SR_DRAGONCOMBO,
+	SR_SKYNETBLOW,
+	SR_EARTHSHAKER,
+	SR_FALLENEMPIRE,
+	SR_TIGERCANNON,
+	SR_HELLGATE,
+	SR_RAMPAGEBLASTER,
+	SR_CRESCENTELBOW,
+	SR_CURSEDCIRCLE,
+	SR_LIGHTNINGWALK,
+	SR_KNUCKLEARROW,
+	SR_WINDMILL,
+	SR_RAISINGDRAGON,
+	SR_GENTLETOUCH,
+	SR_ASSIMILATEPOWER,
+	SR_POWERVELOCITY,
+	SR_CRESCENTELBOW_AUTOSPELL,
+	SR_GATEOFHELL,
+	SR_GENTLETOUCH_QUIET,
+	SR_GENTLETOUCH_CURE,
+	SR_GENTLETOUCH_ENERGYGAIN,
+	SR_GENTLETOUCH_CHANGE,
+	SR_GENTLETOUCH_REVITALIZE,
+
+	WA_SWING_DANCE = 2350,
+	WA_SYMPHONY_OF_LOVER,
+	WA_MOONLIT_SERENADE,
+	MI_RUSH_WINDMILL = 2381,
+	MI_ECHOSONG,
+	MI_HARMONIZE,
+	WM_LESSON = 2412,
+	WM_METALICSOUND,
+	WM_REVERBERATION,
+	WM_REVERBERATION_MELEE,
+	WM_REVERBERATION_MAGIC,
+	WM_DOMINION_IMPULSE,
+	WM_SEVERE_RAINSTORM,
+	WM_POEMOFNETHERWORLD,
+	WM_VOICEOFSIREN,
+	WM_DEADHILLHERE,
+	WM_LULLABY_DEEPSLEEP,
+	WM_SIRCLEOFNATURE,
+	WM_RANDOMIZESPELL,
+	WM_GLOOMYDAY,
+	WM_GREAT_ECHO,
+	WM_SONG_OF_MANA,
+	WM_DANCE_WITH_WUG,
+	WM_SOUND_OF_DESTRUCTION,
+	WM_SATURDAY_NIGHT_FEVER,
+	WM_LERADS_DEW,
+	WM_MELODYOFSINK,
+	WM_BEYOND_OF_WARCRY,
+	WM_UNLIMITED_HUMMING_VOICE,
+
+	SO_FIREWALK = 2443,
+	SO_ELECTRICWALK,
+	SO_SPELLFIST,
+	SO_EARTHGRAVE,
+	SO_DIAMONDDUST,
+	SO_POISON_BUSTER,
+	SO_PSYCHIC_WAVE,
+	SO_CLOUD_KILL,
+	SO_STRIKING,
+	SO_WARMER,
+	SO_VACUUM_EXTREME,
+	SO_VARETYR_SPEAR,
+	SO_ARRULLO,
+	SO_EL_CONTROL,
+	SO_SUMMON_AGNI,
+	SO_SUMMON_AQUA,
+	SO_SUMMON_VENTUS,
+	SO_SUMMON_TERA,
+	SO_EL_ACTION,
+	SO_EL_ANALYSIS,
+	SO_EL_SYMPATHY,
+	SO_EL_CURE,
+	SO_FIRE_INSIGNIA,
+	SO_WATER_INSIGNIA,
+	SO_WIND_INSIGNIA,
+	SO_EARTH_INSIGNIA,
+
+	GN_TRAINING_SWORD = 2474,
+	GN_REMODELING_CART,
+	GN_CART_TORNADO,
+	GN_CARTCANNON,
+	GN_CARTBOOST,
+	GN_THORNS_TRAP,
+	GN_BLOOD_SUCKER,
+	GN_SPORE_EXPLOSION,
+	GN_WALLOFTHORN,
+	GN_CRAZYWEED,
+	GN_CRAZYWEED_ATK,
+	GN_DEMONIC_FIRE,
+	GN_FIRE_EXPANSION,
+	GN_FIRE_EXPANSION_SMOKE_POWDER,
+	GN_FIRE_EXPANSION_TEAR_GAS,
+	GN_FIRE_EXPANSION_ACID,
+	GN_HELLS_PLANT,
+	GN_HELLS_PLANT_ATK,
+	GN_MANDRAGORA,
+	GN_SLINGITEM,
+	GN_CHANGEMATERIAL,
+	GN_MIX_COOKING,
+	GN_MAKEBOMB,
+	GN_S_PHARMACY,
+	GN_SLINGITEM_RANGEMELEEATK,
+
+	AB_SECRAMENT,
+	WM_SEVERE_RAINSTORM_MELEE,
+	SR_HOWLINGOFLION,
+	SR_RIDEINLIGHTNING,
+	LG_OVERBRAND_BRANDISH,
+	LG_OVERBRAND_PLUSATK,
+
+	ALL_ODINS_RECALL = 2533,
+	RETURN_TO_ELDICASTES,
+	ALL_BUYING_STORE,
+
 	HLIF_HEAL = 8001,
 	HLIF_AVOID,
 	HLIF_BRAIN,
@@ -1064,6 +1369,49 @@ enum e_skill {
 	MER_KYRIE,
 	MER_BLESSING,
 	MER_INCAGI,
+
+	EL_CIRCLE_OF_FIRE = 8401,
+	EL_FIRE_CLOAK,
+	EL_FIRE_MANTLE,
+	EL_WATER_SCREEN,
+	EL_WATER_DROP,
+	EL_WATER_BARRIER,
+	EL_WIND_STEP,
+	EL_WIND_CURTAIN,
+	EL_ZEPHYR,
+	EL_SOLID_SKIN,
+	EL_STONE_SHIELD,
+	EL_POWER_OF_GAIA,
+	EL_PYROTECHNIC,
+	EL_HEATER,
+	EL_TROPIC,
+	EL_AQUAPLAY,
+	EL_COOLER,
+	EL_CHILLY_AIR,
+	EL_GUST,
+	EL_BLAST,
+	EL_WILD_STORM,
+	EL_PETROLOGY,
+	EL_CURSED_SOIL,
+	EL_UPHEAVAL,
+	EL_FIRE_ARROW,
+	EL_FIRE_BOMB,
+	EL_FIRE_BOMB_ATK,
+	EL_FIRE_WAVE,
+	EL_FIRE_WAVE_ATK,
+	EL_ICE_NEEDLE,
+	EL_WATER_SCREW,
+	EL_WATER_SCREW_ATK,
+	EL_TIDAL_WEAPON,
+	EL_WIND_SLASH,
+	EL_HURRICANE,
+	EL_HURRICANE_ATK,
+	EL_TYPOON_MIS,
+	EL_TYPOON_MIS_ATK,
+	EL_STONE_HAMMER,
+	EL_ROCK_CRUSHER,
+	EL_ROCK_CRUSHER_ATK,
+	EL_STONE_RAIN,
 };
 
 /// The client view ids for land skills.
@@ -1144,6 +1492,49 @@ enum {
 	UNT_EVILLAND,
 	UNT_DARK_RUNNER, //TODO
 	UNT_DARK_TRANSFER, //TODO
+	UNT_EPICLESIS, //TODO
+	UNT_EARTHSTRAIN, //TODO
+	UNT_MANHOLE, //TODO
+	UNT_DIMENSIONDOOR, //TODO
+	UNT_CHAOSPANIC, //TODO
+	UNT_MAELSTROM, //TODO
+	UNT_BLOODYLUST, //TODO
+	UNT_FEINTBOMB, //TODO
+	UNT_MAGENTATRAP, //TODO
+	UNT_COBALTTRAP, //TODO
+	UNT_MAIZETRAP, //TODO
+	UNT_VERDURETRAP, //TODO
+	UNT_FIRINGTRAP, //TODO
+	UNT_ICEBOUNDTRAP, //TODO
+	UNT_ELECTRICSHOCKER, //TODO
+	UNT_CLUSTERBOMB, //TODO
+	UNT_REVERBERATION, //TODO
+	UNT_SEVERE_RAINSTORM, //TODO
+	UNT_FIREWALK, //TODO
+	UNT_ELECTRICWALK, //TODO
+	UNT_POEMOFNETHERWORLD, //TODO
+	UNT_PSYCHIC_WAVE, //TODO
+	UNT_CLOUD_KILL, //TODO
+	UNT_POISONSMOKE, //TODO
+	UNT_NEUTRALBARRIER, //TODO
+	UNT_STEALTHFIELD, //TODO
+	UNT_WARMER, //TODO
+	UNT_THORNS_TRAP, //TODO
+	UNT_WALLOFTHORN, //TODO
+	UNT_DEMONIC_FIRE, //TODO
+	UNT_FIRE_EXPANSION_SMOKE_POWDER, //TODO
+	UNT_FIRE_EXPANSION_TEAR_GAS, //TODO
+	UNT_HELLS_PLANT, //TODO
+	UNT_VACUUM_EXTREME, //TODO
+	UNT_BANDING, //TODO
+	UNT_FIRE_MANTLE, //TODO
+	UNT_WATER_BARRIER, //TODO
+	UNT_ZEPHYR, //TODO
+	UNT_POWER_OF_GAIA, //TODO
+	UNT_FIRE_INSIGNIA, //TODO
+	UNT_WATER_INSIGNIA, //TODO
+	UNT_WIND_INSIGNIA, //TODO
+	UNT_EARTH_INSIGNIA, //TODO
 
 	UNT_MAX = 0x190
 };
diff --git a/src/map/status.h b/src/map/status.h
index e46494a36..718fd2e88 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -910,6 +910,7 @@ enum si_type {
 	SI_WATER_INSIGNIA = 568,
 	SI_WIND_INSIGNIA = 569,
 	SI_EARTH_INSIGNIA = 570,
+	SI_EQUIPED_FLOOR = 571,
 */
 };
 
@@ -955,7 +956,9 @@ enum {
 	OPT1_STUN,
 	OPT1_SLEEP,
 	//Aegis uses OPT1 = 5 to identify undead enemies (which also grants them immunity to the other opt1 changes)
-	OPT1_STONEWAIT=6 //Petrifying
+	OPT1_STONEWAIT=6, //Petrifying
+	OPT1_BURNING,
+	OPT1_IMPRISON,
 };
 
 //opt2: Stackable status changes.
@@ -968,6 +971,7 @@ enum {
 	OPT2_ANGELUS      = 0x0020,
 	OPT2_BLEEDING     = 0x0040,
 	OPT2_DPOISON      = 0x0080,
+	OPT2_FEAR         = 0x0100,
 };
 
 //opt3: (SHOW_EFST_*)
@@ -1014,9 +1018,18 @@ enum {
 	OPTION_XMAS      = 0x00010000,
 	OPTION_TRANSFORM = 0x00020000,
 	OPTION_SUMMER    = 0x00040000,
+	OPTION_DRAGON1   = 0x00080000,
+	OPTION_WUG       = 0x00100000,
+	OPTION_WUGRIDER  = 0x00200000,
+	OPTION_MADOGEAR  = 0x00400000,
+	OPTION_DRAGON2   = 0x00800000,
+	OPTION_DRAGON3   = 0x01000000,
+	OPTION_DRAGON4   = 0x02000000,
+	OPTION_DRAGON5   = 0x04000000,
 };
 
 #define OPTION_CART (OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5)
+#define OPTION_DRAGON (OPTION_DRAGON1|OPTION_DRAGON2|OPTION_DRAGON3|OPTION_DRAGON4|OPTION_DRAGON5)
 
 #define OPTION_MASK ~0x40