diff options
| author | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-11 16:58:06 +0000 |
|---|---|---|
| committer | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-11 16:58:06 +0000 |
| commit | 0c87b6196c334797f487e9c8a82ea1e0b4a4bdbe (patch) | |
| tree | 894b8e4bade3d9a718ac403bebacc5f81828bca0 | |
| parent | 94661807ec510d48ca6dd135f0e02a3a835bc614 (diff) | |
| download | hercules-0c87b6196c334797f487e9c8a82ea1e0b4a4bdbe.tar.gz hercules-0c87b6196c334797f487e9c8a82ea1e0b4a4bdbe.tar.bz2 hercules-0c87b6196c334797f487e9c8a82ea1e0b4a4bdbe.tar.xz hercules-0c87b6196c334797f487e9c8a82ea1e0b4a4bdbe.zip | |
* Tidied up battle_check_target abit
* Updated traps to affect allies as well in GvG
* Updated cast and delay time for Soul Breaker
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1077 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | SVN-Changelog.txt | 2 | ||||
| -rw-r--r-- | db/Changelog.txt | 1 | ||||
| -rw-r--r-- | db/skill_cast_db.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 17 |
4 files changed, 16 insertions, 6 deletions
diff --git a/SVN-Changelog.txt b/SVN-Changelog.txt index d6b4fb286..a01556a92 100644 --- a/SVN-Changelog.txt +++ b/SVN-Changelog.txt @@ -1,6 +1,8 @@ Date Added
02/11
+ * Tidied up battle_check_target abit [celest]
+ * Updated traps to affect allies as well in GvG [celest]
* Check if login server is online before setting character to online (in SQL),
thanks to Alex14 [celest]
* Synchronise storage as well when saving character to cut down on item
diff --git a/db/Changelog.txt b/db/Changelog.txt index 71653c94d..66845e4f1 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -6,6 +6,7 @@ Skill databases == celest working on them i believe. 02/11 + * Updated Soul Breaker cast and delay time, thanks to matthias [celest] * Updated Chain Crush to require level 2 Tiger Fist, thanks to matthias for pointing it out [celest] diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 01bebcd24..05da02889 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -239,7 +239,7 @@ //375,0,10000:10000:10000:10000:15000,0,0 //PF_SOULBURN#ソウルバーン# 378,0,2000,20000:30000:40000:50000:60000,20000:30000:40000:50000:60000 //ASC_EDP#エンチャントデッドリーポイズン# -379,0,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0 //ASC_BREAKER +379,1000,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,0,0 //ASC_BREAKER 380,0,0,30000,0 //SN_SIGHT#トゥルーサイト# 381,1000,1200,0,0,0 //SN_FALCONASSAULT 382,2000,500,0,0 //SN_SHARPSHOOTING diff --git a/src/map/battle.c b/src/map/battle.c index 1bc612e0c..9f3361237 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3682,15 +3682,22 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f // スキルユニットの場合、親を求める if( src->type==BL_SKILL) { - int inf2 = skill_get_inf2(((struct skill_unit *)src)->group->skill_id); - if( (ss=map_id2bl( ((struct skill_unit *)src)->group->src_id))==NULL ) + struct skill_unit *su = (struct skill_unit *)src; + int skillid, inf2; + + nullpo_retr (-1, su); + nullpo_retr (-1, su->group); + skillid = su->group->skill_id; + inf2 = skill_get_inf2(skillid); + if( (ss=map_id2bl( su->group->src_id))==NULL ) return -1; if(ss->prev == NULL) return -1; if(inf2&0x80 && - (map[src->m].flag.pvp || pc_iskiller((struct map_session_data *)src, (struct map_session_data *)target)) && // [MouseJstr] - !(target->type == BL_PC && pc_isinvisible((struct map_session_data *)target))) - return 0; + (map[src->m].flag.pvp || + (skillid >= 115 && skillid <= 125 && map[src->m].flag.gvg)) && + !(target->type == BL_PC && pc_isinvisible((struct map_session_data *)target))) + return 0; if(ss == target) { if(inf2&0x100) return 0; |