Fixes some issues with traps #2182
Merged
+152
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
4144
requested changes
Aug 21, 2018
src/map/battle.c
Outdated
| @@ -4339,6 +4339,27 @@ static struct Damage battle_calc_misc_attack(struct block_list *src, struct bloc | |||
| } | |||
| break; | |||
| } | |||
|
|
|||
| if (battle_config.trap_reflect == true) { | |||
There was a problem hiding this comment.
this code with if and switch better move into separate function
src/map/skill.c
Outdated
| @@ -16864,7 +16865,11 @@ static int skill_trap_splash(struct block_list *bl, va_list ap) | |||
| } | |||
| /* Fall through */ | |||
| default: | |||
| skill->attack(skill->get_type(sg->skill_id),ss,src,bl,sg->skill_id,sg->skill_lv,tick,0); | |||
| // if trap damage should be split among targets, count them | |||
| if (skill->get_nk(sg->skill_id)&NK_SPLASHSPLIT) | |||
There was a problem hiding this comment.
need space before & and after it
bWolfie
reviewed
Aug 21, 2018
guilherme-gm
force-pushed
the
201808-trapfix
branch
from
a3c811a
to
dca07b9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Prelude
Changes Proposed
These commits fixes two issues related to traps.
The first one allows traps that causes damage to be reflected by skills/cards that gives physical attack reflection (e.g. Reflect Shield and High Orc Card). This feature can be turned off in skill.conf to get old effect back.
As we don't have information about some 3rd classes traps I let them commented out until we're sure they can also be reflected.
The second issue refers to Blastimine and Claymore Trap damage behavior. The damage caused by these traps must be split by the number of enemies affected by them.
Affected Branches:
master
Issues addressed:
Known Issues and TODO List
Special thanks to @kyeme