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

* Renamed SI_CARTSBOOST for Genetic to SI_GN_CARTBOOST

Browse Source 
* Fixed Crimson Marker icon that doesn't show when it's casted to mob

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
This commit is contained in:
Cydh Ramdh 2013-12-29 01:29:46 +07:00
parent 5363a8d771
commit 3ee970a0e0
4 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
db/const.txt
View File

@ -301,12 +301,30 @@ EAJ_BABY_SURA 0x6204
EAJ_BABY_GENETIC 0x6205 EAJ_BABY_GENETIC 0x6205
EAJ_BABY_CHASER 0x6206 EAJ_BABY_CHASER 0x6206
Option_Wedding 0x1000 Option_Nothing 0x00000000
Option_Xmas 0x10000 Option_Sight 0x00000001
Option_Summer 0x40000 Option_Hide 0x00000002
Option_Wug 0x100000 Option_Cloadk 0x00000004
Option_Wugrider 0x200000 Option_Falcon 0x00000010
Option_Hanbok 0x8000000 Option_Riding 0x00000020
Option_Invisible 0x00000040
Option_Orcish 0x00000800
Option_Wedding 0x00001000
Option_Ruwach 0x00002000
Option_Chasewalk 0x00004000
Option_Flying 0x00008000
Option_Xmas 0x00010000
Option_Transform 0x00020000
Option_Summer 0x00040000
Option_Dragon1 0x00080000
Option_Wug 0x00100000
Option_Wugrider 0x00200000
Option_Madogear 0x00400000
Option_Dragon2 0x00800000
Option_Dragon3 0x01000000
Option_Dragon4 0x02000000
Option_Dragon5 0x04000000
Option_Hanbok 0x08000000
Option_Mounting 0x10000000 Option_Mounting 0x10000000
bc_all 0 bc_all 0
@ -1325,7 +1343,7 @@ SC_SKE 222
SC_KAITE 223 SC_KAITE 223
SC_SWOO 224 SC_SWOO 224
SC_SKA 225 SC_SKA 225
SC_TKREST 226 SC_EARTHSCROLL 226
SC_MIRACLE 227 SC_MIRACLE 227
SC_MADNESSCANCEL 228 SC_MADNESSCANCEL 228
SC_ADJUSTMENT 229 SC_ADJUSTMENT 229
@ -1351,6 +1369,10 @@ SC_INCFLEE2 248
SC_JAILED 249 SC_JAILED 249
SC_ENCHANTARMS 250 SC_ENCHANTARMS 250
SC_MAGICALATTACK 251 SC_MAGICALATTACK 251
SC_ARMORCHANGE 252
SC_CRITICALWOUND 253
SC_MAGICMIRROR 254
SC_SLOWCAST 255
SC_SUMMER 256 SC_SUMMER 256
SC_EXPBOOST 257 SC_EXPBOOST 257
SC_ITEMBOOST 258 SC_ITEMBOOST 258
@ -1373,6 +1395,12 @@ SC_SEVENWIND 274
SC_DEF_RATE 275 SC_DEF_RATE 275
//SC_SPREGEN 276 //SC_SPREGEN 276
SC_WALKSPEED 277 SC_WALKSPEED 277
SC_MERC_FLEEUP 278
SC_MERC_ATKUP 279
SC_MERC_HPUP 280
SC_MERC_SPUP 281
SC_MERC_HITUP 282
SC_MERC_QUICKEN 283
SC_REBIRTH 284 SC_REBIRTH 284
//SC_SKILLCASTRATE 285 //SC_SKILLCASTRATE 285
//SC_DEFRATIOATK 286 //SC_DEFRATIOATK 286
@ -2138,7 +2166,7 @@ SI_SPELLBOOK3 457
SI_FREEZE_SP 458 SI_FREEZE_SP 458
SI_GN_TRAINING_SWORD 459 SI_GN_TRAINING_SWORD 459
SI_GN_REMODELING_CART 460 SI_GN_REMODELING_CART 460
SI_CARTSBOOST 461 SI_GN_CARTBOOST 461
SI_FIXEDCASTINGTM_REDUCE 462 SI_FIXEDCASTINGTM_REDUCE 462
SI_THORNTRAP 463 SI_THORNTRAP 463
SI_BLOODSUCKER 464 SI_BLOODSUCKER 464

4
db/re/skill_db.txt
View File

