diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-24 09:37:08 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-24 09:37:08 +0000 |
| commit | 75e90443fb9402967c1675131e15eb8d147ab2e8 (patch) | |
| tree | 307b9810f4ab62ea8d33da003609a12e162992cf /src | |
| parent | 092c12d31a3787620fceedc2a6d032eacde14788 (diff) | |
| download | hercules-75e90443fb9402967c1675131e15eb8d147ab2e8.tar.gz hercules-75e90443fb9402967c1675131e15eb8d147ab2e8.tar.bz2 hercules-75e90443fb9402967c1675131e15eb8d147ab2e8.tar.xz hercules-75e90443fb9402967c1675131e15eb8d147ab2e8.zip | |
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.
Also removed the associated SI_TKREST since this status doesn't actually have an icon.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13695 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 6 | ||||
| -rw-r--r-- | src/map/status.h | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index db59a3bc9..c9d449bdf 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7954,7 +7954,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in //Consume sd->itemid = sd->itemindex = -1; 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. else pc_delitem(sd,i,1,0); diff --git a/src/map/status.c b/src/map/status.c index f7c10872d..6c1a1029e 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -318,7 +318,7 @@ void initChangeTables(void) set_sc( TK_READYTURN , SC_READYTURN , SI_READYTURN , 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_SPTIME , SC_TKREST , SI_TKREST , SCB_NONE ); + add_sc( TK_SPTIME , SC_EARTHSCROLL ); add_sc( TK_SEVENWIND , SC_SEVENWIND ); set_sc( TK_SEVENWIND , SC_GHOSTWEAPON , SI_GHOSTWEAPON , 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. } break; - case SC_TKREST: + case SC_EARTHSCROLL: val2 = 11-val1; //Chance to consume: 11-skilllv% break; case SC_RUN: @@ -6328,7 +6328,7 @@ int status_change_clear(struct block_list* bl, int type) case SC_SUMMER: case SC_NOCHAT: case SC_FUSION: - case SC_TKREST: + case SC_EARTHSCROLL: case SC_READYSTORM: case SC_READYDOWN: case SC_READYCOUNTER: diff --git a/src/map/status.h b/src/map/status.h index 638783de1..bae20055f 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -243,7 +243,7 @@ typedef enum sc_type { SC_KAITE, SC_SWOO, // [marquis007] SC_SKA, // [marquis007] - SC_TKREST, // [marquis007] + SC_EARTHSCROLL, SC_MIRACLE, //SG 'hidden' skill [Komurka] SC_MADNESSCANCEL, SC_ADJUSTMENT, @@ -446,7 +446,6 @@ enum si_type { SI_CLOSECONFINE2 = 201, SI_MADNESSCANCEL = 203, //[blackhole89] SI_GATLINGFEVER = 204, - SI_TKREST = 205, // 205 = Gloria again (but TK- Happy State looks like it) SI_UTSUSEMI = 206, SI_BUNSINJYUTSU = 207, SI_NEN = 208, |