diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /db/const.txt | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'db/const.txt')
| -rw-r--r-- | db/const.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/db/const.txt b/db/const.txt index 8f649b4f3..c7fff2825 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1263,6 +1263,16 @@ SC__MAELSTROM 576 SC__CHAOS 577 SC__FEINTBOMB_MASTER 578 SC_FALLENEMPIRE 579 +SC_FLASHCOMBO 580 +SC_DEFSET 581 +SC_MDEFSET 582 +SC_NO_SWITCH_EQUIP 583 + +// 2014 Halloween Event +SC_MTF_MHP 584 +SC_MTF_MSP 585 +SC_MTF_PUMPKIN 586 +SC_MTF_HITFLEE 587 e_gasp 0 e_what 1 |