@ -532,10 +532,10 @@
373,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x20, PF_HPCONVERSION,Indulge 373,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x20, PF_HPCONVERSION,Indulge
374,9,6,1,0,0x1,0,1,1,yes,0,0xE00,0,none,0,0x20, PF_SOULCHANGE,Soul Exhale 374,9,6,1,0,0x1,0,1,1,yes,0,0xE00,0,none,0,0x20, PF_SOULCHANGE,Soul Exhale
375,9,6,1,0,0x98,0,5,1,yes,0,0,0,magic,0,0x0, PF_SOULBURN,Soul Siphon 375,9,6,1,0,0x98,0,5,1,yes,0,0,0,magic,0,0x0, PF_SOULBURN,Soul Siphon
376,0,0,0,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0, ASC_KATAR,Advanced Katar Mastery
//**** //****
// Asassin Cross // Asassin Cross
376,0,0,0,0,0x1,0,5,1,no,0,0,0,weapon,0,0x0, ASC_KATAR,Advanced Katar Mastery
//377,0,0,4,0,0x1,0,10,1,no,0,0,0,misc,0,0x0, ASC_HALLUCINATION,Hallucination Walk //377,0,0,4,0,0x1,0,10,1,no,0,0,0,misc,0,0x0, ASC_HALLUCINATION,Hallucination Walk
378,0,6,4,5,0x1,0,5,1,no,0,0,0,weapon,0,0x0, ASC_EDP,Enchant Deadly Poison 378,0,6,4,5,0x1,0,5,1,no,0,0,0,weapon,0,0x0, ASC_EDP,Enchant Deadly Poison
379,7,6,1,-1,0x68,0,10,1,yes,0,0,0,misc,0,0x0, ASC_BREAKER,Soul Destroyer 379,7,6,1,-1,0x68,0,10,1,yes,0,0,0,misc,0,0x0, ASC_BREAKER,Soul Destroyer
@ -643,7 +643,6 @@
442,0,0,0,0,0,0,3,0,no,0,0,0,none,0,0x0, SG_FRIEND,Friend of the Sun Moon and Stars 442,0,0,0,0,0,0,3,0,no,0,0,0,none,0,0x0, SG_FRIEND,Friend of the Sun Moon and Stars
443,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, SG_KNOWLEDGE,Knowledge of the Sun Moon and Stars 443,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, SG_KNOWLEDGE,Knowledge of the Sun Moon and Stars
444,0,6,4,0,0x1,0,1,1,no,0,0,0,misc,0,0x0, SG_FUSION,Union of the Sun Moon and Stars 444,0,6,4,0,0x1,0,1,1,no,0,0,0,misc,0,0x0, SG_FUSION,Union of the Sun Moon and Stars
445,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_ALCHEMIST,Spirit of the Alchemist
//**** //****
// Alchemist // Alchemist
@ -651,6 +650,7 @@
//**** //****
// Soul Linker // Soul Linker
445,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_ALCHEMIST,Spirit of the Alchemist
447,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_MONK,Spirit of the Monk 447,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_MONK,Spirit of the Monk
448,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_STAR,Spirit of the Star Gladiator 448,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_STAR,Spirit of the Star Gladiator
449,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_SAGE,Spirit of the Sage 449,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0,0x0, SL_SAGE,Spirit of the Sage

41
src/map/status.c
View File

