diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 19:30:15 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 19:30:15 +0000 |
| commit | bb78f61a194f92934784d108cb8e54e391c570aa (patch) | |
| tree | 2e49643974eca093697308c944ff3ba0622922ea /src/map/unit.c | |
| parent | 06387a85ce94281d1652ab4bc61c5b9c0971832a (diff) | |
| download | hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.gz hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.bz2 hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.xz hercules-bb78f61a194f92934784d108cb8e54e391c570aa.zip | |
- Removed settings enemy_critical_rate, homun_critical_rate. Added settings enable_critical (defaults to specify only players), mob_critical_rate and critical_rate. The last applies to all non-mobs and non-players (battle/battle.conf)
- Removed settings mob_npc_warp, mob_warpportal. Replaced with setting mob_warp which specifies which types of warp can a mob step into (battle/monster.conf)
- Updated status_calc_misc so that it also handles the BL_PC case, removed redundant info from status_calc_pc, and moving the SNovice Max Hp bonus to status_base_pc_maxhp
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8135 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 0860c7b0a..063c9ac34 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -195,7 +195,7 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data) sc_start(&sd->bl,SC_MIRACLE,100,1,battle_config.sg_miracle_skill_duration); } } else if (md) { - if(battle_config.mob_npc_warp && map_getcell(bl->m,x,y,CELL_CHKNPC) && + if(battle_config.mob_warp&1 && map_getcell(bl->m,x,y,CELL_CHKNPC) && npc_touch_areanpc2(bl)) // Enable mobs to step on warps. [Skotlex] return 0; if (md->min_chase > md->db->range2) md->min_chase--; @@ -507,6 +507,8 @@ int unit_warp(struct block_list *bl,int m,short x,short y,int type) case BL_MOB: if (map[bl->m].flag.monster_noteleport) return 1; + if (m != bl->m && map[m].flag.nobranch && battle_config.mob_warp&4) + return 1; break; case BL_PC: if (map[bl->m].flag.noteleport) |