From 8314f662e97a867e1d756db2f5e5da0a8d1890d5 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sat, 17 Dec 2011 02:49:22 +0000 Subject: Fixed bug with quest skills duration, shrink, sight blaster, etc), bugreport:5122 dropped unofficial fire ivy support (also it was conflicting with the bug above) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15138 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/skill_cast_db.txt | 56 ++++++++++++++++++------------------ src/map/battle.c | 5 ---- src/map/config/Skills/Mage_Classes.h | 6 ---- src/map/skill.c | 52 +++++++-------------------------- 4 files changed, 38 insertions(+), 81 deletions(-) diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 05e44e02b..77eb50271 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -1783,61 +1783,61 @@ //===== Elemental Skills ======================= //-- EL_CIRCLE_OF_FIRE -8401,0,0,0,-1,0,0 +//8401,0,0,0,-1,0,0 //-- EL_FIRE_CLOAK -8402,0,0,0,-1,0,0 +//8402,0,0,0,-1,0,0 //-- EL_FIRE_MANTLE -8403,0,0,0,15000,0,0 +//8403,0,0,0,15000,0,0 //-- EL_WATER_SCREEN -8404,0,0,0,-1,0,0 +//8404,0,0,0,-1,0,0 //-- EL_WATER_DROP -8405,0,0,0,-1,0,0 +//8405,0,0,0,-1,0,0 //-- EL_WATER_BARRIER -8406,1000,0,0,15000,0,0 +//8406,1000,0,0,15000,0,0 //-- EL_WIND_STEP -8407,0,0,0,-1,0,0 +//8407,0,0,0,-1,0,0 //-- EL_WIND_CURTAIN -8408,0,0,0,-1,0,0 +//8408,0,0,0,-1,0,0 //-- EL_ZEPHYR -8409,0,0,0,15000,0,0 +//8409,0,0,0,15000,0,0 //-- EL_STONE_SHIELD -8411,0,0,0,-1,0,0 +//8411,0,0,0,-1,0,0 //-- EL_POWER_OF_GAIA -8412,0,0,0,15000,0,0 +//8412,0,0,0,15000,0,0 //-- EL_PYROTECHNIC -8413,0,0,0,-1,0,0 +//8413,0,0,0,-1,0,0 //-- EL_HEATER -8414,0,0,0,-1,0,0 +//8414,0,0,0,-1,0,0 //-- EL_TROPIC -8415,0,0,0,-1,0,0 +//8415,0,0,0,-1,0,0 //-- EL_AQUAPLAY -8416,0,0,0,-1,0,0 +//8416,0,0,0,-1,0,0 //-- EL_COOLER -8417,0,0,0,-1,0,0 +//8417,0,0,0,-1,0,0 //-- EL_CHILLY_AIR -8418,0,0,0,-1,0,0 +//8418,0,0,0,-1,0,0 //-- EL_GUST -8419,0,0,0,-1,0,0 +//8419,0,0,0,-1,0,0 //-- EL_BLAST -8420,0,0,0,-1,0,0 +//8420,0,0,0,-1,0,0 //-- EL_WILD_STORM -8421,0,0,0,-1,0,0 +//8421,0,0,0,-1,0,0 //-- EL_PETROLOGY -8422,0,0,0,-1,0,0 +//8422,0,0,0,-1,0,0 //-- EL_CURSED_SOIL -8423,0,0,0,-1,0,0 +//8423,0,0,0,-1,0,0 //-- EL_UPHEAVAL -8424,0,0,0,-1,0,0 +//8424,0,0,0,-1,0,0 //-- EL_TIDAL_WEAPON -8433,0,0,0,-1,0,0 +//8433,0,0,0,-1,0,0 //-- EL_TYPOON_MIS -8437,0,0,0,15000,0,0 +//8437,0,0,0,15000,0,0 //-- EL_STONE_HAMMER -8439,0,0,0,5000,0,0 +//8439,0,0,0,5000,0,0 //-- EL_ROCK_CRUSHER -8440,0,0,0,15000,0,0 +//8440,0,0,0,15000,0,0 //-- EL_ROCK_CRUSHER_ATK -8441,0,0,0,15000,0,0 +//8441,0,0,0,15000,0,0 //========================================== //===== Guild Skills ======================= diff --git a/src/map/battle.c b/src/map/battle.c index c1faed285..ec2dc6dfa 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2765,11 +2765,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list case WZ_SIGHTRASHER: skillratio += 20*skill_lv; break; -#if FIREIVY_ON - case WZ_FIREIVY: - skillratio += 20*skill_lv-15; - break; -#endif case WZ_VERMILION: skillratio += 20*skill_lv-20; break; diff --git a/src/map/config/Skills/Mage_Classes.h b/src/map/config/Skills/Mage_Classes.h index 26cd1d03c..c3ff3ab52 100644 --- a/src/map/config/Skills/Mage_Classes.h +++ b/src/map/config/Skills/Mage_Classes.h @@ -7,12 +7,6 @@ * making these settings the most performance-effiecient possible **/ -/** - * (Wizard/HW/Warlock) enable Fire Ivy skill? (1 OR 0) - * Default: 0 (disabled) - **/ -#define FIREIVY_ON 0 - /** * No settings past this point **/ diff --git a/src/map/skill.c b/src/map/skill.c index 0a7ad5e67..eed8c334d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -793,14 +793,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int case WZ_METEOR: sc_start(bl,SC_STUN,3*skilllv,skilllv,skill_get_time2(skillid,skilllv)); break; -#if FIREIVY_ON - //case WZ_FIREIVY: - // Testing for Fire Ivy - //sc_start(bl,SC_STUN,3*skilllv,skilllv,skill_get_time2(skillid,skilllv)); - //sc_start(bl,SC_STUN,(5*skilllv+35),skilllv,skill_get_time2(skillid,skilllv)); - //sc_start(bl,SC_BURNING,(8*skilllv+35),skilllv,skill_get_time2(skillid,skilllv)); - //break; -#endif + case WZ_VERMILION: sc_start(bl,SC_BLIND,4*skilllv,skilllv,skill_get_time2(skillid,skilllv)); break; @@ -3333,9 +3326,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int case NJ_KOUENKA: case NJ_HYOUSENSOU: case NJ_HUUJIN: -#if FIREIVY_ON - case WZ_FIREIVY: -#endif + /** * Arch Bishop **/ @@ -3459,7 +3450,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int skill_attack(BF_MAGIC,src,src,src,skillid,skilllv,tick,flag); status_percent_damage(src, src, 0, 100, false); } - if (sd) skill_blockpc_start (sd, skillid, (skilllv < 5 ? 10000: 15000)); break; case NPC_BLOODDRAIN: @@ -7657,9 +7647,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, int skillid, int sk case MG_SAFETYWALL: case MG_FIREWALL: case MG_THUNDERSTORM: -#if FIREIVY_ON - case WZ_FIREIVY: -#endif + case AL_PNEUMA: case WZ_ICEWALL: case WZ_FIREPILLAR: @@ -13883,9 +13871,7 @@ int skill_stasis_check(struct block_list *bl, int src_id, int skillid) case SA_LANDPROTECTOR: case PF_HPCONVERSION: case PF_SOULCHANGE: case PF_SPIDERWEB: case PF_FOGWALL: case TK_RUN: case TK_HIGHJUMP: case TK_SEVENWIND: case SL_KAAHI: case SL_KAUPE: case SL_KAITE: -#if FIREIVY_ON - case WZ_FIREIVY: -#endif + // Skills that need to be confirmed. case SO_FIREWALK: case SO_ELECTRICWALK: case SO_SPELLFIST: case SO_EARTHGRAVE: case SO_DIAMONDDUST: case SO_POISON_BUSTER: case SO_PSYCHIC_WAVE: case SO_CLOUD_KILL: @@ -13938,10 +13924,7 @@ static bool skill_parse_row_skilldb(char* split[], int columns, int current) i = skill_get_index(id); if( !i ) // invalid skill id return false; -#if FIREIVY_ON == 0 - if( i == WZ_FIREIVY ) //Disabled - return true; -#endif + skill_split_atoi(split[1],skill_db[i].range); skill_db[i].hit = atoi(split[2]); skill_db[i].inf = atoi(split[3]); @@ -13983,10 +13966,7 @@ static bool skill_parse_row_requiredb(char* split[], int columns, int current) i = skill_get_index(i); if( !i ) // invalid skill id return false; -#if FIREIVY_ON == 0 - if( i == WZ_FIREIVY ) //Disabled - return true; -#endif + skill_split_atoi(split[1],skill_db[i].hp); skill_split_atoi(split[2],skill_db[i].mhp); skill_split_atoi(split[3],skill_db[i].sp); @@ -14072,10 +14052,7 @@ static bool skill_parse_row_castdb(char* split[], int columns, int current) i = skill_get_index(i); if( !i ) // invalid skill id return false; -#if FIREIVY_ON == 0 - if( i == WZ_FIREIVY ) //Disabled - return true; -#endif + skill_split_atoi(split[1],skill_db[i].cast); skill_split_atoi(split[2],skill_db[i].delay); skill_split_atoi(split[3],skill_db[i].walkdelay); @@ -14091,10 +14068,7 @@ static bool skill_parse_row_castnodexdb(char* split[], int columns, int current) i = skill_get_index(i); if( !i ) // invalid skill id return false; -#if FIREIVY_ON == 0 - if( i == WZ_FIREIVY ) //Disabled - return true; -#endif + skill_split_atoi(split[1],skill_db[i].castnodex); if( split[2] ) // optional column skill_split_atoi(split[2],skill_db[i].delaynodex); @@ -14108,10 +14082,7 @@ static bool skill_parse_row_nocastdb(char* split[], int columns, int current) i = skill_get_index(i); if( !i ) // invalid skill id return false; -#if FIREIVY_ON == 0 - if( i == WZ_FIREIVY ) //Disabled - return true; -#endif + skill_db[i].nocast |= atoi(split[1]); return true; @@ -14255,10 +14226,7 @@ static bool skill_parse_row_abradb(char* split[], int columns, int current) ShowError("abra_db: Passive skills cannot be casted (%d/%s)\n", i, skill_get_name(i)); return false; } -#if FIREIVY_ON == 0 - if( i == WZ_FIREIVY ) //Disabled - return true; -#endif + skill_abra_db[current].skillid = i; skill_abra_db[current].req_lv = atoi(split[2]); skill_abra_db[current].per = atoi(split[3]); -- cgit v1.2.3-70-g09d2