diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-02 02:06:03 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-02 02:06:03 +0000 |
| commit | 82eaeb717a65928f8383be29f3418e6ed6fec1e9 (patch) | |
| tree | 3b796e9bab6c5494f32d0aba5048b1b91e19fe6d | |
| parent | e28801d3e47703d7c49e3e4b6eb016fb87f099f3 (diff) | |
| download | hercules-82eaeb717a65928f8383be29f3418e6ed6fec1e9.tar.gz hercules-82eaeb717a65928f8383be29f3418e6ed6fec1e9.tar.bz2 hercules-82eaeb717a65928f8383be29f3418e6ed6fec1e9.tar.xz hercules-82eaeb717a65928f8383be29f3418e6ed6fec1e9.zip | |
Marionette Control now has an infinite duration.(bugreport:2542)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14078 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | db/skill_cast_db.txt | 2 | ||||
| -rw-r--r-- | src/map/status.c | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index bc7317392..adb8a73d7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 09/10/02 * Fixed a damage underflow.(bugreport:3624) [Inkfish] + * Marionette Control now has an infinite duration.(bugreport:2542) [Inkfish] 09/09/23 * Added supports for Soul Bound. [Inkfish] 09/09/21 diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 4ef06fd4c..ca3718de4 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -657,7 +657,7 @@ //-- CG_MOONLIT 395,0,0,0,20000:25000:30000:35000:40000,0 //-- CG_MARIONETTE -396,0,0,0,300000,0 +396,0,0,0,1000,0 //========================================== //===== Mixed Advanced Skills ============== diff --git a/src/map/status.c b/src/map/status.c index 99c699c44..59b591296 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5516,7 +5516,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val { int stat; - val2 = tick / 1000; val3 = 0; val4 = 0; stat = ( sd ? sd->status.str : status_get_base_status(bl)->str ) / 2; val3 |= cap_value(stat,0,0xFF)<<16; @@ -5525,7 +5524,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val stat = ( sd ? sd->status.int_: status_get_base_status(bl)->int_) / 2; val4 |= cap_value(stat,0,0xFF)<<16; stat = ( sd ? sd->status.dex : status_get_base_status(bl)->dex ) / 2; val4 |= cap_value(stat,0,0xFF)<<8; stat = ( sd ? sd->status.luk : status_get_base_status(bl)->luk ) / 2; val4 |= cap_value(stat,0,0xFF); - tick = 1000; break; } case SC_MARIONETTE2: @@ -5541,7 +5539,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val if (!psce) return 0; - val2 = tick / 1000; val3 = 0; val4 = 0; max_stat = battle_config.max_parameter; //Cap to 99 (default) @@ -5551,7 +5548,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val stat = (psce->val4 >>16)&0xFF; stat = min(stat, max_stat - status->int_); val4 |= cap_value(stat,0,0xFF)<<16; stat = (psce->val4 >> 8)&0xFF; stat = min(stat, max_stat - status->dex ); val4 |= cap_value(stat,0,0xFF)<<8; stat = (psce->val4 >> 0)&0xFF; stat = min(stat, max_stat - status->luk ); val4 |= cap_value(stat,0,0xFF); - tick = 1000; break; } case SC_REJECTSWORD: @@ -7114,7 +7110,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr data) case SC_MARIONETTE2: { struct block_list *pbl = map_id2bl(sce->val1); - if (pbl && check_distance_bl(bl, pbl, 7) && (sce->val2)-->0) + if( pbl && check_distance_bl(bl, pbl, 7) ) { sc_timer_next(1000 + tick, status_change_timer, bl->id, data); return 0; |