Skip to content
Permalink
Browse files
Added support for skill scale display (#5041) 
Fixes #4530

Thanks to @Balferian
  • Loading branch information
@Lemongrass3110
Lemongrass3110 committed Jun 4, 2020
1 parent f218994 commit d87ac219862dcacc7c5ade32e752cd401a6ea5d5
Showing with 93 additions and 5 deletions.
  1. +4 −0 conf/battle/client.conf
  2. +25 −0 db/pre-re/skill_db.yml
  3. +25 −0 db/re/skill_db.yml
  4. +2 −1 doc/skill_db.txt
  5. +1 −0 src/map/battle.cpp
  6. +1 −0 src/map/battle.hpp
  7. +30 −1 src/map/clif.cpp
  8. +1 −1 src/map/clif.hpp
  9. +1 −0 src/map/script_constants.hpp
  10. +1 −0 src/map/skill.hpp
  11. +2 −2 src/map/unit.cpp
4 conf/battle/client.conf
View file
@@ -145,3 +145,7 @@ ping_timer_inverval: 30

// Send packets timeout in seconds before ping packet can be sent.
ping_time: 20

// Show skill scale for clients 2015-12-23 and newer? (Note 1)
// Official: yes
show_skill_scale: yes
25 db/pre-re/skill_db.yml
View file
@@ -15309,6 +15309,7 @@ Body:
Flags:
IsNpc: true
TargetTrap: true
ShowScale: true
Hit: Multi_Hit
HitCount: 1
SplashArea:
@@ -15414,6 +15415,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15460,6 +15462,7 @@ Body:
Flags:
IsNpc: true
TargetTrap: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea: 7
@@ -15475,6 +15478,7 @@ Body:
Flags:
IsNpc: true
TargetTrap: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea: 14
@@ -15489,6 +15493,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15513,6 +15518,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15537,6 +15543,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15561,6 +15568,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15585,6 +15593,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15609,6 +15618,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15634,6 +15644,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
Element: Fire
@@ -15652,6 +15663,7 @@ Body:
IgnoreDefCard: true
Flags:
IsNpc: true
ShowScale: true
Range: 7
Hit: Single
HitCount: 1
@@ -15748,6 +15760,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15864,6 +15877,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15888,6 +15902,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15912,6 +15927,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15945,6 +15961,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16224,6 +16241,7 @@ Body:
Flags:
IsNpc: true
IgnoreLandProtector: true
ShowScale: true
Hit: Single
HitCount: 1
Element: Poison
@@ -16240,6 +16258,8 @@ Body:
Name: NPC_COMET
Description: Comet 2
MaxLevel: 1
Flags:
ShowScale: true
- Id: 716
Name: NPC_MAXPAIN
Description: Max Pain
@@ -16271,6 +16291,8 @@ Body:
Name: NPC_JACKFROST
Description: Jack Frost 2
MaxLevel: 1
Flags:
ShowScale: true
- Id: 725
Name: NPC_REVERBERATION
Description: Reverberation 2
@@ -16283,6 +16305,7 @@ Body:
IsNpc: true
IsTrap: true
DisableNearNpc: true
ShowScale: true
Range: 1
Hit: Single
HitCount: 1
@@ -16323,6 +16346,8 @@ Body:
Name: NPC_LEX_AETERNA
Description: Lex Aeterna 2
MaxLevel: 1
Flags:
ShowScale: true
- Id: 728
Name: NPC_ARROWSTORM
Description: NPC Arrow Storm
25 db/re/skill_db.yml
View file
@@ -15722,6 +15722,7 @@ Body:
Flags:
IsNpc: true
TargetTrap: true
ShowScale: true
Hit: Multi_Hit
HitCount: 1
SplashArea:
@@ -15829,6 +15830,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15877,6 +15879,7 @@ Body:
Flags:
IsNpc: true
TargetTrap: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea: 7
@@ -15892,6 +15895,7 @@ Body:
Flags:
IsNpc: true
TargetTrap: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea: 14
@@ -15907,6 +15911,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15932,6 +15937,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15957,6 +15963,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -15982,6 +15989,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16007,6 +16015,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16032,6 +16041,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16058,6 +16068,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
Element: Fire
@@ -16077,6 +16088,7 @@ Body:
IgnoreDefCard: true
Flags:
IsNpc: true
ShowScale: true
Range: 7
Hit: Single
HitCount: 1
@@ -16175,6 +16187,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16295,6 +16308,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16320,6 +16334,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16345,6 +16360,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16378,6 +16394,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
SplashArea:
@@ -16676,6 +16693,7 @@ Body:
Flags:
IsNpc: true
IgnoreLandProtector: true
ShowScale: true
Hit: Single
HitCount: 1
Element: Poison
@@ -16699,6 +16717,7 @@ Body:
Splash: true
Flags:
AlterRangeRadius: true
ShowScale: true
Range: 11
Hit: Multi_Hit
HitCount: -20
@@ -16724,6 +16743,7 @@ Body:
IgnoreDefCard: true
Flags:
IsNpc: true
ShowScale: true
Hit: Single
HitCount: 1
Duration1: 10000
@@ -16748,6 +16768,7 @@ Body:
Flags:
IsNpc: true
IgnoreLandProtector: true
ShowScale: true
Hit: Single
HitCount: 1
Knockback: 2
@@ -16826,6 +16847,8 @@ Body:
TargetType: Self
DamageFlags:
Splash: true
Flags:
ShowScale: true
Hit: Multi_Hit
HitCount: -5
Element: Water
@@ -16864,6 +16887,7 @@ Body:
IsNpc: true
IsTrap: true
DisableNearNpc: true
ShowScale: true
Range: 1
Hit: Single
HitCount: 1
@@ -16912,6 +16936,7 @@ Body:
Splash: true
Flags:
IsNpc: true
ShowScale: true
Range: 9
Hit: Single
SplashArea:
3 doc/skill_db.txt
View file
@@ -99,8 +99,9 @@ TargetManHole - Target enemy with SC__MANHOLE.
TargetHidden - Target enemy with OPTION_HIDE.
IncreaseDanceWithWugDamage - Increase SC_DANCEWITHWUG damage.
IgnoreWugBite - Ignore RA_WUGBITE.
IgnoreAutoGuard - Not blocked by SC_AUTOGUARD (When TargetType is Weapon only).
IgnoreAutoGuard - Not blocked by SC_AUTOGUARD (When TargetType is Weapon only).
IgnoreCicada - Not blocked by SC_UTSUSEMI or SC_BUNSINJYUTSU (When TargetType is Weapon only).
ShowScale - Shows AoE area while casting

---------------------------------------

1 src/map/battle.cpp
View file
@@ -8956,6 +8956,7 @@ static const struct _battle_data {
{ "rental_item_novalue", &battle_config.rental_item_novalue, 1, 0, 1, },
{ "ping_timer_inverval", &battle_config.ping_timer_interval, 30, 0, 99999999, },
{ "ping_time", &battle_config.ping_time, 20, 0, 99999999, },
{ "show_skill_scale", &battle_config.show_skill_scale, 1, 0, 1, },

#include "../custom/battle_config_init.inc"
};

0 comments on commit d87ac21

Please sign in to comment.