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

* Follow up 8a66d82 and c70762a

Browse Source
This commit is contained in:
Cahyadi Ramadhan Togihon
2013-10-09 06:49:08 +07:00
parent 9bb2df825b
commit d670952c61
5 changed files with 850 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1652
db/pre-re/skill_require_db.txt
View File

File diff suppressed because it is too large Load Diff

37
db/re/skill_db.txt
View File

@@ -1260,25 +1260,26 @@
3034,7,6,16,0,0x1,0,1,1,no,0,0,0,none,0,0x0, ECL_SEQUOIADUST,Sequoia Dust
3035,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, ECLAGE_RECALL,Return To Eclage
//****
// EP 14.3 Part 2 3rd Job Skills
//5001,1,8,1,-1,0,0,5,3,no,0,0,0,weapon,0,0, GC_DARKCROW,Dark Claw
//5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, RA_UNLIMIT,Unlimited
//5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,0, GN_ILLUSIONDOPING,Illusion Doping
//5004,9,6,2,1,0x42,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,weapon,0,0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
//5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,0, RK_LUXANIMA,Lux Anima
//5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0,0, NC_MAGMA_ERUPTION,Magma Eruption
//5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0,0, WM_FRIGG_SONG,Frigg's Song
//5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0,0, SO_ELEMENTAL_SHIELD,Elemental Shield
//5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0,0, SR_FLASHCOMBO,Flash Combo
//5010,0,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0, SC_ESCAPE,Emergency Escape
//5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, AB_OFFERTORIUM,Offertorium
//5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
//5013,0,6,4,0,0x3,5,5,1,no,0,0,0,none,0,0, LG_KINGS_GRACE,King's Grace
//5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, ALL_FULL_THROTTLE,Full Throttle
//5015,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, SR_FLASHCOMBO_ATK_STEP1,Flash Combo Attack Step 1
//5016,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, SR_FLASHCOMBO_ATK_STEP2,Flash Combo Attack Step 2
//5017,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, SR_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3
//5018,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0, SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4
5001,1,8,1,-1,0,0,5,3,no,0,0,0,weapon,0,0x0, GC_DARKCROW,Dark Claw
5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, RA_UNLIMIT,Unlimited
5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,0x0, GN_ILLUSIONDOPING,Illusion Doping
5004,9,6,2,1,0x42,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,weapon,0,0x0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,0x0, RK_LUXANIMA,Lux Anima
5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0,0x0, NC_MAGMA_ERUPTION,Magma Eruption
5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0,0x0, WM_FRIGG_SONG,Frigg's Song
5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0,0x0, SO_ELEMENTAL_SHIELD,Elemental Shield
5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO,Flash Combo
5010,0,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SC_ESCAPE,Emergency Escape
5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, AB_OFFERTORIUM,Offertorium
5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
5013,0,6,4,0,0x3,5,5,1,no,0,0,0,none,0,0x0, LG_KINGS_GRACE,King's Grace
5014,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, ALL_FULL_THROTTLE,Full Throttle
5015,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP1,Flash Combo Attack Step 1
5016,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP2,Flash Combo Attack Step 2
5017,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3
5018,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4
//****
// Homunculus S

2
db/re/skill_require_db.txt
View File

@@ -1,7 +1,7 @@
// Skill Requirements Database
//
// Structure of Database:
// SkillID,HPCost,MaxHPTrigger,SPCost,HPRateCost,SPRateCost,ZenyCost,RequiredWeapons,RequiredAmmoTypes,RequiredAmmoAmount,RequiredState,RequiredStatuses,SpiritSphereCost,RequiredItemID1,RequiredItemAmount1,RequiredItemID2,RequiredItemAmount2,RequiredItemID3,RequiredItemAmount3,RequiredItemID4,RequiredItemAmount4,RequiredItemID5,RequiredItemAmount5,RequiredItemID6,RequiredItemAmount6,RequiredItemID7,RequiredItemAmount7,RequiredItemID8,RequiredItemAmount8,RequiredItemID9,RequiredItemAmount9,RequiredItemID10,RequiredItemAmount10
// SkillID,HPCost,MaxHPTrigger,SPCost,HPRateCost,SPRateCost,ZenyCost,RequiredWeapons,RequiredAmmoTypes,RequiredAmmoAmount,RequiredState,RequiredStatuses,SpiritSphereCost,RequiredItemID1,RequiredItemAmount1,RequiredItemID2,RequiredItemAmount2,RequiredItemID3,RequiredItemAmount3,RequiredItemID4,RequiredItemAmount4,RequiredItemID5,RequiredItemAmount5,RequiredItemID6,RequiredItemAmount6,RequiredItemID7,RequiredItemAmount7,RequiredItemID8,RequiredItemAmount8,RequiredItemID9,RequiredItemAmount9,RequiredItemID10,RequiredItemAmount10,RequiredEquipment
//
// If HP/SPratecost is positive, it is a percent of your current life, otherwise it is a percent of your max life.
//

2
src/common/mmo.h
View File

@@ -81,7 +81,7 @@
#define MAX_ZENY 1000000000
#define MAX_FAME 1000000000
#define MAX_CART 100
#define MAX_SKILL 3100
#define MAX_SKILL 5020
#define GLOBAL_REG_NUM 256 // max permanent character variables per char
#define ACCOUNT_REG_NUM 64 // max permanent local account variables per account
#define ACCOUNT_REG2_NUM 16 // max permanent global account variables per account

6
src/map/battle.c
View File

@@ -4390,7 +4390,7 @@ void battle_do_reflect(int attack_type, struct Damage *wd, struct block_list* sr
if( (wd->damage + wd->damage2) && src && target && src != target &&
(src->type != BL_SKILL ||
(src->type == BL_SKILL && ( skill_id == SG_SUN_WARM || skill_id == SG_MOON_WARM || skill_id == SG_STAR_WARM )) )
){ //don't reflect to ourself
){ //don't reflect to yourself
int64 damage = wd->damage + wd->damage2, rdamage = 0;
struct map_session_data *tsd = BL_CAST(BL_PC, target);
struct status_change *tsc = status_get_sc(target);
@@ -5349,7 +5349,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
MATK_ADDRATE(skill_damage);
#endif
battle_do_reflect(BF_MAGIC,&ad, src, target, skill_id, skill_lv); //WIP [lighta]
//battle_do_reflect(BF_MAGIC,&ad, src, target, skill_id, skill_lv); //WIP [lighta]
return ad;
}
@@ -5750,7 +5750,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
if(tstatus->mode&MD_IGNOREMISC && md.flag&(BF_MISC) ) //misc @TODO optimize me
md.damage = md.damage2 = 1;
battle_do_reflect(BF_MISC,&md, src, target, skill_id, skill_lv); //WIP [lighta]
//battle_do_reflect(BF_MISC,&md, src, target, skill_id, skill_lv); //WIP [lighta]
return md;
}