-
Notifications
You must be signed in to change notification settings - Fork 684
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.
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
Filtering Framework Expansion #5554
Filtering Framework Expansion #5554
Conversation
oops there are more |
@multimokia changes addressed |
marking as high priority because of future dev that needs the additional options to create filtered sprites |
image mas_o31_deco = ConditionSwitch( | ||
"morning_flag", "mod_assets/location/spaceroom/o31/halloween_deco.png", | ||
"not morning_flag", "mod_assets/location/spaceroom/o31/halloween_deco-n.png" | ||
image mas_o31_deco = MASFilterSwitch( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The filter dims the lighting of o31 decor, the player cake and Monika's cake by a lot. For these 3 cases we should either use the current night sprites or, if possible, highlights.
@@ -222,8 +223,12 @@ M̼̤̱͇̤ ͈̰̬͈̭ͅw̩̜͇͈ͅa̲̩̭̩ͅs̙ ̣͔͓͚̰h̠̯̫̼͉e̗̗̮r | |||
""" | |||
super(renpy.Displayable, self).__init__() | |||
|
|||
# dont really feel like changing every image line to not do inline | |||
# if statements so this will work for now. | |||
self.day_mode = not mas_globals.dark_mode |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calendar was not affected by mas_globals.dark_mode
as it is not considered as part of the ui but part of the background, so it should change depending on the day or the filter cycle.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but why? calendar is all UI elements so it should follow the UI rules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calendar is only somewhat a button. Since it hangs on the spaceroom walls and also functions as a part of the room, we treat it as such. Additionally, it makes no sense for the calendar to change with ui modes because it's a part of the room.
…release classes for literal filterswitches
Key Changes
MASFilterSwitch
- filter-based version of ConditionSwitch. Basically builds a ConditionSwitch that uses filters appropriately. Should be used for most cases, although this may change as we use more filters.MASFilteredSprite
- generates a filtered version of an image as a displayableMASFilterableSprite
- updated to include highlight viaMASFilterMap
. In general, this should only be used if you need to combine a sprite and its highlight for whatever reason.mas_sprites.add_filter
- adds a new filter. Must be called before init level -1.mas_sprites.get_filter
- gets the current filtermas_sprites.set_filter
- sets the current filter. ignores invalid filter valuesmas_isCurrentFlt
- checks if the current filter is the same as the passed in onespaceroom
label is now in charge of progressing the filter. It will handle scene change and dissolve all when filter change is appropriate.progress_filter
to thespaceroom
label. Passing in False will prevent spaceroom from progressing the filter.morning_flag
in the calendar displayable toself.day_mode
which is set by themas_current_background.isFltDay
function.MASBackground
integration latermorning_flag
dev_sprite_timer.rpy
mas_weather.should_scene_change
- if you want the scene to change, callmas_idle_mailbox.send_scene_change
new API functions
mas_progressFilter
- progresses the filter depending on rules. This should only be called by spaceroom label. DO NOT USE ANYWHERE ELSE.mas_isDay
- replacesmas_isSunny
mas_isDayNow
- variant ofmas_isDayNow
except uses current time. This should replace previous uses ofmas_isMorning
mas_isNightNow
- variant ofmas_isNight
except uses current time. This should replace previous uses ofnot mas_isMorning
New
MASBackground
functionsisFltDay
- checks if the given/current filter is considered a "day" filter. This will be fully implemented withfiltering-backgrounds
development in the future. For now it is specific to day/night filtering. This should replace all uses of the globalmorning_flag
isFltNight
- checks if the given/current filter is considered a "night" filter. SeeisFltDay
. This should replace all uses ofnot morning_flag
Testing
mas_o31_deco
mas_d25_banners
mas_mistletoe
mas_d25_lights
mas_d25_garlands
mas_d25_tree
mas_d25_gifts_1
mas_d25_gifts_2
mas_d25_gifts_3
mas_bday_cake_monika
- lit and unlitmas_bday_cake_player
- lit and unlitmas_bday_banners
mas_bday_balloons
chibi_peek