Add effect layering under the character, flippable effects and more #701

Crystalwarrior · 2022-03-25T11:56:52Z

Fix effect offsets only applying after the effect already plays
Massive overhaul with new properties and ini style:

# index:filename, index: part is optional
[1:realization]
# Sound to play for this effect
sound = sfx-realization
# Whether or not to delete the image once it's done playing. Ignored if loop=true
cull = true
# Which layer it's going to be on. Possible options:
# under - under the character
# character - over the character
# over - over everything in IC
# chat - over the chat box and other UI.
layer = chat
# Should we loop this effect?
loop = false
# Maximum duration for this effect in miliseconds. Put at 0 for no max letting the full animation to play out.
# Useful for single-image effects, such as realization flash.
max_duration = 60
# Should we respect the character's flip tick box and flip with them?
respect_flip = false
# Should we respect the character's offset and offset with them?
respect_offset = false
# Should we use smooth (bilinear) or pixel (nearest neighbor) scaling algorithm?
scaling = smooth
# Once we play the effect, should it remain in the effect dropdown still?
sticky = false
# Should we stretch the effect across the viewport?
stretch = true

fixes #636
fixes #704

Add "_layer" property which can be "behind", "character" or default "chat". This deprecates the "under_chatbox" property

…etting being enabled but just for that 1 effect

github-actions

clang-tidy made some suggestions

src/courtroom.cpp

…desk add new "over" layer which is over everything in the viewport but under the chat box

…aracter offsets if explicitly told to

github-actions

clang-tidy made some suggestions

src/courtroom.cpp

…talking about.

github-actions

clang-tidy made some suggestions

include/courtroom.h

src/courtroom.cpp

Add "loop" effect property so you set up in the ini if the effect should loop rather than it using the file's loop settings Add "max_duration" effect property Add "cull" effect property which decides whether to clear the effect or not when it's done (if loop is false)

github-actions

clang-tidy made some suggestions

src/courtroom.cpp

github-actions

clang-tidy made some suggestions

src/text_file_functions.cpp

Crystalwarrior · 2022-03-27T20:04:54Z

Just fixing the whole ass effects system at this point

…able. However, since order may or may not matter, you can optionally include index:name and it orders it properly.

github-actions

clang-tidy made some suggestions

src/courtroom.cpp

… misc theme exists

…'t play effect sound and prefer the sfx we chose instead.

github-actions

clang-tidy made some suggestions

src/courtroom.cpp

…ayers

github-actions · 2022-03-28T19:56:36Z

clang-tidy review says "All clean, LGTM! 👍"

github-actions

clang-tidy made some suggestions

src/courtroom.cpp

stonedDiscord

if you do what the bot complained about i'll merge it

include/courtroom.h

src/courtroom.cpp

src/text_file_functions.cpp

github-actions

clang-tidy made some suggestions

src/courtroom.cpp

stonedDiscord

it compiles

Crystalwarrior added 2 commits March 25, 2022 14:54

Fix effect offsets only applying after the effect already plays

01e80dd

Add "_layer" property which can be "behind", "character" or default "chat". This deprecates the "under_chatbox" property

Add a "sticky" effect property which is the same as "stickyeffects" s…

e5516cf

…etting being enabled but just for that 1 effect

github-actions bot reviewed Mar 25, 2022

View reviewed changes

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Outdated Show resolved Hide resolved

src/courtroom.cpp Outdated Show resolved Hide resolved

src/courtroom.cpp Outdated Show resolved Hide resolved

Crystalwarrior added 3 commits March 25, 2022 15:05

Clang is tidy, clang is caring

cfe3b1f

make character layer actually stack over the character but under the …

d34835a

…desk add new "over" layer which is over everything in the viewport but under the chat box

Switch "ignore_offset" to "respect_offset" so effects only respect ch…

f7cc329

…aracter offsets if explicitly told to

github-actions bot reviewed Mar 27, 2022

View reviewed changes

