summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-16 03:25:48 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-16 03:25:48 +0000
commit97f2abb87a41e3a879bbe7c544fe1f7a6bc1cf80 (patch)
tree24097ca872ad5c852d18a54397bcf8ff002b9f47
parent0aa7658757f41b6734e0011158343aafb209cde7 (diff)
downloadhercules-97f2abb87a41e3a879bbe7c544fe1f7a6bc1cf80.tar.gz
hercules-97f2abb87a41e3a879bbe7c544fe1f7a6bc1cf80.tar.bz2
hercules-97f2abb87a41e3a879bbe7c544fe1f7a6bc1cf80.tar.xz
hercules-97f2abb87a41e3a879bbe7c544fe1f7a6bc1cf80.zip
- Fixing TK Mission asigning non spawning mobs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11485 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/mob.c4
-rw-r--r--src/map/skill.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 66edfdd1e..4083fc804 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/10/15
+ * Fixing TK Mission asigning non spawning mobs. [Zephyrus]
* Updated the item price/sell reading code to enable 'null' values. The
difference between a blank value and 0 is that when the value is blank, it
should automatically take half/double the other value. The previous
diff --git a/src/map/mob.c b/src/map/mob.c
index d66307a78..430b32f65 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -245,7 +245,7 @@ struct mob_data* mob_spawn_dataset(struct spawn_data *data)
* &1: Apply the summon success chance found in the list (otherwise get any monster from the db)
* &2: Apply a monster check level.
* &4: Selected monster should not be a boss type
- * &8: Selected monster must give base exp.
+ * &8: Selected monster must have normal spawn.
* lv: Mob level to check against
*------------------------------------------*/
int mob_get_random_id(int type, int flag, int lv)
@@ -268,7 +268,7 @@ int mob_get_random_id(int type, int flag, int lv)
(flag&1 && mob->summonper[type] <= rand() % 1000000) ||
(flag&2 && lv < mob->lv) ||
(flag&4 && mob->status.mode&MD_BOSS) ||
- (flag&8 && mob->base_exp < 1)
+ (flag&8 && mob->spawn[0].qty < 1)
) && (i++) < MAX_MOB_DB);
if(i >= MAX_MOB_DB)
diff --git a/src/map/skill.c b/src/map/skill.c
index 20f40315c..2e805347e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4007,7 +4007,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
clif_skill_fail(sd,skillid,0,0);
break;
}
- id = mob_get_random_id(0,0xC, sd->status.base_level);
+ id = mob_get_random_id(0,0xE, sd->status.base_level);
if (!id) {
clif_skill_fail(sd,skillid,0,0);
break;