diff options
| author | shenhuyong <shenhuyong@hotmail.com> | 2013-10-05 11:59:41 +0800 |
|---|---|---|
| committer | shenhuyong <shenhuyong@hotmail.com> | 2013-10-05 11:59:41 +0800 |
| commit | f4fb487fbd563ead914ebdc64ae8074650469375 (patch) | |
| tree | 1b0653926dd32d0b2944f865c8309e76b59dd3d7 /src | |
| parent | dedec165eaeb0d291279b1d5b53fac242bcf7b4c (diff) | |
| download | hercules-f4fb487fbd563ead914ebdc64ae8074650469375.tar.gz hercules-f4fb487fbd563ead914ebdc64ae8074650469375.tar.bz2 hercules-f4fb487fbd563ead914ebdc64ae8074650469375.tar.xz hercules-f4fb487fbd563ead914ebdc64ae8074650469375.zip | |
* Follow up dedec165eaeb0d291279b1d5b53fac242bcf7b4c
-Update pre-re/skill_db.txt
* Updated the const.txt to support the newest common status, as well as the latest NPC's.
* Fixed a issue where the Dark Collector's assigned MAPID was incorrect.
* Updated all Rebellion skills to have official ranges and SP requirements.
-Also updated the skill_db entrys for these skills to have near official settings.
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 67fdfcf96..ab4099917 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 a55fb2937..de07cd599 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9805,6 +9805,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 |