Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Marionette Control now has an infinite duration.(bugreport:2542)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14078 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Inkfish 2009-10-02 02:06:03 +00:00
parent df4857ca11
commit f1bcfea0b4
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
09/10/02 09/10/02
* Fixed a damage underflow.(bugreport:3624) [Inkfish] * Fixed a damage underflow.(bugreport:3624) [Inkfish]
* Marionette Control now has an infinite duration.(bugreport:2542) [Inkfish]
09/09/23 09/09/23
* Added supports for Soul Bound. [Inkfish] * Added supports for Soul Bound. [Inkfish]
09/09/21 09/09/21

2
db/skill_cast_db.txt
View File

@ -657,7 +657,7 @@
//-- CG_MOONLIT //-- CG_MOONLIT
395,0,0,0,20000:25000:30000:35000:40000,0 395,0,0,0,20000:25000:30000:35000:40000,0
//-- CG_MARIONETTE //-- CG_MARIONETTE
396,0,0,0,300000,0 396,0,0,0,1000,0
//========================================== //==========================================
//===== Mixed Advanced Skills ============== //===== Mixed Advanced Skills ==============

6
src/map/status.c
View File

@ -5516,7 +5516,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
{ {
int stat; int stat;
val2 = tick / 1000;
val3 = 0; val3 = 0;
val4 = 0; val4 = 0;
stat = ( sd ? sd->status.str : status_get_base_status(bl)->str ) / 2; val3 |= cap_value(stat,0,0xFF)<<16; 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.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.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); stat = ( sd ? sd->status.luk : status_get_base_status(bl)->luk ) / 2; val4 |= cap_value(stat,0,0xFF);
tick = 1000;
break; break;
} }
case SC_MARIONETTE2: 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) if (!psce)
return 0; return 0;
val2 = tick / 1000;
val3 = 0; val3 = 0;
val4 = 0; val4 = 0;
max_stat = battle_config.max_parameter; //Cap to 99 (default) 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 >>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 >> 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); stat = (psce->val4 >> 0)&0xFF; stat = min(stat, max_stat - status->luk ); val4 |= cap_value(stat,0,0xFF);
tick = 1000;
break; break;
} }
case SC_REJECTSWORD: case SC_REJECTSWORD:
@ -7114,7 +7110,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr data)
case SC_MARIONETTE2: case SC_MARIONETTE2:
{ {
struct block_list *pbl = map_id2bl(sce->val1); 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); sc_timer_next(1000 + tick, status_change_timer, bl->id, data);
return 0; return 0;