Appease clang tidy... mostly. I don't understand the last thing it's …

6cf7efc

…talking about.

github-actions bot reviewed Mar 27, 2022

View reviewed changes

include/courtroom.h Outdated Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

Crystalwarrior added 2 commits March 27, 2022 16:09

Appease clang tidy further

e996315

Crystalwarrior changed the title ~~Add effect layering under the character and flippable effects~~ Add effect layering under the character, flippable effects and more Mar 27, 2022

github-actions bot reviewed Mar 27, 2022

View reviewed changes

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

Fix effects not allowed to have underscores (_) in them without breaking

0d9fb00

github-actions bot reviewed Mar 27, 2022

View reviewed changes

src/text_file_functions.cpp Outdated Show resolved Hide resolved

Change the way effects.ini looks and is parsed to be more sane and do…

c36c02b

…able. However, since order may or may not matter, you can optionally include index:name and it orders it properly.

github-actions bot reviewed Mar 27, 2022

View reviewed changes

src/courtroom.cpp Show resolved Hide resolved

Crystalwarrior mentioned this pull request Mar 27, 2022

2.10 additions AttorneyOnline/AO2-Themes#13

Merged

Crystalwarrior requested a review from Salanto March 27, 2022 20:32

Crystalwarrior added 4 commits March 27, 2022 23:33

Appeal to clang

978413a

Fix a dumb way I created QSettings in get_effects

c539525

Fix effect properties being broken due to optional index

c276462

Fix get_effect_property not getting the current theme properties if a…

f036f31

… misc theme exists

Crystalwarrior requested a review from stonedDiscord March 28, 2022 11:18

If sound list has a sound effect selected, if pre is not checked, don…

4f1ebe6

…'t play effect sound and prefer the sfx we chose instead.

github-actions bot reviewed Mar 28, 2022

View reviewed changes

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

Merge commit '18412cc9303b1c11c8e35818d57b39aee72a5ec2' into effect-l…

4812940

…ayers

Fix \f not using the theme's realization effect

dab16a6

github-actions bot reviewed Mar 29, 2022

View reviewed changes

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

Crystal2002 mentioned this pull request May 11, 2022

AO 2.10 Feature Changelog Crystal2002/AO-Documentation#2

Open

stonedDiscord previously approved these changes May 21, 2022

View reviewed changes

include/courtroom.h Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

Merge branch 'master' into effect-layers

f7c87b5

Salanto dismissed stonedDiscord’s stale review via f7c87b5 June 2, 2022 18:32

stonedDiscord added the web label Jun 6, 2022

Merge branch 'master' into effect-layers

a6896a6

Salanto reviewed Jun 19, 2022

View reviewed changes

src/courtroom.cpp Outdated Show resolved Hide resolved

Salanto reviewed Jun 19, 2022

View reviewed changes

src/text_file_functions.cpp Show resolved Hide resolved

Salanto and others added 3 commits June 19, 2022 23:40

Add missing curly bracket

12d105d

Merge branch 'master' into effect-layers

4097881

Yolo

5d1132f

github-actions bot reviewed Jun 19, 2022

View reviewed changes

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

src/courtroom.cpp Show resolved Hide resolved

Crystalwarrior added this to the 2.10 milestone Jul 7, 2022

stonedDiscord approved these changes Jul 16, 2022

View reviewed changes

Crystalwarrior merged commit c8914c9 into master Jul 18, 2022

in1tiate deleted the effect-layers branch July 18, 2022 22:50

oldmud0 mentioned this pull request Aug 21, 2022

Fix case of self_offset received without a y offset #864

Merged

Add effect layering under the character, flippable effects and more #701

Add effect layering under the character, flippable effects and more #701

Uh oh!

Conversation

Crystalwarrior commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Crystalwarrior commented Mar 27, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 28, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stonedDiscord left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stonedDiscord left a comment

Choose a reason for hiding this comment

Uh oh!

Crystalwarrior commented Mar 25, 2022 •

edited

Loading