summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-11 17:06:24 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-11 17:06:24 +0000
commitc5b8ed90526b50767ce40f3a39f441334e1b5b9b (patch)
tree14ed06a5b6f95cac92dae5a0b8183a2ab8f79de3
parent9ffb82567bd67e223ced24687fff2909712eb64b (diff)
downloadhercules-c5b8ed90526b50767ce40f3a39f441334e1b5b9b.tar.gz
hercules-c5b8ed90526b50767ce40f3a39f441334e1b5b9b.tar.bz2
hercules-c5b8ed90526b50767ce40f3a39f441334e1b5b9b.tar.xz
hercules-c5b8ed90526b50767ce40f3a39f441334e1b5b9b.zip
Inverted the way monster_ai 0x200 works, default is 0 again (followup to r13667).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13668 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/Changelog.txt1
-rw-r--r--conf/battle/monster.conf10
-rw-r--r--src/map/mob.c2
3 files changed, 7 insertions, 6 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 14a95be59..e6d0179e3 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
2009/04/10
+ * Rev. 13668 Inverted the way monster_ai 0x200 works, default is 0 again. [ultramage]
* Rev. 13667 Default value for monster_ai is now 0x200. [L0ne_W0lf]
2009/04/02
* Uncommented pvp_room in maps_athena.conf [Playtester]
diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf
index c14dc6f35..ed9b2f627 100644
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -55,14 +55,14 @@ monster_max_aspd: 199
// 0x100: When set, a mob will pick a random skill from it's list and start from
// that instead of checking skills in orders (when unset, if a mob has too
// many skills, the ones near the end will rarely get selected)
-// 0x200: When set, a mob's skill re-use delay will be applied to all entries of
-// the same skill, instead of only that particular entry (eg: Mob has heal
-// on six lines for different conditions, when set, whenever one of the six
-// trigger, all of them will share the delay
+// 0x200: When set, a mob's skill re-use delay will not be applied to all entries of
+// the same skill, instead, only to that particular entry (eg: Mob has heal
+// on six lines in the mob_skill_db, only the entry that is actually used
+// will receive the delay). This will make monsters harder, especially MvPs.
// 0x400: By default mobs have a range of 9 for all skills. Set this to enforce
// the normal skill range rules on them.
// Example: 0x140 -> Chase players through warps + use skills in random order.
-monster_ai: 0x200
+monster_ai: 0
// Should mobs be able to be warped (add as needed)?
// 0: Disable.
diff --git a/src/map/mob.c b/src/map/mob.c
index b68c8dde0..4c77b17af 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3046,7 +3046,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
continue;
}
//Skill used. Post-setups...
- if(battle_config.mob_ai&0x200)
+ if(!(battle_config.mob_ai&0x200))
{ //pass on delay to same skill.
for (j = 0; j < md->db->maxskill; j++)
if (md->db->skill[j].skill_id == ms[i].skill_id)