diff options
| author | shennetsind <notind@gmail.com> | 2013-10-07 15:04:33 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-10-07 15:04:33 -0700 |
| commit | 5d6acd951f98bb54c64231d97e196e23f926980a (patch) | |
| tree | 5440e0fc3e412f610493964674bf74f4992c77cd /src | |
| parent | 71b09304a2287350da9ffa4994c4bc78e253e092 (diff) | |
| parent | 33622377e840c6d15ee7f65a1e4b9b9a815bd69b (diff) | |
| download | hercules-5d6acd951f98bb54c64231d97e196e23f926980a.tar.gz hercules-5d6acd951f98bb54c64231d97e196e23f926980a.tar.bz2 hercules-5d6acd951f98bb54c64231d97e196e23f926980a.tar.xz hercules-5d6acd951f98bb54c64231d97e196e23f926980a.zip | |
Merge pull request #182 from shenhuyong/master
* Follow up dedec165eaeb0d291279b1d5b53fac242bcf7b4c
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 1 | ||||
| -rw-r--r-- | src/map/skill.h | 10 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/map/map.h b/src/map/map.h index 29c1dfecc..3a7990dcb 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -118,7 +118,7 @@ enum { MAPID_ALCHEMIST, MAPID_ROGUE, MAPID_SOUL_LINKER, - MAPID_DARK_COLLECTOR = JOBL_2_2|0x0D, + MAPID_DARK_COLLECTOR = JOBL_2_2|0x0E, //Trans Novice And Trans 1-1 Jobs MAPID_NOVICE_HIGH = JOBL_UPPER|0x0, MAPID_SWORDMAN_HIGH, diff --git a/src/map/skill.c b/src/map/skill.c index b90be3c2a..5269c83e8 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9811,6 +9811,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui case MH_STEINWAND: case MH_XENO_SLASHER: case NC_MAGMA_ERUPTION: + case RL_B_TRAP: flag|=1;//Set flag to 1 to prevent deleting ammo (it will be deleted on group-delete). case GS_GROUNDDRIFT: //Ammo should be deleted right away. skill->unitsetting(src,skill_id,skill_lv,x,y,0); diff --git a/src/map/skill.h b/src/map/skill.h index 592721f1e..0f89cd3be 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -1587,9 +1587,13 @@ enum { UNT_MAKIBISHI, UNT_VENOMFOG, UNT_ICEMINE, - UNT_FLAMECROSS, - UNT_HELLBURNING, - UNT_MAGMA_ERUPTION, + UNT_FLAMECROSS, + UNT_HELLBURNING, + UNT_MAGMA_ERUPTION, + UNT_KINGS_GRACE, + UNT_GLITTERING_GREED, + UNT_B_TRAP, + UNT_FIRE_RAIN, /** * Guild Auras |