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.

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

Additions to the island event #9689

Merged
merged 49 commits into from Oct 29, 2022

Conversation

Booplicate
Copy link
Member

@Booplicate Booplicate commented Oct 27, 2022

Additions:

  • MASAudioData - isn't used as of now, but will be used later for the next wave of changes

Changes:

  • play_song is deprecated in favour of mas_play_song
  • various internal functions (island-related) renamed to snake_case to be consistent with the rest of the funcs in the namespace
  • backgrounds now properly report which images are missing for which filters
  • cleanup of the background framework
    • new internal funcs
      • getBackground
      • unlockBackground
      • lockBackground
      • isBackgroundUnlocked
    • new global funcs
      • mas_getCurrentBackgroundId
      • mas_isBackgroundUnlocked
  • background selector was improved
    • we don't suggest to select the current background anymore
    • replaced duplicated code with predicate functions for filtering
    • in case no backgrounds are available, we will show the default as a fallback option (you still can't go into the same background)

Fixes:

  • fixed a typo that lead to a name error in _mfwm_find_fb_def

Recognition:

Testing:

  • verify playing music still works
  • verify the background selector still works
    • and you can't go into the same room
    • and current room isn't being suggested
    • and on O31 only the rooms with the required deco are shown
  • verify the islands still work
    • test during different time of day (filter) and weather
    • test on O31 (don't forget about the update script)
      • again, test during the day and night
    • verify your unlocks are valid
    • verify the new dialogue (on click events) is good

Booplicate and others added 30 commits October 5, 2022 09:18
add new type of images - interior
allow to directly specify the filenames of the images to load
added the new images definitions
some cleanup
add our cool custom table/char/shadow to the cache during init, that way we can use our dynamic displayables. Cool

Co-Authored-By: ThePotatoGuy <potato@desu.zone>
have fun with easter eggs
Otherwise it assumes the images are on disk. Since renpy doesn't handle str being used as img tag in this case
This will add proper filters to both of the bgs
`decode_images` > `decode_data`
improve unlock callbacks
- don't suggest to select current bg (it's pointless)
- cleanup duplicated code using predicate lambdas to filter bgs
- use def bg as a fallback if we somehow get to the selector with no bg available
Booplicate and others added 4 commits October 27, 2022 12:01
Co-Authored-By: lunulae <45501964+lunulae@users.noreply.github.com>
@Booplicate Booplicate added awaiting dlg review dialogue needs to be reviewed awaiting testing code needs to be tested awaiting code review someone needs to check for syntax/logic/indentation errors labels Oct 27, 2022
@Booplicate Booplicate added this to the 0.12.12 milestone Oct 27, 2022
@Booplicate Booplicate added this to awaiting review in core via automation Oct 27, 2022
@Booplicate Booplicate added this to awaiting review in Non-idle stuff via automation Oct 27, 2022
Non-idle stuff automation moved this from awaiting review to awaitng merge Oct 28, 2022
core automation moved this from awaiting review to awaiting merge Oct 28, 2022
@ThePotatoGuy ThePotatoGuy merged commit 3e5011f into Monika-After-Story:content Oct 29, 2022
Non-idle stuff automation moved this from awaitng merge to done Oct 29, 2022
core automation moved this from awaiting merge to done Oct 29, 2022
@ThePotatoGuy ThePotatoGuy added this to done in o31 Oct 29, 2022
@ThePotatoGuy ThePotatoGuy removed awaiting dlg review dialogue needs to be reviewed awaiting testing code needs to be tested awaiting code review someone needs to check for syntax/logic/indentation errors labels Oct 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
core
  
done
o31
  
done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants