diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-23 15:41:17 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-23 15:41:17 +0000 |
| commit | 43fe20d3fa5793b185d5f399c5c48075d4d6f842 (patch) | |
| tree | 84b3d0261b92f6a14beae125ae57d8e9266a35de /src/map/skill.c | |
| parent | 921d73f1f2aedfd13f760153b1b11695d7ab85f8 (diff) | |
| download | hercules-43fe20d3fa5793b185d5f399c5c48075d4d6f842.tar.gz hercules-43fe20d3fa5793b185d5f399c5c48075d4d6f842.tar.bz2 hercules-43fe20d3fa5793b185d5f399c5c48075d4d6f842.tar.xz hercules-43fe20d3fa5793b185d5f399c5c48075d4d6f842.zip | |
- Updated BD_INTOABYSS's unit flag to not affect mobs.
- Changed setting for skill_nocast flag 16. It is no longer a "pk-mode map" setting, it's now a clone-forbidden skill. That is, skills with the flag 16 will never be copied by clones. If you use a PK-mode server, use flag 2 now to forbid skills from common maps.
- Default skills from not being cloned are Magnus Exorcism and Turn Undead.
- The map search free cell will now use the size of the map # of tries before giving up when the spawn area is the whole map. Added a check to inmediately give up when the number of spawn retries has reached the max specified (no_spawn_onplayer = 100).
- Cleaned up a bit the clone code to account for the unit flags UF_NOPC/UF_NOMOB when the skill is not ground-based (accounts for self skill that causes a ground-tile to be placed, like Dances).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7315 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 7cd697cc9..d2438c855 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -854,12 +854,8 @@ int skillnotok (int skillid, struct map_session_data *sd) // Check skill restrictions [Celest] if(!map_flag_vs(sd->bl.m) && skill_get_nocast (skillid) & 1) return 1; - if(map[sd->bl.m].flag.pvp) { - if(!battle_config.pk_mode && skill_get_nocast (skillid) & 2) - return 1; - if(battle_config.pk_mode && skill_get_nocast (skillid) & 16) - return 1; - } + if(map[sd->bl.m].flag.pvp && skill_get_nocast (skillid) & 2) + return 1; if(map_flag_gvg(sd->bl.m) && skill_get_nocast (skillid) & 4) return 1; if(agit_flag && skill_get_nocast (skillid) & 8) |