Cavemanon
/
SnootGame
25
0
Fork 16
Code Issues 2 Pull Requests 3 Projects Releases 4 Wiki Activity

Choreography changes Closes: #12 #82

Closed
nutbuster wants to merge 0 commits from bncf into Monster-Update-6
pull from: bncf
merge into: Cavemanon:Monster-Update-6
Conversation 3 Commits - Files Changed -
nutbuster commented 2021-10-09 19:44:20 +00:00
Member
Copy Link

Since @Bowie has noticed/mentioned my branch that includes both @Nio & his changes, here is the pull request
Also during the merge there is one pain point to look at in script.rpy:

image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)

#double surprised
#<<<<<<< B's
#image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
#=======
#image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
#image naser surprised = "naser/naserintermediaryshocked.png"
#
#>>>>>>> N's

The only change I have added myself is a new warning for mods/README.md & updating Nio's script filename & labels

Since @Bowie has noticed/mentioned my branch that includes both @Nio & his changes, here is the pull request Also during the merge there is one pain point to look at in `script.rpy`: ``` image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True) #double surprised #<<<<<<< B's #image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True) #======= #image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True) #image naser surprised = "naser/naserintermediaryshocked.png" # #>>>>>>> N's ``` The only change I have added myself is a new warning for `mods/README.md` & updating Nio's script filename & labels
nutbuster added 102 commits 2021-10-09 20:01:06 +00:00
nutbuster changed title from WIP: to WIP: Choreography changes Closes: #12 2021-10-09 20:20:31 +00:00
Bowie commented 2021-10-09 20:48:09 +00:00
Member
Copy Link

Issue in the OP is resolved by keeping only <<<<<<< B's and rming the duplicate image naserintermediaryshocked.png. show naser surprised will still work in Nios scripts due to the presence of images/naser/naser surprised.png.

There's a few other issues surrounding duplicated backgrounds, CGs and sprites that both Nio and I added separately which'll cause renpy ambiguity errors in case there's a .png and .jpg with the same name. Most of these can be found in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/cgs
although I did also spot a duplicate parkinglot.jpg, parkinglot.png in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/backgrounds

If it makes things easier to trace I reckon most of the troublesome assets are from this commit c05c4ac014

Issue in the OP is resolved by keeping only `<<<<<<< B's` and rming the duplicate image `naserintermediaryshocked.png`. `show naser surprised` will still work in Nios scripts due to the presence of `images/naser/naser surprised.png`. There's a few other issues surrounding duplicated backgrounds, CGs and sprites that both Nio and I added separately which'll cause renpy ambiguity errors in case there's a `.png` and `.jpg` with the same name. Most of these can be found in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/cgs although I did also spot a duplicate `parkinglot.jpg`, `parkinglot.png` in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/backgrounds If it makes things easier to trace I reckon most of the troublesome assets are from this commit https://git.snootgame.xyz/nutbuster/SnootGame/commit/c05c4ac014bac1b9113ee849e734b1acb85cabde
Bowie commented 2021-10-09 21:10:59 +00:00
Member
Copy Link

Following files in images/ are unused duplicates and can be rmed

trishfam/chondrahappy
trishfam/chondraneutral
trishfam/rileyconspiratorial
trishfam/rileyneutral
trishfam/rileysmirk
trishfam/talihappy
trishfam/talineutral
trishfam/tanacheer
trishfam/tananeutral
trishfam/trevorawe
trishfam/trevorneutral
Following files in `images/` are unused duplicates and can be rmed ``` trishfam/chondrahappy trishfam/chondraneutral trishfam/rileyconspiratorial trishfam/rileyneutral trishfam/rileysmirk trishfam/talihappy trishfam/talineutral trishfam/tanacheer trishfam/tananeutral trishfam/trevorawe trishfam/trevorneutral ```
nutbuster commented 2021-10-09 22:39:06 +00:00
Author
Member
Copy Link

There's a few other issues surrounding duplicated backgrounds, CGs and sprites that both Nio and I added separately which'll cause renpy ambiguity errors in case there's a .png and .jpg with the same name. Most of these can be found in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/cgs
although I did also spot a duplicate parkinglot.jpg, parkinglot.png in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/backgrounds

Oddly enough the .jpg duplicates aren't actually jpg, their magic number or their actual filetype is an actual png, for now I'll use the png files

ls * | sed 's/jpg/png/g' | sort | uniq -D
bowlingalley.png
bowlingalley.png
parkinglot.png
parkinglot.png
trishhome.png
trishhome.png

bowlingalley.jpg: PNG image data, 1920 x 1080, 8-bit/color RGB, non-interlaced
parkinglot.jpg: PNG image data, 1920 x 1080, 8-bit/color RGBA, non-interlaced
trishhome.jpg: PNG image data, 1920 x 1080, 8-bit/color RGB, non-interlaced
> There's a few other issues surrounding duplicated backgrounds, CGs and sprites that both Nio and I added separately which'll cause renpy ambiguity errors in case there's a `.png` and `.jpg` with the same name. Most of these can be found in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/cgs > although I did also spot a duplicate `parkinglot.jpg`, `parkinglot.png` in https://git.snootgame.xyz/nutbuster/SnootGame/src/branch/bowieniocombo/game/images/backgrounds Oddly enough the .jpg duplicates aren't actually jpg, their magic number or their actual filetype is an actual png, for now I'll use the png files ``` ls * | sed 's/jpg/png/g' | sort | uniq -D bowlingalley.png bowlingalley.png parkinglot.png parkinglot.png trishhome.png trishhome.png ``` ``` bowlingalley.jpg: PNG image data, 1920 x 1080, 8-bit/color RGB, non-interlaced parkinglot.jpg: PNG image data, 1920 x 1080, 8-bit/color RGBA, non-interlaced trishhome.jpg: PNG image data, 1920 x 1080, 8-bit/color RGB, non-interlaced ```
nutbuster changed title from WIP: Choreography changes Closes: #12 to Choreography changes Closes: #12 2021-10-10 02:14:28 +00:00
nutbuster closed this pull request 2021-10-10 02:49:54 +00:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
Critical Priority

Absolutely urgent issues that must be delt with before others can even be considered.

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
High Priority

Bugs that cause crashes, major story errors, or other massively negative issues. Features that are a must-have inclusion or else the game won't be as good.

  
Low Priority

Minor or easy to miss errors. Features that'd be nice, but can be done with out.

  
Medium Priority

Errors that stick out, but aren't fatal to gameplay. Features that are in decent demand or would improve gameplay by a signifigant amount

  
Meta

for all the other fun stuff about the project thats not code

  
needs more info

Something is wrong

  
question

   
refactor

Cleaning up the cruft

  
wontfix

This won't be fixed

  
bug

Something is not working

  
Critical Priority

Absolutely urgent issues that must be delt with before others can even be considered.

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
High Priority

Bugs that cause crashes, major story errors, or other massively negative issues. Features that are a must-have inclusion or else the game won't be as good.

  
invalid

Something is wrong

  
Low Priority

Minor or easy to miss errors. Features that'd be nice, but can be done with out.

  
Medium Priority

Errors that stick out, but aren't fatal to gameplay. Features that are in decent demand or would improve gameplay by a signifigant amount

  
Meta

for all the other fun stuff about the project thats not code

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
Critical Priority
duplicate
enhancement
help wanted
High Priority
Low Priority
Medium Priority
Meta
needs more info
question
refactor
wontfix
bug
Critical Priority
duplicate
enhancement
help wanted
High Priority
invalid
Low Priority
Medium Priority
Meta
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Cavemanon/SnootGame#82
No description provided.
Delete Branch "bncf"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?