@ -683,7 +683,7 @@ void initChangeTables(void)
set_sc( SO_EARTH_INSIGNIA , SC_EARTH_INSIGNIA , SI_EARTH_INSIGNIA , SCB_MDEF|SCB_DEF|SCB_MAXHP|SCB_MAXSP|SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); set_sc( SO_EARTH_INSIGNIA , SC_EARTH_INSIGNIA , SI_EARTH_INSIGNIA , SCB_MDEF|SCB_DEF|SCB_MAXHP|SCB_MAXSP|SCB_WATK | SCB_ATK_ELE | SCB_REGEN );
/* Genetic */ /* Genetic */
set_sc( GN_CARTBOOST , SC_GN_CARTBOOST , SI_CARTSBOOST , SCB_SPEED ); set_sc( GN_CARTBOOST , SC_GN_CARTBOOST , SI_GN_CARTBOOST , SCB_SPEED );
set_sc( GN_THORNS_TRAP , SC_THORNSTRAP , SI_THORNTRAP , SCB_NONE ); set_sc( GN_THORNS_TRAP , SC_THORNSTRAP , SI_THORNTRAP , SCB_NONE );
set_sc_with_vfx( GN_BLOOD_SUCKER , SC_BLOODSUCKER , SI_BLOODSUCKER , SCB_NONE ); set_sc_with_vfx( GN_BLOOD_SUCKER , SC_BLOODSUCKER , SI_BLOODSUCKER , SCB_NONE );
add_sc( GN_WALLOFTHORN , SC_STOP ); add_sc( GN_WALLOFTHORN , SC_STOP );
@ -740,14 +740,14 @@ void initChangeTables(void)
set_sc_with_vfx( SC_SUPER_STAR , SC_SUPER_STAR , SI_SUPER_STAR , SCB_NONE ); set_sc_with_vfx( SC_SUPER_STAR , SC_SUPER_STAR , SI_SUPER_STAR , SCB_NONE );
/* Rebellion */ /* Rebellion */
add_sc( RL_MASS_SPIRAL , SC_BLEEDING ); add_sc( RL_MASS_SPIRAL , SC_BLEEDING );
add_sc( RL_HAMMER_OF_GOD , SC_STUN ); add_sc( RL_HAMMER_OF_GOD , SC_STUN );
set_sc( RL_B_TRAP , SC_B_TRAP , SI_B_TRAP , SCB_SPEED ); set_sc( RL_B_TRAP , SC_B_TRAP , SI_B_TRAP , SCB_SPEED );
set_sc( RL_E_CHAIN , SC_E_CHAIN , SI_E_CHAIN , SCB_NONE ); set_sc( RL_E_CHAIN , SC_E_CHAIN , SI_E_CHAIN , SCB_NONE );
set_sc( RL_C_MARKER , SC_C_MARKER , SI_C_MARKER , SCB_SPEED ); set_sc_with_vfx( RL_C_MARKER , SC_C_MARKER , SI_C_MARKER , SCB_SPEED );
set_sc( RL_P_ALTER , SC_P_ALTER , SI_P_ALTER , SCB_BATK ); set_sc( RL_P_ALTER , SC_P_ALTER , SI_P_ALTER , SCB_BATK );
set_sc( RL_SLUGSHOT , SC_STUN , SI_SLUGSHOT , SCB_NONE ); set_sc( RL_SLUGSHOT , SC_STUN , SI_SLUGSHOT , SCB_NONE );
set_sc( RL_AM_BLAST , SC_ANTI_M_BLAST , SI_ANTI_M_BLAST , SCB_DEF_ELE ); set_sc( RL_AM_BLAST , SC_ANTI_M_BLAST , SI_ANTI_M_BLAST , SCB_DEF_ELE );
set_sc( RL_HEAT_BARREL , SC_HEAT_BARREL , SI_HEAT_BARREL , SCB_BATK|SCB_ASPD|SCB_HIT ); set_sc( RL_HEAT_BARREL , SC_HEAT_BARREL , SI_HEAT_BARREL , SCB_BATK|SCB_ASPD|SCB_HIT );
/* Storing the target job rather than simply SC_SPIRIT simplifies code later on */ /* Storing the target job rather than simply SC_SPIRIT simplifies code later on */
@ -879,14 +879,14 @@ void initChangeTables(void)
StatusIconChangeTable[SC_DROCERA_HERB_STEAMED] = SI_DROCERA_HERB_STEAMED; StatusIconChangeTable[SC_DROCERA_HERB_STEAMED] = SI_DROCERA_HERB_STEAMED;
StatusIconChangeTable[SC_PUTTI_TAILS_NOODLES] = SI_PUTTI_TAILS_NOODLES; StatusIconChangeTable[SC_PUTTI_TAILS_NOODLES] = SI_PUTTI_TAILS_NOODLES;
StatusIconChangeTable[SC_BOOST500] |= SI_BOOST500; StatusIconChangeTable[SC_BOOST500] = SI_BOOST500;
StatusIconChangeTable[SC_FULL_SWING_K] |= SI_FULL_SWING_K; StatusIconChangeTable[SC_FULL_SWING_K] = SI_FULL_SWING_K;
StatusIconChangeTable[SC_MANA_PLUS] |= SI_MANA_PLUS; StatusIconChangeTable[SC_MANA_PLUS] = SI_MANA_PLUS;
StatusIconChangeTable[SC_MUSTLE_M] |= SI_MUSTLE_M; StatusIconChangeTable[SC_MUSTLE_M] = SI_MUSTLE_M;
StatusIconChangeTable[SC_LIFE_FORCE_F] |= SI_LIFE_FORCE_F; StatusIconChangeTable[SC_LIFE_FORCE_F] = SI_LIFE_FORCE_F;
StatusIconChangeTable[SC_EXTRACT_WHITE_POTION_Z] |= SI_EXTRACT_WHITE_POTION_Z; StatusIconChangeTable[SC_EXTRACT_WHITE_POTION_Z] = SI_EXTRACT_WHITE_POTION_Z;
StatusIconChangeTable[SC_VITATA_500] |= SI_VITATA_500; StatusIconChangeTable[SC_VITATA_500] = SI_VITATA_500;
StatusIconChangeTable[SC_EXTRACT_SALAMINE_JUICE] |= SI_EXTRACT_SALAMINE_JUICE; StatusIconChangeTable[SC_EXTRACT_SALAMINE_JUICE] = SI_EXTRACT_SALAMINE_JUICE;
/* Elemental Spirit's 'side' status change icons */ /* Elemental Spirit's 'side' status change icons */
StatusIconChangeTable[SC_CIRCLE_OF_FIRE] = SI_CIRCLE_OF_FIRE; StatusIconChangeTable[SC_CIRCLE_OF_FIRE] = SI_CIRCLE_OF_FIRE;
@ -962,8 +962,8 @@ void initChangeTables(void)
StatusChangeFlagTable[SC_BATKFOOD] |= SCB_BATK; StatusChangeFlagTable[SC_BATKFOOD] |= SCB_BATK;
StatusChangeFlagTable[SC_WATKFOOD] |= SCB_WATK; StatusChangeFlagTable[SC_WATKFOOD] |= SCB_WATK;
StatusChangeFlagTable[SC_MATKFOOD] |= SCB_MATK; StatusChangeFlagTable[SC_MATKFOOD] |= SCB_MATK;
StatusChangeFlagTable[SC_ARMOR_ELEMENT] |= SCB_ALL; StatusChangeFlagTable[SC_ARMOR_ELEMENT] |= SCB_DEF_ELE;
StatusChangeFlagTable[SC_ARMOR_RESIST] |= SCB_ALL; StatusChangeFlagTable[SC_ARMOR_RESIST] |= SCB_DEF_ELE;
StatusChangeFlagTable[SC_SPCOST_RATE] |= SCB_ALL; StatusChangeFlagTable[SC_SPCOST_RATE] |= SCB_ALL;
StatusChangeFlagTable[SC_WALKSPEED] |= SCB_SPEED; StatusChangeFlagTable[SC_WALKSPEED] |= SCB_SPEED;
StatusChangeFlagTable[SC_ITEMSCRIPT] |= SCB_ALL; StatusChangeFlagTable[SC_ITEMSCRIPT] |= SCB_ALL;
@ -1079,7 +1079,6 @@ void initChangeTables(void)
StatusChangeStateTable[SC_DEEPSLEEP] |= SCS_NOCAST; StatusChangeStateTable[SC_DEEPSLEEP] |= SCS_NOCAST;
StatusChangeStateTable[SC_SATURDAYNIGHTFEVER] |= SCS_NOCAST; StatusChangeStateTable[SC_SATURDAYNIGHTFEVER] |= SCS_NOCAST;
StatusChangeStateTable[SC_CURSEDCIRCLE_TARGET] |= SCS_NOCAST; StatusChangeStateTable[SC_CURSEDCIRCLE_TARGET] |= SCS_NOCAST;
StatusChangeStateTable[SC_SILENCE] |= SCS_NOCAST;
StatusChangeStateTable[SC_KINGS_GRACE] |= SCS_NOCAST; StatusChangeStateTable[SC_KINGS_GRACE] |= SCS_NOCAST;
StatusChangeStateTable[SC_HEAT_BARREL_AFTER] |= SCS_NOCAST; StatusChangeStateTable[SC_HEAT_BARREL_AFTER] |= SCS_NOCAST;
@ -9496,11 +9495,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
case SC_POISON: sc->opt2 |= OPT2_POISON; break; case SC_POISON: sc->opt2 |= OPT2_POISON; break;
case SC_CURSE: sc->opt2 |= OPT2_CURSE; break; case SC_CURSE: sc->opt2 |= OPT2_CURSE; break;
case SC_SILENCE: sc->opt2 |= OPT2_SILENCE; break; case SC_SILENCE: sc->opt2 |= OPT2_SILENCE; break;
case SC_SIGNUMCRUCIS: sc->opt2 |= OPT2_SIGNUMCRUCIS; break;
case SC_SIGNUMCRUCIS:
sc->opt2 |= OPT2_SIGNUMCRUCIS;
break;
case SC_BLIND: sc->opt2 |= OPT2_BLIND; break; case SC_BLIND: sc->opt2 |= OPT2_BLIND; break;
case SC_ANGELUS: sc->opt2 |= OPT2_ANGELUS; break; case SC_ANGELUS: sc->opt2 |= OPT2_ANGELUS; break;
case SC_BLEEDING: sc->opt2 |= OPT2_BLEEDING; break; case SC_BLEEDING: sc->opt2 |= OPT2_BLEEDING; break;

2
src/map/status.h
View File

@ -1156,7 +1156,7 @@ enum si_type {
SI_FREEZE_SP = 458, SI_FREEZE_SP = 458,
SI_GN_TRAINING_SWORD = 459, SI_GN_TRAINING_SWORD = 459,
SI_GN_REMODELING_CART = 460, SI_GN_REMODELING_CART = 460,
SI_CARTSBOOST = 461, SI_GN_CARTBOOST = 461,
SI_FIXEDCASTINGTM_REDUCE = 462, SI_FIXEDCASTINGTM_REDUCE = 462,
SI_THORNTRAP = 463, SI_THORNTRAP = 463,
SI_BLOODSUCKER = 464, SI_BLOODSUCKER = 464,