Skip to content

Commit

Permalink
Merge pull request #3218 from guilherme-gm/old-job-rebalances-1
Browse files Browse the repository at this point in the history 
1st jobs skill rebalance (2018 patch/Renewal)
  • Loading branch information
@MishimaHaruna
MishimaHaruna authored Mar 30, 2024
2 parents be0c897 + 8f0fb32 commit 42b08af
Show file tree
Hide file tree
Showing 7 changed files with 224 additions and 199 deletions.
4 changes: 4 additions & 0 deletions db/re/sc_config.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ SC_ANGELUS: {
NoMagicBlocked: true
}
CalcFlags: {
Maxhp: true
Def2: true
}
Icon: "SI_ANGELUS"
Expand All @@ -215,6 +216,7 @@ SC_BLESSING: {
Str: true
Int: true
Dex: true
Hit: true
}
Icon: "SI_BLESSING"
Skill: "AL_BLESSING"
Expand All @@ -228,6 +230,7 @@ SC_INC_AGI: {
CalcFlags: {
Agi: true
Speed: true
Aspd: true
}
Icon: "SI_INC_AGI"
Skill: "AL_INCAGI"
Expand Down Expand Up @@ -390,6 +393,7 @@ SC_SHOUT: {
}
CalcFlags: {
Str: true
Batk: true
}
Icon: "SI_SHOUT"
Skill: "MC_LOUD"
Expand Down
267 changes: 92 additions & 175 deletions db/re/skill_db.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ skill_db: (
}
SplashRange: 2
KnockBackTiles: 2
AfterCastActDelay: 2000
AfterCastActDelay: 500
CoolDown: 2000
SkillData2: 10000
FixedCastTime: 0
Expand Down Expand Up @@ -681,18 +681,7 @@ skill_db: (
}
InterruptCast: true
CastTime: 400
AfterCastActDelay: {
Lv1: 1200
Lv2: 1200
Lv3: 1600
Lv4: 1600
Lv5: 2000
Lv6: 2000
Lv7: 2400
Lv8: 2400
Lv9: 2800
Lv10: 2500
}
AfterCastActDelay: 1_400
FixedCastTime: 100
Requirements: {
SPCost: {
Expand Down Expand Up @@ -740,40 +729,29 @@ skill_db: (
}
InterruptCast: true
CastTime: {
Lv1: 640
Lv2: 960
Lv3: 1280
Lv4: 1600
Lv5: 1920
Lv6: 2100
Lv7: 1560
Lv8: 2880
Lv9: 3200
Lv10: 3520
}
AfterCastActDelay: {
Lv1: 1000
Lv2: 1200
Lv3: 1400
Lv4: 1600
Lv5: 1800
Lv6: 2000
Lv7: 2200
Lv8: 2400
Lv9: 2600
Lv10: 2800
}
Lv1: 500
Lv2: 800
Lv3: 1_100
Lv4: 1_400
Lv5: 1_700
Lv6: 2_000
Lv7: 2_300
Lv8: 2_600
Lv9: 2_900
Lv10: 3_200
}
AfterCastActDelay: 1400
FixedCastTime: {
Lv1: 160
Lv2: 240
Lv3: 320
Lv4: 400
Lv5: 480
Lv6: 700
Lv7: 640
Lv8: 720
Lv9: 800
Lv10: 880
Lv1: 300
Lv2: 400
Lv3: 500
Lv4: 600
Lv5: 700
Lv6: 800
Lv7: 900
Lv8: 1_000
Lv9: 1_100
Lv10: 1_200
}
Requirements: {
SPCost: {
Expand Down Expand Up @@ -810,7 +788,7 @@ skill_db: (
Element: "Ele_Water"
InterruptCast: true
CastTime: 640
AfterCastActDelay: 1500
AfterCastActDelay: 500
SkillData2: {
Lv1: 3000
Lv2: 6000
Expand Down Expand Up @@ -903,42 +881,9 @@ skill_db: (
}
SplashRange: 2
InterruptCast: true
CastTime: {
Lv1: 1280
Lv2: 1280
Lv3: 1280
Lv4: 1280
Lv5: 1280
Lv6: 800
Lv7: 800
Lv8: 800
Lv9: 800
Lv10: 800
}
AfterCastActDelay: {
Lv1: 1500
Lv2: 1500
Lv3: 1500
Lv4: 1500
Lv5: 1500
Lv6: 1000
Lv7: 1000
Lv8: 1000
Lv9: 1000
Lv10: 1000
}
FixedCastTime: {
Lv1: 320
Lv2: 320
Lv3: 320
Lv4: 320
Lv5: 320
Lv6: 200
Lv7: 200
Lv8: 200
Lv9: 200
Lv10: 200
}
CastTime: 800
AfterCastActDelay: 700
FixedCastTime: 200
Requirements: {
SPCost: 25
}
Expand Down Expand Up @@ -1043,40 +988,29 @@ skill_db: (
}
InterruptCast: true
CastTime: {
Lv1: 640
Lv2: 960
Lv3: 1280
Lv4: 1600
Lv5: 1920
Lv6: 2100
Lv7: 1560
Lv8: 2880
Lv9: 3200
Lv10: 3520
}
AfterCastActDelay: {
Lv1: 1000
Lv2: 1200
Lv3: 1400
Lv4: 1600
Lv5: 1800
Lv6: 2000
Lv7: 2200
Lv8: 2400
Lv9: 2600
Lv10: 2800
}
Lv1: 500
Lv2: 800
Lv3: 1_100
Lv4: 1_400
Lv5: 1_700
Lv6: 2_000
Lv7: 2_300
Lv8: 2_600
Lv9: 2_900
Lv10: 3_200
}
AfterCastActDelay: 1400
FixedCastTime: {
Lv1: 160
Lv2: 240
Lv3: 320
Lv4: 400
Lv5: 480
Lv6: 700
Lv7: 640
Lv8: 720
Lv9: 800
Lv10: 880
Lv1: 300
Lv2: 400
Lv3: 500
Lv4: 600
Lv5: 700
Lv6: 800
Lv7: 900
Lv8: 1_000
Lv9: 1_100
Lv10: 1_200
}
Requirements: {
SPCost: {
Expand Down Expand Up @@ -1124,40 +1058,29 @@ skill_db: (
}
InterruptCast: true
CastTime: {
Lv1: 640
Lv2: 960
Lv3: 1280
Lv4: 1600
Lv5: 1920
Lv6: 2100
Lv7: 1560
Lv8: 2880
Lv9: 3200
Lv10: 3520
}
AfterCastActDelay: {
Lv1: 1000
Lv2: 1200
Lv3: 1400
Lv4: 1600
Lv5: 1800
Lv6: 2000
Lv7: 2200
Lv8: 2400
Lv9: 2600
Lv10: 2800
}
Lv1: 500
Lv2: 800
Lv3: 1_100
Lv4: 1_400
Lv5: 1_700
Lv6: 2_000
Lv7: 2_300
Lv8: 2_600
Lv9: 2_900
Lv10: 3_200
}
AfterCastActDelay: 1400
FixedCastTime: {
Lv1: 160
Lv2: 240
Lv3: 320
Lv4: 400
Lv5: 480
Lv6: 700
Lv7: 640
Lv8: 720
Lv9: 800
Lv10: 880
Lv1: 300
Lv2: 400
Lv3: 500
Lv4: 600
Lv5: 700
Lv6: 800
Lv7: 900
Lv8: 1_000
Lv9: 1_100
Lv10: 1_200
}
Requirements: {
SPCost: {
Expand Down Expand Up @@ -1205,16 +1128,16 @@ skill_db: (
}
InterruptCast: true
CastTime: {
Lv1: 640
Lv2: 1280
Lv3: 1920
Lv4: 2560
Lv5: 3200
Lv6: 3840
Lv7: 4480
Lv8: 5120
Lv9: 5760
Lv10: 6400
Lv1: 2_700
Lv2: 2_900
Lv3: 3_100
Lv4: 3_300
Lv5: 3_500
Lv6: 3_700
Lv7: 3_900
Lv8: 4_100
Lv9: 4_300
Lv10: 4_500
}
AfterCastActDelay: {
Lv1: 2000
Expand All @@ -1229,18 +1152,7 @@ skill_db: (
Lv10: 2000
}
SkillData1: 500
FixedCastTime: {
Lv1: 160
Lv2: 320
Lv3: 480
Lv4: 640
Lv5: 800
Lv6: 960
Lv7: 1120
Lv8: 1280
Lv9: 1440
Lv10: 1600
}
FixedCastTime: 1_500
Requirements: {
SPCost: {
Lv1: 29
Expand Down Expand Up @@ -1645,6 +1557,7 @@ skill_db: (
InterruptCast: true
CastTime: 350
AfterCastActDelay: 3500
CoolDown: 30_000
SkillData1: {
Lv1: 30000
Lv2: 60000
Expand Down Expand Up @@ -5653,9 +5566,13 @@ skill_db: (
AttackType: "Weapon"
DamageType: {
NoDamage: true
SplashArea: true
}
SkillData1: 300000
FixedCastTime: 0
SplashRange: -1
SkillData1: 300_000 // SC duration
CastTime: 1_000
FixedCastTime: 500
CoolDown: 30_000
Requirements: {
SPCost: 8
}
Expand All @@ -5678,8 +5595,8 @@ skill_db: (
AttackType: "Magic"
Element: "Ele_Holy"
InterruptCast: true
CastTime: 1600
FixedCastTime: 400
CastTime: 800
FixedCastTime: 200
Requirements: {
SPCost: 15
}
Expand Down
2 changes: 2 additions & 0 deletions src/map/battle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,8 @@ static int64 battle_calc_weapon_damage(struct block_list *src, struct block_list
if ( sd->battle_status.equip_atk != 0 )
eatk = sd->base_status.equip_atk;

eatk += sd->battle_status.buff_extra_batk;

if ( sd->bonus.atk_rate )
damage += damage * sd->bonus.atk_rate / 100;
}
Expand Down
Loading

0 comments on commit 42b08af

Please sign in to comment.