diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-08-08 19:30:54 +0200 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-08-08 19:30:54 +0200 |
| commit | 73089923e91b88bb2470cd7abab8616b5e68d374 (patch) | |
| tree | 56923692e7feb7bae6424725590601fe16837bab | |
| parent | d9941f08b517529186dd453fadfa059ac4895eac (diff) | |
| download | hercules-73089923e91b88bb2470cd7abab8616b5e68d374.tar.gz hercules-73089923e91b88bb2470cd7abab8616b5e68d374.tar.bz2 hercules-73089923e91b88bb2470cd7abab8616b5e68d374.tar.xz hercules-73089923e91b88bb2470cd7abab8616b5e68d374.zip | |
- Fix Expiatio Range (bug:7778)
- Fix Dark Illusion Range
- Fix Absorb Spirit Sphere on Duels (bug:4085)
| -rw-r--r-- | db/re/skill_db.txt | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 85da031f9..b94ae42d0 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -716,7 +716,7 @@ //**** 2021,10,6,1,0,0x1,0,5,1,no,0,0,0,none,0, GC_VENOMIMPRESS,Venom Impress 2022,3,8,1,-1,0,0,5,-7,no,0,0,0,weapon,0, GC_CROSSIMPACT,Cross Impact -2023,3:4:5:6:7,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,GC_DARKILLUSION,Dark Illusion +2023,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,GC_DARKILLUSION,Dark Illusion 2024,0,0,0,0,0,0,10,0,no,0,0,0,none,0, GC_RESEARCHNEWPOISON,Research New Poison 2025,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, GC_CREATENEWPOISON,Create New Poison 2026,5,6,16,0,0x1,0,1,1,no,0,0,0,none,0, GC_ANTIDOTE,Antidote @@ -750,7 +750,7 @@ 2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0, AB_RENOVATIO,Renovatio 2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0, AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack. 2052,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0, AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why? -2053,0,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0, AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members? +2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0, AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members? 2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0, AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later. 2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, AB_DUPLELIGHT_MELEE,Duple Light Melee 2056,-1,6,1,0,0,0,10,1,no,0,0,0,magic,0, AB_DUPLELIGHT_MAGIC,Duple Light Magic diff --git a/src/map/skill.c b/src/map/skill.c index 4adb11fde..e8217d5d3 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6011,7 +6011,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin case MO_ABSORBSPIRITS: { int sp = 0; - if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && ((dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK)!=MAPID_REBELLION)) + if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m) || (sd->duel_group && sd->duel_group == dstsd->duel_group)) && ((dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK)!=MAPID_REBELLION)) { // split the if for readability, and included gunslingers in the check so that their coins cannot be removed [Reddozen] sp = dstsd->spiritball * 7; pc->delspiritball(dstsd,dstsd->spiritball,0); |