diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | db/Changelog.txt | 1 | ||||
| -rw-r--r-- | db/skill_unit_db.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 5 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 90d112e4c..0a93157e1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/02/07 + * Modified spider web so that the skill_unit_db flag restrictions may take + place. [Skotlex] * Cleaning up of the socket code [ultramage] - Shuffled includes around for files that were leeching off of socket.h - Added code that enforces standard shutdown behavior for sockets diff --git a/db/Changelog.txt b/db/Changelog.txt index 69a86761c..39ba44b1d 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -21,6 +21,7 @@ ======================== 02/07 + * Modified Spider web so that it can't be casted on top of another web. * Updated the range of BioExplosion and Self Destruction so they count as ranged skills. 02/05 diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt index 35b3ad979..1aebf8f77 100644 --- a/db/skill_unit_db.txt +++ b/db/skill_unit_db.txt @@ -80,7 +80,7 @@ 369,0xb3, , -1, 0,10000,all, 0x008 //PA_GOSPEL 395,0xb5, , 4, 0, -1,all, 0x200 //CG_MOONLIT 404,0xb6, , -1, 0, -1,all, 0x000 //PF_FOGWALL -405,0xb7, , 0, 1,1000,enemy, 0x000 //PF_SPIDERWEB +405,0xb7, , 0, 1,1000,enemy, 0x002 //PF_SPIDERWEB 409,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLBABY 410,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLPARENT 428,0x86, , 0, 1, 200,enemy, 0x000 //SG_SUN_WARM diff --git a/src/map/skill.c b/src/map/skill.c index 17123f72d..cdba67d5f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3307,7 +3307,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in return skill_castend_damage_id (src, bl, skillid, skilllv, tick, flag); default: //Skill is actually ground placed. - if ((src == bl || skillid == PF_SPIDERWEB) && skill_get_unit_id(skillid,0)) + if (src == bl && skill_get_unit_id(skillid,0)) return skill_castend_pos2(src,bl->x,bl->y,skillid,skilllv,tick,0); } @@ -5556,11 +5556,12 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) case WE_CALLPARENT: case WE_CALLBABY: case AM_RESURRECTHOMUN: + case PF_SPIDERWEB: //Find a random spot to place the skill. [Skotlex] inf2 = skill_get_splash(ud->skillid, ud->skilllv); ud->skillx = src->x + inf2; ud->skilly = src->y + inf2; - if (!map_random_dir(src, &ud->skillx, &ud->skilly)) { + if (inf2 && !map_random_dir(src, &ud->skillx, &ud->skilly)) { ud->skillx = src->x; ud->skilly = src->y; } |