diff options
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | conf-tmpl/battle_athena.conf | 5 | ||||
| -rw-r--r-- | src/map/mob.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt index de201b458..892afb98a 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,7 @@ Date Added 11/22 + * Changed monster_ignore_gm option to a level value. [Valaris] + (accounts greater than or equal to this setting won't be attacked by aggressives.) * Fixed mapflag #s and constants for setmapflag and remove mapflag. [Valaris] * Added skill names for kRO 11/23's new skills [celest] - Preserve, Full Strip, Weapon Refine, Slim Pitcher, Full Chemical Protection, diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf index 9c1a56bfb..2bfb84fe7 100644 --- a/conf-tmpl/battle_athena.conf +++ b/conf-tmpl/battle_athena.conf @@ -630,8 +630,9 @@ maximum_level: 255 // Example 2 : Setting 100 with 99 luk would add 99 to the drop rate. drops_by_luk: 0 -// Do all monsters ignore GMs unless attacked? (Note 1) -monsters_ignore_gm: no +// Do all monsters ignore GMs unless attacked? (Set to minimum level required for GMs not to be attacked, +// 0 means no one on server will be attacked) +monsters_ignore_gm: 100 // Turn equipment breaking on. (Note 1) // Turning this one will allow equipment to break in battles, diff --git a/src/map/mob.c b/src/map/mob.c index b3a2d83c0..5a0249a6c 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1105,9 +1105,9 @@ int mob_can_reach(struct mob_data *md,struct block_list *bl,int range) } //========== guildcastle guardian no search eof============== - if(bl && bl->type == BL_PC && battle_config.monsters_ignore_gm==1) { // option to have monsters ignore GMs [Valaris] + if(bl && bl->type == BL_PC && battle_config.monsters_ignore_gm) { // option to have monsters ignore GMs [Valaris] struct map_session_data *sd; - if((sd=(struct map_session_data *)bl) != NULL && pc_isGM(sd)) + if((sd=(struct map_session_data *)bl) != NULL && pc_isGM(sd) >= battle_config.monsters_ignore_gm) return 0; } |