-
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
Base Separation #4582
Merged
Merged
Base Separation #4582
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
ThePotatoGuy
added
awaiting testing
code needs to be tested
awaiting code review
someone needs to check for syntax/logic/indentation errors
labels
Sep 1, 2019
This was referenced Sep 1, 2019
…MonikaModDev into base-separation
This was referenced Sep 2, 2019
Merged
Merged
jmwall24
approved these changes
Sep 2, 2019
multimokia
approved these changes
Sep 2, 2019
ThePotatoGuy
removed
awaiting code review
someone needs to check for syntax/logic/indentation errors
awaiting testing
code needs to be tested
high priority
labels
Sep 2, 2019
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.
#4458 #4474
Key Changes
Split-Base system
For a more in depth description of this, check #3174 .
MASPoseArms
New class that represents a pose's arms. Allows for easier pose creation (aka now we can mix and match arms, provided they are separate).
See
sprite-chart.rpy
for more info.Remade sprites + new night filtesr
Unit Test expansion
assertDictEqual
andassertListEqual
have been addedassertEqual
now triages toassertDictEqual
andassertListEqual
if necessarySprite JSON updates:
(wiki will be updated with new documentation shortly) (See here for a draft)
Removals:
fallback
-mpm_type
should be used to denote a fallback-styleMASPoseMap
(see below)Additions:
mpm_type
- new property forMASPoseMap
that determines what the values should be. This is only used to differentiate between the Enable/disable and fallback modes.arm_split
- new property for ACS sprites, contains aMASPoseMap
with special string values to determine if an ACS has images for specific split layers. This is only meant forBSE_ACS
andASE_ACS
layers.pose_arms
- new property for clothes sprites, contains aMASPoseMap
withMASPoseArms
. Determines which layers have arm layers (if at all) for an outfit.version
- top-level required property. Initial version is2
. This will be updated whenever the sprite system changes format in a way where existing JSONs will be broken. JSONs with a different version are not loaded.Followups
These will be linked to this PR when they are created:
Testing
monika_chr.wear_acs_in
or sister functions) will force the acs to be worn in the correct layer. (this can be overrided if needed)Unit Tests
Verify the 3 new groups are sucessful:
JSON - MASPoseMap
JSON - MASPoseArms
JSON - MASPoseArms-JGroup