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

Renamed Happy Break's status name from SC_TKREST to SC_EARTHSCROLL, since that's its official purpose and it doesn't do anything else.

Browse Source 
Also removed the associated SI_TKREST since this status doesn't actually have an icon.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13695 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-04-24 09:37:08 +00:00
parent 97f947bb63
commit c17d002e07
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/skill.c
View File

@ -7954,7 +7954,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
//Consume //Consume
sd->itemid = sd->itemindex = -1; sd->itemid = sd->itemindex = -1;
if(skill == WZ_EARTHSPIKE && sc && if(skill == WZ_EARTHSPIKE && sc &&
sc->data[SC_TKREST] && rand()%100 > sc->data[SC_TKREST]->val2) // [marquis007] sc->data[SC_EARTHSCROLL] && rand()%100 > sc->data[SC_EARTHSCROLL]->val2) // [marquis007]
; //Do not consume item. ; //Do not consume item.
else else
pc_delitem(sd,i,1,0); pc_delitem(sd,i,1,0);

6
src/map/status.c
View File

@ -318,7 +318,7 @@ void initChangeTables(void)
set_sc( TK_READYTURN , SC_READYTURN , SI_READYTURN , SCB_NONE ); set_sc( TK_READYTURN , SC_READYTURN , SI_READYTURN , SCB_NONE );
set_sc( TK_READYCOUNTER , SC_READYCOUNTER , SI_READYCOUNTER , SCB_NONE ); set_sc( TK_READYCOUNTER , SC_READYCOUNTER , SI_READYCOUNTER , SCB_NONE );
set_sc( TK_DODGE , SC_DODGE , SI_DODGE , SCB_NONE ); set_sc( TK_DODGE , SC_DODGE , SI_DODGE , SCB_NONE );
set_sc( TK_SPTIME , SC_TKREST , SI_TKREST , SCB_NONE ); add_sc( TK_SPTIME , SC_EARTHSCROLL );
add_sc( TK_SEVENWIND , SC_SEVENWIND ); add_sc( TK_SEVENWIND , SC_SEVENWIND );
set_sc( TK_SEVENWIND , SC_GHOSTWEAPON , SI_GHOSTWEAPON , SCB_ATK_ELE ); set_sc( TK_SEVENWIND , SC_GHOSTWEAPON , SI_GHOSTWEAPON , SCB_ATK_ELE );
set_sc( TK_SEVENWIND , SC_SHADOWWEAPON , SI_SHADOWWEAPON , SCB_ATK_ELE ); set_sc( TK_SEVENWIND , SC_SHADOWWEAPON , SI_SHADOWWEAPON , SCB_ATK_ELE );
@ -5772,7 +5772,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
val4 = tick; //Store combo-time in val4. val4 = tick; //Store combo-time in val4.
} }
break; break;
case SC_TKREST: case SC_EARTHSCROLL:
val2 = 11-val1; //Chance to consume: 11-skilllv% val2 = 11-val1; //Chance to consume: 11-skilllv%
break; break;
case SC_RUN: case SC_RUN:
@ -6328,7 +6328,7 @@ int status_change_clear(struct block_list* bl, int type)
case SC_SUMMER: case SC_SUMMER:
case SC_NOCHAT: case SC_NOCHAT:
case SC_FUSION: case SC_FUSION:
case SC_TKREST: case SC_EARTHSCROLL:
case SC_READYSTORM: case SC_READYSTORM:
case SC_READYDOWN: case SC_READYDOWN:
case SC_READYCOUNTER: case SC_READYCOUNTER:

3
src/map/status.h
View File

@ -243,7 +243,7 @@ typedef enum sc_type {
SC_KAITE, SC_KAITE,
SC_SWOO, // [marquis007] SC_SWOO, // [marquis007]
SC_SKA, // [marquis007] SC_SKA, // [marquis007]
SC_TKREST, // [marquis007] SC_EARTHSCROLL,
SC_MIRACLE, //SG 'hidden' skill [Komurka] SC_MIRACLE, //SG 'hidden' skill [Komurka]
SC_MADNESSCANCEL, SC_MADNESSCANCEL,
SC_ADJUSTMENT, SC_ADJUSTMENT,
@ -446,7 +446,6 @@ enum si_type {
SI_CLOSECONFINE2 = 201, SI_CLOSECONFINE2 = 201,
SI_MADNESSCANCEL = 203, //[blackhole89] SI_MADNESSCANCEL = 203, //[blackhole89]
SI_GATLINGFEVER = 204, SI_GATLINGFEVER = 204,
SI_TKREST = 205, // 205 = Gloria again (but TK- Happy State looks like it)
SI_UTSUSEMI = 206, SI_UTSUSEMI = 206,
SI_BUNSINJYUTSU = 207, SI_BUNSINJYUTSU = 207,
SI_NEN = 208, SI_NEN = 208,