summaryrefslogtreecommitdiff
path: root/src/map/skill.h
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 12:27:02 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 12:27:02 +0000
commit99ebdaf8e77e81e43d39825163837d6f4b2bc07a (patch)
tree5edaf24d7e804ab58c98897ea31e81af6277215d /src/map/skill.h
parent45544327c64939d9e7ac9578cb476ff497c6c3ce (diff)
downloadhercules-99ebdaf8e77e81e43d39825163837d6f4b2bc07a.tar.gz
hercules-99ebdaf8e77e81e43d39825163837d6f4b2bc07a.tar.bz2
hercules-99ebdaf8e77e81e43d39825163837d6f4b2bc07a.tar.xz
hercules-99ebdaf8e77e81e43d39825163837d6f4b2bc07a.zip
* Updated most of map-server to 1082
* Removed my own additions for skill delays using aspd * Adapted skill_range_leniency to jA's code * Fixed drop rates only limited to multiples of 100's * Added missing code for castle_defense_rate * Removed pc_undead_nofreeze * Updated unrefineable items table * Added 3 new script commands * Added SC_SpeedUp0 * Merged itemdb_read for SQL and TXT * Removed itemdb_read_cardillustnametable limited to TXT only * Added reading itemslotcounttable.txt from the GRF to auto set number of slots per item * Added a display message when reading itemslottable from the GRF * Added options in battle_athena.conf to enable/disable reading the GRF git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@699 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.h')
-rw-r--r--src/map/skill.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/map/skill.h b/src/map/skill.h
index 4d1319599..5baf42024 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -313,10 +313,9 @@ enum { // struct map_session_data �� status_change�̔�?�e?�u��
SC_SPIDERWEB =180, /* �X�p�C�_?�E�F�b�u */
SC_MEMORIZE =181, /* �������C�Y */
-// SC_DPOISON =182, /* �ғ� */
-
-// SC_EDP =183, /* �G�t�F�N�g������������ړ� */
-
+ SC_DPOISON =182, /* �ғ� */
+ SC_EDP =183, /* �G�t�F�N�g������������ړ� */
+ SC_SACRIFICE =184, /* �T�N���t�@�C�X */
SC_WEDDING =187, //�����p(�����ߏւɂȂ���?���̂�?���Ƃ�)
SC_NOCHAT =188, //�ԃG��?��
SC_SPLASHER =189, /* �x�i���X�v���b�V��? */
@@ -326,25 +325,27 @@ enum { // struct map_session_data �� status_change�̔�?�e?�u��
// Used by English Team
SC_BROKNARMOR =32,
SC_BROKNWEAPON =33,
+ SC_SPEEDUP0 =41, // for skill speedup
+ SC_SPEEDUP1 =42, // for skill speedup
SC_SLOWDOWN =45, // for skill slowdown
SC_AUTOBERSERK =46,
SC_SIGHTTRASHER =73,
// SC_BASILICA =125, // 125 is the same id as joint break
SC_BASILICA =102, // temporarily use this before an actual id is found [celest]
- SC_EDP =114, //
+// SC_EDP =114, //
SC_MARIONETTE2 =122, // Marionette target
SC_ENSEMBLE =159,
SC_FOGWALL =178,
SC_GOSPEL =179,
- SC_LANDPROTECTOR =182,
- SC_ADAPTATION =183,
- SC_CHASEWALK =184,
SC_ATKPOT =185, // [Valaris]
SC_MATKPOT =186, // [Valaris]
SC_MINDBREAKER =191,
SC_SPELLBREAKER =192,
- SC_DPOISON =193, /* �ғ� */
+ SC_LANDPROTECTOR =193,
+// SC_DPOISON =193, /* �ғ� */
SC_BLOCKSKILL =194, // for disallowing the use of a skill for a time period
+ SC_ADAPTATION =195,
+ SC_CHASEWALK =196,
/* SC_LEADERSHIP =196, // temporarily disabled - they're too buggy =/
SC_GLORYWOUNDS =197,
SC_SOULCOLD =198,