diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-11 10:36:56 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-11 10:36:56 +0000 |
| commit | 346d82c7d47afa212738d1a5b07eb3780ad46620 (patch) | |
| tree | f3cf6b88eb3f4eea6dbef92ee6aa107c5971bf5b | |
| parent | 234ababd8c1a9df4391c6c54f9167f625e432dc2 (diff) | |
| download | hercules-346d82c7d47afa212738d1a5b07eb3780ad46620.tar.gz hercules-346d82c7d47afa212738d1a5b07eb3780ad46620.tar.bz2 hercules-346d82c7d47afa212738d1a5b07eb3780ad46620.tar.xz hercules-346d82c7d47afa212738d1a5b07eb3780ad46620.zip | |
- Corrected CR_CULTIVATION to cause summoned plants to expire after 5 minutes.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12052 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | db/skill_cast_db.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 9 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index a25feedce..83e0cbec1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/01/11 + * Corrected CR_CULTIVATION to cause summoned plants to expire after 5 + minutes. 2008/01/10 * Fixed getmonsterinfo to return "null" when returning the name of a non-existing mob instead of -1. diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index d451ca3c6..fa02f74f3 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -822,6 +822,8 @@ 489,1000,3000,0,0,30000 //-- CR_ACIDDEMONSTRATION 490,1000,1000,0,0,0 +//-- CR_CULTIVATION +491,0,0,0,300000,0 //========================================== //-- ITEM_ENCHANTARMS diff --git a/src/map/skill.c b/src/map/skill.c index 1015f2092..4ccda7030 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5824,10 +5824,13 @@ int skill_castend_pos2(struct block_list* src, int x, int y, int skillid, int sk pc_delitem(sd,j,skill_db[skillid].amount[i],0); clif_skill_poseffect(src,skillid,skilllv,x,y,tick); - if (rand()%100 < 50) - mob_once_spawn(sd, src->m, x, y, "--ja--",(skilllv < 2 ? 1084+rand()%2 : 1078+rand()%6), 1, ""); - else + if (rand()%100 < 50) { clif_skill_fail(sd,skillid,0,0); + } else { + TBL_MOB* md = mob_once_spawn_sub(src, src->m, x, y, "--ja--",(skilllv < 2 ? 1084+rand()%2 : 1078+rand()%6),""); + if (md && (i = skill_get_time(skillid, skilllv)) > 0) + md->deletetimer = add_timer (tick + i, mob_timer_delete, md->bl.id, 0); + } } break; |