diff options
author | technote24 <technote24@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-10-03 20:45:45 +0000 |
---|---|---|
committer | technote24 <technote24@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-10-03 20:45:45 +0000 |
commit | d4cec2529589b43bb4fd70ba79589bc1bb75da98 (patch) | |
tree | 1fcebd8a35da4b93921b63379e482604f8e2f2cb /src/map/clif.h | |
parent | 3eb270dcc69016eea6a5e5ea602c895e4a779443 (diff) | |
download | hercules-d4cec2529589b43bb4fd70ba79589bc1bb75da98.tar.gz hercules-d4cec2529589b43bb4fd70ba79589bc1bb75da98.tar.bz2 hercules-d4cec2529589b43bb4fd70ba79589bc1bb75da98.tar.xz hercules-d4cec2529589b43bb4fd70ba79589bc1bb75da98.zip |
=General
*Updated a hand full of enum tables and added some place holders in the skill databases.
-Tables updated are the Emotions, Map Types, Use Skill Fail Causes, Skills, Units, and Status.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16812 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.h')
-rw-r--r-- | src/map/clif.h | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index 9039c489c..e92dc4db5 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -166,6 +166,13 @@ typedef enum emotion_type E_ENE, E_PANIC, E_WHISP, // --- 80 + E_YUT1, + E_YUT2, + E_YUT3, + E_YUT4, + E_YUT5, + E_YUT6, + E_YUT7, // E_MAX } emotion_type; @@ -213,6 +220,9 @@ enum map_type MAPTYPE_AGIT_SIEGEV15 = 18, MAPTYPE_BATTLEFIELD = 19, MAPTYPE_PVP_TOURNAMENT = 20, + //Map types 21 - 24 not used. + MAPTYPE_SIEGE_LOWLEVEL = 25, + //Map types 26 - 28 remains opens for future types. MAPTYPE_UNUSED = 29, }; @@ -243,18 +253,18 @@ enum useskill_fail_cause USESKILL_FAIL_DUPLICATE = 22, USESKILL_FAIL_CONDITION = 23, USESKILL_FAIL_PAINTBRUSH = 24, - //XXX_USESKILL_FAIL_II_SURFACE_PAINTS = 25, + USESKILL_FAIL_DRAGON = 25, USESKILL_FAIL_POS = 26, USESKILL_FAIL_HELPER_SP_INSUFFICIENT = 27, - //XXX_USESKILL_FAIL_II_NECK_CANDY = 28, - //XXX_USESKILL_FAIL_II_MISERABLE_TEAR = 29, - //XXX_USESKILL_FAIL_II_PROTECT_NECK_CANDY = 30, + USESKILL_FAIL_NEER_WALL = 28, + USESKILL_FAIL_NEED_EXP_1PERCENT = 29, + USESKILL_FAIL_CHORUS_SP_INSUFFICIENT = 30, USESKILL_FAIL_GC_WEAPONBLOCKING = 31, USESKILL_FAIL_GC_POISONINGWEAPON = 32, USESKILL_FAIL_MADOGEAR = 33, - //XXX_USESKILL_FAIL_II_VULCANBULLET = 34, - //XXX_USESKILL_FAIL_II_FUELGAS = 35, - //XXX_USESKILL_FAIL_II_COLDSLOWERBULLET = 36, + USESKILL_FAIL_NEED_EQUIPMENT_KUNAI = 34, + USESKILL_FAIL_TOTARGET_PLAYER = 35, + USESKILL_FAIL_SIZE = 36, USESKILL_FAIL_CANONBALL = 37, //XXX_USESKILL_FAIL_II_MADOGEAR_ACCELERATION = 38, //XXX_USESKILL_FAIL_II_MADOGEAR_HOVERING_BOOSTER = 39, @@ -298,6 +308,10 @@ enum useskill_fail_cause USESKILL_FAIL_NEED_ROYAL_GUARD_BANDING = 77, USESKILL_FAIL_NEED_EQUIPPED_WEAPON_CLASS = 78, USESKILL_FAIL_EL_SUMMON = 79, + USESKILL_FAIL_RELATIONGRADE = 80, + USESKILL_FAIL_STYLE_CHANGE_FIGHTER = 81, + USESKILL_FAIL_STYLE_CHANGE_GRAPPLER = 82, + USESKILL_FAIL_THERE_ARE_NPC_AROUND = 83, }; int clif_setip(const char* ip); |