From 8921a3023de5519f0e0af164d71023914c8656f3 Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 10 Sep 2007 20:50:55 +0000 Subject: * Added a safeguard to skill_get_unit_layout() against incorrectly defined layout ids (will give weird results but won't crash at least) * Fixed Firewall/Icewall being oriented backwards (no real difference though...) * Removed some junk Landprotector/Graffiti code; Graffiti doesn't get placed randomly anymore * Icewall can now be cast on yourself... but for some reason, the cell on yourself immediately expires! * Merged together functions clif_set0192() and clif_changemapcell() - also removed its "send to whole map" mode which is just plain wrong (although aegis actually does use it to 'inform' caster about changes) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11175 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.h | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) (limited to 'src/map/skill.h') diff --git a/src/map/skill.h b/src/map/skill.h index 5195c728d..3f3420628 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -98,17 +98,17 @@ struct skill_unit_layout { }; enum { - UF_DEFNOTENEMY = 0x0001, // defnotenemy 設定でBCT_NOENEMYに切り替え - UF_NOREITERATION = 0x0002, // 重複置き禁止 - UF_NOFOOTSET = 0x0004, // 足元置き禁止 - UF_NOOVERLAP = 0x0008, // ユニット効果が重複しない - UF_NOPC = 0x0010, //May not target players - UF_NOMOB = 0x0020, //May not target mobs - UF_SKILL = 0x0080, //May target skills - UF_DANCE = 0x0100, //Dance - UF_ENSEMBLE = 0x0200, //Duet - UF_SONG = 0x0400, //Song - UF_DUALMODE = 0x0800, //Spells should trigger both ontimer and onplace/onout/onleft effects. + UF_DEFNOTENEMY = 0x0001, // defnotenemy 設定でBCT_NOENEMYに切り替え + UF_NOREITERATION = 0x0002, // 重複置き禁止 + UF_NOFOOTSET = 0x0004, // 足元置き禁止 + UF_NOOVERLAP = 0x0008, // ユニット効果が重複しない + UF_NOPC = 0x0010, //May not target players + UF_NOMOB = 0x0020, //May not target mobs + UF_SKILL = 0x0080, //May target skills + UF_DANCE = 0x0100, //Dance + UF_ENSEMBLE = 0x0200, //Duet + UF_SONG = 0x0400, //Song + UF_DUALMODE = 0x0800, //Spells should trigger both ontimer and onplace/onout/onleft effects. }; // アイテム作成デ?タベ?ス @@ -274,8 +274,20 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds void skill_reload(void); enum { - ST_NONE,ST_HIDING,ST_CLOAKING,ST_HIDDEN,ST_RIDING,ST_FALCON,ST_CART,ST_SHIELD,ST_SIGHT,ST_EXPLOSIONSPIRITS,ST_CARTBOOST, - ST_RECOV_WEIGHT_RATE,ST_MOVE_ENABLE,ST_WATER, + ST_NONE, + ST_HIDING, + ST_CLOAKING, + ST_HIDDEN, + ST_RIDING, + ST_FALCON, + ST_CART, + ST_SHIELD, + ST_SIGHT, + ST_EXPLOSIONSPIRITS, + ST_CARTBOOST, + ST_RECOV_WEIGHT_RATE, + ST_MOVE_ENABLE, + ST_WATER, }; enum _skill { @@ -933,7 +945,9 @@ enum { UNT_ATTACK_SKILLS, //These show no effect on the client, therefore can be used for attack skills. UNT_FIREPILLAR_WAITING, UNT_FIREPILLAR_ACTIVE, - //0x89, 0x8a, 0x8b + //0x89 + //0x8a + //0x8b UNT_USED_TRAPS = 0x8c, UNT_ICEWALL, UNT_QUAGMIRE, -- cgit v1.2.3-70-g09d2