Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronize Damage Feature #8305

Merged
merged 20 commits into from
May 25, 2024
+3,427 −23
Merged

Synchronize Damage Feature #8305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
059f6e0
Adds ClientAttackMotion to mob database
aleos89 May 2, 2024
e89d89e
Increased version number
Lemongrass3110 May 2, 2024
82afe60
Synchronize Damage Feature
Playtester May 4, 2024
fae8477
ClientAttackMotion Min and Default
Playtester May 4, 2024
2b02765
Resolves invalid parsed values
aleos89 May 4, 2024
d30e016
Made synchronize_damage work together with delay_battle_damage
Playtester May 5, 2024
ef28d9e
Apply suggestions from code review
Playtester May 5, 2024
3bc4534
Ensure clientamotion is at least 1 already in constructor
Playtester May 5, 2024
70fdcba
Update ClientAttackMotion values
aleos89 May 8, 2024
31ad1f4
ClientAttackMotion cleanup part deux
aleos89 May 8, 2024
1262acd
Added status_get_clientamotion and optimized implementation
Playtester May 8, 2024
611e2c3
Apply suggestion: Check config first
Playtester May 20, 2024
6586b56
Code optimizations based on feedback from Lemongrass
Playtester May 20, 2024
36e7923
Fixed spaces
Playtester May 20, 2024
f1430ba
Removed != 0 check
Playtester May 21, 2024
2fc675b
Improved documentation and moved setting to battle.conf
Playtester May 21, 2024
52fdaf7
Fixed problem that caused build to fail
Playtester May 21, 2024
a801950
Unified the amotion calculation in battle_delay_damage
Playtester May 22, 2024
313109b
Code optimization (easier to read)
Playtester May 25, 2024
308dafb
Comment in battle.conf updated by Lemongrass
Playtester May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions conf/battle/battle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,19 @@ equip_self_break_rate: 100
// This affects the behaviour of skills like acid terror and meltdown
equip_skill_break_rate: 100

// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
// NOTE: The official setting is yes, even thought it degrades performance a bit.
// Should damage have a delay before it is applied? (Note 1)
// Some skills might not have a delay by default regardless of this setting.
// The official setting is yes, even thought it degrades performance a bit.
delay_battle_damage: yes

// Should the damage timing be synchronized between the client and server? (Note 1)
// This is not official behavior, but it should remove the position lag after being hit by a monster.
// This setting only affects normal monster attacks and takes priority over "delay_battle_damage".
// Many skills show their damage immediately, so setting "delay_battle_damage" to "no" at the same
// time might improve the experience further, but will not work for all skills.
Comment on lines +141 to +142
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Many skills show their damage immediately, so setting "delay_battle_damage" to "no" at the same
// time might improve the experience further, but will not work for all skills.
// Many skills show their damage immediately, so setting "delay_battle_damage" to "no" at the same
// time might improve the experience further, but will not work for all skills.

Could we not add a check for that as well? Maybe in another PR?
Basically we would just have to replace the skill_id == 0 check with a skill_id == 0 || skill_get_delay == 0 (pseudo) check?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The correct way to implement this for skills is to define the clientamotion for each skill and then use this information when sychnronize_damage is enabled. Would be great, but currently we don't have this information available.

// Tired of Dark Illusion hitting you 5 seconds too late? Then turn this on.
synchronize_damage: no

// Are arrows/ammo consumed when used on a bow/gun?
// 0 = No
// 1 = Yes
Expand Down
3 changes: 2 additions & 1 deletion db/import-tmpl/mob_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
# WalkSpeed Walk speed. (Default: DEFAULT_WALK_SPEED)
# AttackDelay Attack speed. (Default: 0)
# AttackMotion Attack animation speed. (Default: 0)
# ClientAttackMotion Client attack speed. (Default: AttackMotion)
# DamageMotion Damage animation speed. (Default: 0)
# DamageTaken Rate at which the monster will receive incoming damage. (Default: 100)
# Ai Aegis monster type AI behavior. (Default: 06)
Expand All @@ -77,7 +78,7 @@

Header:
Type: MOB_DB
Version: 3
Version: 4

#Body:
# eAthena Dev Team
Expand Down
3 changes: 2 additions & 1 deletion db/mob_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
# WalkSpeed Walk speed. (Default: DEFAULT_WALK_SPEED)
# AttackDelay Attack speed. (Default: 0)
# AttackMotion Attack animation speed. (Default: 0)
# ClientAttackMotion Client attack speed. (Default: AttackMotion)
# DamageMotion Damage animation speed. (Default: 0)
# DamageTaken Rate at which the monster will receive incoming damage. (Default: 100)
# Ai Aegis monster type AI behavior. (Default: 06)
Expand All @@ -77,7 +78,7 @@

Header:
Type: MOB_DB
Version: 3
Version: 4

Footer:
Imports:
Expand Down